+#include "popup.h"
+
#include "openbox.h"
#include "frame.h"
+#include "client.h"
#include "window.h"
#include "stacking.h"
#include "render/render.h"
#include "render/theme.h"
-typedef struct Popup {
+struct _ObPopup
+{
ObWindow obwin;
Window bg;
Window text;
gboolean hasicon;
- Appearance *a_bg;
- Appearance *a_icon;
- Appearance *a_text;
- int gravity;
- int x;
- int y;
- int w;
- int h;
+ RrAppearance *a_bg;
+ RrAppearance *a_icon;
+ RrAppearance *a_text;
+ gint gravity;
+ gint x;
+ gint y;
+ gint w;
+ gint h;
gboolean mapped;
-} Popup;
+};
Popup *popup_new(gboolean hasicon)
{
+ XSetWindowAttributes attrib;
Popup *self = g_new(Popup, 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->mapped = FALSE;
+ self->a_bg = self->a_icon = self->a_text = NULL;
+
+ 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);
+
+ if (self->hasicon)
+ self->icon = 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);
+ XMapWindow(ob_display, self->icon);
+
stacking_add(INTERNAL_AS_WINDOW(self));
- stacking_raise(INTERNAL_AS_WINDOW(self));
return self;
}
void popup_free(Popup *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_icon);
+ RrAppearanceFree(self->a_text);
+ stacking_remove(self);
+ g_free(self);
}
- if (self->a_text)
- appearance_free(self->a_text);
- stacking_remove(self);
- g_free(self);
}
-void popup_position(Popup *self, int gravity, int x, int y)
+void popup_position(Popup *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(Popup *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(Popup *self, gchar *text)
{
- int textw, texth;
- int iconw;
+ gint textw, texth;
+ gint iconw;
if (!self->a_text)
- self->a_text = appearance_copy(theme_app_hilite_label);
+ self->a_text = RrAppearanceCopy(ob_rr_theme->app_hilite_label);
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 * (self->hasicon ? 3 : 2);
+ 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(Popup *self, RrJustify align)
{
- XSetWindowAttributes attrib;
- int x, y, w, h;
- int textw, texth;
- int iconw;
+ if (!self->a_text)
+ self->a_text = RrAppearanceCopy(ob_rr_theme->app_hilite_label);
+
+ self->a_text->texture[0].data.text.justify = align;
+}
+
+void popup_show(Popup *self, gchar *text, ObClientIcon *icon)
+{
+ gint l, t, r, b;
+ gint x, y, w, h;
+ gint textw, texth;
+ gint 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_bg)
+ self->a_bg = RrAppearanceCopy(ob_rr_theme->app_hilite_bg);
+ if (self->hasicon && !self->a_icon)
+ self->a_icon = RrAppearanceCopy(ob_rr_theme->a_clear_tex);
if (!self->a_text)
- self->a_text = appearance_copy(theme_app_hilite_label);
+ self->a_text = RrAppearanceCopy(ob_rr_theme->app_hilite_label);
+
+ 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].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 = NoTexture;
+ self->a_icon->texture[0].type = RR_TEXTURE_NONE;
}
/* 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 * (self->hasicon ? 3 : 2));
+ textw = w - (l+r + iconw + ob_rr_theme->padding *
+ (self->hasicon ? 3 : 2));
} else
- w = textw + iconw + theme_bevel * (self->hasicon ? 3 : 2);
+ 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;
}
/* 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.parent = self->a_bg;
- self->a_text->surface.parentx = iconw +
- theme_bevel * (self->hasicon ? 2 : 1);
- self->a_text->surface.parenty = theme_bevel;
+ 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 * (self->hasicon ? 2 : 1),
- theme_bevel, textw, texth);
+ l + iconw + ob_rr_theme->padding * (self->hasicon ? 2 : 1),
+ t + ob_rr_theme->padding, 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.parent = self->a_bg;
- self->a_icon->surface.parentx = theme_bevel;
- self->a_icon->surface.parenty = theme_bevel;
+ self->a_icon->surface.parentx = l + ob_rr_theme->padding;
+ self->a_icon->surface.parenty = t + ob_rr_theme->padding;
XMoveResizeWindow(ob_display, self->icon,
- theme_bevel, theme_bevel, iconw, texth);
+ l + ob_rr_theme->padding, t + ob_rr_theme->padding,
+ iconw, texth);
}
- paint(self->bg, self->a_bg);
- paint(self->text, self->a_text);
+ RrPaint(self->a_bg, self->bg, w, h);
+ RrPaint(self->a_text, self->text, textw, texth);
if (self->hasicon)
- paint(self->icon, self->a_icon);
+ RrPaint(self->a_icon, self->icon, iconw, texth);
if (!self->mapped) {
XMapWindow(ob_display, self->bg);
projects / chaz / openbox / blobdiff