X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Ffocus_cycle_popup.c;h=c7921fa991db3b09db6e1618fd1444e7083d6e4f;hb=a170ad7c85b5f23fafe64d28a3f183a7ce42ce53;hp=77a6d2153ebb898e49ac0cb1ee88ec1130ba4b6a;hpb=930d7a33ad5da28884d8824cccb18a9de0eb2db3;p=chaz%2Fopenbox

diff --git a/openbox/focus_cycle_popup.c b/openbox/focus_cycle_popup.c
index 77a6d215..c7921fa9 100644
--- a/openbox/focus_cycle_popup.c
+++ b/openbox/focus_cycle_popup.c
@@ -23,6 +23,7 @@
 #include "screen.h"
 #include "focus.h"
 #include "openbox.h"
+#include "config.h"
 #include "window.h"
 #include "event.h"
 #include "render/render.h"
@@ -30,16 +31,16 @@
 #include <X11/Xlib.h>
 #include <glib.h>
 
+/* Size of the icons, which can appear inside or outside of a hilite box */
+#define ICON_SIZE config_theme_window_list_icon_size
 /* Size of the hilite box around a window's icon */
-#define HILITE_SIZE 40
+#define HILITE_SIZE (ICON_SIZE + 2*HILITE_OFFSET)
 /* Width of the outer ring around the hilite box */
 #define HILITE_WIDTH 2
 /* Space between the outer ring around the hilite box and the icon inside it */
 #define HILITE_MARGIN 1
 /* Total distance from the edge of the hilite box to the icon inside it */
 #define HILITE_OFFSET (HILITE_WIDTH + HILITE_MARGIN)
-/* Size of the icons, which can appear inside or outside of a hilite box */
-#define ICON_SIZE (HILITE_SIZE - 2*HILITE_OFFSET)
 /* Margin area around the outside of the dialog */
 #define OUTSIDE_BORDER 3
 /* Margin area around the text */
