Merge branch 'backport' into work

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

diff --git a/openbox/menuframe.c b/openbox/menuframe.c
index fb9b6c5..598bc00 100644 (file)
--- a/openbox/menuframe.c
+++ b/openbox/menuframe.c
@@ -24,7 +24,6 @@
 #include "actions.h"
 #include "grab.h"
 #include "openbox.h"
 #include "actions.h"
 #include "grab.h"
 #include "openbox.h"

-#include "mainloop.h"

 #include "config.h"
 #include "render/theme.h"
 
 #include "config.h"
 #include "render/theme.h"
 


@@ -51,7 +50,7 @@ static void menu_frame_hide(ObMenuFrame *self);
 static Window createWindow(Window parent, gulong mask,
                            XSetWindowAttributes *attrib)
 {
 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);
 }
                          RrDepth(ob_rr_inst), InputOutput,
                          RrVisual(ob_rr_inst), mask, attrib);
 }


@@ -78,7 +77,7 @@ ObMenuFrame* menu_frame_new(ObMenu *menu, guint show_from, ObClient *client)
     XSetWindowAttributes attr;
 
     self = g_new0(ObMenuFrame, 1);
     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;
     self->menu = menu;
     self->selected = NULL;
     self->client = client;


@@ -86,16 +85,17 @@ ObMenuFrame* menu_frame_new(ObMenu *menu, guint show_from, ObClient *client)
     self->show_from = show_from;
 
     attr.event_mask = FRAME_EVENTMASK;
     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);
 
                                 CWEventMask, &attr);
 

-    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);
 
                      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;
 }
 
     return self;
 }


@@ -108,11 +108,12 @@ void menu_frame_free(ObMenuFrame *self)
             self->entries = g_list_delete_link(self->entries, self->entries);
         }
 
             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);
 
 
         RrAppearanceFree(self->a_items);
 

-        XDestroyWindow(ob_display, self->window);
+        XDestroyWindow(obt_display, self->window);

 
         g_free(self);
     }
 
         g_free(self);
     }


@@ -144,8 +145,10 @@ static ObMenuEntryFrame* menu_entry_frame_new(ObMenuEntry *entry,
         g_hash_table_insert(menu_frame_map, &self->bullet, self);
     }
 
         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;
 }
 
     return self;
 }


@@ -155,16 +158,18 @@ static void menu_entry_frame_free(ObMenuEntryFrame *self)
     if (self) {
         menu_entry_unref(self->entry);
 
     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) {
         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) {
             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);
         }
 
             g_hash_table_remove(menu_frame_map, &self->bullet);
         }
 


@@ -175,7 +180,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);
 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)
 }
 
 static void menu_frame_place_topmenu(ObMenuFrame *self, gint *x, gint *y)


@@ -334,7 +339,7 @@ static void menu_entry_frame_render(ObMenuEntryFrame *self)
         g_assert_not_reached();
     }
     RECT_SET_SIZE(self->area, self->frame->inner_w, th);
         g_assert_not_reached();
     }
     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;
                   self->area.width, self->area.height);
     item_a->surface.parent = self->frame->a_items;
     item_a->surface.parentx = self->area.x;


@@ -393,7 +398,7 @@ static void menu_entry_frame_render(ObMenuEntryFrame *self)
 
     switch (self->entry->type) {
     case OB_MENU_ENTRY_TYPE_NORMAL:
 
     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);
                           self->frame->text_x, PADDING,
                           self->frame->text_w,
                           ITEM_HEIGHT - 2*PADDING);


@@ -404,7 +409,7 @@ static void menu_entry_frame_render(ObMenuEntryFrame *self)
                 ITEM_HEIGHT - 2*PADDING);
         break;
     case OB_MENU_ENTRY_TYPE_SUBMENU:
                 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);
                           self->frame->text_x, PADDING,
                           self->frame->text_w - ITEM_HEIGHT,
                           ITEM_HEIGHT - 2*PADDING);


@@ -417,7 +422,7 @@ static void menu_entry_frame_render(ObMenuEntryFrame *self)
     case OB_MENU_ENTRY_TYPE_SEPARATOR:
         if (self->entry->data.separator.label != NULL) {
             /* labeled separator */
     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 -
                               ob_rr_theme->paddingx, ob_rr_theme->paddingy,
                               self->area.width - 2*ob_rr_theme->paddingx,
                               ob_rr_theme->menu_title_height -


@@ -433,7 +438,7 @@ static void menu_entry_frame_render(ObMenuEntryFrame *self)
             RrAppearance *clear;
 
             /* unlabeled separaator */
             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;
                               self->area.width - 2*PADDING, SEPARATOR_HEIGHT);
 
             clear = ob_rr_theme->a_clear_tex;


