aboutsummaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorDrew DeVault <sir@cmpwn.com>2017-10-22 23:19:21 -0400
committerDrew DeVault <sir@cmpwn.com>2017-11-01 08:44:07 -0400
commita7446792a1a0fd9fe3391f041d7bbfe9e2b11255 (patch)
treed07f4baaaf9fb38ba68c0f932a39b738bc570d1d /include
parent03c0d41ca956e3eb5ddac15a34918bfb97fc4c09 (diff)
Consider scale factor when rendering views
Diffstat (limited to 'include')
-rw-r--r--include/rootston/config.h1
-rw-r--r--include/rootston/view.h1
-rw-r--r--include/wlr/types/wlr_surface.h6
3 files changed, 7 insertions, 1 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 993ff654..4a5e8d08 100644
--- a/include/rootston/view.h
+++ b/include/rootston/view.h
@@ -48,6 +48,7 @@ enum roots_view_type {
struct roots_view {
struct roots_desktop *desktop;
+ struct roots_output *output;
double x, y;
float rotation;
// TODO: Something for roots-enforced width/height
diff --git a/include/wlr/types/wlr_surface.h b/include/wlr/types/wlr_surface.h
index ea4184aa..e1a07566 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,8 @@ 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);
+
#endif