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

s/desktop_view_at()/desktop_surface_and_view_at()/

Browse source 
Make is clearer what the function does.
This commit is contained in:
Johan Malm 2021-09-25 10:04:37 +01:00
parent 23f28e5082
commit 1e4598cdce
3 changed files with 13 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

7
include/labwc.h
View file

@ -342,11 +342,12 @@ void desktop_focus_topmost_mapped_view(struct server *server);
bool isfocusable(struct view *view); bool isfocusable(struct view *view);
/** /**
* desktop_view_at - find view or layer-surface at co-ordinate (lx, ly) * desktop_surface_and_view_at - find view and surface at (lx, ly)
* Note: If surface points to layer-surface, view will be set to NULL * Note: If surface points to layer-surface, view will be set to NULL
*/ */
struct view *desktop_view_at(struct server *server, double lx, double ly, struct view *desktop_surface_and_view_at(struct server *server, double lx,
struct wlr_surface **surface, double *sx, double *sy, int *view_area); double ly, struct wlr_surface **surface, double *sx, double *sy,
int *view_area);
void cursor_init(struct seat *seat); void cursor_init(struct seat *seat);

14
src/cursor.c
View file

@ -139,14 +139,15 @@ process_cursor_motion(struct server *server, uint32_t time)
return; return;
} }
/* Otherwise, find the view under the pointer and send the event along */ /* Otherwise, find view under the pointer and send the event along */
double sx, sy; double sx, sy;
struct wlr_seat *wlr_seat = server->seat.seat; struct wlr_seat *wlr_seat = server->seat.seat;
struct wlr_surface *surface = NULL; struct wlr_surface *surface = NULL;
int view_area = LAB_SSD_NONE; int view_area = LAB_SSD_NONE;
struct view *view = struct view *view = desktop_surface_and_view_at(server,
desktop_view_at(server, server->seat.cursor->x, server->seat.cursor->x, server->seat.cursor->y, &surface,
server->seat.cursor->y, &surface, &sx, &sy, &view_area); &sx, &sy, &view_area);
if (!view) { if (!view) {
set_cursor(server, XCURSOR_DEFAULT); set_cursor(server, XCURSOR_DEFAULT);
} else { } else {
@ -296,8 +297,9 @@ cursor_button(struct wl_listener *listener, void *data)
int view_area = LAB_SSD_NONE; int view_area = LAB_SSD_NONE;
uint32_t resize_edges; uint32_t resize_edges;
struct view *view = desktop_view_at(server, server->seat.cursor->x, struct view *view = desktop_surface_and_view_at(server,
server->seat.cursor->y, &surface, &sx, &sy, &view_area); server->seat.cursor->x, server->seat.cursor->y, &surface,
&sx, &sy, &view_area);
/* handle alt + _press_ on view */ /* handle alt + _press_ on view */
struct wlr_input_device *device = seat->keyboard_group->input_device; struct wlr_input_device *device = seat->keyboard_group->input_device;

2
src/desktop.c
View file

@ -297,7 +297,7 @@ wlr_surface *layer_surface_at(struct wl_list *layer, double lx, double ly,
} }
struct view * struct view *
desktop_view_at(struct server *server, double lx, double ly, desktop_surface_and_view_at(struct server *server, double lx, double ly,
struct wlr_surface **surface, double *sx, double *sy, struct wlr_surface **surface, double *sx, double *sy,
int *view_area) int *view_area)
{ {