diff options
-rw-r--r-- | sway/commands.c | 2 | ||||
-rw-r--r-- | sway/commands/resize.c | 10 | ||||
-rw-r--r-- | sway/input/cursor.c | 2 |
3 files changed, 9 insertions, 5 deletions
diff --git a/sway/commands.c b/sway/commands.c index 62f9ea87..efed7ddf 100644 --- a/sway/commands.c +++ b/sway/commands.c | |||
@@ -105,8 +105,8 @@ static struct cmd_handler handlers[] = { | |||
105 | { "exec", cmd_exec }, | 105 | { "exec", cmd_exec }, |
106 | { "exec_always", cmd_exec_always }, | 106 | { "exec_always", cmd_exec_always }, |
107 | { "focus_follows_mouse", cmd_focus_follows_mouse }, | 107 | { "focus_follows_mouse", cmd_focus_follows_mouse }, |
108 | { "for_window", cmd_for_window }, | ||
109 | { "font", cmd_font }, | 108 | { "font", cmd_font }, |
109 | { "for_window", cmd_for_window }, | ||
110 | { "fullscreen", cmd_fullscreen }, | 110 | { "fullscreen", cmd_fullscreen }, |
111 | { "include", cmd_include }, | 111 | { "include", cmd_include }, |
112 | { "input", cmd_input }, | 112 | { "input", cmd_input }, |
diff --git a/sway/commands/resize.c b/sway/commands/resize.c index d1f9e019..29637953 100644 --- a/sway/commands/resize.c +++ b/sway/commands/resize.c | |||
@@ -219,15 +219,17 @@ struct cmd_results *cmd_resize(int argc, char **argv) { | |||
219 | return cmd_results_new(CMD_INVALID, "resize", | 219 | return cmd_results_new(CMD_INVALID, "resize", |
220 | "Can only resize views/containers"); | 220 | "Can only resize views/containers"); |
221 | } | 221 | } |
222 | |||
223 | struct cmd_results *error; | ||
224 | if ((error = checkarg(argc, "resize", EXPECTED_AT_LEAST, 2))) { | ||
225 | return error; | ||
226 | } | ||
227 | |||
222 | if (strcasecmp(argv[0], "set") == 0) { | 228 | if (strcasecmp(argv[0], "set") == 0) { |
223 | // TODO | 229 | // TODO |
224 | //return cmd_resize_set(argc - 1, &argv[1]); | 230 | //return cmd_resize_set(argc - 1, &argv[1]); |
225 | return cmd_results_new(CMD_INVALID, "resize", "resize set unimplemented"); | 231 | return cmd_results_new(CMD_INVALID, "resize", "resize set unimplemented"); |
226 | } | 232 | } |
227 | struct cmd_results *error; | ||
228 | if ((error = checkarg(argc, "resize", EXPECTED_AT_LEAST, 2))) { | ||
229 | return error; | ||
230 | } | ||
231 | 233 | ||
232 | // TODO: resize grow|shrink left|right|up|down | 234 | // TODO: resize grow|shrink left|right|up|down |
233 | 235 | ||
diff --git a/sway/input/cursor.c b/sway/input/cursor.c index e094bbbe..c0c6e827 100644 --- a/sway/input/cursor.c +++ b/sway/input/cursor.c | |||
@@ -264,6 +264,8 @@ static void handle_touch_down(struct wl_listener *listener, void *data) { | |||
264 | if (seat_is_input_allowed(cursor->seat, surface)) { | 264 | if (seat_is_input_allowed(cursor->seat, surface)) { |
265 | wlr_seat_touch_notify_down(seat, surface, event->time_msec, | 265 | wlr_seat_touch_notify_down(seat, surface, event->time_msec, |
266 | event->touch_id, sx, sy); | 266 | event->touch_id, sx, sy); |
267 | cursor->image_client = NULL; | ||
268 | wlr_cursor_set_image(cursor->cursor, NULL, 0, 0, 0, 0, 0, 0); | ||
267 | } | 269 | } |
268 | } | 270 | } |
269 | 271 | ||