godzil/wmfs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

config: Add root section (with multi mouse section and background_command)

Browse Source
This commit is contained in:
Martin Duquesnoy 2008-10-26 18:52:59 +01:00
parent c0801d1c27
commit 4bd8a487e9
5 changed files with 48 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/config.c
View File

@ -191,6 +191,13 @@ init_conf(void)
CFG_END()
};
static cfg_opt_t root_opts[] =
{
CFG_STR("background_command", "", CFGF_NONE),
CFG_SEC("mouse", mouse_button_opts, CFGF_MULTI),
CFG_END()
};
static cfg_opt_t titlebar_opts[] =
{
CFG_STR("position", "top", CFGF_NONE),
@ -199,7 +206,8 @@ init_conf(void)
CFG_STR("fg_focus", "#FFFFFF", CFGF_NONE),
CFG_STR("fg_normal", "#FFFFFF", CFGF_NONE),
CFG_STR("text_align", "left", CFGF_NONE),
CFG_SEC("mouse", mouse_button_opts, CFGF_MULTI)
CFG_SEC("mouse", mouse_button_opts, CFGF_MULTI),
CFG_END()
};
static cfg_opt_t client_opts[]=
@ -208,7 +216,8 @@ init_conf(void)
CFG_STR("border_normal", "#354B5C", CFGF_NONE),
CFG_STR("border_focus", "#6286A1", CFGF_NONE),
CFG_STR("modifier", "Alt", CFGF_NONE),
CFG_SEC("mouse", mouse_button_opts, CFGF_MULTI)
CFG_SEC("mouse", mouse_button_opts, CFGF_MULTI),
CFG_END()
};
static cfg_opt_t layout_opts[] =
@ -277,6 +286,7 @@ init_conf(void)
{
CFG_SEC("misc", misc_opts, CFGF_NONE),
CFG_SEC("variables", variables_opts, CFGF_NONE),
CFG_SEC("root", root_opts, CFGF_NONE),
CFG_SEC("titlebar", titlebar_opts, CFGF_NONE),
CFG_SEC("client", client_opts, CFGF_NONE),
CFG_SEC("bar", bar_opts, CFGF_NONE),
@ -290,6 +300,7 @@ init_conf(void)
cfg_t *cfg_misc;
cfg_t *cfg_bar;
cfg_t *cfg_variables;
cfg_t *cfg_root;
cfg_t *cfg_titlebar;
cfg_t *cfg_client;
cfg_t *cfg_layouts;
@ -319,6 +330,7 @@ init_conf(void)
cfg_misc = cfg_getsec(cfg, "misc");
cfg_variables = cfg_getsec(cfg, "variables");
cfg_root = cfg_getsec(cfg, "root");
cfg_titlebar = cfg_getsec(cfg, "titlebar");
cfg_client = cfg_getsec(cfg, "client");
cfg_bar = cfg_getsec(cfg, "bar");
@ -349,6 +361,19 @@ init_conf(void)
conf.colors.text = strdup(var_to_str(cfg_getstr(cfg_bar, "fg")));
conf.bartop = (strcmp(strdup(cfg_getstr(cfg_bar, "position")), "top") == 0) ? True : False;
/* root */
conf.root.background_command = strdup(var_to_str(cfg_getstr(cfg_root, "background_command")));
conf.root.nmouse = cfg_size(cfg_root, "mouse");
conf.root.mouse = emalloc(conf.root.nmouse, sizeof(MouseBinding));
for(i = 0; i < conf.root.nmouse; ++i)
{
cfgtmp = cfg_getnsec(cfg_root, "mouse", i);
conf.root.mouse[i].button = char_to_button(cfg_getstr(cfgtmp, "button"));
conf.root.mouse[i].func = name_to_func(cfg_getstr(cfgtmp, "func"), func_list);
conf.root.mouse[i].cmd = strdup(var_to_str(cfg_getstr(cfgtmp, "cmd")));
}
/* titlebar */
strcpy(buf, var_to_str(cfg_getstr(cfg_titlebar, "position")));
if(strcmp(buf, "bottom") == 0)

10
src/event.c
View File

@ -57,12 +57,10 @@ buttonpress(XEvent ev)
/* Root */
if(ev.xbutton.window == root)
{
if(ev.xbutton.button == Button4)
uicb_tag("+1");
if(ev.xbutton.button == Button5)
uicb_tag("-1");
}
for(i = 0; i < conf.root.nmouse; ++i)
if(ev.xbutton.button == conf.root.mouse[i].button)
if(conf.root.mouse[i].func)
conf.root.mouse[i].func(conf.root.mouse[i].cmd);
/* Bar */
{

6
src/structs.h
View File

@ -163,6 +163,12 @@ typedef struct
uint layout_bg;
} colors;
struct
{
char *background_command;
MouseBinding *mouse;
int nmouse;
} root;
struct
{
int borderheight;
uint bordernormal;

2
src/wmfs.c
View File

@ -167,6 +167,8 @@ init(void)
EnterWindowMask | LeaveWindowMask | StructureNotifyMask ;
at.cursor = cursor[CurNormal];
XChangeWindowAttributes(dpy, root, CWEventMask | CWCursor, &at);
if(conf.root.background_command)
uicb_spawn(conf.root.background_command);
/* INIT BAR / BUTTON */
bary = (conf.bartop) ? 0 : mh - barheight;

9
wmfsrc
View File

@ -47,6 +47,15 @@ tags
tag { name = "nine" }
}
root
{
background_command = "xsetroot -solid black"
mouse { button = "4" func = "tag_next" }
mouse { button = "5" func = "tag_prev" }
mouse { button = "3" func = "spawn" cmd = term }
}
client
{
border_height = 1