alex/swayfx
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Fix unused function in swap command

Browse source 
Also fixes a size_t cast to void *.
This commit is contained in:
emersion 2018-11-14 19:31:43 +01:00
parent 47cca240e2
commit 98a953a872
No known key found for this signature in database
GPG key ID: 0FDE7BE0E88F5E48
1 changed files with 9 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
sway/commands/swap.c
View file

@ -144,19 +144,18 @@ static void container_swap(struct sway_container *con1,
} }
} }
static bool test_con_id(struct sway_container *container, void *con_id) { static bool test_con_id(struct sway_container *container, void *data) {
return container->node.id == (size_t)con_id; size_t *con_id = data;
return container->node.id == *con_id;
} }
static bool test_id(struct sway_container *container, void *id) {
#ifdef HAVE_XWAYLAND #ifdef HAVE_XWAYLAND
xcb_window_t *wid = id; static bool test_id(struct sway_container *container, void *data) {
xcb_window_t *wid = data;
return (container->view && container->view->type == SWAY_VIEW_XWAYLAND return (container->view && container->view->type == SWAY_VIEW_XWAYLAND
&& container->view->wlr_xwayland_surface->window_id == *wid); && container->view->wlr_xwayland_surface->window_id == *wid);
#else
return false;
#endif
} }
#endif
static bool test_mark(struct sway_container *container, void *mark) { static bool test_mark(struct sway_container *container, void *mark) {
if (container->marks->length) { if (container->marks->length) {
@ -187,13 +186,13 @@ struct cmd_results *cmd_swap(int argc, char **argv) {
if (strcasecmp(argv[2], "id") == 0) { if (strcasecmp(argv[2], "id") == 0) {
#ifdef HAVE_XWAYLAND #ifdef HAVE_XWAYLAND
xcb_window_t id = strtol(value, NULL, 0); xcb_window_t id = strtol(value, NULL, 0);
other = root_find_container(test_id, (void *)&id); other = root_find_container(test_id, &id);
#endif #endif
} else if (strcasecmp(argv[2], "con_id") == 0) { } else if (strcasecmp(argv[2], "con_id") == 0) {
size_t con_id = atoi(value); size_t con_id = atoi(value);
other = root_find_container(test_con_id, (void *)con_id); other = root_find_container(test_con_id, &con_id);
} else if (strcasecmp(argv[2], "mark") == 0) { } else if (strcasecmp(argv[2], "mark") == 0) {
other = root_find_container(test_mark, (void *)value); other = root_find_container(test_mark, value);
} else { } else {
free(value); free(value);
return cmd_results_new(CMD_INVALID, "swap", EXPECTED_SYNTAX); return cmd_results_new(CMD_INVALID, "swap", EXPECTED_SYNTAX);