all: Fix typo

This commit is contained in:
Martin Duquesnoy 2008-10-31 10:02:19 +01:00
parent f41a145a4c
commit dbae20cf0f
3 changed files with 18 additions and 20 deletions

View File

@ -227,7 +227,7 @@ grabkeys(void)
KeyCode code; KeyCode code;
XUngrabKey(dpy, AnyKey, AnyModifier, root); XUngrabKey(dpy, AnyKey, AnyModifier, root);
for(i = 0; i < conf.nkeybind; i++) for(i = 0; i < conf.nkeybind; ++i)
{ {
code = XKeysymToKeycode(dpy, keys[i].keysym); code = XKeysymToKeycode(dpy, keys[i].keysym);
XGrabKey(dpy, code, keys[i].mod, root, True, GrabModeAsync, GrabModeAsync); XGrabKey(dpy, code, keys[i].mod, root, True, GrabModeAsync, GrabModeAsync);
@ -248,7 +248,7 @@ keypress(XEvent ev)
KeySym keysym; KeySym keysym;
keysym = XKeycodeToKeysym(dpy, (KeyCode)ev.xkey.keycode, 0); keysym = XKeycodeToKeysym(dpy, (KeyCode)ev.xkey.keycode, 0);
for(i = 0; i < conf.nkeybind; i++) for(i = 0; i < conf.nkeybind; ++i)
if(keysym == keys[i].keysym if(keysym == keys[i].keysym
&& (keys[i].mod & ~(numlockmask | LockMask)) == && (keys[i].mod & ~(numlockmask | LockMask)) ==
(ev.xkey.state & ~(numlockmask | LockMask)) (ev.xkey.state & ~(numlockmask | LockMask))

View File

@ -45,8 +45,7 @@ arrange(void)
tags[seltag].layout.func(); tags[seltag].layout.func();
if(selbytag[seltag] != NULL if(selbytag[seltag] != NULL)
&& selbytag[seltag]->tbar != NULL)
client_focus(selbytag[seltag]); client_focus(selbytag[seltag]);
else else
client_focus(NULL); client_focus(NULL);
@ -191,13 +190,10 @@ void
multi_tile(Position type) multi_tile(Position type)
{ {
Client *c; Client *c;
/* Master geometry */
XRectangle mastergeo = {sgeo.x, sgeo.y, 0, 0}; XRectangle mastergeo = {sgeo.x, sgeo.y, 0, 0};
/* Client geometry */
XRectangle cgeo = {sgeo.x, sgeo.y, 0, 0}; XRectangle cgeo = {sgeo.x, sgeo.y, 0, 0};
uint n, mwfact, nmaster = tags[seltag].nmaster; uint i , n, tilesize, mwfact, nmaster = tags[seltag].nmaster;
uint tilesize = 0; uint border = conf.client.borderheight * 2;
int i, border = conf.client.borderheight * 2;
for(n = 0, c = nexttiled(clients); c; c = nexttiled(c->next), ++n); for(n = 0, c = nexttiled(clients); c; c = nexttiled(c->next), ++n);
if(!n) if(!n)
@ -307,7 +303,7 @@ multi_tile(Position type)
} }
/* Magic instant */ /* Magic instant */
client_moveresize(c, cgeo, False); client_moveresize(c, cgeo, tags[seltag].resizehint);
/* Set the position of the next client */ /* Set the position of the next client */
if(type == Top || type == Bottom) if(type == Top || type == Bottom)
@ -377,8 +373,10 @@ uicb_togglemax(uicb_t cmd)
return; return;
if(!sel->max) if(!sel->max)
{ {
sel->ogeo.x = sel->geo.x; sel->ogeo.y = sel->geo.y; sel->ogeo.x = sel->geo.x;
sel->ogeo.width = sel->geo.width; sel->ogeo.height = sel->geo.height; sel->ogeo.y = sel->geo.y;
sel->ogeo.width = sel->geo.width;
sel->ogeo.height = sel->geo.height;
geo.x = sgeo.x; geo.y = sgeo.y; geo.x = sgeo.x; geo.y = sgeo.y;
geo.width = sgeo.width - (sel->border * 2); geo.width = sgeo.width - (sel->border * 2);
@ -390,8 +388,10 @@ uicb_togglemax(uicb_t cmd)
} }
else if(sel->max) else if(sel->max)
{ {
geo.x = sel->ogeo.x; geo.y = sel->ogeo.y; geo.x = sel->ogeo.x;
geo.width = sel->ogeo.width; geo.height = sel->ogeo.height; geo.y = sel->ogeo.y;
geo.width = sel->ogeo.width;
geo.height = sel->ogeo.height;
client_moveresize(sel, geo, False); client_moveresize(sel, geo, False);
sel->max = False; sel->max = False;
@ -400,5 +400,3 @@ uicb_togglemax(uicb_t cmd)
return; return;
} }

8
wmfsrc
View File

@ -24,10 +24,10 @@ layouts
fg = "#191919" fg = "#191919"
bg = "#7E89A2" bg = "#7E89A2"
layout { type = "tile" symbol = "TILE_R" } layout { type = "tile" symbol = "TILE >" }
layout { type = "tile_left" symbol = "TILE_L" } layout { type = "tile_left" symbol = "TILE <" }
layout { type = "tile_top" symbol = "TILE_T" } layout { type = "tile_top" symbol = "TILE ^" }
layout { type = "tile_bottom" symbol = "TILE_B" } layout { type = "tile_bottom" symbol = "TILE v" }
layout { type = "max" symbol = "MAX" } layout { type = "max" symbol = "MAX" }
layout { type = "free" symbol = "FREE" } layout { type = "free" symbol = "FREE" }
} }