#include "config.h"
#include "keyboard.h"
#include "mouse.h"
+#include "actions.h"
#include "prop.h"
#include "translate.h"
#include "client.h"
gboolean config_focus_under_mouse;
ObPlacePolicy config_place_policy;
+gboolean config_place_center;
gchar *config_theme;
gboolean config_theme_keepborder;
dst->pos_given = TRUE;
dst->center_x = src->center_x;
dst->center_y = src->center_y;
+ dst->opposite_x = src->opposite_x;
+ dst->opposite_y = src->opposite_y;
dst->position.x = src->position.x;
dst->position.y = src->position.y;
dst->monitor = src->monitor;
settings->center_x = TRUE;
x_pos_given = TRUE;
} else {
- settings->position.x = parse_int(doc, c);
+ if (s[0] == '-')
+ settings->opposite_x = TRUE;
+ if (s[0] == '-' || s[0] == '+')
+ settings->position.x = atoi(s+1);
+ else
+ settings->position.x = atoi(s);
x_pos_given = TRUE;
}
g_free(s);
settings->center_y = TRUE;
settings->pos_given = TRUE;
} else {
- settings->position.y = parse_int(doc, c);
+ if (s[0] == '-')
+ settings->opposite_y = TRUE;
+ if (s[0] == '-' || s[0] == '+')
+ settings->position.y = atoi(s+1);
+ else
+ settings->position.y = atoi(s);
settings->pos_given = TRUE;
}
g_free(s);
}
else if ((n = parse_find_node("action", node->children))) {
while (n) {
- ObAction *action;
+ ObActionsAct *action;
- action = action_parse(i, doc, n, OB_USER_ACTION_KEYBOARD_KEY);
+ action = actions_parse(i, doc, n);
if (action)
keyboard_bind(keylist, action);
n = parse_find_node("action", n->next);
xmlNodePtr n, nbut, nact;
gchar *buttonstr;
gchar *contextstr;
- ObUserAction uact;
ObMouseAction mact;
- ObAction *action;
mouse_unbind_all();
if (!parse_attr_string("button", nbut, &buttonstr))
goto next_nbut;
if (parse_attr_contains("press", nbut, "action")) {
- uact = OB_USER_ACTION_MOUSE_PRESS;
mact = OB_MOUSE_ACTION_PRESS;
} else if (parse_attr_contains("release", nbut, "action")) {
- uact = OB_USER_ACTION_MOUSE_RELEASE;
mact = OB_MOUSE_ACTION_RELEASE;
} else if (parse_attr_contains("click", nbut, "action")) {
- uact = OB_USER_ACTION_MOUSE_CLICK;
mact = OB_MOUSE_ACTION_CLICK;
} else if (parse_attr_contains("doubleclick", nbut,"action")) {
- uact = OB_USER_ACTION_MOUSE_DOUBLE_CLICK;
mact = OB_MOUSE_ACTION_DOUBLE_CLICK;
} else if (parse_attr_contains("drag", nbut, "action")) {
- uact = OB_USER_ACTION_MOUSE_MOTION;
mact = OB_MOUSE_ACTION_MOTION;
} else
goto next_nbut;
nact = parse_find_node("action", nbut->children);
while (nact) {
- if ((action = action_parse(i, doc, nact, uact)))
+ ObActionsAct *action;
+
+ if ((action = actions_parse(i, doc, nact)))
mouse_bind(buttonstr, contextstr, mact, action);
nact = parse_find_node("action", nact->next);
}
if ((n = parse_find_node("policy", node)))
if (parse_contains("UnderMouse", doc, n))
config_place_policy = OB_PLACE_POLICY_MOUSE;
+ if ((n = parse_find_node("center", node)))
+ config_place_center = parse_bool(doc, n);
}
static void parse_theme(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node,
{
ObDefKeyBind *it;
ObDefKeyBind binds[] = {
+ { NULL, NULL },
{ "A-Tab", "NextWindow" },
{ "S-A-Tab", "PreviousWindow" },
{ "A-F4", "Close" },
for (it = binds; it->key; ++it) {
GList *l = g_list_append(NULL, g_strdup(it->key));
- keyboard_bind(l, action_from_string(it->actname,
- OB_USER_ACTION_KEYBOARD_KEY));
+ keyboard_bind(l, actions_parse_string(it->actname));
+ g_list_free(l);
}
}
{
ObDefMouseBind *it;
ObDefMouseBind binds[] = {
+ { NULL, NULL, 0, NULL },
{ "Left", "Client", OB_MOUSE_ACTION_PRESS, "Focus" },
{ "Middle", "Client", OB_MOUSE_ACTION_PRESS, "Focus" },
{ "Right", "Client", OB_MOUSE_ACTION_PRESS, "Focus" },
{ NULL, NULL, 0, NULL }
};
- for (it = binds; it->button; ++it) {
- ObUserAction uact;
- switch (it->mact) {
- case OB_MOUSE_ACTION_PRESS:
- uact = OB_USER_ACTION_MOUSE_PRESS; break;
- case OB_MOUSE_ACTION_RELEASE:
- uact = OB_USER_ACTION_MOUSE_RELEASE; break;
- case OB_MOUSE_ACTION_CLICK:
- uact = OB_USER_ACTION_MOUSE_CLICK; break;
- case OB_MOUSE_ACTION_DOUBLE_CLICK:
- uact = OB_USER_ACTION_MOUSE_DOUBLE_CLICK; break;
- case OB_MOUSE_ACTION_MOTION:
- uact = OB_USER_ACTION_MOUSE_MOTION; break;
- default:
- g_assert_not_reached();
- }
+ for (it = binds; it->button; ++it)
mouse_bind(it->button, it->context, it->mact,
- action_from_string(it->actname, uact));
- }
+ actions_parse_string(it->actname));
}
void config_startup(ObParseInst *i)
parse_register(i, "focus", parse_focus, NULL);
config_place_policy = OB_PLACE_POLICY_SMART;
+ config_place_center = TRUE;
parse_register(i, "placement", parse_placement, NULL);