Merge branch 'backport' into work

[dana/openbox.git] / openbox / menuframe.c

diff --git a/openbox/menuframe.c b/openbox/menuframe.c
index 54f0cdb..867aa81 100644 (file)
--- a/openbox/menuframe.c
+++ b/openbox/menuframe.c
@@ -21,12 +21,11 @@
 #include "client.h"
 #include "menu.h"
 #include "screen.h"
-#include "prop.h"
 #include "actions.h"
 #include "grab.h"
 #include "openbox.h"
-#include "mainloop.h"
 #include "config.h"
+#include "obt/prop.h"
 #include "render/theme.h"
 
 #define PADDING 2
@@ -52,7 +51,7 @@ static void menu_frame_hide(ObMenuFrame *self);
 static Window createWindow(Window parent, gulong mask,
                            XSetWindowAttributes *attrib)
 {
-    return XCreateWindow(ob_display, parent, 0, 0, 1, 1, 0,
+    return XCreateWindow(obt_display, parent, 0, 0, 1, 1, 0,
                          RrDepth(ob_rr_inst), InputOutput,
                          RrVisual(ob_rr_inst), mask, attrib);
 }
@@ -79,7 +78,7 @@ ObMenuFrame* menu_frame_new(ObMenu *menu, guint show_from, ObClient *client)
     XSetWindowAttributes attr;
 
     self = g_new0(ObMenuFrame, 1);
-    self->type = Window_Menu;
+    self->obwin.type = OB_WINDOW_CLASS_MENUFRAME;
     self->menu = menu;
     self->selected = NULL;
     self->client = client;
@@ -87,20 +86,21 @@ ObMenuFrame* menu_frame_new(ObMenu *menu, guint show_from, ObClient *client)
     self->show_from = show_from;
 
     attr.event_mask = FRAME_EVENTMASK;
-    self->window = createWindow(RootWindow(ob_display, ob_screen),
+    self->window = createWindow(obt_root(ob_screen),
                                 CWEventMask, &attr);
 
     /* make it a popup menu type window */
-    PROP_SET32(self->window, net_wm_window_type, atom,
-               prop_atoms.net_wm_window_type_popup_menu);
+    OBT_PROP_SET32(self->window, NET_WM_WINDOW_TYPE, ATOM,
+                   OBT_PROP_ATOM(NET_WM_WINDOW_TYPE_POPUP_MENU));
 
-    XSetWindowBorderWidth(ob_display, self->window, ob_rr_theme->mbwidth);
-    XSetWindowBorder(ob_display, self->window,
+    XSetWindowBorderWidth(obt_display, self->window, ob_rr_theme->mbwidth);
+    XSetWindowBorder(obt_display, self->window,
                      RrColorPixel(ob_rr_theme->menu_border_color));
 
     self->a_items = RrAppearanceCopy(ob_rr_theme->a_menu);
 
-    stacking_add(MENU_AS_WINDOW(self));
+    window_add(&self->window, MENUFRAME_AS_WINDOW(self));
+    stacking_add(MENUFRAME_AS_WINDOW(self));
 
     return self;
 }
@@ -113,11 +113,12 @@ void menu_frame_free(ObMenuFrame *self)
             self->entries = g_list_delete_link(self->entries, self->entries);
         }
 
-        stacking_remove(MENU_AS_WINDOW(self));
+        stacking_remove(MENUFRAME_AS_WINDOW(self));
+        window_remove(self->window);
 
         RrAppearanceFree(self->a_items);
 
-        XDestroyWindow(ob_display, self->window);
+        XDestroyWindow(obt_display, self->window);
 
         g_free(self);
     }
@@ -149,8 +150,10 @@ static ObMenuEntryFrame* menu_entry_frame_new(ObMenuEntry *entry,
         g_hash_table_insert(menu_frame_map, &self->bullet, self);
     }
 
