diff --git a/wmfs2/src/client.h b/wmfs2/src/client.h index c1b2a52..52c6158 100755 --- a/wmfs2/src/client.h +++ b/wmfs2/src/client.h @@ -13,6 +13,7 @@ Client *client_gb_win(Window w); void client_map(Client *c); void client_unmap(Client *c); void client_focus(Client *c); +void client_get_name(Client *c); void client_close(Client *c); Client *client_new(Window w, XWindowAttributes *wa); void client_remove(Client *c); diff --git a/wmfs2/src/event.c b/wmfs2/src/event.c index 4820724..f902978 100755 --- a/wmfs2/src/event.c +++ b/wmfs2/src/event.c @@ -15,7 +15,7 @@ static void event_buttonpress(XEvent *e) { - XButtonEvent *ev = &e->xbutton; + /*XButtonEvent *ev = &e->xbutton;*/ } @@ -36,8 +36,8 @@ event_enternotify(XEvent *e) static void event_clientmessageevent(XEvent *e) { - XClientMessageEvent *ev = &e->xclient; - Client *c; + /* XClientMessageEvent *ev = &e->xclient; + Client *c;*/ } static void @@ -186,7 +186,6 @@ event_keypress(XEvent *e) { XKeyPressedEvent *ev = &e->xkey; KeySym keysym = XKeycodeToKeysym(EVDPY(e), (KeyCode)ev->keycode, 0); - Flags m = ~(W->numlockmask | LockMask); Keybind *k; SLIST_FOREACH(k, &W->h.keybind, next) diff --git a/wmfs2/src/infobar.h b/wmfs2/src/infobar.h index 7222e26..23b4343 100755 --- a/wmfs2/src/infobar.h +++ b/wmfs2/src/infobar.h @@ -12,6 +12,7 @@ enum { ElemTag = 0, ElemLayout, ElemSelbar, ElemStatus, ElemCustom }; void infobar_init(void); Infobar *infobar_new(Scr33n *s); +void infobar_elem_update(Infobar *i); void infobar_refresh(Infobar *i); void infobar_remove(Infobar *i); void infobar_free(Scr33n *s); diff --git a/wmfs2/src/screen.c b/wmfs2/src/screen.c index 670248e..7f82afa 100755 --- a/wmfs2/src/screen.c +++ b/wmfs2/src/screen.c @@ -12,6 +12,7 @@ #include "screen.h" #include "util.h" #include "tag.h" +#include "infobar.h" static Scr33n* screen_new(Geo *g, int id) diff --git a/wmfs2/src/tag.c b/wmfs2/src/tag.c index a4dcf23..8b67162 100755 --- a/wmfs2/src/tag.c +++ b/wmfs2/src/tag.c @@ -55,6 +55,7 @@ uicb_tag_set(Uicb cmd) void uicb_tag_next(Uicb cmd) { + (void)cmd; Tag *t; if((t = TAILQ_NEXT(W->screen->seltag, next))) @@ -66,6 +67,7 @@ uicb_tag_next(Uicb cmd) void uicb_tag_prev(Uicb cmd) { + (void)cmd; Tag *t; if((t = TAILQ_PREV(W->screen->seltag, tsub, next))) diff --git a/wmfs2/src/util.c b/wmfs2/src/util.c index 85147cb..f66b71a 100755 --- a/wmfs2/src/util.c +++ b/wmfs2/src/util.c @@ -3,6 +3,8 @@ * For license, see COPYING. */ +#define _GNU_SOURCE /* vasprintf() */ + #include #include diff --git a/wmfs2/src/wmfs.c b/wmfs2/src/wmfs.c index 7d062d8..543a02c 100755 --- a/wmfs2/src/wmfs.c +++ b/wmfs2/src/wmfs.c @@ -9,8 +9,12 @@ #include "wmfs.h" #include "event.h" +#include "ewmh.h" +#include "screen.h" +#include "infobar.h" #include "util.h" #include "config.h" +#include "client.h" int wmfs_error_handler(Display *d, XErrorEvent *event) @@ -146,7 +150,6 @@ wmfs_scan(void) int i, n; XWindowAttributes wa; Window usl, usl2, *w = NULL; - Client *c; /* Atom rt; @@ -155,7 +158,7 @@ wmfs_scan(void) uchar *ret; */ - if(XQueryTree(W->dpy, W->root, &usl, &usl2, &w, &n)) + if(XQueryTree(W->dpy, W->root, &usl, &usl2, &w, (unsigned int*)&n)) for(i = n - 1; i != -1; --i) { XGetWindowAttributes(W->dpy, w[i], &wa);