blankie
/
wlroots
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Add window resizing

This commit is contained in:
Scott Anderson 2017-09-28 22:38:12 +13:00
parent e00b4455fe
commit ce76cfba0f
1 changed files with 55 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

73
backend/x11/backend.c
View File

@ -6,6 +6,7 @@
#include <EGL/egl.h> #include <EGL/egl.h>
#include <wayland-server.h> #include <wayland-server.h>
#include <xcb/xcb.h> #include <xcb/xcb.h>
#include <xcb/glx.h>
#include <X11/Xlib-xcb.h> #include <X11/Xlib-xcb.h>
#include <linux/input-event-codes.h> #include <linux/input-event-codes.h>
#include <wlr/backend/interface.h> #include <wlr/backend/interface.h>
@ -23,22 +24,14 @@ static struct wlr_input_device_impl input_impl;
static struct wlr_keyboard_impl keyboard_impl; static struct wlr_keyboard_impl keyboard_impl;
static struct wlr_pointer_impl pointer_impl; static struct wlr_pointer_impl pointer_impl;
int x11_event(int fd, uint32_t mask, void *data) { void handle_x11_event(struct wlr_x11_backend *x11, xcb_generic_event_t *event) {
struct wlr_x11_backend *x11 = data; struct wlr_x11_output *output = &x11->output;
xcb_generic_event_t *event = xcb_poll_for_event(x11->xcb_conn);
if (!event) {
return 0;
}
struct timespec ts; struct timespec ts;
clock_gettime(CLOCK_MONOTONIC, &ts); clock_gettime(CLOCK_MONOTONIC, &ts);
switch (event->response_type) { switch (event->response_type) {
struct wlr_x11_output *output;
case XCB_EXPOSE: case XCB_EXPOSE:
output = &x11->output;
wl_signal_emit(&output->wlr_output.events.frame, output); wl_signal_emit(&output->wlr_output.events.frame, output);
break; break;
case XCB_KEY_PRESS: { case XCB_KEY_PRESS: {
@ -121,19 +114,62 @@ int x11_event(int fd, uint32_t mask, void *data) {
.time_usec = ts.tv_nsec / 1000, .time_usec = ts.tv_nsec / 1000,
.x_mm = motion->event_x, .x_mm = motion->event_x,
.y_mm = motion->event_y, .y_mm = motion->event_y,
.width_mm = 1024, .width_mm = output->wlr_output.width,
.height_mm = 768, .height_mm = output->wlr_output.height,
}; };
wl_signal_emit(&x11->pointer.events.motion_absolute, &abs); wl_signal_emit(&x11->pointer.events.motion_absolute, &abs);
break; break;
} }
default: case XCB_CONFIGURE_NOTIFY: {
wlr_log(L_INFO, "Unknown event"); xcb_configure_notify_event_t *conf = (xcb_configure_notify_event_t *)event;
output->wlr_output.width = conf->width;
output->wlr_output.height = conf->height;
wlr_output_update_matrix(&output->wlr_output);
wl_signal_emit(&output->wlr_output.events.resolution, output);
// Move the pointer to its new location
xcb_query_pointer_cookie_t cookie =
xcb_query_pointer(x11->xcb_conn, output->win);
xcb_query_pointer_reply_t *pointer =
xcb_query_pointer_reply(x11->xcb_conn, cookie, NULL);
if (!pointer) {
break;
}
struct wlr_event_pointer_motion_absolute abs = {
.device = &x11->pointer_dev,
.time_sec = ts.tv_sec,
.time_usec = ts.tv_nsec / 1000,
.x_mm = pointer->root_x,
.y_mm = pointer->root_y,
.width_mm = output->wlr_output.width,
.height_mm = output->wlr_output.height,
};
wl_signal_emit(&x11->pointer.events.motion_absolute, &abs);
break; break;
} }
case XCB_MAP_NOTIFY:
case XCB_REPARENT_NOTIFY:
case XCB_GLX_GET_CONVOLUTION_FILTER:
break;
default:
wlr_log(L_INFO, "Unknown event: %d", event->response_type);
break;
}
}
int x11_event(int fd, uint32_t mask, void *data) {
struct wlr_x11_backend *x11 = data;
xcb_generic_event_t *e;
while ((e = xcb_poll_for_event(x11->xcb_conn))) {
handle_x11_event(x11, e);
free(e);
}
free(event);
return 0; return 0;
} }
@ -215,9 +251,10 @@ static bool wlr_x11_backend_start(struct wlr_backend *backend) {
uint32_t values[2] = { uint32_t values[2] = {
x11->screen->white_pixel, x11->screen->white_pixel,
XCB_EVENT_MASK_EXPOSURE | XCB_EVENT_MASK_EXPOSURE |
XCB_EVENT_MASK_KEY_PRESS | XCB_EVENT_MASK_KEY_RELEASE | XCB_EVENT_MASK_KEY_PRESS | XCB_EVENT_MASK_KEY_RELEASE |
XCB_EVENT_MASK_BUTTON_PRESS | XCB_EVENT_MASK_BUTTON_RELEASE | XCB_EVENT_MASK_BUTTON_PRESS | XCB_EVENT_MASK_BUTTON_RELEASE |
XCB_EVENT_MASK_POINTER_MOTION XCB_EVENT_MASK_POINTER_MOTION |
XCB_EVENT_MASK_STRUCTURE_NOTIFY
}; };
output->x11 = x11; output->x11 = x11;