overlay: s/preview/overlay/

Replace "preview" in rc.xml and themerc with "overlay" since "preview" sounds
like it shows the window content.

Breaking changes are:
- `snapping.preview.*` in themerc is now replaced with `snapping.overlay`.
- `<snapping><preview>` in rc.xml is now replaced with `<snapping><overlay>`.

diff --git a/docs/labwc-config.5.scd b/docs/labwc-config.5.scd
index a52daa6762dce662aa11bf70a3f84bcecac4fa0d..5a14443aeb229ed80a3e2e602008eb85ee45d4bd 100644 (file)
--- a/docs/labwc-config.5.scd
+++ b/docs/labwc-config.5.scd
@@ -322,12 +322,12 @@ extending outward from the snapped edge.
        SnapToEdge action for that edge. A *range* of 0 disables snapping via
        interactive moves. Default is 1.
 
-*<snapping><preview><enabled>* [yes|no]
-       Show a preview when snapping to a window to an edge. Default is yes.
+*<snapping><overlay><enabled>* [yes|no]
+       Show an overlay when snapping to a window to an edge. Default is yes.
 
-*<snapping><preview><delay><inner>*++
-*<snapping><preview><delay><outer>*
-       Sets the delay to show a preview when snapping a window to each type of
+*<snapping><overlay><delay><inner>*++
+*<snapping><overlay><delay><outer>*
+       Sets the delay to show an overlay when snapping a window to each type of
        edge. Defaults are 500 ms.
        *inner* edges are edges with an adjacent output and *outer* edges are
        edges without an adjacent output.

diff --git a/docs/labwc-theme.5.scd b/docs/labwc-theme.5.scd
index 6e59a3c1733730759edbbe6e062a65aa2706e3a8..4506e125e0c4d4df5c7bb397a42d5283fca71e4e 100644 (file)
--- a/docs/labwc-theme.5.scd
+++ b/docs/labwc-theme.5.scd
@@ -210,39 +210,39 @@ elements are not listed here, but are supported.
        Height of boxes in workspace switcher in pixels. Setting to 0 disables
        boxes. Default is 20.
 
-*snapping.preview.region.fill* [yes|no]
-       Show a filled rectangle as the preview when a window is snapped to a region.
+*snapping.overlay.region.fill* [yes|no]
+       Show a filled rectangle as an overlay when a window is snapped to a region.
        Otherwise, an outlined rectangle is shown instead.
        If software rendering is used, an outlined rectangle is always shown.
 
-*snapping.preview.edge.fill* [yes|no]
-       Show a filled rectangle as the preview when a window is snapped to an edge.
+*snapping.overlay.edge.fill* [yes|no]
+       Show a filled rectangle as an overlay when a window is snapped to an edge.
        Otherwise, an outlined rectangle is shown instead.
        If software rendering is used, an outlined rectangle is always shown.
 
-*snapping.preview.region.bg.color*
-       Color of a filled rectangle shown as the preview when a window is snapped to
+*snapping.overlay.region.bg.color*
+       Color of a filled rectangle shown as an overlay when a window is snapped to
        a region. Default is #8080b380.
 
-*snapping.preview.edge.bg.color*
-       Color of a filled rectangle shown as the preview when a window is snapped to
+*snapping.overlay.edge.bg.color*
+       Color of a filled rectangle shown as an overlay when a window is snapped to
        an edge. Default is #8080b380.
 
-*snapping.preview.region.border.width*
-       Border width of an outlined rectangle shown as the preview when a window is
+*snapping.overlay.region.border.width*
+       Border width of an outlined rectangle shown as an overlay when a window is
        snapped to a region. Inherits `osd.border.width` if not set.
 
-*snapping.preview.edge.border.width*
+*snapping.overlay.edge.border.width*
        Border width of an outlined rectangle shown as the preview when a window is
        snapped to an edge. Inherits `osd.border.width` if not set.
 
-*snapping.preview.region.border.color*
-       Color(s) of an outlined rectangle shown as the preview when a window is
+*snapping.overlay.region.border.color*
+       Color(s) of an outlined rectangle shown as an overlay when a window is
        snapped to a region. Possible values and the default value are the same as
        those of *osd.window-switcher.preview.border.color*.
 
-*snapping.preview.edge.border.color*
-       Color(s) of an outlined rectangle shown as the preview when a window is
+*snapping.overlay.edge.border.color*
+       Color(s) of an outlined rectangle shown as an overlay when a window is
        snapped to an edge. Possible values and the default value are the same as
        those of *osd.window-switcher.preview.border.color*.
 

diff --git a/docs/rc.xml.all b/docs/rc.xml.all
index 5fdcd3468e1f4f7c7e376d36500dc9391aa83908..92da7a2d8c48d6f645f8672e883a2ade28c4a4e3 100644 (file)
--- a/docs/rc.xml.all
+++ b/docs/rc.xml.all
@@ -114,9 +114,9 @@
   <snapping>
     <!-- Set range to 0 to disable window snapping completely -->
     <range>1</range>
-    <preview enabled="yes">
+    <overlay enabled="yes">
       <delay inner="500" outer="500" />
-    </preview>
+    </overlay>
     <topMaximize>yes</topMaximize>
     <notifyClient>always</notifyClient>
   </snapping>

diff --git a/docs/themerc b/docs/themerc
index 23f32ac75023a9524fa5587be2bc5d83e9d23b35..e4b6733f64257da09dadf24940b71d201feaa8a3 100644 (file)
--- a/docs/themerc
+++ b/docs/themerc
@@ -74,11 +74,11 @@ osd.window-switcher.preview.border.color: #dddda6,#000000,#dddda6
 osd.workspace-switcher.boxes.width: 20
 osd.workspace-switcher.boxes.height: 20
 
-snapping.preview.region.fill: yes
-snapping.preview.edge.fill: yes
-snapping.preview.region.bg.color: #8080b380
-snapping.preview.edge.bg.color: #8080b380
-snapping.preview.region.border.width: 1
-snapping.preview.edge.border.width: 1
-snapping.preview.region.border.color: #dddda6,#000000,#dddda6
-snapping.preview.edge.border.color: #dddda6,#000000,#dddda6
+snapping.overlay.region.fill: yes
+snapping.overlay.edge.fill: yes
+snapping.overlay.region.bg.color: #8080b380
+snapping.overlay.edge.bg.color: #8080b380
+snapping.overlay.region.border.width: 1
+snapping.overlay.edge.border.width: 1
+snapping.overlay.region.border.color: #dddda6,#000000,#dddda6
+snapping.overlay.edge.border.color: #dddda6,#000000,#dddda6

