2012-08-12 12:18:43 +02:00
|
|
|
|
#undef I3__FILE__
|
|
|
|
|
#define I3__FILE__ "config.c"
|
2009-02-25 00:50:30 +01:00
|
|
|
|
/*
|
2011-03-14 00:32:54 +01:00
|
|
|
|
* vim:ts=4:sw=4:expandtab
|
2009-02-25 00:50:30 +01:00
|
|
|
|
*
|
|
|
|
|
* i3 - an improved dynamic tiling window manager
|
2015-04-04 02:17:56 +02:00
|
|
|
|
* © 2009 Michael Stapelberg and contributors (see also: LICENSE)
|
2009-02-25 00:50:30 +01:00
|
|
|
|
*
|
2012-12-24 15:57:02 +01:00
|
|
|
|
* config.c: Configuration file (calling the parser (src/config_parser.c) with
|
|
|
|
|
* the correct path, switching key bindings mode).
|
2009-11-22 20:25:33 +01:00
|
|
|
|
*
|
2009-02-25 00:50:30 +01:00
|
|
|
|
*/
|
2011-10-23 00:40:02 +02:00
|
|
|
|
#include "all.h"
|
2014-01-02 08:40:03 +01:00
|
|
|
|
#include <xkbcommon/xkbcommon.h>
|
2009-08-07 15:35:12 +02:00
|
|
|
|
|
2011-03-19 22:26:15 +01:00
|
|
|
|
char *current_configpath = NULL;
|
2009-02-25 00:50:30 +01:00
|
|
|
|
Config config;
|
2009-09-27 18:45:39 +02:00
|
|
|
|
struct modes_head modes;
|
2011-10-18 23:11:27 +02:00
|
|
|
|
struct barconfig_head barconfigs = TAILQ_HEAD_INITIALIZER(barconfigs);
|
2009-02-25 00:50:30 +01:00
|
|
|
|
|
2009-08-07 15:35:12 +02:00
|
|
|
|
/**
|
|
|
|
|
* Ungrabs all keys, to be called before re-grabbing the keys because of a
|
|
|
|
|
* mapping_notify event or a configuration file reload
|
2009-07-23 20:36:48 +02:00
|
|
|
|
*
|
|
|
|
|
*/
|
2009-07-23 18:14:24 +02:00
|
|
|
|
void ungrab_all_keys(xcb_connection_t *conn) {
|
2012-09-06 14:49:14 +02:00
|
|
|
|
DLOG("Ungrabbing all keys\n");
|
|
|
|
|
xcb_ungrab_key(conn, XCB_GRAB_ANY, root, XCB_BUTTON_MASK_ANY);
|
2009-08-07 15:35:12 +02:00
|
|
|
|
}
|
|
|
|
|
|
introduced i3 command for changing the hidden state and the mode of i3bar
The hidden_state and mode of each i3bar instance can now be controlled from within i3.
Therefore, two new i3 command were introduced:
_
bar hidden_state show|hide|toggle [<bar_id>]
show: always show the bar
hide: normal hide mode
toggle: toggle between show and hide (individually for each bar)
_
bar mode dock|hide|invisible|toggle [<bar_id>]
hide,dock: like before
invisible: always keep the bar hidden
toggle: toggle between dock and hide (individually for each bar)
This patch introduces a hidden_state ("hidden_state hide|show") in the
barconfig, which indicates the current hidden_state of each i3bar
instance. It only affects the bar when in hide mode. Additionally, a new
invisible mode was introduced. In order to change the hidden_state or
mode of the bar from i3, a barconfig-update event was introduced, for
which a bar can subscribe and the bar then gets notified about the
currently set hidden_state and mode in its barconfig.
For convenience, an id field ("id <bar_id>") was added to the barconfig, where one can
set the desired id for the corresponding bar. If the id is not specified, i3 will
deterministically choose an id; otherwise, with the previous random approach for finding
a new id, which is actually not shared with i3bar, as it would determine its id on
startup, the event-subscription would be destroyed on reload. Still, this issue remains
when manually changing the bar_id in the config and then reloading.
fixes #833, #651
2013-05-25 14:30:00 +02:00
|
|
|
|
/*
|
|
|
|
|
* Sends the current bar configuration as an event to all barconfig_update listeners.
|
|
|
|
|
*
|
|
|
|
|
*/
|
|
|
|
|
void update_barconfig() {
|
|
|
|
|
Barconfig *current;
|
2014-06-19 11:20:32 +02:00
|
|
|
|
TAILQ_FOREACH(current, &barconfigs, configs) {
|
2014-04-27 07:33:58 +02:00
|
|
|
|
ipc_send_barconfig_update_event(current);
|
introduced i3 command for changing the hidden state and the mode of i3bar
The hidden_state and mode of each i3bar instance can now be controlled from within i3.
Therefore, two new i3 command were introduced:
_
bar hidden_state show|hide|toggle [<bar_id>]
show: always show the bar
hide: normal hide mode
toggle: toggle between show and hide (individually for each bar)
_
bar mode dock|hide|invisible|toggle [<bar_id>]
hide,dock: like before
invisible: always keep the bar hidden
toggle: toggle between dock and hide (individually for each bar)
This patch introduces a hidden_state ("hidden_state hide|show") in the
barconfig, which indicates the current hidden_state of each i3bar
instance. It only affects the bar when in hide mode. Additionally, a new
invisible mode was introduced. In order to change the hidden_state or
mode of the bar from i3, a barconfig-update event was introduced, for
which a bar can subscribe and the bar then gets notified about the
currently set hidden_state and mode in its barconfig.
For convenience, an id field ("id <bar_id>") was added to the barconfig, where one can
set the desired id for the corresponding bar. If the id is not specified, i3 will
deterministically choose an id; otherwise, with the previous random approach for finding
a new id, which is actually not shared with i3bar, as it would determine its id on
startup, the event-subscription would be destroyed on reload. Still, this issue remains
when manually changing the bar_id in the config and then reloading.
fixes #833, #651
2013-05-25 14:30:00 +02:00
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2009-03-04 09:16:18 +01:00
|
|
|
|
/*
|
2009-11-22 20:25:33 +01:00
|
|
|
|
* Finds the configuration file to use (either the one specified by
|
|
|
|
|
* override_configpath), the user’s one or the system default) and calls
|
|
|
|
|
* parse_file().
|
2009-03-04 09:16:18 +01:00
|
|
|
|
*
|
2009-11-22 20:25:33 +01:00
|
|
|
|
*/
|
2014-08-02 07:01:15 +02:00
|
|
|
|
bool parse_configuration(const char *override_configpath, bool use_nagbar) {
|
2015-03-28 19:30:35 +01:00
|
|
|
|
char *path = get_config_path(override_configpath, true);
|
|
|
|
|
if (path == NULL) {
|
|
|
|
|
die("Unable to find the configuration file (looked at "
|
|
|
|
|
"~/.i3/config, $XDG_CONFIG_HOME/i3/config, " SYSCONFDIR "/i3/config and $XDG_CONFIG_DIRS/i3/config)");
|
|
|
|
|
}
|
|
|
|
|
|
2011-12-29 00:04:48 +01:00
|
|
|
|
LOG("Parsing configfile %s\n", path);
|
2011-03-19 22:26:15 +01:00
|
|
|
|
FREE(current_configpath);
|
2011-03-19 21:50:13 +01:00
|
|
|
|
current_configpath = path;
|
2014-08-02 07:01:15 +02:00
|
|
|
|
|
|
|
|
|
/* initialize default bindings if we're just validating the config file */
|
|
|
|
|
if (!use_nagbar && bindings == NULL) {
|
2015-08-03 11:50:13 +02:00
|
|
|
|
bindings = scalloc(1, sizeof(struct bindings_head));
|
2014-08-02 07:01:15 +02:00
|
|
|
|
TAILQ_INIT(bindings);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return parse_file(path, use_nagbar);
|
2009-11-22 20:25:33 +01:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
|
* (Re-)loads the configuration file (sets useful defaults before).
|
2009-03-04 09:16:18 +01:00
|
|
|
|
*
|
|
|
|
|
*/
|
2009-07-23 20:36:48 +02:00
|
|
|
|
void load_configuration(xcb_connection_t *conn, const char *override_configpath, bool reload) {
|
2011-09-12 00:31:06 +02:00
|
|
|
|
if (reload) {
|
|
|
|
|
/* First ungrab the keys */
|
|
|
|
|
ungrab_all_keys(conn);
|
2009-07-23 20:36:48 +02:00
|
|
|
|
|
2011-09-12 00:31:06 +02:00
|
|
|
|
struct Mode *mode;
|
|
|
|
|
while (!SLIST_EMPTY(&modes)) {
|
|
|
|
|
mode = SLIST_FIRST(&modes);
|
|
|
|
|
FREE(mode->name);
|
|
|
|
|
|
|
|
|
|
/* Clear the old binding list */
|
2015-10-30 18:10:41 +01:00
|
|
|
|
while (!TAILQ_EMPTY(mode->bindings)) {
|
|
|
|
|
Binding *bind = TAILQ_FIRST(mode->bindings);
|
|
|
|
|
TAILQ_REMOVE(mode->bindings, bind, bindings);
|
2014-11-10 06:04:47 +01:00
|
|
|
|
binding_free(bind);
|
2011-09-12 00:31:06 +02:00
|
|
|
|
}
|
2015-10-30 18:10:41 +01:00
|
|
|
|
FREE(mode->bindings);
|
|
|
|
|
|
2011-09-12 00:31:06 +02:00
|
|
|
|
SLIST_REMOVE(&modes, mode, Mode, modes);
|
2015-10-30 18:10:41 +01:00
|
|
|
|
FREE(mode);
|
2011-09-12 00:31:06 +02:00
|
|
|
|
}
|
2009-07-23 18:14:24 +02:00
|
|
|
|
|
2011-09-12 00:31:06 +02:00
|
|
|
|
struct Assignment *assign;
|
|
|
|
|
while (!TAILQ_EMPTY(&assignments)) {
|
|
|
|
|
assign = TAILQ_FIRST(&assignments);
|
2011-09-12 00:41:46 +02:00
|
|
|
|
if (assign->type == A_TO_WORKSPACE)
|
|
|
|
|
FREE(assign->dest.workspace);
|
|
|
|
|
else if (assign->type == A_COMMAND)
|
|
|
|
|
FREE(assign->dest.command);
|
|
|
|
|
match_free(&(assign->match));
|
2011-09-12 00:31:06 +02:00
|
|
|
|
TAILQ_REMOVE(&assignments, assign, assignments);
|
|
|
|
|
FREE(assign);
|
|
|
|
|
}
|
2010-03-25 19:08:37 +01:00
|
|
|
|
|
2011-10-20 19:47:09 +02:00
|
|
|
|
/* Clear bar configs */
|
|
|
|
|
Barconfig *barconfig;
|
|
|
|
|
while (!TAILQ_EMPTY(&barconfigs)) {
|
|
|
|
|
barconfig = TAILQ_FIRST(&barconfigs);
|
|
|
|
|
FREE(barconfig->id);
|
|
|
|
|
for (int c = 0; c < barconfig->num_outputs; c++)
|
|
|
|
|
free(barconfig->outputs[c]);
|
2015-10-30 18:10:41 +01:00
|
|
|
|
|
|
|
|
|
while (!TAILQ_EMPTY(&(barconfig->bar_bindings))) {
|
|
|
|
|
struct Barbinding *binding = TAILQ_FIRST(&(barconfig->bar_bindings));
|
|
|
|
|
FREE(binding->command);
|
|
|
|
|
TAILQ_REMOVE(&(barconfig->bar_bindings), binding, bindings);
|
|
|
|
|
FREE(binding);
|
|
|
|
|
}
|
|
|
|
|
|
2015-10-16 11:34:19 +02:00
|
|
|
|
while (!TAILQ_EMPTY(&(barconfig->tray_outputs))) {
|
|
|
|
|
struct tray_output_t *tray_output = TAILQ_FIRST(&(barconfig->tray_outputs));
|
|
|
|
|
FREE(tray_output->output);
|
|
|
|
|
TAILQ_REMOVE(&(barconfig->tray_outputs), tray_output, tray_outputs);
|
|
|
|
|
FREE(tray_output);
|
|
|
|
|
}
|
2015-10-30 18:10:41 +01:00
|
|
|
|
|
2011-10-20 19:47:09 +02:00
|
|
|
|
FREE(barconfig->outputs);
|
|
|
|
|
FREE(barconfig->socket_path);
|
|
|
|
|
FREE(barconfig->status_command);
|
2011-11-24 21:53:29 +01:00
|
|
|
|
FREE(barconfig->i3bar_command);
|
2011-10-20 19:47:09 +02:00
|
|
|
|
FREE(barconfig->font);
|
|
|
|
|
FREE(barconfig->colors.background);
|
|
|
|
|
FREE(barconfig->colors.statusline);
|
2015-10-26 21:55:01 +01:00
|
|
|
|
FREE(barconfig->colors.separator);
|
|
|
|
|
FREE(barconfig->colors.focused_background);
|
|
|
|
|
FREE(barconfig->colors.focused_statusline);
|
|
|
|
|
FREE(barconfig->colors.focused_separator);
|
2012-01-20 22:36:50 +01:00
|
|
|
|
FREE(barconfig->colors.focused_workspace_border);
|
2011-10-20 19:47:09 +02:00
|
|
|
|
FREE(barconfig->colors.focused_workspace_bg);
|
2012-01-20 22:36:50 +01:00
|
|
|
|
FREE(barconfig->colors.focused_workspace_text);
|
|
|
|
|
FREE(barconfig->colors.active_workspace_border);
|
2011-10-20 19:47:09 +02:00
|
|
|
|
FREE(barconfig->colors.active_workspace_bg);
|
2012-01-20 22:36:50 +01:00
|
|
|
|
FREE(barconfig->colors.active_workspace_text);
|
|
|
|
|
FREE(barconfig->colors.inactive_workspace_border);
|
2011-10-20 19:47:09 +02:00
|
|
|
|
FREE(barconfig->colors.inactive_workspace_bg);
|
2012-01-20 22:36:50 +01:00
|
|
|
|
FREE(barconfig->colors.inactive_workspace_text);
|
|
|
|
|
FREE(barconfig->colors.urgent_workspace_border);
|
2011-10-20 19:47:09 +02:00
|
|
|
|
FREE(barconfig->colors.urgent_workspace_bg);
|
2012-01-20 22:36:50 +01:00
|
|
|
|
FREE(barconfig->colors.urgent_workspace_text);
|
2015-05-31 16:07:23 +02:00
|
|
|
|
FREE(barconfig->colors.binding_mode_border);
|
|
|
|
|
FREE(barconfig->colors.binding_mode_bg);
|
|
|
|
|
FREE(barconfig->colors.binding_mode_text);
|
2011-10-20 19:47:09 +02:00
|
|
|
|
TAILQ_REMOVE(&barconfigs, barconfig, configs);
|
|
|
|
|
FREE(barconfig);
|
|
|
|
|
}
|
|
|
|
|
|
2014-06-15 19:07:02 +02:00
|
|
|
|
/* Clear workspace names */
|
2010-03-27 15:25:51 +01:00
|
|
|
|
#if 0
|
2011-09-12 00:31:06 +02:00
|
|
|
|
Workspace *ws;
|
|
|
|
|
TAILQ_FOREACH(ws, workspaces, workspaces)
|
|
|
|
|
workspace_set_name(ws, NULL);
|
2010-03-27 15:25:51 +01:00
|
|
|
|
#endif
|
2011-11-24 00:12:36 +01:00
|
|
|
|
|
|
|
|
|
/* Invalidate pixmap caches in case font or colors changed */
|
|
|
|
|
Con *con;
|
2014-06-19 11:20:32 +02:00
|
|
|
|
TAILQ_FOREACH(con, &all_cons, all_cons)
|
|
|
|
|
FREE(con->deco_render_params);
|
2011-11-24 00:12:36 +01:00
|
|
|
|
|
|
|
|
|
/* Get rid of the current font */
|
|
|
|
|
free_font();
|
2016-01-09 13:46:49 +01:00
|
|
|
|
|
|
|
|
|
free(config.ipc_socket_path);
|
|
|
|
|
free(config.restart_state_path);
|
|
|
|
|
free(config.fake_outputs);
|
2011-09-12 00:31:06 +02:00
|
|
|
|
}
|
2009-07-23 18:14:24 +02:00
|
|
|
|
|
2011-09-12 00:31:06 +02:00
|
|
|
|
SLIST_INIT(&modes);
|
2009-09-27 18:45:39 +02:00
|
|
|
|
|
2015-08-03 11:50:13 +02:00
|
|
|
|
struct Mode *default_mode = scalloc(1, sizeof(struct Mode));
|
2011-09-12 00:31:06 +02:00
|
|
|
|
default_mode->name = sstrdup("default");
|
2015-08-03 11:50:13 +02:00
|
|
|
|
default_mode->bindings = scalloc(1, sizeof(struct bindings_head));
|
2011-09-12 00:31:06 +02:00
|
|
|
|
TAILQ_INIT(default_mode->bindings);
|
|
|
|
|
SLIST_INSERT_HEAD(&modes, default_mode, modes);
|
2009-09-27 18:45:39 +02:00
|
|
|
|
|
2011-09-12 00:31:06 +02:00
|
|
|
|
bindings = default_mode->bindings;
|
2009-09-27 18:45:39 +02:00
|
|
|
|
|
2009-02-25 00:50:30 +01:00
|
|
|
|
#define REQUIRED_OPTION(name) \
|
2014-06-15 19:07:02 +02:00
|
|
|
|
if (config.name == NULL) \
|
2011-09-12 00:31:06 +02:00
|
|
|
|
die("You did not specify required configuration option " #name "\n");
|
2009-02-25 00:50:30 +01:00
|
|
|
|
|
2011-09-12 00:31:06 +02:00
|
|
|
|
/* Clear the old config or initialize the data structure */
|
|
|
|
|
memset(&config, 0, sizeof(config));
|
2009-02-25 00:50:30 +01:00
|
|
|
|
|
2014-06-15 19:07:02 +02:00
|
|
|
|
/* Initialize default colors */
|
2016-01-09 22:47:33 +01:00
|
|
|
|
#define INIT_COLOR(x, cborder, cbackground, ctext, cindicator) \
|
|
|
|
|
do { \
|
|
|
|
|
x.border = draw_util_hex_to_color(cborder); \
|
|
|
|
|
x.background = draw_util_hex_to_color(cbackground); \
|
|
|
|
|
x.text = draw_util_hex_to_color(ctext); \
|
|
|
|
|
x.indicator = draw_util_hex_to_color(cindicator); \
|
|
|
|
|
x.child_border = draw_util_hex_to_color(cbackground); \
|
2011-09-12 00:31:06 +02:00
|
|
|
|
} while (0)
|
|
|
|
|
|
2015-11-16 23:03:39 +01:00
|
|
|
|
config.client.background = draw_util_hex_to_color("#000000");
|
2012-01-22 12:22:15 +01:00
|
|
|
|
INIT_COLOR(config.client.focused, "#4c7899", "#285577", "#ffffff", "#2e9ef4");
|
|
|
|
|
INIT_COLOR(config.client.focused_inactive, "#333333", "#5f676a", "#ffffff", "#484e50");
|
|
|
|
|
INIT_COLOR(config.client.unfocused, "#333333", "#222222", "#888888", "#292d2e");
|
|
|
|
|
INIT_COLOR(config.client.urgent, "#2f343a", "#900000", "#ffffff", "#900000");
|
|
|
|
|
|
2013-12-15 11:42:40 +01:00
|
|
|
|
/* border and indicator color are ignored for placeholder contents */
|
|
|
|
|
INIT_COLOR(config.client.placeholder, "#000000", "#0c0c0c", "#ffffff", "#000000");
|
|
|
|
|
|
2012-01-22 12:22:15 +01:00
|
|
|
|
/* the last argument (indicator color) is ignored for bar colors */
|
|
|
|
|
INIT_COLOR(config.bar.focused, "#4c7899", "#285577", "#ffffff", "#000000");
|
|
|
|
|
INIT_COLOR(config.bar.unfocused, "#333333", "#222222", "#888888", "#000000");
|
|
|
|
|
INIT_COLOR(config.bar.urgent, "#2f343a", "#900000", "#ffffff", "#000000");
|
2011-09-12 00:31:06 +02:00
|
|
|
|
|
2015-03-30 22:16:05 +02:00
|
|
|
|
config.show_marks = true;
|
|
|
|
|
|
2011-09-12 00:31:06 +02:00
|
|
|
|
config.default_border = BS_NORMAL;
|
|
|
|
|
config.default_floating_border = BS_NORMAL;
|
2014-04-26 17:18:21 +02:00
|
|
|
|
config.default_border_width = logical_px(2);
|
2014-05-09 18:33:38 +02:00
|
|
|
|
config.default_floating_border_width = logical_px(2);
|
2011-09-12 00:31:06 +02:00
|
|
|
|
/* Set default_orientation to NO_ORIENTATION for auto orientation. */
|
|
|
|
|
config.default_orientation = NO_ORIENTATION;
|
|
|
|
|
|
2012-09-22 13:48:22 +02:00
|
|
|
|
/* Set default urgency reset delay to 500ms */
|
|
|
|
|
if (config.workspace_urgency_timer == 0)
|
|
|
|
|
config.workspace_urgency_timer = 0.5;
|
|
|
|
|
|
2014-08-02 07:01:15 +02:00
|
|
|
|
parse_configuration(override_configpath, true);
|
2011-09-12 00:31:06 +02:00
|
|
|
|
|
|
|
|
|
if (reload) {
|
|
|
|
|
translate_keysyms();
|
Use libxkbcommon for translating keysyms, support all XKB groups.
fixes #1835
This commit improves the translation of keysyms to keycodes by loading
keymaps using libxkbcommon-x11 and using libxkbcommon for figuring out
the keymap, depending on each keybinding’s modifiers. This way, the
upper layers of complex layouts are now usable with i3’s bindsym
directive, such as de_neo’s layer 3 and higher.
Furthermore, the commit generalizes the handling of different XKB
groups. We formerly had support only for two separate groups, the
default group 1, and group 2. While Mode_switch is only one way to
switch to group 2, we called the binding option Mode_switch. With this
commit, the new names Group1, Group2 (an alias for Mode_switch), Group3
and Group4 are introduced for configuring bindings. This is only useful
for advanced keyboard layouts, such as people loading two keyboard
layouts and switching between them (us, ru seems to be a popular
combination).
When grabbing keys, one can only specify the modifier mask, but not an
XKB state mask (or value), so we still dynamically unbind and re-bind
keys whenever the XKB group changes.
The commit was manually tested using the following i3 config:
bindsym Group4+n nop heya from group 4
bindsym Group3+n nop heya from group 3
bindsym Group2+n nop heya from group 2
bindsym n nop heya
bindsym shift+N nop explicit shift binding
bindsym shift+r nop implicit shift binding
bindcode Group2+38 nop fallback overwritten in group 2 only
bindcode 38 nop fallback
…with the following layout:
setxkbmap -layout "us,ua,ru,de" -variant ",winkeys,,neo" \
-option "grp:shift_caps_toggle,grp_led:scroll" \
-model pc104 -rules evdev
By default (xkb group 1, us layout), pressing “n” will result in the
“heya” message appearing. Pressing “a” will result in the “fallback”
message appearing. “j” is not triggered.
By pressing Shift+CapsLock you switch to the next group (xkb group 2, ua
layout). Pressing “a” will result in the “fallback overwritten in group
2 only” message, pressing “n” will still result in “heya”. “j” is not
triggered.
In the next group (xkb group 3, ru layout), pressing “a” will result in
the “fallback” message again, pressing “n” will result in “heya”,
“j” is not triggered.
In the last group (xkb group 4, de_neo layout), pressing “a” will still
result in “fallback”, pressing “n” will result in “heya”, pressing “j”
will result in “heya from group 4”.
Pressing shift+n results in “explicit shift binding”, pressing shift+r
results in “implicit shift binding”. This ensures that keysym
translation falls back to looking at non-shift keys (“r” can be used
instead of ”R”) and that the order of keybindings doesn’t play a role
(“bindsym n” does not override “bindsym shift+n”, even though it’s
specified earlier in the config).
The fallback behavior ensures use-cases such as ticket #1775 are still
covered.
Only binding keys when the X server is in the corresponding XKB group
ensures use-cases such as ticket #585 are still covered.
2015-08-23 22:49:32 +02:00
|
|
|
|
grab_all_keys(conn);
|
2015-11-11 20:40:25 +01:00
|
|
|
|
regrab_all_buttons(conn);
|
2011-09-12 00:31:06 +02:00
|
|
|
|
}
|
2009-09-19 19:05:15 +02:00
|
|
|
|
|
2011-11-15 00:39:03 +01:00
|
|
|
|
if (config.font.type == FONT_TYPE_NONE) {
|
2011-09-12 00:31:06 +02:00
|
|
|
|
ELOG("You did not specify required configuration option \"font\"\n");
|
|
|
|
|
config.font = load_font("fixed", true);
|
2011-11-13 20:19:42 +01:00
|
|
|
|
set_font(&config.font);
|
2011-09-12 00:31:06 +02:00
|
|
|
|
}
|
2009-07-28 13:55:09 +02:00
|
|
|
|
|
2011-11-24 00:12:36 +01:00
|
|
|
|
/* Redraw the currently visible decorations on reload, so that
|
|
|
|
|
* the possibly new drawing parameters changed. */
|
|
|
|
|
if (reload) {
|
|
|
|
|
x_deco_recurse(croot);
|
|
|
|
|
xcb_flush(conn);
|
|
|
|
|
}
|
|
|
|
|
|
2010-03-27 15:25:51 +01:00
|
|
|
|
#if 0
|
2011-09-12 00:31:06 +02:00
|
|
|
|
/* Set an empty name for every workspace which got no name */
|
|
|
|
|
Workspace *ws;
|
|
|
|
|
TAILQ_FOREACH(ws, workspaces, workspaces) {
|
|
|
|
|
if (ws->name != NULL) {
|
|
|
|
|
/* If the font was not specified when the workspace name
|
|
|
|
|
* was loaded, we need to predict the text width now */
|
|
|
|
|
if (ws->text_width == 0)
|
|
|
|
|
ws->text_width = predict_text_width(global_conn,
|
|
|
|
|
config.font, ws->name, ws->name_len);
|
|
|
|
|
continue;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
workspace_set_name(ws, NULL);
|
|
|
|
|
}
|
2010-03-27 15:25:51 +01:00
|
|
|
|
#endif
|
2009-02-25 00:50:30 +01:00
|
|
|
|
}
|