released at 0.0.9

Author: mcpcpc

CHANGELOG

@@ -54,3 +54,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Removed
 - Global root variable.
 - Removed leave notify event.
+
+## [0.0.9] - 2020-11-17
+### Fixed
+- Window resize lag.
+- Bug where window border moves outside of root window.

config.h

@@ -21,10 +21,10 @@
  * window behavior.
  */
 
-#define WINDOW_WIDTH           600
-#define WINDOW_HEIGHT          400
-#define WINDOW_MIN_WIDTH       60
-#define WINDOW_MIN_HEIGHT      40
+#define WINDOW_X               600
+#define WINDOW_Y               400
+#define WINDOW_MIN_X           60
+#define WINDOW_MIN_Y           40
 #define BORDER_WIDTH           1        /* 0 = no border effect */
 #define BORDER_COLOR_UNFOCUSED 0x696969 /* 0xRRGGBB */
 #define BORDER_COLOR_FOCUSED   0xFFFFFF /* 0xRRGGBB */

xwm.c

@@ -50,42 +50,31 @@ static void handleButtonPress(xcb_generic_event_t * ev) {
         XCB_GRAB_MODE_ASYNC, XCB_GRAB_MODE_ASYNC, scre->root, XCB_NONE, XCB_CURRENT_TIME);
 }
 
-static void moveWindow(xcb_query_pointer_reply_t * poin) {
-    xcb_get_geometry_cookie_t geom_now = xcb_get_geometry(dpy, win);
-    xcb_get_geometry_reply_t * geom = xcb_get_geometry_reply(dpy, geom_now, NULL);
-    values[0] = ((poin->root_x + geom->width) > scre->width_in_pixels) ?
-        (scre->width_in_pixels - geom->width) : poin->root_x;
-    values[1] = ((poin->root_y + geom->height) > scre->height_in_pixels) ?
-        (scre->height_in_pixels - geom->height) : poin->root_y;
-    xcb_configure_window(dpy, win, XCB_CONFIG_WINDOW_X
-        | XCB_CONFIG_WINDOW_Y, values);
-}
-
-static void resizeWindow(xcb_query_pointer_reply_t * poin) {
-    xcb_get_geometry_cookie_t geom_now = xcb_get_geometry(dpy, win);
-    xcb_get_geometry_reply_t* geom = xcb_get_geometry_reply(dpy, geom_now, NULL);
-    if (!((poin->root_x <= geom->x) || (poin->root_y <= geom->y))) {
-        values[0] = poin->root_x - geom->x;
-        values[1] = poin->root_y - geom->y;
-        uint32_t min_x = WINDOW_MIN_WIDTH;
-        uint32_t min_y = WINDOW_MIN_HEIGHT;
-        if ((values[0] >= min_x) && (values[1] >= min_y)) {
-            xcb_configure_window(dpy, win, XCB_CONFIG_WINDOW_WIDTH
-                | XCB_CONFIG_WINDOW_HEIGHT, values);
-        }
-    }
-}
-
 static void handleMotionNotify(xcb_generic_event_t * ev) {
     xcb_query_pointer_cookie_t coord = xcb_query_pointer(dpy, scre->root);
     xcb_query_pointer_reply_t * poin = xcb_query_pointer_reply(dpy, coord, 0);
     uint32_t val[2] = {1, 3};
     if ((values[2] == val[0]) && (win != 0)) {
-        moveWindow(poin);
-    }
-    if ((values[2] == val[1]) && (win != 0)) {
-        resizeWindow(poin);
-    }
+        xcb_get_geometry_cookie_t geom_now = xcb_get_geometry(dpy, win);
+        xcb_get_geometry_reply_t * geom = xcb_get_geometry_reply(dpy, geom_now, NULL);
+        values[0] = ((poin->root_x + geom->width + 2*BORDER_WIDTH) > scre->width_in_pixels) ?
+            (scre->width_in_pixels - geom->width - 2*BORDER_WIDTH) : poin->root_x;
+        values[1] = ((poin->root_y + geom->height + 2*BORDER_WIDTH) > scre->height_in_pixels) ?
+            (scre->height_in_pixels - geom->height - 2*BORDER_WIDTH) : poin->root_y;
+        xcb_configure_window(dpy, win, XCB_CONFIG_WINDOW_X
+            | XCB_CONFIG_WINDOW_Y, values);
+    } else if ((values[2] == val[1]) && (win != 0)) {
+        xcb_get_geometry_cookie_t geom_now = xcb_get_geometry(dpy, win);
+        xcb_get_geometry_reply_t* geom = xcb_get_geometry_reply(dpy, geom_now, NULL);
+        if (!((poin->root_x <= geom->x) || (poin->root_y <= geom->y))) {
+            values[0] = poin->root_x - geom->x - BORDER_WIDTH;
+            values[1] = poin->root_y - geom->y - BORDER_WIDTH;
+            if ((values[0] >= WINDOW_MIN_X) && (values[1] >= WINDOW_MIN_Y)) {
+                xcb_configure_window(dpy, win, XCB_CONFIG_WINDOW_WIDTH
+                    | XCB_CONFIG_WINDOW_HEIGHT, values);
+            }
+        }
+    } else {}
 }
 
 static xcb_keycode_t * xcb_get_keycodes(xcb_keysym_t keysym) {
@@ -132,8 +121,8 @@ static void setBorderWidth(xcb_window_t window) {
 static void setWindowDimensions(xcb_window_t window) {
     if ((scre->root != window) && (0 != window)) {
         uint32_t vals[2];
-        vals[0] = WINDOW_WIDTH;
-        vals[1] = WINDOW_HEIGHT;
+        vals[0] = WINDOW_X;
+        vals[1] = WINDOW_Y;
         xcb_configure_window(dpy, window, XCB_CONFIG_WINDOW_WIDTH |
             XCB_CONFIG_WINDOW_HEIGHT, vals);
         xcb_flush(dpy);
@@ -259,7 +248,7 @@ static int strcmp_c(char * str1, char * str2) {
 int main(int argc, char * argv[]) {
     int ret = 0;
     if ((argc == 2) && (strcmp_c("-v", argv[1]) == 0)) {
-        ret = die("xwm-0.0.8, © 2020 Michael Czigler, see LICENSE for details\n");
+        ret = die("xwm-0.0.9, © 2020 Michael Czigler, see LICENSE for details\n");
     }
     if ((ret == 0) && (argc != 1)) {
         ret = die("usage: xwm [-v]\n");

xwm.h

@@ -27,8 +27,6 @@ static void setFocus(xcb_drawable_t window);
 static void setWindowDimensions(xcb_drawable_t window);
 static void setBorderWidth(xcb_drawable_t window);
 static void setBorderColor(xcb_drawable_t window, int focus);
-static void moveWindow(xcb_query_pointer_reply_t * poin);
-static void resizeWindow(xcb_query_pointer_reply_t * poin);
 
 /* event hander actions */
 static int eventHandler(void);