mirrors/labwc
1
0
Fork 0
mirror of https://github.com/labwc/labwc.git synced 2026-04-05 07:15:36 -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

91
src/interactive.c
View file

@ -36,22 +36,22 @@ max_move_scale(double pos_cursor, double pos_old, double size_old,
}
void
interactive_anchor_to_cursor(struct server *server, struct wlr_box *geo)
interactive_anchor_to_cursor(struct wlr_box *geo)
{
assert(server->input_mode == LAB_INPUT_STATE_MOVE);
assert(g_server.input_mode == LAB_INPUT_STATE_MOVE);
if (wlr_box_empty(geo)) {
return;
}
/* Resize grab_box while anchoring it to grab_{x,y} */
server->grab_box.x = max_move_scale(server->grab_x, server->grab_box.x,
server->grab_box.width, geo->width);
server->grab_box.y = max_move_scale(server->grab_y, server->grab_box.y,
server->grab_box.height, geo->height);
server->grab_box.width = geo->width;
server->grab_box.height = geo->height;
g_server.grab_box.x = max_move_scale(g_server.grab_x, g_server.grab_box.x,
g_server.grab_box.width, geo->width);
g_server.grab_box.y = max_move_scale(g_server.grab_y, g_server.grab_box.y,
g_server.grab_box.height, geo->height);
g_server.grab_box.width = geo->width;
g_server.grab_box.height = geo->height;
geo->x = server->grab_box.x + (server->seat.cursor->x - server->grab_x);
geo->y = server->grab_box.y + (server->seat.cursor->y - server->grab_y);
geo->x = g_server.grab_box.x + (g_server.seat.cursor->x - g_server.grab_x);
geo->y = g_server.grab_box.y + (g_server.seat.cursor->y - g_server.grab_y);
}
/*
@ -60,21 +60,21 @@ interactive_anchor_to_cursor(struct server *server, struct wlr_box *geo)
* then interactive_begin() is called.
*/
void
interactive_set_grab_context(struct server *server, const struct cursor_context *ctx)
interactive_set_grab_context(const struct cursor_context *ctx)
{
if (!ctx->view) {
return;
}
if (server->input_mode != LAB_INPUT_STATE_PASSTHROUGH) {
if (g_server.input_mode != LAB_INPUT_STATE_PASSTHROUGH) {
return;
}
server->grabbed_view = ctx->view;
server->grab_x = server->seat.cursor->x;
server->grab_y = server->seat.cursor->y;
server->grab_box = ctx->view->current;
server->resize_edges =
cursor_get_resize_edges(server->seat.cursor, ctx);
g_server.grabbed_view = ctx->view;
g_server.grab_x = g_server.seat.cursor->x;
g_server.grab_y = g_server.seat.cursor->y;
g_server.grab_box = ctx->view->current;
g_server.resize_edges =
cursor_get_resize_edges(g_server.seat.cursor, ctx);
}
void
@ -86,11 +86,10 @@ interactive_begin(struct view *view, enum input_mode mode, enum lab_edge edges)
* the compositor stops propagating pointer events to clients and
* instead consumes them itself, to move or resize windows.
*/
struct server *server = view->server;
struct seat *seat = &server->seat;
struct seat *seat = &g_server.seat;
if (server->input_mode != LAB_INPUT_STATE_PASSTHROUGH
|| view != server->grabbed_view) {
if (g_server.input_mode != LAB_INPUT_STATE_PASSTHROUGH
|| view != g_server.grabbed_view) {
return;
}
@ -138,7 +137,7 @@ interactive_begin(struct view *view, enum input_mode mode, enum lab_edge edges)
* Otherwise, they were set already from cursor context.
*/
if (edges != LAB_EDGE_NONE) {
server->resize_edges = edges;
g_server.resize_edges = edges;
}
/*
@ -147,15 +146,15 @@ interactive_begin(struct view *view, enum input_mode mode, enum lab_edge edges)
* keep the same geometry as the starting point.
*/
enum view_axis maximized = view->maximized;
if (server->resize_edges & LAB_EDGES_LEFT_RIGHT) {
if (g_server.resize_edges & LAB_EDGES_LEFT_RIGHT) {
maximized &= ~VIEW_AXIS_HORIZONTAL;
}
if (server->resize_edges & LAB_EDGES_TOP_BOTTOM) {
if (g_server.resize_edges & LAB_EDGES_TOP_BOTTOM) {
maximized &= ~VIEW_AXIS_VERTICAL;
}
view_set_maximized(view, maximized);
view_set_untiled(view);
cursor_shape = cursor_get_from_edge(server->resize_edges);
cursor_shape = cursor_get_from_edge(g_server.resize_edges);
break;
}
default:
@ -175,7 +174,7 @@ interactive_begin(struct view *view, enum input_mode mode, enum lab_edge edges)
if (mode == LAB_INPUT_STATE_MOVE && !view_is_floating(view)
&& rc.unsnap_threshold <= 0) {
struct wlr_box natural_geo = view->natural_geometry;
interactive_anchor_to_cursor(server, &natural_geo);
interactive_anchor_to_cursor(&natural_geo);
/* Shaded clients will not process resize events until unshaded */
view_set_shade(view, false);
view_set_maximized(view, VIEW_AXIS_NONE);
@ -187,7 +186,7 @@ interactive_begin(struct view *view, enum input_mode mode, enum lab_edge edges)
resize_indicator_show(view);
}
if (rc.window_edge_strength) {
edges_calculate_visibility(server, view);
edges_calculate_visibility(view);
}
}
@ -199,7 +198,7 @@ edge_from_cursor(struct seat *seat, struct output **dest_output,
*edge1 = LAB_EDGE_NONE;
*edge2 = LAB_EDGE_NONE;
if (!view_is_floating(seat->server->grabbed_view)) {
if (!view_is_floating(g_server.grabbed_view)) {
return false;
}
@ -207,7 +206,7 @@ edge_from_cursor(struct seat *seat, struct output **dest_output,
return false;
}
struct output *output = output_nearest_to_cursor(seat->server);
struct output *output = output_nearest_to_cursor();
if (!output_is_usable(output)) {
wlr_log(WLR_ERROR, "output at cursor is unusable");
return false;
@ -221,25 +220,25 @@ edge_from_cursor(struct seat *seat, struct output **dest_output,
int bottom_range = rc.snap_edge_range_outer;
int left_range = rc.snap_edge_range_outer;
int right_range = rc.snap_edge_range_outer;
if (wlr_output_layout_adjacent_output(seat->server->output_layout, WLR_DIRECTION_UP,
if (wlr_output_layout_adjacent_output(g_server.output_layout, WLR_DIRECTION_UP,
output->wlr_output, cursor_x, cursor_y)) {
top_range = rc.snap_edge_range_inner;
}
if (wlr_output_layout_adjacent_output(seat->server->output_layout, WLR_DIRECTION_DOWN,
if (wlr_output_layout_adjacent_output(g_server.output_layout, WLR_DIRECTION_DOWN,
output->wlr_output, cursor_x, cursor_y)) {
bottom_range = rc.snap_edge_range_inner;
}
if (wlr_output_layout_adjacent_output(seat->server->output_layout, WLR_DIRECTION_LEFT,
if (wlr_output_layout_adjacent_output(g_server.output_layout, WLR_DIRECTION_LEFT,
output->wlr_output, cursor_x, cursor_y)) {
left_range = rc.snap_edge_range_inner;
}
if (wlr_output_layout_adjacent_output(seat->server->output_layout, WLR_DIRECTION_RIGHT,
if (wlr_output_layout_adjacent_output(g_server.output_layout, WLR_DIRECTION_RIGHT,
output->wlr_output, cursor_x, cursor_y)) {
right_range = rc.snap_edge_range_inner;
}
/* Translate into output local coordinates */
wlr_output_layout_output_coords(seat->server->output_layout,
wlr_output_layout_output_coords(g_server.output_layout,
output->wlr_output, &cursor_x, &cursor_y);
struct wlr_box *area = &output->usable_area;
@ -284,7 +283,7 @@ snap_to_edge(struct view *view)
{
struct output *output;
enum lab_edge edge1, edge2;
if (!edge_from_cursor(&view->server->seat, &output, &edge1, &edge2)) {
if (!edge_from_cursor(&g_server.seat, &output, &edge1, &edge2)) {
return false;
}
enum lab_edge edge = edge1 | edge2;
@ -304,11 +303,11 @@ snap_to_edge(struct view *view)
static bool
snap_to_region(struct view *view)
{
if (!regions_should_snap(view->server)) {
if (!regions_should_snap()) {
return false;
}
struct region *region = regions_from_cursor(view->server);
struct region *region = regions_from_cursor();
if (region) {
view_snap_to_region(view, region);
return true;
@ -321,11 +320,11 @@ interactive_finish(struct view *view)
{
assert(view);
if (view->server->grabbed_view != view) {
if (g_server.grabbed_view != view) {
return;
}
if (view->server->input_mode == LAB_INPUT_STATE_MOVE) {
if (g_server.input_mode == LAB_INPUT_STATE_MOVE) {
if (!snap_to_region(view)) {
snap_to_edge(view);
}
@ -344,25 +343,25 @@ interactive_cancel(struct view *view)
{
assert(view);
if (view->server->grabbed_view != view) {
if (g_server.grabbed_view != view) {
return;
}
view->server->grabbed_view = NULL;
g_server.grabbed_view = NULL;
/*
* It's possible that grabbed_view was set but interactive_begin()
* wasn't called yet. In that case, we are done.
*/
if (view->server->input_mode != LAB_INPUT_STATE_MOVE
&& view->server->input_mode != LAB_INPUT_STATE_RESIZE) {
if (g_server.input_mode != LAB_INPUT_STATE_MOVE
&& g_server.input_mode != LAB_INPUT_STATE_RESIZE) {
return;
}
overlay_finish(&view->server->seat);
overlay_finish(&g_server.seat);
resize_indicator_hide(view);
/* Restore keyboard/pointer focus */
seat_focus_override_end(&view->server->seat, /*restore_focus*/ true);
seat_focus_override_end(&g_server.seat, /*restore_focus*/ true);
}