mirror of
https://github.com/hyprwm/wlroots-hyprland.git
synced 2024-11-02 03:45:58 +01:00
Fix time and transform
This commit is contained in:
parent
68c3806377
commit
1b18b0a27d
2 changed files with 12 additions and 4 deletions
|
@ -2,6 +2,7 @@
|
||||||
#include <stdbool.h>
|
#include <stdbool.h>
|
||||||
#include <stdio.h>
|
#include <stdio.h>
|
||||||
#include <stdlib.h>
|
#include <stdlib.h>
|
||||||
|
#include <time.h>
|
||||||
#include <EGL/egl.h>
|
#include <EGL/egl.h>
|
||||||
#include <wayland-server.h>
|
#include <wayland-server.h>
|
||||||
#include <xcb/xcb.h>
|
#include <xcb/xcb.h>
|
||||||
|
@ -53,6 +54,7 @@ static bool handle_x11_event(struct wlr_x11_backend *x11, xcb_generic_event_t *e
|
||||||
};
|
};
|
||||||
|
|
||||||
wl_signal_emit(&x11->keyboard.events.key, &key);
|
wl_signal_emit(&x11->keyboard.events.key, &key);
|
||||||
|
x11->time = ev->time;
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
case XCB_BUTTON_PRESS:
|
case XCB_BUTTON_PRESS:
|
||||||
|
@ -68,6 +70,7 @@ static bool handle_x11_event(struct wlr_x11_backend *x11, xcb_generic_event_t *e
|
||||||
};
|
};
|
||||||
|
|
||||||
wl_signal_emit(&x11->pointer.events.button, &button);
|
wl_signal_emit(&x11->pointer.events.button, &button);
|
||||||
|
x11->time = ev->time;
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
case XCB_MOTION_NOTIFY: {
|
case XCB_MOTION_NOTIFY: {
|
||||||
|
@ -83,6 +86,7 @@ static bool handle_x11_event(struct wlr_x11_backend *x11, xcb_generic_event_t *e
|
||||||
};
|
};
|
||||||
|
|
||||||
wl_signal_emit(&x11->pointer.events.motion_absolute, &abs);
|
wl_signal_emit(&x11->pointer.events.motion_absolute, &abs);
|
||||||
|
x11->time = ev->time;
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
case XCB_CONFIGURE_NOTIFY: {
|
case XCB_CONFIGURE_NOTIFY: {
|
||||||
|
@ -104,8 +108,8 @@ static bool handle_x11_event(struct wlr_x11_backend *x11, xcb_generic_event_t *e
|
||||||
|
|
||||||
struct wlr_event_pointer_motion_absolute abs = {
|
struct wlr_event_pointer_motion_absolute abs = {
|
||||||
.device = &x11->pointer_dev,
|
.device = &x11->pointer_dev,
|
||||||
//.time_sec = ev->time / 1000,
|
.time_sec = x11->time / 1000,
|
||||||
//.time_usec = (ev->time % 1000) * 1000,
|
.time_usec = (x11->time % 1000) * 1000,
|
||||||
.x_mm = pointer->root_x,
|
.x_mm = pointer->root_x,
|
||||||
.y_mm = pointer->root_y,
|
.y_mm = pointer->root_y,
|
||||||
.width_mm = output->wlr_output.width,
|
.width_mm = output->wlr_output.width,
|
||||||
|
@ -293,8 +297,9 @@ static struct wlr_backend_impl backend_impl = {
|
||||||
.get_egl = wlr_x11_backend_get_egl,
|
.get_egl = wlr_x11_backend_get_egl,
|
||||||
};
|
};
|
||||||
|
|
||||||
static void output_transform(struct wlr_output *output, enum wl_output_transform transform) {
|
static void output_transform(struct wlr_output *wlr_output, enum wl_output_transform transform) {
|
||||||
// TODO
|
struct wlr_x11_output *output = (struct wlr_x11_output *)wlr_output;
|
||||||
|
output->wlr_output.transform = transform;
|
||||||
}
|
}
|
||||||
|
|
||||||
static void output_destroy(struct wlr_output *wlr_output) {
|
static void output_destroy(struct wlr_output *wlr_output) {
|
||||||
|
|
|
@ -48,6 +48,9 @@ struct wlr_x11_backend {
|
||||||
struct wlr_x11_atom wm_protocols;
|
struct wlr_x11_atom wm_protocols;
|
||||||
struct wlr_x11_atom wm_delete_window;
|
struct wlr_x11_atom wm_delete_window;
|
||||||
} atoms;
|
} atoms;
|
||||||
|
|
||||||
|
// The time we last received an event
|
||||||
|
xcb_timestamp_t time;
|
||||||
};
|
};
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
Loading…
Reference in a new issue