X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Fpopup.c;h=e7fcbbe552acbf9c93a3e2f29dd3137f9fade101;hb=4c672be2e1f39e72eb7d7e99f129e61338f481b2;hp=9823ff2a07b08ba8801391b2b5179d696204b795;hpb=acc6124682c674e16b896bfe6b54c94f12f4cb87;p=chaz%2Fopenbox diff --git a/openbox/popup.c b/openbox/popup.c index 9823ff2a..e7fcbbe5 100644 --- a/openbox/popup.c +++ b/openbox/popup.c @@ -1,6 +1,7 @@ /* -*- 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 @@ -35,8 +36,8 @@ ObPopup *popup_new(gboolean hasicon) self->hasicon = hasicon; 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); + self->a_bg = RrAppearanceCopy(ob_rr_theme->osd_hilite_bg); + self->a_text = RrAppearanceCopy(ob_rr_theme->osd_hilite_label); attrib.override_redirect = True; self->bg = XCreateWindow(ob_display, RootWindow(ob_display, ob_screen), @@ -87,11 +88,11 @@ void popup_size_to_string(ObPopup *self, gchar *text) self->a_text->texture[0].data.text.string = text; RrMinsize(self->a_text, &textw, &texth); /*XXX textw += ob_rr_theme->bevel * 2;*/ - texth += ob_rr_theme->padding * 2; + texth += ob_rr_theme->paddingy * 2; - self->h = texth + ob_rr_theme->padding * 2; + self->h = texth + ob_rr_theme->paddingy * 2; iconw = (self->hasicon ? texth : 0); - self->w = textw + iconw + ob_rr_theme->padding * (self->hasicon ? 3 : 2); + self->w = textw + iconw + ob_rr_theme->paddingx * (self->hasicon ? 3 : 2); } void popup_set_text_align(ObPopup *self, RrJustify align) @@ -107,13 +108,15 @@ void popup_show(ObPopup *self, gchar *text) gint iconw; Rect *area; /* won't go outside this */ - area = screen_physical_area_monitor(0); /* XXX i'm guessing this - is wrong for xinerama? */ + 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); + XSetWindowBorderWidth(ob_display, self->bg, ob_rr_theme->fbwidth); + XSetWindowBorder(ob_display, self->bg, ob_rr_theme->frame_b_color->pixel); /* set up the textures */ self->a_text->texture[0].data.text.string = text; @@ -121,22 +124,22 @@ void popup_show(ObPopup *self, gchar *text) /* measure the shit out */ RrMinsize(self->a_text, &textw, &texth); /*XXX textw += ob_rr_theme->padding * 2;*/ - texth += ob_rr_theme->padding * 2; + 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->padding * 2); + texth = h - (t+b + ob_rr_theme->paddingy * 2); } else - h = t+b + texth + ob_rr_theme->padding * 2; + h = t+b + texth + ob_rr_theme->paddingy * 2; iconw = (self->hasicon ? texth : 0); if (self->w) { w = self->w; - textw = w - (l+r + iconw + ob_rr_theme->padding * + textw = w - (l+r + iconw + ob_rr_theme->paddingx * (self->hasicon ? 3 : 2)); } else - w = l+r + textw + iconw + ob_rr_theme->padding * + w = l+r + textw + iconw + ob_rr_theme->paddingx * (self->hasicon ? 3 : 2); /* sanity checks to avoid crashes! */ if (w < 1) w = 1; @@ -182,12 +185,12 @@ void popup_show(ObPopup *self, gchar *text) 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; + 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->padding * + l + iconw + ob_rr_theme->paddingx * (self->hasicon ? 2 : 1), - t + ob_rr_theme->padding, textw, texth); + t + ob_rr_theme->paddingy, textw, texth); RrPaint(self->a_bg, self->bg, w, h); RrPaint(self->a_text, self->text, textw, texth); @@ -195,7 +198,8 @@ void popup_show(ObPopup *self, gchar *text) if (self->hasicon) { if (iconw < 1) iconw = 1; /* sanity check for crashes */ if (self->draw_icon) - self->draw_icon(l + ob_rr_theme->padding, t + ob_rr_theme->padding, + self->draw_icon(l + ob_rr_theme->paddingx, + t + ob_rr_theme->paddingy, iconw, texth, self->draw_icon_data); } @@ -273,112 +277,109 @@ static void pager_popup_draw_icon(gint px, gint py, gint w, gint h, { ObPagerPopup *self = data; gint x, y; - guint i; 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)) + eachw = (w - ob_rr_theme->fbwidth - + (screen_desktop_layout.columns * ob_rr_theme->fbwidth)) / screen_desktop_layout.columns; - eachh = (h - ob_rr_theme->bwidth - - (screen_desktop_layout.rows * ob_rr_theme->bwidth)) + eachh = (h - ob_rr_theme->fbwidth - + (screen_desktop_layout.rows * ob_rr_theme->fbwidth)) / 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; + 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; if (eachw <= 0 || eachh <= 0) return; - switch (screen_desktop_layout.start_corner) { - case OB_CORNER_TOPLEFT: - n = 0; - switch (screen_desktop_layout.orientation) { - case OB_ORIENTATION_HORZ: + 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_ORIENTATION_VERT: - horz_inc = screen_desktop_layout.rows; - vert_inc = 1; - break; - } - break; - case OB_CORNER_TOPRIGHT: - n = screen_desktop_layout.columns; - switch (screen_desktop_layout.orientation) { - case OB_ORIENTATION_HORZ: + case OB_CORNER_TOPRIGHT: + n = screen_desktop_layout.columns - 1; horz_inc = -1; vert_inc = screen_desktop_layout.columns; break; - case OB_ORIENTATION_VERT: - horz_inc = -screen_desktop_layout.rows; - vert_inc = 1; + case OB_CORNER_BOTTOMRIGHT: + n = screen_desktop_layout.rows * screen_desktop_layout.columns - 1; + horz_inc = -1; + vert_inc = -screen_desktop_layout.columns; break; - } - break; - case OB_CORNER_BOTTOMLEFT: - n = screen_desktop_layout.rows; - switch (screen_desktop_layout.orientation) { - case OB_ORIENTATION_HORZ: + case OB_CORNER_BOTTOMLEFT: + n = (screen_desktop_layout.rows - 1) + * screen_desktop_layout.columns; horz_inc = 1; vert_inc = -screen_desktop_layout.columns; break; - case OB_ORIENTATION_VERT: - horz_inc = screen_desktop_layout.rows; - vert_inc = -1; - break; + default: + g_assert_not_reached(); } break; - case OB_CORNER_BOTTOMRIGHT: - n = MAX(self->desks, - screen_desktop_layout.rows * screen_desktop_layout.columns); - switch (screen_desktop_layout.orientation) { - case OB_ORIENTATION_HORZ: - horz_inc = -1; - vert_inc = -screen_desktop_layout.columns; + 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_ORIENTATION_VERT: + 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(); } rown = n; - i = 0; for (r = 0, y = 0; r < screen_desktop_layout.rows; - ++r, y += eachh + ob_rr_theme->bwidth) + ++r, y += eachh + ob_rr_theme->fbwidth) { for (c = 0, x = 0; c < screen_desktop_layout.columns; - ++c, x += eachw + ob_rr_theme->bwidth) + ++c, x += eachw + ob_rr_theme->fbwidth) { RrAppearance *a; - if (i >= self->desks) - break; - - 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[i], - x + px, y + py, eachw, eachh); - RrPaint(a, self->wins[i], eachw, eachh); + 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; - - ++i; } n = rown += vert_inc; } @@ -393,8 +394,8 @@ ObPagerPopup *pager_popup_new() 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->hilight = RrAppearanceCopy(ob_rr_theme->osd_hilite_fg); + self->unhilight = RrAppearanceCopy(ob_rr_theme->osd_unhilite_fg); self->popup->draw_icon = pager_popup_draw_icon; self->popup->draw_icon_data = self; @@ -432,9 +433,9 @@ void pager_popup_show(ObPagerPopup *self, gchar *text, guint desk) for (i = self->desks; i < screen_num_desktops; ++i) { XSetWindowAttributes attr; - attr.border_pixel = RrColorPixel(ob_rr_theme->b_color); + attr.border_pixel = RrColorPixel(ob_rr_theme->frame_b_color); self->wins[i] = XCreateWindow(ob_display, self->popup->bg, - 0, 0, 1, 1, ob_rr_theme->bwidth, + 0, 0, 1, 1, ob_rr_theme->fbwidth, RrDepth(ob_rr_inst), InputOutput, RrVisual(ob_rr_inst), CWBorderPixel, &attr);