nilix/openbox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix the popup for directional focusing, only show what is going to be a valid target. change directional focus to use the same criteria as normal cycling.

Browse source
This commit is contained in:
Dana Jansens 2007-05-19 20:31:08 +00:00
parent 34ad5b92b4
commit 2253b5e341
4 changed files with 34 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

43
openbox/focus_cycle.c
View file

@ -35,6 +35,7 @@ ObClient *focus_cycle_target = NULL;
static void focus_cycle_destroy_notify (ObClient *client, gpointer data); static void focus_cycle_destroy_notify (ObClient *client, gpointer data);
static gboolean focus_target_has_siblings (ObClient *ft, static gboolean focus_target_has_siblings (ObClient *ft,
gboolean iconic_windows,
gboolean all_desktops); gboolean all_desktops);
static ObClient *focus_find_directional (ObClient *c, static ObClient *focus_find_directional (ObClient *c,
ObDirection dir, ObDirection dir,
@ -76,7 +77,9 @@ static void focus_cycle_destroy_notify(ObClient *client, gpointer data)
/*! Returns if a focus target has valid group siblings that can be cycled /*! Returns if a focus target has valid group siblings that can be cycled
to in its place */ to in its place */
static gboolean focus_target_has_siblings(ObClient *ft, gboolean all_desktops) static gboolean focus_target_has_siblings(ObClient *ft,
gboolean iconic_windows,
gboolean all_desktops)
{ {
GSList *it; GSList *it;
@ -87,7 +90,8 @@ static gboolean focus_target_has_siblings(ObClient *ft, gboolean all_desktops)
ObClient *c = it->data; ObClient *c = it->data;
/* check that it's not a helper window to avoid infinite recursion */ /* check that it's not a helper window to avoid infinite recursion */
if (c != ft && !client_helper(c) && if (c != ft && !client_helper(c) &&
focus_cycle_target_valid(c, all_desktops, FALSE, FALSE)) focus_cycle_target_valid(c, iconic_windows, all_desktops, FALSE,
FALSE))
{ {
return TRUE; return TRUE;
} }
@ -96,6 +100,7 @@ static gboolean focus_target_has_siblings(ObClient *ft, gboolean all_desktops)
} }
gboolean focus_cycle_target_valid(ObClient *ft, gboolean focus_cycle_target_valid(ObClient *ft,
gboolean iconic_windows,
gboolean all_desktops, gboolean all_desktops,
gboolean dock_windows, gboolean dock_windows,
gboolean desktop_windows) gboolean desktop_windows)
@ -112,6 +117,9 @@ gboolean focus_cycle_target_valid(ObClient *ft,
/* the window can receive focus somehow */ /* the window can receive focus somehow */
ok = ok && (ft->can_focus || ft->focus_notify); ok = ok && (ft->can_focus || ft->focus_notify);
/* the window is not iconic, or we're allowed to go to iconic ones */
ok = ok && (iconic_windows || !ft->iconic);
/* it's the right type of window */ /* it's the right type of window */
if (dock_windows || desktop_windows) if (dock_windows || desktop_windows)
ok = ok && ((dock_windows && ft->type == OB_CLIENT_TYPE_DOCK) || ok = ok && ((dock_windows && ft->type == OB_CLIENT_TYPE_DOCK) ||
@ -127,7 +135,7 @@ gboolean focus_cycle_target_valid(ObClient *ft,
((focus_client && ft->group == focus_client->group) || ((focus_client && ft->group == focus_client->group) ||
/* ... or if there are no other windows in its group /* ... or if there are no other windows in its group
that can be cycled to instead */ that can be cycled to instead */
!focus_target_has_siblings(ft, all_desktops)))); !focus_target_has_siblings(ft, iconic_windows, all_desktops))));
/* it's not set to skip the taskbar (unless it is a type that would be /* it's not set to skip the taskbar (unless it is a type that would be
expected to set this hint */ expected to set this hint */
@ -190,7 +198,8 @@ void focus_cycle(gboolean forward, gboolean all_desktops,
if (it == NULL) it = g_list_last(list); if (it == NULL) it = g_list_last(list);
} }
ft = it->data; ft = it->data;
if (focus_cycle_target_valid(ft, all_desktops, dock_windows, if (focus_cycle_target_valid(ft, TRUE,
all_desktops, dock_windows,
desktop_windows)) desktop_windows))
{ {
if (interactive) { if (interactive) {
@ -200,7 +209,8 @@ void focus_cycle(gboolean forward, gboolean all_desktops,
} }
if (dialog) if (dialog)
/* same arguments as focus_target_valid */ /* same arguments as focus_target_valid */
focus_cycle_popup_show(ft, all_desktops, dock_windows, focus_cycle_popup_show(ft, TRUE,
all_desktops, dock_windows,
desktop_windows); desktop_windows);
return; return;
} else if (ft != focus_cycle_target) { } else if (ft != focus_cycle_target) {
@ -257,23 +267,8 @@ static ObClient *focus_find_directional(ObClient *c, ObDirection dir,
/* the currently selected window isn't interesting */ /* the currently selected window isn't interesting */
if(cur == c) if(cur == c)
continue; continue;
if (cur->type == OB_CLIENT_TYPE_DOCK && !dock_windows) if (!focus_cycle_target_valid(it->data, FALSE, FALSE, dock_windows,
continue; desktop_windows))
if (cur->type == OB_CLIENT_TYPE_DESKTOP && !desktop_windows)
continue;
if (!client_normal(cur) &&
cur->type != OB_CLIENT_TYPE_DOCK &&
cur->type != OB_CLIENT_TYPE_DESKTOP)
continue;
/* using c->desktop instead of screen_desktop doesn't work if the
* current window was omnipresent, hope this doesn't have any other
* side effects */
if(screen_desktop != cur->desktop && cur->desktop != DESKTOP_ALL)
continue;
if(cur->iconic)
continue;
if(!(client_focus_target(cur) == cur &&
client_can_focus(cur)))
continue; continue;
/* find the centre coords of this window, from the /* find the centre coords of this window, from the
@ -367,7 +362,7 @@ void focus_directional_cycle(ObDirection dir, gboolean dock_windows,
GList *it; GList *it;
for (it = focus_order; it; it = g_list_next(it)) for (it = focus_order; it; it = g_list_next(it))
if (focus_cycle_target_valid(it->data, FALSE, dock_windows, if (focus_cycle_target_valid(it->data, FALSE, FALSE, dock_windows,
desktop_windows)) desktop_windows))
ft = it->data; ft = it->data;
} }
@ -380,7 +375,7 @@ void focus_directional_cycle(ObDirection dir, gboolean dock_windows,
} }
if (focus_cycle_target && dialog) { if (focus_cycle_target && dialog) {
/* same arguments as focus_target_valid */ /* same arguments as focus_target_valid */
focus_cycle_popup_show(focus_cycle_target, FALSE, dock_windows, focus_cycle_popup_show(focus_cycle_target, FALSE, FALSE, dock_windows,
desktop_windows); desktop_windows);
return; return;
} }

1
openbox/focus_cycle.h
View file

@ -45,6 +45,7 @@ void focus_directional_cycle(ObDirection dir, gboolean dock_windows,
void focus_cycle_stop(); void focus_cycle_stop();
gboolean focus_cycle_target_valid(struct _ObClient *ft, gboolean focus_cycle_target_valid(struct _ObClient *ft,
gboolean iconic_windows,
gboolean all_desktops, gboolean all_desktops,
gboolean dock_windows, gboolean dock_windows,
gboolean desktop_windows); gboolean desktop_windows);

19
openbox/focus_cycle_popup.c
View file

@ -71,9 +71,13 @@ struct _ObFocusCyclePopup
static ObFocusCyclePopup popup; static ObFocusCyclePopup popup;
static gchar *popup_get_name (ObClient *c); static gchar *popup_get_name (ObClient *c);
static void popup_setup (ObFocusCyclePopup *p,gboolean all_desktops, static void popup_setup (ObFocusCyclePopup *p,
gboolean dock_windows, gboolean desktop_windows); gboolean iconic_windows,
static void popup_render (ObFocusCyclePopup *p, const ObClient *c); gboolean all_desktops,
gboolean dock_windows,
gboolean desktop_windows);
static void popup_render (ObFocusCyclePopup *p,
const ObClient *c);
static Window create_window(Window parent, guint bwidth, gulong mask, static Window create_window(Window parent, guint bwidth, gulong mask,
XSetWindowAttributes *attr) XSetWindowAttributes *attr)
@ -142,7 +146,8 @@ void focus_cycle_popup_shutdown(gboolean reconfig)
RrAppearanceFree(popup.a_bg); RrAppearanceFree(popup.a_bg);
} }
static void popup_setup(ObFocusCyclePopup *p,gboolean all_desktops, static void popup_setup(ObFocusCyclePopup *p,
gboolean iconic_windows, gboolean all_desktops,
gboolean dock_windows, gboolean desktop_windows) gboolean dock_windows, gboolean desktop_windows)
{ {
gint maxwidth, n; gint maxwidth, n;
@ -161,6 +166,7 @@ static void popup_setup(ObFocusCyclePopup *p,gboolean all_desktops,
ObClient *ft = it->data; ObClient *ft = it->data;
if (focus_cycle_target_valid(ft, if (focus_cycle_target_valid(ft,
iconic_windows,
all_desktops, all_desktops,
dock_windows, dock_windows,
desktop_windows)) desktop_windows))
@ -410,7 +416,7 @@ static void popup_render(ObFocusCyclePopup *p, const ObClient *c)
p->last_target = newtarget; p->last_target = newtarget;
} }
void focus_cycle_popup_show(ObClient *c, void focus_cycle_popup_show(ObClient *c, gboolean iconic_windows,
gboolean all_desktops, gboolean dock_windows, gboolean all_desktops, gboolean dock_windows,
gboolean desktop_windows) gboolean desktop_windows)
{ {
@ -418,7 +424,8 @@ void focus_cycle_popup_show(ObClient *c,
/* do this stuff only when the dialog is first showing */ /* do this stuff only when the dialog is first showing */
if (!popup.mapped) if (!popup.mapped)
popup_setup(&popup, all_desktops, dock_windows, desktop_windows); popup_setup(&popup, iconic_windows, all_desktops,
dock_windows, desktop_windows);
g_assert(popup.targets != NULL); g_assert(popup.targets != NULL);
popup_render(&popup, c); popup_render(&popup, c);

2
openbox/focus_cycle_popup.h
View file

@ -27,7 +27,7 @@ struct _ObClient;
void focus_cycle_popup_startup(gboolean reconfig); void focus_cycle_popup_startup(gboolean reconfig);
void focus_cycle_popup_shutdown(gboolean reconfig); void focus_cycle_popup_shutdown(gboolean reconfig);
void focus_cycle_popup_show(struct _ObClient *c, void focus_cycle_popup_show(struct _ObClient *c, gboolean iconic_windows,
gboolean all_desktops, gboolean dock_windows, gboolean all_desktops, gboolean dock_windows,
gboolean desktop_windows); gboolean desktop_windows);
void focus_cycle_popup_hide(); void focus_cycle_popup_hide();