mirror of
https://github.com/hyprwm/wlroots-hyprland.git
synced 2024-11-26 22:55:58 +01:00
52b058c2a3
Before this commit, the x11 server would fill any exposed area with white before the wlroots x11 backend got a chance to do anything. This was e.g. visible when running rootston and resizing the window: When the window becomes larger, the new area is filled with black. By just not setting a back pixel value, this commit gets rid of this behaviour. Signed-off-by: Uli Schlachter <psychon@znc.in>
178 lines
5.7 KiB
C
178 lines
5.7 KiB
C
#include <assert.h>
|
|
#include <stdlib.h>
|
|
#include <wlr/interfaces/wlr_output.h>
|
|
#include <wlr/util/log.h>
|
|
#include "backend/x11.h"
|
|
#include "util/signal.h"
|
|
|
|
static int signal_frame(void *data) {
|
|
struct wlr_x11_output *output = data;
|
|
wlr_output_send_frame(&output->wlr_output);
|
|
wl_event_source_timer_update(output->frame_timer, output->frame_delay);
|
|
return 0;
|
|
}
|
|
|
|
static void parse_xcb_setup(struct wlr_output *output, xcb_connection_t *xcb_conn) {
|
|
const xcb_setup_t *xcb_setup = xcb_get_setup(xcb_conn);
|
|
|
|
snprintf(output->make, sizeof(output->make), "%.*s",
|
|
xcb_setup_vendor_length(xcb_setup),
|
|
xcb_setup_vendor(xcb_setup));
|
|
snprintf(output->model, sizeof(output->model), "%"PRIu16".%"PRIu16,
|
|
xcb_setup->protocol_major_version,
|
|
xcb_setup->protocol_minor_version);
|
|
}
|
|
|
|
static void output_set_refresh(struct wlr_output *wlr_output, int32_t refresh) {
|
|
struct wlr_x11_output *output = (struct wlr_x11_output *)wlr_output;
|
|
|
|
if (refresh <= 0) {
|
|
refresh = X11_DEFAULT_REFRESH;
|
|
}
|
|
|
|
wlr_output_update_custom_mode(&output->wlr_output, wlr_output->width,
|
|
wlr_output->height, refresh);
|
|
|
|
output->frame_delay = 1000000 / refresh;
|
|
}
|
|
|
|
static bool output_set_custom_mode(struct wlr_output *wlr_output,
|
|
int32_t width, int32_t height, int32_t refresh) {
|
|
struct wlr_x11_output *output = (struct wlr_x11_output *)wlr_output;
|
|
struct wlr_x11_backend *x11 = output->x11;
|
|
|
|
output_set_refresh(&output->wlr_output, refresh);
|
|
|
|
const uint32_t values[] = { width, height };
|
|
xcb_configure_window(x11->xcb_conn, output->win,
|
|
XCB_CONFIG_WINDOW_WIDTH | XCB_CONFIG_WINDOW_HEIGHT, values);
|
|
return true;
|
|
}
|
|
|
|
static void output_transform(struct wlr_output *wlr_output,
|
|
enum wl_output_transform transform) {
|
|
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) {
|
|
struct wlr_x11_output *output = (struct wlr_x11_output *)wlr_output;
|
|
struct wlr_x11_backend *x11 = output->x11;
|
|
|
|
wl_list_remove(&output->link);
|
|
wl_event_source_remove(output->frame_timer);
|
|
eglDestroySurface(x11->egl.display, output->surf);
|
|
xcb_destroy_window(x11->xcb_conn, output->win);
|
|
xcb_flush(x11->xcb_conn);
|
|
free(output);
|
|
}
|
|
|
|
static bool output_make_current(struct wlr_output *wlr_output, int *buffer_age) {
|
|
struct wlr_x11_output *output = (struct wlr_x11_output *)wlr_output;
|
|
struct wlr_x11_backend *x11 = output->x11;
|
|
|
|
return wlr_egl_make_current(&x11->egl, output->surf, buffer_age);
|
|
}
|
|
|
|
static bool output_swap_buffers(struct wlr_output *wlr_output,
|
|
pixman_region32_t *damage) {
|
|
struct wlr_x11_output *output = (struct wlr_x11_output *)wlr_output;
|
|
struct wlr_x11_backend *x11 = output->x11;
|
|
|
|
return wlr_egl_swap_buffers(&x11->egl, output->surf, damage);
|
|
}
|
|
|
|
static const struct wlr_output_impl output_impl = {
|
|
.set_custom_mode = output_set_custom_mode,
|
|
.transform = output_transform,
|
|
.destroy = output_destroy,
|
|
.make_current = output_make_current,
|
|
.swap_buffers = output_swap_buffers,
|
|
};
|
|
|
|
struct wlr_output *wlr_x11_output_create(struct wlr_backend *backend) {
|
|
assert(wlr_backend_is_x11(backend));
|
|
struct wlr_x11_backend *x11 = (struct wlr_x11_backend *)backend;
|
|
|
|
if (!x11->started) {
|
|
++x11->requested_outputs;
|
|
return NULL;
|
|
}
|
|
|
|
struct wlr_x11_output *output = calloc(1, sizeof(struct wlr_x11_output));
|
|
if (output == NULL) {
|
|
return NULL;
|
|
}
|
|
output->x11 = x11;
|
|
|
|
struct wlr_output *wlr_output = &output->wlr_output;
|
|
wlr_output_init(wlr_output, &x11->backend, &output_impl, x11->wl_display);
|
|
|
|
output_set_refresh(&output->wlr_output, 0);
|
|
|
|
snprintf(wlr_output->name, sizeof(wlr_output->name), "X11-%d",
|
|
wl_list_length(&x11->outputs) + 1);
|
|
parse_xcb_setup(wlr_output, x11->xcb_conn);
|
|
|
|
uint32_t mask = XCB_CW_EVENT_MASK;
|
|
uint32_t values[] = {
|
|
XCB_EVENT_MASK_EXPOSURE |
|
|
XCB_EVENT_MASK_KEY_PRESS | XCB_EVENT_MASK_KEY_RELEASE |
|
|
XCB_EVENT_MASK_BUTTON_PRESS | XCB_EVENT_MASK_BUTTON_RELEASE |
|
|
XCB_EVENT_MASK_POINTER_MOTION |
|
|
XCB_EVENT_MASK_STRUCTURE_NOTIFY
|
|
};
|
|
output->win = xcb_generate_id(x11->xcb_conn);
|
|
xcb_create_window(x11->xcb_conn, XCB_COPY_FROM_PARENT, output->win,
|
|
x11->screen->root, 0, 0, 1024, 768, 1, XCB_WINDOW_CLASS_INPUT_OUTPUT,
|
|
x11->screen->root_visual, mask, values);
|
|
|
|
output->surf = wlr_egl_create_surface(&x11->egl, &output->win);
|
|
if (!output->surf) {
|
|
wlr_log(L_ERROR, "Failed to create EGL surface");
|
|
free(output);
|
|
return NULL;
|
|
}
|
|
|
|
xcb_change_property(x11->xcb_conn, XCB_PROP_MODE_REPLACE, output->win,
|
|
x11->atoms.wm_protocols, XCB_ATOM_ATOM, 32, 1,
|
|
&x11->atoms.wm_delete_window);
|
|
|
|
char title[32];
|
|
if (snprintf(title, sizeof(title), "wlroots - %s", wlr_output->name)) {
|
|
xcb_change_property(x11->xcb_conn, XCB_PROP_MODE_REPLACE, output->win,
|
|
x11->atoms.net_wm_name, x11->atoms.utf8_string, 8,
|
|
strlen(title), title);
|
|
}
|
|
|
|
uint32_t cursor_values[] = { x11->cursor };
|
|
xcb_change_window_attributes(x11->xcb_conn, output->win, XCB_CW_CURSOR,
|
|
cursor_values);
|
|
|
|
xcb_map_window(x11->xcb_conn, output->win);
|
|
xcb_flush(x11->xcb_conn);
|
|
|
|
struct wl_event_loop *ev = wl_display_get_event_loop(x11->wl_display);
|
|
output->frame_timer = wl_event_loop_add_timer(ev, signal_frame, output);
|
|
|
|
wl_event_source_timer_update(output->frame_timer, output->frame_delay);
|
|
wlr_output_update_enabled(wlr_output, true);
|
|
|
|
wl_list_insert(&x11->outputs, &output->link);
|
|
wlr_signal_emit_safe(&x11->backend.events.new_output, wlr_output);
|
|
|
|
return wlr_output;
|
|
}
|
|
|
|
void x11_output_handle_configure_notify(struct wlr_x11_output *output,
|
|
xcb_configure_notify_event_t *ev) {
|
|
wlr_output_update_custom_mode(&output->wlr_output, ev->width,
|
|
ev->height, output->wlr_output.refresh);
|
|
|
|
// Move the pointer to its new location
|
|
x11_update_pointer_position(output, output->x11->time);
|
|
}
|
|
|
|
bool wlr_output_is_x11(struct wlr_output *wlr_output) {
|
|
return wlr_output->impl == &output_impl;
|
|
}
|