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: rename g_server to just server

Browse source
This commit is contained in:
John Lindgren 2026-03-19 12:05:43 -04:00 • committed by Johan Malm
parent 8d46da9db1
commit 4f72e6775e
61 changed files with 955 additions and 955 deletions
Download patch file Download diff file Expand all files Collapse all files

132
src/input/cursor.c
View file

@ -148,7 +148,7 @@ handle_request_set_cursor(struct wl_listener *listener, void *data)
{
struct seat *seat = wl_container_of(listener, seat, request_set_cursor);
if (g_server.input_mode != LAB_INPUT_STATE_PASSTHROUGH) {
if (server.input_mode != LAB_INPUT_STATE_PASSTHROUGH) {
/* Prevent setting a cursor image when moving or resizing */
return;
}
@ -208,7 +208,7 @@ handle_request_set_shape(struct wl_listener *listener, void *data)
struct wlr_seat_client *focused_client = seat->seat->pointer_state.focused_client;
/* Prevent setting a cursor image when moving or resizing */
if (g_server.input_mode != LAB_INPUT_STATE_PASSTHROUGH) {
if (server.input_mode != LAB_INPUT_STATE_PASSTHROUGH) {
return;
}
@ -267,10 +267,10 @@ handle_request_set_primary_selection(struct wl_listener *listener, void *data)
static void
process_cursor_move(uint32_t time)
{
struct view *view = g_server.grabbed_view;
struct view *view = server.grabbed_view;
int x = g_server.grab_box.x + (g_server.seat.cursor->x - g_server.grab_x);
int y = g_server.grab_box.y + (g_server.seat.cursor->y - g_server.grab_y);
int x = server.grab_box.x + (server.seat.cursor->x - server.grab_x);
int y = server.grab_box.y + (server.seat.cursor->y - server.grab_y);
/* Apply resistance for maximized/tiled view */
bool needs_untile = resistance_unsnap_apply(view, &x, &y);
@ -300,7 +300,7 @@ process_cursor_move(uint32_t time)
resistance_move_apply(view, &x, &y);
view_move(view, x, y);
overlay_update(&g_server.seat);
overlay_update(&server.seat);
}
static void
@ -310,8 +310,8 @@ process_cursor_resize(uint32_t time)
static uint32_t last_resize_time = 0;
static struct view *last_resize_view = NULL;
assert(g_server.grabbed_view);
if (g_server.grabbed_view == last_resize_view) {
assert(server.grabbed_view);
if (server.grabbed_view == last_resize_view) {
int32_t refresh = 0;
if (output_is_usable(last_resize_view->output)) {
refresh = last_resize_view->output->wlr_output->refresh;
@ -327,43 +327,43 @@ process_cursor_resize(uint32_t time)
}
last_resize_time = time;
last_resize_view = g_server.grabbed_view;
last_resize_view = server.grabbed_view;
double dx = g_server.seat.cursor->x - g_server.grab_x;
double dy = g_server.seat.cursor->y - g_server.grab_y;
double dx = server.seat.cursor->x - server.grab_x;
double dy = server.seat.cursor->y - server.grab_y;
struct view *view = g_server.grabbed_view;
struct view *view = server.grabbed_view;
struct wlr_box new_view_geo = view->current;
if (g_server.resize_edges & LAB_EDGE_TOP) {
if (server.resize_edges & LAB_EDGE_TOP) {
/* Shift y to anchor bottom edge when resizing top */
new_view_geo.y = g_server.grab_box.y + dy;
new_view_geo.height = g_server.grab_box.height - dy;
} else if (g_server.resize_edges & LAB_EDGE_BOTTOM) {
new_view_geo.height = g_server.grab_box.height + dy;
new_view_geo.y = server.grab_box.y + dy;
new_view_geo.height = server.grab_box.height - dy;
} else if (server.resize_edges & LAB_EDGE_BOTTOM) {
new_view_geo.height = server.grab_box.height + dy;
}
if (g_server.resize_edges & LAB_EDGE_LEFT) {
if (server.resize_edges & LAB_EDGE_LEFT) {
/* Shift x to anchor right edge when resizing left */
new_view_geo.x = g_server.grab_box.x + dx;
new_view_geo.width = g_server.grab_box.width - dx;
} else if (g_server.resize_edges & LAB_EDGE_RIGHT) {
new_view_geo.width = g_server.grab_box.width + dx;
new_view_geo.x = server.grab_box.x + dx;
new_view_geo.width = server.grab_box.width - dx;
} else if (server.resize_edges & LAB_EDGE_RIGHT) {
new_view_geo.width = server.grab_box.width + dx;
}
resistance_resize_apply(view, &new_view_geo);
view_adjust_size(view, &new_view_geo.width, &new_view_geo.height);
if (g_server.resize_edges & LAB_EDGE_TOP) {
if (server.resize_edges & LAB_EDGE_TOP) {
/* After size adjustments, make sure to anchor bottom edge */
new_view_geo.y = g_server.grab_box.y +
g_server.grab_box.height - new_view_geo.height;
new_view_geo.y = server.grab_box.y +
server.grab_box.height - new_view_geo.height;
}
if (g_server.resize_edges & LAB_EDGE_LEFT) {
if (server.resize_edges & LAB_EDGE_LEFT) {
/* After size adjustments, make sure to anchor bottom right */
new_view_geo.x = g_server.grab_box.x +
g_server.grab_box.width - new_view_geo.width;
new_view_geo.x = server.grab_box.x +
server.grab_box.width - new_view_geo.width;
}
if (rc.resize_draw_contents) {
@ -536,12 +536,12 @@ static void
cursor_update_common(const struct cursor_context *ctx,
struct cursor_context *notified_ctx)
{
struct seat *seat = &g_server.seat;
struct seat *seat = &server.seat;
struct wlr_seat *wlr_seat = seat->seat;
ssd_update_hovered_button(ctx->node);
if (g_server.input_mode != LAB_INPUT_STATE_PASSTHROUGH) {
if (server.input_mode != LAB_INPUT_STATE_PASSTHROUGH) {
/*
* Prevent updating focus/cursor image during
* interactive move/resize, window switcher and
@ -565,8 +565,8 @@ cursor_update_common(const struct cursor_context *ctx,
int lx, ly;
wlr_scene_node_coords(seat->pressed.ctx.node, &lx, &ly);
*notified_ctx = seat->pressed.ctx;
notified_ctx->sx = g_server.seat.cursor->x - lx;
notified_ctx->sy = g_server.seat.cursor->y - ly;
notified_ctx->sx = server.seat.cursor->x - lx;
notified_ctx->sy = server.seat.cursor->y - ly;
}
return;
}
@ -623,21 +623,21 @@ bool
cursor_process_motion(uint32_t time, double *sx, double *sy)
{
/* If the mode is non-passthrough, delegate to those functions. */
if (g_server.input_mode == LAB_INPUT_STATE_MOVE) {
if (server.input_mode == LAB_INPUT_STATE_MOVE) {
process_cursor_move(time);
return false;
} else if (g_server.input_mode == LAB_INPUT_STATE_RESIZE) {
} else if (server.input_mode == LAB_INPUT_STATE_RESIZE) {
process_cursor_resize(time);
return false;
}
/* Otherwise, find view under the pointer and send the event along */
struct cursor_context ctx = get_cursor_context();
struct seat *seat = &g_server.seat;
struct seat *seat = &server.seat;
if (ctx.type == LAB_NODE_MENUITEM) {
menu_process_cursor_motion(ctx.node);
cursor_set(&g_server.seat, LAB_CURSOR_DEFAULT);
cursor_set(&server.seat, LAB_CURSOR_DEFAULT);
return false;
}
@ -712,7 +712,7 @@ _cursor_update_focus(void)
* Always focus the surface below the cursor when
* followMouse=yes and followMouseRequiresMovement=no.
*/
desktop_focus_view_or_surface(&g_server.seat, ctx.view,
desktop_focus_view_or_surface(&server.seat, ctx.view,
ctx.surface, rc.raise_on_focus);
}
@ -735,7 +735,7 @@ static void
warp_cursor_to_constraint_hint(struct seat *seat,
struct wlr_pointer_constraint_v1 *constraint)
{
if (!g_server.active_view) {
if (!server.active_view) {
return;
}
@ -744,8 +744,8 @@ warp_cursor_to_constraint_hint(struct seat *seat,
double sx = constraint->current.cursor_hint.x;
double sy = constraint->current.cursor_hint.y;
wlr_cursor_warp(seat->cursor, NULL,
g_server.active_view->current.x + sx,
g_server.active_view->current.y + sy);
server.active_view->current.x + sx,
server.active_view->current.y + sy);
/* Make sure we are not sending unnecessary surface movements */
wlr_seat_pointer_warp(seat->seat, sx, sy);
@ -791,11 +791,11 @@ create_constraint(struct wl_listener *listener, void *data)
struct constraint *constraint = znew(*constraint);
constraint->constraint = wlr_constraint;
constraint->seat = &g_server.seat;
constraint->seat = &server.seat;
constraint->destroy.notify = handle_constraint_destroy;
wl_signal_add(&wlr_constraint->events.destroy, &constraint->destroy);
struct view *view = g_server.active_view;
struct view *view = server.active_view;
if (view && view->surface == wlr_constraint->surface) {
constrain_cursor(wlr_constraint);
}
@ -805,7 +805,7 @@ void
constrain_cursor(struct wlr_pointer_constraint_v1
*constraint)
{
struct seat *seat = &g_server.seat;
struct seat *seat = &server.seat;
if (seat->current_constraint == constraint) {
return;
}
@ -835,7 +835,7 @@ constrain_cursor(struct wlr_pointer_constraint_v1
static void
apply_constraint(struct seat *seat, struct wlr_pointer *pointer, double *x, double *y)
{
if (!g_server.active_view) {
if (!server.active_view) {
return;
}
if (!seat->current_constraint
@ -848,8 +848,8 @@ apply_constraint(struct seat *seat, struct wlr_pointer *pointer, double *x, doub
double sx = seat->cursor->x;
double sy = seat->cursor->y;
sx -= g_server.active_view->current.x;
sy -= g_server.active_view->current.y;
sx -= server.active_view->current.x;
sy -= server.active_view->current.y;
double sx_confined, sy_confined;
if (!wlr_region_confine(&seat->current_constraint->region, sx, sy,
@ -949,7 +949,7 @@ handle_motion(struct wl_listener *listener, void *data)
WL_POINTER_AXIS_SOURCE_CONTINUOUS, event->time_msec);
} else {
wlr_relative_pointer_manager_v1_send_relative_motion(
g_server.relative_pointer_manager,
server.relative_pointer_manager,
seat->seat, (uint64_t)event->time_msec * 1000,
event->delta_x, event->delta_y, event->unaccel_dx,
event->unaccel_dy);
@ -989,12 +989,12 @@ handle_motion_absolute(struct wl_listener *listener, void *data)
static void
process_release_mousebinding(struct cursor_context *ctx, uint32_t button)
{
if (g_server.input_mode == LAB_INPUT_STATE_CYCLE) {
if (server.input_mode == LAB_INPUT_STATE_CYCLE) {
return;
}
struct mousebind *mousebind;
uint32_t modifiers = keyboard_get_all_modifiers(&g_server.seat);
uint32_t modifiers = keyboard_get_all_modifiers(&server.seat);
wl_list_for_each(mousebind, &rc.mousebinds, link) {
if (ctx->type == LAB_NODE_CLIENT
@ -1058,14 +1058,14 @@ static bool
process_press_mousebinding(struct cursor_context *ctx,
uint32_t button)
{
if (g_server.input_mode == LAB_INPUT_STATE_CYCLE) {
if (server.input_mode == LAB_INPUT_STATE_CYCLE) {
return false;
}
struct mousebind *mousebind;
bool double_click = is_double_click(rc.doubleclick_time, button, ctx);
bool consumed_by_frame_context = false;
uint32_t modifiers = keyboard_get_all_modifiers(&g_server.seat);
uint32_t modifiers = keyboard_get_all_modifiers(&server.seat);
wl_list_for_each(mousebind, &rc.mousebinds, link) {
if (ctx->type == LAB_NODE_CLIENT
@ -1145,7 +1145,7 @@ cursor_process_button_press(struct seat *seat, uint32_t button, uint32_t time_ms
interactive_set_grab_context(&ctx);
}
if (g_server.input_mode == LAB_INPUT_STATE_MENU) {
if (server.input_mode == LAB_INPUT_STATE_MENU) {
/*
* If menu was already opened on press, set a very small value
* so subsequent release always closes menu or selects menu item.
@ -1213,7 +1213,7 @@ cursor_process_button_release(struct seat *seat, uint32_t button,
cursor_context_save(&seat->pressed, NULL);
if (g_server.input_mode == LAB_INPUT_STATE_MENU) {
if (server.input_mode == LAB_INPUT_STATE_MENU) {
/* TODO: take into account overflow of time_msec */
if (time_msec - press_msec > rc.menu_ignore_button_release_period) {
if (ctx.type == LAB_NODE_MENUITEM) {
@ -1225,14 +1225,14 @@ cursor_process_button_release(struct seat *seat, uint32_t button,
}
return notify;
}
if (g_server.input_mode == LAB_INPUT_STATE_CYCLE) {
if (server.input_mode == LAB_INPUT_STATE_CYCLE) {
if (ctx.type == LAB_NODE_CYCLE_OSD_ITEM) {
cycle_on_cursor_release(ctx.node);
}
return notify;
}
if (g_server.input_mode != LAB_INPUT_STATE_PASSTHROUGH) {
if (server.input_mode != LAB_INPUT_STATE_PASSTHROUGH) {
return notify;
}
@ -1262,17 +1262,17 @@ cursor_finish_button_release(struct seat *seat, uint32_t button)
lab_set_remove(&seat->bound_buttons, button);
if (g_server.input_mode == LAB_INPUT_STATE_MOVE
|| g_server.input_mode == LAB_INPUT_STATE_RESIZE) {
if (resize_outlines_enabled(g_server.grabbed_view)) {
resize_outlines_finish(g_server.grabbed_view);
if (server.input_mode == LAB_INPUT_STATE_MOVE
|| server.input_mode == LAB_INPUT_STATE_RESIZE) {
if (resize_outlines_enabled(server.grabbed_view)) {
resize_outlines_finish(server.grabbed_view);
}
/* Exit interactive move/resize mode */
interactive_finish(g_server.grabbed_view);
interactive_finish(server.grabbed_view);
return true;
} else if (g_server.grabbed_view) {
} else if (server.grabbed_view) {
/* Button was released without starting move/resize */
interactive_cancel(g_server.grabbed_view);
interactive_cancel(server.grabbed_view);
}
return false;
@ -1366,11 +1366,11 @@ process_cursor_axis(enum wl_pointer_axis orientation,
double delta, double delta_discrete)
{
struct cursor_context ctx = get_cursor_context();
uint32_t modifiers = keyboard_get_all_modifiers(&g_server.seat);
uint32_t modifiers = keyboard_get_all_modifiers(&server.seat);
enum direction direction = LAB_DIRECTION_INVALID;
struct scroll_info info = compare_delta(delta, delta_discrete,
&g_server.seat.accumulated_scrolls[orientation]);
&server.seat.accumulated_scrolls[orientation]);
if (orientation == WL_POINTER_AXIS_HORIZONTAL_SCROLL) {
if (info.direction < 0) {
@ -1504,7 +1504,7 @@ cursor_emulate_move(struct seat *seat, struct wlr_input_device *device,
}
wlr_relative_pointer_manager_v1_send_relative_motion(
g_server.relative_pointer_manager,
server.relative_pointer_manager,
seat->seat, (uint64_t)time_msec * 1000,
dx, dy, dx, dy);
@ -1633,7 +1633,7 @@ cursor_init(struct seat *seat)
CONNECT_SIGNAL(seat->seat, seat, request_set_cursor);
struct wlr_cursor_shape_manager_v1 *cursor_shape_manager =
wlr_cursor_shape_manager_v1_create(g_server.wl_display,
wlr_cursor_shape_manager_v1_create(server.wl_display,
LAB_CURSOR_SHAPE_V1_VERSION);
if (!cursor_shape_manager) {
wlr_log(WLR_ERROR, "unable to create cursor_shape interface");

2
src/input/gestures.c
View file

@ -114,7 +114,7 @@ handle_hold_end(struct wl_listener *listener, void *data)
void
gestures_init(struct seat *seat)
{
seat->pointer_gestures = wlr_pointer_gestures_v1_create(g_server.wl_display);
seat->pointer_gestures = wlr_pointer_gestures_v1_create(server.wl_display);
CONNECT_SIGNAL(seat->cursor, seat, pinch_begin);
CONNECT_SIGNAL(seat->cursor, seat, pinch_update);

8
src/input/ime.c
View file

@ -227,7 +227,7 @@ update_popup_position(struct input_method_popup *popup)
}
struct wlr_box output_box;
wlr_output_layout_get_box(
g_server.output_layout, output->wlr_output, &output_box);
server.output_layout, output->wlr_output, &output_box);
/* Use xdg-positioner utilities to position popup */
struct wlr_xdg_positioner_rules rules = {
@ -582,14 +582,14 @@ input_method_relay_create(struct seat *seat)
relay->seat = seat;
wl_list_init(&relay->text_inputs);
wl_list_init(&relay->popups);
relay->popup_tree = lab_wlr_scene_tree_create(&g_server.scene->tree);
relay->popup_tree = lab_wlr_scene_tree_create(&server.scene->tree);
relay->new_text_input.notify = handle_new_text_input;
wl_signal_add(&g_server.text_input_manager->events.text_input,
wl_signal_add(&server.text_input_manager->events.text_input,
&relay->new_text_input);
relay->new_input_method.notify = handle_new_input_method;
wl_signal_add(&g_server.input_method_manager->events.input_method,
wl_signal_add(&server.input_method_manager->events.input_method,
&relay->new_input_method);
relay->focused_surface_destroy.notify = handle_focused_surface_destroy;

24
src/input/keyboard.c
View file

@ -54,7 +54,7 @@ keyboard_reset_current_keybind(void)
static void
change_vt(unsigned int vt)
{
wlr_session_change_vt(g_server.session, vt);
wlr_session_change_vt(server.session, vt);
}
uint32_t
@ -133,14 +133,14 @@ handle_modifiers(struct wl_listener *listener, void *data)
struct seat *seat = keyboard->base.seat;
struct wlr_keyboard *wlr_keyboard = keyboard->wlr_keyboard;
if (g_server.input_mode == LAB_INPUT_STATE_MOVE) {
if (server.input_mode == LAB_INPUT_STATE_MOVE) {
/* Any change to the modifier state re-enable region snap */
seat->region_prevent_snap = false;
/* Pressing/releasing modifier key may show/hide region overlay */
overlay_update(seat);
}
bool cycling = g_server.input_mode == LAB_INPUT_STATE_CYCLE;
bool cycling = server.input_mode == LAB_INPUT_STATE_CYCLE;
if ((cycling || seat->workspace_osd_shown_by_modifier)
&& !keyboard_get_all_modifiers(seat)) {
@ -195,7 +195,7 @@ match_keybinding_for_sym(uint32_t modifiers,
if (modifiers ^ keybind->modifiers) {
continue;
}
if (view_inhibits_actions(g_server.active_view, &keybind->actions)) {
if (view_inhibits_actions(server.active_view, &keybind->actions)) {
continue;
}
if (sym == XKB_KEY_NoSymbol) {
@ -416,7 +416,7 @@ handle_change_vt_key(struct keyboard *keyboard,
static void
handle_menu_keys(struct keysyms *syms)
{
assert(g_server.input_mode == LAB_INPUT_STATE_MENU);
assert(server.input_mode == LAB_INPUT_STATE_MENU);
for (int i = 0; i < syms->nr_syms; i++) {
switch (syms->syms[i]) {
@ -484,7 +484,7 @@ handle_compositor_keybindings(struct keyboard *keyboard,
{
struct wlr_keyboard *wlr_keyboard = keyboard->wlr_keyboard;
struct keyinfo keyinfo = get_keyinfo(wlr_keyboard, event->keycode);
bool locked = g_server.session_lock_manager->locked;
bool locked = server.session_lock_manager->locked;
key_state_set_pressed(event->keycode,
event->state == WL_KEYBOARD_KEY_STATE_PRESSED);
@ -515,11 +515,11 @@ handle_compositor_keybindings(struct keyboard *keyboard,
* _all_ key press/releases are registered
*/
if (!locked) {
if (g_server.input_mode == LAB_INPUT_STATE_MENU) {
if (server.input_mode == LAB_INPUT_STATE_MENU) {
key_state_store_pressed_key_as_bound(event->keycode);
handle_menu_keys(&keyinfo.translated);
return LAB_KEY_HANDLED_TRUE;
} else if (g_server.input_mode == LAB_INPUT_STATE_CYCLE) {
} else if (server.input_mode == LAB_INPUT_STATE_CYCLE) {
if (handle_cycle_view_key(&keyinfo)) {
key_state_store_pressed_key_as_bound(event->keycode);
return LAB_KEY_HANDLED_TRUE;
@ -580,7 +580,7 @@ start_keybind_repeat(struct keyboard *keyboard,
keyboard->keybind_repeat_keycode = event->keycode;
keyboard->keybind_repeat_rate = wlr_keyboard->repeat_info.rate;
keyboard->keybind_repeat = wl_event_loop_add_timer(
g_server.wl_event_loop, handle_keybind_repeat, keyboard);
server.wl_event_loop, handle_keybind_repeat, keyboard);
wl_event_source_timer_update(keyboard->keybind_repeat,
wlr_keyboard->repeat_info.delay);
}
@ -724,15 +724,15 @@ reset_window_keyboard_layout_groups(void)
* but let's keep it simple for now and just reset them all.
*/
struct view *view;
for_each_view(view, &g_server.views, LAB_VIEW_CRITERIA_NONE) {
for_each_view(view, &server.views, LAB_VIEW_CRITERIA_NONE) {
view->keyboard_layout = 0;
}
struct view *active_view = g_server.active_view;
struct view *active_view = server.active_view;
if (!active_view) {
return;
}
keyboard_update_layout(&g_server.seat, active_view->keyboard_layout);
keyboard_update_layout(&server.seat, active_view->keyboard_layout);
}
/*

4
src/input/tablet-pad.c
View file

@ -183,9 +183,9 @@ tablet_pad_create(struct seat *seat, struct wlr_input_device *wlr_device)
pad->seat = seat;
pad->wlr_input_device = wlr_device;
pad->pad = wlr_tablet_pad_from_input_device(wlr_device);
if (g_server.tablet_manager) {
if (server.tablet_manager) {
pad->pad_v2 = wlr_tablet_pad_create(
g_server.tablet_manager, seat->seat, wlr_device);
server.tablet_manager, seat->seat, wlr_device);
}
pad->pad->data = pad;
wlr_log(WLR_INFO, "tablet pad capabilities: %zu button(s) %zu strip(s) %zu ring(s)",

12
src/input/tablet.c
View file

@ -44,7 +44,7 @@ handle_set_cursor(struct wl_listener *listener, void *data)
struct wlr_seat_client *focused_client =
seat->seat->pointer_state.focused_client;
if (g_server.input_mode != LAB_INPUT_STATE_PASSTHROUGH) {
if (server.input_mode != LAB_INPUT_STATE_PASSTHROUGH) {
return;
}
@ -76,7 +76,7 @@ tablet_tool_create(struct seat *seat,
struct drawing_tablet_tool *tool = znew(*tool);
tool->seat = seat;
tool->tool_v2 =
wlr_tablet_tool_create(g_server.tablet_manager,
wlr_tablet_tool_create(server.tablet_manager,
seat->seat, wlr_tablet_tool);
wlr_tablet_tool->data = tool;
wlr_log(WLR_INFO, "tablet tool capabilities:%s%s%s%s%s%s",
@ -239,7 +239,7 @@ tablet_get_coords(struct drawing_tablet *tablet, struct drawing_tablet_tool *too
double sx, sy;
struct wlr_scene_node *node =
wlr_scene_node_at(&g_server.scene->tree.node, lx, ly, &sx, &sy);
wlr_scene_node_at(&server.scene->tree.node, lx, ly, &sx, &sy);
/* find the surface and return it if it accepts tablet events */
struct wlr_surface *surface = lab_wlr_surface_from_node(node);
@ -449,7 +449,7 @@ handle_tablet_tool_axis(struct wl_listener *listener, void *data)
* Note that surface is also NULL when mouse emulation is forced.
*/
if (!is_down_mouse_emulation && ((surface
&& g_server.input_mode == LAB_INPUT_STATE_PASSTHROUGH)
&& server.input_mode == LAB_INPUT_STATE_PASSTHROUGH)
|| wlr_tablet_tool_v2_has_implicit_grab(tool->tool_v2))) {
/* motion seems to be supported by all tools */
notify_motion(tablet, tool, surface, x, y, dx, dy, ev->time_msec);
@ -719,9 +719,9 @@ tablet_create(struct seat *seat, struct wlr_input_device *wlr_device)
tablet->wlr_input_device = wlr_device;
tablet->tablet = wlr_tablet_from_input_device(wlr_device);
tablet->tablet->data = tablet;
if (g_server.tablet_manager) {
if (server.tablet_manager) {
tablet->tablet_v2 = wlr_tablet_create(
g_server.tablet_manager, seat->seat, wlr_device);
server.tablet_manager, seat->seat, wlr_device);
}
wlr_log(WLR_INFO, "tablet dimensions: %.2fmm x %.2fmm",
tablet->tablet->width_mm, tablet->tablet->height_mm);

4
src/input/touch.c
View file

@ -52,7 +52,7 @@ touch_get_coords(struct seat *seat, struct wlr_touch *touch, double x, double y,
* This matches normal pointer/mouse behavior where the first click on
* a surface closes a root/client menu.
*/
if (g_server.input_mode == LAB_INPUT_STATE_MENU) {
if (server.input_mode == LAB_INPUT_STATE_MENU) {
return NULL;
}
@ -63,7 +63,7 @@ touch_get_coords(struct seat *seat, struct wlr_touch *touch, double x, double y,
double sx, sy;
struct wlr_scene_node *node =
wlr_scene_node_at(&g_server.scene->tree.node, lx, ly, &sx, &sy);
wlr_scene_node_at(&server.scene->tree.node, lx, ly, &sx, &sy);
*x_offset = lx - sx;
*y_offset = ly - sy;