aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--backend/libinput/tablet_tool.c2
-rw-r--r--backend/wayland/output.c2
-rw-r--r--include/rootston/config.h1
-rw-r--r--include/rootston/view.h4
-rw-r--r--include/wlr/types/wlr_data_device.h5
-rw-r--r--include/wlr/types/wlr_keyboard.h3
-rw-r--r--include/wlr/types/wlr_output.h5
-rw-r--r--include/wlr/types/wlr_seat.h12
-rw-r--r--include/wlr/types/wlr_surface.h9
-rw-r--r--rootston/config.c4
-rw-r--r--rootston/cursor.c9
-rw-r--r--rootston/desktop.c66
-rw-r--r--rootston/keyboard.c91
-rw-r--r--rootston/output.c19
-rw-r--r--rootston/xdg_shell_v6.c2
-rw-r--r--types/wlr_cursor.c4
-rw-r--r--types/wlr_data_device.c13
-rw-r--r--types/wlr_keyboard.c25
-rw-r--r--types/wlr_output.c12
-rw-r--r--types/wlr_seat.c87
-rw-r--r--types/wlr_surface.c28
-rw-r--r--types/wlr_xdg_shell_v6.c7
22 files changed, 297 insertions, 113 deletions
diff --git a/backend/libinput/tablet_tool.c b/backend/libinput/tablet_tool.c
index 3caaf3f7..3d5fafc3 100644
--- a/backend/libinput/tablet_tool.c
+++ b/backend/libinput/tablet_tool.c
@@ -70,6 +70,8 @@ void handle_tablet_tool_axis(struct libinput_event *event,
wlr_event.updated_axes |= WLR_TABLET_TOOL_AXIS_WHEEL;
wlr_event.wheel_delta = libinput_event_tablet_tool_get_wheel_delta(tevent);
}
+ wlr_log(L_DEBUG, "Tablet tool axis event %d @ %f,%f",
+ wlr_event.updated_axes, wlr_event.x_mm, wlr_event.y_mm);
wl_signal_emit(&wlr_dev->tablet_tool->events.axis, &wlr_event);
}
diff --git a/backend/wayland/output.c b/backend/wayland/output.c
index 90f8b39a..c4301617 100644
--- a/backend/wayland/output.c
+++ b/backend/wayland/output.c
@@ -249,7 +249,7 @@ struct wlr_output *wlr_wl_output_create(struct wlr_backend *_backend) {
wlr_output_init(&output->wlr_output, &backend->backend, &output_impl);
struct wlr_output *wlr_output = &output->wlr_output;
- wlr_output_update_size(wlr_output, 640, 480);
+ wlr_output_update_size(wlr_output, 1280, 720);
strncpy(wlr_output->make, "wayland", sizeof(wlr_output->make));
strncpy(wlr_output->model, "wayland", sizeof(wlr_output->model));
snprintf(wlr_output->name, sizeof(wlr_output->name), "WL-%d",
diff --git a/include/rootston/config.h b/include/rootston/config.h
index 75c04619..e0466117 100644
--- a/include/rootston/config.h
+++ b/include/rootston/config.h
@@ -8,6 +8,7 @@ struct output_config {
char *name;
enum wl_output_transform transform;
int x, y;
+ int scale;
struct wl_list link;
struct {
int width, height;
diff --git a/include/rootston/view.h b/include/rootston/view.h
index 956ba1d3..f0d102cd 100644
--- a/include/rootston/view.h
+++ b/include/rootston/view.h
@@ -84,7 +84,7 @@ struct roots_view {
// configure event from the xdg_shell
// If not then this should follow the typical type/impl pattern we use
// elsewhere
- void (*get_size)(struct roots_view *view, struct wlr_box *box);
+ void (*get_size)(const struct roots_view *view, struct wlr_box *box);
void (*activate)(struct roots_view *view, bool active);
void (*move)(struct roots_view *view, double x, double y);
void (*resize)(struct roots_view *view, uint32_t width, uint32_t height);
@@ -94,7 +94,7 @@ struct roots_view {
void (*close)(struct roots_view *view);
};
-void view_get_size(struct roots_view *view, struct wlr_box *box);
+void view_get_size(const struct roots_view *view, struct wlr_box *box);
void view_activate(struct roots_view *view, bool active);
void view_move(struct roots_view *view, double x, double y);
void view_resize(struct roots_view *view, uint32_t width, uint32_t height);
diff --git a/include/wlr/types/wlr_data_device.h b/include/wlr/types/wlr_data_device.h
index 691e2df8..f45c15a2 100644
--- a/include/wlr/types/wlr_data_device.h
+++ b/include/wlr/types/wlr_data_device.h
@@ -75,6 +75,11 @@ struct wlr_data_device_manager *wlr_data_device_manager_create(
struct wl_display *display);
/**
+ * Destroys a wlr_data_device_manager and removes its wl_data_device_manager global.
+ */
+void wlr_data_device_manager_destroy(struct wlr_data_device_manager *manager);
+
+/**
* Creates a new wl_data_offer if there is a wl_data_source currently set as
* the seat selection and sends it to the seat client, followed by the
* wl_data_device.selection() event. If there is no current selection, the
diff --git a/include/wlr/types/wlr_keyboard.h b/include/wlr/types/wlr_keyboard.h
index af837ff5..e2d50b03 100644
--- a/include/wlr/types/wlr_keyboard.h
+++ b/include/wlr/types/wlr_keyboard.h
@@ -28,6 +28,8 @@ enum wlr_keyboard_modifier {
WLR_MODIFIER_MOD5 = 128,
};
+#define WLR_KEYBOARD_KEYS_CAP 32
+
struct wlr_keyboard_impl;
struct wlr_keyboard {
@@ -41,6 +43,7 @@ struct wlr_keyboard {
xkb_led_index_t led_indexes[WLR_LED_COUNT];
xkb_mod_index_t mod_indexes[WLR_MODIFIER_COUNT];
+ uint32_t keycodes[WLR_KEYBOARD_KEYS_CAP];
struct {
xkb_mod_mask_t depressed;
xkb_mod_mask_t latched;
diff --git a/include/wlr/types/wlr_output.h b/include/wlr/types/wlr_output.h
index e6323f9c..df123639 100644
--- a/include/wlr/types/wlr_output.h
+++ b/include/wlr/types/wlr_output.h
@@ -14,7 +14,7 @@ struct wlr_output_mode {
struct wlr_output_cursor {
struct wlr_output *output;
- int32_t x, y;
+ double x, y;
bool enabled;
uint32_t width, height;
int32_t hotspot_x, hotspot_y;
@@ -95,7 +95,8 @@ bool wlr_output_cursor_set_image(struct wlr_output_cursor *cursor,
int32_t hotspot_x, int32_t hotspot_y);
void wlr_output_cursor_set_surface(struct wlr_output_cursor *cursor,
struct wlr_surface *surface, int32_t hotspot_x, int32_t hotspot_y);
-bool wlr_output_cursor_move(struct wlr_output_cursor *cursor, int x, int y);
+bool wlr_output_cursor_move(struct wlr_output_cursor *cursor,
+ double x, double y);
void wlr_output_cursor_destroy(struct wlr_output_cursor *cursor);
#endif
diff --git a/include/wlr/types/wlr_seat.h b/include/wlr/types/wlr_seat.h
index b8b467d2..09d3e282 100644
--- a/include/wlr/types/wlr_seat.h
+++ b/include/wlr/types/wlr_seat.h
@@ -45,9 +45,7 @@ struct wlr_keyboard_grab_interface {
struct wlr_surface *surface);
void (*key)(struct wlr_seat_keyboard_grab *grab, uint32_t time,
uint32_t key, uint32_t state);
- void (*modifiers)(struct wlr_seat_keyboard_grab *grab,
- uint32_t mods_depressed, uint32_t mods_latched,
- uint32_t mods_locked, uint32_t group);
+ void (*modifiers)(struct wlr_seat_keyboard_grab *grab);
void (*cancel)(struct wlr_seat_keyboard_grab *grab);
};
@@ -296,17 +294,13 @@ void wlr_seat_keyboard_notify_key(struct wlr_seat *seat, uint32_t time,
* Send the modifier state to focused keyboard resources. Compositors should use
* `wlr_seat_keyboard_notify_modifiers()` to respect any keyboard grabs.
*/
-void wlr_seat_keyboard_send_modifiers(struct wlr_seat *seat,
- uint32_t mods_depressed, uint32_t mods_latched, uint32_t mods_locked,
- uint32_t group);
+void wlr_seat_keyboard_send_modifiers(struct wlr_seat *seat);
/**
* Notify the seat that the modifiers for the keyboard have changed. Defers to
* any keyboard grabs.
*/
-void wlr_seat_keyboard_notify_modifiers(struct wlr_seat *seat,
- uint32_t mods_depressed, uint32_t mods_latched, uint32_t mods_locked,
- uint32_t group);
+void wlr_seat_keyboard_notify_modifiers(struct wlr_seat *seat);
/**
* Notify the seat that the keyboard focus has changed and request it to be the
diff --git a/include/wlr/types/wlr_surface.h b/include/wlr/types/wlr_surface.h
index ea4184aa..cea53109 100644
--- a/include/wlr/types/wlr_surface.h
+++ b/include/wlr/types/wlr_surface.h
@@ -1,10 +1,10 @@
#ifndef WLR_TYPES_WLR_SURFACE_H
#define WLR_TYPES_WLR_SURFACE_H
-
#include <wayland-server.h>
#include <pixman.h>
#include <stdint.h>
#include <stdbool.h>
+#include <wlr/types/wlr_output.h>
struct wlr_frame_callback {
struct wl_resource *resource;
@@ -135,4 +135,11 @@ struct wlr_surface *wlr_surface_get_main_surface(struct wlr_surface *surface);
*/
struct wlr_subsurface *wlr_surface_subsurface_at(struct wlr_surface *surface,
double sx, double sy, double *sub_x, double *sub_y);
+
+void wlr_surface_send_enter(struct wlr_surface *surface,
+ struct wlr_output *output);
+
+void wlr_surface_send_leave(struct wlr_surface *surface,
+ struct wlr_output *output);
+
#endif
diff --git a/rootston/config.c b/rootston/config.c
index dc7a4b1d..ff02ff1d 100644
--- a/rootston/config.c
+++ b/rootston/config.c
@@ -220,6 +220,7 @@ static int config_ini_handler(void *user, const char *section, const char *name,
oc = calloc(1, sizeof(struct output_config));
oc->name = strdup(output_name);
oc->transform = WL_OUTPUT_TRANSFORM_NORMAL;
+ oc->scale = 1;
wl_list_insert(&config->outputs, &oc->link);
}
@@ -227,6 +228,9 @@ static int config_ini_handler(void *user, const char *section, const char *name,
oc->x = strtol(value, NULL, 10);
} else if (strcmp(name, "y") == 0) {
oc->y = strtol(value, NULL, 10);
+ } else if (strcmp(name, "scale") == 0) {
+ oc->scale = strtol(value, NULL, 10);
+ assert(oc->scale >= 1);
} else if (strcmp(name, "rotate") == 0) {
if (strcmp(value, "normal") == 0) {
oc->transform = WL_OUTPUT_TRANSFORM_NORMAL;
diff --git a/rootston/cursor.c b/rootston/cursor.c
index 80836ccd..cbd03af1 100644
--- a/rootston/cursor.c
+++ b/rootston/cursor.c
@@ -402,11 +402,20 @@ static void handle_touch_motion(struct wl_listener *listener, void *data) {
static void handle_tool_axis(struct wl_listener *listener, void *data) {
struct roots_input *input = wl_container_of(listener, input, cursor_tool_axis);
struct wlr_event_tablet_tool_axis *event = data;
+
if ((event->updated_axes & WLR_TABLET_TOOL_AXIS_X) &&
(event->updated_axes & WLR_TABLET_TOOL_AXIS_Y)) {
wlr_cursor_warp_absolute(input->cursor, event->device,
event->x_mm / event->width_mm, event->y_mm / event->height_mm);
cursor_update_position(input, event->time_msec);
+ } else if ((event->updated_axes & WLR_TABLET_TOOL_AXIS_X)) {
+ wlr_cursor_warp_absolute(input->cursor, event->device,
+ event->x_mm / event->width_mm, -1);
+ cursor_update_position(input, event->time_msec);
+ } else if ((event->updated_axes & WLR_TABLET_TOOL_AXIS_Y)) {
+ wlr_cursor_warp_absolute(input->cursor, event->device,
+ -1, event->y_mm / event->height_mm);
+ cursor_update_position(input, event->time_msec);
}
}
diff --git a/rootston/desktop.c b/rootston/desktop.c
index f5d5925b..469a503b 100644
--- a/rootston/desktop.c
+++ b/rootston/desktop.c
@@ -35,36 +35,64 @@ void view_destroy(struct roots_view *view) {
free(view);
}
-void view_get_size(struct roots_view *view, struct wlr_box *box) {
+void view_get_size(const struct roots_view *view, struct wlr_box *box) {
if (view->get_size) {
view->get_size(view, box);
- return;
+ } else {
+ box->width = view->wlr_surface->current->width;
+ box->height = view->wlr_surface->current->height;
}
- box->x = box->y = 0;
- box->width = view->wlr_surface->current->width;
- box->height = view->wlr_surface->current->height;
+ box->x = view->x;
+ box->y = view->y;
}
-void view_activate(struct roots_view *view, bool activate) {
- if (view->activate) {
- view->activate(view, activate);
+static void view_update_output(const struct roots_view *view,
+ const struct wlr_box *before) {
+ struct roots_desktop *desktop = view->desktop;
+ struct roots_output *output;
+ struct wlr_box box;
+ view_get_size(view, &box);
+ wl_list_for_each(output, &desktop->outputs, link) {
+ bool intersected = before->x != -1 && wlr_output_layout_intersects(
+ desktop->layout, output->wlr_output,
+ before->x, before->y, before->x + before->width,
+ before->y + before->height);
+ bool intersects = wlr_output_layout_intersects(
+ desktop->layout, output->wlr_output,
+ view->x, view->y, view->x + box.width, view->y + box.height);
+ if (intersected && !intersects) {
+ wlr_surface_send_leave(view->wlr_surface, output->wlr_output);
+ }
+ if (!intersected && intersects) {
+ wlr_surface_send_enter(view->wlr_surface, output->wlr_output);
+ }
}
}
void view_move(struct roots_view *view, double x, double y) {
+ struct wlr_box before;
+ view_get_size(view, &before);
if (view->move) {
view->move(view, x, y);
- return;
+ } else {
+ view->x = x;
+ view->y = y;
}
+}
- view->x = x;
- view->y = y;
+void view_activate(struct roots_view *view, bool activate) {
+ if (view->activate) {
+ view->activate(view, activate);
+ }
}
void view_resize(struct roots_view *view, uint32_t width, uint32_t height) {
+ struct wlr_box before;
+ view_get_size(view, &before);
if (view->resize) {
view->resize(view, width, height);
}
+ view_update_output(view, &before);
}
void view_move_resize(struct roots_view *view, double x, double y,
@@ -129,8 +157,8 @@ void view_close(struct roots_view *view) {
}
bool view_center(struct roots_view *view) {
- struct wlr_box size;
- view_get_size(view, &size);
+ struct wlr_box box;
+ view_get_size(view, &box);
struct roots_desktop *desktop = view->desktop;
struct wlr_cursor *cursor = desktop->server->input->cursor;
@@ -153,19 +181,20 @@ bool view_center(struct roots_view *view) {
int width, height;
wlr_output_effective_resolution(output, &width, &height);
- double view_x = (double)(width - size.width) / 2 + l_output->x;
- double view_y = (double)(height - size.height) / 2 + l_output->y;
-
+ double view_x = (double)(width - box.width) / 2 + l_output->x;
+ double view_y = (double)(height - box.height) / 2 + l_output->y;
view_move(view, view_x, view_y);
return true;
}
void view_setup(struct roots_view *view) {
- view_center(view);
-
struct roots_input *input = view->desktop->server->input;
+ view_center(view);
set_view_focus(input, view->desktop, view);
+ struct wlr_box before;
+ view_get_size(view, &before);
+ view_update_output(view, &before);
}
void view_teardown(struct roots_view *view) {
@@ -177,7 +206,6 @@ void view_teardown(struct roots_view *view) {
struct roots_view *prev_view = views->items[views->length-2];
struct roots_input *input = prev_view->desktop->server->input;
set_view_focus(input, prev_view->desktop, prev_view);
- wlr_seat_keyboard_notify_enter(input->wl_seat, prev_view->wlr_surface);
}
struct roots_view *view_at(struct roots_desktop *desktop, double lx, double ly,
diff --git a/rootston/keyboard.c b/rootston/keyboard.c
index e174b731..bde912aa 100644
--- a/rootston/keyboard.c
+++ b/rootston/keyboard.c
@@ -60,7 +60,7 @@ static void keyboard_binding_execute(struct roots_keyboard *keyboard,
* should be propagated to clients.
*/
static bool keyboard_keysym_press(struct roots_keyboard *keyboard,
- xkb_keysym_t keysym) {
+ xkb_keysym_t keysym, uint32_t modifiers) {
ssize_t i = keyboard_pressed_keysym_index(keyboard, keysym);
if (i < 0) {
i = keyboard_pressed_keysym_index(keyboard, XKB_KEY_NoSymbol);
@@ -88,7 +88,6 @@ static bool keyboard_keysym_press(struct roots_keyboard *keyboard,
wlr_seat_keyboard_end_grab(keyboard->input->wl_seat);
}
- uint32_t modifiers = wlr_keyboard_get_modifiers(keyboard->device->keyboard);
struct wl_list *bindings = &keyboard->input->server->config->bindings;
struct binding_config *bc;
wl_list_for_each(bc, bindings, link) {
@@ -122,25 +121,85 @@ static void keyboard_keysym_release(struct roots_keyboard *keyboard,
}
}
-static void keyboard_key_notify(struct wl_listener *listener, void *data) {
- struct wlr_event_keyboard_key *event = data;
- struct roots_keyboard *keyboard = wl_container_of(listener, keyboard, key);
+/*
+ * Process keypresses from the keyboard as if modifiers didn't change keysyms.
+ *
+ * This avoids the xkb keysym translation based on modifiers considered pressed
+ * in the state and uses the list of modifiers saved on the rootston side.
+ *
+ * This will trigger the keybind: [Alt]+[Shift]+2
+ */
+static bool keyboard_keysyms_simple(struct roots_keyboard *keyboard,
+ uint32_t keycode, enum wlr_key_state state) {
+ uint32_t modifiers = wlr_keyboard_get_modifiers(keyboard->device->keyboard);
+ const xkb_keysym_t *syms;
+ xkb_layout_index_t layout_index = xkb_state_key_get_layout(
+ keyboard->device->keyboard->xkb_state, keycode);
+ int syms_len = xkb_keymap_key_get_syms_by_level(
+ keyboard->device->keyboard->keymap, keycode, layout_index, 0, &syms);
- uint32_t keycode = event->keycode + 8;
+ bool handled = false;
+ for (int i = 0; i < syms_len; i++) {
+ if (state) {
+ bool keysym_handled = keyboard_keysym_press(keyboard,
+ syms[i], modifiers);
+ handled = handled || keysym_handled;
+ } else { // WLR_KEY_RELEASED
+ keyboard_keysym_release(keyboard, syms[i]);
+ }
+ }
+
+ return handled;
+}
+
+/*
+ * Process keypresses from the keyboard as xkb sees them.
+ *
+ * This uses the xkb keysyms translation based on pressed modifiers and clears
+ * the consumed modifiers from the list of modifiers passed to keybind
+ * detection.
+ *
+ * (On US layout) this will trigger: [Alt]+[at]
+ */
+static bool keyboard_keysyms_xkb(struct roots_keyboard *keyboard,
+ uint32_t keycode, enum wlr_key_state state) {
+ uint32_t modifiers = wlr_keyboard_get_modifiers(keyboard->device->keyboard);
const xkb_keysym_t *syms;
int syms_len = xkb_state_key_get_syms(keyboard->device->keyboard->xkb_state,
keycode, &syms);
+ uint32_t consumed = xkb_state_key_get_consumed_mods2(
+ keyboard->device->keyboard->xkb_state, keycode, XKB_CONSUMED_MODE_XKB);
+
+ modifiers = modifiers & ~consumed;
bool handled = false;
for (int i = 0; i < syms_len; i++) {
- if (event->state == WLR_KEY_PRESSED) {
- bool keysym_handled = keyboard_keysym_press(keyboard, syms[i]);
+ if (state) {
+ bool keysym_handled = keyboard_keysym_press(keyboard,
+ syms[i], modifiers);
handled = handled || keysym_handled;
} else { // WLR_KEY_RELEASED
keyboard_keysym_release(keyboard, syms[i]);
}
}
+ return handled;
+}
+
+static void keyboard_key_notify(struct wl_listener *listener, void *data) {
+ struct wlr_event_keyboard_key *event = data;
+ struct roots_keyboard *keyboard = wl_container_of(listener, keyboard, key);
+
+ uint32_t keycode = event->keycode + 8;
+
+ bool handled = keyboard_keysyms_xkb(keyboard, keycode, event->state);
+
+ if (!handled) {
+ bool key_handled = keyboard_keysyms_simple(keyboard, keycode,
+ event->state);
+ handled = handled || key_handled;
+ }
+
if (!handled) {
wlr_seat_set_keyboard(keyboard->input->wl_seat, keyboard->device);
wlr_seat_keyboard_notify_key(keyboard->input->wl_seat, event->time_msec,
@@ -149,17 +208,11 @@ static void keyboard_key_notify(struct wl_listener *listener, void *data) {
}
static void keyboard_modifiers_notify(struct wl_listener *listener, void *data) {
- struct roots_keyboard *r_keyboard =
- wl_container_of(listener, r_keyboard, modifiers);
- struct wlr_seat *seat = r_keyboard->input->wl_seat;
- struct wlr_keyboard *keyboard = r_keyboard->device->keyboard;
- wlr_seat_set_keyboard(seat, r_keyboard->device);
- wlr_seat_keyboard_notify_modifiers(seat,
- keyboard->modifiers.depressed,
- keyboard->modifiers.latched,
- keyboard->modifiers.locked,
- keyboard->modifiers.group);
-
+ struct roots_keyboard *keyboard =
+ wl_container_of(listener, keyboard, modifiers);
+ struct wlr_seat *seat = keyboard->input->wl_seat;
+ wlr_seat_set_keyboard(seat, keyboard->device);
+ wlr_seat_keyboard_notify_modifiers(seat);
}
static void keyboard_config_merge(struct keyboard_config *config,
diff --git a/rootston/output.c b/rootston/output.c
index baa7b6cc..c21c6781 100644
--- a/rootston/output.c
+++ b/rootston/output.c
@@ -20,10 +20,13 @@ static void render_surface(struct wlr_surface *surface,
struct roots_desktop *desktop, struct wlr_output *wlr_output,
struct timespec *when, double lx, double ly, float rotation) {
if (surface->texture->valid) {
- int width = surface->current->buffer_width;
- int height = surface->current->buffer_height;
+ float scale_factor = (float)wlr_output->scale / surface->current->scale;
+ int width = surface->current->buffer_width * scale_factor;
+ int height = surface->current->buffer_height * scale_factor;
double ox = lx, oy = ly;
wlr_output_layout_output_coords(desktop->layout, wlr_output, &ox, &oy);
+ ox *= wlr_output->scale;
+ oy *= wlr_output->scale;
if (wlr_output_layout_intersects(desktop->layout, wlr_output,
lx, ly, lx + width, ly + height)) {
@@ -32,15 +35,22 @@ static void render_surface(struct wlr_surface *surface,
float translate_origin[16];
wlr_matrix_translate(&translate_origin,
(int)ox + width / 2, (int)oy + height / 2, 0);
+
float rotate[16];
wlr_matrix_rotate(&rotate, rotation);
+
float translate_center[16];
wlr_matrix_translate(&translate_center, -width / 2, -height / 2, 0);
+
+ float scale[16];
+ wlr_matrix_scale(&scale, width, height, 1);
+
float transform[16];
wlr_matrix_mul(&translate_origin, &rotate, &transform);
wlr_matrix_mul(&transform, &translate_center, &transform);
- wlr_surface_get_matrix(surface, &matrix,
- &wlr_output->transform_matrix, &transform);
+ wlr_matrix_mul(&transform, &scale, &transform);
+ wlr_matrix_mul(&wlr_output->transform_matrix, &transform, &matrix);
+
wlr_render_with_matrix(desktop->server->renderer,
surface->texture, &matrix);
@@ -217,6 +227,7 @@ void output_add_notify(struct wl_listener *listener, void *data) {
if (output_config->mode.width) {
set_mode(wlr_output, output_config);
}
+ wlr_output->scale = output_config->scale;
wlr_output_transform(wlr_output, output_config->transform);
wlr_output_layout_add(desktop->layout,
wlr_output, output_config->x, output_config->y);
diff --git a/rootston/xdg_shell_v6.c b/rootston/xdg_shell_v6.c
index a86899be..2a0660a6 100644
--- a/rootston/xdg_shell_v6.c
+++ b/rootston/xdg_shell_v6.c
@@ -10,7 +10,7 @@
#include "rootston/server.h"
#include "rootston/input.h"
-static void get_size(struct roots_view *view, struct wlr_box *box) {
+static void get_size(const struct roots_view *view, struct wlr_box *box) {
assert(view->type == ROOTS_XDG_SHELL_V6_VIEW);
struct wlr_xdg_surface_v6 *surf = view->xdg_surface_v6;
// TODO: surf->geometry can be NULL
diff --git a/types/wlr_cursor.c b/types/wlr_cursor.c
index 83d36d14..dfaccb53 100644
--- a/types/wlr_cursor.c
+++ b/types/wlr_cursor.c
@@ -261,8 +261,8 @@ void wlr_cursor_warp_absolute(struct wlr_cursor *cur,
mapping = wlr_output_layout_get_box(cur->state->layout, NULL);
}
- double x = mapping->width * x_mm + mapping->x;
- double y = mapping->height * y_mm + mapping->y;
+ double x = x_mm > 0 ? mapping->width * x_mm + mapping->x : cur->x;
+ double y = y_mm > 0 ? mapping->height * y_mm + mapping->y : cur->y;
wlr_cursor_warp_unchecked(cur, x, y);
}
diff --git a/types/wlr_data_device.c b/types/wlr_data_device.c
index ee83260e..df18317b 100644
--- a/types/wlr_data_device.c
+++ b/types/wlr_data_device.c
@@ -531,9 +531,8 @@ static void keyboard_drag_key(struct wlr_seat_keyboard_grab *grab,
// no keyboard input during drags
}
-static void keyboard_drag_modifiers(struct wlr_seat_keyboard_grab *grab,
- uint32_t mods_depressed, uint32_t mods_latched,
- uint32_t mods_locked, uint32_t group) {
+static void keyboard_drag_modifiers(struct wlr_seat_keyboard_grab *grab) {
+ //struct wlr_keyboard *keyboard = grab->seat->keyboard_state.keyboard;
// TODO change the dnd action based on what modifier is pressed on the
// keyboard
}
@@ -816,3 +815,11 @@ struct wlr_data_device_manager *wlr_data_device_manager_create(
return manager;
}
+
+void wlr_data_device_manager_destroy(struct wlr_data_device_manager *manager) {
+ if (!manager) {
+ return;
+ }
+ wl_global_destroy(manager->global);
+ free(manager);
+}
diff --git a/types/wlr_keyboard.c b/types/wlr_keyboard.c
index c27264ef..98ebeed5 100644
--- a/types/wlr_keyboard.c
+++ b/types/wlr_keyboard.c
@@ -45,6 +45,30 @@ static void keyboard_modifier_update(struct wlr_keyboard *keyboard) {
wl_signal_emit(&keyboard->events.modifiers, keyboard);
}
+static void keyboard_key_update(struct wlr_keyboard *keyboard,
+ struct wlr_event_keyboard_key *event) {
+ bool found = false;
+ size_t i = 0;
+ for (; i < WLR_KEYBOARD_KEYS_CAP; ++i) {
+ if (keyboard->keycodes[i] == event->keycode) {
+ found = true;
+ break;
+ }
+ }
+
+ if (event->state == WLR_KEY_PRESSED && !found) {
+ for (size_t i = 0; i < WLR_KEYBOARD_KEYS_CAP; ++i) {
+ if (keyboard->keycodes[i] == 0) {
+ keyboard->keycodes[i] = event->keycode;
+ break;
+ }
+ }
+ }
+ if (event->state == WLR_KEY_RELEASED && found) {
+ keyboard->keycodes[i] = 0;
+ }
+}
+
void wlr_keyboard_notify_modifiers(struct wlr_keyboard *keyboard,
uint32_t mods_depressed, uint32_t mods_latched, uint32_t mods_locked,
uint32_t group) {
@@ -68,6 +92,7 @@ void wlr_keyboard_notify_key(struct wlr_keyboard *keyboard,
}
keyboard_led_update(keyboard);
keyboard_modifier_update(keyboard);
+ keyboard_key_update(keyboard, event);
wl_signal_emit(&keyboard->events.key, event);
}
diff --git a/types/wlr_output.c b/types/wlr_output.c
index 5456d064..df02afec 100644
--- a/types/wlr_output.c
+++ b/types/wlr_output.c
@@ -231,7 +231,6 @@ void wlr_output_destroy(struct wlr_output *output) {
void wlr_output_effective_resolution(struct wlr_output *output,
int *width, int *height) {
- // TODO: Scale factor
if (output->transform % 2 == 1) {
*width = output->height;
*height = output->width;
@@ -239,6 +238,8 @@ void wlr_output_effective_resolution(struct wlr_output *output,
*width = output->width;
*height = output->height;
}
+ *width /= output->scale;
+ *height /= output->scale;
}
void wlr_output_make_current(struct wlr_output *output) {
@@ -269,6 +270,8 @@ static void output_cursor_render(struct wlr_output_cursor *cursor) {
output_box.x = output_box.y = 0;
wlr_output_effective_resolution(cursor->output, &output_box.width,
&output_box.height);
+ output_box.width *= cursor->output->scale;
+ output_box.height *= cursor->output->scale;
struct wlr_box cursor_box;
output_cursor_get_box(cursor, &cursor_box);
@@ -471,7 +474,10 @@ void wlr_output_cursor_set_surface(struct wlr_output_cursor *cursor,
}
}
-bool wlr_output_cursor_move(struct wlr_output_cursor *cursor, int x, int y) {
+bool wlr_output_cursor_move(struct wlr_output_cursor *cursor,
+ double x, double y) {
+ x *= cursor->output->scale;
+ y *= cursor->output->scale;
cursor->x = x;
cursor->y = y;
@@ -483,7 +489,7 @@ bool wlr_output_cursor_move(struct wlr_output_cursor *cursor, int x, int y) {
if (!cursor->output->impl->move_cursor) {
return false;
}
- return cursor->output->impl->move_cursor(cursor->output, x, y);
+ return cursor->output->impl->move_cursor(cursor->output, (int)x, (int)y);
}
struct wlr_output_cursor *wlr_output_cursor_create(struct wlr_output *output) {
diff --git a/types/wlr_seat.c b/types/wlr_seat.c
index 76b34d31..9de1b3a0 100644
--- a/types/wlr_seat.c
+++ b/types/wlr_seat.c
@@ -284,11 +284,8 @@ static void default_keyboard_key(struct wlr_seat_keyboard_grab *grab,
wlr_seat_keyboard_send_key(grab->seat, time, key, state);
}
-static void default_keyboard_modifiers(struct wlr_seat_keyboard_grab *grab,
- uint32_t mods_depressed, uint32_t mods_latched,
- uint32_t mods_locked, uint32_t group) {
- wlr_seat_keyboard_send_modifiers(grab->seat, mods_depressed,
- mods_latched, mods_locked, group);
+static void default_keyboard_modifiers(struct wlr_seat_keyboard_grab *grab) {
+ wlr_seat_keyboard_send_modifiers(grab->seat);
}
static void default_keyboard_cancel(struct wlr_seat_keyboard_grab *grab) {
@@ -708,24 +705,26 @@ static void keyboard_resource_destroy_notify(struct wl_listener *listener,
wlr_seat_keyboard_clear_focus(state->seat);
}
-void wlr_seat_keyboard_send_modifiers(struct wlr_seat *seat,
- uint32_t mods_depressed, uint32_t mods_latched, uint32_t mods_locked,
- uint32_t group) {
+void wlr_seat_keyboard_send_modifiers(struct wlr_seat *seat) {
struct wlr_seat_client *client = seat->keyboard_state.focused_client;
if (!client || !client->keyboard) {
return;
}
- uint32_t serial = wl_display_next_serial(seat->display);
+ struct wlr_keyboard *keyboard = seat->keyboard_state.keyboard;
+ if (!keyboard) {
+ return;
+ }
+ uint32_t serial = wl_display_next_serial(seat->display);
wl_keyboard_send_modifiers(client->keyboard, serial,
- mods_depressed, mods_latched,
- mods_locked, group);
+ keyboard->modifiers.depressed, keyboard->modifiers.latched,
+ keyboard->modifiers.locked, keyboard->modifiers.group);
}
-void wlr_seat_keyboard_enter(struct wlr_seat *wlr_seat,
+void wlr_seat_keyboard_enter(struct wlr_seat *seat,
struct wlr_surface *surface) {
- if (wlr_seat->keyboard_state.focused_surface == surface) {
+ if (seat->keyboard_state.focused_surface == surface) {
// this surface already got an enter notify
return;
}
@@ -734,71 +733,79 @@ void wlr_seat_keyboard_enter(struct wlr_seat *wlr_seat,
if (surface) {
struct wl_client *wl_client = wl_resource_get_client(surface->resource);
- client = wlr_seat_client_for_wl_client(wlr_seat, wl_client);
+ client = wlr_seat_client_for_wl_client(seat, wl_client);
}
struct wlr_seat_client *focused_client =
- wlr_seat->keyboard_state.focused_client;
+ seat->keyboard_state.focused_client;
struct wlr_surface *focused_surface =
- wlr_seat->keyboard_state.focused_surface;
+ seat->keyboard_state.focused_surface;
// leave the previously entered surface
if (focused_client && focused_client->keyboard && focused_surface) {
- uint32_t serial = wl_display_next_serial(wlr_seat->display);
+ uint32_t serial = wl_display_next_serial(seat->display);
wl_keyboard_send_leave(focused_client->keyboard, serial,
focused_surface->resource);
}
// enter the current surface
- if (client && client->keyboard) {
- // TODO: read the currently pressed keys out of the active keyboard and
- // put them in this array
+ if (client && client->keyboard && seat->keyboard_state.keyboard) {
+ struct wlr_keyboard *keyboard = seat->keyboard_state.keyboard;
+
struct wl_array keys;
wl_array_init(&keys);
- uint32_t serial = wl_display_next_serial(wlr_seat->display);
+ size_t n = 0;
+ for (size_t i = 0; i < WLR_KEYBOARD_KEYS_CAP; ++i) {
+ if (keyboard->keycodes[i] != 0) {
+ wl_array_add(&keys, sizeof(uint32_t));
+ ((uint32_t *)keys.data)[n] = keyboard->keycodes[i];
+ n++;
+ }
+ }
+ uint32_t serial = wl_display_next_serial(seat->display);
wl_keyboard_send_enter(client->keyboard, serial,
surface->resource, &keys);
+ wl_array_release(&keys);
+
+ wlr_seat_keyboard_send_modifiers(seat);
wlr_seat_client_send_selection(client);
}
// reinitialize the focus destroy events
- wl_list_remove(&wlr_seat->keyboard_state.surface_destroy.link);
- wl_list_init(&wlr_seat->keyboard_state.surface_destroy.link);
- wl_list_remove(&wlr_seat->keyboard_state.resource_destroy.link);
- wl_list_init(&wlr_seat->keyboard_state.resource_destroy.link);
+ wl_list_remove(&seat->keyboard_state.surface_destroy.link);
+ wl_list_init(&seat->keyboard_state.surface_destroy.link);
+ wl_list_remove(&seat->keyboard_state.resource_destroy.link);
+ wl_list_init(&seat->keyboard_state.resource_destroy.link);
if (surface) {
wl_signal_add(&surface->events.destroy,
- &wlr_seat->keyboard_state.surface_destroy);
+ &seat->keyboard_state.surface_destroy);
wl_resource_add_destroy_listener(surface->resource,
- &wlr_seat->keyboard_state.resource_destroy);
- wlr_seat->keyboard_state.resource_destroy.notify =
+ &seat->keyboard_state.resource_destroy);
+ seat->keyboard_state.resource_destroy.notify =
keyboard_resource_destroy_notify;
- wlr_seat->keyboard_state.surface_destroy.notify =
+ seat->keyboard_state.surface_destroy.notify =
keyboard_surface_destroy_notify;
}
- wlr_seat->keyboard_state.focused_client = client;
- wlr_seat->keyboard_state.focused_surface = surface;
+ seat->keyboard_state.focused_client = client;
+ seat->keyboard_state.focused_surface = surface;
}
-void wlr_seat_keyboard_notify_enter(struct wlr_seat *wlr_seat, struct
+void wlr_seat_keyboard_notify_enter(struct wlr_seat *seat, struct
wlr_surface *surface) {
- struct wlr_seat_keyboard_grab *grab = wlr_seat->keyboard_state.grab;
+ struct wlr_seat_keyboard_grab *grab = seat->keyboard_state.grab;
grab->interface->enter(grab, surface);
}
-void wlr_seat_keyboard_clear_focus(struct wlr_seat *wlr_seat) {
+void wlr_seat_keyboard_clear_focus(struct wlr_seat *seat) {
struct wl_array keys;
wl_array_init(&keys);
- wlr_seat_keyboard_enter(wlr_seat, NULL);
+ wlr_seat_keyboard_enter(seat, NULL);
}
-void wlr_seat_keyboard_notify_modifiers(struct wlr_seat *seat,
- uint32_t mods_depressed, uint32_t mods_latched, uint32_t mods_locked,
- uint32_t group) {
+void wlr_seat_keyboard_notify_modifiers(struct wlr_seat *seat) {
struct wlr_seat_keyboard_grab *grab = seat->keyboard_state.grab;
- grab->interface->modifiers(grab,
- mods_depressed, mods_latched, mods_locked, group);
+ grab->interface->modifiers(grab);
}
void wlr_seat_keyboard_notify_key(struct wlr_seat *seat, uint32_t time,
diff --git a/types/wlr_surface.c b/types/wlr_surface.c
index 48971849..8cc2aa33 100644
--- a/types/wlr_surface.c
+++ b/types/wlr_surface.c
@@ -649,8 +649,8 @@ void wlr_surface_get_matrix(struct wlr_surface *surface,
float (*matrix)[16],
const float (*projection)[16],
const float (*transform)[16]) {
- int width = surface->texture->width / surface->current->scale;
- int height = surface->texture->height / surface->current->scale;
+ int width = surface->texture->width;
+ int height = surface->texture->height;
float scale[16];
wlr_matrix_identity(matrix);
if (transform) {
@@ -905,3 +905,27 @@ struct wlr_subsurface *wlr_surface_subsurface_at(struct wlr_surface *surface,
return NULL;
}
+
+void wlr_surface_send_enter(struct wlr_surface *surface,
+ struct wlr_output *output) {
+ struct wl_client *client = wl_resource_get_client(surface->resource);
+ struct wl_resource *resource;
+ wl_resource_for_each(resource, &output->wl_resources) {
+ if (client == wl_resource_get_client(resource)) {
+ wl_surface_send_enter(surface->resource, resource);
+ break;
+ }
+ }
+}
+
+void wlr_surface_send_leave(struct wlr_surface *surface,
+ struct wlr_output *output) {
+ struct wl_client *client = wl_resource_get_client(surface->resource);
+ struct wl_resource *resource;
+ wl_resource_for_each(resource, &output->wl_resources) {
+ if (client == wl_resource_get_client(resource)) {
+ wl_surface_send_leave(surface->resource, resource);
+ break;
+ }
+ }
+}
diff --git a/types/wlr_xdg_shell_v6.c b/types/wlr_xdg_shell_v6.c
index c260fd5e..c7917f84 100644
--- a/types/wlr_xdg_shell_v6.c
+++ b/types/wlr_xdg_shell_v6.c
@@ -111,11 +111,8 @@ static void xdg_keyboard_grab_key(struct wlr_seat_keyboard_grab *grab, uint32_t
wlr_seat_keyboard_send_key(grab->seat, time, key, state);
}
-static void xdg_keyboard_grab_modifiers(struct wlr_seat_keyboard_grab *grab,
- uint32_t mods_depressed, uint32_t mods_latched,
- uint32_t mods_locked, uint32_t group) {
- wlr_seat_keyboard_send_modifiers(grab->seat, mods_depressed, mods_latched,
- mods_locked, group);
+static void xdg_keyboard_grab_modifiers(struct wlr_seat_keyboard_grab *grab) {
+ wlr_seat_keyboard_send_modifiers(grab->seat);
}
static void xdg_keyboard_grab_cancel(struct wlr_seat_keyboard_grab *grab) {
generated by cgit v1.2.3 (git 2.39.1) at 2024-09-22 12:34:09 +0000