make omnipresent back into toggleomnipresent
This commit is contained in:
parent
1af52f6b8d
commit
bea270cac5
1 changed files with 6 additions and 47 deletions
|
@ -2,61 +2,20 @@
|
||||||
#include "openbox/client.h"
|
#include "openbox/client.h"
|
||||||
#include "openbox/screen.h"
|
#include "openbox/screen.h"
|
||||||
|
|
||||||
typedef struct {
|
static gboolean run_func_toggle(ObActionsData *data, gpointer options);
|
||||||
gboolean toggle;
|
|
||||||
gboolean on;
|
|
||||||
} 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_omnipresent_startup()
|
void action_omnipresent_startup()
|
||||||
{
|
{
|
||||||
actions_register("omnipresent",
|
actions_register("ToggleOmnipresent", NULL, NULL, run_func_toggle,
|
||||||
setup_func,
|
|
||||||
free_func,
|
|
||||||
run_func,
|
|
||||||
NULL, NULL);
|
NULL, NULL);
|
||||||
}
|
}
|
||||||
|
|
||||||
static gpointer setup_func(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node)
|
|
||||||
{
|
|
||||||
xmlNodePtr n;
|
|
||||||
Options *o;
|
|
||||||
|
|
||||||
o = g_new0(Options, 1);
|
|
||||||
o->toggle = TRUE;
|
|
||||||
|
|
||||||
if ((n = parse_find_node("state", node))) {
|
|
||||||
gchar *s = parse_string(doc, n);
|
|
||||||
if (g_ascii_strcasecmp(s, "toggle")) {
|
|
||||||
o->toggle = FALSE;
|
|
||||||
o->on = parse_bool(doc, n);
|
|
||||||
}
|
|
||||||
g_free(s);
|
|
||||||
}
|
|
||||||
|
|
||||||
return o;
|
|
||||||
}
|
|
||||||
|
|
||||||
static void free_func(gpointer options)
|
|
||||||
{
|
|
||||||
Options *o = options;
|
|
||||||
|
|
||||||
g_free(o);
|
|
||||||
}
|
|
||||||
|
|
||||||
/* Always return FALSE because its not interactive */
|
/* Always return FALSE because its not interactive */
|
||||||
static gboolean run_func(ObActionsData *data, gpointer options)
|
static gboolean run_func_toggle(ObActionsData *data, gpointer options)
|
||||||
{
|
{
|
||||||
Options *o = options;
|
|
||||||
|
|
||||||
if (data->client)
|
if (data->client)
|
||||||
if (o->toggle || (o->on != (data->client->desktop == DESKTOP_ALL)))
|
client_set_desktop(data->client,
|
||||||
client_set_desktop(data->client,
|
data->client->desktop == DESKTOP_ALL ?
|
||||||
data->client->desktop == DESKTOP_ALL ?
|
screen_desktop : DESKTOP_ALL, FALSE, TRUE);
|
||||||
screen_desktop : DESKTOP_ALL, FALSE, TRUE);
|
|
||||||
|
|
||||||
return FALSE;
|
return FALSE;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue