X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Ffocus_cycle_popup.c;h=e4cf5c10cf95459bebcee1a2593fd626e305d6f8;hb=29637976e6aecf45bae84ba9ce3ecb26635012f7;hp=015330bda32f2be41a9b25b972568f0b360ae349;hpb=4940d007cce43a135f1b448902f5a3571dbce62a;p=chaz%2Fopenbox diff --git a/openbox/focus_cycle_popup.c b/openbox/focus_cycle_popup.c index 015330bd..e4cf5c10 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" @@ -35,6 +34,7 @@ #define ICON_HILITE_WIDTH 2 #define ICON_HILITE_MARGIN 1 #define OUTSIDE_BORDER 3 +#define TEXT_BORDER 2 typedef struct _ObFocusCyclePopup ObFocusCyclePopup; typedef struct _ObFocusCyclePopupTarget ObFocusCyclePopupTarget; @@ -87,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); } @@ -96,9 +96,9 @@ 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.obwin.type = OB_WINDOW_CLASS_INTERNALWINDOW; popup.a_bg = RrAppearanceCopy(ob_rr_theme->osd_hilite_bg); popup.a_text = RrAppearanceCopy(ob_rr_theme->osd_hilite_label); popup.a_icon = RrAppearanceCopy(ob_rr_theme->a_clear_tex); @@ -112,9 +112,9 @@ void focus_cycle_popup_startup(gboolean reconfig) popup.a_bg->texture[0].type = RR_TEXTURE_RGBA; attrib.override_redirect = True; - attrib.border_pixel=RrColorPixel(ob_rr_theme->frame_focused_border_color); - popup.bg = create_window(RootWindow(ob_display, ob_screen), - ob_rr_theme->fbwidth, + attrib.border_pixel=RrColorPixel(ob_rr_theme->osd_border_color); + popup.bg = create_window(RootWindow(obt_display, ob_screen), + ob_rr_theme->obwidth, CWOverrideRedirect | CWBorderPixel, &attrib); popup.text = create_window(popup.bg, 0, 0, NULL); @@ -125,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)); + stacking_add(INTERNALWINDOW_AS_WINDOW(&popup)); + window_add(&popup.bg, INTERNALWINDOW_AS_WINDOW(&popup)); } void focus_cycle_popup_shutdown(gboolean reconfig) { icon_popup_free(single_popup); - stacking_remove(INTERNAL_AS_WINDOW(&popup)); + window_remove(popup.bg); + stacking_remove(INTERNALWINDOW_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); @@ -174,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); @@ -195,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; @@ -210,31 +213,26 @@ static void popup_setup(ObFocusCyclePopup *p, gboolean create_targets, static gchar *popup_get_name(ObClient *c) { ObClient *p; - gchar *title = NULL; + gchar *title; const gchar *desk = NULL; gchar *ret; - /* find our highest direct parent, including non-normal windows */ - for (p = c; p->transient_for && p->transient_for != OB_TRAN_GROUP; - p = p->transient_for); + /* find our highest direct parent */ + p = client_search_top_direct_parent(c); if (c->desktop != DESKTOP_ALL && c->desktop != screen_desktop) desk = screen_desktop_names[c->desktop]; - /* use the transient's parent's title/icon if we don't have one */ - if (p != c && !strcmp("", (c->iconic ? c->icon_title : c->title))) - title = g_strdup(p->iconic ? p->icon_title : p->title); + title = c->iconic ? c->icon_title : c->title; - if (title == NULL) - title = g_strdup(c->iconic ? c->icon_title : c->title); + /* use the transient's parent's title/icon if we don't have one */ + if (p != c && title[0] == '\0') + title = p->iconic ? p->icon_title : p->title; if (desk) ret = g_strdup_printf("%s [%s]", title, desk); - else { - ret = title; - title = NULL; - } - g_free(title); + else + ret = g_strdup(title); return ret; } @@ -244,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; @@ -256,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); @@ -287,10 +284,10 @@ static void popup_render(ObFocusCyclePopup *p, const ObClient *c) /* get the text dimensions */ textw = w - l - r; - texth = RrMinHeight(p->a_text); + texth = RrMinHeight(p->a_text) + TEXT_BORDER * 2; /* find the height of the dialog */ - h = t + b + (icon_rows * ICON_SIZE) + (OUTSIDE_BORDER*2 + texth); + h = t + b + (icon_rows * ICON_SIZE) + (OUTSIDE_BORDER + texth); /* get the position of the text */ textx = l; @@ -298,9 +295,9 @@ static void popup_render(ObFocusCyclePopup *p, const ObClient *c) /* find the position for the popup (include the outer borders) */ x = screen_area->x + (screen_area->width - - (w + ob_rr_theme->fbwidth * 2)) / 2; + (w + ob_rr_theme->obwidth * 2)) / 2; y = screen_area->y + (screen_area->height - - (h + ob_rr_theme->fbwidth * 2)) / 2; + (h + ob_rr_theme->obwidth * 2)) / 2; /* get the dimensions of the target hilite texture */ rgbax = ml; @@ -316,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; @@ -326,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; } @@ -414,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 */ @@ -439,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, @@ -457,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); @@ -480,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); } @@ -510,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); }