#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;
+
+StrutPartial config_margins;
gchar *config_theme;
gboolean config_theme_keepborder;
-gboolean config_theme_hidedisabled;
gchar *config_title_layout;
gint config_desktops_num;
GSList *config_desktops_names;
guint config_screen_firstdesk;
+guint config_desktop_popup_time;
gboolean config_resize_redraw;
gboolean config_resize_four_corners;
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;
gint config_resist_win;
gint config_resist_edge;
-gboolean config_resist_layers_below;
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">
<position>
<x>700</x>
<y>0</y>
+ <monitor>1</monitor>
</position>
- <head>1</head>
+ .. there is a lot more settings available
</application>
</applications>
*/
/* Manages settings for individual applications.
- Some notes: head is the screen number in a multi monitor
+ Some notes: monitor is the screen number in a multi monitor
(Xinerama) setup (starting from 0) or mouse, meaning the
- head the pointer is on. Default: mouse.
+ monitor the pointer is on. Default: mouse.
Layer can be three values, above (Always on top), below
(Always on bottom) and everything else (normal behaviour).
Positions can be an integer value or center, which will
- center the window in the specified axis. Position is relative
- from head, so <position><x>center</x></position><head>1</head>
- will center the window on the second head.
+ center the window in the specified axis. Position is within
+ the monitor, so <position><x>center</x></position><monitor>2</monitor>
+ will center the window on the second monitor.
*/
-static void parse_per_app_settings(ObParseInst *i, xmlDocPtr doc,
- xmlNodePtr node, gpointer d)
+static void parse_per_app_settings(ObParseInst *inst, xmlDocPtr doc,
+ xmlNodePtr node, gpointer data)
{
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)))
- settings->decor = parse_bool(doc, n);
+ if (!parse_contains("default", doc, n))
+ settings->decor = parse_bool(doc, n);
- settings->shade = -1;
if ((n = parse_find_node("shade", app->children)))
- settings->shade = parse_bool(doc, n);
+ 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))) {
- gchar *s = parse_string(doc, c);
- if (!strcmp(s, "center")) {
- settings->center_x = TRUE;
- x_pos_given = TRUE;
- } else {
- settings->position.x = parse_int(doc, c);
- x_pos_given = TRUE;
+ if ((c = parse_find_node("x", n->children)))
+ if (!parse_contains("default", doc, c)) {
+ gchar *s = parse_string(doc, c);
+ if (!g_ascii_strcasecmp(s, "center")) {
+ settings->center_x = TRUE;
+ x_pos_given = TRUE;
+ } else {
+ 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);
}
- g_free(s);
- }
- if (x_pos_given && (c = parse_find_node("y", n->children))) {
- gchar *s = parse_string(doc, c);
- if (!strcmp(s, "center")) {
- settings->center_y = TRUE;
- settings->pos_given = TRUE;
- } else {
- settings->position.y = parse_int(doc, c);
- settings->pos_given = TRUE;
+ if (x_pos_given && (c = parse_find_node("y", n->children)))
+ if (!parse_contains("default", doc, c)) {
+ gchar *s = parse_string(doc, c);
+ if (!g_ascii_strcasecmp(s, "center")) {
+ settings->center_y = TRUE;
+ settings->pos_given = TRUE;
+ } else {
+ 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);
+ }
+
+ if (settings->pos_given &&
+ (c = parse_find_node("monitor", n->children)))
+ if (!parse_contains("default", doc, c)) {
+ gchar *s = parse_string(doc, c);
+ if (!g_ascii_strcasecmp(s, "mouse"))
+ settings->monitor = 0;
+ else
+ settings->monitor = parse_int(doc, c) + 1;
+ g_free(s);
}
- g_free(s);
- }
}
- settings->focus = -1;
if ((n = parse_find_node("focus", app->children)))
- settings->focus = parse_bool(doc, n);
+ if (!parse_contains("default", doc, n))
+ settings->focus = parse_bool(doc, n);
if ((n = parse_find_node("desktop", app->children))) {
- gchar *s = parse_string(doc, n);
- if (!strcmp(s, "all"))
- settings->desktop = DESKTOP_ALL;
- else
- settings->desktop = parse_int(doc, n);
- g_free(s);
- } else
- settings->desktop = DESKTOP_ALL - 1; /* lets hope the user
- * doesn't have 2^32
- * desktops */
-
- if ((n = parse_find_node("head", app->children))) {
- gchar *s = parse_string(doc, n);
- if (!strcmp(s, "mouse"))
- settings->head = -1;
- else
- settings->head = parse_int(doc, n);
- g_free(s);
+ if (!parse_contains("default", doc, n)) {
+ gchar *s = parse_string(doc, n);
+ if (!g_ascii_strcasecmp(s, "all"))
+ settings->desktop = DESKTOP_ALL;
+ else {
+ gint i = parse_int(doc, n);
+ if (i > 0)
+ settings->desktop = i;
+ }
+ g_free(s);
+ }
}
- settings->layer = -2;
- if ((n = parse_find_node("layer", app->children))) {
- gchar *s = parse_string(doc, n);
- if (!strcmp(s, "above"))
- settings->layer = 1;
- else if (!strcmp(s, "below"))
- settings->layer = -1;
- else
- settings->layer = 0;
- g_free(s);
- }
+ if ((n = parse_find_node("layer", app->children)))
+ if (!parse_contains("default", doc, n)) {
+ gchar *s = parse_string(doc, n);
+ if (!g_ascii_strcasecmp(s, "above"))
+ settings->layer = 1;
+ else if (!g_ascii_strcasecmp(s, "below"))
+ settings->layer = -1;
+ else
+ settings->layer = 0;
+ g_free(s);
+ }
- settings->iconic = -1;
if ((n = parse_find_node("iconic", app->children)))
- settings->iconic = parse_bool(doc, n);
+ 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)))
- settings->skip_pager = parse_bool(doc, n);
+ 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)))
- settings->skip_taskbar = parse_bool(doc, n);
+ if (!parse_contains("default", doc, n))
+ settings->skip_taskbar = parse_bool(doc, n);
- settings->fullscreen = -1;
if ((n = parse_find_node("fullscreen", app->children)))
- settings->fullscreen = parse_bool(doc, n);
-
- settings->max_horz = -1;
- settings->max_vert = -1;
- if ((n = parse_find_node("maximized", app->children))) {
- gchar *s = parse_string(doc, n);
- if (!strcmp(s, "horizontal")) {
- settings->max_horz = TRUE;
- settings->max_vert = FALSE;
- } else if (!strcmp(s, "vertical")) {
- settings->max_horz = FALSE;
- settings->max_vert = TRUE;
- } else
- settings->max_horz = settings->max_vert =
- parse_bool(doc, n);
- g_free(s);
- }
+ if (!parse_contains("default", doc, n))
+ settings->fullscreen = parse_bool(doc, n);
+
+ if ((n = parse_find_node("maximized", app->children)))
+ if (!parse_contains("default", doc, n)) {
+ gchar *s = parse_string(doc, n);
+ if (!g_ascii_strcasecmp(s, "horizontal")) {
+ settings->max_horz = TRUE;
+ settings->max_vert = FALSE;
+ } else if (!g_ascii_strcasecmp(s, "vertical")) {
+ settings->max_horz = FALSE;
+ settings->max_vert = TRUE;
+ } else
+ settings->max_horz = settings->max_vert =
+ parse_bool(doc, n);
+ g_free(s);
+ }
config_per_app_settings = g_slist_append(config_per_app_settings,
(gpointer) settings);
+ g_free(name);
+ g_free(class);
+ g_free(role);
+ name = class = role = NULL;
}
-
+
app = parse_find_node("application", app->next);
}
}
}
else if ((n = parse_find_node("action", node->children))) {
while (n) {
- ObAction *action;
-
- action = action_parse(i, doc, n, OB_USER_ACTION_KEYBOARD_KEY);
+ ObActionsAct *action;
+
+ action = actions_parse(i, doc, n);
if (action)
keyboard_bind(keylist, action);
n = parse_find_node("action", n->next);
}
static void parse_keyboard(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node,
- gpointer d)
+ gpointer data)
{
xmlNodePtr n;
gchar *key;
/*
-<context name="Titlebar">
+<context name="Titlebar">
<mousebind button="Left" action="Press">
<action name="Raise"></action>
</mousebind>
*/
static void parse_mouse(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node,
- gpointer d)
+ gpointer data)
{
xmlNodePtr n, nbut, nact;
gchar *buttonstr;
gchar *contextstr;
- ObUserAction uact;
ObMouseAction mact;
- ObAction *action;
mouse_unbind_all();
node = node->children;
-
+
if ((n = parse_find_node("dragThreshold", node)))
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);
}
}
static void parse_focus(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node,
- gpointer d)
+ gpointer data)
{
xmlNodePtr n;
node = node->children;
-
+
if ((n = parse_find_node("focusNew", node)))
config_focus_new = parse_bool(doc, n);
if ((n = parse_find_node("followMouse", node)))
config_focus_follow = parse_bool(doc, n);
if ((n = parse_find_node("focusDelay", node)))
- config_focus_delay = parse_int(doc, n) * 1000;
+ config_focus_delay = parse_int(doc, n);
if ((n = parse_find_node("raiseOnFocus", node)))
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,
- gpointer d)
+ gpointer data)
{
xmlNodePtr n;
node = node->children;
-
+
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_margins(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node,
+ gpointer data)
+{
+ xmlNodePtr n;
+
+ node = node->children;
+
+ if ((n = parse_find_node("top", node)))
+ config_margins.top = MAX(0, parse_int(doc, n));
+ if ((n = parse_find_node("left", node)))
+ config_margins.left = MAX(0, parse_int(doc, n));
+ if ((n = parse_find_node("right", node)))
+ config_margins.right = MAX(0, parse_int(doc, n));
+ if ((n = parse_find_node("bottom", node)))
+ config_margins.bottom = MAX(0, parse_int(doc, n));
}
static void parse_theme(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node,
- gpointer d)
+ gpointer data)
{
xmlNodePtr n;
g_free(c);
}
if ((n = parse_find_node("titleLayout", node))) {
+ gchar *c, *d;
+
g_free(config_title_layout);
config_title_layout = parse_string(doc, n);
+
+ /* replace duplicates with spaces */
+ for (c = config_title_layout; *c != '\0'; ++c)
+ for (d = c+1; *d != '\0'; ++d)
+ if (*c == *d) *d = ' ';
}
if ((n = parse_find_node("keepBorder", node)))
config_theme_keepborder = parse_bool(doc, n);
- if ((n = parse_find_node("hideDisabled", node)))
- config_theme_hidedisabled = parse_bool(doc, n);
if ((n = parse_find_node("animateIconify", node)))
config_animate_iconify = parse_bool(doc, n);
}
static void parse_desktops(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node,
- gpointer d)
+ gpointer data)
{
xmlNodePtr n;
node = node->children;
-
+
if ((n = parse_find_node("number", node))) {
gint d = parse_int(doc, n);
if (d > 0)
nname = parse_find_node("name", nname->next);
}
}
+ if ((n = parse_find_node("popupTime", node)))
+ config_desktop_popup_time = parse_int(doc, n);
}
static void parse_resize(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node,
- gpointer d)
+ gpointer data)
{
xmlNodePtr n;
node = node->children;
-
+
if ((n = parse_find_node("drawContents", node)))
config_resize_redraw = parse_bool(doc, n);
if ((n = parse_find_node("popupShow", node))) {
}
static void parse_dock(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node,
- gpointer d)
+ gpointer data)
{
xmlNodePtr n;
if ((n = parse_find_node("autoHide", node)))
config_dock_hide = parse_bool(doc, n);
if ((n = parse_find_node("hideDelay", node)))
- config_dock_hide_delay = parse_int(doc, n) * 1000;
+ config_dock_hide_delay = parse_int(doc, n);
if ((n = parse_find_node("showDelay", node)))
- config_dock_show_delay = parse_int(doc, n) * 1000;
+ config_dock_show_delay = parse_int(doc, n);
if ((n = parse_find_node("moveButton", node))) {
gchar *str = parse_string(doc, n);
guint b, s;
}
static void parse_menu(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node,
- gpointer d)
+ gpointer data)
{
xmlNodePtr n;
for (node = node->children; node; node = node->next) {
parse_expand_tilde(c));
g_free(c);
}
- if ((n = parse_find_node("warpPointer", node)))
- config_menu_warppointer = parse_bool(doc, n);
if ((n = parse_find_node("hideDelay", node)))
config_menu_hide_delay = parse_int(doc, n);
if ((n = parse_find_node("middle", node)))
config_menu_middle = parse_bool(doc, n);
if ((n = parse_find_node("submenuShowDelay", node)))
config_submenu_show_delay = parse_int(doc, n);
- if ((n = parse_find_node("desktopMenuIcons", node)))
+ if ((n = parse_find_node("applicationIcons", node)))
config_menu_client_list_icons = parse_bool(doc, n);
}
}
-
-static void parse_resistance(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node,
- gpointer d)
+
+static void parse_resistance(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node,
+ gpointer data)
{
xmlNodePtr n;
config_resist_win = parse_int(doc, n);
if ((n = parse_find_node("screen_edge_strength", node)))
config_resist_edge = parse_int(doc, n);
- if ((n = parse_find_node("edges_hit_layers_below", node)))
- config_resist_layers_below = parse_bool(doc, n);
}
typedef struct
{ "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));
+ keyboard_bind(l, actions_parse_string(it->actname));
}
}
{ "Middle", "Desktop", OB_MOUSE_ACTION_PRESS, "Focus" },
{ "Right", "Desktop", OB_MOUSE_ACTION_PRESS, "Focus" },
{ "Left", "Titlebar", OB_MOUSE_ACTION_PRESS, "Focus" },
- { "Left", "Handle", OB_MOUSE_ACTION_PRESS, "Focus" },
+ { "Left", "Bottom", OB_MOUSE_ACTION_PRESS, "Focus" },
{ "Left", "BLCorner", OB_MOUSE_ACTION_PRESS, "Focus" },
{ "Left", "BRCorner", OB_MOUSE_ACTION_PRESS, "Focus" },
{ "Left", "TLCorner", OB_MOUSE_ACTION_PRESS, "Focus" },
{ "Left", "Client", OB_MOUSE_ACTION_CLICK, "Raise" },
{ "Left", "Titlebar", OB_MOUSE_ACTION_CLICK, "Raise" },
{ "Middle", "Titlebar", OB_MOUSE_ACTION_CLICK, "Lower" },
- { "Left", "Handle", OB_MOUSE_ACTION_CLICK, "Raise" },
{ "Left", "BLCorner", OB_MOUSE_ACTION_CLICK, "Raise" },
{ "Left", "BRCorner", OB_MOUSE_ACTION_CLICK, "Raise" },
{ "Left", "TLCorner", OB_MOUSE_ACTION_CLICK, "Raise" },
{ "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, "ToggleMaximize" },
{ "Left", "Iconify", OB_MOUSE_ACTION_CLICK, "Iconify" },
{ "Left", "AllDesktops", OB_MOUSE_ACTION_CLICK, "ToggleOmnipresent" },
{ "Left", "Shade", OB_MOUSE_ACTION_CLICK, "ToggleShade" },
{ "Left", "TRCorner", OB_MOUSE_ACTION_MOTION, "Resize" },
{ "Left", "BLCorner", OB_MOUSE_ACTION_MOTION, "Resize" },
{ "Left", "BRCorner", OB_MOUSE_ACTION_MOTION, "Resize" },
+ { "Left", "Top", OB_MOUSE_ACTION_MOTION, "Resize" },
+ { "Left", "Bottom", OB_MOUSE_ACTION_MOTION, "Resize" },
+ { "Left", "Left", OB_MOUSE_ACTION_MOTION, "Resize" },
+ { "Left", "Right", OB_MOUSE_ACTION_MOTION, "Resize" },
{ "Left", "Titlebar", OB_MOUSE_ACTION_MOTION, "Move" },
{ "A-Left", "Frame", OB_MOUSE_ACTION_MOTION, "Move" },
{ "A-Middle", "Frame", 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);
+ STRUT_PARTIAL_SET(config_margins, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0);
+
+ parse_register(i, "margins", parse_margins, NULL);
+
config_theme = NULL;
- config_animate_iconify = FALSE;
+ config_animate_iconify = TRUE;
config_title_layout = g_strdup("NLIMC");
config_theme_keepborder = TRUE;
- config_theme_hidedisabled = FALSE;
config_font_activewindow = NULL;
config_font_inactivewindow = NULL;
config_desktops_num = 4;
config_screen_firstdesk = 1;
config_desktops_names = NULL;
+ config_desktop_popup_time = 875;
parse_register(i, "desktops", parse_desktops, NULL);
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();
config_resist_win = 10;
config_resist_edge = 20;
- config_resist_layers_below = FALSE;
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 / mikachu / openbox.git / blobdiff