aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--backend/drm/drm.c7
-rw-r--r--backend/session/direct-ipc.c3
-rw-r--r--backend/session/logind.c5
-rw-r--r--backend/session/session.c5
-rw-r--r--examples/support/config.c2
-rw-r--r--include/rootston/desktop.h3
-rw-r--r--include/rootston/server.h3
-rw-r--r--include/rootston/view.h5
-rw-r--r--include/wlr/types/wlr_output.h15
-rw-r--r--include/wlr/xwayland.h3
-rw-r--r--meson.build12
-rw-r--r--rootston/config.c1
-rw-r--r--rootston/desktop.c3
-rw-r--r--rootston/keyboard.c2
-rw-r--r--rootston/main.c3
-rw-r--r--rootston/seat.c1
-rw-r--r--rootston/xwayland.c3
-rw-r--r--types/wlr_output.c21
-rw-r--r--types/wlr_xdg_shell_v6.c1
-rw-r--r--xwayland/xwm.c7
20 files changed, 73 insertions, 32 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,
diff --git a/examples/support/config.c b/examples/support/config.c
index 0ef025c0..ff63b078 100644
--- a/examples/support/config.c
+++ b/examples/support/config.c
@@ -7,10 +7,10 @@
#include <string.h>
#include <unistd.h>
#include <sys/param.h>
+#include "config.h"
#include <wlr/util/log.h>
#include <wlr/types/wlr_box.h>
#include "shared.h"
-#include "config.h"
#include "ini.h"
static void usage(const char *name, int ret) {
diff --git a/include/rootston/desktop.h b/include/rootston/desktop.h
index 289875c5..7039cfcf 100644
--- a/include/rootston/desktop.h
+++ b/include/rootston/desktop.h
@@ -2,6 +2,7 @@
#define _ROOTSTON_DESKTOP_H
#include <time.h>
#include <wayland-server.h>
+#include "config.h"
#include <wlr/types/wlr_output.h>
#include <wlr/types/wlr_output_layout.h>
#include <wlr/types/wlr_compositor.h>
@@ -50,7 +51,7 @@ struct roots_desktop {
struct wl_listener wl_shell_surface;
struct wl_listener decoration_new;
-#ifdef HAS_XWAYLAND
+#ifdef WLR_HAS_XWAYLAND
struct wlr_xwayland *xwayland;
struct wl_listener xwayland_surface;
struct wl_listener xwayland_ready;
diff --git a/include/rootston/server.h b/include/rootston/server.h
index 8fc6530e..a014c749 100644
--- a/include/rootston/server.h
+++ b/include/rootston/server.h
@@ -1,11 +1,12 @@
#ifndef _ROOTSTON_SERVER_H
#define _ROOTSTON_SERVER_H
#include <wayland-server.h>
+#include "config.h"
#include <wlr/backend.h>
#include <wlr/backend/session.h>
#include <wlr/types/wlr_data_device.h>
#include <wlr/render.h>
-#ifdef HAS_XWAYLAND
+#ifdef WLR_HAS_XWAYLAND
#include <wlr/xwayland.h>
#endif
#include "rootston/config.h"
diff --git a/include/rootston/view.h b/include/rootston/view.h
index bb7297d0..53e96764 100644
--- a/include/rootston/view.h
+++ b/include/rootston/view.h
@@ -2,6 +2,7 @@
#define _ROOTSTON_VIEW_H
#include <stdbool.h>
+#include "config.h"
#include <wlr/types/wlr_box.h>
#include <wlr/types/wlr_surface.h>
#include <wlr/types/wlr_xdg_shell_v6.h>
@@ -79,14 +80,14 @@ struct roots_view {
union {
struct wlr_wl_shell_surface *wl_shell_surface;
struct wlr_xdg_surface_v6 *xdg_surface_v6;
-#ifdef HAS_XWAYLAND
+#ifdef WLR_HAS_XWAYLAND
struct wlr_xwayland_surface *xwayland_surface;
#endif
};
union {
struct roots_wl_shell_surface *roots_wl_shell_surface;
struct roots_xdg_surface_v6 *roots_xdg_surface_v6;
-#ifdef HAS_XWAYLAND
+#ifdef WLR_HAS_XWAYLAND
struct roots_xwayland_surface *roots_xwayland_surface;
#endif
};
diff --git a/include/wlr/types/wlr_output.h b/include/wlr/types/wlr_output.h
index a974a154..8e4f5446 100644
--- a/include/wlr/types/wlr_output.h
+++ b/include/wlr/types/wlr_output.h
@@ -118,6 +118,19 @@ bool wlr_output_cursor_move(struct wlr_output_cursor *cursor,
double x, double y);
void wlr_output_cursor_destroy(struct wlr_output_cursor *cursor);
-enum wl_output_transform wlr_output_transform_invert(enum wl_output_transform);
+
+/**
+ * Returns the transform that, when composed with `tr`, gives
+ * `WL_OUTPUT_TRANSFORM_NORMAL`.
+ */
+enum wl_output_transform wlr_output_transform_invert(
+ enum wl_output_transform tr);
+
+/**
+ * Returns a transform that, when applied, has the same effect as applying
+ * sequentially `tr_a` and `tr_b`.
+ */
+enum wl_output_transform wlr_output_transform_compose(
+ enum wl_output_transform tr_a, enum wl_output_transform tr_b);
#endif
diff --git a/include/wlr/xwayland.h b/include/wlr/xwayland.h
index acf04595..230cfeed 100644
--- a/include/wlr/xwayland.h
+++ b/include/wlr/xwayland.h
@@ -3,11 +3,12 @@
#include <time.h>
#include <stdbool.h>
+#include "config.h"
#include <wlr/types/wlr_compositor.h>
#include <wlr/types/wlr_seat.h>
#include <xcb/xcb.h>
-#ifdef HAS_XCB_ICCCM
+#ifdef WLR_HAS_XCB_ICCCM
#include <xcb/xcb_icccm.h>
#endif
diff --git a/meson.build b/meson.build
index a3f5e7f9..51de7a4c 100644
--- a/meson.build
+++ b/meson.build
@@ -24,6 +24,8 @@ add_project_link_arguments(
language: 'c',
)
+conf_data = configuration_data()
+
wlr_inc = include_directories('include')
cc = meson.get_compiler('c')
@@ -63,26 +65,24 @@ elogind = dependency('libelogind', required: false)
math = cc.find_library('m', required: false)
if xcb_icccm.found()
- add_project_arguments('-DHAS_XCB_ICCCM', language: 'c')
+ conf_data.set('WLR_HAS_XCB_ICCCM', true)
endif
if libcap.found() and get_option('enable_libcap')
- add_project_arguments('-DHAS_LIBCAP', language: 'c')
+ conf_data.set('WLR_HAS_LIBCAP', true)
endif
if systemd.found() and get_option('enable_systemd')
- add_project_arguments('-DHAS_SYSTEMD', language: 'c')
+ conf_data.set('WLR_HAS_SYSTEMD', true)
endif
if elogind.found() and get_option('enable_elogind')
- add_project_arguments('-DHAS_ELOGIND', language: 'c')
+ conf_data.set('WLR_HAS_ELOGIND', true)
endif
exclude_files = []
wlr_parts = []
-conf_data = configuration_data()
if get_option('enable_xwayland')
- add_project_arguments('-DHAS_XWAYLAND', language: 'c')
subdir('xwayland')
wlr_parts += [lib_wlr_xwayland]
conf_data.set('WLR_HAS_XWAYLAND', true)
diff --git a/rootston/config.c b/rootston/config.c
index dd741186..f369c4f5 100644
--- a/rootston/config.c
+++ b/rootston/config.c
@@ -9,6 +9,7 @@
#include <strings.h>
#include <unistd.h>
#include <sys/param.h>
+#include "config.h"
#include <wlr/util/log.h>
#include <wlr/types/wlr_box.h>
#include "rootston/config.h"
diff --git a/rootston/desktop.c b/rootston/desktop.c
index 1431dc5d..a4692439 100644
--- a/rootston/desktop.c
+++ b/rootston/desktop.c
@@ -3,6 +3,7 @@
#include <time.h>
#include <stdlib.h>
#include <math.h>
+#include "config.h"
#include <wlr/types/wlr_box.h>
#include <wlr/types/wlr_compositor.h>
#include <wlr/types/wlr_cursor.h>
@@ -440,7 +441,7 @@ struct roots_desktop *desktop_create(struct roots_server *server,
&desktop->wl_shell_surface);
desktop->wl_shell_surface.notify = handle_wl_shell_surface;
-#ifdef HAS_XWAYLAND
+#ifdef WLR_HAS_XWAYLAND
if (config->xwayland) {
desktop->xwayland = wlr_xwayland_create(server->wl_display,
desktop->compositor);
diff --git a/rootston/keyboard.c b/rootston/keyboard.c
index 16071c0c..7b281308 100644
--- a/rootston/keyboard.c
+++ b/rootston/keyboard.c
@@ -117,6 +117,8 @@ static void keyboard_binding_execute(struct roots_keyboard *keyboard,
if (focus != NULL) {
view_maximize(focus, !focus->maximized);
}
+ } else if (strcmp(command, "nop") == 0) {
+ wlr_log(L_DEBUG, "nop command");
} else {
wlr_log(L_ERROR, "unknown binding command: %s", command);
}
diff --git a/rootston/main.c b/rootston/main.c
index 161824d6..87f1c0b4 100644
--- a/rootston/main.c
+++ b/rootston/main.c
@@ -3,6 +3,7 @@
#include <stdlib.h>
#include <unistd.h>
#include <wayland-server.h>
+#include "config.h"
#include <wlr/backend.h>
#include <wlr/backend/headless.h>
#include <wlr/backend/multi.h>
@@ -64,7 +65,7 @@ int main(int argc, char **argv) {
}
setenv("WAYLAND_DISPLAY", socket, true);
-#ifndef HAS_XWAYLAND
+#ifndef WLR_HAS_XWAYLAND
ready(NULL, NULL);
#else
if (server.desktop->xwayland != NULL) {
diff --git a/rootston/seat.c b/rootston/seat.c
index ce0f1374..635bc8b1 100644
--- a/rootston/seat.c
+++ b/rootston/seat.c
@@ -2,6 +2,7 @@
#include <stdlib.h>
#include <string.h>
#include <wayland-server.h>
+#include "config.h"
#include <wlr/types/wlr_xcursor_manager.h>
#include <wlr/util/log.h>
#include "rootston/xcursor.h"
diff --git a/rootston/xwayland.c b/rootston/xwayland.c
index 5f677116..b00b61bc 100644
--- a/rootston/xwayland.c
+++ b/rootston/xwayland.c
@@ -2,11 +2,12 @@
#include <stdlib.h>
#include <stdbool.h>
#include <wayland-server.h>
+#include "config.h"
#include <wlr/types/wlr_box.h>
#include <wlr/types/wlr_surface.h>
#include <wlr/xwayland.h>
#include <wlr/util/log.h>
-#include "rootston/desktop.h"
+#include "rootston/server.h"
#include "rootston/server.h"
static void activate(struct roots_view *view, bool active) {
diff --git a/types/wlr_output.c b/types/wlr_output.c
index f319905c..115f3e8b 100644
--- a/types/wlr_output.c
+++ b/types/wlr_output.c
@@ -726,11 +726,22 @@ void wlr_output_cursor_destroy(struct wlr_output_cursor *cursor) {
free(cursor);
}
+
enum wl_output_transform wlr_output_transform_invert(
- enum wl_output_transform transform) {
- if ((transform & WL_OUTPUT_TRANSFORM_90) &&
- !(transform & WL_OUTPUT_TRANSFORM_FLIPPED)) {
- transform ^= WL_OUTPUT_TRANSFORM_180;
+ enum wl_output_transform tr) {
+ if ((tr & WL_OUTPUT_TRANSFORM_90) && !(tr & WL_OUTPUT_TRANSFORM_FLIPPED)) {
+ tr ^= WL_OUTPUT_TRANSFORM_180;
+ }
+ return tr;
+}
+
+enum wl_output_transform wlr_output_transform_compose(
+ enum wl_output_transform tr_a, enum wl_output_transform tr_b) {
+ uint32_t flipped = (tr_a ^ tr_b) & WL_OUTPUT_TRANSFORM_FLIPPED;
+ uint32_t rotated =
+ (tr_a + tr_b) & (WL_OUTPUT_TRANSFORM_90 | WL_OUTPUT_TRANSFORM_180);
+ if ((tr_a & WL_OUTPUT_TRANSFORM_FLIPPED) && (tr_b & WL_OUTPUT_TRANSFORM_FLIPPED)) {
+ rotated = wlr_output_transform_invert(rotated);
}
- return transform;
+ return flipped | rotated;
}
diff --git a/types/wlr_xdg_shell_v6.c b/types/wlr_xdg_shell_v6.c
index 23d36b6f..e288883d 100644
--- a/types/wlr_xdg_shell_v6.c
+++ b/types/wlr_xdg_shell_v6.c
@@ -5,6 +5,7 @@
#include <stdlib.h>
#include <string.h>
#include <wayland-server.h>
+#include "config.h"
#include <wlr/types/wlr_xdg_shell_v6.h>
#include <wlr/types/wlr_surface.h>
#include <wlr/types/wlr_seat.h>
diff --git a/xwayland/xwm.c b/xwayland/xwm.c
index a8fd4d95..f7ea879d 100644
--- a/xwayland/xwm.c
+++ b/xwayland/xwm.c
@@ -7,6 +7,7 @@
#include <xcb/xfixes.h>
#include <xcb/xcb_image.h>
#include <xcb/render.h>
+#include "config.h"
#include "wlr/util/log.h"
#include "wlr/util/edges.h"
#include "wlr/types/wlr_surface.h"
@@ -14,7 +15,7 @@
#include "wlr/xcursor.h"
#include "wlr/xwm.h"
-#ifdef HAS_XCB_ICCCM
+#ifdef WLR_HAS_XCB_ICCCM
#include <xcb/xcb_icccm.h>
#endif
@@ -366,7 +367,7 @@ static void read_surface_protocols(struct wlr_xwm *xwm,
wlr_log(L_DEBUG, "WM_PROTOCOLS (%zu)", atoms_len);
}
-#ifdef HAS_XCB_ICCCM
+#ifdef WLR_HAS_XCB_ICCCM
static void read_surface_hints(struct wlr_xwm *xwm,
struct wlr_xwayland_surface *xsurface,
xcb_get_property_reply_t *reply) {
@@ -397,7 +398,7 @@ static void read_surface_hints(struct wlr_xwm *xwm,
}
#endif
-#ifdef HAS_XCB_ICCCM
+#ifdef WLR_HAS_XCB_ICCCM
static void read_surface_normal_hints(struct wlr_xwm *xwm,
struct wlr_xwayland_surface *xsurface,
xcb_get_property_reply_t *reply) {
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-11 23:55:07 +0000