-#include <glib.h>
-
+#include "kernel/debug.h"
#include "kernel/menu.h"
#include "kernel/screen.h"
#include "kernel/client.h"
#include "kernel/openbox.h"
-
#include "kernel/frame.h"
#include "render/theme.h"
+#include <glib.h>
+
static char *PLUGIN_NAME = "client_menu";
-static Menu *send_to_menu;
-static Menu *layer_menu;
+static ObMenu *send_to_menu;
+static ObMenu *layer_menu;
typedef struct {
-
+ gint foo;
} Client_Menu_Data;
-#define CLIENT_MENU(m) ((Menu *)m)
-#define CLIENT_MENU_DATA(m) ((Client_Menu_Data *)((Menu *)m)->plugin_data)
+#define CLIENT_MENU(m) ((ObMenu *)m)
+#define CLIENT_MENU_DATA(m) ((Client_Menu_Data *)((ObMenu *)m)->plugin_data)
-
-void client_menu_clean_up(Menu *m) {
+void client_menu_clean_up(ObMenu *m) {
}
-void client_send_to_update(Menu *self)
+void client_send_to_update(ObMenu *self)
{
- guint i;
+ guint i = 0;
+ GList *it = self->entries;
- for (i = 0; i < screen_num_desktops; ++i) {
- MenuEntry *e;
- Action *a = action_from_string("sendtodesktop");
- a->data.sendto.desk = i;
- a->data.sendto.follow = FALSE;
- e = menu_entry_new(screen_desktop_names[i], a);
- menu_add_entry(self, e);
+ /* check if we have to update. lame */
+ while (it != NULL) {
+ if (i >= screen_num_desktops)
+ break;
+ if (strcmp(screen_desktop_names[i],
+ ((ObMenuEntry *)it->data)->label) != 0)
+ break;
+ ++i;
+ it = it->next;
}
- menu_render_full(self);
+ if (it != NULL || i != screen_num_desktops) {
+ menu_clear(self);
+ ob_debug("update\n");
+ for (i = 0; i < screen_num_desktops; ++i) {
+ ObMenuEntry *e;
+ Action *a = action_from_string("sendtodesktop");
+ a->data.sendto.desk = i;
+ a->data.sendto.follow = FALSE;
+ e = menu_entry_new(screen_desktop_names[i], a);
+ menu_add_entry(self, e);
+ }
+
+ self->update(self);
+ }
}
-void client_menu_show(Menu *self, int x, int y, Client *client)
+void client_menu_show(ObMenu *self, int x, int y, ObClient *client)
{
- int newy;
+ guint i;
+ gint newy, newx;
+ Rect *a = NULL;
+
g_assert(!self->invalid);
g_assert(client);
- newy = client->frame->area.y + client->frame->a_focused_title->area.height
- + theme_bwidth;
+ for (i = 0; i < screen_num_monitors; ++i) {
+ a = screen_physical_area_monitor(i);
+ if (RECT_CONTAINS(*a, x, y))
+ break;
+ }
+ g_assert(a != NULL);
+ self->xin_area = i;
+
+ newx = MAX(x, client->area.x);
+ newy = MAX(y, client->area.y);
+ POINT_SET(self->location,
+ MIN(newx, client->area.x + client->area.width - self->size.width),
+ MIN(newy, client->area.y + client->area.height -
+ self->size.height));
- POINT_SET(self->location,
- MIN(x, screen_physical_size.width - self->size.width -
- theme_bwidth * 2),
- MIN(newy, screen_physical_size.height - self->size.height -
- theme_bwidth * 2));
XMoveWindow(ob_display, self->frame, self->location.x, self->location.y);
if (!self->shown) {
void plugin_shutdown() { }
-void plugin_destroy (Menu *m)
+void plugin_destroy (ObMenu *m)
{
}
void *plugin_create() /* TODO: need config */
{
- Menu *m = menu_new_full(NULL, "client-menu", NULL,
- client_menu_show, NULL);
+ ObMenu *m = menu_new_full(NULL, "client-menu", NULL,
+ client_menu_show, NULL, NULL, NULL, NULL);
+ m->plugin = PLUGIN_NAME;
menu_add_entry(m, menu_entry_new_submenu("Send To Workspace",
send_to_menu));
send_to_menu->parent = m;
action_from_string("toggleshade")));
menu_add_entry(m, menu_entry_new("Omnipresent",
action_from_string("toggleomnipresent")));
+ menu_add_entry(m, menu_entry_new("Decorations",
+ action_from_string("toggledecorations")));
menu_add_entry(m, menu_entry_new_submenu("Layers",
layer_menu));
layer_menu->parent = m;
void plugin_startup()
{
- Menu *t;
- /* create a Send To Workspace Menu */
+ ObMenu *t;
+ /* create a Send To Workspace ObMenu */
send_to_menu = menu_new_full(NULL, "send-to-workspace",
- NULL, NULL, client_send_to_update);
+ NULL, NULL, client_send_to_update, NULL, NULL, NULL);
layer_menu = menu_new(NULL, "layer", NULL);
menu_add_entry(layer_menu, menu_entry_new("Top Layer",
menu_add_entry(layer_menu, menu_entry_new("Bottom Layer",
action_from_string("sendtobottomlayer")));
- t = (Menu *)plugin_create("client_menu");
+ t = (ObMenu *)plugin_create("client_menu");
}