X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Fpopup.c;h=82a78f1dea5e10e764b97bd01d8155f5a97d56c2;hb=d4fec1d33658f3923a8d4eff665350aa429036e6;hp=3df451b56adeae0ba3ab33787443dd38eee40896;hpb=f6ba1f27b9790f56bda1e5831069e2dd7e2c96a2;p=chaz%2Fopenbox

diff --git a/openbox/popup.c b/openbox/popup.c
index 3df451b5..82a78f1d 100644
--- a/openbox/popup.c
+++ b/openbox/popup.c
@@ -1,7 +1,8 @@
 /* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*-
 
    popup.c for the Openbox window manager
-   Copyright (c) 2003        Ben Jansens
+   Copyright (c) 2006        Mikael Magnusson
+   Copyright (c) 2003-2007   Dana 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
@@ -22,10 +23,24 @@
 #include "frame.h"
 #include "client.h"
 #include "stacking.h"
+#include "event.h"
 #include "screen.h"
+#include "mainloop.h"
 #include "render/render.h"
 #include "render/theme.h"
 
+static gboolean popup_show_timeout(gpointer data)
+{
+    ObPopup *self = data;
+    
+    XMapWindow(ob_display, self->bg);
+    stacking_raise(INTERNAL_AS_WINDOW(self));
+    self->mapped = TRUE;
+    self->delay_mapped = FALSE;
+
+    return FALSE; /* don't repeat */
+}
+
 ObPopup *popup_new(gboolean hasicon)
 {
     XSetWindowAttributes attrib;
@@ -35,8 +50,8 @@ ObPopup *popup_new(gboolean hasicon)
     self->hasicon = hasicon;
     self->gravity = NorthWestGravity;
     self->x = self->y = self->w = self->h = 0;
-    self->a_bg = RrAppearanceCopy(ob_rr_theme->app_hilite_bg);
-    self->a_text = RrAppearanceCopy(ob_rr_theme->app_hilite_label);
+    self->a_bg = RrAppearanceCopy(ob_rr_theme->osd_hilite_bg);
+    self->a_text = RrAppearanceCopy(ob_rr_theme->osd_hilite_label);
 
     attrib.override_redirect = True;
     self->bg = XCreateWindow(ob_display, RootWindow(ob_display, ob_screen),
@@ -73,25 +88,43 @@ void popup_position(ObPopup *self, gint gravity, gint x, gint y)
     self->y = y;
 }
 
-void popup_size(ObPopup *self, gint w, gint h)
+void popup_width(ObPopup *self, gint w)
 {
     self->w = w;
-    self->h = h;
+    self->maxw = w;
 }
 
-void popup_size_to_string(ObPopup *self, gchar *text)
+void popup_height(ObPopup *self, gint h)
 {
-    gint textw, texth;
-    gint iconw;
+    gint texth;
 
+    /* don't let the height be smaller than the text */
+    texth = RrMinHeight(self->a_text) + ob_rr_theme->paddingy * 2;
+    self->h = MAX(h, texth);
+}
+
+void popup_width_to_string(ObPopup *self, gchar *text, gint max)
+{
     self->a_text->texture[0].data.text.string = text;
-    RrMinsize(self->a_text, &textw, &texth);
-    /*XXX textw += ob_rr_theme->bevel * 2;*/
-    texth += ob_rr_theme->padding * 2;
+    self->w = RrMinWidth(self->a_text);
+    self->maxw = max;
+}
 
-    self->h = texth + ob_rr_theme->padding * 2;
-    iconw = (self->hasicon ? texth : 0);
-    self->w = textw + iconw + ob_rr_theme->padding * (self->hasicon ? 3 : 2);
+void popup_height_to_string(ObPopup *self, gchar *text)
+{
+    self->h = RrMinHeight(self->a_text) + ob_rr_theme->paddingy * 2;
+}
+
+void popup_width_to_strings(ObPopup *self, gchar **strings, gint num, gint max)
+{
+    gint i, maxw;
+
+    maxw = 0;
+    for (i = 0; i < num; ++i) {
+        popup_width_to_string(self, strings[i], max);
+        maxw = MAX(maxw, self->w);
+    }
+    self->w = maxw;
 }
 
 void popup_set_text_align(ObPopup *self, RrJustify align)
@@ -99,41 +132,46 @@ void popup_set_text_align(ObPopup *self, RrJustify align)
     self->a_text->texture[0].data.text.justify = align;
 }
 
-void popup_show(ObPopup *self, gchar *text)
+void popup_delay_show(ObPopup *self, gulong usec, gchar *text)
 {
     gint l, t, r, b;
     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);
 
