#include "openbox/screen.h"
#include "openbox/client.h"
#include "openbox/openbox.h"
-#include <glib.h>
+#include "obt/keyboard.h"
typedef enum {
LAST,
ObActionsIInputFunc *input,
ObActionsICancelFunc *cancel,
ObActionsIPostFunc *post);
+static void free_func(gpointer o);
static gboolean run_func(ObActionsData *data, gpointer options);
static gboolean i_pre_func(guint state, gpointer options);
static gboolean i_input_func(guint initial_state,
XEvent *e,
+ ObtIC *ic,
gpointer options,
gboolean *used);
static void i_post_func(gpointer options);
ObActionsIInputFunc *input,
ObActionsICancelFunc *cancel,
ObActionsIPostFunc *post);
-
+
void action_desktop_startup(void)
{
- actions_register_i("GoToDesktop", setup_go_func, g_free, run_func);
- actions_register_i("SendToDesktop", setup_send_func, g_free, run_func);
+ actions_register_i("GoToDesktop", setup_go_func, free_func, run_func);
+ actions_register_i("SendToDesktop", setup_send_func, free_func, run_func);
/* 3.4-compatibility */
- actions_register("DesktopLast", setup_go_last_func, g_free, run_func);
+ actions_register("DesktopLast", setup_go_last_func, free_func, run_func);
actions_register("SendToDesktopLast", setup_send_last_func,
- g_free, run_func);
- actions_register("Desktop", setup_go_abs_func, g_free, run_func);
- actions_register("SendToDesktop", setup_send_abs_func, g_free, run_func);
- actions_register_i("DesktopNext", setup_go_next_func, g_free, run_func);
+ free_func, run_func);
+ actions_register("Desktop", setup_go_abs_func, free_func, run_func);
+ actions_register("SendToDesktop", setup_send_abs_func,
+ free_func, run_func);
+ actions_register_i("DesktopNext", setup_go_next_func, free_func, run_func);
actions_register_i("SendToDesktopNext", setup_send_next_func,
- g_free, run_func);
+ free_func, run_func);
actions_register_i("DesktopPrevious", setup_go_prev_func,
- g_free, run_func);
+ free_func, run_func);
actions_register_i("SendToDesktopPrevious", setup_send_prev_func,
- g_free, run_func);
- actions_register_i("DesktopLeft", setup_go_left_func, g_free, run_func);
+ free_func, run_func);
+ actions_register_i("DesktopLeft", setup_go_left_func, free_func, run_func);
actions_register_i("SendToDesktopLeft", setup_send_left_func,
- g_free, run_func);
- actions_register_i("DesktopRight", setup_go_right_func, g_free, run_func);
+ free_func, run_func);
+ actions_register_i("DesktopRight", setup_go_right_func,
+ free_func, run_func);
actions_register_i("SendToDesktopRight", setup_send_right_func,
- g_free, run_func);
- actions_register_i("DesktopUp", setup_go_up_func, g_free, run_func);
+ free_func, run_func);
+ actions_register_i("DesktopUp", setup_go_up_func, free_func, run_func);
actions_register_i("SendToDesktopUp", setup_send_up_func,
- g_free, run_func);
- actions_register_i("DesktopDown", setup_go_down_func, g_free, run_func);
+ free_func, run_func);
+ actions_register_i("DesktopDown", setup_go_down_func, free_func, run_func);
actions_register_i("SendToDesktopDown", setup_send_down_func,
- g_free, run_func);
+ free_func, run_func);
}
static gpointer setup_func(xmlNodePtr node,
xmlNodePtr n;
Options *o;
- o = g_new0(Options, 1);
+ o = g_slice_new0(Options);
/* don't go anywhere if there are no options given */
o->type = ABSOLUTE;
o->u.abs.desktop = screen_desktop;
/* wrap by default - it's handy! */
o->u.rel.wrap = TRUE;
- if ((n = obt_parse_find_node(node, "to"))) {
- gchar *s = obt_parse_node_string(n);
+ if ((n = obt_xml_find_node(node, "to"))) {
+ gchar *s = obt_xml_node_string(n);
if (!g_ascii_strcasecmp(s, "last"))
o->type = LAST;
else if (!g_ascii_strcasecmp(s, "next")) {
g_free(s);
}
- if ((n = obt_parse_find_node(node, "wrap")))
- o->u.rel.wrap = obt_parse_node_bool(n);
+ if ((n = obt_xml_find_node(node, "wrap")))
+ o->u.rel.wrap = obt_xml_node_bool(n);
return o;
}
o->send = TRUE;
o->follow = TRUE;
- if ((n = obt_parse_find_node(node, "follow")))
- o->follow = obt_parse_node_bool(n);
+ if ((n = obt_xml_find_node(node, "follow")))
+ o->follow = obt_xml_node_bool(n);
if (o->type == RELATIVE && o->follow) {
o->interactive = TRUE;
return o;
}
+static void free_func(gpointer o)
+{
+ g_slice_free(Options, o);
+}
+
/* Always return FALSE because its not interactive */
static gboolean run_func(ObActionsData *data, gpointer options)
{
static gboolean i_input_func(guint initial_state,
XEvent *e,
+ ObtIC *ic,
gpointer options,
gboolean *used)
{
+ guint mods;
+
+ mods = obt_keyboard_only_modmasks(e->xkey.state);
+ if (e->type == KeyRelease) {
+ /* remove from the state the mask of the modifier key being
+ released, if it is a modifier key being released that is */
+ mods &= ~obt_keyboard_keycode_to_modmask(e->xkey.keycode);
+ }
+
if (e->type == KeyPress) {
+ KeySym sym = obt_keyboard_keypress_to_keysym(e);
+
/* Escape cancels no matter what */
- if (ob_keycode_match(e->xkey.keycode, OB_KEY_ESCAPE)) {
+ if (sym == XK_Escape)
return FALSE;
- }
/* There were no modifiers and they pressed enter */
- else if (ob_keycode_match(e->xkey.keycode, OB_KEY_RETURN) &&
- !initial_state)
- {
+ else if (sym == XK_Return && !initial_state)
return FALSE;
- }
}
/* They released the modifiers */
- else if (e->type == KeyRelease && initial_state &&
- (e->xkey.state & initial_state) == 0)
+ else if (e->type == KeyRelease && initial_state && !(mods & initial_state))
{
return FALSE;
}
static gpointer setup_follow(xmlNodePtr node)
{
xmlNodePtr n;
- Options *o = g_new0(Options, 1);
+ Options *o = g_slice_new0(Options);
o->send = TRUE;
o->follow = TRUE;
- if ((n = obt_parse_find_node(node, "follow")))
- o->follow = obt_parse_node_bool(n);
+ if ((n = obt_xml_find_node(node, "follow")))
+ o->follow = obt_xml_node_bool(n);
return o;
}
static gpointer setup_go_last_func(xmlNodePtr node)
{
- Options *o = g_new0(Options, 1);
+ Options *o = g_slice_new0(Options);
o->type = LAST;
return o;
}
static gpointer setup_go_abs_func(xmlNodePtr node)
{
xmlNodePtr n;
- Options *o = g_new0(Options, 1);
+ Options *o = g_slice_new0(Options);
o->type = ABSOLUTE;
- if ((n = obt_parse_find_node(node, "desktop")))
- o->u.abs.desktop = obt_parse_node_int(n) - 1;
+ if ((n = obt_xml_find_node(node, "desktop")))
+ o->u.abs.desktop = obt_xml_node_int(n) - 1;
else
o->u.abs.desktop = screen_desktop;
return o;
xmlNodePtr n;
Options *o = setup_follow(node);
o->type = ABSOLUTE;
- if ((n = obt_parse_find_node(node, "desktop")))
- o->u.abs.desktop = obt_parse_node_int(n) - 1;
+ if ((n = obt_xml_find_node(node, "desktop")))
+ o->u.abs.desktop = obt_xml_node_int(n) - 1;
else
o->u.abs.desktop = screen_desktop;
return o;
o->u.rel.dir = dir;
o->u.rel.wrap = TRUE;
- if ((n = obt_parse_find_node(node, "wrap")))
- o->u.rel.wrap = obt_parse_node_bool(n);
+ if ((n = obt_xml_find_node(node, "wrap")))
+ o->u.rel.wrap = obt_xml_node_bool(n);
if (input) {
o->interactive = TRUE;
ObActionsICancelFunc *cancel,
ObActionsIPostFunc *post)
{
- Options *o = g_new0(Options, 1);
+ Options *o = g_slice_new0(Options);
setup_rel(o, node, TRUE, OB_DIRECTION_EAST, pre, input, post);
return o;
}
ObActionsICancelFunc *cancel,
ObActionsIPostFunc *post)
{
- Options *o = g_new0(Options, 1);
+ Options *o = g_slice_new0(Options);
setup_rel(o, node, TRUE, OB_DIRECTION_WEST, pre, input, post);
return o;
}
ObActionsICancelFunc *cancel,
ObActionsIPostFunc *post)
{
- Options *o = g_new0(Options, 1);
+ Options *o = g_slice_new0(Options);
setup_rel(o, node, FALSE, OB_DIRECTION_WEST, pre, input, post);
return o;
}
ObActionsICancelFunc *cancel,
ObActionsIPostFunc *post)
{
- Options *o = g_new0(Options, 1);
+ Options *o = g_slice_new0(Options);
setup_rel(o, node, FALSE, OB_DIRECTION_EAST, pre, input, post);
return o;
}
ObActionsICancelFunc *cancel,
ObActionsIPostFunc *post)
{
- Options *o = g_new0(Options, 1);
+ Options *o = g_slice_new0(Options);
setup_rel(o, node, FALSE, OB_DIRECTION_NORTH, pre, input, post);
return o;
}
ObActionsICancelFunc *cancel,
ObActionsIPostFunc *post)
{
- Options *o = g_new0(Options, 1);
+ Options *o = g_slice_new0(Options);
setup_rel(o, node, FALSE, OB_DIRECTION_SOUTH, pre, input, post);
return o;
}
projects / chaz / openbox / blobdiff