X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Fpopup.c;h=e975294dfd59ba7574ebafaa2ed94c245955374f;hb=4d50b21835d7dd00ecc40efd64c5573d7e048500;hp=f20aa006170678be0160e921357dd4e2c568697e;hpb=bccb90b01da9d3f3b483e690444ebfbca914aa02;p=chaz%2Fopenbox

diff --git a/openbox/popup.c b/openbox/popup.c
index f20aa006..e975294d 100644
--- a/openbox/popup.c
+++ b/openbox/popup.c
@@ -1,146 +1,146 @@
+/* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*-
+
+   popup.c for the Openbox window manager
+   Copyright (c) 2006        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"
 #include "frame.h"
+#include "client.h"
+#include "stacking.h"
+#include "screen.h"
 #include "render/render.h"
 #include "render/theme.h"
 
-typedef struct Popup {
-    gboolean hasicon;
-    Window bg;
-    Window icon;
-    Window text;
-    Appearance *a_bg;
-    Appearance *a_icon;
-    Appearance *a_text;
-    int gravity;
-    int x;
-    int y;
-    int w;
-    int h;
-} Popup;
-
-Popup *popup_new(gboolean hasicon)
-{
-    Popup *self = g_new(Popup, 1);
+ObPopup *popup_new(gboolean hasicon)
+{
+    XSetWindowAttributes attrib;
+    ObPopup *self = g_new0(ObPopup, 1);
+
+    self->obwin.type = Window_Internal;
     self->hasicon = hasicon;
-    self->bg = None;
-    self->a_text = NULL;
     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);
+
+    attrib.override_redirect = True;
+    self->bg = XCreateWindow(ob_display, RootWindow(ob_display, ob_screen),
+                             0, 0, 1, 1, 0, RrDepth(ob_rr_inst),
+                             InputOutput, RrVisual(ob_rr_inst),
+                             CWOverrideRedirect, &attrib);
+    
+    self->text = XCreateWindow(ob_display, self->bg,
+                               0, 0, 1, 1, 0, RrDepth(ob_rr_inst),
+                               InputOutput, RrVisual(ob_rr_inst), 0, NULL);
+
+    XMapWindow(ob_display, self->text);
+
+    stacking_add(INTERNAL_AS_WINDOW(self));
     return self;
 }
 
-void popup_free(Popup *self)
+void popup_free(ObPopup *self)
 {
-    if (self->bg) {
+    if (self) {
         XDestroyWindow(ob_display, self->bg);
         XDestroyWindow(ob_display, self->text);
-        XDestroyWindow(ob_display, self->icon);
-        appearance_free(self->a_bg);
-        if (self->hasicon)
-            appearance_free(self->a_icon);
+        RrAppearanceFree(self->a_bg);
+        RrAppearanceFree(self->a_text);
+        stacking_remove(self);
+        g_free(self);
     }
-    if (self->a_text)
-        appearance_free(self->a_text);
-    g_free(self);
 }
 
-void popup_position(Popup *self, int gravity, int x, int y)
+void popup_position(ObPopup *self, gint gravity, gint x, gint y)
 {
     self->gravity = gravity;
     self->x = x;
     self->y = y;
 }
 
-void popup_size(Popup *self, int w, int h)
+void popup_size(ObPopup *self, gint w, gint h)
 {
     self->w = w;
     self->h = h;
 }
 
-void popup_size_to_string(Popup *self, char *text)
+void popup_size_to_string(ObPopup *self, gchar *text)
 {
-    int textw, texth;
-    int iconw;
-
-    if (!self->a_text)
-        self->a_text = appearance_copy(theme_app_hilite_label);
+    gint textw, texth;
+    gint iconw;
 
     self->a_text->texture[0].data.text.string = text;
-    appearance_minsize(self->a_text, &textw, &texth);
-    textw += theme_bevel * 2;
-    texth += theme_bevel * 2;
+    RrMinsize(self->a_text, &textw, &texth);
+    /*XXX textw += ob_rr_theme->bevel * 2;*/
+    texth += ob_rr_theme->padding * 2;
 
