diff options
Diffstat (limited to 'backend')
| -rw-r--r-- | backend/drm/drm.c | 7 | ||||
| -rw-r--r-- | backend/session/direct-ipc.c | 3 | ||||
| -rw-r--r-- | backend/session/logind.c | 5 | ||||
| -rw-r--r-- | backend/session/session.c | 5 |
4 files changed, 12 insertions, 8 deletions
diff --git a/backend/drm/drm.c b/backend/drm/drm.c index 06f012a3..dd5c97f5 100644 --- a/backend/drm/drm.c +++ b/backend/drm/drm.c @@ -543,10 +543,11 @@ static bool wlr_drm_connector_set_cursor(struct wlr_output *output, // OpenGL will read the pixels out upside down, // so we need to flip the image vertically + enum wl_output_transform transform = wlr_output_transform_compose( + wlr_output_transform_invert(output->transform), + WL_OUTPUT_TRANSFORM_FLIPPED_180); wlr_matrix_texture(plane->matrix, plane->surf.width, plane->surf.height, - conn->output.transform ^ WL_OUTPUT_TRANSFORM_FLIPPED_180); - - // TODO the image needs to be rotated depending on the output rotation + transform); plane->wlr_tex = wlr_render_texture_create(plane->surf.renderer->wlr_rend); diff --git a/backend/session/direct-ipc.c b/backend/session/direct-ipc.c index 0ea51e2f..52cdbbb9 100644 --- a/backend/session/direct-ipc.c +++ b/backend/session/direct-ipc.c @@ -18,12 +18,13 @@ #include <linux/major.h> #endif #include <xf86drm.h> +#include "config.h" #include <wlr/util/log.h> #include "backend/session/direct-ipc.h" enum { DRM_MAJOR = 226 }; -#ifdef HAS_LIBCAP +#ifdef WLR_HAS_LIBCAP #include <sys/capability.h> static bool have_permissions(void) { diff --git a/backend/session/logind.c b/backend/session/logind.c index e9d4c8f3..539490de 100644 --- a/backend/session/logind.c +++ b/backend/session/logind.c @@ -10,13 +10,14 @@ #include <sys/stat.h> #include <fcntl.h> #include <wayland-server.h> +#include "config.h" #include <wlr/backend/session/interface.h> #include <wlr/util/log.h> -#ifdef HAS_SYSTEMD +#ifdef WLR_HAS_SYSTEMD #include <systemd/sd-bus.h> #include <systemd/sd-login.h> -#elif HAS_ELOGIND +#elif WLR_HAS_ELOGIND #include <elogind/sd-bus.h> #include <elogind/sd-login.h> #endif diff --git a/backend/session/session.c b/backend/session/session.c index 0ed54499..725aa1b9 100644 --- a/backend/session/session.c +++ b/backend/session/session.c @@ -9,6 +9,7 @@ #include <wayland-server.h> #include <xf86drm.h> #include <xf86drmMode.h> +#include "config.h" #include <wlr/backend/session.h> #include <wlr/backend/session/interface.h> #include <wlr/util/log.h> @@ -17,9 +18,9 @@ extern const struct session_impl session_logind; extern const struct session_impl session_direct; static const struct session_impl *impls[] = { -#ifdef HAS_SYSTEMD +#ifdef WLR_HAS_SYSTEMD &session_logind, -#elif HAS_ELOGIND +#elif WLR_HAS_ELOGIND &session_logind, #endif &session_direct, |