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

Merge branch 'master' into personal

Browse Source
This commit is contained in:
seanpringle
2012-09-17 11:50:13 +10:00
parent e32fa0c773 83abf12f2e
commit 7305faf3ff
1 changed files with 7 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
xoat.c
View File

@@ -152,17 +152,18 @@ typedef struct {
Window windows[STACK]; Window windows[STACK];
} stack; } stack;
#include "config.h"
Display *display; Display *display;
Time latest; Time latest;
char *self; char *self;
unsigned int NumlockMask;
monitor monitors[MAX_MONITORS]; monitor monitors[MAX_MONITORS];
int nmonitors = 1; int nmonitors = 1;
short current_spot = 0, current_mon = 0; short current_spot, current_mon;
Window root, ewmh, current = None; Window root, ewmh, current = None;
stack windows, snapshot; stack windows, snapshot;
wm_strut struts;
static int (*xerror)(Display *, XErrorEvent *); static int (*xerror)(Display *, XErrorEvent *);
unsigned int NumlockMask = 0;
#define for_windows(i,c)\ #define for_windows(i,c)\
for (query_windows(), (i) = 0; (i) < windows.depth; (i)++)\ for (query_windows(), (i) = 0; (i) < windows.depth; (i)++)\
@@ -178,11 +179,6 @@ unsigned int NumlockMask = 0;
#define for_spots_rev(i)\ #define for_spots_rev(i)\
for ((i) = SPOT3; (i) >= SPOT1; (i)--) for ((i) = SPOT3; (i) >= SPOT1; (i)--)
typedef void (*handler)(XEvent*);
typedef void (*action)(void*, int, client*);
#include "config.h"
void catch_exit(int sig) void catch_exit(int sig)
{ {
while (0 < waitpid(-1, NULL, WNOHANG)); while (0 < waitpid(-1, NULL, WNOHANG));
@@ -754,7 +750,7 @@ void action_rollback(void *data, int num, client *cli)
} }
// key actions // key actions
action actions[ACTIONS] = { void (*actions[ACTIONS])(void*, int, client*) = {
[ACTION_NONE] = NULL, [ACTION_NONE] = NULL,
[ACTION_MOVE] = action_move, [ACTION_MOVE] = action_move,
[ACTION_FOCUS] = action_focus, [ACTION_FOCUS] = action_focus,
@@ -924,7 +920,7 @@ void any_event(XEvent *e)
client_free(c); client_free(c);
} }
handler handlers[LASTEvent] = { void (*handlers[LASTEvent])(XEvent*) = {
[CreateNotify] = create_notify, [CreateNotify] = create_notify,
[ConfigureRequest] = configure_request, [ConfigureRequest] = configure_request,
[ConfigureNotify] = configure_notify, [ConfigureNotify] = configure_notify,
@@ -942,6 +938,7 @@ handler handlers[LASTEvent] = {
int main(int argc, char *argv[]) int main(int argc, char *argv[])
{ {
int i, j; client *c; XEvent ev; int i, j; client *c; XEvent ev;
wm_strut struts; memset(&struts, 0, sizeof(wm_strut));
if (!(display = XOpenDisplay(0))) return 1; if (!(display = XOpenDisplay(0))) return 1;