-    self->h = texth + theme_bevel * 2;
+    self->h = texth + ob_rr_theme->padding * 2;
     iconw = (self->hasicon ? texth : 0);
-    self->w = textw + iconw + theme_bevel * 3;
+    self->w = textw + iconw + ob_rr_theme->padding * (self->hasicon ? 3 : 2);
 }
 
-void popup_show(Popup *self, char *text, Icon *icon)
+void popup_set_text_align(ObPopup *self, RrJustify align)
 {
-    XSetWindowAttributes attrib;
-    int x, y, w, h;
-    int textw, texth;
-    int iconw;
-
-    /* create the shit if needed */
-    if (!self->bg) {
-        attrib.override_redirect = True;
-        self->bg = XCreateWindow(ob_display, ob_root,
-                                 0, 0, 1, 1, 0, render_depth, InputOutput,
-                                 render_visual, CWOverrideRedirect, &attrib);
-
-        XSetWindowBorderWidth(ob_display, self->bg, theme_bwidth);
-        XSetWindowBorder(ob_display, self->bg, theme_b_color->pixel);
-
-        self->text = XCreateWindow(ob_display, self->bg,
-                                   0, 0, 1, 1, 0, render_depth, InputOutput,
-                                   render_visual, 0, NULL);
-        if (self->hasicon)
-            self->icon = XCreateWindow(ob_display, self->bg,
-                                       0, 0, 1, 1, 0,
-                                       render_depth, InputOutput,
-                                       render_visual, 0, NULL);
-
-        XMapWindow(ob_display, self->text);
-        XMapWindow(ob_display, self->icon);
-
-        self->a_bg = appearance_copy(theme_app_hilite_bg);
-        if (self->hasicon)
-            self->a_icon = appearance_copy(theme_app_icon);
-    }
-    if (!self->a_text)
-        self->a_text = appearance_copy(theme_app_hilite_label);
+    self->a_text->texture[0].data.text.justify = align;
+}
+
+void popup_show(ObPopup *self, 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);
 
     /* set up the textures */
     self->a_text->texture[0].data.text.string = text;
-    if (self->hasicon) {
-        if (icon) {
-            self->a_icon->texture[0].type = RGBA;
-            self->a_icon->texture[0].data.rgba.width = icon->width;
-            self->a_icon->texture[0].data.rgba.height = icon->height;
-            self->a_icon->texture[0].data.rgba.data = icon->data;
-        } else
-            self->a_icon->texture[0].type = NoTexture;
-    }
 
     /* measure the shit out */
-    appearance_minsize(self->a_text, &textw, &texth);
-    textw += theme_bevel * 2;
-    texth += theme_bevel * 2;
+    RrMinsize(self->a_text, &textw, &texth);
+    /*XXX textw += ob_rr_theme->padding * 2;*/
+    texth += ob_rr_theme->padding * 2;
 
     /* set the sizes up and reget the text sizes from the calculated
        outer sizes */
     if (self->h) {
         h = self->h;
-        texth = h - (theme_bevel * 2);
+        texth = h - (t+b + ob_rr_theme->padding * 2);
     } else
-        h = texth + theme_bevel * 2;
+        h = t+b + texth + ob_rr_theme->padding * 2;
     iconw = (self->hasicon ? texth : 0);
     if (self->w) {
         w = self->w;
-        textw = w - (iconw + theme_bevel * 3);
+        textw = w - (l+r + iconw + ob_rr_theme->padding *
+                     (self->hasicon ? 3 : 2));
     } else
-        w = textw + iconw + theme_bevel * 3;
+        w = l+r + textw + iconw + ob_rr_theme->padding *
+            (self->hasicon ? 3 : 2);
     /* sanity checks to avoid crashes! */
     if (w < 1) w = 1;
     if (h < 1) h = 1;
@@ -177,39 +177,270 @@ void popup_show(Popup *self, char *text, Icon *icon)
         break;
     }
 
+    x=MAX(MIN(x, area->width-w),0);
+    y=MAX(MIN(y, area->height-h),0);
+
     /* set the windows/appearances up */
