X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Ffocus_cycle_popup.c;h=532de4ba2775afdf4c1d9faa8bbe8864607ad9b3;hb=3592046b2b26e05ee94c0dd0fed5b7fd5475c198;hp=581fa21587b33223a647eb0a91d3f6491cd55dca;hpb=8f2e3f5fe16aeb0324aa5ee2b2c30a83ec724ad0;p=chaz%2Fopenbox

diff --git a/openbox/focus_cycle_popup.c b/openbox/focus_cycle_popup.c
index 581fa215..532de4ba 100644
--- a/openbox/focus_cycle_popup.c
+++ b/openbox/focus_cycle_popup.c
@@ -30,9 +30,11 @@
 #include <X11/Xlib.h>
 #include <glib.h>
 
-#define ICON_SIZE 40
-#define ICON_HILITE_WIDTH 2
-#define ICON_HILITE_MARGIN 1
+#define HILITE_SIZE 40
+#define HILITE_WIDTH 2
+#define HILITE_MARGIN 1
+#define HILITE_OFFSET (HILITE_WIDTH + HILITE_MARGIN)
+#define ICON_SIZE (HILITE_SIZE - 2*HILITE_OFFSET)
 #define OUTSIDE_BORDER 3
 #define TEXT_BORDER 2
 
@@ -43,7 +45,8 @@ struct _ObFocusCyclePopupTarget
 {
     ObClient *client;
     gchar *text;
-    Window win;
+    Window iconwin;
+    Window textwin;
 };
 
 struct _ObFocusCyclePopup
@@ -51,8 +54,6 @@ struct _ObFocusCyclePopup
     ObWindow obwin;
     Window bg;
 
-    Window text;
-
     GList *targets;
     gint n_targets;
 
@@ -64,8 +65,6 @@ struct _ObFocusCyclePopup
     RrAppearance *a_text;
     RrAppearance *a_icon;
 
-    RrPixel32 *hilite_rgba;
-
     gboolean mapped;
 };
 
