released at 0.1.4

Author: mcpcpc

CHANGELOG

@@ -83,3 +83,15 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Changed
 - Default new window location from top-left to center.
 
+## [0.1.4] - 2020-12-22
+### Added
+- Raise focus command keys to xwm.1 and README.
+
+### Changed
+- The "Features" section of the README to indicate audience.
+
+### Removed
+- Pointer warp on window resize/move as this appears to be default.
+
+### Fixed
+- Spelling and grammar in man page.

README

@@ -1,17 +1,13 @@
 xwm - a tiny XCB floating window manager
 
-FEATURES
-========
-
-*   Few features (just works)
-*   Extensible & configurable
-*   Focus follows mouse
+A minimal viable solution that was developed with single-monitor
+workflows in mind. Despite the small footprint, xwm maintains
+extensibility and can be customized to enhance the user experience.
 
-BUILD REQUIREMENTS
-==================
+REQUIREMENTS
+============
 
 xcb-util-keysyms, along with any default or user defined utilities:
-
     application launcher   https://git.suckless.org/dmenu
     terminal emulator      https://git.suckless.org/st
     internet browser       https://git.suckless.org/surf
@@ -20,7 +16,8 @@ COMMANDS
 ========
 
 Default keys and behavior can be customized via the config.h file:
-
+    Win+Button1            raise focused window to top of stack
+    Win+Button3            raise focused window to top of stack
     Win+Button1+[drag]     interactive window move
     Win+Button3+[drag]     interactive window resize
     Win+Space              run launcher menu (default: dmenu_run)
@@ -52,7 +49,7 @@ PATCHES
 
 For additional features, I have provided a respository for sharing
 and hosting user created patches:
-    https://github.com/mcpcpc/xwm-patches
+    https://github.com/mcpcpc/xwm-community
 
 EXAMPLES
 ========

config.h

@@ -21,6 +21,10 @@
  * window behavior.
  */
 
+#define ROOT_PADDING_TOP       0
+#define ROOT_PADDING_BOTTOM    0
+#define ROOT_PADDING_LEFT      0
+#define ROOT_PADDING_RIGHT     0
 #define WINDOW_X               600
 #define WINDOW_Y               400
 #define WINDOW_MIN_X           60
@@ -53,4 +57,3 @@ static Key keys[] = {
     { MOD1,      0x0071, killclient, NULL },    /* 0x0071 = XK_q */
     { MOD1|MOD2, 0x0071, closewm,    NULL }     /* 0x0071 = XK_q */
 };
-

xwm.1

@@ -1,14 +1,14 @@
 .\"Manpage for xwm.
 .TH XWM 1 "NOVEMBER 2020" Linux "User Manuals"
 .SH NAME
-xwm \- a tiny XCB floating window managers
+xwm \- a tiny XCB floating window manager
 .SH SYNOPSIS
 .B xwm [-v]
 .SH DESCRIPTION
 .B xwm
 is a tiny floating window manager implemented using
 the XCB protocol. Other than
-.BR libxcb (1),
+.BR xcb-util-keysyms (1),
 xwm relies on third-party tools, which can be
 configured or expanded to meet the user's preference.
 The default configuration provides support and
@@ -33,6 +33,14 @@ The default command key bindings are:
 tab(;);
 lb l l.
 _
+Super;MouseButton1;T{
+Raise focused window to top of stack.
+T}
+_
+Super;MouseButton3;T{
+Raise focused window to top of stack.
+T}
+_
 Super-MouseButton1;[drag];T{
 Interactive window move.
 T}

xwm.c

@@ -12,8 +12,6 @@ static xcb_connection_t * dpy;
 static xcb_screen_t     * scre;
 static xcb_drawable_t     win;
 static uint32_t           values[3];
