#include "config.h"
#include "keyboard.h"
#include "mouse.h"
+#include "actions.h"
#include "prop.h"
#include "translate.h"
#include "client.h"
guint config_focus_delay;
gboolean config_focus_raise;
gboolean config_focus_last;
+gboolean config_focus_under_mouse;
ObPlacePolicy config_place_policy;
+gboolean config_place_center;
gchar *config_theme;
gboolean config_theme_keepborder;
gint config_mouse_threshold;
gint config_mouse_dclicktime;
+gint config_mouse_screenedgetime;
-gboolean config_menu_warppointer;
guint config_menu_hide_delay;
gboolean config_menu_middle;
guint config_submenu_show_delay;
GSList *config_per_app_settings;
+ObAppSettings* config_create_app_settings()
+{
+ ObAppSettings *settings = g_new0(ObAppSettings, 1);
+ settings->decor = -1;
+ settings->shade = -1;
+ settings->monitor = -1;
+ settings->focus = -1;
+ settings->desktop = 0;
+ settings->layer = -2;
+ settings->iconic = -1;
+ settings->skip_pager = -1;
+ settings->skip_taskbar = -1;
+ settings->fullscreen = -1;
+ settings->max_horz = -1;
+ settings->max_vert = -1;
+ return settings;
+}
+
+#define copy_if(setting, default) \
+ if (src->setting != default) dst->setting = src->setting
+void config_app_settings_copy_non_defaults(const ObAppSettings *src,
+ ObAppSettings *dst)
+{
+ g_assert(src != NULL);
+ g_assert(dst != NULL);
+
+ copy_if(decor, -1);
+ copy_if(shade, -1);
+ copy_if(focus, -1);
+ copy_if(desktop, 0);
+ copy_if(layer, -2);
+ copy_if(iconic, -1);
+ copy_if(skip_pager, -1);
+ copy_if(skip_taskbar, -1);
+ copy_if(fullscreen, -1);
+ copy_if(max_horz, -1);
+ copy_if(max_vert, -1);
+
+ if (src->pos_given) {
+ 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;
+ }
+}
+
/*
<applications>
<application name="aterm">
xmlNodePtr node, gpointer d)
{
xmlNodePtr app = parse_find_node("application", node->children);
- gchar *name, *class;
+ gchar *name = NULL, *class = NULL, *role = NULL;
gboolean name_set, class_set;
gboolean x_pos_given;
name_set = parse_attr_string("name", app, &name);
if (class_set || name_set) {
xmlNodePtr n, c;
- ObAppSettings *settings = g_new0(ObAppSettings, 1);
+ ObAppSettings *settings = config_create_app_settings();;
if (name_set)
- settings->name = name;
- else
- settings->name = NULL;
+ settings->name = g_pattern_spec_new(name);
if (class_set)
- settings->class = class;
- else
- settings->class = NULL;
+ settings->class = g_pattern_spec_new(class);
- if (!parse_attr_string("role", app, &settings->role))
- settings->role = NULL;
+ if (parse_attr_string("role", app, &role))
+ settings->role = g_pattern_spec_new(role);
- settings->decor = -1;
if ((n = parse_find_node("decor", app->children)))
if (!parse_contains("default", doc, n))
settings->decor = parse_bool(doc, n);
- settings->shade = -1;
if ((n = parse_find_node("shade", app->children)))
if (!parse_contains("default", doc, n))
settings->shade = parse_bool(doc, n);
- settings->position.x = settings->position.y = 0;
- settings->pos_given = FALSE;
if ((n = parse_find_node("position", app->children))) {
if ((c = parse_find_node("x", n->children)))
if (!parse_contains("default", doc, c)) {
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);
}
}
- settings->focus = -1;
if ((n = parse_find_node("focus", app->children)))
if (!parse_contains("default", doc, n))
settings->focus = parse_bool(doc, n);
settings->desktop = i;
}
g_free(s);
- } else
- settings->desktop = 0;
+ }
}
- settings->layer = -2;
if ((n = parse_find_node("layer", app->children)))
if (!parse_contains("default", doc, n)) {
gchar *s = parse_string(doc, n);
g_free(s);
}
- settings->iconic = -1;
if ((n = parse_find_node("iconic", app->children)))
if (!parse_contains("default", doc, n))
settings->iconic = parse_bool(doc, n);
- settings->skip_pager = -1;
if ((n = parse_find_node("skip_pager", app->children)))
if (!parse_contains("default", doc, n))
settings->skip_pager = parse_bool(doc, n);
- settings->skip_taskbar = -1;
if ((n = parse_find_node("skip_taskbar", app->children)))
if (!parse_contains("default", doc, n))
settings->skip_taskbar = parse_bool(doc, n);
- settings->fullscreen = -1;
if ((n = parse_find_node("fullscreen", app->children)))
if (!parse_contains("default", doc, n))
settings->fullscreen = parse_bool(doc, n);
- settings->max_horz = -1;
- settings->max_vert = -1;
if ((n = parse_find_node("maximized", app->children)))
if (!parse_contains("default", doc, n)) {
gchar *s = parse_string(doc, n);
app = parse_find_node("application", app->next);
}
+
+ g_free(name);
+ g_free(class);
+ g_free(role);
}
/*
}
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();
config_mouse_threshold = parse_int(doc, n);
if ((n = parse_find_node("doubleClickTime", node)))
config_mouse_dclicktime = parse_int(doc, n);
+ if ((n = parse_find_node("screenEdgeWarpTime", node)))
+ config_mouse_screenedgetime = parse_int(doc, n);
n = parse_find_node("context", node);
while (n) {
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);
}
config_focus_raise = parse_bool(doc, n);
if ((n = parse_find_node("focusLast", node)))
config_focus_last = parse_bool(doc, n);
+ if ((n = parse_find_node("underMouse", node)))
+ config_focus_under_mouse = parse_bool(doc, n);
}
static void parse_placement(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node,
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,
const gchar *actname;
} ObDefKeyBind;
-static void bind_default_keyboard()
-{
- ObDefKeyBind *it;
- ObDefKeyBind binds[] = {
- { "A-Tab", "NextWindow" },
- { "S-A-Tab", "PreviousWindow" },
- { "A-F4", "Close" },
- { NULL, NULL }
- };
-
- 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));
- }
-}
-
typedef struct
{
const gchar *button;
{ "Left", "AllDesktops", OB_MOUSE_ACTION_CLICK, "Raise" },
{ "Left", "Shade", OB_MOUSE_ACTION_CLICK, "Raise" },
{ "Left", "Close", OB_MOUSE_ACTION_CLICK, "Close" },
- { "Left", "Maximize", OB_MOUSE_ACTION_CLICK, "ToggleMaximizeFull" },
+ { "Left", "Maximize", OB_MOUSE_ACTION_CLICK, "Maximize" },
{ "Left", "Iconify", OB_MOUSE_ACTION_CLICK, "Iconify" },
- { "Left", "AllDesktops", OB_MOUSE_ACTION_CLICK, "ToggleOmnipresent" },
- { "Left", "Shade", OB_MOUSE_ACTION_CLICK, "ToggleShade" },
+ { "Left", "AllDesktops", OB_MOUSE_ACTION_CLICK, "Omnipresent" },
+ { "Left", "Shade", OB_MOUSE_ACTION_CLICK, "Shade" },
{ "Left", "TLCorner", OB_MOUSE_ACTION_MOTION, "Resize" },
{ "Left", "TRCorner", OB_MOUSE_ACTION_MOTION, "Resize" },
{ "Left", "BLCorner", OB_MOUSE_ACTION_MOTION, "Resize" },
{ 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)
config_focus_follow = FALSE;
config_focus_delay = 0;
config_focus_raise = FALSE;
- config_focus_last = FALSE;
+ config_focus_last = TRUE;
+ config_focus_under_mouse = FALSE;
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);
translate_key("C-g", &config_keyboard_reset_state,
&config_keyboard_reset_keycode);
- bind_default_keyboard();
-
parse_register(i, "keyboard", parse_keyboard, NULL);
- config_mouse_threshold = 3;
+ config_mouse_threshold = 8;
config_mouse_dclicktime = 200;
+ config_mouse_screenedgetime = 400;
bind_default_mouse();
parse_register(i, "resistance", parse_resistance, NULL);
- config_menu_warppointer = TRUE;
config_menu_hide_delay = 250;
config_menu_middle = FALSE;
config_submenu_show_delay = 0;
for (it = config_per_app_settings; it; it = g_slist_next(it)) {
ObAppSettings *itd = (ObAppSettings *)it->data;
- g_free(itd->name);
- g_free(itd->role);
- g_free(itd->class);
+ if (itd->name) g_pattern_spec_free(itd->name);
+ if (itd->role) g_pattern_spec_free(itd->role);
+ if (itd->class) g_pattern_spec_free(itd->class);
g_free(it->data);
}
g_slist_free(config_per_app_settings);
projects / chaz / openbox / blobdiff