-    XMapWindow(ob_display, self->window);
-    XMapWindow(ob_display, self->text);
+    XMapWindow(obt_display, self->window);
+    XMapWindow(obt_display, self->text);
+
+    window_add(&self->window, MENUFRAME_AS_WINDOW(self->frame));
 
     return self;
 }
@@ -160,16 +163,18 @@ static void menu_entry_frame_free(ObMenuEntryFrame *self)
     if (self) {
         menu_entry_unref(self->entry);
 
-        XDestroyWindow(ob_display, self->text);
-        XDestroyWindow(ob_display, self->window);
+        window_remove(self->window);
+
+        XDestroyWindow(obt_display, self->text);
+        XDestroyWindow(obt_display, self->window);
         g_hash_table_remove(menu_frame_map, &self->text);
         g_hash_table_remove(menu_frame_map, &self->window);
         if (self->entry->type == OB_MENU_ENTRY_TYPE_NORMAL) {
-            XDestroyWindow(ob_display, self->icon);
+            XDestroyWindow(obt_display, self->icon);
             g_hash_table_remove(menu_frame_map, &self->icon);
         }
         if (self->entry->type == OB_MENU_ENTRY_TYPE_SUBMENU) {
-            XDestroyWindow(ob_display, self->bullet);
+            XDestroyWindow(obt_display, self->bullet);
             g_hash_table_remove(menu_frame_map, &self->bullet);
         }
 
@@ -180,7 +185,7 @@ static void menu_entry_frame_free(ObMenuEntryFrame *self)
 void menu_frame_move(ObMenuFrame *self, gint x, gint y)
 {
     RECT_SET_POINT(self->area, x, y);
-    XMoveWindow(ob_display, self->window, self->area.x, self->area.y);
+    XMoveWindow(obt_display, self->window, self->area.x, self->area.y);
 }
 
 static void menu_frame_place_topmenu(ObMenuFrame *self, gint *x, gint *y)
@@ -341,7 +346,7 @@ static void menu_entry_frame_render(ObMenuEntryFrame *self)
     }
 
     RECT_SET_SIZE(self->area, self->frame->inner_w, th);
