X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Ffocus.c;h=8b7eb29a20ca283b9cf9750b8297df806ab07dc5;hb=f0b09e265a9b5c333ae27d57db6be79a3da6312f;hp=ad18d9748aea81f8a0e18c1893826393790aed05;hpb=34e819738b344a992a1dbfd6cdd165e0c8ddb3a9;p=chaz%2Fopenbox diff --git a/openbox/focus.c b/openbox/focus.c index ad18d974..8b7eb29a 100644 --- a/openbox/focus.c +++ b/openbox/focus.c @@ -34,7 +34,6 @@ void focus_startup() XSetWindowAttributes attrib; focus_client = NULL; - focus_cycle_popup = popup_new(TRUE); attrib.override_redirect = TRUE; focus_backup = XCreateWindow(ob_display, ob_root, @@ -43,6 +42,10 @@ void focus_startup() 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 */ focus_set_client(NULL); } @@ -265,9 +268,9 @@ static void popup_cycle(Client *c, gboolean show) if (p == c) title = NULL; else - title = g_strconcat((p->iconic ? p->icon_title : p->title), + title = g_strconcat((c->iconic ? c->icon_title : c->title), " - ", - (c->iconic ? c->icon_title : c->title), + (p->iconic ? p->icon_title : p->title), NULL); popup_show(focus_cycle_popup,