mousebind: support `Border` context

This new context includes `Top`...`BRCorner` and makes it easier to modify
the mousebinds bound to them.

diff --git a/docs/labwc-config.5.scd b/docs/labwc-config.5.scd
index 1dc59a8c4e1663c78c5c85208a01155666da10c2..95600d3b0b72e96fa8298e9c4a87cb90d7b1aba4 100644 (file)
--- a/docs/labwc-config.5.scd
+++ b/docs/labwc-config.5.scd
@@ -747,6 +747,7 @@ extending outward from the snapped edge.
        - AllDesktops: A button that, by default, toggles omnipresence of a
          window.
        - Close: A button that, by default, closses a window.
+       - Border: The window's border including Top...BRCorner below.
        - Top: The top edge of the window's border.
        - Bottom: The bottom edge of the window's border.
        - Left: The left edge of the window's border.

diff --git a/docs/rc.xml.all b/docs/rc.xml.all
index 940b2f96698800a920148202f303f18e02d35ba6..f91985c352c15ec3c145c5fdf7e06705e925faae 100644 (file)
--- a/docs/rc.xml.all
+++ b/docs/rc.xml.all
@@ -375,42 +375,7 @@
       </mousebind>
     </context>
 
-    <context name="Top">
-      <mousebind button="Left" action="Drag">
-        <action name="Resize" />
-      </mousebind>
-    </context>
-    <context name="Left">
-      <mousebind button="Left" action="Drag">
-        <action name="Resize" />
-      </mousebind>
-    </context>
-    <context name="Right">
-      <mousebind button="Left" action="Drag">
-        <action name="Resize" />
-      </mousebind>
-    </context>
-    <context name="Bottom">
-      <mousebind button="Left" action="Drag">
-        <action name="Resize" />
-      </mousebind>
-    </context>
-    <context name="TRCorner">
-      <mousebind button="Left" action="Drag">
-        <action name="Resize" />
-      </mousebind>
-    </context>
-    <context name="BRCorner">
-      <mousebind button="Left" action="Drag">
-        <action name="Resize" />
-      </mousebind>
-    </context>
-    <context name="TLCorner">
-      <mousebind button="Left" action="Drag">
-        <action name="Resize" />
-      </mousebind>
-    </context>
-    <context name="BLCorner">
+    <context name="Border">
       <mousebind button="Left" action="Drag">
         <action name="Resize" />
       </mousebind>

diff --git a/include/config/default-bindings.h b/include/config/default-bindings.h
index 98c0b206166476acc53ecaf7b739dae6d39c0b91..12ec5c4c9b6179bcb74bb9657b2e79a2183e25cd 100644 (file)
--- a/include/config/default-bindings.h
+++ b/include/config/default-bindings.h
@@ -143,42 +143,7 @@ static struct mouse_combos {
                const char *name, *value;
        } attributes[2];
 } mouse_combos[] = { {
-               .context = "Left",
-               .button = "Left",
-               .event = "Drag",
-               .action = "Resize",
-       }, {
-               .context = "Top",
-               .button = "Left",
-               .event = "Drag",
-               .action = "Resize",
-       }, {
-               .context = "Bottom",
-               .button = "Left",
-               .event = "Drag",
-               .action = "Resize",
-       }, {
-               .context = "Right",
-               .button = "Left",
-               .event = "Drag",
-               .action = "Resize",
-       }, {
-               .context = "TLCorner",
-               .button = "Left",
-               .event = "Drag",
-               .action = "Resize",
-       }, {
-               .context = "TRCorner",
-               .button = "Left",
-               .event = "Drag",
-               .action = "Resize",
-       }, {
-               .context = "BRCorner",
-               .button = "Left",
-               .event = "Drag",
-               .action = "Resize",
-       }, {
-               .context = "BLCorner",
+               .context = "Border",
                .button = "Left",
                .event = "Drag",
                .action = "Resize",

diff --git a/include/ssd.h b/include/ssd.h
index f3597f3180d0682bb39b72a59209e02a106e59a5..f1e038431d0069c93186bd4b307cf28922dc787f 100644 (file)
--- a/include/ssd.h
+++ b/include/ssd.h
@@ -53,6 +53,7 @@ enum ssd_part_type {
        LAB_SSD_PART_RIGHT,
        LAB_SSD_PART_BOTTOM,
        LAB_SSD_PART_LEFT,
+       LAB_SSD_PART_BORDER,
 
        LAB_SSD_CLIENT,
        LAB_SSD_FRAME,

diff --git a/src/config/mousebind.c b/src/config/mousebind.c
index 0f49b6a516cd7a629baa885ffb492a898e0d734f..ad7f6712af57e67401df95c84708c704730663a2 100644 (file)
--- a/src/config/mousebind.c
+++ b/src/config/mousebind.c
@@ -132,6 +132,8 @@ context_from_str(const char *str)
                return LAB_SSD_PART_CORNER_BOTTOM_RIGHT;
        } else if (!strcasecmp(str, "BLCorner")) {
                return LAB_SSD_PART_CORNER_BOTTOM_LEFT;
+       } else if (!strcasecmp(str, "Border")) {
+               return LAB_SSD_PART_BORDER;
        } else if (!strcasecmp(str, "Top")) {
                return LAB_SSD_PART_TOP;
        } else if (!strcasecmp(str, "Right")) {

diff --git a/src/ssd/ssd.c b/src/ssd/ssd.c
index adf7c2cbc2c92b65a6fadb7a734b1a8e9db8d86f..d0603d5e214253a2f190c0b133b05c7e55986d0b 100644 (file)
--- a/src/ssd/ssd.c
+++ b/src/ssd/ssd.c
@@ -328,6 +328,10 @@ ssd_part_contains(enum ssd_part_type whole, enum ssd_part_type candidate)
                return candidate >= LAB_SSD_BUTTON_CLOSE
                        && candidate <= LAB_SSD_CLIENT;
        }
+       if (whole == LAB_SSD_PART_BORDER) {
+               return candidate >= LAB_SSD_PART_CORNER_TOP_LEFT
+                       && candidate <= LAB_SSD_PART_LEFT;
+       }
        if (whole == LAB_SSD_PART_TOP) {
                return candidate == LAB_SSD_PART_CORNER_TOP_LEFT
                        || candidate == LAB_SSD_PART_CORNER_TOP_RIGHT;