<group> option for raise/lower related actions. hi floam.

[chaz/openbox] / openbox / popup.c

diff --git a/openbox/popup.c b/openbox/popup.c
index 592c5ee0514a163e7f18260f55a02a521dfecc26..f132d9df2afcdd9b94a2ee543ea866fd63368737 100644 (file)
--- a/openbox/popup.c
+++ b/openbox/popup.c
@@ -1,3 +1,22 @@
+/* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*-
+
+   popup.c for the Openbox window manager
+   Copyright (c) 2004        Mikael Magnusson
+   Copyright (c) 2003        Ben Jansens
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   See the COPYING file for a copy of the GNU General Public License.
+*/
+
 #include "popup.h"
 
 #include "openbox.h"
@@ -87,6 +106,12 @@ void popup_show(ObPopup *self, gchar *text)
     gint x, y, w, h;
     gint textw, texth;
     gint iconw;
+    Rect *area; /* won't go outside this */
+
+    area = screen_physical_area();          /* XXX this should work quite
+                                               good, someone with xinerama,
+                                               and different resolutions on
+                                               screens? */
 
     RrMargins(self->a_bg, &l, &t, &r, &b);
 
@@ -152,6 +177,9 @@ void popup_show(ObPopup *self, gchar *text)
         break;
     }
 
+    x=MAX(MIN(x, area->width-w),0);
+    y=MAX(MIN(y, area->height-h),0);
+
     /* set the windows/appearances up */
     XMoveResizeWindow(ob_display, self->bg, x, y, w, h);
 
@@ -176,7 +204,7 @@ void popup_show(ObPopup *self, gchar *text)
 
     if (!self->mapped) {
         XMapWindow(ob_display, self->bg);
-        stacking_raise(INTERNAL_AS_WINDOW(self));
+        stacking_raise(INTERNAL_AS_WINDOW(self), FALSE);
         self->mapped = TRUE;
     }
 }
@@ -230,7 +258,7 @@ void icon_popup_free(ObIconPopup *self)
 }
 
 void icon_popup_show(ObIconPopup *self,
-                     gchar *text, struct _ObClientIcon *icon)
+                     gchar *text, const ObClientIcon *icon)
 {
     if (icon) {
         self->a_icon->texture[0].type = RR_TEXTURE_RGBA;
@@ -263,11 +291,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 +298,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 +357,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 +367,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 +412,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);