X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Ffocus.c;h=3927272c5b6cabad247bff0339c1bca1a147d99e;hb=a46b4ee4341dcf5c86b9182b5b970825f2e11692;hp=8d5e6c547755654b037779ebedd6cba3c3cc996f;hpb=276b2be581c6cb138b439537761ff2ca42201805;p=chaz%2Fopenbox diff --git a/openbox/focus.c b/openbox/focus.c index 8d5e6c54..3927272c 100644 --- a/openbox/focus.c +++ b/openbox/focus.c @@ -17,33 +17,18 @@ #include #include -Client *focus_client = NULL; +ObClient *focus_client = NULL; GList **focus_order = NULL; /* these lists are created when screen_startup sets the number of desktops */ -Window focus_backup = None; - -static Client *focus_cycle_target = NULL; +static ObClient *focus_cycle_target = NULL; static Popup *focus_cycle_popup = NULL; void focus_startup() { - /* create the window which gets focus when no clients get it. Have to - make it override-redirect so we don't try manage it, since it is - mapped. */ - XSetWindowAttributes attrib; focus_client = NULL; - attrib.override_redirect = TRUE; - focus_backup = XCreateWindow(ob_display, ob_root, - -100, -100, 1, 1, 0, - CopyFromParent, InputOutput, CopyFromParent, - CWOverrideRedirect, &attrib); - XMapRaised(ob_display, focus_backup); - - /* do this *after* focus_backup is created, since it is used for - stacking */ focus_cycle_popup = popup_new(TRUE); /* start with nothing focused */ @@ -62,14 +47,12 @@ void focus_shutdown() popup_free(focus_cycle_popup); focus_cycle_popup = NULL; - XDestroyWindow(ob_display, focus_backup); - /* reset focus to root */ XSetInputFocus(ob_display, PointerRoot, RevertToPointerRoot, event_lasttime); } -static void push_to_top(Client *client) +static void push_to_top(ObClient *client) { guint desktop; @@ -79,10 +62,10 @@ static void push_to_top(Client *client) focus_order[desktop] = g_list_prepend(focus_order[desktop], client); } -void focus_set_client(Client *client) +void focus_set_client(ObClient *client) { Window active; - Client *old; + ObClient *old; #ifdef DEBUG_FOCUS g_message("focus_set_client 0x%lx", client ? client->window : 0); @@ -94,7 +77,7 @@ void focus_set_client(Client *client) if (client == NULL) { /* when nothing will be focused, send focus to the backup target */ - XSetInputFocus(ob_display, focus_backup, RevertToPointerRoot, + XSetInputFocus(ob_display, screen_support_win, RevertToPointerRoot, event_lasttime); XSync(ob_display, FALSE); } @@ -130,7 +113,7 @@ static gboolean focus_under_pointer() if (ob_pointer_pos(&x, &y)) { for (it = stacking_list; it != NULL; it = it->next) { if (WINDOW_IS_CLIENT(it->data)) { - Client *c = WINDOW_AS_CLIENT(it->data); + ObClient *c = WINDOW_AS_CLIENT(it->data); if (c->desktop == screen_desktop && RECT_CONTAINS(c->frame->area, x, y)) break; @@ -146,10 +129,10 @@ static gboolean focus_under_pointer() /* finds the first transient that isn't 'skip' and ensure's that client_normal is true for it */ -static Client *find_transient_recursive(Client *c, Client *top, Client *skip) +static ObClient *find_transient_recursive(ObClient *c, ObClient *top, ObClient *skip) { GSList *it; - Client *ret; + ObClient *ret; for (it = c->transients; it; it = it->next) { if (it->data == top) return NULL; @@ -160,9 +143,9 @@ static Client *find_transient_recursive(Client *c, Client *top, Client *skip) return NULL; } -static gboolean focus_fallback_transient(Client *top, Client *old) +static gboolean focus_fallback_transient(ObClient *top, ObClient *old) { - Client *target = find_transient_recursive(top, top, old); + ObClient *target = find_transient_recursive(top, top, old); if (!target) { /* make sure client_normal is true always */ if (!client_normal(top)) @@ -172,10 +155,10 @@ static gboolean focus_fallback_transient(Client *top, Client *old) return client_focus(target); } -void focus_fallback(FallbackType type) +void focus_fallback(ObFocusFallbackType type) { GList *it; - Client *old = NULL; + ObClient *old = NULL; old = focus_client; @@ -185,16 +168,16 @@ void focus_fallback(FallbackType type) */ focus_set_client(NULL); - if (!(type == Fallback_Desktop ? + if (!(type == OB_FOCUS_FALLBACK_DESKTOP ? config_focus_last_on_desktop : config_focus_last)) { if (config_focus_follow) focus_under_pointer(); return; } - if (type == Fallback_Unfocusing && old) { + if (type == OB_FOCUS_FALLBACK_UNFOCUSING && old) { /* try for transient relations */ if (old->transient_for) { - if (old->transient_for == TRAN_GROUP) { + if (old->transient_for == OB_TRAN_GROUP) { for (it = focus_order[screen_desktop]; it; it = it->next) { GSList *sit; @@ -226,12 +209,12 @@ void focus_fallback(FallbackType type) } for (it = focus_order[screen_desktop]; it != NULL; it = it->next) - if (type != Fallback_Unfocusing || it->data != old) + if (type != OB_FOCUS_FALLBACK_UNFOCUSING || it->data != old) if (client_normal(it->data) && /* dont fall back to 'anonymous' fullscreen windows. theres no checks for this is in transient/group fallbacks, so they can be fallback targets there. */ - !((Client*)it->data)->fullscreen && + !((ObClient*)it->data)->fullscreen && client_can_focus(it->data)) { gboolean r = client_focus(it->data); assert(r); @@ -241,13 +224,13 @@ void focus_fallback(FallbackType type) /* nothing to focus, and already set it to none above */ } -static void popup_cycle(Client *c, gboolean show) +static void popup_cycle(ObClient *c, gboolean show) { if (!show) { popup_hide(focus_cycle_popup); } else { Rect *a; - Client *p = c; + ObClient *p = c; char *title; a = screen_physical_area_monitor(0); @@ -262,7 +245,7 @@ static void popup_cycle(Client *c, gboolean show) popup_size(focus_cycle_popup, 320, 48); /* use the transient's parent's title/icon */ - while (p->transient_for && p->transient_for != TRAN_GROUP) + while (p->transient_for && p->transient_for != OB_TRAN_GROUP) p = p->transient_for; if (p == c) @@ -280,14 +263,14 @@ static void popup_cycle(Client *c, gboolean show) } } -Client *focus_cycle(gboolean forward, gboolean linear, gboolean done, +ObClient *focus_cycle(gboolean forward, gboolean linear, gboolean done, gboolean cancel) { - static Client *first = NULL; - static Client *t = NULL; + static ObClient *first = NULL; + static ObClient *t = NULL; static GList *order = NULL; GList *it, *start, *list; - Client *ft; + ObClient *ft; if (cancel) { if (focus_cycle_target) @@ -355,7 +338,7 @@ done_cycle: return NULL; } -void focus_order_add_new(Client *c) +void focus_order_add_new(ObClient *c) { guint d, i; @@ -365,20 +348,20 @@ void focus_order_add_new(Client *c) d = c->desktop; if (d == DESKTOP_ALL) { for (i = 0; i < screen_num_desktops; ++i) { - if (focus_order[i] && ((Client*)focus_order[i]->data)->iconic) + if (focus_order[i] && ((ObClient*)focus_order[i]->data)->iconic) focus_order[i] = g_list_insert(focus_order[i], c, 0); else focus_order[i] = g_list_insert(focus_order[i], c, 1); } } else - if (focus_order[d] && ((Client*)focus_order[d]->data)->iconic) + if (focus_order[d] && ((ObClient*)focus_order[d]->data)->iconic) focus_order[d] = g_list_insert(focus_order[d], c, 0); else focus_order[d] = g_list_insert(focus_order[d], c, 1); } } -void focus_order_remove(Client *c) +void focus_order_remove(ObClient *c) { guint d, i; @@ -390,7 +373,7 @@ void focus_order_remove(Client *c) focus_order[d] = g_list_remove(focus_order[d], c); } -static void to_top(Client *c, guint d) +static void to_top(ObClient *c, guint d) { focus_order[d] = g_list_remove(focus_order[d], c); if (!c->iconic) { @@ -400,12 +383,12 @@ static void to_top(Client *c, guint d) /* insert before first iconic window */ for (it = focus_order[d]; - it && !((Client*)it->data)->iconic; it = it->next); + it && !((ObClient*)it->data)->iconic; it = it->next); g_list_insert_before(focus_order[d], it, c); } } -void focus_order_to_top(Client *c) +void focus_order_to_top(ObClient *c) { guint d, i; @@ -417,7 +400,7 @@ void focus_order_to_top(Client *c) to_top(c, d); } -static void to_bottom(Client *c, guint d) +static void to_bottom(ObClient *c, guint d) { focus_order[d] = g_list_remove(focus_order[d], c); if (c->iconic) { @@ -427,12 +410,12 @@ static void to_bottom(Client *c, guint d) /* insert before first iconic window */ for (it = focus_order[d]; - it && !((Client*)it->data)->iconic; it = it->next); + it && !((ObClient*)it->data)->iconic; it = it->next); g_list_insert_before(focus_order[d], it, c); } } -void focus_order_to_bottom(Client *c) +void focus_order_to_bottom(ObClient *c) { guint d, i;