-    RECT_SET(self->a_bg->area, 0, 0, w, h);
     XMoveResizeWindow(ob_display, self->bg, x, y, w, h);
 
-    RECT_SET(self->a_text->area, 0, 0, textw, texth); 
-    RECT_SET(self->a_text->texture[0].position, theme_bevel, theme_bevel,
-             textw - theme_bevel * 2, texth - theme_bevel * 2);
-    self->a_text->surface.data.planar.parent = self->a_bg;
-    self->a_text->surface.data.planar.parentx = iconw + theme_bevel * 2;
-    self->a_text->surface.data.planar.parenty = theme_bevel;
+    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;
     XMoveResizeWindow(ob_display, self->text,
-                      iconw + theme_bevel * 2, theme_bevel, textw, texth);
+                      l + iconw + ob_rr_theme->padding *
+                      (self->hasicon ? 2 : 1),
+                      t + ob_rr_theme->padding, textw, texth);
+
+    RrPaint(self->a_bg, self->bg, w, h);
+    RrPaint(self->a_text, self->text, textw, texth);
 
     if (self->hasicon) {
         if (iconw < 1) iconw = 1; /* sanity check for crashes */
-        RECT_SET(self->a_icon->area, 0, 0, iconw, texth);
-        RECT_SET(self->a_icon->texture[0].position, 0, 0, iconw, texth);
-        self->a_icon->surface.data.planar.parent = self->a_bg;
-        self->a_icon->surface.data.planar.parentx = theme_bevel;
-        self->a_icon->surface.data.planar.parenty = theme_bevel;
-        XMoveResizeWindow(ob_display, self->icon,
-                          theme_bevel, theme_bevel, iconw, texth);
+        if (self->draw_icon)
+            self->draw_icon(l + ob_rr_theme->padding, t + ob_rr_theme->padding,
+                            iconw, texth, self->draw_icon_data);
+    }
+
+    if (!self->mapped) {
+        XMapWindow(ob_display, self->bg);
+        stacking_raise(INTERNAL_AS_WINDOW(self), FALSE);
+        self->mapped = TRUE;
+    }
+}
+
+void popup_hide(ObPopup *self)
+{
+    if (self->mapped) {
+        XUnmapWindow(ob_display, self->bg);
+        self->mapped = FALSE;
+    }
+}
+
+static void icon_popup_draw_icon(gint x, gint y, gint w, gint h, gpointer data)
+{
+    ObIconPopup *self = data;
+
+    self->a_icon->surface.parent = self->popup->a_bg;
+    self->a_icon->surface.parentx = x;
+    self->a_icon->surface.parenty = y;
+    XMoveResizeWindow(ob_display, self->icon, x, y, w, h);
+    RrPaint(self->a_icon, self->icon, w, h);
+}
+
+ObIconPopup *icon_popup_new()
+{
+    ObIconPopup *self;
+
+    self = g_new0(ObIconPopup, 1);
+    self->popup = popup_new(TRUE);
+    self->a_icon = RrAppearanceCopy(ob_rr_theme->a_clear_tex);
+    self->icon = XCreateWindow(ob_display, self->popup->bg,
+                               0, 0, 1, 1, 0,
+                               RrDepth(ob_rr_inst), InputOutput,
+                               RrVisual(ob_rr_inst), 0, NULL);
+    XMapWindow(ob_display, self->icon);
+
+    self->popup->draw_icon = icon_popup_draw_icon;
+    self->popup->draw_icon_data = self;
+
+    return self;
+}
+
+void icon_popup_free(ObIconPopup *self)
+{
+    if (self) {
+        XDestroyWindow(ob_display, self->icon);
+        RrAppearanceFree(self->a_icon);
+        popup_free(self->popup);
+        g_free(self);
+    }
+}
+
+void icon_popup_show(ObIconPopup *self,
+                     gchar *text, const ObClientIcon *icon)
+{
+    if (icon) {
+        self->a_icon->texture[0].type = RR_TEXTURE_RGBA;
+        self->a_icon->texture[0].data.rgba.width = icon->width;
+        self->a_icon->texture[0].data.rgba.height = icon->height;
+        self->a_icon->texture[0].data.rgba.data = icon->data;
+    } else
+        self->a_icon->texture[0].type = RR_TEXTURE_NONE;
+
+    popup_show(self->popup, text);
+}
+
+static void pager_popup_draw_icon(gint px, gint py, gint w, gint h,
+                                  gpointer data)
+{
+    ObPagerPopup *self = data;
+    gint x, y;
+    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))
+        / screen_desktop_layout.columns;
+    eachh = (h - ob_rr_theme->bwidth -
+             (screen_desktop_layout.rows * ob_rr_theme->bwidth))
+        / 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;
+
+    if (eachw <= 0 || eachh <= 0)
+        return;
+
+    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_CORNER_TOPRIGHT:
+            n = screen_desktop_layout.columns - 1;
+            horz_inc = -1;
+            vert_inc = screen_desktop_layout.columns;
+            break;
+        case OB_CORNER_BOTTOMRIGHT:
+            n = screen_desktop_layout.rows * screen_desktop_layout.columns - 1;
+            horz_inc = -1;
+            vert_inc = -screen_desktop_layout.columns;
+            break;
+        case OB_CORNER_BOTTOMLEFT:
+            n = (screen_desktop_layout.rows - 1) * screen_desktop_layout.columns;
+            horz_inc = 1;
+            vert_inc = -screen_desktop_layout.columns;
+            break;
+        default:
+            g_assert_not_reached();
+        }
+        break;
+    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_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();
     }
 
