aboutsummaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorDrew DeVault <sir@cmpwn.com>2017-11-10 08:26:20 -0500
committerGitHub <noreply@github.com>2017-11-10 08:26:20 -0500
commite6babc07a050262dc487ec665b042346b06e4916 (patch)
tree34c0eb69a7e5820c684aba6d2405c899c04e18f1 /include
parent425713b83730a7b707ac5b0a325b8e37464a982c (diff)
parentbf1b12a72500fb8cb41cbc60d29e602c25c97fc2 (diff)
Merge pull request #390 from emersion/rootston-maximize
Maximize views in rootston
Diffstat (limited to 'include')
-rw-r--r--include/rootston/view.h17
-rw-r--r--include/wlr/types/wlr_wl_shell.h2
-rw-r--r--include/wlr/types/wlr_xdg_shell_v6.h2
3 files changed, 20 insertions, 1 deletions
diff --git a/include/rootston/view.h b/include/rootston/view.h
index 8a289355..f0d102cd 100644
--- a/include/rootston/view.h
+++ b/include/rootston/view.h
@@ -11,9 +11,10 @@ struct roots_wl_shell_surface {
// 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_maximized;
+ struct wl_listener set_state;
struct wl_listener surface_commit;
};
@@ -26,6 +27,7 @@ struct roots_xdg_surface_v6 {
struct wl_listener destroy;
struct wl_listener request_move;
struct wl_listener request_resize;
+ struct wl_listener request_maximize;
};
struct roots_xwayland_surface {
@@ -36,6 +38,7 @@ struct roots_xwayland_surface {
struct wl_listener request_configure;
struct wl_listener request_move;
struct wl_listener request_resize;
+ struct wl_listener request_maximize;
struct wl_listener map_notify;
struct wl_listener unmap_notify;
};
@@ -48,8 +51,17 @@ enum roots_view_type {
struct roots_view {
struct roots_desktop *desktop;
+
double x, y;
float rotation;
+
+ bool maximized;
+ struct {
+ double x, y;
+ uint32_t width, height;
+ float rotation;
+ } saved;
+
// TODO: Something for roots-enforced width/height
enum roots_view_type type;
union {
@@ -67,6 +79,7 @@ struct roots_view {
#endif
};
struct wlr_surface *wlr_surface;
+
// TODO: This would probably be better as a field that's updated on a
// configure event from the xdg_shell
// If not then this should follow the typical type/impl pattern we use
@@ -77,6 +90,7 @@ struct roots_view {
void (*resize)(struct roots_view *view, uint32_t width, uint32_t height);
void (*move_resize)(struct roots_view *view, double x, double y,
uint32_t width, uint32_t height);
+ void (*maximize)(struct roots_view *view, bool maximized);
void (*close)(struct roots_view *view);
};
@@ -86,6 +100,7 @@ void view_move(struct roots_view *view, double x, double y);
void view_resize(struct roots_view *view, uint32_t width, uint32_t height);
void view_move_resize(struct roots_view *view, double x, double y,
uint32_t width, uint32_t height);
+void view_maximize(struct roots_view *view, bool maximized);
void view_close(struct roots_view *view);
bool view_center(struct roots_view *view);
void view_setup(struct roots_view *view);
diff --git a/include/wlr/types/wlr_wl_shell.h b/include/wlr/types/wlr_wl_shell.h
index 4e814817..1f0630f2 100644
--- a/include/wlr/types/wlr_wl_shell.h
+++ b/include/wlr/types/wlr_wl_shell.h
@@ -42,6 +42,8 @@ struct wlr_wl_shell_popup_grab {
enum wlr_wl_shell_surface_state {
WLR_WL_SHELL_SURFACE_STATE_NONE,
WLR_WL_SHELL_SURFACE_STATE_TOPLEVEL,
+ WLR_WL_SHELL_SURFACE_STATE_MAXIMIZED,
+ WLR_WL_SHELL_SURFACE_STATE_FULLSCREEN,
WLR_WL_SHELL_SURFACE_STATE_TRANSIENT,
WLR_WL_SHELL_SURFACE_STATE_POPUP,
};
diff --git a/include/wlr/types/wlr_xdg_shell_v6.h b/include/wlr/types/wlr_xdg_shell_v6.h
index b0de41e2..bc78428b 100644
--- a/include/wlr/types/wlr_xdg_shell_v6.h
+++ b/include/wlr/types/wlr_xdg_shell_v6.h
@@ -126,6 +126,8 @@ struct wlr_xdg_surface_v6 {
struct wl_signal ack_configure;
struct wl_signal ping_timeout;
+ struct wl_signal request_maximize;
+ struct wl_signal request_fullscreen;
struct wl_signal request_minimize;
struct wl_signal request_move;
struct wl_signal request_resize;