mirrors/labwc
1
0
Fork 0
mirror of https://github.com/labwc/labwc.git synced 2026-04-12 08:21:13 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Merge branch 'allcontext' into magnifier

Browse source
This commit is contained in:
Simon Long 2024-05-03 12:10:25 +01:00
commit 22914f9142
5 changed files with 11 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -559,6 +559,7 @@ extending outward from the snapped edge.
through to the application. through to the application.
- Desktop: The desktop background, where no windows are present. - Desktop: The desktop background, where no windows are present.
- Root: A synonym for Desktop (for compatibility). - Root: A synonym for Desktop (for compatibility).
- All: Anywhere on the screen.
Supported mouse *buttons* are: Supported mouse *buttons* are:
- Left - Left

1
include/ssd.h
View file

@ -45,6 +45,7 @@ enum ssd_part_type {
LAB_SSD_LAYER_SURFACE, LAB_SSD_LAYER_SURFACE,
LAB_SSD_LAYER_SUBSURFACE, LAB_SSD_LAYER_SUBSURFACE,
LAB_SSD_UNMANAGED, LAB_SSD_UNMANAGED,
LAB_SSD_ALL,
LAB_SSD_END_MARKER LAB_SSD_END_MARKER
}; };

2
src/config/mousebind.c
View file

@ -142,6 +142,8 @@ context_from_str(const char *str)
return LAB_SSD_ROOT; return LAB_SSD_ROOT;
} else if (!strcasecmp(str, "Root")) { } else if (!strcasecmp(str, "Root")) {
return LAB_SSD_ROOT; return LAB_SSD_ROOT;
} else if (!strcasecmp(str, "All")) {
return LAB_SSD_ALL;
} }
wlr_log(WLR_ERROR, "unknown mouse context (%s)", str); wlr_log(WLR_ERROR, "unknown mouse context (%s)", str);
return LAB_SSD_NONE; return LAB_SSD_NONE;

6
src/input/cursor.c
View file

@ -823,12 +823,15 @@ handle_release_mousebinding(struct server *server,
*/ */
consumed_by_frame_context |= consumed_by_frame_context |=
mousebind->context == LAB_SSD_FRAME; mousebind->context == LAB_SSD_FRAME;
consumed_by_frame_context |=
mousebind->context == LAB_SSD_ALL;
} }
continue; continue;
default: default:
continue; continue;
} }
consumed_by_frame_context |= mousebind->context == LAB_SSD_FRAME; consumed_by_frame_context |= mousebind->context == LAB_SSD_FRAME;
consumed_by_frame_context |= mousebind->context == LAB_SSD_ALL;
actions_run(ctx->view, server, &mousebind->actions, actions_run(ctx->view, server, &mousebind->actions,
/*resize_edges*/ 0); /*resize_edges*/ 0);
} }
@ -909,6 +912,8 @@ handle_press_mousebinding(struct server *server, struct cursor_context *ctx,
*/ */
consumed_by_frame_context |= consumed_by_frame_context |=
mousebind->context == LAB_SSD_FRAME; mousebind->context == LAB_SSD_FRAME;
consumed_by_frame_context |=
mousebind->context == LAB_SSD_ALL;
mousebind->pressed_in_context = true; mousebind->pressed_in_context = true;
} }
continue; continue;
@ -923,6 +928,7 @@ handle_press_mousebinding(struct server *server, struct cursor_context *ctx,
continue; continue;
} }
consumed_by_frame_context |= mousebind->context == LAB_SSD_FRAME; consumed_by_frame_context |= mousebind->context == LAB_SSD_FRAME;
consumed_by_frame_context |= mousebind->context == LAB_SSD_ALL;
actions_run(ctx->view, server, &mousebind->actions, resize_edges); actions_run(ctx->view, server, &mousebind->actions, resize_edges);
} }
} }

2
src/ssd/ssd.c
View file

@ -309,7 +309,7 @@ ssd_destroy(struct ssd *ssd)
bool bool
ssd_part_contains(enum ssd_part_type whole, enum ssd_part_type candidate) ssd_part_contains(enum ssd_part_type whole, enum ssd_part_type candidate)
{ {
if (whole == candidate) { if (whole == candidate || whole == LAB_SSD_ALL) {
return true; return true;
} }
if (whole == LAB_SSD_PART_TITLEBAR) { if (whole == LAB_SSD_PART_TITLEBAR) {