mirror/cwm
1
0
Fork 0
mirror of https://github.com/leahneukirchen/cwm.git synced 2023-08-10 21:13:12 +03:00
Code Issues Projects Releases Wiki Activity

confable menu and window mouse bindings from rivo nurges (thanks!) with

Browse Source 
some minor fixups, man page bits and knf.

ok oga@
This commit is contained in:
okan
2008-06-14 21:48:54 +00:00
parent b4ae492b7b
commit bdcbbe7f53
7 changed files with 329 additions and 101 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
parse.y
View File

@@ -66,7 +66,7 @@ typedef struct {
%}
%token FONTNAME STICKY GAP
%token FONTNAME STICKY GAP MOUSEBIND
%token AUTOGROUP BIND COMMAND IGNORE
%token YES NO
%token ERROR
@@ -167,6 +167,11 @@ main : FONTNAME STRING {
conf->gap_left = $4;
conf->gap_right = $5;
}
| MOUSEBIND STRING string {
conf_mousebind(conf, $2, $3);
free($2);
free($3);
}
;
%%
@@ -206,6 +211,7 @@ lookup(char *s)
{ "fontname", FONTNAME},
{ "gap", GAP},
{ "ignore", IGNORE},
{ "mousebind", MOUSEBIND},
{ "no", NO},
{ "sticky", STICKY},
{ "yes", YES}
@@ -469,6 +475,7 @@ conf_clear(struct conf *c)
struct keybinding *kb;
struct winmatch *wm;
struct cmd *cmd;
struct mousebinding *mb;
while (cmd = TAILQ_FIRST(&c->cmdq)) {
TAILQ_REMOVE(&c->cmdq, cmd, entry);
@@ -494,6 +501,11 @@ conf_clear(struct conf *c)
free(wm);
}
while (mb = TAILQ_FIRST(&c->mousebindingq)) {
TAILQ_REMOVE(&c->mousebindingq, mb, entry);
free(mb);
}
if (c->DefaultFontName != NULL &&
c->DefaultFontName != DEFAULTFONTNAME)
free(c->DefaultFontName);
@@ -529,6 +541,7 @@ parse_config(const char *filename, struct conf *xconf)
struct keybinding *kb;
struct winmatch *wm;
struct cmd *cmd;
struct mousebinding *mb;
conf_clear(xconf);
@@ -554,6 +567,11 @@ parse_config(const char *filename, struct conf *xconf)
TAILQ_INSERT_TAIL(&xconf->ignoreq, wm, entry);
}
while (mb = TAILQ_FIRST(&conf->mousebindingq)) {
TAILQ_REMOVE(&conf->mousebindingq, mb, entry);
TAILQ_INSERT_TAIL(&xconf->mousebindingq, mb, entry);
}
strlcpy(xconf->termpath, conf->termpath,
sizeof(xconf->termpath));
strlcpy(xconf->lockpath, conf->lockpath,