-    XResizeWindow(ob_display, self->window,
+    XResizeWindow(obt_display, self->window,
                   self->area.width, self->area.height);
     item_a->surface.parent = self->frame->a_items;
     item_a->surface.parentx = self->area.x;
@@ -400,7 +405,7 @@ static void menu_entry_frame_render(ObMenuEntryFrame *self)
 
     switch (self->entry->type) {
     case OB_MENU_ENTRY_TYPE_NORMAL:
-        XMoveResizeWindow(ob_display, self->text,
+        XMoveResizeWindow(obt_display, self->text,
                           self->frame->text_x, PADDING,
                           self->frame->text_w,
                           ITEM_HEIGHT - 2*PADDING);
@@ -411,7 +416,7 @@ static void menu_entry_frame_render(ObMenuEntryFrame *self)
                 ITEM_HEIGHT - 2*PADDING);
         break;
     case OB_MENU_ENTRY_TYPE_SUBMENU:
-        XMoveResizeWindow(ob_display, self->text,
+        XMoveResizeWindow(obt_display, self->text,
                           self->frame->text_x, PADDING,
                           self->frame->text_w - ITEM_HEIGHT,
                           ITEM_HEIGHT - 2*PADDING);
@@ -424,7 +429,7 @@ static void menu_entry_frame_render(ObMenuEntryFrame *self)
     case OB_MENU_ENTRY_TYPE_SEPARATOR:
         if (self->entry->data.separator.label != NULL) {
             /* labeled separator */
-            XMoveResizeWindow(ob_display, self->text,
+            XMoveResizeWindow(obt_display, self->text,
                               ob_rr_theme->paddingx, ob_rr_theme->paddingy,
                               self->area.width - 2*ob_rr_theme->paddingx,
                               ob_rr_theme->menu_title_height -
@@ -440,7 +445,7 @@ static void menu_entry_frame_render(ObMenuEntryFrame *self)
             RrAppearance *clear;
 
             /* unlabeled separaator */
-            XMoveResizeWindow(ob_display, self->text, PADDING, PADDING,
+            XMoveResizeWindow(obt_display, self->text, PADDING, PADDING,
                               self->area.width - 2*PADDING, SEPARATOR_HEIGHT);
 
             clear = ob_rr_theme->a_clear_tex;
@@ -466,7 +471,7 @@ static void menu_entry_frame_render(ObMenuEntryFrame *self)
     {
         RrAppearance *clear;
 
-        XMoveResizeWindow(ob_display, self->icon,
+        XMoveResizeWindow(obt_display, self->icon,
                           PADDING, frame->item_margin.top,
                           ITEM_HEIGHT - frame->item_margin.top
                           - frame->item_margin.bottom,
@@ -488,14 +493,14 @@ static void menu_entry_frame_render(ObMenuEntryFrame *self)
                 - frame->item_margin.bottom,
                 ITEM_HEIGHT - frame->item_margin.top
                 - frame->item_margin.bottom);
-        XMapWindow(ob_display, self->icon);
+        XMapWindow(obt_display, self->icon);
     } else if (self->entry->type == OB_MENU_ENTRY_TYPE_NORMAL &&
                self->entry->data.normal.mask)
     {
         RrColor *c;
         RrAppearance *clear;
 
-        XMoveResizeWindow(ob_display, self->icon,
+        XMoveResizeWindow(obt_display, self->icon,
                           PADDING, frame->item_margin.top,
                           ITEM_HEIGHT - frame->item_margin.top
                           - frame->item_margin.bottom,
@@ -528,13 +533,13 @@ static void menu_entry_frame_render(ObMenuEntryFrame *self)
                 - frame->item_margin.bottom,
                 ITEM_HEIGHT - frame->item_margin.top
                 - frame->item_margin.bottom);
-        XMapWindow(ob_display, self->icon);
+        XMapWindow(obt_display, self->icon);
     } else
-        XUnmapWindow(ob_display, self->icon);
+        XUnmapWindow(obt_display, self->icon);
 
     if (self->entry->type == OB_MENU_ENTRY_TYPE_SUBMENU) {
         RrAppearance *bullet_a;
-        XMoveResizeWindow(ob_display, self->bullet,
+        XMoveResizeWindow(obt_display, self->bullet,
                           self->frame->text_x + self->frame->text_w -
                           ITEM_HEIGHT + PADDING, PADDING,
                           ITEM_HEIGHT - 2*PADDING,
@@ -549,11 +554,11 @@ static void menu_entry_frame_render(ObMenuEntryFrame *self)
         RrPaint(bullet_a, self->bullet,
                 ITEM_HEIGHT - 2*PADDING,
                 ITEM_HEIGHT - 2*PADDING);
-        XMapWindow(ob_display, self->bullet);
+        XMapWindow(obt_display, self->bullet);
     } else
-        XUnmapWindow(ob_display, self->bullet);
+        XUnmapWindow(obt_display, self->bullet);
 
-    XFlush(ob_display);
+    XFlush(obt_display);
 }
 
 /*! this code is taken from the menu_frame_render. if that changes, this won't
@@ -671,10 +676,10 @@ void menu_frame_render(ObMenuFrame *self)
         }
 
         RECT_SET_POINT(e->area, 0, h+e->border);
-        XMoveWindow(ob_display, e->window,
+        XMoveWindow(obt_display, e->window,
                     e->area.x-e->border, e->area.y-e->border);
-        XSetWindowBorderWidth(ob_display, e->window, e->border);
-        XSetWindowBorder(ob_display, e->window,
+        XSetWindowBorderWidth(obt_display, e->window, e->border);
+        XSetWindowBorder(obt_display, e->window,
                          RrColorPixel(ob_rr_theme->menu_border_color));
 
 
@@ -756,7 +761,7 @@ void menu_frame_render(ObMenuFrame *self)
     if (!w) w = 10;
     if (!h) h = 3;
 
-    XResizeWindow(ob_display, self->window, w, h);
+    XResizeWindow(obt_display, self->window, w, h);
 
     self->inner_w = w;
 
@@ -770,7 +775,7 @@ void menu_frame_render(ObMenuFrame *self)
 
     RECT_SET_SIZE(self->area, w, h);
 
-    XFlush(ob_display);
+    XFlush(obt_display);
 }
 
 static void menu_frame_update(ObMenuFrame *self)
@@ -952,7 +957,7 @@ gboolean menu_frame_show_topmenu(ObMenuFrame *self, gint x, gint y,
 
     menu_frame_move(self, x, y);
 
-    XMapWindow(ob_display, self->window);
+    XMapWindow(obt_display, self->window);
 
     if (screen_pointer_pos(&px, &py)) {
         ObMenuEntryFrame *e = menu_entry_frame_under(px, py);
@@ -995,7 +1000,7 @@ gboolean menu_frame_show_submenu(ObMenuFrame *self, ObMenuFrame *parent,
     }
     menu_frame_move(self, x + dx, y + dy);
 
-    XMapWindow(ob_display, self->window);
+    XMapWindow(obt_display, self->window);
 
     if (screen_pointer_pos(&px, &py)) {
         ObMenuEntryFrame *e = menu_entry_frame_under(px, py);
@@ -1032,7 +1037,7 @@ static void menu_frame_hide(ObMenuFrame *self)
         ungrab_keyboard();
     }
 
-    XUnmapWindow(ob_display, self->window);
+    XUnmapWindow(obt_display, self->window);
 
     menu_frame_free(self);
 }
@@ -1043,8 +1048,8 @@ void menu_frame_hide_all(void)
 
     if (config_submenu_show_delay) {
         /* remove any submenu open requests */
-        ob_main_loop_timeout_remove(ob_main_loop,
-                                    menu_entry_frame_submenu_timeout);
+        obt_main_loop_timeout_remove(ob_main_loop,
+                                     menu_entry_frame_submenu_timeout);
     }
     if ((it = g_list_last(menu_frame_visible)))
         menu_frame_hide(it->data);
@@ -1058,8 +1063,8 @@ void menu_frame_hide_all_client(ObClient *client)
         if (f->client == client) {
             if (config_submenu_show_delay) {
                 /* remove any submenu open requests */
-                ob_main_loop_timeout_remove(ob_main_loop,
-                                            menu_entry_frame_submenu_timeout);
+                obt_main_loop_timeout_remove(ob_main_loop,
+                                             menu_entry_frame_submenu_timeout);
             }
             menu_frame_hide(f);
         }
@@ -1125,8 +1130,8 @@ void menu_frame_select(ObMenuFrame *self, ObMenuEntryFrame *entry,
 
     if (config_submenu_show_delay) {
         /* remove any submenu open requests */
-        ob_main_loop_timeout_remove(ob_main_loop,
-                                    menu_entry_frame_submenu_timeout);
+        obt_main_loop_timeout_remove(ob_main_loop,
+                                     menu_entry_frame_submenu_timeout);
     }
 
     self->selected = entry;
@@ -1142,11 +1147,11 @@ void menu_frame_select(ObMenuFrame *self, ObMenuEntryFrame *entry,
         if (self->selected->entry->type == OB_MENU_ENTRY_TYPE_SUBMENU) {
             if (config_submenu_show_delay && !immediate) {
                 /* initiate a new submenu open request */
-                ob_main_loop_timeout_add(ob_main_loop,
-                                         config_submenu_show_delay * 1000,
-                                         menu_entry_frame_submenu_timeout,
-                                         self->selected, g_direct_equal,
-                                         NULL);
+                obt_main_loop_timeout_add(ob_main_loop,
+                                          config_submenu_show_delay * 1000,
+                                          menu_entry_frame_submenu_timeout,
+                                          self->selected, g_direct_equal,
+                                          NULL);
             } else {
                 menu_entry_frame_show_submenu(self->selected);
             }