X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Fpopup.c;h=4a0ae89075fa7c3a81330bb8a0bd6622c3dbe78b;hb=d3d4aa29871111737a4f6985da695c8688a05270;hp=3844089c2e8ef5995c8fb60e4352d7b4030e3a0a;hpb=16f46c296d1fcd3f27fc62a18e71c55fb3fd3e88;p=chaz%2Fopenbox diff --git a/openbox/popup.c b/openbox/popup.c index 3844089c..4a0ae890 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 @@ -105,6 +106,12 @@ void popup_show(ObPopup *self, gchar *text) 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); @@ -170,6 +177,9 @@ void popup_show(ObPopup *self, gchar *text) break; } + x=MAX(MIN(x, area->width-w),0); + y=MAX(MIN(y, area->height-h),0); + /* set the windows/appearances up */ XMoveResizeWindow(ob_display, self->bg, x, y, w, h); @@ -194,7 +204,7 @@ void popup_show(ObPopup *self, gchar *text) if (!self->mapped) { XMapWindow(ob_display, self->bg); - stacking_raise(INTERNAL_AS_WINDOW(self)); + stacking_raise(INTERNAL_AS_WINDOW(self), FALSE); self->mapped = TRUE; } } @@ -248,7 +258,7 @@ void icon_popup_free(ObIconPopup *self) } void icon_popup_show(ObIconPopup *self, - gchar *text, struct _ObClientIcon *icon) + gchar *text, const ObClientIcon *icon) { if (icon) { self->a_icon->texture[0].type = RR_TEXTURE_RGBA; @@ -266,7 +276,6 @@ 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; @@ -291,64 +300,66 @@ static void pager_popup_draw_icon(gint px, gint py, gint w, gint h, 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_ORIENTATION_VERT: + 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(); } rown = n; - i = 0; for (r = 0, y = 0; r < screen_desktop_layout.rows; ++r, y += eachh + ob_rr_theme->bwidth) { @@ -357,21 +368,17 @@ static void pager_popup_draw_icon(gint px, gint py, gint w, gint h, { 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; }