applied the proposal by nsz

[dwm.git] / dwm.c

diff --git a/dwm.c b/dwm.c
index ee0c810..997a220 100644 (file)
--- a/dwm.c
+++ b/dwm.c
@@ -112,7 +112,7 @@ typedef struct {
        const char *symbol;
        void (*arrange)(void);
        Bool isfloating;
        const char *symbol;
        void (*arrange)(void);
        Bool isfloating;

-} Layout; 
+} Layout;

 
 typedef struct {
        const char *class;
 
 typedef struct {
        const char *class;


@@ -241,13 +241,15 @@ Client *stack = NULL;
 Cursor cursor[CurLast];
 Display *dpy;
 DC dc = {0};
 Cursor cursor[CurLast];
 Display *dpy;
 DC dc = {0};

+Geom geoms[];
+Geom *geom = geoms;
+Layout layouts[];
+Layout *lt = layouts;

 Window root, barwin;
 
 /* configuration, allows nested code to access above variables */
 #include "config.h"
 #define TAGSZ (LENGTH(tags) * sizeof(Bool))
 Window root, barwin;
 
 /* configuration, allows nested code to access above variables */
 #include "config.h"
 #define TAGSZ (LENGTH(tags) * sizeof(Bool))

-Layout *lt = layouts;
-Geom *geom = geoms;

 
 /* function implementations */
 
 
 /* function implementations */
 


@@ -1851,6 +1853,7 @@ xerror(Display *dpy, XErrorEvent *ee) {
        || (ee->request_code == X_PolyFillRectangle && ee->error_code == BadDrawable)
        || (ee->request_code == X_PolySegment && ee->error_code == BadDrawable)
        || (ee->request_code == X_ConfigureWindow && ee->error_code == BadMatch)
        || (ee->request_code == X_PolyFillRectangle && ee->error_code == BadDrawable)
        || (ee->request_code == X_PolySegment && ee->error_code == BadDrawable)
        || (ee->request_code == X_ConfigureWindow && ee->error_code == BadMatch)

+       || (ee->request_code == X_GrabButton && ee->error_code == BadAccess)

        || (ee->request_code == X_GrabKey && ee->error_code == BadAccess)
        || (ee->request_code == X_CopyArea && ee->error_code == BadDrawable))
                return 0;
        || (ee->request_code == X_GrabKey && ee->error_code == BadAccess)
        || (ee->request_code == X_CopyArea && ee->error_code == BadDrawable))
                return 0;