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 pull request #815 from emersion/fix-backend-timer-refresh

Browse source 
backend/{x11,headless}: fix refresh rate
This commit is contained in:
Drew DeVault 2018-04-03 23:00:23 -04:00 committed by GitHub
commit 60519951e0
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 24 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
backend/headless/output.c
View file

@ -25,6 +25,10 @@ static bool output_set_custom_mode(struct wlr_output *wlr_output, int32_t width,
(struct wlr_headless_output *)wlr_output; (struct wlr_headless_output *)wlr_output;
struct wlr_headless_backend *backend = output->backend; struct wlr_headless_backend *backend = output->backend;
if (refresh == 0) {
refresh = HEADLESS_DEFAULT_REFRESH;
}
if (output->egl_surface) { if (output->egl_surface) {
eglDestroySurface(backend->egl.display, output->egl_surface); eglDestroySurface(backend->egl.display, output->egl_surface);
} }
@ -114,7 +118,7 @@ struct wlr_output *wlr_headless_add_output(struct wlr_backend *wlr_backend,
goto error; goto error;
} }
output_set_custom_mode(wlr_output, width, height, 60*1000); output_set_custom_mode(wlr_output, width, height, 0);
strncpy(wlr_output->make, "headless", sizeof(wlr_output->make)); strncpy(wlr_output->make, "headless", sizeof(wlr_output->make));
strncpy(wlr_output->model, "headless", sizeof(wlr_output->model)); strncpy(wlr_output->model, "headless", sizeof(wlr_output->model));
snprintf(wlr_output->name, sizeof(wlr_output->name), "HEADLESS-%d", snprintf(wlr_output->name, sizeof(wlr_output->name), "HEADLESS-%d",

20
backend/x11/output.c
View file

@ -23,14 +23,25 @@ static void parse_xcb_setup(struct wlr_output *output, xcb_connection_t *xcb_con
xcb_setup->protocol_minor_version); xcb_setup->protocol_minor_version);
} }
static bool output_set_custom_mode(struct wlr_output *wlr_output, int32_t width, static void output_set_refresh(struct wlr_output *wlr_output, int32_t refresh) {
int32_t height, int32_t refresh) {
struct wlr_x11_output *output = (struct wlr_x11_output *)wlr_output; struct wlr_x11_output *output = (struct wlr_x11_output *)wlr_output;
struct wlr_x11_backend *x11 = output->x11;
if (refresh == 0) {
refresh = X11_DEFAULT_REFRESH;
}
wlr_output_update_custom_mode(&output->wlr_output, wlr_output->width, wlr_output_update_custom_mode(&output->wlr_output, wlr_output->width,
wlr_output->height, refresh); wlr_output->height, refresh);
output->frame_delay = 1000000 / 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 }; const uint32_t values[] = { width, height };
xcb_configure_window(x11->xcb_conn, output->win, xcb_configure_window(x11->xcb_conn, output->win,
@ -97,8 +108,7 @@ struct wlr_output *wlr_x11_output_create(struct wlr_backend *backend) {
struct wlr_output *wlr_output = &output->wlr_output; struct wlr_output *wlr_output = &output->wlr_output;
wlr_output_init(wlr_output, &x11->backend, &output_impl, x11->wl_display); wlr_output_init(wlr_output, &x11->backend, &output_impl, x11->wl_display);
wlr_output->refresh = 60 * 1000000; output_set_refresh(&output->wlr_output, 0);
output->frame_delay = 16; // 60 Hz
snprintf(wlr_output->name, sizeof(wlr_output->name), "X11-%d", snprintf(wlr_output->name, sizeof(wlr_output->name), "X11-%d",
wl_list_length(&x11->outputs) + 1); wl_list_length(&x11->outputs) + 1);

2
include/backend/headless.h
View file

@ -4,6 +4,8 @@
#include <wlr/backend/headless.h> #include <wlr/backend/headless.h>
#include <wlr/backend/interface.h> #include <wlr/backend/interface.h>
#define HEADLESS_DEFAULT_REFRESH (60 * 1000) // 60 Hz
struct wlr_headless_backend { struct wlr_headless_backend {
struct wlr_backend backend; struct wlr_backend backend;
struct wlr_egl egl; struct wlr_egl egl;

2
include/backend/x11.h
View file

@ -12,6 +12,8 @@
#define XCB_EVENT_RESPONSE_TYPE_MASK 0x7f #define XCB_EVENT_RESPONSE_TYPE_MASK 0x7f
#define X11_DEFAULT_REFRESH (60 * 1000) // 60 Hz
struct wlr_x11_backend; struct wlr_x11_backend;
struct wlr_x11_output { struct wlr_x11_output {