Re-add mouse support on win32, fix bugs

[wmpus] / sys-x11.c

diff --git a/sys-x11.c b/sys-x11.c
index 6290f80acbff90a91e29d293ed4e9303a8cd3c0b..3fc4ed7f7d7a02a7e6e935b49895b5000173a7a7 100644 (file)
--- a/sys-x11.c
+++ b/sys-x11.c
@@ -38,7 +38,7 @@ typedef enum {
 } color_t;
 
 /* Global data */
-static void *win_cache;
+static void *cache;
 static Atom atoms[natoms];
 static int (*xerrorxlib)(Display *, XErrorEvent *);
 static unsigned long colors[ncolors];
@@ -217,16 +217,16 @@ static win_t *win_find(Display *dpy, Window xid, int create)
        win_sys_t sys = {.dpy=dpy, .xid=xid};
        win_t     tmp = {.sys=&sys};
        win_t **old = NULL, *new = NULL;
-       if ((old = tfind(&tmp, &win_cache, win_cmp)))
+       if ((old = tfind(&tmp, &cache, win_cmp)))
                return *old;
        if (create && (new = win_new(dpy,xid)))
-               tsearch(new, &win_cache, win_cmp);
+               tsearch(new, &cache, win_cmp);
        return new;
 }
 
 static void win_remove(win_t *win)
 {
-       tdelete(win, &win_cache, win_cmp);
+       tdelete(win, &cache, win_cmp);
        free(win->sys);
        free(win);
 }
@@ -388,7 +388,7 @@ void sys_move(win_t *win, int x, int y, int w, int h)
 {
        //printf("sys_move: %p - %d,%d  %dx%d\n", win, x, y, w, h);
        int b = 2*BORDER;
-       win->x = MAX(x,0);   win->y = MAX(y,0);
+       win->x = x; win->y = y;
        win->w = MAX(w,1+b); win->h = MAX(h,1+b);
        w      = MAX(w-b,1); h      = MAX(h-b,1);
        XMoveResizeWindow(win->sys->dpy, win->sys->xid, x, y, w, h);