allow the use of keycodes directly in key bindings

[chaz/openbox] / openbox / popup.c

diff --git a/openbox/popup.c b/openbox/popup.c
index 592c5ee0514a163e7f18260f55a02a521dfecc26..8521de6a46100a66e0a8522b475c05ec28bacd59 100644 (file)
--- a/openbox/popup.c
+++ b/openbox/popup.c
@@ -263,11 +263,6 @@ static void pager_popup_draw_icon(gint px, gint py, gint w, gint h,
         / screen_desktop_layout.rows;
     /* make them squares */
     eachw = eachh = MIN(eachw, eachh);
-    g_message("dif %d %d %d %d ",
-              (screen_desktop_layout.columns * (eachw + ob_rr_theme->bwidth) +
-               ob_rr_theme->bwidth), w,
-              (screen_desktop_layout.rows * (eachh + ob_rr_theme->bwidth) +
-               ob_rr_theme->bwidth), h);
 
     /* center */
     px += (w - (screen_desktop_layout.columns * (eachw + ob_rr_theme->bwidth) +
@@ -275,8 +270,6 @@ static void pager_popup_draw_icon(gint px, gint py, gint w, gint h,
     py += (h - (screen_desktop_layout.rows * (eachh + ob_rr_theme->bwidth) +
                 ob_rr_theme->bwidth)) / 2;
 
-    g_message("%d %d %d %d", px, py, eachw, eachh);
-
     if (eachw <= 0 || eachh <= 0)
         return;
 
@@ -336,8 +329,6 @@ static void pager_popup_draw_icon(gint px, gint py, gint w, gint h,
         break;
     }
 
-    g_message("%d %d %d", n, horz_inc, vert_inc);
-
     rown = n;
     i = 0;
     for (r = 0, y = 0; r < screen_desktop_layout.rows;
@@ -348,8 +339,6 @@ static void pager_popup_draw_icon(gint px, gint py, gint w, gint h,
         {
             RrAppearance *a;
 
-            g_message("i %d n %d", i, n);
-
             if (i >= self->desks)
                 break;
 
@@ -395,6 +384,7 @@ void pager_popup_free(ObPagerPopup *self)
 
         for (i = 0; i < self->desks; ++i)
             XDestroyWindow(ob_display, self->wins[i]);
+        g_free(self->wins);
         RrAppearanceFree(self->hilight);
         RrAppearanceFree(self->unhilight);
         popup_free(self->popup);