X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Fpopup.c;h=af1c511cbc3d67ff9a0e207006c0c7d43ee76779;hb=fa0ae17adbc8f73b707c33836d37841e81b9303a;hp=3924a4d164a5f45837e4dc6b664682dc35cbd4bb;hpb=7736fcc4b69af5847d711e90d008e05b5c4c4f26;p=chaz%2Fopenbox diff --git a/openbox/popup.c b/openbox/popup.c index 3924a4d1..af1c511c 100644 --- a/openbox/popup.c +++ b/openbox/popup.c @@ -25,16 +25,15 @@ #include "stacking.h" #include "event.h" #include "screen.h" -#include "mainloop.h" #include "render/render.h" #include "render/theme.h" -ObPopup *popup_new() +ObPopup *popup_new(void) { XSetWindowAttributes attrib; ObPopup *self = g_new0(ObPopup, 1); - self->obwin.type = Window_Internal; + self->obwin.type = OB_WINDOW_CLASS_INTERNAL; self->gravity = NorthWestGravity; self->x = self->y = self->textw = self->h = 0; self->a_bg = RrAppearanceCopy(ob_rr_theme->osd_hilite_bg); @@ -42,32 +41,34 @@ ObPopup *popup_new() self->iconwm = self->iconhm = 1; attrib.override_redirect = True; - self->bg = XCreateWindow(ob_display, RootWindow(ob_display, ob_screen), + self->bg = XCreateWindow(obt_display, obt_root(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, + + self->text = XCreateWindow(obt_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, + XSetWindowBorderWidth(obt_display, self->bg, ob_rr_theme->obwidth); + XSetWindowBorder(obt_display, self->bg, RrColorPixel(ob_rr_theme->osd_border_color)); - XMapWindow(ob_display, self->text); + XMapWindow(obt_display, self->text); stacking_add(INTERNAL_AS_WINDOW(self)); + window_add(&self->bg, INTERNAL_AS_WINDOW(self)); return self; } void popup_free(ObPopup *self) { if (self) { - XDestroyWindow(ob_display, self->bg); - XDestroyWindow(ob_display, self->text); + XDestroyWindow(obt_display, self->bg); + XDestroyWindow(obt_display, self->text); RrAppearanceFree(self->a_bg); RrAppearanceFree(self->a_text); + window_remove(self->bg); stacking_remove(self); g_free(self); } @@ -110,7 +111,7 @@ void popup_text_width_to_string(ObPopup *self, gchar *text) self->a_text->texture[0].data.text.string = text; self->textw = RrMinWidth(self->a_text); } else - self->textw = 0; + self->textw = 0; } void popup_height_to_string(ObPopup *self, gchar *text) @@ -138,8 +139,8 @@ void popup_set_text_align(ObPopup *self, RrJustify align) static gboolean popup_show_timeout(gpointer data) { ObPopup *self = data; - - XMapWindow(ob_display, self->bg); + + XMapWindow(obt_display, self->bg); stacking_raise(INTERNAL_AS_WINDOW(self)); self->mapped = TRUE; self->delay_mapped = FALSE; @@ -151,17 +152,17 @@ void popup_delay_show(ObPopup *self, gulong usec, gchar *text) { gint l, t, r, b; gint x, y, w, h; + guint m; gint emptyx, emptyy; /* empty space between elements */ gint textx, texty, textw, texth; gint iconx, icony, iconw, iconh; - Rect *area; + Rect *area, mon; + gboolean hasicon = self->hasicon; - area = screen_physical_area(); - - /* when there is no icon and the text is not parent relative, then + /* 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) + if (hasicon || self->a_text->surface.grad == RR_SURFACE_PARENTREL) RrMargins(self->a_bg, &l, &t, &r, &b); else l = t = r = b = 0; @@ -183,16 +184,13 @@ void popup_delay_show(ObPopup *self, gulong usec, gchar *text) texth = self->h - emptyy; h = texth * self->iconhm + emptyy; - if (self->textw) { - self->a_text->texture[0].data.text.justify = RR_JUSTIFY_LEFT; + if (self->textw) textw = self->textw; - } else - self->a_text->texture[0].data.text.justify = RR_JUSTIFY_CENTER; iconx = textx = l + ob_rr_theme->paddingx; emptyx = l + r + ob_rr_theme->paddingx * 2; - if (self->hasicon) { + if (hasicon) { iconw = texth * self->iconwm; iconh = texth * self->iconhm; textx += iconw + ob_rr_theme->paddingx; @@ -204,10 +202,10 @@ void popup_delay_show(ObPopup *self, gulong usec, gchar *text) 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 and the text is not parent relative, then - fill the whole dialog with the text appearance, don't use the bg at all + /* when there is no icon, then fill the whole dialog with the text + appearance */ - if (!(self->hasicon || self->a_text->surface.grad == RR_SURFACE_PARENTREL)) + if (!hasicon) { textx = texty = 0; texth += emptyy; @@ -248,26 +246,49 @@ void popup_delay_show(ObPopup *self, gulong usec, gchar *text) break; } - x=MAX(MIN(x, area->width-w),0); - y=MAX(MIN(y, area->height-h),0); - + /* Find the monitor which contains the biggest part of the popup. + * If the popup is completely off screen, limit it to the intersection + * of all monitors and then try again. If it's still off screen, put it + * on monitor 0. */ + RECT_SET(mon, x, y, w, h); + m = screen_find_monitor(&mon); + area = screen_physical_area_monitor(m); + + x=MAX(MIN(x, area->x+area->width-w),area->x); + y=MAX(MIN(y, area->y+area->height-h),area->y); + + g_free(area); + + if (m == screen_num_monitors) { + RECT_SET(mon, x, y, w, h); + m = screen_find_monitor(&mon); + if (m == screen_num_monitors) + m = 0; + area = screen_physical_area_monitor(m); + + x=MAX(MIN(x, area->x+area->width-w),area->x); + y=MAX(MIN(y, area->y+area->height-h),area->y); + + g_free(area); + } + /* set the windows/appearances up */ - XMoveResizeWindow(ob_display, self->bg, x, y, w, h); - /* when there is no icon and the text is not parent relative, then + XMoveResizeWindow(obt_display, self->bg, x, y, w, h); + /* 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) + if (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); + XMoveResizeWindow(obt_display, self->text, textx, texty, textw, texth); RrPaint(self->a_text, self->text, textw, texth); } - if (self->hasicon) + if (hasicon) self->draw_icon(iconx, icony, iconw, iconh, self->draw_icon_data); /* do the actual showing */ @@ -275,9 +296,9 @@ void popup_delay_show(ObPopup *self, gulong usec, gchar *text) if (usec) { /* don't kill previous show timers */ if (!self->delay_mapped) { - ob_main_loop_timeout_add(ob_main_loop, usec, - popup_show_timeout, self, - g_direct_equal, NULL); + obt_main_loop_timeout_add(ob_main_loop, usec, + popup_show_timeout, self, + g_direct_equal, NULL); self->delay_mapped = TRUE; } } else { @@ -294,12 +315,12 @@ void popup_hide(ObPopup *self) /* kill enter events cause by this unmapping */ ignore_start = event_start_ignore_all_enters(); - XUnmapWindow(ob_display, self->bg); + XUnmapWindow(obt_display, self->bg); self->mapped = FALSE; event_end_ignore_all_enters(ignore_start); } else if (self->delay_mapped) { - ob_main_loop_timeout_remove(ob_main_loop, popup_show_timeout); + obt_main_loop_timeout_remove_data(ob_main_loop, popup_show_timeout, self, FALSE); self->delay_mapped = FALSE; } } @@ -311,22 +332,22 @@ static void icon_popup_draw_icon(gint x, gint y, gint w, gint h, gpointer 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); + XMoveResizeWindow(obt_display, self->icon, x, y, w, h); RrPaint(self->a_icon, self->icon, w, h); } -ObIconPopup *icon_popup_new() +ObIconPopup *icon_popup_new(void) { ObIconPopup *self; self = g_new0(ObIconPopup, 1); - self->popup = popup_new(TRUE); + self->popup = popup_new(); self->a_icon = RrAppearanceCopy(ob_rr_theme->a_clear_tex); - self->icon = XCreateWindow(ob_display, self->popup->bg, + self->icon = XCreateWindow(obt_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); + XMapWindow(obt_display, self->icon); self->popup->hasicon = TRUE; self->popup->draw_icon = icon_popup_draw_icon; @@ -338,7 +359,7 @@ ObIconPopup *icon_popup_new() void icon_popup_free(ObIconPopup *self) { if (self) { - XDestroyWindow(ob_display, self->icon); + XDestroyWindow(obt_display, self->icon); RrAppearanceFree(self->a_icon); popup_free(self->popup); g_free(self); @@ -346,16 +367,17 @@ void icon_popup_free(ObIconPopup *self) } void icon_popup_delay_show(ObIconPopup *self, gulong usec, - gchar *text, const ObClientIcon *icon) + gchar *text, RrImage *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.alpha = 0xff; - self->a_icon->texture[0].data.rgba.data = icon->data; - } else + RrAppearanceClearTextures(self->a_icon); + self->a_icon->texture[0].type = RR_TEXTURE_IMAGE; + self->a_icon->texture[0].data.image.alpha = 0xff; + self->a_icon->texture[0].data.image.image = icon; + } else { + RrAppearanceClearTextures(self->a_icon); self->a_icon->texture[0].type = RR_TEXTURE_NONE; + } popup_delay_show(self->popup, usec, text); } @@ -463,7 +485,7 @@ static void pager_popup_draw_icon(gint px, gint py, gint w, gint h, a->surface.parent = self->popup->a_bg; a->surface.parentx = x + px; a->surface.parenty = y + py; - XMoveResizeWindow(ob_display, self->wins[n], + XMoveResizeWindow(obt_display, self->wins[n], x + px, y + py, eachw, eachh); RrPaint(a, self->wins[n], eachw, eachh); } @@ -473,12 +495,12 @@ static void pager_popup_draw_icon(gint px, gint py, gint w, gint h, } } -ObPagerPopup *pager_popup_new() +ObPagerPopup *pager_popup_new(void) { ObPagerPopup *self; self = g_new(ObPagerPopup, 1); - self->popup = popup_new(TRUE); + self->popup = popup_new(); self->desks = 0; self->wins = g_new(Window, self->desks); @@ -498,7 +520,7 @@ void pager_popup_free(ObPagerPopup *self) guint i; for (i = 0; i < self->desks; ++i) - XDestroyWindow(ob_display, self->wins[i]); + XDestroyWindow(obt_display, self->wins[i]); g_free(self->wins); RrAppearanceFree(self->hilight); RrAppearanceFree(self->unhilight); @@ -514,7 +536,7 @@ void pager_popup_delay_show(ObPagerPopup *self, gulong usec, if (screen_num_desktops < self->desks) for (i = screen_num_desktops; i < self->desks; ++i) - XDestroyWindow(ob_display, self->wins[i]); + XDestroyWindow(obt_display, self->wins[i]); if (screen_num_desktops != self->desks) self->wins = g_renew(Window, self->wins, screen_num_desktops); @@ -523,14 +545,14 @@ void pager_popup_delay_show(ObPagerPopup *self, gulong usec, for (i = self->desks; i < screen_num_desktops; ++i) { XSetWindowAttributes attr; - attr.border_pixel = + attr.border_pixel = RrColorPixel(ob_rr_theme->osd_border_color); - self->wins[i] = XCreateWindow(ob_display, self->popup->bg, + self->wins[i] = XCreateWindow(obt_display, self->popup->bg, 0, 0, 1, 1, ob_rr_theme->obwidth, RrDepth(ob_rr_inst), InputOutput, RrVisual(ob_rr_inst), CWBorderPixel, &attr); - XMapWindow(ob_display, self->wins[i]); + XMapWindow(obt_display, self->wins[i]); } self->desks = screen_num_desktops;