mirror of
https://github.com/hyprwm/wlroots-hyprland.git
synced 2024-11-02 11:55:59 +01:00
67523fb228
This improves the way the output numbers are handled for the wayland backend. Instead of using the number of active outputs plus one, the last used number is stored and new outputs will increment it. This fixes the situation where you start with one output, create a second, close the first, and create a third. Without this, both outputs will be `WL-2`, which causes an issue since the identifier will also be identical. With this, the last output is `WL-3` and the outputs can be distinguished.
93 lines
2.3 KiB
C
93 lines
2.3 KiB
C
#ifndef BACKEND_WAYLAND_H
|
|
#define BACKEND_WAYLAND_H
|
|
|
|
#include <stdbool.h>
|
|
|
|
#include <wayland-client.h>
|
|
#include <wayland-egl.h>
|
|
#include <wayland-server.h>
|
|
#include <wayland-util.h>
|
|
|
|
#include <wlr/backend/wayland.h>
|
|
#include <wlr/render/egl.h>
|
|
#include <wlr/render/wlr_renderer.h>
|
|
#include <wlr/types/wlr_box.h>
|
|
|
|
struct wlr_wl_backend {
|
|
struct wlr_backend backend;
|
|
|
|
/* local state */
|
|
bool started;
|
|
struct wl_display *local_display;
|
|
struct wl_list devices;
|
|
struct wl_list outputs;
|
|
struct wlr_egl egl;
|
|
struct wlr_renderer *renderer;
|
|
size_t requested_outputs;
|
|
size_t last_output_num;
|
|
struct wl_listener local_display_destroy;
|
|
/* remote state */
|
|
struct wl_display *remote_display;
|
|
struct wl_event_source *remote_display_src;
|
|
struct wl_registry *registry;
|
|
struct wl_compositor *compositor;
|
|
struct xdg_wm_base *xdg_wm_base;
|
|
struct wl_shm *shm;
|
|
struct wl_seat *seat;
|
|
struct wl_pointer *pointer;
|
|
struct wl_keyboard *keyboard;
|
|
struct wlr_wl_pointer *current_pointer;
|
|
char *seat_name;
|
|
};
|
|
|
|
struct wlr_wl_output {
|
|
struct wlr_output wlr_output;
|
|
|
|
struct wlr_wl_backend *backend;
|
|
struct wl_list link;
|
|
|
|
struct wl_surface *surface;
|
|
struct wl_callback *frame_callback;
|
|
struct xdg_surface *xdg_surface;
|
|
struct xdg_toplevel *xdg_toplevel;
|
|
struct wl_egl_window *egl_window;
|
|
EGLSurface egl_surface;
|
|
|
|
uint32_t enter_serial;
|
|
|
|
struct {
|
|
struct wl_surface *surface;
|
|
struct wl_egl_window *egl_window;
|
|
int32_t hotspot_x, hotspot_y;
|
|
int32_t width, height;
|
|
} cursor;
|
|
};
|
|
|
|
struct wlr_wl_input_device {
|
|
struct wlr_input_device wlr_input_device;
|
|
|
|
struct wlr_wl_backend *backend;
|
|
void *resource;
|
|
};
|
|
|
|
struct wlr_wl_pointer {
|
|
struct wlr_pointer wlr_pointer;
|
|
|
|
struct wlr_wl_input_device *input_device;
|
|
struct wl_pointer *wl_pointer;
|
|
enum wlr_axis_source axis_source;
|
|
int32_t axis_discrete;
|
|
struct wlr_wl_output *output;
|
|
|
|
struct wl_listener output_destroy;
|
|
};
|
|
|
|
struct wlr_wl_backend *get_wl_backend_from_backend(struct wlr_backend *backend);
|
|
void update_wl_output_cursor(struct wlr_wl_output *output);
|
|
struct wlr_wl_pointer *pointer_get_wl(struct wlr_pointer *wlr_pointer);
|
|
void create_wl_pointer(struct wl_pointer *wl_pointer, struct wlr_wl_output *output);
|
|
void create_wl_keyboard(struct wl_keyboard *wl_keyboard, struct wlr_wl_backend *wl);
|
|
|
|
extern const struct wl_seat_listener seat_listener;
|
|
|
|
#endif
|