diff --git a/include/config/rcxml.h b/include/config/rcxml.h
index ff8b81368b57bcfbe183d2c6c6d514e090f31681..84c823be4209d98f3a00d49bae9898a9f854b13c 100644 (file)
--- a/include/config/rcxml.h
+++ b/include/config/rcxml.h
@@ -107,9 +107,9 @@ struct rcxml {
 
        /* window snapping */
        int snap_edge_range;
-       bool snap_preview_enabled;
-       int snap_preview_delay_inner;
-       int snap_preview_delay_outer;
+       bool snap_overlay_enabled;
+       int snap_overlay_delay_inner;
+       int snap_overlay_delay_outer;
        bool snap_top_maximize;
        enum tiling_events_mode snap_tiling_events_mode;
 

diff --git a/include/theme.h b/include/theme.h
index ddbe1fb6ece1c0d862d0e67ed24797567afbcabd..54bb4ceb5db7b1cb12ef9eb77e7692f68286b2a0 100644 (file)
--- a/include/theme.h
+++ b/include/theme.h
@@ -82,16 +82,16 @@ struct theme {
        int osd_workspace_switcher_boxes_width;
        int osd_workspace_switcher_boxes_height;
 
-       bool snapping_preview_region_fill;
-       bool snapping_preview_edge_fill;
+       bool snapping_overlay_region_fill;
+       bool snapping_overlay_edge_fill;
 
-       float snapping_preview_region_bg_color[4];
-       float snapping_preview_edge_bg_color[4];
+       float snapping_overlay_region_bg_color[4];
+       float snapping_overlay_edge_bg_color[4];
 
-       int snapping_preview_region_border_width;
-       int snapping_preview_edge_border_width;
-       float snapping_preview_region_border_color[3][4];
-       float snapping_preview_edge_border_color[3][4];
+       int snapping_overlay_region_border_width;
+       int snapping_overlay_edge_border_width;
+       float snapping_overlay_region_border_color[3][4];
+       float snapping_overlay_edge_border_color[3][4];
 
        /* textures */
        struct lab_data_buffer *button_close_active_unpressed;

diff --git a/src/config/rcxml.c b/src/config/rcxml.c
index fd55c591706929307796ea5c4241fa19d29d4d8d..7b004473462ec5daa5e6f8f87f278896bf999c10 100644 (file)
--- a/src/config/rcxml.c
+++ b/src/config/rcxml.c
@@ -929,12 +929,12 @@ entry(xmlNode *node, char *nodename, char *content)
                rc.window_edge_strength = atoi(content);
        } else if (!strcasecmp(nodename, "range.snapping")) {
                rc.snap_edge_range = atoi(content);
-       } else if (!strcasecmp(nodename, "enabled.preview.snapping")) {
-               set_bool(content, &rc.snap_preview_enabled);
-       } else if (!strcasecmp(nodename, "inner.delay.preview.snapping")) {
-               rc.snap_preview_delay_inner = atoi(content);
-       } else if (!strcasecmp(nodename, "outer.delay.preview.snapping")) {
-               rc.snap_preview_delay_outer = atoi(content);
+       } else if (!strcasecmp(nodename, "enabled.overlay.snapping")) {
+               set_bool(content, &rc.snap_overlay_enabled);
+       } else if (!strcasecmp(nodename, "inner.delay.overlay.snapping")) {
+               rc.snap_overlay_delay_inner = atoi(content);
+       } else if (!strcasecmp(nodename, "outer.delay.overlay.snapping")) {
+               rc.snap_overlay_delay_outer = atoi(content);
        } else if (!strcasecmp(nodename, "topMaximize.snapping")) {
                set_bool(content, &rc.snap_top_maximize);
        } else if (!strcasecmp(nodename, "notifyClient.snapping")) {
@@ -1218,9 +1218,9 @@ rcxml_init(void)
        rc.window_edge_strength = 20;
 
        rc.snap_edge_range = 1;
-       rc.snap_preview_enabled = true;
-       rc.snap_preview_delay_inner = 500;
-       rc.snap_preview_delay_outer = 500;
+       rc.snap_overlay_enabled = true;
+       rc.snap_overlay_delay_inner = 500;
+       rc.snap_overlay_delay_outer = 500;
        rc.snap_top_maximize = true;
        rc.snap_tiling_events_mode = LAB_TILING_EVENTS_ALWAYS;
 

diff --git a/src/overlay.c b/src/overlay.c
index a0da7ed82077804faf13b028bde41ce1be2d5909..7f23ec4bf7fbbd8ba26f147b257820e492066f96 100644 (file)
--- a/src/overlay.c
+++ b/src/overlay.c
@@ -48,15 +48,15 @@ void overlay_reconfigure(struct seat *seat)
 
        struct theme *theme = seat->server->theme;
        create_overlay_rect(seat, &seat->overlay.region_rect,
-               theme->snapping_preview_region_fill,
-               theme->snapping_preview_region_bg_color,
-               theme->snapping_preview_region_border_width,
-               theme->snapping_preview_region_border_color);
+               theme->snapping_overlay_region_fill,
+               theme->snapping_overlay_region_bg_color,
+               theme->snapping_overlay_region_border_width,
+               theme->snapping_overlay_region_border_color);
        create_overlay_rect(seat, &seat->overlay.edge_rect,
-               theme->snapping_preview_edge_fill,
-               theme->snapping_preview_edge_bg_color,
-               theme->snapping_preview_edge_border_width,
-               theme->snapping_preview_edge_border_color);
+               theme->snapping_overlay_edge_fill,
+               theme->snapping_overlay_edge_bg_color,
+               theme->snapping_overlay_edge_border_width,
+               theme->snapping_overlay_edge_border_color);
 }
 
 static void
