From f38a9077ae54c0eb2c79ef998eedb56dd0ca83e8 Mon Sep 17 00:00:00 2001 From: tokyo4j Date: Thu, 4 Apr 2024 02:45:54 +0900 Subject: [PATCH] [fixup] timeout -> delay --- include/config/rcxml.h | 4 ++-- src/config/rcxml.c | 12 ++++++------ src/overlay.c | 12 ++++++------ 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/include/config/rcxml.h b/include/config/rcxml.h index c8de1864..f8d15a11 100644 --- a/include/config/rcxml.h +++ b/include/config/rcxml.h @@ -125,8 +125,8 @@ struct rcxml { /* window snapping */ int snap_edge_range; - int snap_preview_interior_timeout; - int snap_preview_exterior_timeout; + int snap_preview_delay_interior; + int snap_preview_delay_exterior; bool snap_top_maximize; enum tiling_events_mode snap_tiling_events_mode; diff --git a/src/config/rcxml.c b/src/config/rcxml.c index c27bc1b0..86d497ba 100644 --- a/src/config/rcxml.c +++ b/src/config/rcxml.c @@ -912,18 +912,18 @@ 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, "edgeType.previewTimeout.snapping")) { + } else if (!strcasecmp(nodename, "edgeType.previewDelay.snapping")) { if (!strcasecmp(content, "interior")) { edge_type = EDGE_TYPE_INTERIOR; } else if (!strcasecmp(content, "exterior")) { edge_type = EDGE_TYPE_EXTERIOR; } - } else if (!strcasecmp(nodename, "previewTimeout.snapping")) { + } else if (!strcasecmp(nodename, "previewDelay.snapping")) { if (edge_type & EDGE_TYPE_INTERIOR) { - rc.snap_preview_interior_timeout = atoi(content); + rc.snap_preview_delay_interior = atoi(content); } if (edge_type & EDGE_TYPE_EXTERIOR) { - rc.snap_preview_exterior_timeout = atoi(content); + rc.snap_preview_delay_exterior = atoi(content); } } else if (!strcasecmp(nodename, "topMaximize.snapping")) { set_bool(content, &rc.snap_top_maximize); @@ -1202,8 +1202,8 @@ rcxml_init(void) rc.window_edge_strength = 20; rc.snap_edge_range = 1; - rc.snap_preview_interior_timeout = 500; - rc.snap_preview_exterior_timeout = 500; + rc.snap_preview_delay_interior = 500; + rc.snap_preview_delay_exterior = 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 9a88a922..3424277a 100644 --- a/src/overlay.c +++ b/src/overlay.c @@ -157,21 +157,21 @@ show_edge_overlay(struct seat *seat, enum view_edge edge, seat->overlay.active.edge = edge; seat->overlay.active.output = output; - int timeout; + int delay; if (edge_has_adjacent_output_from_cursor(seat, output, edge)) { - timeout = rc.snap_preview_interior_timeout; + delay = rc.snap_preview_delay_interior; } else { - timeout = rc.snap_preview_exterior_timeout; + delay = rc.snap_preview_delay_exterior; } - if (timeout > 0) { + if (delay > 0) { if (!seat->overlay.timer) { seat->overlay.timer = wl_event_loop_add_timer( seat->server->wl_event_loop, handle_edge_overlay_timeout, seat); } - /* Show overlay ms later */ - wl_event_source_timer_update(seat->overlay.timer, timeout); + /* Show overlay ms later */ + wl_event_source_timer_update(seat->overlay.timer, delay); } else { /* Show overlay now */ struct wlr_box box = get_edge_snap_box(seat->overlay.active.edge,