mirror of
https://github.com/labwc/labwc.git
synced 2025-10-29 05:40:24 -04:00
[style] rename action() to actions_run()
This commit is contained in:
parent
7d98bc7aa2
commit
953e8a4f9d
5 changed files with 8 additions and 7 deletions
|
|
@ -14,7 +14,7 @@ struct action {
|
||||||
struct action *action_create(const char *action_name);
|
struct action *action_create(const char *action_name);
|
||||||
void action_list_free(struct wl_list *action_list);
|
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);
|
struct wl_list *actions, uint32_t resize_edges);
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
|
||||||
|
|
@ -129,7 +129,8 @@ activator_or_focused_view(struct view *activator, struct server *server)
|
||||||
}
|
}
|
||||||
|
|
||||||
void
|
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) {
|
if (!actions) {
|
||||||
wlr_log(WLR_ERROR, "empty actions");
|
wlr_log(WLR_ERROR, "empty actions");
|
||||||
|
|
|
||||||
|
|
@ -261,7 +261,7 @@ process_cursor_motion(struct server *server, uint32_t time)
|
||||||
}
|
}
|
||||||
|
|
||||||
mousebind->pressed_in_context = false;
|
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 = true;
|
||||||
activated_any_frame |= mousebind->context == LAB_SSD_FRAME;
|
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 = true;
|
||||||
activated_any_frame |= mousebind->context == LAB_SSD_FRAME;
|
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;
|
return activated_any && activated_any_frame;
|
||||||
|
|
|
||||||
|
|
@ -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++) {
|
for (size_t i = 0; i < keybind->keysyms_len; i++) {
|
||||||
if (xkb_keysym_to_lower(sym) == keybind->keysyms[i]) {
|
if (xkb_keysym_to_lower(sym) == keybind->keysyms[i]) {
|
||||||
wlr_keyboard_set_repeat_info(kb, 0, 0);
|
wlr_keyboard_set_repeat_info(kb, 0, 0);
|
||||||
action(NULL, server, &keybind->actions, 0);
|
actions_run(NULL, server, &keybind->actions, 0);
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -574,7 +574,7 @@ menu_call_actions(struct menu *menu, struct wlr_scene_node *node)
|
||||||
/* ..but it just opens a submenu */
|
/* ..but it just opens a submenu */
|
||||||
return false;
|
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_close(menu->server->menu_current);
|
||||||
menu->server->menu_current = NULL;
|
menu->server->menu_current = NULL;
|
||||||
return true;
|
return true;
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue