mirrors/labwc
1
0
Fork 0
mirror of https://github.com/labwc/labwc.git synced 2026-04-07 08:21:20 -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
parent 13e06852bf
commit e172f98af0
81 changed files with 1522 additions and 1682 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/xdg-popup.c
View file

@ -30,7 +30,6 @@ static void
popup_unconstrain(struct xdg_popup *popup)
{
struct view *view = popup->parent_view;
struct server *server = view->server;
/* Get position of parent toplevel/popup */
int parent_lx, parent_ly;
@ -46,8 +45,7 @@ popup_unconstrain(struct xdg_popup *popup)
* output.
*/
struct wlr_box *popup_box = &popup->wlr_popup->scheduled.geometry;
struct output *output = output_nearest_to(server,
parent_lx + MAX(popup_box->x, 0),
struct output *output = output_nearest_to(parent_lx + MAX(popup_box->x, 0),
parent_ly + MAX(popup_box->y, 0));
struct wlr_box usable = output_usable_area_in_layout_coords(output);
@ -91,7 +89,7 @@ handle_destroy(struct wl_listener *listener, void *data)
wl_list_remove(&popup->commit.link);
}
cursor_update_focus(popup->parent_view->server);
cursor_update_focus();
free(popup);
}
@ -151,15 +149,15 @@ xdg_popup_create(struct view *view, struct wlr_xdg_popup *wlr_popup)
* this, we always set the user data field of wlr_surfaces to the
* corresponding scene node.
*
* xdg-popups live in server->xdg_popup_tree so that they can be
* xdg-popups live in g_server.xdg_popup_tree so that they can be
* rendered above always-on-top windows
*/
struct wlr_scene_tree *parent_tree = NULL;
if (parent->role == WLR_XDG_SURFACE_ROLE_POPUP) {
parent_tree = parent->surface->data;
} else {
parent_tree = view->server->xdg_popup_tree;
wlr_scene_node_set_position(&view->server->xdg_popup_tree->node,
parent_tree = g_server.xdg_popup_tree;
wlr_scene_node_set_position(&g_server.xdg_popup_tree->node,
view->current.x, view->current.y);
}
wlr_popup->base->surface->data =