tree-wide: auto-replace of (struct server *)

#!/bin/bash
    read -r -d '' EXPRS << EOF
    s/xwayland->server/xwayland->svr/g;

    s/\t*struct server \*server;\n//g;
    s/\t*struct server \*server =.*?;\n//gs;
    s/\t*.* = ([a-z_]*->)*server[;,]\n//g;
    s/\{\n\n/\{\n/g;
    s/\n\n+/\n\n/g;

    s/\(\s*struct server \*server\)/(void)/g;
    s/\(\s*struct server \*server,\s*/(/g;
    s/,\s*struct server \*server\)/)/g;
    s/,\s*struct server \*server,\s*/, /g;

    s/\(\s*([a-z_]*->)*server\)/()/g;
    s/\(\s*([a-z_]*->)*server,\s*/(/g;
    s/,\s*([a-z_]*->)*server\)/)/g;
    s/,\s*([a-z_]*->)*server,\s*/, /g;

    s/([a-z_]*->)*server->/g_server./g;

    s/xwayland->svr/xwayland->server/g;
    EOF

    find src include \( -name \*.c -o -name \*.h \) -exec \
        perl -0777 -i -pe "$EXPRS" \{\} \;
This commit is contained in:
John Lindgren 2026-02-23 11:56:39 -05:00 committed by Johan Malm
parent 60ac8f07bb
commit cb49bddf63
81 changed files with 1522 additions and 1682 deletions

View file

@ -49,7 +49,6 @@ struct menu {
int height;
} size;
struct wl_list menuitems;
struct server *server;
struct {
struct menu *menu;
struct menuitem *item;
@ -65,14 +64,14 @@ struct menu {
};
/* For keyboard support */
void menu_item_select_next(struct server *server);
void menu_item_select_previous(struct server *server);
void menu_submenu_enter(struct server *server);
void menu_submenu_leave(struct server *server);
bool menu_call_selected_actions(struct server *server);
void menu_item_select_next(void);
void menu_item_select_previous(void);
void menu_submenu_enter(void);
void menu_submenu_leave(void);
bool menu_call_selected_actions(void);
void menu_init(struct server *server);
void menu_finish(struct server *server);
void menu_init(void);
void menu_finish(void);
void menu_on_view_destroy(struct view *view);
/**
@ -80,15 +79,15 @@ void menu_on_view_destroy(struct view *view);
*
* @id id string defined in menu.xml like "root-menu"
*/
struct menu *menu_get_by_id(struct server *server, const char *id);
struct menu *menu_get_by_id(const char *id);
/**
* menu_open_root - open menu on position (x, y)
*
* This function will close server->menu_current, open the
* new menu and assign @menu to server->menu_current.
* This function will close g_server.menu_current, open the
* new menu and assign @menu to g_server.menu_current.
*
* Additionally, server->input_mode will be set to LAB_INPUT_STATE_MENU.
* Additionally, g_server.input_mode will be set to LAB_INPUT_STATE_MENU.
*/
void menu_open_root(struct menu *menu, int x, int y);
@ -103,14 +102,14 @@ void menu_process_cursor_motion(struct wlr_scene_node *node);
/**
* menu_close_root- close root menu
*
* This function will close server->menu_current and set it to NULL.
* Asserts that server->input_mode is set to LAB_INPUT_STATE_MENU.
* This function will close g_server.menu_current and set it to NULL.
* Asserts that g_server.input_mode is set to LAB_INPUT_STATE_MENU.
*
* Additionally, server->input_mode will be set to LAB_INPUT_STATE_PASSTHROUGH.
* Additionally, g_server.input_mode will be set to LAB_INPUT_STATE_PASSTHROUGH.
*/
void menu_close_root(struct server *server);
void menu_close_root(void);
/* menu_reconfigure - reload theme and content */
void menu_reconfigure(struct server *server);
void menu_reconfigure(void);
#endif /* LABWC_MENU_H */