mirrors/labwc
1
0
Fork 0
mirror of https://github.com/labwc/labwc.git synced 2025-11-04 13:30:07 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

src/config/rcxml.c: reset default values on Reconfigure

Browse source 
Reported-by: <umk3> via IRC
This commit is contained in:
Consolatis 2023-03-08 23:53:34 +01:00 • committed by Johan Malm
parent 00ebcdc290
commit ce6b760b4b
2 changed files with 22 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

4
include/common/font.h
View file

@ -5,12 +5,12 @@
struct lab_data_buffer; struct lab_data_buffer;
enum font_slant { enum font_slant {
FONT_SLANT_NORMAL, FONT_SLANT_NORMAL = 0,
FONT_SLANT_ITALIC FONT_SLANT_ITALIC
}; };
enum font_weight { enum font_weight {
FONT_WEIGHT_NORMAL, FONT_WEIGHT_NORMAL = 0,
FONT_WEIGHT_BOLD FONT_WEIGHT_BOLD
}; };

28
src/config/rcxml.c
View file

@ -535,23 +535,35 @@ rcxml_parse_xml(struct buf *b)
xmlCleanupParser(); xmlCleanupParser();
} }
static void
init_font_defaults(struct font *font)
{
font->size = 10;
font->slant = FONT_SLANT_NORMAL;
font->weight = FONT_WEIGHT_NORMAL;
}
static void static void
rcxml_init(void) rcxml_init(void)
{ {
static bool has_run; static bool has_run;
if (has_run) { if (!has_run) {
return;
}
has_run = true;
wl_list_init(&rc.keybinds); wl_list_init(&rc.keybinds);
wl_list_init(&rc.mousebinds); wl_list_init(&rc.mousebinds);
wl_list_init(&rc.libinput_categories); wl_list_init(&rc.libinput_categories);
wl_list_init(&rc.workspace_config.workspaces);
wl_list_init(&rc.regions);
}
has_run = true;
rc.xdg_shell_server_side_deco = true; rc.xdg_shell_server_side_deco = true;
rc.corner_radius = 8; rc.corner_radius = 8;
rc.font_activewindow.size = 10;
rc.font_menuitem.size = 10; init_font_defaults(&rc.font_activewindow);
rc.font_osd.size = 10; init_font_defaults(&rc.font_menuitem);
init_font_defaults(&rc.font_osd);
rc.doubleclick_time = 500; rc.doubleclick_time = 500;
rc.repeat_rate = 25; rc.repeat_rate = 25;
rc.repeat_delay = 600; rc.repeat_delay = 600;
@ -562,8 +574,6 @@ rcxml_init(void)
rc.cycle_preview_contents = false; rc.cycle_preview_contents = false;
rc.cycle_preview_outlines = true; rc.cycle_preview_outlines = true;
rc.workspace_config.popuptime = INT_MIN; rc.workspace_config.popuptime = INT_MIN;
wl_list_init(&rc.workspace_config.workspaces);
wl_list_init(&rc.regions);
} }
static struct { static struct {