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

remove the activate action, make the focus action "activate" but not raise or unshade

Browse source
This commit is contained in:
Dana Jansens 2007-06-22 14:09:57 +00:00
parent d642be361f
commit 6c5f6ed1f5
5 changed files with 8 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Makefile.am
View file

@ -156,13 +156,13 @@ openbox_openbox_SOURCES = \
gettext.h \
openbox/actions/all.c \
openbox/actions/all.h \
openbox/actions/activate.c \
openbox/actions/breakchroot.c \
openbox/actions/close.c \
openbox/actions/cyclewindows.c \
openbox/actions/debug.c \
openbox/actions/execute.c \
openbox/actions/exit.c \
openbox/actions/focus.c \
openbox/actions/move.c \
openbox/actions/reconfigure.c \
openbox/actions/restart.c \

2
openbox/actions/all.c
View file

@ -10,8 +10,8 @@ void action_all_startup()
action_exit_startup();
action_restart_startup();
action_cyclewindows_startup();
action_activate_startup();
action_breakchroot_startup();
action_close_startup();
action_move_startup();
action_focus_startup();
}

2
openbox/actions/all.h
View file

@ -11,9 +11,9 @@ void action_reconfigure_startup();
void action_exit_startup();
void action_restart_startup();
void action_cyclewindows_startup();
void action_activate_startup();
void action_breakchroot_startup();
void action_close_startup();
void action_move_startup();
void action_focus_startup();
#endif

14
openbox/actions/activate.c → openbox/actions/focus.c
View file

@ -5,17 +5,15 @@
typedef struct {
gboolean here;
gboolean raise;
gboolean unshade;
} Options;
static gpointer setup_func(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node);
static void free_func(gpointer options);
static gboolean run_func(ObActionsData *data, gpointer options);
void action_activate_startup()
void action_focus_startup()
{
actions_register("Activate",
actions_register("Focus",
setup_func,
free_func,
run_func,
@ -28,15 +26,9 @@ static gpointer setup_func(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node)
Options *o;
o = g_new0(Options, 1);
o->raise = TRUE;
o->unshade = TRUE;
if ((n = parse_find_node("here", node)))
o->here = parse_bool(doc, n);
if ((n = parse_find_node("raise", node)))
o->raise = parse_bool(doc, n);
if ((n = parse_find_node("unshade", node)))
o->unshade = parse_bool(doc, n);
return o;
}
@ -57,7 +49,7 @@ static gboolean run_func(ObActionsData *data, gpointer options)
data->context != OB_FRAME_CONTEXT_CLIENT ||
data->context != OB_FRAME_CONTEXT_FRAME)
{
client_activate(data->client, o->here, o->raise, o->unshade, TRUE);
client_activate(data->client, o->here, FALSE, FALSE, TRUE);
}
} else {
/* focus action on something other than a client, make keybindings

4
openbox/focus_cycle.c
View file

@ -137,7 +137,7 @@ ObClient* focus_cycle(gboolean forward, gboolean all_desktops,
focus_cycle_all_desktops,
focus_cycle_dock_windows,
focus_cycle_desktop_windows);
return NULL;
return focus_cycle_target;
} else if (ft != focus_cycle_target) {
focus_cycle_target = ft;
done = TRUE;
@ -316,7 +316,7 @@ ObClient* focus_directional_cycle(ObDirection dir, gboolean dock_windows,
focus_cycle_all_desktops,
focus_cycle_dock_windows,
focus_cycle_desktop_windows);
return NULL;
return focus_cycle_target;
done_cycle:
if (done && !cancel) ret = focus_cycle_target;