Merge branch 'hidpi'

4 files changed, 14 insertions, 5 deletions

diff --git a/include/rootston/config.h b/include/rootston/config.h
index 75c04619..e0466117 100644
--- a/include/rootston/config.h
+++ b/include/rootston/config.h
@@ -8,6 +8,7 @@ struct output_config {
 	char *name;
 	enum wl_output_transform transform;
 	int x, y;
+	int scale;
 	struct wl_list link;
 	struct {
 		int width, height;
diff --git a/include/rootston/view.h b/include/rootston/view.h
index 0913b42e..8a289355 100644
--- a/include/rootston/view.h
+++ b/include/rootston/view.h
@@ -71,7 +71,7 @@ struct roots_view {
 	// configure event from the xdg_shell
 	// If not then this should follow the typical type/impl pattern we use
 	// elsewhere
-	void (*get_size)(struct roots_view *view, struct wlr_box *box);
+	void (*get_size)(const struct roots_view *view, struct wlr_box *box);
 	void (*activate)(struct roots_view *view, bool active);
 	void (*move)(struct roots_view *view, double x, double y);
 	void (*resize)(struct roots_view *view, uint32_t width, uint32_t height);
@@ -80,7 +80,7 @@ struct roots_view {
 	void (*close)(struct roots_view *view);
 };
 
-void view_get_size(struct roots_view *view, struct wlr_box *box);
+void view_get_size(const struct roots_view *view, struct wlr_box *box);
 void view_activate(struct roots_view *view, bool active);
 void view_move(struct roots_view *view, double x, double y);
 void view_resize(struct roots_view *view, uint32_t width, uint32_t height);
diff --git a/include/wlr/types/wlr_output.h b/include/wlr/types/wlr_output.h
index e6323f9c..df123639 100644
--- a/include/wlr/types/wlr_output.h
+++ b/include/wlr/types/wlr_output.h
@@ -14,7 +14,7 @@ struct wlr_output_mode {
 
 struct wlr_output_cursor {
 	struct wlr_output *output;
-	int32_t x, y;
+	double x, y;
 	bool enabled;
 	uint32_t width, height;
 	int32_t hotspot_x, hotspot_y;
@@ -95,7 +95,8 @@ bool wlr_output_cursor_set_image(struct wlr_output_cursor *cursor,
 	int32_t hotspot_x, int32_t hotspot_y);
 void wlr_output_cursor_set_surface(struct wlr_output_cursor *cursor,
 	struct wlr_surface *surface, int32_t hotspot_x, int32_t hotspot_y);
-bool wlr_output_cursor_move(struct wlr_output_cursor *cursor, int x, int y);
+bool wlr_output_cursor_move(struct wlr_output_cursor *cursor,
+	double x, double y);
 void wlr_output_cursor_destroy(struct wlr_output_cursor *cursor);
 
 #endif
diff --git a/include/wlr/types/wlr_surface.h b/include/wlr/types/wlr_surface.h
index ea4184aa..cea53109 100644
--- a/include/wlr/types/wlr_surface.h
+++ b/include/wlr/types/wlr_surface.h
@@ -1,10 +1,10 @@
 #ifndef WLR_TYPES_WLR_SURFACE_H
 #define WLR_TYPES_WLR_SURFACE_H
-
 #include <wayland-server.h>
 #include <pixman.h>
 #include <stdint.h>
 #include <stdbool.h>
+#include <wlr/types/wlr_output.h>
 
 struct wlr_frame_callback {
 	struct wl_resource *resource;
@@ -135,4 +135,11 @@ struct wlr_surface *wlr_surface_get_main_surface(struct wlr_surface *surface);
  */
 struct wlr_subsurface *wlr_surface_subsurface_at(struct wlr_surface *surface,
 		double sx, double sy, double *sub_x, double *sub_y);
+
+void wlr_surface_send_enter(struct wlr_surface *surface,
+		struct wlr_output *output);
+
+void wlr_surface_send_leave(struct wlr_surface *surface,
+		struct wlr_output *output);
+
 #endif