aboutsummaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
Diffstat (limited to 'include')
-rw-r--r--include/backend/drm/drm.h5
-rw-r--r--include/backend/wayland.h2
-rw-r--r--include/backend/x11.h2
-rw-r--r--include/render/gles2.h2
-rw-r--r--include/rootston/config.h1
-rw-r--r--include/rootston/input.h22
-rw-r--r--include/rootston/view.h7
-rw-r--r--include/wlr/backend.h2
-rw-r--r--include/wlr/backend/interface.h2
-rw-r--r--include/wlr/interfaces/wlr_output.h6
-rw-r--r--include/wlr/render/egl.h (renamed from include/wlr/egl.h)0
-rw-r--r--include/wlr/types/wlr_output.h5
12 files changed, 35 insertions, 21 deletions
diff --git a/include/backend/drm/drm.h b/include/backend/drm/drm.h
index 0f19c01e..4d23f963 100644
--- a/include/backend/drm/drm.h
+++ b/include/backend/drm/drm.h
@@ -13,7 +13,8 @@
#include <wlr/backend/session.h>
#include <wlr/backend/drm.h>
#include <wlr/types/wlr_output.h>
-#include <wlr/egl.h>
+#include <wlr/render/egl.h>
+#include <wlr/types/wlr_list.h>
#include "iface.h"
#include "properties.h"
@@ -30,7 +31,6 @@ struct wlr_drm_plane {
// Only used by cursor
float matrix[16];
- struct wlr_renderer *wlr_rend;
struct wlr_texture *wlr_tex;
struct gbm_bo *cursor_bo;
@@ -113,7 +113,6 @@ struct wlr_drm_mode {
struct wlr_drm_connector {
struct wlr_output output;
- struct wlr_drm_backend *drm;
enum wlr_drm_connector_state state;
uint32_t id;
diff --git a/include/backend/wayland.h b/include/backend/wayland.h
index bc3b6277..e1c89b11 100644
--- a/include/backend/wayland.h
+++ b/include/backend/wayland.h
@@ -5,7 +5,7 @@
#include <wayland-client.h>
#include <wayland-server.h>
#include <wayland-egl.h>
-#include <wlr/egl.h>
+#include <wlr/render/egl.h>
#include <wlr/backend/wayland.h>
#include <wlr/types/wlr_output.h>
#include <wlr/types/wlr_input_device.h>
diff --git a/include/backend/x11.h b/include/backend/x11.h
index b4284b63..f5ec56bc 100644
--- a/include/backend/x11.h
+++ b/include/backend/x11.h
@@ -5,7 +5,7 @@
#include <xcb/xcb.h>
#include <X11/Xlib-xcb.h>
#include <wayland-server.h>
-#include <wlr/egl.h>
+#include <wlr/render/egl.h>
#include <wlr/types/wlr_output.h>
#include <wlr/types/wlr_input_device.h>
diff --git a/include/render/gles2.h b/include/render/gles2.h
index 688a51dd..0b7032cc 100644
--- a/include/render/gles2.h
+++ b/include/render/gles2.h
@@ -8,9 +8,9 @@
#include <GLES2/gl2ext.h>
#include <EGL/egl.h>
#include <EGL/eglext.h>
-#include <wlr/egl.h>
#include <wlr/backend.h>
#include <wlr/render.h>
+#include <wlr/render/egl.h>
#include <wlr/render/interface.h>
#include <wlr/util/log.h>
diff --git a/include/rootston/config.h b/include/rootston/config.h
index 66347c3c..5fa4890f 100644
--- a/include/rootston/config.h
+++ b/include/rootston/config.h
@@ -42,6 +42,7 @@ struct roots_config {
struct wl_list devices;
struct wl_list bindings;
char *config_path;
+ char *startup_cmd;
};
struct roots_config *parse_args(int argc, char *argv[]);
diff --git a/include/rootston/input.h b/include/rootston/input.h
index 516104a7..ddd5a05d 100644
--- a/include/rootston/input.h
+++ b/include/rootston/input.h
@@ -24,18 +24,12 @@ struct roots_keyboard {
struct roots_pointer {
struct roots_input *input;
struct wlr_input_device *device;
- // We don't listen to any pointer events directly - they go through
- // wlr_cursor
struct wl_list link;
};
struct roots_touch {
struct roots_input *input;
struct wlr_input_device *device;
- struct wl_listener down;
- struct wl_listener up;
- struct wl_listener motion;
- struct wl_listener cancel;
struct wl_list link;
};
@@ -70,6 +64,13 @@ struct roots_input_event {
struct wlr_input_device *device;
};
+struct roots_touch_point {
+ struct roots_touch *device;
+ int32_t slot;
+ double x, y;
+ struct wl_list link;
+};
+
struct roots_input {
struct roots_config *config;
struct roots_server *server;
@@ -104,9 +105,16 @@ struct roots_input {
struct wl_listener cursor_motion_absolute;
struct wl_listener cursor_button;
struct wl_listener cursor_axis;
+
+ struct wl_listener cursor_touch_down;
+ struct wl_listener cursor_touch_up;
+ struct wl_listener cursor_touch_motion;
+
struct wl_listener cursor_tool_axis;
struct wl_listener cursor_tool_tip;
+ struct wl_list touch_points;
+
struct wl_listener pointer_grab_end;
struct wl_listener request_set_cursor;
@@ -120,6 +128,8 @@ void pointer_add(struct wlr_input_device *device, struct roots_input *input);
void pointer_remove(struct wlr_input_device *device, struct roots_input *input);
void keyboard_add(struct wlr_input_device *device, struct roots_input *input);
void keyboard_remove(struct wlr_input_device *device, struct roots_input *input);
+void touch_add(struct wlr_input_device *device, struct roots_input *input);
+void touch_remove(struct wlr_input_device *device, struct roots_input *input);
void tablet_tool_add(struct wlr_input_device *device, struct roots_input *input);
void tablet_tool_remove(struct wlr_input_device *device, struct roots_input *input);
diff --git a/include/rootston/view.h b/include/rootston/view.h
index ad722225..7d297329 100644
--- a/include/rootston/view.h
+++ b/include/rootston/view.h
@@ -8,13 +8,12 @@
struct roots_wl_shell_surface {
struct roots_view *view;
+
// TODO: Maybe destroy listener should go in roots_view
struct wl_listener destroy;
struct wl_listener ping_timeout;
struct wl_listener request_move;
struct wl_listener request_resize;
- struct wl_listener request_set_fullscreen;
- struct wl_listener request_set_maximized;
struct wl_listener surface_commit;
};
@@ -25,15 +24,13 @@ struct roots_xdg_surface_v6 {
// TODO: Maybe destroy listener should go in roots_view
struct wl_listener commit;
struct wl_listener destroy;
- struct wl_listener ping_timeout;
- struct wl_listener request_minimize;
struct wl_listener request_move;
struct wl_listener request_resize;
- struct wl_listener request_show_window_menu;
};
struct roots_xwayland_surface {
struct roots_view *view;
+
// TODO: Maybe destroy listener should go in roots_view
struct wl_listener destroy;
struct wl_listener request_configure;
diff --git a/include/wlr/backend.h b/include/wlr/backend.h
index 6c11152f..78d01edf 100644
--- a/include/wlr/backend.h
+++ b/include/wlr/backend.h
@@ -3,7 +3,7 @@
#include <wayland-server.h>
#include <wlr/backend/session.h>
-#include <wlr/egl.h>
+#include <wlr/render/egl.h>
struct wlr_backend_impl;
diff --git a/include/wlr/backend/interface.h b/include/wlr/backend/interface.h
index ea41400a..3f0aaadb 100644
--- a/include/wlr/backend/interface.h
+++ b/include/wlr/backend/interface.h
@@ -3,7 +3,7 @@
#include <stdbool.h>
#include <wlr/backend.h>
-#include <wlr/egl.h>
+#include <wlr/render/egl.h>
struct wlr_backend_impl {
bool (*start)(struct wlr_backend *backend);
diff --git a/include/wlr/interfaces/wlr_output.h b/include/wlr/interfaces/wlr_output.h
index b7927569..17dd5538 100644
--- a/include/wlr/interfaces/wlr_output.h
+++ b/include/wlr/interfaces/wlr_output.h
@@ -1,8 +1,9 @@
#ifndef WLR_INTERFACES_WLR_OUTPUT_H
#define WLR_INTERFACES_WLR_OUTPUT_H
-#include <wlr/types/wlr_output.h>
#include <stdbool.h>
+#include <wlr/types/wlr_output.h>
+#include <wlr/backend.h>
struct wlr_output_impl {
void (*enable)(struct wlr_output *output, bool enable);
@@ -21,7 +22,8 @@ struct wlr_output_impl {
uint16_t (*get_gamma_size)(struct wlr_output *output);
};
-void wlr_output_init(struct wlr_output *output, const struct wlr_output_impl *impl);
+void wlr_output_init(struct wlr_output *output, struct wlr_backend *backend,
+ const struct wlr_output_impl *impl);
void wlr_output_free(struct wlr_output *output);
void wlr_output_update_matrix(struct wlr_output *output);
struct wl_global *wlr_output_create_global(
diff --git a/include/wlr/egl.h b/include/wlr/render/egl.h
index 9ab4d9ce..9ab4d9ce 100644
--- a/include/wlr/egl.h
+++ b/include/wlr/render/egl.h
diff --git a/include/wlr/types/wlr_output.h b/include/wlr/types/wlr_output.h
index 5c85ce91..d8649bbb 100644
--- a/include/wlr/types/wlr_output.h
+++ b/include/wlr/types/wlr_output.h
@@ -16,6 +16,7 @@ struct wlr_output_impl;
struct wlr_output {
const struct wlr_output_impl *impl;
+ struct wlr_backend *backend;
struct wl_global *wl_global;
struct wl_list wl_resources;
@@ -57,6 +58,9 @@ struct wlr_output {
struct wl_listener surface_destroy;
} cursor;
+ // the output position in layout space reported to clients
+ int32_t lx, ly;
+
void *data;
};
@@ -67,6 +71,7 @@ bool wlr_output_set_mode(struct wlr_output *output,
struct wlr_output_mode *mode);
void wlr_output_transform(struct wlr_output *output,
enum wl_output_transform transform);
+void wlr_output_set_position(struct wlr_output *output, int32_t lx, int32_t ly);
bool wlr_output_set_cursor(struct wlr_output *output,
const uint8_t *buf, int32_t stride, uint32_t width, uint32_t height,
int32_t hotspot_x, int32_t hotspot_y);
generated by cgit v1.2.3 (git 2.39.1) at 2024-09-21 00:43:03 +0000