hyprwm/wlroots-hyprland
1
0
Fork 0
mirror of https://github.com/hyprwm/wlroots-hyprland.git synced 2024-11-26 14:45:58 +01:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'master' into fullscreen

Browse source
This commit is contained in:
emersion 2017-11-21 18:34:12 +01:00
commit dcb168914e
No known key found for this signature in database
GPG key ID: 0FDE7BE0E88F5E48
19 changed files with 335 additions and 216 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
backend/libinput/backend.c
View file

@ -69,9 +69,9 @@ static bool wlr_libinput_backend_start(struct wlr_backend *_backend) {
no_devs = NULL; no_devs = NULL;
} }
} }
if (!no_devs && backend->wlr_device_lists->length == 0) { if (!no_devs && backend->wlr_device_lists.length == 0) {
wlr_libinput_readable(libinput_fd, WL_EVENT_READABLE, backend); wlr_libinput_readable(libinput_fd, WL_EVENT_READABLE, backend);
if (backend->wlr_device_lists->length == 0) { if (backend->wlr_device_lists.length == 0) {
wlr_log(L_ERROR, "libinput initialization failed, no input devices"); wlr_log(L_ERROR, "libinput initialization failed, no input devices");
wlr_log(L_ERROR, "Set WLR_LIBINPUT_NO_DEVICES=1 to suppress this check"); wlr_log(L_ERROR, "Set WLR_LIBINPUT_NO_DEVICES=1 to suppress this check");
return false; return false;
@ -97,9 +97,10 @@ static void wlr_libinput_backend_destroy(struct wlr_backend *_backend) {
if (!_backend) { if (!_backend) {
return; return;
} }
struct wlr_libinput_backend *backend = (struct wlr_libinput_backend *)_backend; struct wlr_libinput_backend *backend =
for (size_t i = 0; i < backend->wlr_device_lists->length; i++) { (struct wlr_libinput_backend *)_backend;
struct wl_list *wlr_devices = backend->wlr_device_lists->items[i]; for (size_t i = 0; i < backend->wlr_device_lists.length; i++) {
struct wl_list *wlr_devices = backend->wlr_device_lists.items[i];
struct wlr_input_device *wlr_dev, *next; struct wlr_input_device *wlr_dev, *next;
wl_list_for_each_safe(wlr_dev, next, wlr_devices, link) { wl_list_for_each_safe(wlr_dev, next, wlr_devices, link) {
wl_signal_emit(&backend->backend.events.input_remove, wlr_dev); wl_signal_emit(&backend->backend.events.input_remove, wlr_dev);
@ -107,7 +108,7 @@ static void wlr_libinput_backend_destroy(struct wlr_backend *_backend) {
} }
free(wlr_devices); free(wlr_devices);
} }
wlr_list_free(backend->wlr_device_lists); wlr_list_finish(&backend->wlr_device_lists);
wl_event_source_remove(backend->input_event); wl_event_source_remove(backend->input_event);
libinput_unref(backend->libinput_context); libinput_unref(backend->libinput_context);
free(backend); free(backend);
@ -148,7 +149,7 @@ struct wlr_backend *wlr_libinput_backend_create(struct wl_display *display,
} }
wlr_backend_init(&backend->backend, &backend_impl); wlr_backend_init(&backend->backend, &backend_impl);
if (!(backend->wlr_device_lists = wlr_list_create())) { if (!wlr_list_init(&backend->wlr_device_lists)) {
wlr_log(L_ERROR, "Allocation failed: %s", strerror(errno)); wlr_log(L_ERROR, "Allocation failed: %s", strerror(errno));
goto error_backend; goto error_backend;
} }

8
backend/libinput/events.c
View file

@ -147,7 +147,7 @@ static void handle_device_added(struct wlr_libinput_backend *backend,
if (wl_list_length(wlr_devices) > 0) { if (wl_list_length(wlr_devices) > 0) {
libinput_device_set_user_data(libinput_dev, wlr_devices); libinput_device_set_user_data(libinput_dev, wlr_devices);
wlr_list_add(backend->wlr_device_lists, wlr_devices); wlr_list_push(&backend->wlr_device_lists, wlr_devices);
} else { } else {
free(wlr_devices); free(wlr_devices);
} }
@ -177,9 +177,9 @@ static void handle_device_removed(struct wlr_libinput_backend *backend,
wl_signal_emit(&backend->backend.events.input_remove, dev); wl_signal_emit(&backend->backend.events.input_remove, dev);
wlr_input_device_destroy(dev); wlr_input_device_destroy(dev);
} }
for (size_t i = 0; i < backend->wlr_device_lists->length; i++) { for (size_t i = 0; i < backend->wlr_device_lists.length; i++) {
if (backend->wlr_device_lists->items[i] == wlr_devices) { if (backend->wlr_device_lists.items[i] == wlr_devices) {
wlr_list_del(backend->wlr_device_lists, i); wlr_list_del(&backend->wlr_device_lists, i);
break; break;
} }
} }

33
examples/pointer.c
View file

@ -46,7 +46,7 @@ struct sample_state {
struct wl_listener touch_up; struct wl_listener touch_up;
struct wl_listener touch_down; struct wl_listener touch_down;
struct wl_listener touch_cancel; struct wl_listener touch_cancel;
struct wlr_list *touch_points; struct wl_list touch_points;
struct wl_listener tablet_tool_axis; struct wl_listener tablet_tool_axis;
struct wl_listener tablet_tool_proxmity; struct wl_listener tablet_tool_proxmity;
@ -57,22 +57,25 @@ struct sample_state {
struct touch_point { struct touch_point {
int32_t touch_id; int32_t touch_id;
double x, y; double x, y;
struct wl_list link;
}; };
static void warp_to_touch(struct sample_state *sample, static void warp_to_touch(struct sample_state *sample,
struct wlr_input_device *dev) { struct wlr_input_device *dev) {
if (sample->touch_points->length == 0) { if (wl_list_empty(&sample->touch_points)) {
return; return;
} }
double x = 0, y = 0; double x = 0, y = 0;
for (size_t i = 0; i < sample->touch_points->length; ++i) { size_t n = 0;
struct touch_point *point = sample->touch_points->items[i]; struct touch_point *point;
wl_list_for_each(point, &sample->touch_points, link) {
x += point->x; x += point->x;
y += point->y; y += point->y;
n++;
} }
x /= sample->touch_points->length; x /= n;
y /= sample->touch_points->length; y /= n;
wlr_cursor_warp_absolute(sample->cursor, dev, x, y); wlr_cursor_warp_absolute(sample->cursor, dev, x, y);
} }
@ -197,10 +200,11 @@ static void handle_cursor_axis(struct wl_listener *listener, void *data) {
static void handle_touch_up(struct wl_listener *listener, void *data) { static void handle_touch_up(struct wl_listener *listener, void *data) {
struct sample_state *sample = wl_container_of(listener, sample, touch_up); struct sample_state *sample = wl_container_of(listener, sample, touch_up);
struct wlr_event_touch_up *event = data; struct wlr_event_touch_up *event = data;
for (size_t i = 0; i < sample->touch_points->length; ++i) {
struct touch_point *point = sample->touch_points->items[i]; struct touch_point *point, *tmp;
wl_list_for_each_safe(point, tmp, &sample->touch_points, link) {
if (point->touch_id == event->touch_id) { if (point->touch_id == event->touch_id) {
wlr_list_del(sample->touch_points, i); wl_list_remove(&point->link);
break; break;
} }
} }
@ -215,9 +219,7 @@ static void handle_touch_down(struct wl_listener *listener, void *data) {
point->touch_id = event->touch_id; point->touch_id = event->touch_id;
point->x = event->x_mm / event->width_mm; point->x = event->x_mm / event->width_mm;
point->y = event->y_mm / event->height_mm; point->y = event->y_mm / event->height_mm;
if (wlr_list_add(sample->touch_points, point) == -1) { wl_list_insert(&sample->touch_points, &point->link);
free(point);
}
warp_to_touch(sample, event->device); warp_to_touch(sample, event->device);
} }
@ -226,8 +228,9 @@ static void handle_touch_motion(struct wl_listener *listener, void *data) {
struct sample_state *sample = struct sample_state *sample =
wl_container_of(listener, sample, touch_motion); wl_container_of(listener, sample, touch_motion);
struct wlr_event_touch_motion *event = data; struct wlr_event_touch_motion *event = data;
for (size_t i = 0; i < sample->touch_points->length; ++i) {
struct touch_point *point = sample->touch_points->items[i]; struct touch_point *point;
wl_list_for_each(point, &sample->touch_points, link) {
if (point->touch_id == event->touch_id) { if (point->touch_id == event->touch_id) {
point->x = event->x_mm / event->width_mm; point->x = event->x_mm / event->width_mm;
point->y = event->y_mm / event->height_mm; point->y = event->y_mm / event->height_mm;
@ -257,7 +260,6 @@ int main(int argc, char *argv[]) {
struct sample_state state = { struct sample_state state = {
.default_color = { 0.25f, 0.25f, 0.25f, 1 }, .default_color = { 0.25f, 0.25f, 0.25f, 1 },
.clear_color = { 0.25f, 0.25f, 0.25f, 1 }, .clear_color = { 0.25f, 0.25f, 0.25f, 1 },
.touch_points = wlr_list_create(),
}; };
state.config = parse_args(argc, argv); state.config = parse_args(argc, argv);
@ -266,6 +268,7 @@ int main(int argc, char *argv[]) {
wlr_cursor_attach_output_layout(state.cursor, state.layout); wlr_cursor_attach_output_layout(state.cursor, state.layout);
wlr_cursor_map_to_region(state.cursor, state.config->cursor.mapped_box); wlr_cursor_map_to_region(state.cursor, state.config->cursor.mapped_box);
wl_list_init(&state.devices); wl_list_init(&state.devices);
wl_list_init(&state.touch_points);
// pointer events // pointer events
wl_signal_add(&state.cursor->events.motion, &state.cursor_motion); wl_signal_add(&state.cursor->events.motion, &state.cursor_motion);

27
examples/touch.c
View file

@ -24,12 +24,13 @@
struct sample_state { struct sample_state {
struct wlr_renderer *renderer; struct wlr_renderer *renderer;
struct wlr_texture *cat_texture; struct wlr_texture *cat_texture;
struct wlr_list *touch_points; struct wl_list touch_points;
}; };
struct touch_point { struct touch_point {
int32_t touch_id; int32_t touch_id;
double x, y; double x, y;
struct wl_list link;
}; };
static void handle_output_frame(struct output_state *output, struct timespec *ts) { static void handle_output_frame(struct output_state *output, struct timespec *ts) {
@ -44,8 +45,8 @@ static void handle_output_frame(struct output_state *output, struct timespec *ts
wlr_renderer_begin(sample->renderer, wlr_output); wlr_renderer_begin(sample->renderer, wlr_output);
float matrix[16]; float matrix[16];
for (size_t i = 0; i < sample->touch_points->length; ++i) { struct touch_point *p;
struct touch_point *p = sample->touch_points->items[i]; wl_list_for_each(p, &sample->touch_points, link) {
wlr_texture_get_matrix(sample->cat_texture, &matrix, wlr_texture_get_matrix(sample->cat_texture, &matrix,
&wlr_output->transform_matrix, &wlr_output->transform_matrix,
(int)(p->x * width) - sample->cat_texture->width / 2, (int)(p->x * width) - sample->cat_texture->width / 2,
@ -65,17 +66,15 @@ static void handle_touch_down(struct touch_state *tstate, int32_t touch_id,
point->touch_id = touch_id; point->touch_id = touch_id;
point->x = x / width; point->x = x / width;
point->y = y / height; point->y = y / height;
if (wlr_list_add(sample->touch_points, point) == -1) { wl_list_insert(&sample->touch_points, &point->link);
free(point);
}
} }
static void handle_touch_up(struct touch_state *tstate, int32_t touch_id) { static void handle_touch_up(struct touch_state *tstate, int32_t touch_id) {
struct sample_state *sample = tstate->compositor->data; struct sample_state *sample = tstate->compositor->data;
for (size_t i = 0; i < sample->touch_points->length; ++i) { struct touch_point *point, *tmp;
struct touch_point *point = sample->touch_points->items[i]; wl_list_for_each_safe(point, tmp, &sample->touch_points, link) {
if (point->touch_id == touch_id) { if (point->touch_id == touch_id) {
wlr_list_del(sample->touch_points, i); wl_list_remove(&point->link);
break; break;
} }
} }
@ -84,8 +83,8 @@ static void handle_touch_up(struct touch_state *tstate, int32_t touch_id) {
static void handle_touch_motion(struct touch_state *tstate, int32_t touch_id, static void handle_touch_motion(struct touch_state *tstate, int32_t touch_id,
double x, double y, double width, double height) { double x, double y, double width, double height) {
struct sample_state *sample = tstate->compositor->data; struct sample_state *sample = tstate->compositor->data;
for (size_t i = 0; i < sample->touch_points->length; ++i) { struct touch_point *point;
struct touch_point *point = sample->touch_points->items[i]; wl_list_for_each(point, &sample->touch_points, link) {
if (point->touch_id == touch_id) { if (point->touch_id == touch_id) {
point->x = x / width; point->x = x / width;
point->y = y / height; point->y = y / height;
@ -95,9 +94,9 @@ static void handle_touch_motion(struct touch_state *tstate, int32_t touch_id,
} }
int main(int argc, char *argv[]) { int main(int argc, char *argv[]) {
struct sample_state state = { struct sample_state state;
.touch_points = wlr_list_create() wl_list_init(&state.touch_points);
};
struct compositor_state compositor = { 0, struct compositor_state compositor = { 0,
.data = &state, .data = &state,
.output_frame_cb = handle_output_frame, .output_frame_cb = handle_output_frame,

1
include/backend/drm/drm.h
View file

@ -14,7 +14,6 @@
#include <wlr/backend/drm.h> #include <wlr/backend/drm.h>
#include <wlr/types/wlr_output.h> #include <wlr/types/wlr_output.h>
#include <wlr/render/egl.h> #include <wlr/render/egl.h>
#include <wlr/types/wlr_list.h>
#include "iface.h" #include "iface.h"
#include "properties.h" #include "properties.h"

2
include/backend/libinput.h
View file

@ -18,7 +18,7 @@ struct wlr_libinput_backend {
struct wl_listener session_signal; struct wl_listener session_signal;
struct wlr_list *wlr_device_lists; struct wlr_list wlr_device_lists; // list of struct wl_list
}; };
struct wlr_libinput_input_device { struct wlr_libinput_input_device {

10
include/rootston/view.h
View file

@ -28,6 +28,8 @@ struct roots_xdg_surface_v6 {
struct wl_listener request_resize; struct wl_listener request_resize;
struct wl_listener request_maximize; struct wl_listener request_maximize;
struct wl_listener request_fullscreen; struct wl_listener request_fullscreen;
uint32_t pending_move_resize_configure_serial;
}; };
struct roots_xwayland_surface { struct roots_xwayland_surface {
@ -41,6 +43,8 @@ struct roots_xwayland_surface {
struct wl_listener request_fullscreen; struct wl_listener request_fullscreen;
struct wl_listener map_notify; struct wl_listener map_notify;
struct wl_listener unmap_notify; struct wl_listener unmap_notify;
struct wl_listener surface_commit;
}; };
enum roots_view_type { enum roots_view_type {
@ -64,6 +68,12 @@ struct roots_view {
float rotation; float rotation;
} saved; } saved;
struct {
bool update_x, update_y;
double x, y;
uint32_t width, height;
} pending_move_resize;
// TODO: Something for roots-enforced width/height // TODO: Something for roots-enforced width/height
enum roots_view_type type; enum roots_view_type type;
union { union {

73
include/wlr/types/wlr_list.h
View file

@ -2,6 +2,7 @@
#define WLR_UTIL_LIST_H #define WLR_UTIL_LIST_H
#include <stddef.h> #include <stddef.h>
#include <stdbool.h>
struct wlr_list { struct wlr_list {
size_t capacity; size_t capacity;
@ -10,51 +11,65 @@ struct wlr_list {
}; };
/** /**
* Creates a new list, may return `NULL` on failure * Initialize a list. Returns true on success, false on failure.
*/ */
struct wlr_list *wlr_list_create(void); bool wlr_list_init(struct wlr_list *list);
void wlr_list_free(struct wlr_list *list);
void wlr_list_foreach(struct wlr_list *list, void (*callback)(void *item)); /**
* Deinitialize a list.
*/
void wlr_list_finish(struct wlr_list *list);
/**
* Executes `callback` on each element in the list.
*/
void wlr_list_for_each(struct wlr_list *list, void (*callback)(void *item));
/** /**
* Add `item` to the end of a list. * Add `item` to the end of a list.
* Returns: new list length or `-1` on failure * Returns: new list length or `-1` on failure.
*/ */
int wlr_list_add(struct wlr_list *list, void *item); ssize_t wlr_list_push(struct wlr_list *list, void *item);
/** /**
* Add `item` to the end of a list. * Place `item` into index `index` in the list.
* Returns: new list length or `-1` on failure * Returns: new list length or `-1` on failure.
*/ */
int wlr_list_push(struct wlr_list *list, void *item); ssize_t wlr_list_insert(struct wlr_list *list, size_t index, void *item);
/** /**
* Place `item` into index `index` in the list * Remove an item from the list.
* Returns: new list length or `-1` on failure
*/
int wlr_list_insert(struct wlr_list *list, size_t index, void *item);
/**
* Remove an item from the list
*/ */
void wlr_list_del(struct wlr_list *list, size_t index); void wlr_list_del(struct wlr_list *list, size_t index);
/** /**
* Remove and return an item from the end of the list * Remove and return an item from the end of the list.
*/ */
void *wlr_list_pop(struct wlr_list *list); void *wlr_list_pop(struct wlr_list *list);
/** /**
* Get a reference to the last item of a list without removal * Get a reference to the last item of a list without removal.
*/ */
void *wlr_list_peek(struct wlr_list *list); void *wlr_list_peek(struct wlr_list *list);
/** /**
* Append each item in `source` to `list` * Append each item in `source` to `list`.
* Does not modify `source` * Does not modify `source`.
* Returns: new list length or `-1` on failure * Returns: new list length or `-1` on failure.
*/ */
int wlr_list_cat(struct wlr_list *list, struct wlr_list *source); ssize_t wlr_list_cat(struct wlr_list *list, const struct wlr_list *source);
// See qsort. Remember to use *_qsort functions as compare functions,
// because they dereference the left and right arguments first! /**
void wlr_list_qsort(struct wlr_list *list, int compare(const void *left, const void *right)); * Sort a list using `qsort`.
// Return index for first item in list that returns 0 for given compare */
// function or -1 if none matches. void wlr_list_qsort(struct wlr_list *list,
int wlr_list_seq_find(struct wlr_list *list, int compare(const void *left, const void *right));
int compare(const void *item, const void *cmp_to),
const void *cmp_to); /**
* Return the index of the first item in the list that returns 0 for the given
* `compare` function, or -1 if none matches.
*/
ssize_t wlr_list_find(struct wlr_list *list,
int compare(const void *item, const void *cmp_to), const void *cmp_to);
#endif #endif

25
include/wlr/types/wlr_xdg_shell_v6.h
View file

@ -107,7 +107,9 @@ struct wlr_xdg_surface_v6 {
bool configured; bool configured;
bool added; bool added;
uint32_t configure_serial;
struct wl_event_source *configure_idle; struct wl_event_source *configure_idle;
uint32_t configure_next_serial;
struct wl_list configure_list; struct wl_list configure_list;
char *title; char *title;
@ -123,7 +125,6 @@ struct wlr_xdg_surface_v6 {
struct { struct {
struct wl_signal commit; struct wl_signal commit;
struct wl_signal destroy; struct wl_signal destroy;
struct wl_signal ack_configure;
struct wl_signal ping_timeout; struct wl_signal ping_timeout;
struct wl_signal request_maximize; struct wl_signal request_maximize;
@ -173,37 +174,38 @@ void wlr_xdg_shell_v6_destroy(struct wlr_xdg_shell_v6 *xdg_shell);
void wlr_xdg_surface_v6_ping(struct wlr_xdg_surface_v6 *surface); void wlr_xdg_surface_v6_ping(struct wlr_xdg_surface_v6 *surface);
/** /**
* Request that this toplevel surface be the given size. * Request that this toplevel surface be the given size. Returns the associated
* configure serial.
*/ */
void wlr_xdg_toplevel_v6_set_size(struct wlr_xdg_surface_v6 *surface, uint32_t wlr_xdg_toplevel_v6_set_size(struct wlr_xdg_surface_v6 *surface,
uint32_t width, uint32_t height); uint32_t width, uint32_t height);
/** /**
* Request that this toplevel surface show itself in an activated or deactivated * Request that this toplevel surface show itself in an activated or deactivated
* state. * state. Returns the associated configure serial.
*/ */
void wlr_xdg_toplevel_v6_set_activated(struct wlr_xdg_surface_v6 *surface, uint32_t wlr_xdg_toplevel_v6_set_activated(struct wlr_xdg_surface_v6 *surface,
bool activated); bool activated);
/** /**
* Request that this toplevel surface consider itself maximized or not * Request that this toplevel surface consider itself maximized or not
* maximized. * maximized. Returns the associated configure serial.
*/ */
void wlr_xdg_toplevel_v6_set_maximized(struct wlr_xdg_surface_v6 *surface, uint32_t wlr_xdg_toplevel_v6_set_maximized(struct wlr_xdg_surface_v6 *surface,
bool maximized); bool maximized);
/** /**
* Request that this toplevel surface consider itself fullscreen or not * Request that this toplevel surface consider itself fullscreen or not
* fullscreen. * fullscreen. Returns the associated configure serial.
*/ */
void wlr_xdg_toplevel_v6_set_fullscreen(struct wlr_xdg_surface_v6 *surface, uint32_t wlr_xdg_toplevel_v6_set_fullscreen(struct wlr_xdg_surface_v6 *surface,
bool fullscreen); bool fullscreen);
/** /**
* Request that this toplevel surface consider itself to be resizing or not * Request that this toplevel surface consider itself to be resizing or not
* resizing. * resizing. Returns the associated configure serial.
*/ */
void wlr_xdg_toplevel_v6_set_resizing(struct wlr_xdg_surface_v6 *surface, uint32_t wlr_xdg_toplevel_v6_set_resizing(struct wlr_xdg_surface_v6 *surface,
bool resizing); bool resizing);
/** /**
@ -225,4 +227,5 @@ void wlr_xdg_surface_v6_popup_get_position(struct wlr_xdg_surface_v6 *surface,
struct wlr_xdg_surface_v6 *wlr_xdg_surface_v6_popup_at( struct wlr_xdg_surface_v6 *wlr_xdg_surface_v6_popup_at(
struct wlr_xdg_surface_v6 *surface, double sx, double sy, struct wlr_xdg_surface_v6 *surface, double sx, double sy,
double *popup_sx, double *popup_sy); double *popup_sx, double *popup_sy);
#endif #endif

2
include/wlr/xwayland.h
View file

@ -5,7 +5,6 @@
#include <stdbool.h> #include <stdbool.h>
#include <wlr/types/wlr_compositor.h> #include <wlr/types/wlr_compositor.h>
#include <xcb/xcb.h> #include <xcb/xcb.h>
#include <wlr/types/wlr_list.h>
#ifdef HAS_XCB_ICCCM #ifdef HAS_XCB_ICCCM
#include <xcb/xcb_icccm.h> #include <xcb/xcb_icccm.h>
@ -86,7 +85,6 @@ struct wlr_xwayland_surface {
char *class; char *class;
char *instance; char *instance;
struct wlr_xwayland_surface *parent; struct wlr_xwayland_surface *parent;
struct wlr_list *state; // list of xcb_atom_t
pid_t pid; pid_t pid;
xcb_atom_t *window_type; xcb_atom_t *window_type;

32
rootston/cursor.c
View file

@ -71,43 +71,37 @@ static void roots_cursor_update_position(struct roots_cursor *cursor,
if (view != NULL) { if (view != NULL) {
double dx = cursor->cursor->x - cursor->offs_x; double dx = cursor->cursor->x - cursor->offs_x;
double dy = cursor->cursor->y - cursor->offs_y; double dy = cursor->cursor->y - cursor->offs_y;
double active_x = view->x; double x = view->x;
double active_y = view->y; double y = view->y;
int width = cursor->view_width; int width = cursor->view_width;
int height = cursor->view_height; int height = cursor->view_height;
if (cursor->resize_edges & ROOTS_CURSOR_RESIZE_EDGE_TOP) { if (cursor->resize_edges & ROOTS_CURSOR_RESIZE_EDGE_TOP) {
active_y = cursor->view_y + dy; y = cursor->view_y + dy;
height -= dy; height -= dy;
if (height < 0) { if (height < 1) {
active_y += height; y += height;
} }
} else if (cursor->resize_edges & ROOTS_CURSOR_RESIZE_EDGE_BOTTOM) { } else if (cursor->resize_edges & ROOTS_CURSOR_RESIZE_EDGE_BOTTOM) {
height += dy; height += dy;
} }
if (cursor->resize_edges & ROOTS_CURSOR_RESIZE_EDGE_LEFT) { if (cursor->resize_edges & ROOTS_CURSOR_RESIZE_EDGE_LEFT) {
active_x = cursor->view_x + dx; x = cursor->view_x + dx;
width -= dx; width -= dx;
if (width < 0) { if (width < 1) {
active_x += width; x += width;
} }
} else if (cursor->resize_edges & ROOTS_CURSOR_RESIZE_EDGE_RIGHT) { } else if (cursor->resize_edges & ROOTS_CURSOR_RESIZE_EDGE_RIGHT) {
width += dx; width += dx;
} }
if (width < 0) { if (width < 1) {
width = 0; width = 1;
} }
if (height < 0) { if (height < 1) {
height = 0; height = 1;
} }
if (active_x != view->x || view_move_resize(view, x, y, width, height);
active_y != view->y) {
view_move_resize(view, active_x, active_y,
width, height);
} else {
view_resize(view, width, height);
}
} }
break; break;
case ROOTS_CURSOR_ROTATE: case ROOTS_CURSOR_ROTATE:

15
rootston/desktop.c
View file

@ -85,12 +85,25 @@ void view_resize(struct roots_view *view, uint32_t width, uint32_t height) {
void view_move_resize(struct roots_view *view, double x, double y, void view_move_resize(struct roots_view *view, double x, double y,
uint32_t width, uint32_t height) { uint32_t width, uint32_t height) {
bool update_x = x != view->x;
bool update_y = y != view->y;
if (!update_x && !update_y) {
view_resize(view, width, height);
return;
}
if (view->move_resize) { if (view->move_resize) {
view->move_resize(view, x, y, width, height); view->move_resize(view, x, y, width, height);
return; return;
} }
view_move(view, x, y); view->pending_move_resize.update_x = update_x;
view->pending_move_resize.update_y = update_y;
view->pending_move_resize.x = x;
view->pending_move_resize.y = y;
view->pending_move_resize.width = width;
view->pending_move_resize.height = height;
view_resize(view, width, height); view_resize(view, width, height);
} }

19
rootston/wl_shell.c
View file

@ -84,7 +84,24 @@ static void handle_set_state(struct wl_listener *listener, void *data) {
} }
static void handle_surface_commit(struct wl_listener *listener, void *data) { static void handle_surface_commit(struct wl_listener *listener, void *data) {
// TODO do we need to do anything here? struct roots_wl_shell_surface *roots_surface =
wl_container_of(listener, roots_surface, surface_commit);
struct roots_view *view = roots_surface->view;
struct wlr_surface *wlr_surface = view->wlr_surface;
int width = wlr_surface->current->width;
int height = wlr_surface->current->height;
if (view->pending_move_resize.update_x) {
view->x = view->pending_move_resize.x +
view->pending_move_resize.width - width;
view->pending_move_resize.update_x = false;
}
if (view->pending_move_resize.update_y) {
view->y = view->pending_move_resize.y +
view->pending_move_resize.height - height;
view->pending_move_resize.update_y = false;
}
} }
static void handle_destroy(struct wl_listener *listener, void *data) { static void handle_destroy(struct wl_listener *listener, void *data) {

106
rootston/xdg_shell_v6.c
View file

@ -12,11 +12,11 @@
static void get_size(const 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); assert(view->type == ROOTS_XDG_SHELL_V6_VIEW);
struct wlr_xdg_surface_v6 *surf = view->xdg_surface_v6; struct wlr_xdg_surface_v6 *surface = view->xdg_surface_v6;
if (surf->geometry->width > 0 && surf->geometry->height > 0) { if (surface->geometry->width > 0 && surface->geometry->height > 0) {
box->width = surf->geometry->width; box->width = surface->geometry->width;
box->height = surf->geometry->height; box->height = surface->geometry->height;
} else { } else {
box->width = view->wlr_surface->current->width; box->width = view->wlr_surface->current->width;
box->height = view->wlr_surface->current->height; box->height = view->wlr_surface->current->height;
@ -25,20 +25,19 @@ static void get_size(const struct roots_view *view, struct wlr_box *box) {
static void activate(struct roots_view *view, bool active) { static void activate(struct roots_view *view, bool active) {
assert(view->type == ROOTS_XDG_SHELL_V6_VIEW); assert(view->type == ROOTS_XDG_SHELL_V6_VIEW);
struct wlr_xdg_surface_v6 *surf = view->xdg_surface_v6; struct wlr_xdg_surface_v6 *surface = view->xdg_surface_v6;
if (surf->role == WLR_XDG_SURFACE_V6_ROLE_TOPLEVEL) { if (surface->role == WLR_XDG_SURFACE_V6_ROLE_TOPLEVEL) {
wlr_xdg_toplevel_v6_set_activated(surf, active); wlr_xdg_toplevel_v6_set_activated(surface, active);
} }
} }
static void apply_size_constraints(struct wlr_xdg_surface_v6 *surf, static void apply_size_constraints(struct wlr_xdg_surface_v6 *surface,
uint32_t width, uint32_t height, uint32_t *dest_width, uint32_t width, uint32_t height, uint32_t *dest_width,
uint32_t *dest_height) { uint32_t *dest_height) {
*dest_width = width; *dest_width = width;
*dest_height = height; *dest_height = height;
struct wlr_xdg_toplevel_v6_state *state = struct wlr_xdg_toplevel_v6_state *state = &surface->toplevel_state->current;
&surf->toplevel_state->current;
if (width < state->min_width) { if (width < state->min_width) {
*dest_width = state->min_width; *dest_width = state->min_width;
} else if (state->max_width > 0 && } else if (state->max_width > 0 &&
@ -55,39 +54,57 @@ static void apply_size_constraints(struct wlr_xdg_surface_v6 *surf,
static void resize(struct roots_view *view, uint32_t width, uint32_t height) { static void resize(struct roots_view *view, uint32_t width, uint32_t height) {
assert(view->type == ROOTS_XDG_SHELL_V6_VIEW); assert(view->type == ROOTS_XDG_SHELL_V6_VIEW);
struct wlr_xdg_surface_v6 *surf = view->xdg_surface_v6; struct wlr_xdg_surface_v6 *surface = view->xdg_surface_v6;
if (surf->role != WLR_XDG_SURFACE_V6_ROLE_TOPLEVEL) { if (surface->role != WLR_XDG_SURFACE_V6_ROLE_TOPLEVEL) {
return; return;
} }
uint32_t contrained_width, contrained_height; uint32_t constrained_width, constrained_height;
apply_size_constraints(surf, width, height, &contrained_width, apply_size_constraints(surface, width, height, &constrained_width,
&contrained_height); &constrained_height);
wlr_xdg_toplevel_v6_set_size(surf, contrained_width, contrained_height); wlr_xdg_toplevel_v6_set_size(surface, constrained_width,
constrained_height);
} }
static void move_resize(struct roots_view *view, double x, double y, static void move_resize(struct roots_view *view, double x, double y,
uint32_t width, uint32_t height) { uint32_t width, uint32_t height) {
assert(view->type == ROOTS_XDG_SHELL_V6_VIEW); assert(view->type == ROOTS_XDG_SHELL_V6_VIEW);
struct wlr_xdg_surface_v6 *surf = view->xdg_surface_v6; struct roots_xdg_surface_v6 *roots_surface = view->roots_xdg_surface_v6;
if (surf->role != WLR_XDG_SURFACE_V6_ROLE_TOPLEVEL) { struct wlr_xdg_surface_v6 *surface = view->xdg_surface_v6;
if (surface->role != WLR_XDG_SURFACE_V6_ROLE_TOPLEVEL) {
return; return;
} }
uint32_t contrained_width, contrained_height; bool update_x = x != view->x;
apply_size_constraints(surf, width, height, &contrained_width, bool update_y = y != view->y;
&contrained_height);
x = x + width - contrained_width; uint32_t constrained_width, constrained_height;
y = y + height - contrained_height; apply_size_constraints(surface, width, height, &constrained_width,
&constrained_height);
// TODO: we should wait for an ack_configure event before updating the if (update_x) {
// position x = x + width - constrained_width;
}
if (update_y) {
y = y + height - constrained_height;
}
view->pending_move_resize.update_x = update_x;
view->pending_move_resize.update_y = update_y;
view->pending_move_resize.x = x;
view->pending_move_resize.y = y;
view->pending_move_resize.width = constrained_width;
view->pending_move_resize.height = constrained_height;
uint32_t serial = wlr_xdg_toplevel_v6_set_size(surface, constrained_width,
constrained_height);
if (serial > 0) {
roots_surface->pending_move_resize_configure_serial = serial;
} else {
view->x = x; view->x = x;
view->y = y; view->y = y;
}
wlr_xdg_toplevel_v6_set_size(surf, contrained_width, contrained_height);
} }
static void maximize(struct roots_view *view, bool maximized) { static void maximize(struct roots_view *view, bool maximized) {
@ -112,9 +129,9 @@ static void set_fullscreen(struct roots_view *view, bool fullscreen) {
static void close(struct roots_view *view) { static void close(struct roots_view *view) {
assert(view->type == ROOTS_XDG_SHELL_V6_VIEW); assert(view->type == ROOTS_XDG_SHELL_V6_VIEW);
struct wlr_xdg_surface_v6 *surf = view->xdg_surface_v6; struct wlr_xdg_surface_v6 *surface = view->xdg_surface_v6;
if (surf->role == WLR_XDG_SURFACE_V6_ROLE_TOPLEVEL) { if (surface->role == WLR_XDG_SURFACE_V6_ROLE_TOPLEVEL) {
wlr_xdg_toplevel_v6_send_close(surf); wlr_xdg_toplevel_v6_send_close(surface);
} }
} }
@ -176,11 +193,30 @@ static void handle_request_fullscreen(struct wl_listener *listener,
} }
static void handle_commit(struct wl_listener *listener, void *data) { static void handle_commit(struct wl_listener *listener, void *data) {
//struct roots_xdg_surface_v6 *roots_xdg_surface = struct roots_xdg_surface_v6 *roots_surface =
// wl_container_of(listener, roots_xdg_surface, commit); wl_container_of(listener, roots_surface, commit);
//struct roots_view *view = roots_xdg_surface->view; struct roots_view *view = roots_surface->view;
//struct wlr_xdg_surface_v6 *surface = view->xdg_surface_v6; struct wlr_xdg_surface_v6 *surface = view->xdg_surface_v6;
// TODO
uint32_t pending_serial =
roots_surface->pending_move_resize_configure_serial;
if (pending_serial > 0 && pending_serial >= surface->configure_serial) {
struct wlr_box size;
get_size(view, &size);
if (view->pending_move_resize.update_x) {
view->x = view->pending_move_resize.x +
view->pending_move_resize.width - size.width;
}
if (view->pending_move_resize.update_y) {
view->y = view->pending_move_resize.y +
view->pending_move_resize.height - size.height;
}
if (pending_serial == surface->configure_serial) {
roots_surface->pending_move_resize_configure_serial = 0;
}
}
} }
static void handle_destroy(struct wl_listener *listener, void *data) { static void handle_destroy(struct wl_listener *listener, void *data) {

68
rootston/xwayland.c
View file

@ -52,13 +52,13 @@ static void resize(struct roots_view *view, uint32_t width, uint32_t height) {
assert(view->type == ROOTS_XWAYLAND_VIEW); assert(view->type == ROOTS_XWAYLAND_VIEW);
struct wlr_xwayland_surface *xwayland_surface = view->xwayland_surface; struct wlr_xwayland_surface *xwayland_surface = view->xwayland_surface;
uint32_t contrained_width, contrained_height; uint32_t constrained_width, constrained_height;
apply_size_constraints(xwayland_surface, width, height, &contrained_width, apply_size_constraints(xwayland_surface, width, height, &constrained_width,
&contrained_height); &constrained_height);
wlr_xwayland_surface_configure(view->desktop->xwayland, xwayland_surface, wlr_xwayland_surface_configure(view->desktop->xwayland, xwayland_surface,
xwayland_surface->x, xwayland_surface->y, contrained_width, xwayland_surface->x, xwayland_surface->y, constrained_width,
contrained_height); constrained_height);
} }
static void move_resize(struct roots_view *view, double x, double y, static void move_resize(struct roots_view *view, double x, double y,
@ -66,18 +66,29 @@ static void move_resize(struct roots_view *view, double x, double y,
assert(view->type == ROOTS_XWAYLAND_VIEW); assert(view->type == ROOTS_XWAYLAND_VIEW);
struct wlr_xwayland_surface *xwayland_surface = view->xwayland_surface; struct wlr_xwayland_surface *xwayland_surface = view->xwayland_surface;
uint32_t contrained_width, contrained_height; bool update_x = x != view->x;
apply_size_constraints(xwayland_surface, width, height, &contrained_width, bool update_y = y != view->y;
&contrained_height);
x = x + width - contrained_width; uint32_t constrained_width, constrained_height;
y = y + height - contrained_height; apply_size_constraints(xwayland_surface, width, height, &constrained_width,
&constrained_height);
view->x = x; if (update_x) {
view->y = y; x = x + width - constrained_width;
}
if (update_y) {
y = y + height - constrained_height;
}
view->pending_move_resize.update_x = update_x;
view->pending_move_resize.update_y = update_y;
view->pending_move_resize.x = x;
view->pending_move_resize.y = y;
view->pending_move_resize.width = constrained_width;
view->pending_move_resize.height = constrained_height;
wlr_xwayland_surface_configure(view->desktop->xwayland, xwayland_surface, wlr_xwayland_surface_configure(view->desktop->xwayland, xwayland_surface,
x, y, contrained_width, contrained_height); x, y, constrained_width, constrained_height);
} }
static void close(struct roots_view *view) { static void close(struct roots_view *view) {
@ -192,6 +203,27 @@ static void handle_request_fullscreen(struct wl_listener *listener,
view_set_fullscreen(view, xwayland_surface->fullscreen, NULL); view_set_fullscreen(view, xwayland_surface->fullscreen, NULL);
} }
static void handle_surface_commit(struct wl_listener *listener, void *data) {
struct roots_xwayland_surface *roots_surface =
wl_container_of(listener, roots_surface, surface_commit);
struct roots_view *view = roots_surface->view;
struct wlr_surface *wlr_surface = view->wlr_surface;
int width = wlr_surface->current->width;
int height = wlr_surface->current->height;
if (view->pending_move_resize.update_x) {
view->x = view->pending_move_resize.x +
view->pending_move_resize.width - width;
view->pending_move_resize.update_x = false;
}
if (view->pending_move_resize.update_y) {
view->y = view->pending_move_resize.y +
view->pending_move_resize.height - height;
view->pending_move_resize.update_y = false;
}
}
static void handle_map_notify(struct wl_listener *listener, void *data) { static void handle_map_notify(struct wl_listener *listener, void *data) {
struct roots_xwayland_surface *roots_surface = struct roots_xwayland_surface *roots_surface =
wl_container_of(listener, roots_surface, map_notify); wl_container_of(listener, roots_surface, map_notify);
@ -203,6 +235,10 @@ static void handle_map_notify(struct wl_listener *listener, void *data) {
view->x = (double)xsurface->x; view->x = (double)xsurface->x;
view->y = (double)xsurface->y; view->y = (double)xsurface->y;
roots_surface->surface_commit.notify = handle_surface_commit;
wl_signal_add(&xsurface->surface->events.commit,
&roots_surface->surface_commit);
wl_list_insert(&desktop->views, &view->link); wl_list_insert(&desktop->views, &view->link);
} }
@ -211,6 +247,8 @@ static void handle_unmap_notify(struct wl_listener *listener, void *data) {
wl_container_of(listener, roots_surface, unmap_notify); wl_container_of(listener, roots_surface, unmap_notify);
roots_surface->view->wlr_surface = NULL; roots_surface->view->wlr_surface = NULL;
wl_list_remove(&roots_surface->surface_commit.link);
wl_list_remove(&roots_surface->view->link); wl_list_remove(&roots_surface->view->link);
} }
@ -249,6 +287,10 @@ void handle_xwayland_surface(struct wl_listener *listener, void *data) {
wl_signal_add(&surface->events.request_fullscreen, wl_signal_add(&surface->events.request_fullscreen,
&roots_surface->request_fullscreen); &roots_surface->request_fullscreen);
roots_surface->surface_commit.notify = handle_surface_commit;
wl_signal_add(&surface->surface->events.commit,
&roots_surface->surface_commit);
struct roots_view *view = calloc(1, sizeof(struct roots_view)); struct roots_view *view = calloc(1, sizeof(struct roots_view));
if (view == NULL) { if (view == NULL) {
free(roots_surface); free(roots_surface);

64
types/wlr_list.c
View file

@ -3,26 +3,23 @@
#include <stdbool.h> #include <stdbool.h>
#include <string.h> #include <string.h>
#include <stddef.h> #include <stddef.h>
#include <sys/types.h>
#include <wlr/types/wlr_list.h> #include <wlr/types/wlr_list.h>
struct wlr_list *wlr_list_create(void) { bool wlr_list_init(struct wlr_list *list) {
struct wlr_list *list = malloc(sizeof(struct wlr_list));
if (!list) {
return NULL;
}
list->capacity = 10; list->capacity = 10;
list->length = 0; list->length = 0;
list->items = malloc(sizeof(void *) * list->capacity); list->items = malloc(sizeof(void *) * list->capacity);
if (!list->items) { if (list->items == NULL) {
free(list); return false;
return NULL;
} }
return list; return true;
} }
static bool list_resize(struct wlr_list *list) { static bool list_resize(struct wlr_list *list) {
if (list->length == list->capacity) { if (list->length == list->capacity) {
void *new_items = realloc(list->items, sizeof(void*) * (list->capacity + 10)); void *new_items = realloc(list->items,
sizeof(void *) * (list->capacity + 10));
if (!new_items) { if (!new_items) {
return false; return false;
} }
@ -32,24 +29,17 @@ static bool list_resize(struct wlr_list *list) {
return true; return true;
} }
void wlr_list_free(struct wlr_list *list) { void wlr_list_finish(struct wlr_list *list) {
if (list == NULL) {
return;
}
free(list->items); free(list->items);
free(list);
} }
void wlr_list_foreach(struct wlr_list *list, void (*callback)(void *item)) { void wlr_list_for_each(struct wlr_list *list, void (*callback)(void *item)) {
if (list == NULL || callback == NULL) {
return;
}
for (size_t i = 0; i < list->length; i++) { for (size_t i = 0; i < list->length; i++) {
callback(list->items[i]); callback(list->items[i]);
} }
} }
int wlr_list_add(struct wlr_list *list, void *item) { ssize_t wlr_list_push(struct wlr_list *list, void *item) {
if (!list_resize(list)) { if (!list_resize(list)) {
return -1; return -1;
} }
@ -57,15 +47,12 @@ int wlr_list_add(struct wlr_list *list, void *item) {
return list->length; return list->length;
} }
int wlr_list_push(struct wlr_list *list, void *item) { ssize_t wlr_list_insert(struct wlr_list *list, size_t index, void *item) {
return wlr_list_add(list, item);
}
int wlr_list_insert(struct wlr_list *list, size_t index, void *item) {
if (!list_resize(list)) { if (!list_resize(list)) {
return -1; return -1;
} }
memmove(&list->items[index + 1], &list->items[index], sizeof(void*) * (list->length - index)); memmove(&list->items[index + 1], &list->items[index],
sizeof(void *) * (list->length - index));
list->length++; list->length++;
list->items[index] = item; list->items[index] = item;
return list->length; return list->length;
@ -73,24 +60,31 @@ int wlr_list_insert(struct wlr_list *list, size_t index, void *item) {
void wlr_list_del(struct wlr_list *list, size_t index) { void wlr_list_del(struct wlr_list *list, size_t index) {
list->length--; list->length--;
memmove(&list->items[index], &list->items[index + 1], sizeof(void*) * (list->length - index)); memmove(&list->items[index], &list->items[index + 1],
sizeof(void *) * (list->length - index));
} }
void *wlr_list_pop(struct wlr_list *list) { void *wlr_list_pop(struct wlr_list *list) {
void *_ = list->items[list->length - 1]; if (list->length == 0) {
return NULL;
}
void *last = list->items[list->length - 1];
wlr_list_del(list, list->length - 1); wlr_list_del(list, list->length - 1);
return _; return last;
} }
void *wlr_list_peek(struct wlr_list *list) { void *wlr_list_peek(struct wlr_list *list) {
if (list->length == 0) {
return NULL;
}
return list->items[list->length - 1]; return list->items[list->length - 1];
} }
int wlr_list_cat(struct wlr_list *list, struct wlr_list *source) { ssize_t wlr_list_cat(struct wlr_list *list, const struct wlr_list *source) {
size_t old_len = list->length; size_t old_len = list->length;
size_t i; size_t i;
for (i = 0; i < source->length; ++i) { for (i = 0; i < source->length; ++i) {
if (wlr_list_add(list, source->items[i]) == -1) { if (wlr_list_push(list, source->items[i]) == -1) {
list->length = old_len; list->length = old_len;
return -1; return -1;
} }
@ -98,13 +92,13 @@ int wlr_list_cat(struct wlr_list *list, struct wlr_list *source) {
return list->length; return list->length;
} }
void wlr_list_qsort(struct wlr_list *list, int compare(const void *left, const void *right)) { void wlr_list_qsort(struct wlr_list *list,
int compare(const void *left, const void *right)) {
qsort(list->items, list->length, sizeof(void *), compare); qsort(list->items, list->length, sizeof(void *), compare);
} }
int wlr_list_seq_find(struct wlr_list *list, ssize_t wlr_list_find(struct wlr_list *list,
int compare(const void *item, const void *data), int compare(const void *item, const void *data), const void *data) {
const void *data) {
for (size_t i = 0; i < list->length; i++) { for (size_t i = 0; i < list->length; i++) {
void *item = list->items[i]; void *item = list->items[i];
if (compare(item, data) == 0) { if (compare(item, data) == 0) {

1
types/wlr_output.c
View file

@ -9,7 +9,6 @@
#include <wlr/types/wlr_output.h> #include <wlr/types/wlr_output.h>
#include <wlr/types/wlr_surface.h> #include <wlr/types/wlr_surface.h>
#include <wlr/interfaces/wlr_output.h> #include <wlr/interfaces/wlr_output.h>
#include <wlr/types/wlr_list.h>
#include <wlr/util/log.h> #include <wlr/util/log.h>
#include <GLES2/gl2.h> #include <GLES2/gl2.h>
#include <wlr/render/matrix.h> #include <wlr/render/matrix.h>

43
types/wlr_xdg_shell_v6.c
View file

@ -809,8 +809,7 @@ static void xdg_surface_ack_configure(struct wl_client *client,
} }
surface->configured = true; surface->configured = true;
surface->configure_serial = serial;
wl_signal_emit(&surface->events.ack_configure, surface);
free(configure); free(configure);
} }
@ -938,7 +937,6 @@ static void wlr_xdg_toplevel_v6_send_configure(
static void wlr_xdg_surface_send_configure(void *user_data) { static void wlr_xdg_surface_send_configure(void *user_data) {
struct wlr_xdg_surface_v6 *surface = user_data; struct wlr_xdg_surface_v6 *surface = user_data;
struct wl_display *display = wl_client_get_display(surface->client->client);
surface->configure_idle = NULL; surface->configure_idle = NULL;
@ -950,7 +948,7 @@ static void wlr_xdg_surface_send_configure(void *user_data) {
} }
wl_list_insert(surface->configure_list.prev, &configure->link); wl_list_insert(surface->configure_list.prev, &configure->link);
configure->serial = wl_display_next_serial(display); configure->serial = surface->configure_next_serial;
switch (surface->role) { switch (surface->role) {
case WLR_XDG_SURFACE_V6_ROLE_NONE: case WLR_XDG_SURFACE_V6_ROLE_NONE:
@ -971,7 +969,7 @@ static void wlr_xdg_surface_send_configure(void *user_data) {
zxdg_surface_v6_send_configure(surface->resource, configure->serial); zxdg_surface_v6_send_configure(surface->resource, configure->serial);
} }
static void wlr_xdg_surface_v6_schedule_configure( static uint32_t wlr_xdg_surface_v6_schedule_configure(
struct wlr_xdg_surface_v6 *surface) { struct wlr_xdg_surface_v6 *surface) {
struct wl_display *display = wl_client_get_display(surface->client->client); struct wl_display *display = wl_client_get_display(surface->client->client);
struct wl_event_loop *loop = wl_display_get_event_loop(display); struct wl_event_loop *loop = wl_display_get_event_loop(display);
@ -992,23 +990,23 @@ static void wlr_xdg_surface_v6_schedule_configure(
if (surface->configure_idle != NULL) { if (surface->configure_idle != NULL) {
if (!pending_same) { if (!pending_same) {
// configure request already scheduled // configure request already scheduled
return; return surface->configure_next_serial;
} }
// configure request not necessary anymore // configure request not necessary anymore
wl_event_source_remove(surface->configure_idle); wl_event_source_remove(surface->configure_idle);
surface->configure_idle = NULL; surface->configure_idle = NULL;
return 0;
} else { } else {
if (pending_same) { if (pending_same) {
// configure request not necessary // configure request not necessary
return; return 0;
} }
surface->configure_idle = surface->configure_next_serial = wl_display_next_serial(display);
wl_event_loop_add_idle( surface->configure_idle = wl_event_loop_add_idle(loop,
loop, wlr_xdg_surface_send_configure, surface);
wlr_xdg_surface_send_configure, return surface->configure_next_serial;
surface);
} }
} }
@ -1152,7 +1150,6 @@ static void xdg_shell_get_xdg_surface(struct wl_client *wl_client,
wl_signal_init(&surface->events.request_show_window_menu); wl_signal_init(&surface->events.request_show_window_menu);
wl_signal_init(&surface->events.commit); wl_signal_init(&surface->events.commit);
wl_signal_init(&surface->events.destroy); wl_signal_init(&surface->events.destroy);
wl_signal_init(&surface->events.ack_configure);
wl_signal_init(&surface->events.ping_timeout); wl_signal_init(&surface->events.ping_timeout);
wl_signal_add(&surface->surface->events.destroy, wl_signal_add(&surface->surface->events.destroy,
@ -1301,45 +1298,45 @@ void wlr_xdg_surface_v6_ping(struct wlr_xdg_surface_v6 *surface) {
surface->client->ping_serial); surface->client->ping_serial);
} }
void wlr_xdg_toplevel_v6_set_size(struct wlr_xdg_surface_v6 *surface, uint32_t wlr_xdg_toplevel_v6_set_size(struct wlr_xdg_surface_v6 *surface,
uint32_t width, uint32_t height) { uint32_t width, uint32_t height) {
assert(surface->role == WLR_XDG_SURFACE_V6_ROLE_TOPLEVEL); assert(surface->role == WLR_XDG_SURFACE_V6_ROLE_TOPLEVEL);
surface->toplevel_state->pending.width = width; surface->toplevel_state->pending.width = width;
surface->toplevel_state->pending.height = height; surface->toplevel_state->pending.height = height;
wlr_xdg_surface_v6_schedule_configure(surface); return wlr_xdg_surface_v6_schedule_configure(surface);
} }
void wlr_xdg_toplevel_v6_set_activated(struct wlr_xdg_surface_v6 *surface, uint32_t wlr_xdg_toplevel_v6_set_activated(struct wlr_xdg_surface_v6 *surface,
bool activated) { bool activated) {
assert(surface->role == WLR_XDG_SURFACE_V6_ROLE_TOPLEVEL); assert(surface->role == WLR_XDG_SURFACE_V6_ROLE_TOPLEVEL);
surface->toplevel_state->pending.activated = activated; surface->toplevel_state->pending.activated = activated;
wlr_xdg_surface_v6_schedule_configure(surface); return wlr_xdg_surface_v6_schedule_configure(surface);
} }
void wlr_xdg_toplevel_v6_set_maximized(struct wlr_xdg_surface_v6 *surface, uint32_t wlr_xdg_toplevel_v6_set_maximized(struct wlr_xdg_surface_v6 *surface,
bool maximized) { bool maximized) {
assert(surface->role == WLR_XDG_SURFACE_V6_ROLE_TOPLEVEL); assert(surface->role == WLR_XDG_SURFACE_V6_ROLE_TOPLEVEL);
surface->toplevel_state->pending.maximized = maximized; surface->toplevel_state->pending.maximized = maximized;
wlr_xdg_surface_v6_schedule_configure(surface); return wlr_xdg_surface_v6_schedule_configure(surface);
} }
void wlr_xdg_toplevel_v6_set_fullscreen(struct wlr_xdg_surface_v6 *surface, uint32_t wlr_xdg_toplevel_v6_set_fullscreen(struct wlr_xdg_surface_v6 *surface,
bool fullscreen) { bool fullscreen) {
assert(surface->role == WLR_XDG_SURFACE_V6_ROLE_TOPLEVEL); assert(surface->role == WLR_XDG_SURFACE_V6_ROLE_TOPLEVEL);
surface->toplevel_state->pending.fullscreen = fullscreen; surface->toplevel_state->pending.fullscreen = fullscreen;
wlr_xdg_surface_v6_schedule_configure(surface); return wlr_xdg_surface_v6_schedule_configure(surface);
} }
void wlr_xdg_toplevel_v6_set_resizing(struct wlr_xdg_surface_v6 *surface, uint32_t wlr_xdg_toplevel_v6_set_resizing(struct wlr_xdg_surface_v6 *surface,
bool resizing) { bool resizing) {
assert(surface->role == WLR_XDG_SURFACE_V6_ROLE_TOPLEVEL); assert(surface->role == WLR_XDG_SURFACE_V6_ROLE_TOPLEVEL);
surface->toplevel_state->pending.resizing = resizing; surface->toplevel_state->pending.resizing = resizing;
wlr_xdg_surface_v6_schedule_configure(surface); return wlr_xdg_surface_v6_schedule_configure(surface);
} }
void wlr_xdg_toplevel_v6_send_close(struct wlr_xdg_surface_v6 *surface) { void wlr_xdg_toplevel_v6_send_close(struct wlr_xdg_surface_v6 *surface) {

1
xwayland/xwm.c
View file

@ -218,7 +218,6 @@ static void wlr_xwayland_surface_destroy(
free(xsurface->title); free(xsurface->title);
free(xsurface->class); free(xsurface->class);
free(xsurface->instance); free(xsurface->instance);
wlr_list_free(xsurface->state);
free(xsurface->window_type); free(xsurface->window_type);
free(xsurface->protocols); free(xsurface->protocols);
free(xsurface->hints); free(xsurface->hints);