@@ -54,6 +55,7 @@ typedef struct _ObFocusCyclePopupTarget ObFocusCyclePopupTarget;
 struct _ObFocusCyclePopupTarget
 {
     ObClient *client;
+    RrImage *icon;
     gchar *text;
     Window iconwin;
     /* This is used when the popup is in list mode */
@@ -139,8 +141,10 @@ void focus_cycle_popup_startup(gboolean reconfig)
        may or may not be used */
     RrAppearanceAddTextures(popup.a_icon, 2);
 
-    popup.a_icon->texture[0].type = RR_TEXTURE_RGBA;
+    RrAppearanceClearTextures(popup.a_icon);
+    popup.a_icon->texture[0].type = RR_TEXTURE_IMAGE;
 
+    RrAppearanceClearTextures(popup.a_arrow);
     popup.a_arrow->texture[0].type = RR_TEXTURE_MASK;
     popup.a_arrow->texture[0].data.mask.color =
         ob_rr_theme->osd_color;
@@ -212,9 +216,11 @@ void focus_cycle_popup_shutdown(gboolean reconfig)
     while(popup.targets) {
         ObFocusCyclePopupTarget *t = popup.targets->data;
 
+        RrImageUnref(t->icon);
         g_free(t->text);
         XDestroyWindow(obt_display, t->iconwin);
         XDestroyWindow(obt_display, t->textwin);
+        g_free(t);
 
         popup.targets = g_list_delete_link(popup.targets, popup.targets);
     }
@@ -272,6 +278,8 @@ static void popup_setup(ObFocusCyclePopup *p, gboolean create_targets,
 
                 t->client = ft;
                 t->text = text;
+                t->icon = client_icon(t->client);
+                RrImageRef(t->icon); /* own the icon so it won't go away */
                 t->iconwin = create_window(p->bg, 0, 0, NULL);
                 t->textwin = create_window(p->bg, 0, 0, NULL);
 
@@ -337,6 +345,7 @@ static void popup_render(ObFocusCyclePopup *p, const ObClient *c)
     gint list_mode_icon_column_w = HILITE_SIZE + OUTSIDE_BORDER;
     gint up_arrow_x, down_arrow_x;
     gint up_arrow_y, down_arrow_y;
+    gboolean showing_arrows = FALSE;
 
     g_assert(p->mode == OB_FOCUS_CYCLE_POPUP_MODE_ICONS ||
              p->mode == OB_FOCUS_CYCLE_POPUP_MODE_LIST);
@@ -363,7 +372,7 @@ static void popup_render(ObFocusCyclePopup *p, const ObClient *c)
     /* get the text height */
     texth = RrMinHeight(p->a_hilite_text);
     if (p->mode == OB_FOCUS_CYCLE_POPUP_MODE_LIST)
-        texth = MAX(MAX(texth, RrMinHeight(p->a_text)), ICON_SIZE);
+        texth = MAX(MAX(texth, RrMinHeight(p->a_text)), HILITE_SIZE);
     else
         texth += TEXT_BORDER * 2;
 
@@ -393,18 +402,68 @@ static void popup_render(ObFocusCyclePopup *p, const ObClient *c)
         /* leave space on the side for the icons */
         textw -= list_mode_icon_column_w;
 
+    if (!p->mapped)
+        /* reset the scrolling when the dialog is first shown */
+        p->scroll = 0;
+
     /* find the height of the dialog */
     h = t + b + (icon_rows * MAX(HILITE_SIZE, texth));
     if (p->mode == OB_FOCUS_CYCLE_POPUP_MODE_ICONS)
         /* in icon mode the text sits below the icons, so make some space */
         h += OUTSIDE_BORDER + texth;
-    else
+
+    /* find the focused target */
+    newtarget = NULL;
+    for (i = 0, it = p->targets; it; ++i, it = g_list_next(it)) {
+        const ObFocusCyclePopupTarget *target = it->data;
+        if (target->client == c) {
+            /* save the target */
+            newtarget = target;
+            break;
+        }
+    }
+    selected_pos = i;
+    g_assert(newtarget != NULL);
+
+    /* scroll the list if needed */
+    last_scroll = p->scroll;
+    if (p->mode == OB_FOCUS_CYCLE_POPUP_MODE_LIST) {
+        const gint top = p->scroll + SCROLL_MARGIN;
+        const gint bottom = p->scroll + icon_rows - SCROLL_MARGIN;
+        const gint min_scroll = 0;
+        const gint max_scroll = p->n_targets - icon_rows;
+
+        if (top - selected_pos >= 0) {
+            p->scroll -= top - selected_pos + 1;
+            p->scroll = MAX(p->scroll, min_scroll);
+        } else if (selected_pos - bottom >= 0) {
+            p->scroll += selected_pos - bottom + 1;
+            p->scroll = MIN(p->scroll, max_scroll);
+        }
+    }
+
+    /* show the scroll arrows when appropriate */
+    if (p->scroll && p->mode == OB_FOCUS_CYCLE_POPUP_MODE_LIST) {
+        XMapWindow(obt_display, p->list_mode_up);
+        showing_arrows = TRUE;
+    } else
+        XUnmapWindow(obt_display, p->list_mode_up);
+
+    if (p->scroll < p->n_targets - icon_rows &&
+        p->mode == OB_FOCUS_CYCLE_POPUP_MODE_LIST)
+    {
+        XMapWindow(obt_display, p->list_mode_down);
+        showing_arrows = TRUE;
+    } else
+        XUnmapWindow(obt_display, p->list_mode_down);
+
+    /* make space for the arrows */
+    if (showing_arrows)
         h += ob_rr_theme->up_arrow_mask->height + OUTSIDE_BORDER
             + ob_rr_theme->down_arrow_mask->height + OUTSIDE_BORDER;
 
-
     /* center the icons if there is less than one row */
-    if (icon_rows == 1)
+    if (p->mode == OB_FOCUS_CYCLE_POPUP_MODE_ICONS && icon_rows == 1)
         icons_center_x = (w - p->n_targets * HILITE_SIZE) / 2;
     else
         icons_center_x = 0;
@@ -455,43 +514,8 @@ static void popup_render(ObFocusCyclePopup *p, const ObClient *c)
                               ob_rr_theme->down_arrow_mask->width,
                               ob_rr_theme->down_arrow_mask->height);
         }
-
-
-        /* reset the scrolling when the dialog is first shown */
-        p->scroll = 0;
-    }
-
-    /* find the focused target */
-    newtarget = NULL;
-    for (i = 0, it = p->targets; it; ++i, it = g_list_next(it)) {
-        const ObFocusCyclePopupTarget *target = it->data;
-        if (target->client == c) {
-            /* save the target */
-            newtarget = target;
-            break;
-        }
-    }
-    selected_pos = i;
-
-    /* scroll the list if needed */
-    last_scroll = p->scroll;
-    if (p->mode == OB_FOCUS_CYCLE_POPUP_MODE_LIST) {
-        const gint top = p->scroll + SCROLL_MARGIN;
-        const gint bottom = p->scroll + icon_rows - SCROLL_MARGIN;
-        const gint min_scroll = 0;
-        const gint max_scroll = p->n_targets - icon_rows;
-
-        if (top - selected_pos >= 0) {
-            p->scroll -= top - selected_pos + 1;
-            p->scroll = MAX(p->scroll, min_scroll);
-        } else if (selected_pos - bottom >= 0) {
-            p->scroll += selected_pos - bottom + 1;
-            p->scroll = MIN(p->scroll, max_scroll);
-        }
     }
 
