mirrors/labwc
1
0
Fork 0
mirror of https://github.com/labwc/labwc.git synced 2026-02-08 10:06:59 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

overlay: s/preview/overlay/

Browse source 
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>`.
This commit is contained in:
tokyo4j 2024-04-21 02:22:28 +09:00 • committed by Johan Malm
parent 3f10857496
commit 34290ef629
9 changed files with 97 additions and 97 deletions
Download patch file Download diff file Expand all files Collapse all files

10
docs/labwc-config.5.scd
View file

@ -322,12 +322,12 @@ extending outward from the snapped edge.
SnapToEdge action for that edge. A *range* of 0 disables snapping via SnapToEdge action for that edge. A *range* of 0 disables snapping via
interactive moves. Default is 1. interactive moves. Default is 1.
*<snapping><preview><enabled>* [yes|no] *<snapping><overlay><enabled>* [yes|no]
Show a preview when snapping to a window to an edge. Default is yes. Show an overlay when snapping to a window to an edge. Default is yes.
*<snapping><preview><delay><inner>*++ *<snapping><overlay><delay><inner>*++
*<snapping><preview><delay><outer>* *<snapping><overlay><delay><outer>*
Sets the delay to show a preview when snapping a window to each type of Sets the delay to show an overlay when snapping a window to each type of
edge. Defaults are 500 ms. edge. Defaults are 500 ms.
*inner* edges are edges with an adjacent output and *outer* edges are *inner* edges are edges with an adjacent output and *outer* edges are
edges without an adjacent output. edges without an adjacent output.

30
docs/labwc-theme.5.scd
View file

@ -210,39 +210,39 @@ elements are not listed here, but are supported.
Height of boxes in workspace switcher in pixels. Setting to 0 disables Height of boxes in workspace switcher in pixels. Setting to 0 disables
boxes. Default is 20. boxes. Default is 20.
*snapping.preview.region.fill* [yes|no] *snapping.overlay.region.fill* [yes|no]
Show a filled rectangle as the preview when a window is snapped to a region. Show a filled rectangle as an overlay when a window is snapped to a region.
Otherwise, an outlined rectangle is shown instead. Otherwise, an outlined rectangle is shown instead.
If software rendering is used, an outlined rectangle is always shown. If software rendering is used, an outlined rectangle is always shown.
*snapping.preview.edge.fill* [yes|no] *snapping.overlay.edge.fill* [yes|no]
Show a filled rectangle as the preview when a window is snapped to an edge. Show a filled rectangle as an overlay when a window is snapped to an edge.
Otherwise, an outlined rectangle is shown instead. Otherwise, an outlined rectangle is shown instead.
If software rendering is used, an outlined rectangle is always shown. If software rendering is used, an outlined rectangle is always shown.
*snapping.preview.region.bg.color* *snapping.overlay.region.bg.color*
Color of a filled rectangle shown as the preview when a window is snapped to Color of a filled rectangle shown as an overlay when a window is snapped to
a region. Default is #8080b380. a region. Default is #8080b380.
*snapping.preview.edge.bg.color* *snapping.overlay.edge.bg.color*
Color of a filled rectangle shown as the preview when a window is snapped to Color of a filled rectangle shown as an overlay when a window is snapped to
an edge. Default is #8080b380. an edge. Default is #8080b380.
*snapping.preview.region.border.width* *snapping.overlay.region.border.width*
Border width of an outlined rectangle shown as the preview when a window is 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. 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 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. snapped to an edge. Inherits `osd.border.width` if not set.
*snapping.preview.region.border.color* *snapping.overlay.region.border.color*
Color(s) of an outlined rectangle shown as the preview when a window is 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 snapped to a region. Possible values and the default value are the same as
those of *osd.window-switcher.preview.border.color*. those of *osd.window-switcher.preview.border.color*.
*snapping.preview.edge.border.color* *snapping.overlay.edge.border.color*
Color(s) of an outlined rectangle shown as the preview when a window is 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 snapped to an edge. Possible values and the default value are the same as
those of *osd.window-switcher.preview.border.color*. those of *osd.window-switcher.preview.border.color*.

4
docs/rc.xml.all
View file

@ -114,9 +114,9 @@
<snapping> <snapping>
<!-- Set range to 0 to disable window snapping completely --> <!-- Set range to 0 to disable window snapping completely -->
<range>1</range> <range>1</range>
<preview enabled="yes"> <overlay enabled="yes">
<delay inner="500" outer="500" /> <delay inner="500" outer="500" />
</preview> </overlay>
<topMaximize>yes</topMaximize> <topMaximize>yes</topMaximize>
<notifyClient>always</notifyClient> <notifyClient>always</notifyClient>
</snapping> </snapping>

16
docs/themerc
View file

@ -74,11 +74,11 @@ osd.window-switcher.preview.border.color: #dddda6,#000000,#dddda6
osd.workspace-switcher.boxes.width: 20 osd.workspace-switcher.boxes.width: 20
osd.workspace-switcher.boxes.height: 20 osd.workspace-switcher.boxes.height: 20
snapping.preview.region.fill: yes snapping.overlay.region.fill: yes
snapping.preview.edge.fill: yes snapping.overlay.edge.fill: yes
snapping.preview.region.bg.color: #8080b380 snapping.overlay.region.bg.color: #8080b380
snapping.preview.edge.bg.color: #8080b380 snapping.overlay.edge.bg.color: #8080b380
snapping.preview.region.border.width: 1 snapping.overlay.region.border.width: 1
snapping.preview.edge.border.width: 1 snapping.overlay.edge.border.width: 1
snapping.preview.region.border.color: #dddda6,#000000,#dddda6 snapping.overlay.region.border.color: #dddda6,#000000,#dddda6
snapping.preview.edge.border.color: #dddda6,#000000,#dddda6 snapping.overlay.edge.border.color: #dddda6,#000000,#dddda6

6
include/config/rcxml.h
View file

@ -107,9 +107,9 @@ struct rcxml {
/* window snapping */ /* window snapping */
int snap_edge_range; int snap_edge_range;
bool snap_preview_enabled; bool snap_overlay_enabled;
int snap_preview_delay_inner; int snap_overlay_delay_inner;
int snap_preview_delay_outer; int snap_overlay_delay_outer;
bool snap_top_maximize; bool snap_top_maximize;
enum tiling_events_mode snap_tiling_events_mode; enum tiling_events_mode snap_tiling_events_mode;

16
include/theme.h
View file

@ -82,16 +82,16 @@ struct theme {
int osd_workspace_switcher_boxes_width; int osd_workspace_switcher_boxes_width;
int osd_workspace_switcher_boxes_height; int osd_workspace_switcher_boxes_height;
bool snapping_preview_region_fill; bool snapping_overlay_region_fill;
bool snapping_preview_edge_fill; bool snapping_overlay_edge_fill;
float snapping_preview_region_bg_color[4]; float snapping_overlay_region_bg_color[4];
float snapping_preview_edge_bg_color[4]; float snapping_overlay_edge_bg_color[4];
int snapping_preview_region_border_width; int snapping_overlay_region_border_width;
int snapping_preview_edge_border_width; int snapping_overlay_edge_border_width;
float snapping_preview_region_border_color[3][4]; float snapping_overlay_region_border_color[3][4];
float snapping_preview_edge_border_color[3][4]; float snapping_overlay_edge_border_color[3][4];
/* textures */ /* textures */
struct lab_data_buffer *button_close_active_unpressed; struct lab_data_buffer *button_close_active_unpressed;

18
src/config/rcxml.c
View file

@ -929,12 +929,12 @@ entry(xmlNode *node, char *nodename, char *content)
rc.window_edge_strength = atoi(content); rc.window_edge_strength = atoi(content);
} else if (!strcasecmp(nodename, "range.snapping")) { } else if (!strcasecmp(nodename, "range.snapping")) {
rc.snap_edge_range = atoi(content); rc.snap_edge_range = atoi(content);
} else if (!strcasecmp(nodename, "enabled.preview.snapping")) { } else if (!strcasecmp(nodename, "enabled.overlay.snapping")) {
set_bool(content, &rc.snap_preview_enabled); set_bool(content, &rc.snap_overlay_enabled);
} else if (!strcasecmp(nodename, "inner.delay.preview.snapping")) { } else if (!strcasecmp(nodename, "inner.delay.overlay.snapping")) {
rc.snap_preview_delay_inner = atoi(content); rc.snap_overlay_delay_inner = atoi(content);
} else if (!strcasecmp(nodename, "outer.delay.preview.snapping")) { } else if (!strcasecmp(nodename, "outer.delay.overlay.snapping")) {
rc.snap_preview_delay_outer = atoi(content); rc.snap_overlay_delay_outer = atoi(content);
} else if (!strcasecmp(nodename, "topMaximize.snapping")) { } else if (!strcasecmp(nodename, "topMaximize.snapping")) {
set_bool(content, &rc.snap_top_maximize); set_bool(content, &rc.snap_top_maximize);
} else if (!strcasecmp(nodename, "notifyClient.snapping")) { } else if (!strcasecmp(nodename, "notifyClient.snapping")) {
@ -1218,9 +1218,9 @@ rcxml_init(void)
rc.window_edge_strength = 20; rc.window_edge_strength = 20;
rc.snap_edge_range = 1; rc.snap_edge_range = 1;
rc.snap_preview_enabled = true; rc.snap_overlay_enabled = true;
rc.snap_preview_delay_inner = 500; rc.snap_overlay_delay_inner = 500;
rc.snap_preview_delay_outer = 500; rc.snap_overlay_delay_outer = 500;
rc.snap_top_maximize = true; rc.snap_top_maximize = true;
rc.snap_tiling_events_mode = LAB_TILING_EVENTS_ALWAYS; rc.snap_tiling_events_mode = LAB_TILING_EVENTS_ALWAYS;

22
src/overlay.c
View file

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

72
src/theme.c
View file

@ -538,21 +538,21 @@ theme_builtin(struct theme *theme)
theme->osd_border_color[0] = FLT_MIN; theme->osd_border_color[0] = FLT_MIN;
theme->osd_label_text_color[0] = FLT_MIN; theme->osd_label_text_color[0] = FLT_MIN;
theme->snapping_preview_region_fill = true; theme->snapping_overlay_region_fill = true;
theme->snapping_preview_edge_fill = true; theme->snapping_overlay_edge_fill = true;
parse_hexstr("#8080b380", theme->snapping_preview_region_bg_color); parse_hexstr("#8080b380", theme->snapping_overlay_region_bg_color);
parse_hexstr("#8080b380", theme->snapping_preview_edge_bg_color); parse_hexstr("#8080b380", theme->snapping_overlay_edge_bg_color);
/* inherit settings in post_processing() if not set elsewhere */ /* inherit settings in post_processing() if not set elsewhere */
theme->snapping_preview_region_border_width = INT_MIN; theme->snapping_overlay_region_border_width = INT_MIN;
theme->snapping_preview_edge_border_width = INT_MIN; theme->snapping_overlay_edge_border_width = INT_MIN;
memset(theme->snapping_preview_region_border_color, 0, memset(theme->snapping_overlay_region_border_color, 0,
sizeof(theme->snapping_preview_region_border_color)); sizeof(theme->snapping_overlay_region_border_color));
theme->snapping_preview_region_border_color[0][0] = FLT_MIN; theme->snapping_overlay_region_border_color[0][0] = FLT_MIN;
memset(theme->snapping_preview_edge_border_color, 0, memset(theme->snapping_overlay_edge_border_color, 0,
sizeof(theme->snapping_preview_edge_border_color)); sizeof(theme->snapping_overlay_edge_border_color));
theme->snapping_preview_edge_border_color[0][0] = FLT_MIN; theme->snapping_overlay_edge_border_color[0][0] = FLT_MIN;
} }
static void static void
@ -754,29 +754,29 @@ entry(struct theme *theme, const char *key, const char *value)
if (match_glob(key, "osd.label.text.color")) { if (match_glob(key, "osd.label.text.color")) {
parse_hexstr(value, theme->osd_label_text_color); parse_hexstr(value, theme->osd_label_text_color);
} }
if (match_glob(key, "snapping.preview.region.fill")) { if (match_glob(key, "snapping.overlay.region.fill")) {
theme->snapping_preview_region_fill = parse_bool(value, true); theme->snapping_overlay_region_fill = parse_bool(value, true);
} }
if (match_glob(key, "snapping.preview.edge.fill")) { if (match_glob(key, "snapping.overlay.edge.fill")) {
theme->snapping_preview_edge_fill = parse_bool(value, true); theme->snapping_overlay_edge_fill = parse_bool(value, true);
} }
if (match_glob(key, "snapping.preview.region.bg.color")) { if (match_glob(key, "snapping.overlay.region.bg.color")) {
parse_hexstr(value, theme->snapping_preview_region_bg_color); parse_hexstr(value, theme->snapping_overlay_region_bg_color);
} }
if (match_glob(key, "snapping.preview.edge.bg.color")) { if (match_glob(key, "snapping.overlay.edge.bg.color")) {
parse_hexstr(value, theme->snapping_preview_edge_bg_color); parse_hexstr(value, theme->snapping_overlay_edge_bg_color);
} }
if (match_glob(key, "snapping.preview.region.border.width")) { if (match_glob(key, "snapping.overlay.region.border.width")) {
theme->snapping_preview_region_border_width = atoi(value); theme->snapping_overlay_region_border_width = atoi(value);
} }
if (match_glob(key, "snapping.preview.edge.border.width")) { if (match_glob(key, "snapping.overlay.edge.border.width")) {
theme->snapping_preview_edge_border_width = atoi(value); theme->snapping_overlay_edge_border_width = atoi(value);
} }
if (match_glob(key, "snapping.preview.region.border.color")) { if (match_glob(key, "snapping.overlay.region.border.color")) {
parse_hexstrs(value, theme->snapping_preview_region_border_color); parse_hexstrs(value, theme->snapping_overlay_region_border_color);
} }
if (match_glob(key, "snapping.preview.edge.border.color")) { if (match_glob(key, "snapping.overlay.edge.border.color")) {
parse_hexstrs(value, theme->snapping_preview_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); theme->osd_window_switcher_preview_border_color);
} }
if (theme->snapping_preview_region_border_width == INT_MIN) { if (theme->snapping_overlay_region_border_width == INT_MIN) {
theme->snapping_preview_region_border_width = theme->snapping_overlay_region_border_width =
theme->osd_border_width; theme->osd_border_width;
} }
if (theme->snapping_preview_edge_border_width == INT_MIN) { if (theme->snapping_overlay_edge_border_width == INT_MIN) {
theme->snapping_preview_edge_border_width = theme->snapping_overlay_edge_border_width =
theme->osd_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, 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, fill_colors_with_osd_theme(theme,
theme->snapping_preview_edge_border_color); theme->snapping_overlay_edge_border_color);
} }
} }