mirrors/sway
1
0
Fork 0
mirror of https://github.com/swaywm/sway.git synced 2024-11-22 07:51:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

common/gesture: use format_str()

Browse source 
We already had a similar function in there.
This commit is contained in:
Simon Ser 2023-02-28 16:13:40 +01:00
parent ea279f4df3
commit ac8962eb62
1 changed files with 7 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
common/gesture.c
View file

@ -12,23 +12,6 @@
const uint8_t GESTURE_FINGERS_ANY = 0; const uint8_t GESTURE_FINGERS_ANY = 0;
// Helper to easily allocate and format string
static char *strformat(const char *format, ...) {
va_list args;
va_start(args, format);
int length = vsnprintf(NULL, 0, format, args) + 1;
va_end(args);
char *result = malloc(length);
if (result) {
va_start(args, format);
vsnprintf(result, length, format, args);
va_end(args);
}
return result;
}
char *gesture_parse(const char *input, struct gesture *output) { char *gesture_parse(const char *input, struct gesture *output) {
// Clear output in case of failure // Clear output in case of failure
output->type = GESTURE_TYPE_NONE; output->type = GESTURE_TYPE_NONE;
@ -38,7 +21,7 @@ char *gesture_parse(const char *input, struct gesture *output) {
// Split input type, fingers and directions // Split input type, fingers and directions
list_t *split = split_string(input, ":"); list_t *split = split_string(input, ":");
if (split->length < 1 || split->length > 3) { if (split->length < 1 || split->length > 3) {
return strformat( return format_str(
"expected <gesture>[:<fingers>][:direction], got %s", "expected <gesture>[:<fingers>][:direction], got %s",
input); input);
} }
@ -51,8 +34,8 @@ char *gesture_parse(const char *input, struct gesture *output) {
} else if (strcmp(split->items[0], "swipe") == 0) { } else if (strcmp(split->items[0], "swipe") == 0) {
output->type = GESTURE_TYPE_SWIPE; output->type = GESTURE_TYPE_SWIPE;
} else { } else {
return strformat("expected hold|pinch|swipe, got %s", return format_str("expected hold|pinch|swipe, got %s",
split->items[0]); (const char *)split->items[0]);
} }
// Parse optional arguments // Parse optional arguments
@ -67,7 +50,7 @@ char *gesture_parse(const char *input, struct gesture *output) {
next = split->length == 3 ? split->items[2] : NULL; next = split->length == 3 ? split->items[2] : NULL;
} else if (split->length == 3) { } else if (split->length == 3) {
// Fail here if argument can only be finger count // Fail here if argument can only be finger count
return strformat("expected 1-9, got %s", next); return format_str("expected 1-9, got %s", next);
} }
// If there is an argument left, try to parse as direction // If there is an argument left, try to parse as direction
@ -95,7 +78,7 @@ char *gesture_parse(const char *input, struct gesture *output) {
} else if (strcmp(item, "counterclockwise") == 0) { } else if (strcmp(item, "counterclockwise") == 0) {
output->directions |= GESTURE_DIRECTION_COUNTERCLOCKWISE; output->directions |= GESTURE_DIRECTION_COUNTERCLOCKWISE;
} else { } else {
return strformat("expected direction, got %s", item); return format_str("expected direction, got %s", item);
} }
} }
list_free_items_and_destroy(directions); list_free_items_and_destroy(directions);
@ -163,7 +146,7 @@ static char *gesture_directions_to_string(uint32_t directions) {
if (!result) { if (!result) {
result = strdup(name); result = strdup(name);
} else { } else {
char *new = strformat("%s+%s", result, name); char *new = format_str("%s+%s", result, name);
free(result); free(result);
result = new; result = new;
} }
@ -179,7 +162,7 @@ static char *gesture_directions_to_string(uint32_t directions) {
char *gesture_to_string(struct gesture *gesture) { char *gesture_to_string(struct gesture *gesture) {
char *directions = gesture_directions_to_string(gesture->directions); char *directions = gesture_directions_to_string(gesture->directions);
char *result = strformat("%s:%u:%s", char *result = format_str("%s:%u:%s",
gesture_type_string(gesture->type), gesture_type_string(gesture->type),
gesture->fingers, directions); gesture->fingers, directions);
free(directions); free(directions);