summaryrefslogtreecommitdiff
path: root/event.c
diff options
context:
space:
mode:
authorarg@10ksloc.org <unknown>2006-07-20 15:07:35 +0200
committerarg@10ksloc.org <unknown>2006-07-20 15:07:35 +0200
commit4688ad181da14be36e034918580ec0ce5968ffdb (patch)
treee919b8e6e89400a8b5dac01fa611090f139d5b5f /event.c
parentdc5d967ee61046f899b3b49daeb9268c8161844a (diff)
made status bar drawing more robust, implemented togglemax and togglemode, works quite well
Diffstat (limited to 'event.c')
-rw-r--r--event.c11
1 files changed, 3 insertions, 8 deletions
diff --git a/event.c b/event.c
index 2736903..5d7c8a7 100644
--- a/event.c
+++ b/event.c
@@ -40,8 +40,8 @@ static Key key[] = {
{ MODKEY, XK_3, view, { .i = Twork } },
{ MODKEY, XK_j, focusnext, { 0 } },
{ MODKEY, XK_k, focusprev, { 0 } },
- { MODKEY, XK_m, maximize, { 0 } },
- { MODKEY, XK_space, dotile, { 0 } },
+ { MODKEY, XK_m, togglemax, { 0 } },
+ { MODKEY, XK_space, togglemode, { 0 } },
{ MODKEY, XK_Return, zoom, { 0 } },
{ ControlMask|ShiftMask,XK_0, heretag, { .i = Tscratch } },
{ ControlMask|ShiftMask,XK_1, heretag, { .i = Tdev } },
@@ -55,7 +55,6 @@ static Key key[] = {
{ MODKEY|ShiftMask, XK_g, spawn, { .argv = gimp } },
{ MODKEY|ShiftMask, XK_l, spawn, { .argv = xlock } },
{ MODKEY|ShiftMask, XK_q, quit, { 0 } },
- { MODKEY|ShiftMask, XK_space, dofloat, { 0 } },
{ MODKEY|ShiftMask, XK_w, spawn, { .argv = browse } },
{ MODKEY|ShiftMask, XK_Return, spawn, { .argv = term } },
};
@@ -170,11 +169,7 @@ buttonpress(XEvent *e)
default:
break;
case Button1:
- if(arrange == dotile && !c->isfloat) {
- if((ev->state & ControlMask) && (ev->button == Button1))
- zoom(NULL);
- }
- else {
+ if(arrange == dofloat || c->isfloat) {
higher(c);
movemouse(c);
}