config: add ninb anchor offset

Author: tesselslate

doc/01_options_theme.md

@@ -25,13 +25,13 @@ return config
 
 ## Background
 
-The `background` or `background_png` option determines the background of the 
-waywall window. `background_png` specifies the path to a PNG file, otherwise 
-`background` determines the solid color background. The background is only 
-visible while the Minecraft window does not occupy the entire waywall window 
+The `background` or `background_png` option determines the background of the
+waywall window. `background_png` specifies the path to a PNG file, otherwise
+`background` determines the solid color background. The background is only
+visible while the Minecraft window does not occupy the entire waywall window
 (e.g. while using Thin BT or boat eye.)
 
-For `background`, you may specify either an RGB or RGBA hex color. Different 
+For `background`, you may specify either an RGB or RGBA hex color. Different
 compositors may handle non-opaque background colors differently, and non-opaque
 colors may not appear correctly if waywall is fullscreened.
 
@@ -72,6 +72,12 @@ valid values for `ninb_anchor`:
   - `bottomleft`
   - `bottomright`
 
+You can additionally provide an offset to `ninb_anchor` by appending `+(x,y)`.
+For example, a value of `right+(-20, 20)` will anchor Ninjabrain Bot 20 pixels
+to the left and 20 pixels below the center right side of the window.
+
+<br/>
+
 The `ninb_opacity` option allows you to make the Ninjabrain Bot window
 translucent. The default value of `1.0` results in a fully opaque window, while
 values between `0.0` and `1.0` will result in varying degrees of translucency.

include/config/config.h

@@ -58,6 +58,7 @@ struct config {
                 ANCHOR_BOTTOMRIGHT,
                 ANCHOR_NONE,
             } anchor;
+            int32_t offset_x, offset_y;
 
             double opacity;
         } ninb;

waywall/config/config.c

@@ -319,6 +319,79 @@ parse_bind(const char *bind, struct config_action *action) {
     return 0;
 }
 
+static int
+parse_ninb_anchor(const char *input, struct config_ninb *out) {
+    static const char *anchor_names[] = {
+        [ANCHOR_TOPLEFT] = "topleft",
+        [ANCHOR_TOP] = "top",
+        [ANCHOR_TOPRIGHT] = "topright",
+        [ANCHOR_LEFT] = "left",
+        [ANCHOR_RIGHT] = "right",
+        [ANCHOR_BOTTOMLEFT] = "bottomleft",
+        [ANCHOR_BOTTOMRIGHT] = "bottomright",
+    };
+
+    str ninb_anchor = str_from(input);
+    ssize_t len = str_index(ninb_anchor, '+', 0);
+    if (len == -1) {
+        len = ninb_anchor.len;
+    }
+    bool has_offset = len != ninb_anchor.len;
+
+    for (size_t i = 0; i < STATIC_ARRLEN(anchor_names); i++) {
+        if (strncasecmp(anchor_names[i], input, len) == 0) {
+            out->anchor = i;
+
+            if (!has_offset) {
+                return 0;
+            }
+
+            if (str_index(ninb_anchor, '(', len) != len + 1) {
+                goto invalid_offset;
+            }
+            if (str_index(ninb_anchor, ')', len) != ninb_anchor.len - 1) {
+                goto invalid_offset;
+            }
+
+            str offset_inner = str_slice(ninb_anchor, len + 2, ninb_anchor.len - 1);
+            struct str_halves halves = str_halves(offset_inner, ',');
+
+            if (halves.a.len == 0 || halves.b.len == 0) {
+                goto invalid_offset;
+            }
+
+            char *endptr;
+            long x = strtol(halves.a.data, &endptr, 10);
+            if (endptr == halves.a.data || *endptr != ',') {
+                goto invalid_offset;
+            }
+            if (x < INT32_MIN || x > INT32_MAX) {
+                goto invalid_offset;
+            }
+
+            long y = strtol(halves.b.data, &endptr, 10);
+            if (endptr == halves.b.data || endptr != ninb_anchor.data + ninb_anchor.len - 1) {
+                goto invalid_offset;
+            }
+            if (y < INT32_MIN || y > INT32_MAX) {
+                goto invalid_offset;
+            }
+
+            out->offset_x = x;
+            out->offset_y = y;
+
+            return 0;
+        }
+    }
+
+    ww_log(LOG_ERROR, "invalid value '%s' for 'theme.ninb_anchor'", input);
+    return 1;
+
+invalid_offset:
+    ww_log(LOG_ERROR, "invalid offset in value '%s' for 'theme.ninb_anchor'", input);
+    return 1;
+}
+
 static int
 parse_remap_half(const char *input, uint32_t *out_data, enum config_remap_type *out_type) {
     for (size_t i = 0; i < STATIC_ARRLEN(util_keycodes); i++) {
@@ -672,30 +745,12 @@ process_config_theme(struct config *cfg) {
         return 1;
     }
     if (ninb_anchor) {
-        static const char *anchor_names[] = {
-            [ANCHOR_TOPLEFT] = "topleft",
-            [ANCHOR_TOP] = "top",
-            [ANCHOR_TOPRIGHT] = "topright",
-            [ANCHOR_LEFT] = "left",
-            [ANCHOR_RIGHT] = "right",
-            [ANCHOR_BOTTOMLEFT] = "bottomleft",
-            [ANCHOR_BOTTOMRIGHT] = "bottomright",
-        };
-
-        for (size_t i = 0; i < STATIC_ARRLEN(anchor_names); i++) {
-            if (strcasecmp(anchor_names[i], ninb_anchor) == 0) {
-                cfg->theme.ninb.anchor = i;
-                break;
-            }
-        }
-
-        if (cfg->theme.ninb.anchor == ANCHOR_NONE) {
-            ww_log(LOG_ERROR, "invalid value '%s' for 'theme.ninb_anchor'", ninb_anchor);
-            free(ninb_anchor);
+        int ret = parse_ninb_anchor(ninb_anchor, &cfg->theme.ninb);
+        free(ninb_anchor);
+        if (ret != 0) {
             return 1;
         }
     }
-    free(ninb_anchor);
 
     if (get_double(cfg, "ninb_opacity", &cfg->theme.ninb.opacity, "theme.ninb_opacity", false) !=
         0) {

waywall/wrap.c

@@ -165,6 +165,8 @@ floating_update_anchored(struct wrap *wrap) {
         return;
     }
 
+    x += wrap->cfg->theme.ninb.offset_x;
+    y += wrap->cfg->theme.ninb.offset_y;
     fview->x = x;
     fview->y = y;