-    XSetWindowBorderWidth(ob_display, self->bg, ob_rr_theme->bwidth);
-    XSetWindowBorder(ob_display, self->bg, ob_rr_theme->b_color->pixel);
+    XSetWindowBorderWidth(ob_display, self->bg, ob_rr_theme->fbwidth);
+    XSetWindowBorder(ob_display, self->bg, ob_rr_theme->frame_b_color->pixel);
 
     /* set up the textures */
     self->a_text->texture[0].data.text.string = text;
 
-    /* measure the shit out */
-    RrMinsize(self->a_text, &textw, &texth);
-    /*XXX textw += ob_rr_theme->padding * 2;*/
-    texth += ob_rr_theme->padding * 2;
+    /* measure the text out */
+    RrMinSize(self->a_text, &textw, &texth);
+    texth += ob_rr_theme->paddingy * 2;
 
     /* set the sizes up and reget the text sizes from the calculated
        outer sizes */
     if (self->h) {
         h = self->h;
-        texth = h - (t+b + ob_rr_theme->padding * 2);
+        texth = h - (t+b + ob_rr_theme->paddingy * 2);
     } else
-        h = t+b + texth + ob_rr_theme->padding * 2;
+        h = t+b + texth + ob_rr_theme->paddingy * 2;
     iconw = (self->hasicon ? texth : 0);
-    if (self->w) {
-        w = self->w;
-        textw = w - (l+r + iconw + ob_rr_theme->padding *
-                     (self->hasicon ? 3 : 2));
-    } else
-        w = l+r + textw + iconw + ob_rr_theme->padding *
-            (self->hasicon ? 3 : 2);
+    if (self->w)
+        textw = self->w;
+    w = l+r + textw + iconw + ob_rr_theme->paddingx *
+        (self->hasicon ? 3 : 2);
+    /* cap it at "maxw" */
+    w = MIN(w, self->maxw);
+
     /* sanity checks to avoid crashes! */
     if (w < 1) w = 1;
     if (h < 1) h = 1;
@@ -170,17 +208,20 @@ 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);
 
     self->a_text->surface.parent = self->a_bg;
     self->a_text->surface.parentx = l + iconw +
-        ob_rr_theme->padding * (self->hasicon ? 2 : 1);
-    self->a_text->surface.parenty = t + ob_rr_theme->padding;
+        ob_rr_theme->paddingx * (self->hasicon ? 2 : 1);
+    self->a_text->surface.parenty = t + ob_rr_theme->paddingy;
     XMoveResizeWindow(ob_display, self->text,
-                      l + iconw + ob_rr_theme->padding *
+                      l + iconw + ob_rr_theme->paddingx *
                       (self->hasicon ? 2 : 1),
-                      t + ob_rr_theme->padding, textw, texth);
+                      t + ob_rr_theme->paddingy, textw, texth);
 
     RrPaint(self->a_bg, self->bg, w, h);
     RrPaint(self->a_text, self->text, textw, texth);
@@ -188,14 +229,24 @@ void popup_show(ObPopup *self, gchar *text)
     if (self->hasicon) {
         if (iconw < 1) iconw = 1; /* sanity check for crashes */
         if (self->draw_icon)
-            self->draw_icon(l + ob_rr_theme->padding, t + ob_rr_theme->padding,
+            self->draw_icon(l + ob_rr_theme->paddingx,
+                            t + ob_rr_theme->paddingy,
                             iconw, texth, self->draw_icon_data);
     }
 
+    /* do the actual showing */
     if (!self->mapped) {
-        XMapWindow(ob_display, self->bg);
-        stacking_raise(INTERNAL_AS_WINDOW(self));
-        self->mapped = TRUE;
+        if (usec) {
+            /* don't kill previous show timers */
+            if (!self->delay_mapped) {
+                ob_main_loop_timeout_add(ob_main_loop, usec,
+                                         popup_show_timeout, self,
+                                         g_direct_equal, NULL);
+                self->delay_mapped = TRUE;
+            }
+        } else {
+            popup_show_timeout(self);
+        }
     }
 }
 
@@ -204,6 +255,12 @@ void popup_hide(ObPopup *self)
     if (self->mapped) {
         XUnmapWindow(ob_display, self->bg);
         self->mapped = FALSE;
+
+        /* kill enter events cause by this unmapping */
+        event_ignore_queued_enters();
+    } else if (self->delay_mapped) {
+        ob_main_loop_timeout_remove(ob_main_loop, popup_show_timeout);
+        self->delay_mapped = FALSE;
     }
 }
 
@@ -247,8 +304,8 @@ void icon_popup_free(ObIconPopup *self)
     }
 }
 
