X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Fpopup.c;h=5cbe0347cc4846219757694d85c19be33214db18;hb=33328583a143677d27eb3d081ce66532c3aaca1c;hp=2768ee2b44fe7663d460dd7398216d40ac62e4a1;hpb=6d2650263193aaa7e94b29261c6ba249c0be3fd3;p=chaz%2Fopenbox diff --git a/openbox/popup.c b/openbox/popup.c index 2768ee2b..5cbe0347 100644 --- a/openbox/popup.c +++ b/openbox/popup.c @@ -29,7 +29,7 @@ #include "render/render.h" #include "render/theme.h" -ObPopup *popup_new() +ObPopup *popup_new(void) { XSetWindowAttributes attrib; ObPopup *self = g_new0(ObPopup, 1); @@ -46,28 +46,32 @@ ObPopup *popup_new() 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->fbwidth); + XSetWindowBorderWidth(ob_display, self->bg, ob_rr_theme->obwidth); XSetWindowBorder(ob_display, self->bg, - RrColorPixel(ob_rr_theme->frame_focused_border_color)); + RrColorPixel(ob_rr_theme->osd_border_color)); XMapWindow(ob_display, self->text); stacking_add(INTERNAL_AS_WINDOW(self)); + g_hash_table_insert(window_map, &self->bg, self); return self; } void popup_free(ObPopup *self) { if (self) { + popup_hide(self); /* make sure it's not showing or is being delayed and + will be shown */ XDestroyWindow(ob_display, self->bg); XDestroyWindow(ob_display, self->text); RrAppearanceFree(self->a_bg); RrAppearanceFree(self->a_text); + g_hash_table_remove(window_map, &self->bg); stacking_remove(self); g_free(self); } @@ -110,7 +114,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,7 +142,7 @@ void popup_set_text_align(ObPopup *self, RrJustify align) static gboolean popup_show_timeout(gpointer data) { ObPopup *self = data; - + XMapWindow(ob_display, self->bg); stacking_raise(INTERNAL_AS_WINDOW(self)); self->mapped = TRUE; @@ -151,14 +155,19 @@ 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; - - area = screen_physical_area(); + Rect *area, mon; - RrMargins(self->a_bg, &l, &t, &r, &b); + /* 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; @@ -195,6 +204,17 @@ 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, 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); @@ -228,12 +248,39 @@ 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); - RrPaint(self->a_bg, self->bg, 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) + RrPaint(self->a_bg, self->bg, w, h); if (textw) { self->a_text->surface.parent = self->a_bg; @@ -265,13 +312,17 @@ void popup_delay_show(ObPopup *self, gulong usec, gchar *text) 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_all_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); + ob_main_loop_timeout_remove_data(ob_main_loop, popup_show_timeout, self, FALSE); self->delay_mapped = FALSE; } } @@ -287,12 +338,12 @@ static void icon_popup_draw_icon(gint x, gint y, gint w, gint h, gpointer data) 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, 0, 0, 1, 1, 0, @@ -318,15 +369,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.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); } @@ -350,7 +403,7 @@ static void pager_popup_draw_icon(gint px, gint py, gint w, gint h, gint eachw, eachh; const guint cols = screen_desktop_layout.columns; const guint rows = screen_desktop_layout.rows; - const gint linewidth = ob_rr_theme->fbwidth; + const gint linewidth = ob_rr_theme->obwidth; eachw = (w - ((cols + 1) * linewidth)) / cols; eachh = (h - ((rows + 1) * linewidth)) / rows; @@ -444,12 +497,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); @@ -494,10 +547,10 @@ void pager_popup_delay_show(ObPagerPopup *self, gulong usec, for (i = self->desks; i < screen_num_desktops; ++i) { XSetWindowAttributes attr; - attr.border_pixel = - RrColorPixel(ob_rr_theme->frame_focused_border_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);