mirrors/labwc
1
0
Fork 0
mirror of https://github.com/labwc/labwc.git synced 2026-03-27 07:58:31 -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

30
src/regions.c
View file

@ -17,16 +17,16 @@
#include "view.h"
bool
regions_should_snap(struct server *server)
regions_should_snap(void)
{
if (server->input_mode != LAB_INPUT_STATE_MOVE
if (g_server.input_mode != LAB_INPUT_STATE_MOVE
|| wl_list_empty(&rc.regions)
|| server->seat.region_prevent_snap
|| !view_is_floating(server->grabbed_view)) {
|| g_server.seat.region_prevent_snap
|| !view_is_floating(g_server.grabbed_view)) {
return false;
}
return keyboard_get_all_modifiers(&server->seat);
return keyboard_get_all_modifiers(&g_server.seat);
}
struct region *
@ -44,14 +44,14 @@ regions_from_name(const char *region_name, struct output *output)
}
struct region *
regions_from_cursor(struct server *server)
regions_from_cursor(void)
{
double lx = server->seat.cursor->x;
double ly = server->seat.cursor->y;
double lx = g_server.seat.cursor->x;
double ly = g_server.seat.cursor->y;
struct wlr_output *wlr_output = wlr_output_layout_output_at(
server->output_layout, lx, ly);
struct output *output = output_from_wlr_output(server, wlr_output);
g_server.output_layout, lx, ly);
struct output *output = output_from_wlr_output(wlr_output);
if (!output_is_usable(output)) {
return NULL;
}
@ -81,7 +81,7 @@ regions_reconfigure_output(struct output *output)
/* Evacuate views and destroy current regions */
if (!wl_list_empty(&output->regions)) {
regions_evacuate_output(output);
regions_destroy(&output->server->seat, &output->regions);
regions_destroy(&g_server.seat, &output->regions);
}
/* Initialize regions from config */
@ -100,17 +100,17 @@ regions_reconfigure_output(struct output *output)
}
void
regions_reconfigure(struct server *server)
regions_reconfigure(void)
{
struct output *output;
/* Evacuate views and initialize regions from config */
wl_list_for_each(output, &server->outputs, link) {
wl_list_for_each(output, &g_server.outputs, link) {
regions_reconfigure_output(output);
}
/* Tries to match the evacuated views to the new regions */
desktop_arrange_all_views(server);
desktop_arrange_all_views();
}
void
@ -149,7 +149,7 @@ regions_evacuate_output(struct output *output)
{
assert(output);
struct view *view;
wl_list_for_each(view, &output->server->views, link) {
wl_list_for_each(view, &g_server.views, link) {
if (view->tiled_region && view->tiled_region->output == output) {
view_evacuate_region(view);
}