@@ -458,7 +463,7 @@ static void menu_entry_frame_render(ObMenuEntryFrame *self)
     {
         RrAppearance *clear;
 
     {
         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,
                           PADDING, frame->item_margin.top,
                           ITEM_HEIGHT - frame->item_margin.top
                           - frame->item_margin.bottom,


@@ -483,14 +488,14 @@ static void menu_entry_frame_render(ObMenuEntryFrame *self)
                 - frame->item_margin.bottom,
                 ITEM_HEIGHT - frame->item_margin.top
                 - frame->item_margin.bottom);
                 - 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;
 
     } 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,
                           PADDING, frame->item_margin.top,
                           ITEM_HEIGHT - frame->item_margin.top
                           - frame->item_margin.bottom,


@@ -522,13 +527,13 @@ static void menu_entry_frame_render(ObMenuEntryFrame *self)
                 - frame->item_margin.bottom,
                 ITEM_HEIGHT - frame->item_margin.top
                 - frame->item_margin.bottom);
                 - 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
     } else

-        XUnmapWindow(ob_display, self->icon);
+        XUnmapWindow(obt_display, self->icon);

 
     if (self->entry->type == OB_MENU_ENTRY_TYPE_SUBMENU) {
         RrAppearance *bullet_a;
 
     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,
                           self->frame->text_x + self->frame->text_w -
                           ITEM_HEIGHT + PADDING, PADDING,
                           ITEM_HEIGHT - 2*PADDING,


@@ -543,11 +548,11 @@ static void menu_entry_frame_render(ObMenuEntryFrame *self)
         RrPaint(bullet_a, self->bullet,
                 ITEM_HEIGHT - 2*PADDING,
                 ITEM_HEIGHT - 2*PADDING);
         RrPaint(bullet_a, self->bullet,
                 ITEM_HEIGHT - 2*PADDING,
                 ITEM_HEIGHT - 2*PADDING);

-        XMapWindow(ob_display, self->bullet);
+        XMapWindow(obt_display, self->bullet);

     } else
     } 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
 }
 
 /*! this code is taken from the menu_frame_render. if that changes, this won't


@@ -665,10 +670,10 @@ void menu_frame_render(ObMenuFrame *self)
         }
 
         RECT_SET_POINT(e->area, 0, h+e->border);
         }
 
         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);
                     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));
 
 
                          RrColorPixel(ob_rr_theme->menu_border_color));
 
 


@@ -750,7 +755,7 @@ void menu_frame_render(ObMenuFrame *self)
     if (!w) w = 10;
     if (!h) h = 3;
 
     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;
 
 
     self->inner_w = w;
 


@@ -764,7 +769,7 @@ void menu_frame_render(ObMenuFrame *self)
 
     RECT_SET_SIZE(self->area, w, h);
 
 
     RECT_SET_SIZE(self->area, w, h);
 

-    XFlush(ob_display);
+    XFlush(obt_display);

 }
 
 static void menu_frame_update(ObMenuFrame *self)
 }
 
 static void menu_frame_update(ObMenuFrame *self)


@@ -946,7 +951,7 @@ gboolean menu_frame_show_topmenu(ObMenuFrame *self, gint x, gint y,
 
     menu_frame_move(self, x, 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);
 
     if (screen_pointer_pos(&px, &py)) {
         ObMenuEntryFrame *e = menu_entry_frame_under(px, py);


@@ -989,7 +994,7 @@ gboolean menu_frame_show_submenu(ObMenuFrame *self, ObMenuFrame *parent,
     }
     menu_frame_move(self, x + dx, y + dy);
 
     }
     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);
 
     if (screen_pointer_pos(&px, &py)) {
         ObMenuEntryFrame *e = menu_entry_frame_under(px, py);


@@ -1026,7 +1031,7 @@ static void menu_frame_hide(ObMenuFrame *self)
         ungrab_keyboard();
     }
 
         ungrab_keyboard();
     }
 

-    XUnmapWindow(ob_display, self->window);
+    XUnmapWindow(obt_display, self->window);

 
     menu_frame_free(self);
 }
 
     menu_frame_free(self);
 }


@@ -1037,8 +1042,8 @@ void menu_frame_hide_all(void)
 
     if (config_submenu_show_delay) {
         /* remove any submenu open requests */
 
     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);
     }
     if ((it = g_list_last(menu_frame_visible)))
         menu_frame_hide(it->data);


@@ -1052,8 +1057,8 @@ void menu_frame_hide_all_client(ObClient *client)
         if (f->client == client) {
             if (config_submenu_show_delay) {
                 /* remove any submenu open requests */
         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);
         }
             }
             menu_frame_hide(f);
         }


@@ -1119,8 +1124,8 @@ void menu_frame_select(ObMenuFrame *self, ObMenuEntryFrame *entry,
 
     if (config_submenu_show_delay) {
         /* remove any submenu open requests */
 
     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;
     }
 
     self->selected = entry;


@@ -1136,11 +1141,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 */
         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);
             }
             } else {
                 menu_entry_frame_show_submenu(self->selected);
             }