mirrors/labwc
1
0
Fork 0
mirror of https://github.com/labwc/labwc.git synced 2026-04-04 07:15:41 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

Browse source 
#!/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
Download patch file Download diff file Expand all files Collapse all files

86
src/xdg.c
View file

@ -116,8 +116,7 @@ set_fullscreen_from_request(struct view *view,
{
if (!view->fullscreen && requested->fullscreen
&& requested->fullscreen_output) {
view_set_output(view, output_from_wlr_output(view->server,
requested->fullscreen_output));
view_set_output(view, output_from_wlr_output(requested->fullscreen_output));
}
view_set_fullscreen(view, requested->fullscreen);
}
@ -132,11 +131,10 @@ set_initial_position(struct view *view)
view_constrain_size_to_that_of_usable_area(view);
struct server *server = view->server;
if (server->input_mode == LAB_INPUT_STATE_MOVE
&& view == server->grabbed_view) {
if (g_server.input_mode == LAB_INPUT_STATE_MOVE
&& view == g_server.grabbed_view) {
/* Reposition the view while anchoring it to cursor */
interactive_anchor_to_cursor(server, &view->pending);
interactive_anchor_to_cursor(&view->pending);
} else {
struct view *parent = xdg_toplevel_view_get_parent(view);
if (parent) {
@ -175,7 +173,7 @@ center_fullscreen_if_needed(struct view *view)
}
struct wlr_box output_box = {0};
wlr_output_layout_get_box(view->server->output_layout,
wlr_output_layout_get_box(g_server.output_layout,
view->output->wlr_output, &output_box);
box_center(view->current.width, view->current.height, &output_box,
&output_box, &view->current.x, &view->current.y);
@ -234,7 +232,7 @@ handle_commit(struct wl_listener *listener, void *data)
if (parent && output_is_usable(parent->output)) {
view_set_output(view, parent->output);
} else {
view_set_output(view, output_nearest_to_cursor(view->server));
view_set_output(view, output_nearest_to_cursor());
}
if (output_is_usable(view->output)) {
@ -439,7 +437,7 @@ set_pending_configure_serial(struct view *view, uint32_t serial)
view->pending_configure_serial = serial;
if (!view->pending_configure_timeout) {
view->pending_configure_timeout =
wl_event_loop_add_timer(view->server->wl_event_loop,
wl_event_loop_add_timer(g_server.wl_event_loop,
handle_configure_timeout, view);
}
wl_event_source_timer_update(view->pending_configure_timeout,
@ -487,7 +485,7 @@ handle_request_move(struct wl_listener *listener, void *data)
* this client, to prevent the client from requesting this whenever they
* want.
*
* Note: interactive_begin() checks that view == server->grabbed_view.
* Note: interactive_begin() checks that view == g_server.grabbed_view.
*/
struct view *view = wl_container_of(listener, view, request_move);
interactive_begin(view, LAB_INPUT_STATE_MOVE, LAB_EDGE_NONE);
@ -504,7 +502,7 @@ handle_request_resize(struct wl_listener *listener, void *data)
* this client, to prevent the client from requesting this whenever they
* want.
*
* Note: interactive_begin() checks that view == server->grabbed_view.
* Note: interactive_begin() checks that view == g_server.grabbed_view.
*/
struct wlr_xdg_toplevel_resize_event *event = data;
struct view *view = wl_container_of(listener, view, request_resize);
@ -559,13 +557,12 @@ handle_request_show_window_menu(struct wl_listener *listener, void *data)
{
struct xdg_toplevel_view *xdg_toplevel_view = wl_container_of(
listener, xdg_toplevel_view, request_show_window_menu);
struct server *server = xdg_toplevel_view->base.server;
struct menu *menu = menu_get_by_id(server, "client-menu");
struct menu *menu = menu_get_by_id("client-menu");
assert(menu);
menu->triggered_by_view = &xdg_toplevel_view->base;
struct wlr_cursor *cursor = server->seat.cursor;
struct wlr_cursor *cursor = g_server.seat.cursor;
menu_open_root(menu, cursor->x, cursor->y);
}
@ -686,7 +683,7 @@ xdg_toplevel_view_append_children(struct view *self, struct wl_array *children)
struct wlr_xdg_toplevel *toplevel = xdg_toplevel_from_view(self);
struct view *view;
wl_list_for_each_reverse(view, &self->server->views, link) {
wl_list_for_each_reverse(view, &g_server.views, link) {
if (view == self) {
continue;
}
@ -953,8 +950,6 @@ handle_xdg_activation_request(struct wl_listener *listener, void *data)
static void
handle_new_xdg_toplevel(struct wl_listener *listener, void *data)
{
struct server *server =
wl_container_of(listener, server, new_xdg_toplevel);
struct wlr_xdg_toplevel *xdg_toplevel = data;
struct wlr_xdg_surface *xdg_surface = xdg_toplevel->base;
@ -963,7 +958,6 @@ handle_new_xdg_toplevel(struct wl_listener *listener, void *data)
struct xdg_toplevel_view *xdg_toplevel_view = znew(*xdg_toplevel_view);
struct view *view = &xdg_toplevel_view->base;
view->server = server;
view->type = LAB_XDG_SHELL_VIEW;
view->impl = &xdg_toplevel_view_impl;
view_init(view);
@ -978,13 +972,13 @@ handle_new_xdg_toplevel(struct wl_listener *listener, void *data)
* FIXME: this may be the wrong output since the parent view isn't
* known yet. The correct output will be set at initial commit.
*/
view_set_output(view, output_nearest_to_cursor(server));
view_set_output(view, output_nearest_to_cursor());
if (output_is_usable(view->output)) {
wlr_fractional_scale_v1_notify_scale(xdg_surface->surface,
view->output->wlr_output->scale);
}
view->workspace = server->workspaces.current;
view->workspace = g_server.workspaces.current;
view->scene_tree = lab_wlr_scene_tree_create(
view->workspace->view_trees[VIEW_LAYER_NORMAL]);
wlr_scene_node_set_enabled(&view->scene_tree->node, false);
@ -1045,8 +1039,8 @@ handle_new_xdg_toplevel(struct wl_listener *listener, void *data)
CONNECT_SIGNAL(toplevel, xdg_toplevel_view, request_show_window_menu);
CONNECT_SIGNAL(xdg_surface, xdg_toplevel_view, new_popup);
wl_list_insert(&server->views, &view->link);
view->creation_id = server->next_view_creation_id++;
wl_list_insert(&g_server.views, &view->link);
view->creation_id = g_server.next_view_creation_id++;
}
static void
@ -1080,46 +1074,46 @@ handle_xdg_toplevel_icon_set_icon(struct wl_listener *listener, void *data)
}
void
xdg_shell_init(struct server *server)
xdg_shell_init(void)
{
server->xdg_shell = wlr_xdg_shell_create(server->wl_display,
g_server.xdg_shell = wlr_xdg_shell_create(g_server.wl_display,
LAB_XDG_SHELL_VERSION);
if (!server->xdg_shell) {
if (!g_server.xdg_shell) {
wlr_log(WLR_ERROR, "unable to create the XDG shell interface");
exit(EXIT_FAILURE);
}
server->new_xdg_toplevel.notify = handle_new_xdg_toplevel;
wl_signal_add(&server->xdg_shell->events.new_toplevel, &server->new_xdg_toplevel);
g_server.new_xdg_toplevel.notify = handle_new_xdg_toplevel;
wl_signal_add(&g_server.xdg_shell->events.new_toplevel, &g_server.new_xdg_toplevel);
server->xdg_activation = wlr_xdg_activation_v1_create(server->wl_display);
if (!server->xdg_activation) {
g_server.xdg_activation = wlr_xdg_activation_v1_create(g_server.wl_display);
if (!g_server.xdg_activation) {
wlr_log(WLR_ERROR, "unable to create xdg_activation interface");
exit(EXIT_FAILURE);
}
server->xdg_activation_request.notify = handle_xdg_activation_request;
wl_signal_add(&server->xdg_activation->events.request_activate,
&server->xdg_activation_request);
g_server.xdg_activation_request.notify = handle_xdg_activation_request;
wl_signal_add(&g_server.xdg_activation->events.request_activate,
&g_server.xdg_activation_request);
server->xdg_activation_new_token.notify = handle_xdg_activation_new_token;
wl_signal_add(&server->xdg_activation->events.new_token,
&server->xdg_activation_new_token);
g_server.xdg_activation_new_token.notify = handle_xdg_activation_new_token;
wl_signal_add(&g_server.xdg_activation->events.new_token,
&g_server.xdg_activation_new_token);
server->xdg_toplevel_icon_manager = wlr_xdg_toplevel_icon_manager_v1_create(
server->wl_display, 1);
server->xdg_toplevel_icon_set_icon.notify = handle_xdg_toplevel_icon_set_icon;
wl_signal_add(&server->xdg_toplevel_icon_manager->events.set_icon,
&server->xdg_toplevel_icon_set_icon);
g_server.xdg_toplevel_icon_manager = wlr_xdg_toplevel_icon_manager_v1_create(
g_server.wl_display, 1);
g_server.xdg_toplevel_icon_set_icon.notify = handle_xdg_toplevel_icon_set_icon;
wl_signal_add(&g_server.xdg_toplevel_icon_manager->events.set_icon,
&g_server.xdg_toplevel_icon_set_icon);
wlr_xdg_wm_dialog_v1_create(server->wl_display, 1);
wlr_xdg_wm_dialog_v1_create(g_server.wl_display, 1);
}
void
xdg_shell_finish(struct server *server)
xdg_shell_finish(void)
{
wl_list_remove(&server->new_xdg_toplevel.link);
wl_list_remove(&server->xdg_activation_request.link);
wl_list_remove(&server->xdg_activation_new_token.link);
wl_list_remove(&server->xdg_toplevel_icon_set_icon.link);
wl_list_remove(&g_server.new_xdg_toplevel.link);
wl_list_remove(&g_server.xdg_activation_request.link);
wl_list_remove(&g_server.xdg_activation_new_token.link);
wl_list_remove(&g_server.xdg_toplevel_icon_set_icon.link);
}