mirrors/sway
1
0
Fork 0
mirror of https://github.com/swaywm/sway.git synced 2026-04-29 06:46:22 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Extract common code from find_handler

Browse source
This commit is contained in:
David Eklov 2016-07-17 23:36:35 -05:00
parent 789870e60e
commit 1f0bb9a803
1 changed files with 16 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

40
sway/commands.c
View file

@ -3456,28 +3456,28 @@ static int handler_compare(const void *_a, const void *_b) {
return strcasecmp(a->command, b->command); return strcasecmp(a->command, b->command);
} }
static struct cmd_handler *find_handler(char *line, enum cmd_status block) { static struct cmd_handler *__find_handler(char *line, const struct cmd_handler *handlers, size_t handlers_size) {
struct cmd_handler d = {.command = line}; struct cmd_handler d = {.command = line};
struct cmd_handler *res = NULL; return bsearch(&d, handlers, handlers_size, sizeof(struct cmd_handler), handler_compare);
sway_log(L_DEBUG, "find_handler(%s) %d", line, block == CMD_BLOCK_INPUT);
if (block == CMD_BLOCK_BAR) {
res = bsearch(&d, bar_handlers,
sizeof(bar_handlers) / sizeof(struct cmd_handler),
sizeof(struct cmd_handler), handler_compare);
} else if (block == CMD_BLOCK_BAR_COLORS){
res = bsearch(&d, bar_colors_handlers,
sizeof(bar_colors_handlers) / sizeof(struct cmd_handler),
sizeof(struct cmd_handler), handler_compare);
} else if (block == CMD_BLOCK_INPUT) {
sway_log(L_DEBUG, "lookng at input handlers");
res = bsearch(&d, input_handlers,
sizeof(input_handlers) / sizeof(struct cmd_handler),
sizeof(struct cmd_handler), handler_compare);
} else {
res = bsearch(&d, handlers,
sizeof(handlers) / sizeof(struct cmd_handler),
sizeof(struct cmd_handler), handler_compare);
} }
#define ARRAY_SIZE(array) (sizeof(array) / sizeof(array[0]))
static struct cmd_handler *find_handler(char *line, enum cmd_status block) {
struct cmd_handler *res = NULL;
sway_log(L_DEBUG, "find_handler(%s) %d", line, block);
if (block == CMD_BLOCK_BAR) {
res = __find_handler(line, bar_handlers, ARRAY_SIZE(bar_handlers));
} else if (block == CMD_BLOCK_BAR_COLORS) {
res = __find_handler(line, bar_colors_handlers, ARRAY_SIZE(bar_colors_handlers));
} else if (block == CMD_BLOCK_INPUT) {
res = __find_handler(line, input_handlers, ARRAY_SIZE(input_handlers));
} else {
res = __find_handler(line, handlers, ARRAY_SIZE(handlers));
}
return res; return res;
} }