[style] rename action() to actions_run()

diff --git a/include/action.h b/include/action.h
index 44a16fd287b23a91a40674b79cc2777bb1913a16..b23a0ec9ab85e5f2365e58045158323a62ce9539 100644 (file)
--- a/include/action.h
+++ b/include/action.h
@@ -14,7 +14,7 @@ struct action {
 struct action *action_create(const char *action_name);
 void action_list_free(struct wl_list *action_list);
 
-void action(struct view *activator, struct server *server,
+void actions_run(struct view *activator, struct server *server,
        struct wl_list *actions, uint32_t resize_edges);
 
 #endif

diff --git a/src/action.c b/src/action.c
index 65aee0dc205e1e8c45298e2372761dff1669c85c..a4376650d1a8f9a5483ee81d5071cd9fc19612c8 100644 (file)
--- a/src/action.c
+++ b/src/action.c
@@ -129,7 +129,8 @@ activator_or_focused_view(struct view *activator, struct server *server)
 }
 
 void
-action(struct view *activator, struct server *server, struct wl_list *actions, uint32_t resize_edges)
+actions_run(struct view *activator, struct server *server,
+       struct wl_list *actions, uint32_t resize_edges)
 {
        if (!actions) {
                wlr_log(WLR_ERROR, "empty actions");

diff --git a/src/cursor.c b/src/cursor.c
index ef158cf449679c759da770b5d14a0c7fe50b817d..5203a56cd1fda3ab4ee5c744198ba1de4887bc0e 100644 (file)
--- a/src/cursor.c
+++ b/src/cursor.c
@@ -261,7 +261,7 @@ process_cursor_motion(struct server *server, uint32_t time)
                        }
 
                        mousebind->pressed_in_context = false;
-                       action(NULL, server, &mousebind->actions, resize_edges);
+                       actions_run(NULL, server, &mousebind->actions, resize_edges);
                }
        }
 
@@ -517,7 +517,7 @@ handle_release_mousebinding(struct view *view, struct server *server,
                        }
                        activated_any = true;
                        activated_any_frame |= mousebind->context == LAB_SSD_FRAME;
-                       action(view, server, &mousebind->actions, resize_edges);
+                       actions_run(view, server, &mousebind->actions, resize_edges);
                }
        }
        /*
@@ -599,7 +599,7 @@ handle_press_mousebinding(struct view *view, struct server *server,
                        }
                        activated_any = true;
                        activated_any_frame |= mousebind->context == LAB_SSD_FRAME;
-                       action(view, server, &mousebind->actions, resize_edges);
+                       actions_run(view, server, &mousebind->actions, resize_edges);
                }
        }
        return activated_any && activated_any_frame;

diff --git a/src/keyboard.c b/src/keyboard.c
index 88c356b575e1bcc3cf0e709871b537f9f773b219..7776c3e7a8e9fd42a8067824cbc0c9b554fe98d2 100644 (file)
--- a/src/keyboard.c
+++ b/src/keyboard.c
@@ -70,7 +70,7 @@ handle_keybinding(struct server *server, uint32_t modifiers, xkb_keysym_t sym)
                for (size_t i = 0; i < keybind->keysyms_len; i++) {
                        if (xkb_keysym_to_lower(sym) == keybind->keysyms[i]) {
                                wlr_keyboard_set_repeat_info(kb, 0, 0);
-                               action(NULL, server, &keybind->actions, 0);
+                               actions_run(NULL, server, &keybind->actions, 0);
                                return true;
                        }
                }

diff --git a/src/menu/menu.c b/src/menu/menu.c
index beb85c585f92bd3c6d09110931c07836556f1b15..1b7f945928708fa2ac8e944dff8456b3d1965389 100644 (file)
--- a/src/menu/menu.c
+++ b/src/menu/menu.c
@@ -574,7 +574,7 @@ menu_call_actions(struct menu *menu, struct wlr_scene_node *node)
                        /* ..but it just opens a submenu */
                        return false;
                }
-               action(NULL, menu->server, &menu->selection.item->actions, 0);
+               actions_run(NULL, menu->server, &menu->selection.item->actions, 0);
                menu_close(menu->server->menu_current);
                menu->server->menu_current = NULL;
                return true;