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

Fix some warnings from clang-tidy

Browse source 
Notably this fixes a possible null pointer dereference in warp_cursor()
when output_nearest_to_cursor() returns null.
This commit is contained in:
tokyo4j 2025-07-28 13:54:10 +09:00 • committed by Consolatis
parent b3b6715cdf
commit bdaf85eda1
3 changed files with 6 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

11
src/action.c
View file

@ -823,8 +823,9 @@ get_target_output(struct output *output, struct server *server,
} }
static void static void
warp_cursor(struct view *view, struct output *output, const char *to, const char *x, const char *y) warp_cursor(struct server *server, struct view *view, const char *to, const char *x, const char *y)
{ {
struct output *output = output_nearest_to_cursor(server);
struct wlr_box target_area = {0}; struct wlr_box target_area = {0};
int goto_x; int goto_x;
int goto_y; int goto_y;
@ -855,8 +856,8 @@ warp_cursor(struct view *view, struct output *output, const char *to, const char
target_area.y + target_area.height + offset_y; target_area.y + target_area.height + offset_y;
} }
wlr_cursor_warp(output->server->seat.cursor, NULL, goto_x, goto_y); wlr_cursor_warp(server->seat.cursor, NULL, goto_x, goto_y);
cursor_update_focus(output->server); cursor_update_focus(server);
} }
void void
@ -1352,9 +1353,7 @@ actions_run(struct view *activator, struct server *server,
const char *to = action_get_str(action, "to", "output"); const char *to = action_get_str(action, "to", "output");
const char *x = action_get_str(action, "x", "center"); const char *x = action_get_str(action, "x", "center");
const char *y = action_get_str(action, "y", "center"); const char *y = action_get_str(action, "y", "center");
struct output *output = output_nearest_to_cursor(server); warp_cursor(server, view, to, x, y);
warp_cursor(view, output, to, x, y);
break; break;
} }
case ACTION_TYPE_HIDE_CURSOR: case ACTION_TYPE_HIDE_CURSOR:

1
src/input/cursor.c
View file

@ -302,6 +302,7 @@ process_cursor_resize(struct server *server, uint32_t time)
static uint32_t last_resize_time = 0; static uint32_t last_resize_time = 0;
static struct view *last_resize_view = NULL; static struct view *last_resize_view = NULL;
assert(server->grabbed_view);
if (server->grabbed_view == last_resize_view) { if (server->grabbed_view == last_resize_view) {
int32_t refresh = 0; int32_t refresh = 0;
if (output_is_usable(last_resize_view->output)) { if (output_is_usable(last_resize_view->output)) {

3
src/xdg.c
View file

@ -1054,9 +1054,6 @@ static void
handle_xdg_toplevel_icon_set_icon(struct wl_listener *listener, void *data) handle_xdg_toplevel_icon_set_icon(struct wl_listener *listener, void *data)
{ {
struct wlr_xdg_toplevel_icon_manager_v1_set_icon_event *event = data; struct wlr_xdg_toplevel_icon_manager_v1_set_icon_event *event = data;
struct server *server =
wl_container_of(listener, server, xdg_toplevel_icon_set_icon);
struct wlr_xdg_surface *xdg_surface = event->toplevel->base; struct wlr_xdg_surface *xdg_surface = event->toplevel->base;
struct view *view = xdg_surface->data; struct view *view = xdg_surface->data;
assert(view); assert(view);