nixo
/
gri3-wm
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Correct the Macro-calls in src/xcb.c

This commit is contained in:
Axel Wagner 2010-08-07 02:34:02 +02:00
parent dcbf0c71d2
commit c03e850171
1 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
i3bar/src/xcb.c
View File

@ -102,18 +102,18 @@ void handle_button(xcb_button_press_event_t *event) {
break; break;
case 4: case 4:
/* Mouse wheel down. We select the next ws */ /* Mouse wheel down. We select the next ws */
if (cur_ws == TAILQ_FIRST(walk->workspaces, ws_head)) { if (cur_ws == TAILQ_FIRST(walk->workspaces)) {
cur_ws = TAILQ_LAST(walk->workspaces); cur_ws = TAILQ_LAST(walk->workspaces, ws_head);
} else { } else {
cur_ws = TAILQ_PREV(cur_ws, tailq); cur_ws = TAILQ_PREV(cur_ws, ws_head, tailq);
} }
break; break;
case 5: case 5:
/* Mouse wheel up. We select the previos ws */ /* Mouse wheel up. We select the previos ws */
if (cur_ws == TAILQ_LAST(walk->workspaces)) { if (cur_ws == TAILQ_LAST(walk->workspaces, ws_head)) {
cur_ws = TAILQ_FIRST(walk->workspaces, ws_head); cur_ws = TAILQ_FIRST(walk->workspaces);
} else { } else {
cur_ws = TAILQ_NEXT(cur_ws, ws_head, tailq); cur_ws = TAILQ_NEXT(cur_ws, tailq);
} }
break; break;
} }
@ -256,7 +256,12 @@ void init_xcb(char *fontname) {
* *
*/ */
void clean_xcb() { void clean_xcb() {
/* FIXME: destroy() the bars first */ i3_output *walk;
SLIST_FOREACH(walk, outputs, slist) {
destroy_window(walk);
}
FREE_SLIST(outputs, i3_output);
xcb_disconnect(xcb_connection); xcb_disconnect(xcb_connection);
ev_check_stop(main_loop, xcb_chk); ev_check_stop(main_loop, xcb_chk);