-void icon_popup_show(ObIconPopup *self,
-                     gchar *text, const ObClientIcon *icon)
+void icon_popup_delay_show(ObIconPopup *self, gulong usec,
+                           gchar *text, const ObClientIcon *icon)
 {
     if (icon) {
         self->a_icon->texture[0].type = RR_TEXTURE_RGBA;
@@ -258,7 +315,7 @@ void icon_popup_show(ObIconPopup *self,
     } else
         self->a_icon->texture[0].type = RR_TEXTURE_NONE;
 
-    popup_show(self->popup, text);
+    popup_delay_show(self->popup, usec, text);
 }
 
 static void pager_popup_draw_icon(gint px, gint py, gint w, gint h,
@@ -266,112 +323,109 @@ static void pager_popup_draw_icon(gint px, gint py, gint w, gint h,
 {
     ObPagerPopup *self = data;
     gint x, y;
-    guint i;
     guint rown, n;
     guint horz_inc;
     guint vert_inc;
     guint r, c;
     gint eachw, eachh;
 
-    eachw = (w - ob_rr_theme->bwidth -
-             (screen_desktop_layout.columns * ob_rr_theme->bwidth))
+    eachw = (w - ob_rr_theme->fbwidth -
+             (screen_desktop_layout.columns * ob_rr_theme->fbwidth))
         / screen_desktop_layout.columns;
-    eachh = (h - ob_rr_theme->bwidth -
-             (screen_desktop_layout.rows * ob_rr_theme->bwidth))
+    eachh = (h - ob_rr_theme->fbwidth -
+             (screen_desktop_layout.rows * ob_rr_theme->fbwidth))
         / screen_desktop_layout.rows;
     /* make them squares */
     eachw = eachh = MIN(eachw, eachh);
 
     /* center */
-    px += (w - (screen_desktop_layout.columns * (eachw + ob_rr_theme->bwidth) +
-                ob_rr_theme->bwidth)) / 2;
-    py += (h - (screen_desktop_layout.rows * (eachh + ob_rr_theme->bwidth) +
-                ob_rr_theme->bwidth)) / 2;
+    px += (w - (screen_desktop_layout.columns * (eachw + ob_rr_theme->fbwidth) +
+                ob_rr_theme->fbwidth)) / 2;
+    py += (h - (screen_desktop_layout.rows * (eachh + ob_rr_theme->fbwidth) +
+                ob_rr_theme->fbwidth)) / 2;
 
     if (eachw <= 0 || eachh <= 0)
         return;
 
-    switch (screen_desktop_layout.start_corner) {
-    case OB_CORNER_TOPLEFT:
-        n = 0;
-        switch (screen_desktop_layout.orientation) {
-        case OB_ORIENTATION_HORZ:
+    switch (screen_desktop_layout.orientation) {
+    case OB_ORIENTATION_HORZ:
+        switch (screen_desktop_layout.start_corner) {
+        case OB_CORNER_TOPLEFT:
+            n = 0;
             horz_inc = 1;
             vert_inc = screen_desktop_layout.columns;
             break;
-        case OB_ORIENTATION_VERT:
-            horz_inc = screen_desktop_layout.rows;
-            vert_inc = 1;
-            break;
-        }
-        break;
-    case OB_CORNER_TOPRIGHT:
-        n = screen_desktop_layout.columns;
-        switch (screen_desktop_layout.orientation) {
-        case OB_ORIENTATION_HORZ:
+        case OB_CORNER_TOPRIGHT:
+            n = screen_desktop_layout.columns - 1;
             horz_inc = -1;
             vert_inc = screen_desktop_layout.columns;
             break;
-        case OB_ORIENTATION_VERT:
-            horz_inc = -screen_desktop_layout.rows;
-            vert_inc = 1;
+        case OB_CORNER_BOTTOMRIGHT:
+            n = screen_desktop_layout.rows * screen_desktop_layout.columns - 1;
+            horz_inc = -1;
+            vert_inc = -screen_desktop_layout.columns;
             break;
-        }
-        break;
-    case OB_CORNER_BOTTOMLEFT:
-        n = screen_desktop_layout.rows;
-        switch (screen_desktop_layout.orientation) {
-        case OB_ORIENTATION_HORZ:
+        case OB_CORNER_BOTTOMLEFT:
+            n = (screen_desktop_layout.rows - 1)
+                * screen_desktop_layout.columns;
             horz_inc = 1;
             vert_inc = -screen_desktop_layout.columns;
             break;
-        case OB_ORIENTATION_VERT:
-            horz_inc = screen_desktop_layout.rows;
-            vert_inc = -1;
-            break;
+        default:
+            g_assert_not_reached();
         }
         break;
-    case OB_CORNER_BOTTOMRIGHT:
-        n = MAX(self->desks,
-                screen_desktop_layout.rows * screen_desktop_layout.columns);
-        switch (screen_desktop_layout.orientation) {
-        case OB_ORIENTATION_HORZ:
-            horz_inc = -1;
-            vert_inc = -screen_desktop_layout.columns;
+    case OB_ORIENTATION_VERT:
+        switch (screen_desktop_layout.start_corner) {
+        case OB_CORNER_TOPLEFT:
+            n = 0;
+            horz_inc = screen_desktop_layout.rows;
+            vert_inc = 1;
+            break;
+        case OB_CORNER_TOPRIGHT:
+            n = screen_desktop_layout.rows
+                * (screen_desktop_layout.columns - 1);
+            horz_inc = -screen_desktop_layout.rows;
+            vert_inc = 1;
             break;
-        case OB_ORIENTATION_VERT:
+        case OB_CORNER_BOTTOMRIGHT:
+            n = screen_desktop_layout.rows * screen_desktop_layout.columns - 1;
             horz_inc = -screen_desktop_layout.rows;
             vert_inc = -1;
             break;
+        case OB_CORNER_BOTTOMLEFT:
+            n = screen_desktop_layout.rows - 1;
+            horz_inc = screen_desktop_layout.rows;
+            vert_inc = -1;
+            break;
+        default:
+            g_assert_not_reached();
         }
         break;
+    default:
+        g_assert_not_reached();
     }
 
     rown = n;
-    i = 0;
     for (r = 0, y = 0; r < screen_desktop_layout.rows;
-         ++r, y += eachh + ob_rr_theme->bwidth)
+         ++r, y += eachh + ob_rr_theme->fbwidth)
     {
         for (c = 0, x = 0; c < screen_desktop_layout.columns;
-             ++c, x += eachw + ob_rr_theme->bwidth)
+             ++c, x += eachw + ob_rr_theme->fbwidth)
         {
             RrAppearance *a;
 
-            if (i >= self->desks)
-                break;
-
-            a = (n == self->curdesk ? self->hilight : self->unhilight);
-
-            a->surface.parent = self->popup->a_bg;
-            a->surface.parentx = x + px;
-            a->surface.parenty = y + py;
-            XMoveResizeWindow(ob_display, self->wins[i],
-                              x + px, y + py, eachw, eachh);
-            RrPaint(a, self->wins[i], eachw, eachh);
+            if (n < self->desks) {
+                a = (n == self->curdesk ? self->hilight : self->unhilight);
 
+                a->surface.parent = self->popup->a_bg;
+                a->surface.parentx = x + px;
+                a->surface.parenty = y + py;
+                XMoveResizeWindow(ob_display, self->wins[n],
+                                  x + px, y + py, eachw, eachh);
+                RrPaint(a, self->wins[n], eachw, eachh);
+            }
             n += horz_inc;
-
-            ++i;
         }
         n = rown += vert_inc;
     }
@@ -386,9 +440,10 @@ ObPagerPopup *pager_popup_new()
 
     self->desks = 0;
     self->wins = g_new(Window, self->desks);
-    self->hilight = RrAppearanceCopy(ob_rr_theme->app_hilite_fg);
-    self->unhilight = RrAppearanceCopy(ob_rr_theme->app_unhilite_fg);
+    self->hilight = RrAppearanceCopy(ob_rr_theme->osd_hilite_fg);
+    self->unhilight = RrAppearanceCopy(ob_rr_theme->osd_unhilite_fg);
 
+    self->popup->hasicon = TRUE;
     self->popup->draw_icon = pager_popup_draw_icon;
     self->popup->draw_icon_data = self;
 
@@ -410,7 +465,8 @@ void pager_popup_free(ObPagerPopup *self)
     }
 }
 
-void pager_popup_show(ObPagerPopup *self, gchar *text, guint desk)
+void pager_popup_delay_show(ObPagerPopup *self, gulong usec,
+                            gchar *text, guint desk)
 {
     guint i;
 
@@ -425,9 +481,9 @@ void pager_popup_show(ObPagerPopup *self, gchar *text, guint desk)
         for (i = self->desks; i < screen_num_desktops; ++i) {
             XSetWindowAttributes attr;
 
-            attr.border_pixel = RrColorPixel(ob_rr_theme->b_color);
+            attr.border_pixel = RrColorPixel(ob_rr_theme->frame_b_color);
             self->wins[i] = XCreateWindow(ob_display, self->popup->bg,
-                                          0, 0, 1, 1, ob_rr_theme->bwidth,
+                                          0, 0, 1, 1, ob_rr_theme->fbwidth,
                                           RrDepth(ob_rr_inst), InputOutput,
                                           RrVisual(ob_rr_inst), CWBorderPixel,
                                           &attr);
@@ -437,5 +493,5 @@ void pager_popup_show(ObPagerPopup *self, gchar *text, guint desk)
     self->desks = screen_num_desktops;
     self->curdesk = desk;
 
-    popup_show(self->popup, text);
+    popup_delay_show(self->popup, usec, text);
 }