mirrors/labwc
1
0
Fork 0
mirror of https://github.com/labwc/labwc.git synced 2025-11-03 09:01:51 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

mouse: add support for drag mouse event

Browse source
This commit is contained in:
ARDiDo 2022-01-06 18:30:17 -05:00 • committed by Johan Malm
parent ab07b68d7e
commit 5935a78fb4
6 changed files with 58 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -144,6 +144,7 @@ Configuration must be wrapped in a <labwc_config> root-node.
- Release: Releasing the specified button in the context. - Release: Releasing the specified button in the context.
- Click: Pressing and then releasing inside of the the context. - Click: Pressing and then releasing inside of the the context.
- DoubleClick: Two presses within the doubleClickTime. - DoubleClick: Two presses within the doubleClickTime.
- Drag: Pressing the button within the contex, then moving the cursor
# LIBINPUT # LIBINPUT

24
docs/rc.xml.all
View file

@ -108,7 +108,7 @@
<!-- <!--
Multiple <mousebind> can exist within one <context> Multiple <mousebind> can exist within one <context>
Multiple <actions> can exist within one <mousebind> Multiple <actions> can exist within one <mousebind>
The following openbox-actions are not supported: "Unshade" and "Drag" Currently, the only openbox-action not supported is "Unshade"
--> -->
<mouse> <mouse>
@ -116,12 +116,12 @@
<doubleClickTime>500</doubleClickTime> <doubleClickTime>500</doubleClickTime>
<context name="Frame"> <context name="Frame">
<mousebind button="A-Left" action="Press"> <mousebind button="A-Left" action="Drag">
<action name="Focus"/> <action name="Focus"/>
<action name="Raise"/> <action name="Raise"/>
<action name="Move"/> <action name="Move"/>
</mousebind> </mousebind>
<mousebind button="A-Right" action="Press"> <mousebind button="A-Right" action="Drag">
<action name="Focus"/> <action name="Focus"/>
<action name="Raise"/> <action name="Raise"/>
<action name="Resize"/> <action name="Resize"/>
@ -129,48 +129,48 @@
</context> </context>
<context name="Top"> <context name="Top">
<mousebind button="Left" action="Press"> <mousebind button="Left" action="Drag">
<action name="Resize"/> <action name="Resize"/>
</mousebind> </mousebind>
</context> </context>
<context name="Left"> <context name="Left">
<mousebind button="Left" action="Press"> <mousebind button="Left" action="Drag">
<action name="Resize"/> <action name="Resize"/>
</mousebind> </mousebind>
</context> </context>
<context name="Right"> <context name="Right">
<mousebind button="Left" action="Press"> <mousebind button="Left" action="Drag">
<action name="Resize"/> <action name="Resize"/>
</mousebind> </mousebind>
</context> </context>
<context name="Bottom"> <context name="Bottom">
<mousebind button="Left" action="Press"> <mousebind button="Left" action="Drag">
<action name="Resize"/> <action name="Resize"/>
</mousebind> </mousebind>
</context> </context>
<context name="TRCorner"> <context name="TRCorner">
<mousebind button="Left" action="Press"> <mousebind button="Left" action="Drag">
<action name="Resize"/> <action name="Resize"/>
</mousebind> </mousebind>
</context> </context>
<context name="BRCorner"> <context name="BRCorner">
<mousebind button="Left" action="Press"> <mousebind button="Left" action="Drag">
<action name="Resize"/> <action name="Resize"/>
</mousebind> </mousebind>
</context> </context>
<context name="TLCorner"> <context name="TLCorner">
<mousebind button="Left" action="Press"> <mousebind button="Left" action="Drag">
<action name="Resize"/> <action name="Resize"/>
</mousebind> </mousebind>
</context> </context>
<context name="BLCorner"> <context name="BLCorner">
<mousebind button="Left" action="Press"> <mousebind button="Left" action="Drag">
<action name="Resize"/> <action name="Resize"/>
</mousebind> </mousebind>
</context> </context>
<context name="TitleBar"> <context name="TitleBar">
<mousebind button="Left" action="Press"> <mousebind button="Left" action="Drag">
<action name="Focus"/> <action name="Focus"/>
<action name="Raise"/> <action name="Raise"/>
<action name="Move"/> <action name="Move"/>

1
include/config/mousebind.h
View file

@ -11,6 +11,7 @@ enum mouse_event {
MOUSE_ACTION_CLICK, MOUSE_ACTION_CLICK,
MOUSE_ACTION_PRESS, MOUSE_ACTION_PRESS,
MOUSE_ACTION_RELEASE, MOUSE_ACTION_RELEASE,
MOUSE_ACTION_DRAG,
}; };
struct mousebind { struct mousebind {

2
src/config/mousebind.c
View file

@ -49,6 +49,8 @@ mousebind_event_from_str(const char *str)
return MOUSE_ACTION_PRESS; return MOUSE_ACTION_PRESS;
} else if (!strcasecmp(str, "release")) { } else if (!strcasecmp(str, "release")) {
return MOUSE_ACTION_RELEASE; return MOUSE_ACTION_RELEASE;
} else if (!strcasecmp(str, "drag")) {
return MOUSE_ACTION_DRAG;
} }
wlr_log(WLR_ERROR, "unknown mouse action (%s)", str); wlr_log(WLR_ERROR, "unknown mouse action (%s)", str);
return MOUSE_ACTION_NONE; return MOUSE_ACTION_NONE;

34
src/config/rcxml.c
View file

@ -520,23 +520,23 @@ load_default_key_bindings(void)
static struct { static struct {
const char *context, *button, *event, *action, *command; const char *context, *button, *event, *action, *command;
} mouse_combos[] = { } mouse_combos[] = {
{ "Left", "Left", "Press", "Resize", NULL}, { "Left", "Left", "Drag", "Resize", NULL},
{ "Top", "Left", "Press", "Resize", NULL}, { "Top", "Left", "Drag", "Resize", NULL},
{ "Bottom", "Left", "Press", "Resize", NULL}, { "Bottom", "Left", "Drag", "Resize", NULL},
{ "Right", "Left", "Press", "Resize", NULL}, { "Right", "Left", "Drag", "Resize", NULL},
{ "TLCorner", "Left", "Press", "Resize", NULL}, { "TLCorner", "Left", "Drag", "Resize", NULL},
{ "TRCorner", "Left", "Press", "Resize", NULL}, { "TRCorner", "Left", "Drag", "Resize", NULL},
{ "BRCorner", "Left", "Press", "Resize", NULL}, { "BRCorner", "Left", "Drag", "Resize", NULL},
{ "BLCorner", "Left", "Press", "Resize", NULL}, { "BLCorner", "Left", "Drag", "Resize", NULL},
{ "Frame", "A-Left", "Press", "Focus", NULL}, { "Frame", "A-Left", "Drag", "Focus", NULL},
{ "Frame", "A-Left", "Press", "Raise", NULL}, { "Frame", "A-Left", "Drag", "Raise", NULL},
{ "Frame", "A-Left", "Press", "Move", NULL}, { "Frame", "A-Left", "Drag", "Move", NULL},
{ "Frame", "A-Right", "Press", "Focus", NULL}, { "Frame", "A-Right", "Drag", "Focus", NULL},
{ "Frame", "A-Right", "Press", "Raise", NULL}, { "Frame", "A-Right", "Drag", "Raise", NULL},
{ "Frame", "A-Right", "Press", "Resize", NULL}, { "Frame", "A-Right", "Drag", "Resize", NULL},
{ "Titlebar", "Left", "Press", "Focus", NULL}, { "Titlebar", "Left", "Drag", "Focus", NULL},
{ "Titlebar", "Left", "Press", "Raise", NULL}, { "Titlebar", "Left", "Drag", "Raise", NULL},
{ "TitleBar", "Left", "Press", "Move", NULL }, { "TitleBar", "Left", "Drag", "Move", NULL },
{ "TitleBar", "Left", "DoubleClick", "ToggleMaximize", NULL }, { "TitleBar", "Left", "DoubleClick", "ToggleMaximize", NULL },
{ "Close", "Left", "Click", "Close", NULL }, { "Close", "Left", "Click", "Close", NULL },
{ "Iconify", "Left", "Click", "Iconify", NULL}, { "Iconify", "Left", "Click", "Iconify", NULL},

27
src/cursor.c
View file

@ -198,13 +198,14 @@ process_cursor_motion(struct server *server, uint32_t time)
server->seat.cursor->x, server->seat.cursor->y, &surface, server->seat.cursor->x, server->seat.cursor->y, &surface,
&sx, &sy, &view_area); &sx, &sy, &view_area);
/* resize handles */
uint32_t resize_edges = ssd_resize_edges(view_area);
/* Set cursor */ /* Set cursor */
if (!view) { if (!view) {
/* root, etc. */ /* root, etc. */
cursor_set(&server->seat, XCURSOR_DEFAULT); cursor_set(&server->seat, XCURSOR_DEFAULT);
} else { } else {
/* resize handles */
uint32_t resize_edges = ssd_resize_edges(view_area);
if (resize_edges) { if (resize_edges) {
cursor_name_set_by_server = true; cursor_name_set_by_server = true;
cursor_set(&server->seat, cursor_set(&server->seat,
@ -228,6 +229,25 @@ process_cursor_motion(struct server *server, uint32_t time)
} }
} }
struct mousebind *mousebind;
wl_list_for_each(mousebind, &rc.mousebinds, link) {
if (mousebind->mouse_event == MOUSE_ACTION_DRAG
&& mousebind->pressed_in_context) {
/* Find closest resize edges in case action is Resize */
if (view) {
resize_edges |= server->seat.cursor->x
< view->x + view->w / 2 ? WLR_EDGE_LEFT
: WLR_EDGE_RIGHT;
resize_edges |= server->seat.cursor->y
< view->y + view->h / 2 ? WLR_EDGE_TOP
: WLR_EDGE_BOTTOM;
}
mousebind->pressed_in_context = false;
action(NULL, server, &mousebind->actions, resize_edges);
}
}
/* Required for iconify/maximize/close button mouse-over deco */ /* Required for iconify/maximize/close button mouse-over deco */
damage_all_outputs(server); damage_all_outputs(server);
@ -473,6 +493,8 @@ handle_release_mousebinding(struct view *view, struct server *server,
activated_any_frame |= mousebind->context == LAB_SSD_FRAME; activated_any_frame |= mousebind->context == LAB_SSD_FRAME;
action(view, server, &mousebind->actions, resize_edges); action(view, server, &mousebind->actions, resize_edges);
} }
/* For the drag events */
mousebind->pressed_in_context = false;
} }
return activated_any && activated_any_frame; return activated_any && activated_any_frame;
} }
@ -518,6 +540,7 @@ handle_press_mousebinding(struct view *view, struct server *server,
&& mousebind->button == button && mousebind->button == button
&& modifiers == mousebind->modifiers) { && modifiers == mousebind->modifiers) {
switch (mousebind->mouse_event) { switch (mousebind->mouse_event) {
case MOUSE_ACTION_DRAG: /* FALLTHROUGH */
case MOUSE_ACTION_CLICK: case MOUSE_ACTION_CLICK:
mousebind->pressed_in_context = true; mousebind->pressed_in_context = true;
continue; continue;