jazzman/xoat
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

cleanup

Browse Source
This commit is contained in:
seanpringle
2012-09-21 16:51:47 +10:00
parent 1e78789e68
commit bf739b209e
1 changed files with 8 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
xoat.c
View File

@@ -422,7 +422,7 @@ int client_send_wm_protocol(client *c, Atom protocol)
void client_close(client *c) void client_close(client *c)
{ {
if (!client_send_wm_protocol(c, atoms[WM_DELETE_WINDOW])) if (c && !client_send_wm_protocol(c, atoms[WM_DELETE_WINDOW]))
XKillClient(display, c->window); XKillClient(display, c->window);
} }
@@ -590,24 +590,14 @@ int spot_choose_by_direction(int spot, int mon, int dir)
{ {
if (dir == LEFT) return SPOT3; if (dir == LEFT) return SPOT3;
if (dir == RIGHT) return SPOT2; if (dir == RIGHT) return SPOT2;
if (SPOT1_ALIGN == SPOT1_LEFT) if (dir == UP) return SPOT1_ALIGN == SPOT1_LEFT ? SPOT1: SPOT2;
{ if (dir == DOWN) return SPOT1_ALIGN == SPOT1_LEFT ? SPOT2: SPOT1;
if (dir == UP) return SPOT1;
if (dir == DOWN) return SPOT2;
}
if (dir == UP) return SPOT2;
if (dir == DOWN) return SPOT1;
return spot; return spot;
} }
if (dir == UP) return SPOT2; if (dir == UP) return SPOT2;
if (dir == DOWN) return SPOT3; if (dir == DOWN) return SPOT3;
if (SPOT1_ALIGN == SPOT1_LEFT) if (dir == LEFT) return SPOT1_ALIGN == SPOT1_LEFT ? SPOT1: SPOT2;
{ if (dir == RIGHT) return SPOT1_ALIGN == SPOT1_LEFT ? SPOT2: SPOT1;
if (dir == LEFT) return SPOT1;
if (dir == RIGHT) return SPOT2;
}
if (dir == LEFT) return SPOT2;
if (dir == RIGHT) return SPOT1;
return spot; return spot;
} }
@@ -704,12 +694,10 @@ void action_fullscreen(void *data, int num, client *cli)
if (!cli) return; if (!cli) return;
unsigned long spot = cli->spot; unsigned long spot = cli->spot;
client_raise_family(cli); client_raise_family(cli);
cli->spot = SPOT1;
if (client_toggle_state(cli, atoms[_NET_WM_STATE_FULLSCREEN])) if (client_toggle_state(cli, atoms[_NET_WM_STATE_FULLSCREEN]))
{
window_set_cardinal_prop(cli->window, atoms[XOAT_SPOT], &spot, 1); window_set_cardinal_prop(cli->window, atoms[XOAT_SPOT], &spot, 1);
cli->spot = SPOT1;
}
else else
if (window_get_cardinal_prop(cli->window, atoms[XOAT_SPOT], &spot, 1)) if (window_get_cardinal_prop(cli->window, atoms[XOAT_SPOT], &spot, 1))
cli->spot = spot; cli->spot = spot;
@@ -856,8 +844,7 @@ void unmap_notify(XEvent *e)
void key_press(XEvent *ev) void key_press(XEvent *ev)
{ {
XKeyEvent *e = &ev->xkey; XKeyEvent *e = &ev->xkey; latest = e->time;
latest = e->time;
KeySym key = XkbKeycodeToKeysym(display, e->keycode, 0, 0); KeySym key = XkbKeycodeToKeysym(display, e->keycode, 0, 0);
unsigned int state = e->state & ~(LockMask|NumlockMask); unsigned int state = e->state & ~(LockMask|NumlockMask);
while (XCheckTypedEvent(display, KeyPress, ev)); while (XCheckTypedEvent(display, KeyPress, ev));
@@ -877,8 +864,7 @@ void key_press(XEvent *ev)
void button_press(XEvent *ev) void button_press(XEvent *ev)
{ {
XButtonEvent *e = &ev->xbutton; XButtonEvent *e = &ev->xbutton; latest = e->time;
latest = e->time;
client *c = window_build_client(e->subwindow); client *c = window_build_client(e->subwindow);
if (c && c->manage) if (c && c->manage)
client_activate(c); client_activate(c);