-    g_assert(newtarget != NULL);
-
     /* * * draw everything * * */
 
     /* draw the background */
@@ -519,18 +543,6 @@ static void popup_render(ObFocusCyclePopup *p, const ObClient *c)
                 ob_rr_theme->down_arrow_mask->height);
     }
 
-    /* show the scroll arrows when appropriate */
-    if (p->scroll && p->mode == OB_FOCUS_CYCLE_POPUP_MODE_LIST)
-        XMapWindow(obt_display, p->list_mode_up);
-    else
-        XUnmapWindow(obt_display, p->list_mode_up);
-
-    if (p->scroll < p->n_targets - icon_rows &&
-        p->mode == OB_FOCUS_CYCLE_POPUP_MODE_LIST)
-        XMapWindow(obt_display, p->list_mode_down);
-    else
-        XUnmapWindow(obt_display, p->list_mode_down);
-
     /* draw the icons and text */
     for (i = 0, it = p->targets; it; ++i, it = g_list_next(it)) {
         const ObFocusCyclePopupTarget *target = it->data;
@@ -543,20 +555,21 @@ static void popup_render(ObFocusCyclePopup *p, const ObClient *c)
             /* row and column start from 0 */
             const gint row = i / icons_per_row - p->scroll;
             const gint col = i % icons_per_row;
-            const ObClientIcon *icon;
             gint iconx, icony;
             gint list_mode_textx, list_mode_texty;
             RrAppearance *text;
 
             /* find the coordinates for the icon */
             iconx = icons_center_x + l + (col * HILITE_SIZE);
-            icony = t + ob_rr_theme->up_arrow_mask->height + OUTSIDE_BORDER
+            icony = t + (showing_arrows ? ob_rr_theme->up_arrow_mask->height
+                                          + OUTSIDE_BORDER
+                         : 0)
                 + (row * MAX(texth, HILITE_SIZE))
                 + MAX(texth - HILITE_SIZE, 0) / 2;
 
             /* find the dimensions of the text box */
             list_mode_textx = iconx + HILITE_SIZE + TEXT_BORDER;
-            list_mode_texty = icony + HILITE_OFFSET;
+            list_mode_texty = icony;
 
             /* position the icon */
             XMoveResizeWindow(obt_display, target->iconwin,
@@ -584,16 +597,13 @@ static void popup_render(ObFocusCyclePopup *p, const ObClient *c)
             }
 
             /* get the icon from the client */
-            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 =
+            p->a_icon->texture[0].data.image.twidth = ICON_SIZE;
+            p->a_icon->texture[0].data.image.theight = ICON_SIZE;
+            p->a_icon->texture[0].data.image.tx = HILITE_OFFSET;
+            p->a_icon->texture[0].data.image.ty = HILITE_OFFSET;
+            p->a_icon->texture[0].data.image.alpha =
                 target->client->iconic ? OB_ICONIC_ALPHA : 0xff;
-            p->a_icon->texture[0].data.rgba.data = icon->data;
+            p->a_icon->texture[0].data.image.image = target->icon;
 
             /* Draw the hilite? */
             p->a_icon->texture[1].type = (target == newtarget) ?
@@ -679,6 +689,7 @@ void focus_cycle_popup_hide(void)
     while(popup.targets) {
         ObFocusCyclePopupTarget *t = popup.targets->data;
 
+        RrImageUnref(t->icon);
         g_free(t->text);
         XDestroyWindow(obt_display, t->iconwin);
         XDestroyWindow(obt_display, t->textwin);
@@ -720,8 +731,7 @@ void focus_cycle_popup_single_show(struct _ObClient *c,
     }
 
     text = popup_get_name(c);
-    icon_popup_show(single_popup, text, client_icon(c, HILITE_SIZE,
-                                                    HILITE_SIZE));
+    icon_popup_show(single_popup, text, client_icon(c));
     g_free(text);
     screen_hide_desktop_popup();
 }