X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Ffocus_cycle_popup.c;h=98998c88950396dca7de6b23473adde1bf5f9ef1;hb=ea481338b5f16fd81a7b33e036ead39b918a51af;hp=b827e524ff7ff8b850b98f31e36d8e02fd0bacff;hpb=571b09f999585c66e9781877c94807f663c2bd4c;p=chaz%2Fopenbox diff --git a/openbox/focus_cycle_popup.c b/openbox/focus_cycle_popup.c index b827e524..98998c88 100644 --- a/openbox/focus_cycle_popup.c +++ b/openbox/focus_cycle_popup.c @@ -22,7 +22,6 @@ #include "client.h" #include "screen.h" #include "focus.h" -#include "focus_cycle.h" #include "openbox.h" #include "window.h" #include "event.h" @@ -88,7 +87,7 @@ static void popup_render (ObFocusCyclePopup *p, static Window create_window(Window parent, guint bwidth, gulong mask, XSetWindowAttributes *attr) { - return XCreateWindow(ob_display, parent, 0, 0, 1, 1, bwidth, + return XCreateWindow(obt_display, parent, 0, 0, 1, 1, bwidth, RrDepth(ob_rr_inst), InputOutput, RrVisual(ob_rr_inst), mask, attr); } @@ -97,7 +96,7 @@ void focus_cycle_popup_startup(gboolean reconfig) { XSetWindowAttributes attrib; - single_popup = icon_popup_new(TRUE); + single_popup = icon_popup_new(); popup.obwin.type = Window_Internal; popup.a_bg = RrAppearanceCopy(ob_rr_theme->osd_hilite_bg); @@ -114,7 +113,7 @@ void focus_cycle_popup_startup(gboolean reconfig) attrib.override_redirect = True; attrib.border_pixel=RrColorPixel(ob_rr_theme->osd_border_color); - popup.bg = create_window(RootWindow(ob_display, ob_screen), + popup.bg = create_window(RootWindow(obt_display, ob_screen), ob_rr_theme->obwidth, CWOverrideRedirect | CWBorderPixel, &attrib); @@ -126,30 +125,33 @@ void focus_cycle_popup_startup(gboolean reconfig) popup.hilite_rgba = NULL; - XMapWindow(ob_display, popup.text); + XMapWindow(obt_display, popup.text); stacking_add(INTERNAL_AS_WINDOW(&popup)); + g_hash_table_insert(window_map, &popup.bg, &popup); } void focus_cycle_popup_shutdown(gboolean reconfig) { icon_popup_free(single_popup); + g_hash_table_remove(window_map, &popup.bg); stacking_remove(INTERNAL_AS_WINDOW(&popup)); while(popup.targets) { ObFocusCyclePopupTarget *t = popup.targets->data; g_free(t->text); - XDestroyWindow(ob_display, t->win); + XDestroyWindow(obt_display, t->win); popup.targets = g_list_delete_link(popup.targets, popup.targets); } g_free(popup.hilite_rgba); + popup.hilite_rgba = NULL; - XDestroyWindow(ob_display, popup.text); - XDestroyWindow(ob_display, popup.bg); + XDestroyWindow(obt_display, popup.text); + XDestroyWindow(obt_display, popup.bg); RrAppearanceFree(popup.a_icon); RrAppearanceFree(popup.a_text); @@ -175,11 +177,11 @@ static void popup_setup(ObFocusCyclePopup *p, gboolean create_targets, for (it = g_list_last(focus_order); it; it = g_list_previous(it)) { ObClient *ft = it->data; - if (focus_cycle_target_valid(ft, - iconic_windows, - all_desktops, - dock_windows, - desktop_windows)) + if (focus_valid_target(ft, TRUE, + iconic_windows, + all_desktops, + dock_windows, + desktop_windows)) { gchar *text = popup_get_name(ft); @@ -196,7 +198,7 @@ static void popup_setup(ObFocusCyclePopup *p, gboolean create_targets, t->text = text; t->win = create_window(p->bg, 0, 0, NULL); - XMapWindow(ob_display, t->win); + XMapWindow(obt_display, t->win); p->targets = g_list_prepend(p->targets, t); ++n; @@ -240,7 +242,7 @@ static void popup_render(ObFocusCyclePopup *p, const ObClient *c) gint ml, mt, mr, mb; gint l, t, r, b; gint x, y, w, h; - Rect *screen_area; + Rect *screen_area = NULL; gint icons_per_row; gint icon_rows; gint textx, texty, textw, texth; @@ -252,8 +254,7 @@ static void popup_render(ObFocusCyclePopup *p, const ObClient *c) const ObFocusCyclePopupTarget *newtarget; gint newtargetx, newtargety; - /* XXX find the middle monitor? */ - screen_area = screen_physical_area_monitor(0); + screen_area = screen_physical_area_active(); /* get the outside margins */ RrMargins(p->a_bg, &ml, &mt, &mr, &mb); @@ -312,7 +313,7 @@ static void popup_render(ObFocusCyclePopup *p, const ObClient *c) if (!p->mapped) { /* position the background but don't draw it*/ - XMoveResizeWindow(ob_display, p->bg, x, y, w, h); + XMoveResizeWindow(obt_display, p->bg, x, y, w, h); /* set up the hilite texture for the background */ p->a_bg->texture[0].data.rgba.width = rgbaw; @@ -322,7 +323,7 @@ static void popup_render(ObFocusCyclePopup *p, const ObClient *c) p->a_bg->texture[0].data.rgba.data = p->hilite_rgba; /* position the text, but don't draw it */ - XMoveResizeWindow(ob_display, p->text, textx, texty, textw, texth); + XMoveResizeWindow(obt_display, p->text, textx, texty, textw, texth); p->a_text->surface.parentx = textx; p->a_text->surface.parenty = texty; } @@ -410,7 +411,7 @@ static void popup_render(ObFocusCyclePopup *p, const ObClient *c) innery += ICON_HILITE_WIDTH + ICON_HILITE_MARGIN; /* move the icon */ - XMoveResizeWindow(ob_display, target->win, + XMoveResizeWindow(obt_display, target->win, innerx, innery, innerw, innerh); /* get the icon from the client */ @@ -435,6 +436,8 @@ static void popup_render(ObFocusCyclePopup *p, const ObClient *c) RrPaint(p->a_text, p->text, textw, texth); p->last_target = newtarget; + + g_free(screen_area); } void focus_cycle_popup_show(ObClient *c, gboolean iconic_windows, @@ -453,20 +456,21 @@ void focus_cycle_popup_show(ObClient *c, gboolean iconic_windows, if (!popup.mapped) { /* show the dialog */ - XMapWindow(ob_display, popup.bg); - XFlush(ob_display); + XMapWindow(obt_display, popup.bg); + XFlush(obt_display); popup.mapped = TRUE; + screen_hide_desktop_popup(); } } -void focus_cycle_popup_hide() +void focus_cycle_popup_hide(void) { gulong ignore_start; ignore_start = event_start_ignore_all_enters(); - XUnmapWindow(ob_display, popup.bg); - XFlush(ob_display); + XUnmapWindow(obt_display, popup.bg); + XFlush(obt_display); event_end_ignore_all_enters(ignore_start); @@ -476,7 +480,7 @@ void focus_cycle_popup_hide() ObFocusCyclePopupTarget *t = popup.targets->data; g_free(t->text); - XDestroyWindow(ob_display, t->win); + XDestroyWindow(obt_display, t->win); popup.targets = g_list_delete_link(popup.targets, popup.targets); } @@ -506,21 +510,23 @@ void focus_cycle_popup_single_show(struct _ObClient *c, g_assert(popup.targets == NULL); /* position the popup */ - a = screen_physical_area_monitor(0); + a = screen_physical_area_active(); icon_popup_position(single_popup, CenterGravity, a->x + a->width / 2, a->y + a->height / 2); icon_popup_height(single_popup, POPUP_HEIGHT); icon_popup_min_width(single_popup, POPUP_WIDTH); icon_popup_max_width(single_popup, MAX(a->width/3, POPUP_WIDTH)); icon_popup_text_width(single_popup, popup.maxtextw); + g_free(a); } text = popup_get_name(c); icon_popup_show(single_popup, text, client_icon(c, ICON_SIZE, ICON_SIZE)); g_free(text); + screen_hide_desktop_popup(); } -void focus_cycle_popup_single_hide() +void focus_cycle_popup_single_hide(void) { icon_popup_hide(single_popup); }