@@ -87,7 +86,7 @@ static void   popup_render   (ObFocusCyclePopup *p,
 static Window create_window(Window parent, guint bwidth, gulong mask,
                             XSetWindowAttributes *attr)
 {
-    return XCreateWindow(ob_display, parent, 0, 0, 1, 1, bwidth,
+    return XCreateWindow(obt_display, parent, 0, 0, 1, 1, bwidth,
                          RrDepth(ob_rr_inst), InputOutput,
                          RrVisual(ob_rr_inst), mask, attr);
 }
@@ -95,60 +94,91 @@ static Window create_window(Window parent, guint bwidth, gulong mask,
 void focus_cycle_popup_startup(gboolean reconfig)
 {
     XSetWindowAttributes attrib;
+    RrPixel32 *p;
 
-    single_popup = icon_popup_new(TRUE);
+    single_popup = icon_popup_new();
 
-    popup.obwin.type = Window_Internal;
+    popup.obwin.type = OB_WINDOW_CLASS_INTERNAL;
     popup.a_bg = RrAppearanceCopy(ob_rr_theme->osd_hilite_bg);
     popup.a_text = RrAppearanceCopy(ob_rr_theme->osd_hilite_label);
-    popup.a_icon = RrAppearanceCopy(ob_rr_theme->a_clear_tex);
+    popup.a_icon = RrAppearanceCopy(ob_rr_theme->a_clear);
 
     popup.a_text->surface.parent = popup.a_bg;
     popup.a_icon->surface.parent = popup.a_bg;
 
-    popup.a_icon->texture[0].type = RR_TEXTURE_RGBA;
+    RrAppearanceAddTextures(popup.a_icon, 2);
 
-    RrAppearanceAddTextures(popup.a_bg, 1);
-    popup.a_bg->texture[0].type = RR_TEXTURE_RGBA;
+    popup.a_icon->texture[0].type = RR_TEXTURE_RGBA;
 
     attrib.override_redirect = True;
     attrib.border_pixel=RrColorPixel(ob_rr_theme->osd_border_color);
-    popup.bg = create_window(RootWindow(ob_display, ob_screen),
-                             ob_rr_theme->obwidth,
+    popup.bg = create_window(obt_root(ob_screen), ob_rr_theme->obwidth,
                              CWOverrideRedirect | CWBorderPixel, &attrib);
 
-    popup.text = create_window(popup.bg, 0, 0, NULL);
-
     popup.targets = NULL;
     popup.n_targets = 0;
     popup.last_target = NULL;
 
-    popup.hilite_rgba = NULL;
+    /* set up the hilite texture for the icon */
+    popup.a_icon->texture[1].data.rgba.width = HILITE_SIZE;
+    popup.a_icon->texture[1].data.rgba.height = HILITE_SIZE;
+    popup.a_icon->texture[1].data.rgba.alpha = 0xff;
+    p = g_new(RrPixel32, HILITE_SIZE * HILITE_SIZE);
+    popup.a_icon->texture[1].data.rgba.data = p;
+
+    /* create the hilite under the target icon */
+    {
+        RrPixel32 color;
+        gint x, y, o;
+
+        color = ((ob_rr_theme->osd_color->r & 0xff) << RrDefaultRedOffset) +
+            ((ob_rr_theme->osd_color->g & 0xff) << RrDefaultGreenOffset) +
+            ((ob_rr_theme->osd_color->b & 0xff) << RrDefaultBlueOffset);
+
+        o = 0;
+        for (x = 0; x < HILITE_SIZE; x++)
+            for (y = 0; y < HILITE_SIZE; y++) {
+                guchar a;
+
+                if (x < HILITE_WIDTH ||
+                    x >= HILITE_SIZE - HILITE_WIDTH ||
+                    y < HILITE_WIDTH ||
+                    y >= HILITE_SIZE - HILITE_WIDTH)
+                {
+                    /* the border of the target */
+                    a = 0x88;
+                }
+                else {
+                    /* the background of the target */
+                    a = 0x22;
+                }
 
-    XMapWindow(ob_display, popup.text);
+                p[o++] = color + (a << RrDefaultAlphaOffset);
+            }
+    }
 
     stacking_add(INTERNAL_AS_WINDOW(&popup));
+    window_add(&popup.bg, INTERNAL_AS_WINDOW(&popup));
 }
 
 void focus_cycle_popup_shutdown(gboolean reconfig)
 {
     icon_popup_free(single_popup);
 
+    window_remove(popup.bg);
     stacking_remove(INTERNAL_AS_WINDOW(&popup));
 
     while(popup.targets) {
         ObFocusCyclePopupTarget *t = popup.targets->data;
 
         g_free(t->text);
-        XDestroyWindow(ob_display, t->win);
+        XDestroyWindow(obt_display, t->iconwin);
+        XDestroyWindow(obt_display, t->textwin);
 
         popup.targets = g_list_delete_link(popup.targets, popup.targets);
     }
 
-    g_free(popup.hilite_rgba);
-
-    XDestroyWindow(ob_display, popup.text);
-    XDestroyWindow(ob_display, popup.bg);
+    XDestroyWindow(obt_display, popup.bg);
 
     RrAppearanceFree(popup.a_icon);
     RrAppearanceFree(popup.a_text);
@@ -174,7 +204,7 @@ static void popup_setup(ObFocusCyclePopup *p, gboolean create_targets,
     for (it = g_list_last(focus_order); it; it = g_list_previous(it)) {
         ObClient *ft = it->data;
 
-        if (focus_valid_target(ft,
+        if (focus_valid_target(ft, TRUE,
                                iconic_windows,
                                all_desktops,
                                dock_windows,
@@ -193,9 +223,11 @@ static void popup_setup(ObFocusCyclePopup *p, gboolean create_targets,
 
                 t->client = ft;
                 t->text = text;
-                t->win = create_window(p->bg, 0, 0, NULL);
+                t->iconwin = create_window(p->bg, 0, 0, NULL);
+                t->textwin = create_window(p->bg, 0, 0, NULL);
 
-                XMapWindow(ob_display, t->win);
+                XMapWindow(obt_display, t->iconwin);
+                XMapWindow(obt_display, t->textwin);
 
                 p->targets = g_list_prepend(p->targets, t);
                 ++n;
@@ -240,18 +272,13 @@ static void popup_render(ObFocusCyclePopup *p, const ObClient *c)
     gint l, t, r, b;
     gint x, y, w, h;
     Rect *screen_area = NULL;
-    gint icons_per_row;
-    gint icon_rows;
-    gint textx, texty, textw, texth;
     gint rgbax, rgbay, rgbaw, rgbah;
-    gint icons_center_x;
-    gint innerw, innerh;
     gint i;
     GList *it;
     const ObFocusCyclePopupTarget *newtarget;
     gint newtargetx, newtargety;
 
-    screen_area = screen_physical_area_monitor_active();
+    screen_area = screen_physical_area_active();
 
     /* get the outside margins */
     RrMargins(p->a_bg, &ml, &mt, &mr, &mb);
@@ -262,33 +289,14 @@ static void popup_render(ObFocusCyclePopup *p, const ObClient *c)
     t = mt + OUTSIDE_BORDER;
     b = mb + OUTSIDE_BORDER;
 
-    /* get the icon pictures' sizes */
-    innerw = ICON_SIZE - (ICON_HILITE_WIDTH + ICON_HILITE_MARGIN) * 2;
-    innerh = ICON_SIZE - (ICON_HILITE_WIDTH + ICON_HILITE_MARGIN) * 2;
-
     /* get the width from the text and keep it within limits */
     w = l + r + p->maxtextw;
     w = MIN(w, MAX(screen_area->width/3, POPUP_WIDTH)); /* max width */
     w = MAX(w, POPUP_WIDTH); /* min width */
 
-    /* how many icons will fit in that row? make the width fit that */
-    w -= l + r;
-    icons_per_row = (w + ICON_SIZE - 1) / ICON_SIZE;
-    w = icons_per_row * ICON_SIZE + l + r;
-
-    /* how many rows do we need? */
-    icon_rows = (p->n_targets-1) / icons_per_row + 1;
-
-    /* get the text dimensions */
-    textw = w - l - r;
-    texth = RrMinHeight(p->a_text) + TEXT_BORDER * 2;
-
     /* find the height of the dialog */
-    h = t + b + (icon_rows * ICON_SIZE) + (OUTSIDE_BORDER + texth);
-
-    /* get the position of the text */
-    textx = l;
-    texty = h - texth - b;
+#warning limit the height and scroll entries somehow
+    h = t + b + (p->n_targets * HILITE_SIZE);
 
     /* find the position for the popup (include the outer borders) */
     x = screen_area->x + (screen_area->width -
@@ -302,40 +310,20 @@ static void popup_render(ObFocusCyclePopup *p, const ObClient *c)
     rgbaw = w - ml - mr;
     rgbah = h - mt - mb;
 
-    /* center the icons if there is less than one row */
-    if (icon_rows == 1)
-        icons_center_x = (w - p->n_targets * ICON_SIZE) / 2;
-    else
-        icons_center_x = 0;
-
     if (!p->mapped) {
         /* position the background but don't draw it*/
-        XMoveResizeWindow(ob_display, p->bg, x, y, w, h);
-
-        /* set up the hilite texture for the background */
-        p->a_bg->texture[0].data.rgba.width = rgbaw;
-        p->a_bg->texture[0].data.rgba.height = rgbah;
-        p->a_bg->texture[0].data.rgba.alpha = 0xff;
-        p->hilite_rgba = g_new(RrPixel32, rgbaw * rgbah);
-        p->a_bg->texture[0].data.rgba.data = p->hilite_rgba;
-
-        /* position the text, but don't draw it */
-        XMoveResizeWindow(ob_display, p->text, textx, texty, textw, texth);
-        p->a_text->surface.parentx = textx;
-        p->a_text->surface.parenty = texty;
+        XMoveResizeWindow(obt_display, p->bg, x, y, w, h);
     }
 
     /* find the focused target */
     for (i = 0, it = p->targets; it; ++i, it = g_list_next(it)) {
         const ObFocusCyclePopupTarget *target = it->data;
-        const gint row = i / icons_per_row; /* starting from 0 */
-        const gint col = i % icons_per_row; /* starting from 0 */
 
         if (target->client == c) {
             /* save the target */
             newtarget = target;
-            newtargetx = icons_center_x + l + (col * ICON_SIZE);
-            newtargety = t + (row * ICON_SIZE);
+            newtargetx = l;
+            newtargety = t + i * HILITE_SIZE;
 
             if (!p->mapped)
                 break; /* if we're not dimensioning, then we're done */
@@ -344,95 +332,75 @@ static void popup_render(ObFocusCyclePopup *p, const ObClient *c)
 
     g_assert(newtarget != NULL);
 
-    /* create the hilite under the target icon */
-    {
-        RrPixel32 color;
-        gint i, j, o;
-
-        color = ((ob_rr_theme->osd_color->r & 0xff) << RrDefaultRedOffset) +
-            ((ob_rr_theme->osd_color->g & 0xff) << RrDefaultGreenOffset) +
-            ((ob_rr_theme->osd_color->b & 0xff) << RrDefaultBlueOffset);
-
-        o = 0;
-        for (i = 0; i < rgbah; ++i)
-            for (j = 0; j < rgbaw; ++j) {
-                guchar a;
-                const gint x = j + rgbax - newtargetx;
-                const gint y = i + rgbay - newtargety;
-
-                if (x < 0 || x >= ICON_SIZE ||
-                    y < 0 || y >= ICON_SIZE)
-                {
-                    /* outside the target */
-                    a = 0x00;
-                }
-                else if (x < ICON_HILITE_WIDTH ||
-                         x >= ICON_SIZE - ICON_HILITE_WIDTH ||
-                         y < ICON_HILITE_WIDTH ||
-                         y >= ICON_SIZE - ICON_HILITE_WIDTH)
-                {
-                    /* the border of the target */
-                    a = 0x88;
-                }
-                else {
-                    /* the background of the target */
-                    a = 0x22;
-                }
-
-                p->hilite_rgba[o++] =
-                    color + (a << RrDefaultAlphaOffset);
-            }
-    }
-
     /* * * draw everything * * */
 
     /* draw the background */
-    RrPaint(p->a_bg, p->bg, w, h);
+    if (!p->mapped)
+        RrPaint(p->a_bg, p->bg, w, h);
 
-    /* draw the icons */
+    /* draw the icons and text */
     for (i = 0, it = p->targets; it; ++i, it = g_list_next(it)) {
         const ObFocusCyclePopupTarget *target = it->data;
 
-        /* have to redraw the targetted icon and last targetted icon,
-           they can pick up the hilite changes in the backgroud */
+        /* have to redraw the targetted icon and last targetted icon
+         * to update the hilite */
         if (!p->mapped || newtarget == target || p->last_target == target) {
             const ObClientIcon *icon;
-            const gint row = i / icons_per_row; /* starting from 0 */
-            const gint col = i % icons_per_row; /* starting from 0 */
-            gint innerx, innery;
+            gint innerx, innery, textx, texty;
+            gint textw /* texth = ICON_SIZE */;
 
             /* find the dimensions of the icon inside it */
-            innerx = icons_center_x + l + (col * ICON_SIZE);
-            innerx += ICON_HILITE_WIDTH + ICON_HILITE_MARGIN;
-            innery = t + (row * ICON_SIZE);
-            innery += ICON_HILITE_WIDTH + ICON_HILITE_MARGIN;
+            innerx = l;
+            innery = t + i * HILITE_SIZE;
+
+            /* find the dimensions of the text box */
+            textx = innerx + HILITE_SIZE + TEXT_BORDER;
+            texty = innery + HILITE_OFFSET;
+            textw = w
+                    /* left edge */  - innerx - HILITE_SIZE - TEXT_BORDER
+                    /* right edge */ - OUTSIDE_BORDER - TEXT_BORDER;
 
             /* move the icon */
-            XMoveResizeWindow(ob_display, target->win,
-                              innerx, innery, innerw, innerh);
+            XMoveResizeWindow(obt_display, target->iconwin,
+                              innerx, innery, HILITE_SIZE, HILITE_SIZE);
+
+            /* move the text */
+            XMoveResizeWindow(obt_display, target->textwin,
+                              textx, texty,
+                              textw, ICON_SIZE);
 
             /* get the icon from the client */
-            icon = client_icon(target->client, innerw, innerh);
+            icon = client_icon(target->client, ICON_SIZE, ICON_SIZE);
             p->a_icon->texture[0].data.rgba.width = icon->width;
             p->a_icon->texture[0].data.rgba.height = icon->height;
+            p->a_icon->texture[0].data.rgba.twidth = ICON_SIZE;
+            p->a_icon->texture[0].data.rgba.theight = ICON_SIZE;
+            p->a_icon->texture[0].data.rgba.tx = HILITE_OFFSET;
+            p->a_icon->texture[0].data.rgba.ty = HILITE_OFFSET;
             p->a_icon->texture[0].data.rgba.alpha =
                 target->client->iconic ? OB_ICONIC_ALPHA : 0xff;
             p->a_icon->texture[0].data.rgba.data = icon->data;
 
+            /* Draw the hilite? */
+            p->a_icon->texture[1].type = (target == newtarget) ?
+                                         RR_TEXTURE_RGBA : RR_TEXTURE_NONE;
+
             /* draw the icon */
             p->a_icon->surface.parentx = innerx;
             p->a_icon->surface.parenty = innery;
-            RrPaint(p->a_icon, target->win, innerw, innerh);
+            RrPaint(p->a_icon, target->iconwin, HILITE_SIZE, HILITE_SIZE);
+
+            /* draw the text */
+            p->a_text->texture[0].data.text.string = target->text;
+            p->a_text->surface.parentx = textx;
+            p->a_text->surface.parenty = texty;
+            RrPaint(p->a_text, target->textwin, textw, ICON_SIZE);
         }
     }
 
-    /* draw the text */
-    p->a_text->texture[0].data.text.string = newtarget->text;
-    p->a_text->surface.parentx = textx;
-    p->a_text->surface.parenty = texty;
-    RrPaint(p->a_text, p->text, textw, texth);
-
     p->last_target = newtarget;
+
+    g_free(screen_area);
 }
 
 void focus_cycle_popup_show(ObClient *c, gboolean iconic_windows,
@@ -451,20 +419,21 @@ void focus_cycle_popup_show(ObClient *c, gboolean iconic_windows,
 
     if (!popup.mapped) {
         /* show the dialog */
-        XMapWindow(ob_display, popup.bg);
-        XFlush(ob_display);
+        XMapWindow(obt_display, popup.bg);
+        XFlush(obt_display);
         popup.mapped = TRUE;
+        screen_hide_desktop_popup();
     }
 }
 
-void focus_cycle_popup_hide()
+void focus_cycle_popup_hide(void)
 {
     gulong ignore_start;
 
     ignore_start = event_start_ignore_all_enters();
 
-    XUnmapWindow(ob_display, popup.bg);
-    XFlush(ob_display);
+    XUnmapWindow(obt_display, popup.bg);
+    XFlush(obt_display);
 
     event_end_ignore_all_enters(ignore_start);
 
@@ -474,15 +443,14 @@ void focus_cycle_popup_hide()
         ObFocusCyclePopupTarget *t = popup.targets->data;
 
         g_free(t->text);
-        XDestroyWindow(ob_display, t->win);
+        XDestroyWindow(obt_display, t->iconwin);
+        XDestroyWindow(obt_display, t->textwin);
+        g_free(t);
 
         popup.targets = g_list_delete_link(popup.targets, popup.targets);
     }
     popup.n_targets = 0;
     popup.last_target = NULL;
-
-    g_free(popup.hilite_rgba);
-    popup.hilite_rgba = NULL;
 }
 
 void focus_cycle_popup_single_show(struct _ObClient *c,
@@ -504,21 +472,24 @@ void focus_cycle_popup_single_show(struct _ObClient *c,
         g_assert(popup.targets == NULL);
 
         /* position the popup */
-        a = screen_physical_area_monitor_active();
+        a = screen_physical_area_active();
         icon_popup_position(single_popup, CenterGravity,
                             a->x + a->width / 2, a->y + a->height / 2);
         icon_popup_height(single_popup, POPUP_HEIGHT);
         icon_popup_min_width(single_popup, POPUP_WIDTH);
         icon_popup_max_width(single_popup, MAX(a->width/3, POPUP_WIDTH));
         icon_popup_text_width(single_popup, popup.maxtextw);
+        g_free(a);
     }
 
     text = popup_get_name(c);
-    icon_popup_show(single_popup, text, client_icon(c, ICON_SIZE, ICON_SIZE));
+    icon_popup_show(single_popup, text, client_icon(c, HILITE_SIZE,
+                                                    HILITE_SIZE));
     g_free(text);
+    screen_hide_desktop_popup();
 }
 
-void focus_cycle_popup_single_hide()
+void focus_cycle_popup_single_hide(void)
 {
     icon_popup_hide(single_popup);
 }