mirrors
/
wmii
mirror of https://github.com/0intro/wmii
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Grabmod can now be more than one key (don't count on this staying yet)

This commit is contained in:
Kris Maglione 2006-06-20 22:52:40 -04:00
parent 4930cf53c7
commit 9322b3cfd4
3 changed files with 5 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmd/wm/event.c
View File

@ -96,7 +96,7 @@ handle_buttonpress(XEvent *e)
if((c = frame_of_win(ev->window))) {
ev->state &= valid_mask;
if(ev->state & def.mod) {
if((ev->state & def.mod) == def.mod) {
focus(c, True);
switch(ev->button) {
case Button1:

14
cmd/wm/fs.c
View File

@ -250,7 +250,6 @@ char *
message_root(char *message)
{
unsigned int n;
char *errstr;
if(!strncmp(message, "quit", 5)) {
srv.running = 0;
@ -261,17 +260,11 @@ message_root(char *message)
}if(!strncmp(message, "selcolors ", 10)) {
message += 10;
n = strlen(message);
if((errstr = parse_colors(&message, &n, &def.selcolor)))
return errstr;
if(n) return Ebadvalue;
return nil;
return parse_colors(&message, &n, &def.selcolor);
}if(!strncmp(message, "normcolors ", 11)) {
message += 11;
n = strlen(message);
if((errstr = parse_colors(&message, &n, &def.normcolor)))
return errstr;
if(n) return Ebadvalue;
return nil;
return parse_colors(&message, &n, &def.normcolor);
}if(!strncmp(message, "font ", 5)) {
message += 5;
free(def.font.fontstr);
@ -282,8 +275,7 @@ message_root(char *message)
message += 8;
unsigned long mod;
mod = mod_key_of_str(message);
if((mod != Mod1Mask) && (mod != Mod2Mask) && (mod != Mod3Mask)
&& (mod != Mod4Mask) && (mod != Mod5Mask))
if(!(mod & (Mod1Mask|Mod2Mask|Mod3Mask|Mod4Mask|Mod5Mask)))
return Ebadvalue;
cext_strlcpy(def.grabmod, message, sizeof(def.grabmod));
def.mod = mod;

2
rc/wmiirc
View File

@ -37,7 +37,7 @@ wmiir write /ctl << EOF
font $WMII_FONT
selcolors $WMII_SELCOLORS
normcolors $WMII_NORMCOLORS
grabmod Mod1
grabmod $MODKEY
EOF
# COLUMN RULES