devilhorns pushed a commit to branch devs/devilhorns/wayland.
commit 5af5d16327f034a804011d871b80aa478fcfb93c
Author: Chris Michael <[email protected]>
Date: Fri Mar 8 12:41:13 2013 +0000
Fix FULLSCREEN typo in Surface_Type enum.
Add pending x/y coordinates for surface.
Add geometry structure for surface.
Add a reference to the shell_surface.
Add flag to indicate if surface is mapped.
Add Title and Class for Shell Surface.
Add parent for Shell Surface.
Add ping timer for Shell Surface.
Add ping callback for compositor.
Signed-off-by: Chris Michael <[email protected]>
---
src/bin/e_comp_wl.h | 29 ++++++++++++++++++++++++++---
1 file changed, 26 insertions(+), 3 deletions(-)
diff --git a/src/bin/e_comp_wl.h b/src/bin/e_comp_wl.h
index 2ca5db4..56200a5 100644
--- a/src/bin/e_comp_wl.h
+++ b/src/bin/e_comp_wl.h
@@ -40,7 +40,7 @@ enum _E_Wayland_Shell_Surface_Type
E_WAYLAND_SHELL_SURFACE_NONE,
E_WAYLAND_SHELL_SURFACE_TOPLEVEL,
E_WAYLAND_SHELL_SURFACE_TRANSIENT,
- E_WAYLAND_SHELL_SURFACE_FULLSCREEM,
+ E_WAYLAND_SHELL_SURFACE_FULLSCREEN,
E_WAYLAND_SHELL_SURFACE_MAXIMIZED,
E_WAYLAND_SHELL_SURFACE_POPUP
};
@@ -70,9 +70,24 @@ struct _E_Wayland_Surface
struct wl_listener buffer_destroy;
struct wl_list frames;
+ Evas_Coord x, y;
+
Eina_Bool remove_buffer : 1;
+ Eina_Bool new_buffer : 1;
} pending;
+ struct
+ {
+ Evas_Coord x, y, w, h;
+ Eina_Bool changed : 1;
+ } geometry;
+
+ Eina_Bool mapped : 1;
+
+ E_Wayland_Shell_Surface *shell_surface;
+
+ Eina_List *handlers;
+
void (*configure) (E_Wayland_Surface *ews, int x, int y, int w, int h);
};
@@ -85,8 +100,14 @@ struct _E_Wayland_Shell_Surface
struct wl_list link;
} wl;
- E_Wayland_Surface *surface;
- E_Wayland_Shell_Surface_Type type;
+ E_Wayland_Surface *surface, *parent;
+ E_Wayland_Shell_Surface_Type type, ntype;
+
+ char *title, *clas;
+
+ Eina_Bool responsive : 1;
+
+ void *ping_timer;
};
struct _E_Wayland_Shell_Interface
@@ -146,6 +167,8 @@ struct _E_Wayland_Compositor
} wl;
Ecore_Fd_Handler *fd_handler;
+
+ void (*ping_cb) (E_Wayland_Surface *ews, unsigned int serial);
};
/* external variables */
--
------------------------------------------------------------------------------
Symantec Endpoint Protection 12 positioned as A LEADER in The Forrester
Wave(TM): Endpoint Security, Q1 2013 and "remains a good choice" in the
endpoint security space. For insight on selecting the right partner to
tackle endpoint security challenges, access the full report.
http://p.sf.net/sfu/symantec-dev2dev