mirrors/wlroots
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/wlroots/wlroots.git synced 2025-11-08 13:29:45 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

backend/x11: Revert usage of present extension

Browse source 
This reverts commit 3317134adf.
This reverts commit a3c3b928a3.

There are some serious issues when running this on a real X server, as
opposed to running this on Xwayland, where this was tested.

More investigation needs to be done into why these issues happen and if
our usage of the present extension is correct.
This commit is contained in:
Scott Anderson 2019-11-19 17:37:43 +13:00 • committed by Simon Ser
parent fe72400bad
commit 685a5a11a9
4 changed files with 67 additions and 94 deletions
Download patch file Download diff file Expand all files Collapse all files

11
include/backend/x11.h
View file

@ -6,7 +6,6 @@
#include <X11/Xlib-xcb.h>
#include <wayland-server-core.h>
#include <xcb/xcb.h>
#include <xcb/present.h>
#include <wlr/backend/x11.h>
#include <wlr/config.h>
@ -17,6 +16,8 @@
#define XCB_EVENT_RESPONSE_TYPE_MASK 0x7f
#define X11_DEFAULT_REFRESH (60 * 1000) // 60 Hz
struct wlr_x11_backend;
struct wlr_x11_output {
@ -34,7 +35,8 @@ struct wlr_x11_output {
struct wlr_input_device touch_dev;
struct wl_list touchpoints; // wlr_x11_touchpoint::link
xcb_present_event_t present_context;
struct wl_event_source *frame_timer;
int frame_delay;
bool cursor_hidden;
};
@ -76,7 +78,6 @@ struct wlr_x11_backend {
xcb_timestamp_t time;
uint8_t xinput_opcode;
uint8_t present_opcode;
struct wl_listener display_destroy;
};
@ -96,7 +97,7 @@ void handle_x11_xinput_event(struct wlr_x11_backend *x11,
void update_x11_pointer_position(struct wlr_x11_output *output,
xcb_timestamp_t time);
void handle_x11_present_event(struct wlr_x11_backend *x11,
xcb_present_generic_event_t *ev);
void handle_x11_configure_notify(struct wlr_x11_output *output,
xcb_configure_notify_event_t *event);
#endif