split the focustobottom action back out from unfocus

This commit is contained in:
Dana Jansens 2007-07-14 09:17:39 -04:00
parent bc2c2bc3f0
commit 27a0f0f4c9
6 changed files with 22 additions and 39 deletions

1
.gitignore vendored
View file

@ -30,7 +30,6 @@ m4/*.m4
*.la
missing
.dirstamp
openbox/actions/focustobottom.c
openbox/openbox
parser/obparser-3.0.pc
po/Makefile.in.in

View file

@ -162,6 +162,7 @@ openbox_openbox_SOURCES = \
openbox/actions/execute.c \
openbox/actions/exit.c \
openbox/actions/focus.c \
openbox/actions/focustobottom.c \
openbox/actions/fullscreen.c \
openbox/actions/growtoedge.c \
openbox/actions/iconify.c \

View file

@ -37,4 +37,5 @@ void action_all_startup()
action_movetoedge_startup();
action_growtoedge_startup();
action_if_startup();
action_focustobottom_startup();
}

View file

@ -38,5 +38,6 @@ void action_layer_startup();
void action_movetoedge_startup();
void action_growtoedge_startup();
void action_if_startup();
void action_focustobottom_startup();
#endif

View file

@ -0,0 +1,17 @@
#include "openbox/actions.h"
#include "openbox/focus.h"
static gboolean run_func(ObActionsData *data, gpointer options);
void action_focustobottom_startup()
{
actions_register("FocusToBottom", NULL, NULL, run_func, NULL, NULL);
}
/* Always return FALSE because its not interactive */
static gboolean run_func(ObActionsData *data, gpointer options)
{
if (data->client)
focus_order_to_bottom(data->client);
return FALSE;
}

View file

@ -1,53 +1,17 @@
#include "openbox/actions.h"
#include "openbox/focus.h"
typedef struct {
gboolean tobottom;
} 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_unfocus_startup()
{
actions_register("Unfocus",
setup_func,
free_func,
run_func,
NULL, NULL);
}
static gpointer setup_func(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node)
{
xmlNodePtr n;
Options *o;
o = g_new0(Options, 1);
o->tobottom = TRUE;
if ((n = parse_find_node("tobottom", node)))
o->tobottom = parse_bool(doc, n);
return o;
}
static void free_func(gpointer options)
{
Options *o = options;
g_free(o);
actions_register("Unfocus", NULL, NULL, run_func, NULL, NULL);
}
/* Always return FALSE because its not interactive */
static gboolean run_func(ObActionsData *data, gpointer options)
{
Options *o = options;
if (data->client && data->client == focus_client) {
if (o->tobottom)
focus_order_to_bottom(data->client);
if (data->client && data->client == focus_client)
focus_fallback(FALSE, FALSE, TRUE);
}
return FALSE;
}