#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)
+ObPopup *popup_new()
{
XSetWindowAttributes attrib;
ObPopup *self = g_new0(ObPopup, 1);
self->obwin.type = Window_Internal;
- self->hasicon = hasicon;
self->gravity = NorthWestGravity;
- self->x = self->y = self->w = self->h = 0;
+ self->x = self->y = self->textw = self->h = 0;
self->a_bg = RrAppearanceCopy(ob_rr_theme->osd_hilite_bg);
self->a_text = RrAppearanceCopy(ob_rr_theme->osd_hilite_label);
+ self->iconwm = self->iconhm = 1;
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);
+ XSetWindowBorderWidth(ob_display, self->bg, ob_rr_theme->obwidth);
+ XSetWindowBorder(ob_display, self->bg,
+ RrColorPixel(ob_rr_theme->osd_border_color));
+
XMapWindow(ob_display, self->text);
stacking_add(INTERNAL_AS_WINDOW(self));
self->y = y;
}
-void popup_width(ObPopup *self, gint w)
+void popup_text_width(ObPopup *self, gint w)
{
- self->w = w;
- self->maxw = w;
+ self->textw = w;
+}
+
+void popup_min_width(ObPopup *self, gint minw)
+{
+ self->minw = minw;
+}
+
+void popup_max_width(ObPopup *self, gint maxw)
+{
+ self->maxw = maxw;
}
void popup_height(ObPopup *self, gint h)
self->h = MAX(h, texth);
}
-void popup_width_to_string(ObPopup *self, gchar *text, gint max)
+void popup_text_width_to_string(ObPopup *self, gchar *text)
{
- self->a_text->texture[0].data.text.string = text;
- self->w = RrMinWidth(self->a_text);
- self->maxw = max;
+ if (text[0] != '\0') {
+ self->a_text->texture[0].data.text.string = text;
+ self->textw = RrMinWidth(self->a_text);
+ } else
+ self->textw = 0;
}
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)
+void popup_text_width_to_strings(ObPopup *self, gchar **strings, gint num)
{
gint i, maxw;
maxw = 0;
for (i = 0; i < num; ++i) {
- popup_width_to_string(self, strings[i], max);
- maxw = MAX(maxw, self->w);
+ popup_text_width_to_string(self, strings[i]);
+ maxw = MAX(maxw, self->textw);
}
- self->w = maxw;
+ self->textw = maxw;
}
void popup_set_text_align(ObPopup *self, RrJustify align)
self->a_text->texture[0].data.text.justify = align;
}
-void popup_delay_show(ObPopup *self, gulong usec, gchar *text)
+static gboolean popup_show_timeout(gpointer data)
{
- gint l, t, r, b;
- gint x, y, w, h;
- gint textw, texth;
- gint iconw;
- Rect *area; /* won't go outside this */
+ ObPopup *self = data;
- area = screen_physical_area(); /* XXX this should work quite
- good, someone with xinerama,
- and different resolutions on
- screens? */
+ XMapWindow(ob_display, self->bg);
+ stacking_raise(INTERNAL_AS_WINDOW(self));
+ self->mapped = TRUE;
+ self->delay_mapped = FALSE;
- RrMargins(self->a_bg, &l, &t, &r, &b);
+ return FALSE; /* don't repeat */
+}
- XSetWindowBorderWidth(ob_display, self->bg, ob_rr_theme->fbwidth);
- XSetWindowBorder(ob_display, self->bg, ob_rr_theme->frame_b_color->pixel);
+void popup_delay_show(ObPopup *self, gulong usec, gchar *text)
+{
+ gint l, t, r, b;
+ gint x, y, w, h;
+ gint emptyx, emptyy; /* empty space between elements */
+ gint textx, texty, textw, texth;
+ gint iconx, icony, iconw, iconh;
+ Rect *area, mon;
+
+ RECT_SET(mon, self->x, self->y, 1, 1);
+ area = screen_physical_area_monitor(screen_find_monitor(&mon));
+
+ /* when there is no icon and the text is not parent relative, then
+ fill the whole dialog with the text appearance, don't use the bg at all
+ */
+ if (self->hasicon || self->a_text->surface.grad == RR_SURFACE_PARENTREL)
+ RrMargins(self->a_bg, &l, &t, &r, &b);
+ else
+ l = t = r = b = 0;
/* set up the textures */
self->a_text->texture[0].data.text.string = text;
/* 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->paddingy * 2);
+ if (text[0] != '\0') {
+ RrMinSize(self->a_text, &textw, &texth);
+ } else {
+ textw = 0;
+ texth = RrMinHeight(self->a_text);
+ }
+
+ /* get the height, which is also used for the icon width */
+ emptyy = t + b + ob_rr_theme->paddingy * 2;
+ if (self->h)
+ texth = self->h - emptyy;
+ h = texth * self->iconhm + emptyy;
+
+ if (self->textw)
+ textw = self->textw;
+
+ iconx = textx = l + ob_rr_theme->paddingx;
+
+ emptyx = l + r + ob_rr_theme->paddingx * 2;
+ if (self->hasicon) {
+ iconw = texth * self->iconwm;
+ iconh = texth * self->iconhm;
+ textx += iconw + ob_rr_theme->paddingx;
+ if (textw)
+ emptyx += ob_rr_theme->paddingx; /* between the icon and text */
} else
- h = t+b + texth + ob_rr_theme->paddingy * 2;
- iconw = (self->hasicon ? texth : 0);
- 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);
+ iconw = 0;
+
+ texty = (h - texth - emptyy) / 2 + t + ob_rr_theme->paddingy;
+ icony = (h - iconh - emptyy) / 2 + t + ob_rr_theme->paddingy;
+
+ /* when there is no icon, then fill the whole dialog with the text
+ appearance
+ */
+ if (!self->hasicon)
+ {
+ textx = texty = 0;
+ texth += emptyy;
+ textw += emptyx;
+ emptyx = emptyy = 0;
+ }
+
+ w = textw + emptyx + iconw;
+ /* cap it at maxw/minw */
+ if (self->maxw) w = MIN(w, self->maxw);
+ if (self->minw) w = MAX(w, self->minw);
+ textw = w - emptyx - iconw;
/* sanity checks to avoid crashes! */
if (w < 1) w = 1;
if (h < 1) h = 1;
- if (textw < 1) textw = 1;
if (texth < 1) texth = 1;
/* set up the x coord */
x = self->x;
switch (self->gravity) {
- case NorthGravity:
- case CenterGravity:
- case SouthGravity:
+ case NorthGravity: case CenterGravity: case SouthGravity:
x -= w / 2;
break;
- case NorthEastGravity:
- case EastGravity:
- case SouthEastGravity:
+ case NorthEastGravity: case EastGravity: case SouthEastGravity:
x -= w;
break;
}
/* set up the y coord */
y = self->y;
switch (self->gravity) {
- case WestGravity:
- case CenterGravity:
- case EastGravity:
+ case WestGravity: case CenterGravity: case EastGravity:
y -= h / 2;
break;
- case SouthWestGravity:
- case SouthGravity:
- case SouthEastGravity:
+ case SouthWestGravity: case SouthGravity: case SouthEastGravity:
y -= h;
break;
}
/* 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->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->paddingx *
- (self->hasicon ? 2 : 1),
- t + ob_rr_theme->paddingy, 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 */
- if (self->draw_icon)
- self->draw_icon(l + ob_rr_theme->paddingx,
- t + ob_rr_theme->paddingy,
- iconw, texth, self->draw_icon_data);
+ /* when there is no icon and the text is not parent relative, then
+ fill the whole dialog with the text appearance, don't use the bg at all
+ */
+ if (self->hasicon || self->a_text->surface.grad == RR_SURFACE_PARENTREL)
+ RrPaint(self->a_bg, self->bg, w, h);
+
+ if (textw) {
+ self->a_text->surface.parent = self->a_bg;
+ self->a_text->surface.parentx = textx;
+ self->a_text->surface.parenty = texty;
+ XMoveResizeWindow(ob_display, self->text, textx, texty, textw, texth);
+ RrPaint(self->a_text, self->text, textw, texth);
}
+ if (self->hasicon)
+ self->draw_icon(iconx, icony, iconw, iconh, self->draw_icon_data);
+
/* do the actual showing */
if (!self->mapped) {
if (usec) {
popup_show_timeout(self);
}
}
+
+ g_free(area);
}
void popup_hide(ObPopup *self)
{
if (self->mapped) {
+ gulong ignore_start;
+
+ /* kill enter events cause by this unmapping */
+ ignore_start = event_start_ignore_all_enters();
+
XUnmapWindow(ob_display, self->bg);
self->mapped = FALSE;
- /* kill enter events cause by this unmapping */
- event_ignore_queued_enters();
+ event_end_ignore_all_enters(ignore_start);
} else if (self->delay_mapped) {
ob_main_loop_timeout_remove(ob_main_loop, popup_show_timeout);
self->delay_mapped = FALSE;
RrVisual(ob_rr_inst), 0, NULL);
XMapWindow(ob_display, self->icon);
+ self->popup->hasicon = TRUE;
self->popup->draw_icon = icon_popup_draw_icon;
self->popup->draw_icon_data = self;
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.alpha = 0xff;
self->a_icon->texture[0].data.rgba.data = icon->data;
} else
self->a_icon->texture[0].type = RR_TEXTURE_NONE;
popup_delay_show(self->popup, usec, text);
}
+void icon_popup_icon_size_multiplier(ObIconPopup *self, guint wm, guint hm)
+{
+ /* cap them at 1 */
+ self->popup->iconwm = MAX(1, wm);
+ self->popup->iconhm = MAX(1, hm);
+}
+
static void pager_popup_draw_icon(gint px, gint py, gint w, gint h,
gpointer data)
{
guint vert_inc;
guint r, c;
gint eachw, eachh;
+ const guint cols = screen_desktop_layout.columns;
+ const guint rows = screen_desktop_layout.rows;
+ const gint linewidth = ob_rr_theme->obwidth;
- eachw = (w - ob_rr_theme->fbwidth -
- (screen_desktop_layout.columns * ob_rr_theme->fbwidth))
- / screen_desktop_layout.columns;
- eachh = (h - ob_rr_theme->fbwidth -
- (screen_desktop_layout.rows * ob_rr_theme->fbwidth))
- / screen_desktop_layout.rows;
+ eachw = (w - ((cols + 1) * linewidth)) / cols;
+ eachh = (h - ((rows + 1) * linewidth)) / rows;
/* make them squares */
eachw = eachh = MIN(eachw, eachh);
/* center */
- 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;
+ px += (w - (cols * (eachw + linewidth) + linewidth)) / 2;
+ py += (h - (rows * (eachh + linewidth) + linewidth)) / 2;
if (eachw <= 0 || eachh <= 0)
return;
case OB_CORNER_TOPLEFT:
n = 0;
horz_inc = 1;
- vert_inc = screen_desktop_layout.columns;
+ vert_inc = cols;
break;
case OB_CORNER_TOPRIGHT:
- n = screen_desktop_layout.columns - 1;
+ n = cols - 1;
horz_inc = -1;
- vert_inc = screen_desktop_layout.columns;
+ vert_inc = cols;
break;
case OB_CORNER_BOTTOMRIGHT:
- n = screen_desktop_layout.rows * screen_desktop_layout.columns - 1;
+ n = rows * cols - 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;
+ n = (rows - 1) * cols;
horz_inc = 1;
- vert_inc = -screen_desktop_layout.columns;
+ vert_inc = -cols;
break;
default:
g_assert_not_reached();
switch (screen_desktop_layout.start_corner) {
case OB_CORNER_TOPLEFT:
n = 0;
- horz_inc = screen_desktop_layout.rows;
+ horz_inc = 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;
+ n = rows * (cols - 1);
+ horz_inc = -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;
+ n = rows * cols - 1;
+ horz_inc = -rows;
vert_inc = -1;
break;
case OB_CORNER_BOTTOMLEFT:
- n = screen_desktop_layout.rows - 1;
- horz_inc = screen_desktop_layout.rows;
+ n = rows - 1;
+ horz_inc = rows;
vert_inc = -1;
break;
default:
}
rown = n;
- for (r = 0, y = 0; r < screen_desktop_layout.rows;
- ++r, y += eachh + ob_rr_theme->fbwidth)
+ for (r = 0, y = 0; r < rows; ++r, y += eachh + linewidth)
{
- for (c = 0, x = 0; c < screen_desktop_layout.columns;
- ++c, x += eachw + ob_rr_theme->fbwidth)
+ for (c = 0, x = 0; c < cols; ++c, x += eachw + linewidth)
{
RrAppearance *a;
for (i = self->desks; i < screen_num_desktops; ++i) {
XSetWindowAttributes attr;
- attr.border_pixel = RrColorPixel(ob_rr_theme->frame_b_color);
+ attr.border_pixel =
+ RrColorPixel(ob_rr_theme->osd_border_color);
self->wins[i] = XCreateWindow(ob_display, self->popup->bg,
- 0, 0, 1, 1, ob_rr_theme->fbwidth,
+ 0, 0, 1, 1, ob_rr_theme->obwidth,
RrDepth(ob_rr_inst), InputOutput,
RrVisual(ob_rr_inst), CWBorderPixel,
&attr);
popup_delay_show(self->popup, usec, text);
}
+
+void pager_popup_icon_size_multiplier(ObPagerPopup *self, guint wm, guint hm)
+{
+ /* cap them at 1 */
+ self->popup->iconwm = MAX(1, wm);
+ self->popup->iconhm = MAX(1, hm);
+}
projects / chaz / openbox / blobdiff