event.c
changeset 926 6f9cf0cfe278
parent 925 10df275327ce
child 927 60d5a92ce85c
equal deleted inserted replaced
925:10df275327ce 926:6f9cf0cfe278
    14 	const char *arg;
    14 	const char *arg;
    15 } Key;
    15 } Key;
    16 
    16 
    17 KEYS
    17 KEYS
    18 
    18 
    19 #define CLEANMASK(mask) (mask & ~(numlockmask | LockMask))
    19 #define CLEANMASK(mask)		(mask & ~(numlockmask | LockMask))
    20 #define MOUSEMASK		(BUTTONMASK | PointerMotionMask)
    20 #define MOUSEMASK		(BUTTONMASK | PointerMotionMask)
    21 
    21 
    22 static Client *
    22 static Client *
    23 getclient(Window w) {
    23 getclient(Window w) {
    24 	Client *c;
    24 	Client *c;
   133 					if(ev->state & MODKEY)
   133 					if(ev->state & MODKEY)
   134 						toggletag(buf);
   134 						toggletag(buf);
   135 					else
   135 					else
   136 						toggleview(buf);
   136 						toggleview(buf);
   137 				}
   137 				}
   138 				else if(ev->button == Button4)
       
   139 					shiftview("-1");
       
   140 				else if(ev->button == Button5)
       
   141 					shiftview("1");
       
   142 				return;
   138 				return;
   143 			}
   139 			}
   144 		}
   140 		}
   145 		if(ev->x < x + blw && ev->button == Button1)
   141 		if((ev->x < x + blw) && ev->button == Button1)
   146 			setlayout(NULL);
   142 			setlayout(NULL);
   147 		else if(ev->button == Button4)
       
   148 			focusclient("-1");
       
   149 		else if(ev->button == Button5)
       
   150 			focusclient("1");
       
   151 	}
   143 	}
   152 	else if((c = getclient(ev->window))) {
   144 	else if((c = getclient(ev->window))) {
   153 		focus(c);
   145 		focus(c);
   154 		if(CLEANMASK(ev->state) != MODKEY)
   146 		if(CLEANMASK(ev->state) != MODKEY)
   155 			return;
   147 			return;