aboutsummaryrefslogtreecommitdiff
path: root/include/wlr
diff options
context:
space:
mode:
authorDrew DeVault <sir@cmpwn.com>2018-03-18 13:58:01 -0400
committerDrew DeVault <sir@cmpwn.com>2018-03-27 18:50:09 -0400
commit88eec637a44ede8b521c2aa44d0196c99dd5a0e3 (patch)
treeb0ce49fcee9fa76d5a394b31e446e53339cbddc5 /include/wlr
parent1628730b09448c596c14f948fce53677980337ce (diff)
Address feedback
Diffstat (limited to 'include/wlr')
-rw-r--r--include/wlr/types/wlr_layer_shell.h5
-rw-r--r--include/wlr/types/wlr_xdg_shell.h4
-rw-r--r--include/wlr/types/wlr_xdg_shell_v6.h4
3 files changed, 7 insertions, 6 deletions
diff --git a/include/wlr/types/wlr_layer_shell.h b/include/wlr/types/wlr_layer_shell.h
index 46d0b09c..0807fe8d 100644
--- a/include/wlr/types/wlr_layer_shell.h
+++ b/include/wlr/types/wlr_layer_shell.h
@@ -48,6 +48,7 @@ struct wlr_layer_surface_state {
struct {
uint32_t top, right, bottom, left;
} margin;
+ bool keyboard_interactive;
// Server
uint32_t width, height;
};
@@ -73,8 +74,8 @@ struct wlr_layer_surface {
uint32_t configure_next_serial;
struct wl_list configure_list;
- struct wlr_layer_surface_state next; // client protocol requests
- struct wlr_layer_surface_state pending; // our configure requests
+ struct wlr_layer_surface_state client_pending;
+ struct wlr_layer_surface_state server_pending;
struct wlr_layer_surface_state current;
struct wl_listener surface_destroy_listener;
diff --git a/include/wlr/types/wlr_xdg_shell.h b/include/wlr/types/wlr_xdg_shell.h
index 18596462..9938f4b1 100644
--- a/include/wlr/types/wlr_xdg_shell.h
+++ b/include/wlr/types/wlr_xdg_shell.h
@@ -78,8 +78,8 @@ struct wlr_xdg_toplevel {
struct wlr_xdg_surface *parent;
bool added;
- struct wlr_xdg_toplevel_state next; // client protocol requests
- struct wlr_xdg_toplevel_state pending; // our configure requests
+ struct wlr_xdg_toplevel_state client_pending;
+ struct wlr_xdg_toplevel_state server_pending;
struct wlr_xdg_toplevel_state current;
char *title;
diff --git a/include/wlr/types/wlr_xdg_shell_v6.h b/include/wlr/types/wlr_xdg_shell_v6.h
index c6820f01..0867b2f6 100644
--- a/include/wlr/types/wlr_xdg_shell_v6.h
+++ b/include/wlr/types/wlr_xdg_shell_v6.h
@@ -78,8 +78,8 @@ struct wlr_xdg_toplevel_v6 {
struct wlr_xdg_surface_v6 *parent;
bool added;
- struct wlr_xdg_toplevel_v6_state next; // client protocol requests
- struct wlr_xdg_toplevel_v6_state pending; // user configure requests
+ struct wlr_xdg_toplevel_v6_state client_pending;
+ struct wlr_xdg_toplevel_v6_state server_pending;
struct wlr_xdg_toplevel_v6_state current;
char *title;