Mercurial > molko
diff libmlk-ui/mlk/ui/gridmenu.c @ 450:b26dd49f69ff
core: event -> mlk_event (and friends)
author | David Demelier <markand@malikania.fr> |
---|---|
date | Sat, 18 Feb 2023 13:37:11 +0100 |
parents | 773a082f0b91 |
children | c4f31658104d |
line wrap: on
line diff
--- a/libmlk-ui/mlk/ui/gridmenu.c Sat Feb 18 13:16:40 2023 +0100 +++ b/libmlk-ui/mlk/ui/gridmenu.c Sat Feb 18 13:37:11 2023 +0100 @@ -154,33 +154,33 @@ } static int -handle_keydown(struct gridmenu *menu, const struct event_key *key) +handle_keydown(struct gridmenu *menu, const struct mlk_event_key *key) { - assert(key->type == EVENT_KEYDOWN); + assert(key->type == MLK_EVENT_KEYDOWN); const struct index idx = get_index(menu); int validate = 0; switch (key->key) { - case KEY_UP: + case MLK_KEY_UP: if (idx.row > 0) menu->selected -= menu->ncols; break; - case KEY_RIGHT: + case MLK_KEY_RIGHT: if (menu->selected + 1U < menu->itemsz) menu->selected += 1; break; - case KEY_DOWN: + case MLK_KEY_DOWN: if (idx.row + 1U < menu->itemsz / menu->ncols) menu->selected += menu->ncols; else menu->selected = menu->itemsz - 1; break; - case KEY_LEFT: + case MLK_KEY_LEFT: if (idx.col > 0) menu->selected -= 1; break; - case KEY_ENTER: + case MLK_KEY_ENTER: validate = 1; break; default: @@ -191,9 +191,9 @@ } static int -handle_clickdown(struct gridmenu *menu, const struct event_click *click) +handle_clickdown(struct gridmenu *menu, const struct mlk_event_click *click) { - assert(click->type == EVENT_CLICKDOWN); + assert(click->type == MLK_EVENT_CLICKDOWN); const struct theme *theme = THEME(menu); size_t pagesz, pagenr, selected, c = 0, r = 0; @@ -258,16 +258,16 @@ } int -gridmenu_handle(struct gridmenu *menu, const union event *ev) +gridmenu_handle(struct gridmenu *menu, const union mlk_event *ev) { assert(menu); assert(ev); switch (ev->type) { - case EVENT_KEYDOWN: + case MLK_EVENT_KEYDOWN: return handle_keydown(menu, &ev->key); break; - case EVENT_CLICKDOWN: + case MLK_EVENT_CLICKDOWN: return handle_clickdown(menu, &ev->click); break; default: