1.1 --- a/event.c	Thu Jul 20 12:18:06 2006 +0200
     1.2 +++ b/event.c	Thu Jul 20 15:07:35 2006 +0200
     1.3 @@ -40,8 +40,8 @@
     1.4  	{ MODKEY,		XK_3,		view,		{ .i = Twork } }, 
     1.5  	{ MODKEY,		XK_j,		focusnext,	{ 0 } }, 
     1.6  	{ MODKEY,		XK_k,		focusprev,	{ 0 } },
     1.7 -	{ MODKEY,		XK_m,		maximize,	{ 0 } }, 
     1.8 -	{ MODKEY,		XK_space,	dotile,		{ 0 } }, 
     1.9 +	{ MODKEY,		XK_m,		togglemax,	{ 0 } }, 
    1.10 +	{ MODKEY,		XK_space,	togglemode,	{ 0 } }, 
    1.11  	{ MODKEY,		XK_Return,	zoom,		{ 0 } },
    1.12  	{ ControlMask|ShiftMask,XK_0,		heretag,	{ .i = Tscratch } }, 
    1.13  	{ ControlMask|ShiftMask,XK_1,		heretag,	{ .i = Tdev } }, 
    1.14 @@ -55,7 +55,6 @@
    1.15  	{ MODKEY|ShiftMask,	XK_g,		spawn,		{ .argv = gimp } },
    1.16  	{ MODKEY|ShiftMask,	XK_l,		spawn,		{ .argv = xlock } },
    1.17  	{ MODKEY|ShiftMask,	XK_q,		quit,		{ 0 } },
    1.18 -	{ MODKEY|ShiftMask,	XK_space,	dofloat,	{ 0 } }, 
    1.19  	{ MODKEY|ShiftMask,	XK_w,		spawn,		{ .argv = browse } },
    1.20  	{ MODKEY|ShiftMask,	XK_Return,	spawn,		{ .argv = term } },
    1.21  };
    1.22 @@ -170,11 +169,7 @@
    1.23  		default:
    1.24  			break;
    1.25  		case Button1:
    1.26 -			if(arrange == dotile && !c->isfloat) {
    1.27 -				if((ev->state & ControlMask) && (ev->button == Button1))
    1.28 -					zoom(NULL);
    1.29 -			}
    1.30 -			else {
    1.31 +			if(arrange == dofloat || c->isfloat) {
    1.32  				higher(c);
    1.33  				movemouse(c);
    1.34  			}