@@ -188,7 +188,7 @@ static void
 show_edge_overlay(struct seat *seat, enum view_edge edge,
                struct output *output)
 {
-       if (!rc.snap_preview_enabled) {
+       if (!rc.snap_overlay_enabled) {
                return;
        }
        if (seat->overlay.active.edge == edge
@@ -201,9 +201,9 @@ show_edge_overlay(struct seat *seat, enum view_edge edge,
 
        int delay;
        if (edge_has_adjacent_output_from_cursor(seat, output, edge)) {
-               delay = rc.snap_preview_delay_inner;
+               delay = rc.snap_overlay_delay_inner;
        } else {
-               delay = rc.snap_preview_delay_outer;
+               delay = rc.snap_overlay_delay_outer;
        }
 
        if (delay > 0) {

diff --git a/src/theme.c b/src/theme.c
index 49176901b784267a455c074627e5a8d0235b8907..44290c3722aa9ac14ca36b359413d2b96b1298a6 100644 (file)
--- a/src/theme.c
+++ b/src/theme.c
@@ -538,21 +538,21 @@ theme_builtin(struct theme *theme)
        theme->osd_border_color[0] = FLT_MIN;
        theme->osd_label_text_color[0] = FLT_MIN;
 
-       theme->snapping_preview_region_fill = true;
-       theme->snapping_preview_edge_fill = true;
+       theme->snapping_overlay_region_fill = true;
+       theme->snapping_overlay_edge_fill = true;
 
-       parse_hexstr("#8080b380", theme->snapping_preview_region_bg_color);
-       parse_hexstr("#8080b380", theme->snapping_preview_edge_bg_color);
+       parse_hexstr("#8080b380", theme->snapping_overlay_region_bg_color);
+       parse_hexstr("#8080b380", theme->snapping_overlay_edge_bg_color);
 
        /* inherit settings in post_processing() if not set elsewhere */
-       theme->snapping_preview_region_border_width = INT_MIN;
-       theme->snapping_preview_edge_border_width = INT_MIN;
-       memset(theme->snapping_preview_region_border_color, 0,
-               sizeof(theme->snapping_preview_region_border_color));
-       theme->snapping_preview_region_border_color[0][0] = FLT_MIN;
-       memset(theme->snapping_preview_edge_border_color, 0,
-               sizeof(theme->snapping_preview_edge_border_color));
-       theme->snapping_preview_edge_border_color[0][0] = FLT_MIN;
+       theme->snapping_overlay_region_border_width = INT_MIN;
+       theme->snapping_overlay_edge_border_width = INT_MIN;
+       memset(theme->snapping_overlay_region_border_color, 0,
+               sizeof(theme->snapping_overlay_region_border_color));
+       theme->snapping_overlay_region_border_color[0][0] = FLT_MIN;
+       memset(theme->snapping_overlay_edge_border_color, 0,
+               sizeof(theme->snapping_overlay_edge_border_color));
+       theme->snapping_overlay_edge_border_color[0][0] = FLT_MIN;
 }
 
 static void
@@ -754,29 +754,29 @@ entry(struct theme *theme, const char *key, const char *value)
        if (match_glob(key, "osd.label.text.color")) {
                parse_hexstr(value, theme->osd_label_text_color);
        }
-       if (match_glob(key, "snapping.preview.region.fill")) {
-               theme->snapping_preview_region_fill = parse_bool(value, true);
+       if (match_glob(key, "snapping.overlay.region.fill")) {
+               theme->snapping_overlay_region_fill = parse_bool(value, true);
        }
-       if (match_glob(key, "snapping.preview.edge.fill")) {
-               theme->snapping_preview_edge_fill = parse_bool(value, true);
+       if (match_glob(key, "snapping.overlay.edge.fill")) {
+               theme->snapping_overlay_edge_fill = parse_bool(value, true);
        }
-       if (match_glob(key, "snapping.preview.region.bg.color")) {
-               parse_hexstr(value, theme->snapping_preview_region_bg_color);
+       if (match_glob(key, "snapping.overlay.region.bg.color")) {
+               parse_hexstr(value, theme->snapping_overlay_region_bg_color);
        }
-       if (match_glob(key, "snapping.preview.edge.bg.color")) {
-               parse_hexstr(value, theme->snapping_preview_edge_bg_color);
+       if (match_glob(key, "snapping.overlay.edge.bg.color")) {
+               parse_hexstr(value, theme->snapping_overlay_edge_bg_color);
        }
-       if (match_glob(key, "snapping.preview.region.border.width")) {
-               theme->snapping_preview_region_border_width = atoi(value);
+       if (match_glob(key, "snapping.overlay.region.border.width")) {
+               theme->snapping_overlay_region_border_width = atoi(value);
        }
-       if (match_glob(key, "snapping.preview.edge.border.width")) {
-               theme->snapping_preview_edge_border_width = atoi(value);
+       if (match_glob(key, "snapping.overlay.edge.border.width")) {
+               theme->snapping_overlay_edge_border_width = atoi(value);
        }
-       if (match_glob(key, "snapping.preview.region.border.color")) {
-               parse_hexstrs(value, theme->snapping_preview_region_border_color);
+       if (match_glob(key, "snapping.overlay.region.border.color")) {
+               parse_hexstrs(value, theme->snapping_overlay_region_border_color);
        }
-       if (match_glob(key, "snapping.preview.edge.border.color")) {
-               parse_hexstrs(value, theme->snapping_preview_edge_border_color);
+       if (match_glob(key, "snapping.overlay.edge.border.color")) {
+               parse_hexstrs(value, theme->snapping_overlay_edge_border_color);
        }
 }
 
@@ -1113,21 +1113,21 @@ post_processing(struct theme *theme)
                        theme->osd_window_switcher_preview_border_color);
        }
 
-       if (theme->snapping_preview_region_border_width == INT_MIN) {
-               theme->snapping_preview_region_border_width =
+       if (theme->snapping_overlay_region_border_width == INT_MIN) {
+               theme->snapping_overlay_region_border_width =
                        theme->osd_border_width;
        }
-       if (theme->snapping_preview_edge_border_width == INT_MIN) {
-               theme->snapping_preview_edge_border_width =
+       if (theme->snapping_overlay_edge_border_width == INT_MIN) {
+               theme->snapping_overlay_edge_border_width =
                        theme->osd_border_width;
        }
-       if (theme->snapping_preview_region_border_color[0][0] == FLT_MIN) {
+       if (theme->snapping_overlay_region_border_color[0][0] == FLT_MIN) {
                fill_colors_with_osd_theme(theme,
-                       theme->snapping_preview_region_border_color);
+                       theme->snapping_overlay_region_border_color);
        }
-       if (theme->snapping_preview_edge_border_color[0][0] == FLT_MIN) {
+       if (theme->snapping_overlay_edge_border_color[0][0] == FLT_MIN) {
                fill_colors_with_osd_theme(theme,
-                       theme->snapping_preview_edge_border_color);
+                       theme->snapping_overlay_edge_border_color);
        }
 }