aboutsummaryrefslogtreecommitdiff
path: root/backend
diff options
context:
space:
mode:
Diffstat (limited to 'backend')
-rw-r--r--backend/drm/drm.c6
-rw-r--r--backend/drm/renderer.c2
-rw-r--r--backend/drm/util.c6
-rw-r--r--backend/meson.build1
-rw-r--r--backend/session/direct-freebsd.c6
-rw-r--r--backend/session/direct.c6
-rw-r--r--backend/session/logind.c14
-rw-r--r--backend/wayland/os-compatibility.c156
8 files changed, 25 insertions, 172 deletions
diff --git a/backend/drm/drm.c b/backend/drm/drm.c
index dd247998..9fcf2ad7 100644
--- a/backend/drm/drm.c
+++ b/backend/drm/drm.c
@@ -634,8 +634,10 @@ static bool wlr_drm_connector_move_cursor(struct wlr_output *output,
struct wlr_box transformed_box;
wlr_output_transform_apply_to_box(transform, &box, &transformed_box);
- transformed_box.x -= plane->cursor_hotspot_x;
- transformed_box.y -= plane->cursor_hotspot_y;
+ if (plane != NULL) {
+ transformed_box.x -= plane->cursor_hotspot_x;
+ transformed_box.y -= plane->cursor_hotspot_y;
+ }
return drm->iface->crtc_move_cursor(drm, conn->crtc, transformed_box.x,
transformed_box.y);
diff --git a/backend/drm/renderer.c b/backend/drm/renderer.c
index d53acaa8..87064914 100644
--- a/backend/drm/renderer.c
+++ b/backend/drm/renderer.c
@@ -14,7 +14,7 @@
#include <wlr/render/gles2.h>
#include <wlr/render.h>
#include "backend/drm/drm.h"
-#include "render/glapi.h"
+#include "glapi.h"
bool wlr_drm_renderer_init(struct wlr_drm_backend *drm,
struct wlr_drm_renderer *renderer) {
diff --git a/backend/drm/util.c b/backend/drm/util.c
index c27d7b67..25256343 100644
--- a/backend/drm/util.c
+++ b/backend/drm/util.c
@@ -93,6 +93,12 @@ void parse_edid(struct wlr_output *restrict output, size_t len, const uint8_t *d
uint16_t id = (data[8] << 8) | data[9];
snprintf(output->make, sizeof(output->make), "%s", get_manufacturer(id));
+ uint16_t model = data[10] | (data[11] << 8);
+ snprintf(output->model, sizeof(output->model), "0x%04X", model);
+
+ uint32_t serial = data[12] | (data[13] << 8) | (data[14] << 8) | (data[15] << 8);
+ snprintf(output->serial, sizeof(output->serial), "0x%08X", serial);
+
output->phys_width = ((data[68] & 0xf0) << 4) | data[66];
output->phys_height = ((data[68] & 0x0f) << 8) | data[67];
diff --git a/backend/meson.build b/backend/meson.build
index 5ed7b227..c9d47317 100644
--- a/backend/meson.build
+++ b/backend/meson.build
@@ -21,7 +21,6 @@ backend_files = files(
'wayland/output.c',
'wayland/registry.c',
'wayland/wl_seat.c',
- 'wayland/os-compatibility.c',
'x11/backend.c',
)
diff --git a/backend/session/direct-freebsd.c b/backend/session/direct-freebsd.c
index fc4bab04..c0621416 100644
--- a/backend/session/direct-freebsd.c
+++ b/backend/session/direct-freebsd.c
@@ -148,8 +148,8 @@ static bool setup_tty(struct direct_session *session, struct wl_display *display
struct vt_mode mode = {
.mode = VT_PROCESS,
- .relsig = SIGUSR1,
- .acqsig = SIGUSR1,
+ .relsig = SIGUSR2,
+ .acqsig = SIGUSR2,
.frsig = SIGIO, // has to be set
};
@@ -159,7 +159,7 @@ static bool setup_tty(struct direct_session *session, struct wl_display *display
}
struct wl_event_loop *loop = wl_display_get_event_loop(display);
- session->vt_source = wl_event_loop_add_signal(loop, SIGUSR1,
+ session->vt_source = wl_event_loop_add_signal(loop, SIGUSR2,
vt_handler, session);
if (!session->vt_source) {
goto error;
diff --git a/backend/session/direct.c b/backend/session/direct.c
index 942dc552..9d6cd36d 100644
--- a/backend/session/direct.c
+++ b/backend/session/direct.c
@@ -184,8 +184,8 @@ static bool setup_tty(struct direct_session *session, struct wl_display *display
struct vt_mode mode = {
.mode = VT_PROCESS,
- .relsig = SIGUSR1,
- .acqsig = SIGUSR1,
+ .relsig = SIGUSR2,
+ .acqsig = SIGUSR2,
};
if (ioctl(fd, VT_SETMODE, &mode) < 0) {
@@ -194,7 +194,7 @@ static bool setup_tty(struct direct_session *session, struct wl_display *display
}
struct wl_event_loop *loop = wl_display_get_event_loop(display);
- session->vt_source = wl_event_loop_add_signal(loop, SIGUSR1,
+ session->vt_source = wl_event_loop_add_signal(loop, SIGUSR2,
vt_handler, session);
if (!session->vt_source) {
goto error;
diff --git a/backend/session/logind.c b/backend/session/logind.c
index daff75b6..e9d4c8f3 100644
--- a/backend/session/logind.c
+++ b/backend/session/logind.c
@@ -347,12 +347,6 @@ static struct wlr_session *logind_session_create(struct wl_display *disp) {
goto error;
}
- ret = sd_session_get_vt(session->id, &session->base.vtnr);
- if (ret < 0) {
- wlr_log(L_ERROR, "Session not running in virtual terminal");
- goto error;
- }
-
char *seat;
ret = sd_session_get_seat(session->id, &seat);
if (ret < 0) {
@@ -360,6 +354,14 @@ static struct wlr_session *logind_session_create(struct wl_display *disp) {
goto error;
}
snprintf(session->base.seat, sizeof(session->base.seat), "%s", seat);
+
+ if (strcmp(seat, "seat0") == 0) {
+ ret = sd_session_get_vt(session->id, &session->base.vtnr);
+ if (ret < 0) {
+ wlr_log(L_ERROR, "Session not running in virtual terminal");
+ goto error;
+ }
+ }
free(seat);
ret = sd_bus_default_system(&session->bus);
diff --git a/backend/wayland/os-compatibility.c b/backend/wayland/os-compatibility.c
deleted file mode 100644
index 14125793..00000000
--- a/backend/wayland/os-compatibility.c
+++ /dev/null
@@ -1,156 +0,0 @@
-/*
- * Copyright © 2012 Collabora, Ltd.
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice (including the
- * next paragraph) shall be included in all copies or substantial
- * portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
- * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
- * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-#define _XOPEN_SOURCE 700
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <unistd.h>
-#include <fcntl.h>
-#include <errno.h>
-#ifdef __linux__
-#include <sys/epoll.h>
-#endif
-#include <string.h>
-#include <stdlib.h>
-
-int
-os_fd_set_cloexec(int fd)
-{
- long flags;
-
- if (fd == -1)
- return -1;
-
- flags = fcntl(fd, F_GETFD);
- if (flags == -1)
- return -1;
-
- if (fcntl(fd, F_SETFD, flags | FD_CLOEXEC) == -1)
- return -1;
-
- return 0;
-}
-
-static int
-set_cloexec_or_close(int fd)
-{
- if (os_fd_set_cloexec(fd) != 0) {
- close(fd);
- return -1;
- }
- return fd;
-}
-
-static int
-create_tmpfile_cloexec(char *tmpname)
-{
- int fd;
-
-#ifdef HAVE_MKOSTEMP
- fd = mkostemp(tmpname, O_CLOEXEC);
- if (fd >= 0)
- unlink(tmpname);
-#else
- fd = mkstemp(tmpname);
- if (fd >= 0) {
- fd = set_cloexec_or_close(fd);
- unlink(tmpname);
- }
-#endif
-
- return fd;
-}
-
-/*
- * Create a new, unique, anonymous file of the given size, and
- * return the file descriptor for it. The file descriptor is set
- * CLOEXEC. The file is immediately suitable for mmap()'ing
- * the given size at offset zero.
- *
- * The file should not have a permanent backing store like a disk,
- * but may have if XDG_RUNTIME_DIR is not properly implemented in OS.
- *
- * The file name is deleted from the file system.
- *
- * The file is suitable for buffer sharing between processes by
- * transmitting the file descriptor over Unix sockets using the
- * SCM_RIGHTS methods.
- *
- * If the C library implements posix_fallocate(), it is used to
- * guarantee that disk space is available for the file at the
- * given size. If disk space is insufficient, errno is set to ENOSPC.
- * If posix_fallocate() is not supported, program may receive
- * SIGBUS on accessing mmap()'ed file contents instead.
- */
-int
-os_create_anonymous_file(off_t size)
-{
- static const char template[] = "/wlroots-shared-XXXXXX";
- const char *path;
- char *name;
- int fd;
- int ret;
-
- path = getenv("XDG_RUNTIME_DIR");
- if (!path) {
- errno = ENOENT;
- return -1;
- }
-
- name = malloc(strlen(path) + sizeof(template));
- if (!name)
- return -1;
-
- strcpy(name, path);
- strcat(name, template);
-
- fd = create_tmpfile_cloexec(name);
-
- free(name);
-
- if (fd < 0)
- return -1;
-
-#ifdef HAVE_POSIX_FALLOCATE
- do {
- ret = posix_fallocate(fd, 0, size);
- } while (ret == EINTR);
- if (ret != 0) {
- close(fd);
- errno = ret;
- return -1;
- }
-#else
- do {
- ret = ftruncate(fd, size);
- } while (ret < 0 && errno == EINTR);
- if (ret < 0) {
- close(fd);
- return -1;
- }
-#endif
-
- return fd;
-}
generated by cgit v1.2.3 (git 2.39.1) at 2024-09-25 15:15:26 +0000