diff options
Diffstat (limited to 'sway/input/cursor.c')
-rw-r--r-- | sway/input/cursor.c | 15 |
1 files changed, 3 insertions, 12 deletions
diff --git a/sway/input/cursor.c b/sway/input/cursor.c index 15687993..75d055cd 100644 --- a/sway/input/cursor.c +++ b/sway/input/cursor.c | |||
@@ -1273,11 +1273,7 @@ uint32_t get_mouse_bindsym(const char *name, char **error) { | |||
1273 | // Get event code from name | 1273 | // Get event code from name |
1274 | int code = libevdev_event_code_from_name(EV_KEY, name); | 1274 | int code = libevdev_event_code_from_name(EV_KEY, name); |
1275 | if (code == -1) { | 1275 | if (code == -1) { |
1276 | size_t len = snprintf(NULL, 0, "Unknown event %s", name) + 1; | 1276 | *error = format_str("Unknown event %s", name); |
1277 | *error = malloc(len); | ||
1278 | if (*error) { | ||
1279 | snprintf(*error, len, "Unknown event %s", name); | ||
1280 | } | ||
1281 | return 0; | 1277 | return 0; |
1282 | } | 1278 | } |
1283 | return code; | 1279 | return code; |
@@ -1299,13 +1295,8 @@ uint32_t get_mouse_bindcode(const char *name, char **error) { | |||
1299 | } | 1295 | } |
1300 | const char *event = libevdev_event_code_get_name(EV_KEY, code); | 1296 | const char *event = libevdev_event_code_get_name(EV_KEY, code); |
1301 | if (!event || strncmp(event, "BTN_", strlen("BTN_")) != 0) { | 1297 | if (!event || strncmp(event, "BTN_", strlen("BTN_")) != 0) { |
1302 | size_t len = snprintf(NULL, 0, "Event code %d (%s) is not a button", | 1298 | *error = format_str("Event code %d (%s) is not a button", |
1303 | code, event ? event : "(null)") + 1; | 1299 | code, event ? event : "(null)"); |
1304 | *error = malloc(len); | ||
1305 | if (*error) { | ||
1306 | snprintf(*error, len, "Event code %d (%s) is not a button", | ||
1307 | code, event ? event : "(null)"); | ||
1308 | } | ||
1309 | return 0; | 1300 | return 0; |
1310 | } | 1301 | } |
1311 | return code; | 1302 | return code; |