From cd49b315d9e137c245ceddb3b047cfeb8058539e Mon Sep 17 00:00:00 2001 From: Witold Filipczyk Date: Fri, 28 Jan 2022 15:26:43 +0100 Subject: [PATCH] [action] enum main_action -> main_action_T --- src/bfu/menu.c | 4 ++-- src/bfu/menu.h | 4 ++-- src/config/kbdbind.h | 2 ++ src/dialogs/exmode.c | 2 +- src/viewer/action.c | 2 +- src/viewer/action.h | 2 +- src/viewer/text/search.c | 2 +- src/viewer/text/view.c | 4 ++-- 8 files changed, 12 insertions(+), 10 deletions(-) diff --git a/src/bfu/menu.c b/src/bfu/menu.c index a381ae46..deabc3b4 100644 --- a/src/bfu/menu.c +++ b/src/bfu/menu.c @@ -141,7 +141,7 @@ select_menu_item(struct terminal *term, struct menu_item *it, void *data) /* We save these values due to delete_window() call below. */ menu_func_T func = it->func; void *it_data = it->data; - enum main_action action_id = it->action_id; + main_action_T action_id = it->action_id; if (!mi_is_selectable(it)) return; @@ -1387,7 +1387,7 @@ new_menu(menu_item_flags_T flags) void add_to_menu(struct menu_item **mi, char *text, char *rtext, - enum main_action action_id, menu_func_T func, void *data, + main_action_T action_id, menu_func_T func, void *data, menu_item_flags_T flags) { int n = count_items(*mi); diff --git a/src/bfu/menu.h b/src/bfu/menu.h index 7a49ce02..14b1fdcf 100644 --- a/src/bfu/menu.h +++ b/src/bfu/menu.h @@ -96,7 +96,7 @@ struct menu_item { * ``default'' handler defined in which case @rtext (if non NULL) * will be drawn and @func will be called when selecting the item. */ char *rtext; /* Right aligned guiding text */ - enum main_action action_id; /* Default item handlers */ + main_action_T action_id; /* Default item handlers */ menu_func_T func; /* Called when selecting the item */ void *data; /* Private data passed to handler */ @@ -170,7 +170,7 @@ struct menu_item *new_menu(menu_item_flags_T); void add_to_menu(struct menu_item **mi, char *text, char *rtext, - enum main_action action_id, menu_func_T func, void *data, + main_action_T action_id, menu_func_T func, void *data, menu_item_flags_T flags); #define add_menu_separator(menu) \ diff --git a/src/config/kbdbind.h b/src/config/kbdbind.h index 24e9f0c8..7675d0e4 100644 --- a/src/config/kbdbind.h +++ b/src/config/kbdbind.h @@ -67,6 +67,8 @@ enum main_action { MAIN_ACTIONS, }; +typedef long main_action_T; + enum edit_action { #include "config/actions-edit.inc" diff --git a/src/dialogs/exmode.c b/src/dialogs/exmode.c index 4a1f718c..7ed14851 100644 --- a/src/dialogs/exmode.c +++ b/src/dialogs/exmode.c @@ -41,7 +41,7 @@ static int exmode_action_handler(struct session *ses, char *command, char *args) { - enum main_action action_id = get_action_from_string(KEYMAP_MAIN, command); + main_action_T action_id = get_action_from_string(KEYMAP_MAIN, command); if (action_id == ACT_MAIN_NONE) return 0; if (action_id == ACT_MAIN_QUIT) action_id = ACT_MAIN_REALLY_QUIT; diff --git a/src/viewer/action.c b/src/viewer/action.c index 5e9499c5..368d0b2b 100644 --- a/src/viewer/action.c +++ b/src/viewer/action.c @@ -65,7 +65,7 @@ goto_url_action(struct session *ses, /* Many execution paths may lead to this code so it needs to take appropriate * precausions to stuff like doc_view and doc_view->vs being NULL. */ enum frame_event_status -do_action(struct session *ses, enum main_action action_id, int verbose) +do_action(struct session *ses, main_action_T action_id, int verbose) { enum frame_event_status status = FRAME_EVENT_OK; struct terminal *term = ses->tab->term; diff --git a/src/viewer/action.h b/src/viewer/action.h index e3a95d27..4d09fc0f 100644 --- a/src/viewer/action.h +++ b/src/viewer/action.h @@ -21,7 +21,7 @@ enum frame_event_status { }; enum frame_event_status do_action(struct session *ses, - enum main_action action_id, int verbose); + main_action_T action_id, int verbose); #ifdef __cplusplus } diff --git a/src/viewer/text/search.c b/src/viewer/text/search.c index 97d79af4..08facac0 100644 --- a/src/viewer/text/search.c +++ b/src/viewer/text/search.c @@ -1757,7 +1757,7 @@ link_typeahead_handler(struct input_line *line, int action_id) /* Hack time .. should we change mode? */ if (!line->data) { - enum main_action action_id = ACT_MAIN_NONE; + main_action_T action_id = ACT_MAIN_NONE; switch (*buffer) { case '#': diff --git a/src/viewer/text/view.c b/src/viewer/text/view.c index 4c133947..9db21d9e 100644 --- a/src/viewer/text/view.c +++ b/src/viewer/text/view.c @@ -1622,7 +1622,7 @@ send_mouse_event(struct session *ses, struct document_view *doc_view, static void try_typeahead(struct session *ses, struct document_view *doc_view, - struct term_event *ev, enum main_action action_id) + struct term_event *ev, main_action_T action_id) { switch (get_opt_int("document.browse.search.typeahead", ses)) { case 0: @@ -1676,7 +1676,7 @@ send_kbd_event(struct session *ses, struct document_view *doc_view, struct term_event *ev) { int event; - enum main_action action_id; + main_action_T action_id; if (doc_view && send_to_frame(ses, doc_view, ev) != FRAME_EVENT_IGNORED) return NULL;