-    paint(self->bg, self->a_bg);
-    paint(self->text, self->a_text);
-    if (self->hasicon)
-        paint(self->icon, self->a_icon);
+    rown = n;
+    for (r = 0, y = 0; r < screen_desktop_layout.rows;
+         ++r, y += eachh + ob_rr_theme->bwidth)
+    {
+        for (c = 0, x = 0; c < screen_desktop_layout.columns;
+             ++c, x += eachw + ob_rr_theme->bwidth)
+        {
+            RrAppearance *a;
 
-    XMapWindow(ob_display, self->bg);
+            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;
+        }
+        n = rown += vert_inc;
+    }
 }
 
-void popup_hide(Popup *self)
+ObPagerPopup *pager_popup_new()
 {
-    XUnmapWindow(ob_display, self->bg);
+    ObPagerPopup *self;
+
+    self = g_new(ObPagerPopup, 1);
+    self->popup = popup_new(TRUE);
+
+    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->popup->draw_icon = pager_popup_draw_icon;
+    self->popup->draw_icon_data = self;
+
+    return self;
+}
+
+void pager_popup_free(ObPagerPopup *self)
+{
+    if (self) {
+        guint i;
+
+        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);
+        g_free(self);
+    }
+}
+
+void pager_popup_show(ObPagerPopup *self, gchar *text, guint desk)
+{
+    guint i;
+
+    if (screen_num_desktops < self->desks)
+        for (i = screen_num_desktops; i < self->desks; ++i)
+            XDestroyWindow(ob_display, self->wins[i]);
+
+    if (screen_num_desktops != self->desks)
+        self->wins = g_renew(Window, self->wins, screen_num_desktops);
+
+    if (screen_num_desktops > self->desks)
+        for (i = self->desks; i < screen_num_desktops; ++i) {
+            XSetWindowAttributes attr;
+
+            attr.border_pixel = RrColorPixel(ob_rr_theme->b_color);
+            self->wins[i] = XCreateWindow(ob_display, self->popup->bg,
+                                          0, 0, 1, 1, ob_rr_theme->bwidth,
+                                          RrDepth(ob_rr_inst), InputOutput,
+                                          RrVisual(ob_rr_inst), CWBorderPixel,
+                                          &attr);
+            XMapWindow(ob_display, self->wins[i]);
+        }
+
+    self->desks = screen_num_desktops;
+    self->curdesk = desk;
+
+    popup_show(self->popup, text);
 }