-static uint32_t           min_x = WINDOW_MIN_X;
-static uint32_t           min_y = WINDOW_MIN_Y;
 
 static void killclient(char **com) {
     UNUSED(com);
@@ -47,42 +45,36 @@ static void handleButtonPress(xcb_generic_event_t * ev) {
     win = e->child;
     values[0] = XCB_STACK_MODE_ABOVE;
     xcb_configure_window(dpy, win, XCB_CONFIG_WINDOW_STACK_MODE, values);
-    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 (1 == e->detail) {
-        values[2] = 1;
-        xcb_warp_pointer(dpy, XCB_NONE, win, 0, 0, 0, 0, 1, 1);
-    } else if (win != 0) {
-        values[2] = 3;
-        xcb_warp_pointer(dpy, XCB_NONE, win, 0, 0, 0, 0, geom->width, geom->height);
-    }
-    else {}
+    values[2] = ((1 == e->detail) ? 1 : ((win != 0) ? 3 : 0 ));
     xcb_grab_pointer(dpy, 0, scre->root, XCB_EVENT_MASK_BUTTON_RELEASE
         | XCB_EVENT_MASK_BUTTON_MOTION | XCB_EVENT_MASK_POINTER_MOTION_HINT,
-        XCB_GRAB_MODE_ASYNC, XCB_GRAB_MODE_ASYNC, scre->root, XCB_NONE, XCB_CURRENT_TIME);
+        XCB_GRAB_MODE_ASYNC, XCB_GRAB_MODE_ASYNC,
+        scre->root, XCB_NONE, XCB_CURRENT_TIME);
 }
 
 static void handleMotionNotify(xcb_generic_event_t * ev) {
     UNUSED(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)) {
+    if ((values[2] == (uint32_t)(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);
-        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;
+        uint16_t geom_x = geom->width + (2 * BORDER_WIDTH);
+        uint16_t geom_y = geom->height + (2 * BORDER_WIDTH);
+        values[0] = ((poin->root_x + geom_x) > scre->width_in_pixels) ?
+            (scre->width_in_pixels - geom_x) : poin->root_x;
+        values[1] = ((poin->root_y + geom_y) > scre->height_in_pixels) ?
+            (scre->height_in_pixels - geom_y) : 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)) {
+    } else if ((values[2] == (uint32_t)(3)) && (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] >= min_x) && (values[1] >= min_y)) {
+            if ((values[0] >= (uint32_t)(WINDOW_MIN_X)) &&
+                (values[1] >= (uint32_t)(WINDOW_MIN_Y))) {
                 xcb_configure_window(dpy, win, XCB_CONFIG_WINDOW_WIDTH
                     | XCB_CONFIG_WINDOW_HEIGHT, values);
             }
@@ -218,14 +210,12 @@ static int eventHandler(void) {
 }
 
 static void setup(void) {
-    /* subscribe to events */
     values[0] = XCB_EVENT_MASK_SUBSTRUCTURE_REDIRECT
         | XCB_EVENT_MASK_STRUCTURE_NOTIFY
         | XCB_EVENT_MASK_SUBSTRUCTURE_NOTIFY
         | XCB_EVENT_MASK_PROPERTY_CHANGE;
     xcb_change_window_attributes_checked(dpy, scre->root,
         XCB_CW_EVENT_MASK, values);
-    /* grab keys */
     xcb_ungrab_key(dpy, XCB_GRAB_ANY, scre->root, XCB_MOD_MASK_ANY);
     int key_table_size = sizeof(keys) / sizeof(*keys);
     for (int i = 0; i < key_table_size; ++i) {
@@ -274,7 +264,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.1.3, © 2020 Michael Czigler, see LICENSE for details\n");
+        ret = die("xwm-0.1.4, © 2020 Michael Czigler, see LICENSE for details\n");
     }
     if ((ret == 0) && (argc != 1)) {
         ret = die("usage: xwm [-v]\n");
@@ -295,4 +285,3 @@ int main(int argc, char * argv[]) {
     }
     return ret;
 }
-

xwm.h

@@ -59,4 +59,3 @@ static void setup(void);
 /* error handling & misc. */
 static int die(char * errstr);
 static int strcmp_c(char * str1, char * str2);
-