devilhorns pushed a commit to branch master.
commit 326a53f9b3ed7c8306ab966002756fea3522f0dc
Author: Chris Michael <[email protected]>
Date: Wed Apr 17 11:13:34 2013 +0100
Fix typo in definition of Output_Mode structure.
Add a "Terminal" structure to represent tty's for drm compositing.
Signed-off-by: Chris Michael <[email protected]>
---
src/bin/e_comp_wl.h | 31 +++++++++++++++++++++++++++++--
1 file changed, 29 insertions(+), 2 deletions(-)
diff --git a/src/bin/e_comp_wl.h b/src/bin/e_comp_wl.h
index f65b61c..6396933 100644
--- a/src/bin/e_comp_wl.h
+++ b/src/bin/e_comp_wl.h
@@ -1,4 +1,5 @@
#ifdef E_TYPEDEFS
+
#else
# ifndef E_COMP_WL_H
# define E_COMP_WL_H
@@ -7,6 +8,10 @@
# include <wayland-server.h>
# include <xkbcommon/xkbcommon.h>
+/* headers for terminal support */
+# include <termios.h>
+# include <linux/vt.h>
+
# ifdef __linux__
# include <linux/input.h>
# else
@@ -39,7 +44,8 @@ typedef struct _E_Wayland_Keyboard_Info
E_Wayland_Keyboard_Info;
typedef struct _E_Wayland_Input E_Wayland_Input;
typedef struct _E_Wayland_Compositor E_Wayland_Compositor;
typedef struct _E_Wayland_Output E_Wayland_Output;
-typedef struct _E_Wayland_Ouput_Mode E_Wayland_Output_Mode;
+typedef struct _E_Wayland_Output_Mode E_Wayland_Output_Mode;
+typedef struct _E_Wayland_Terminal E_Wayland_Terminal;
typedef struct _E_Wayland_Plane E_Wayland_Plane;
enum _E_Wayland_Shell_Surface_Type
@@ -117,7 +123,6 @@ struct _E_Wayland_Surface
E_Border *bd;
Eina_List *bd_hooks;
- /* E_Border_Hook *bd_hook; */
E_Wayland_Shell_Surface *shell_surface;
Eina_Bool mapped : 1;
@@ -343,6 +348,28 @@ struct _E_Wayland_Output_Mode
unsigned int refresh;
};
+struct _E_Wayland_Terminal
+{
+ E_Wayland_Compositor *compositor;
+
+ int fd, kbd_mode;
+
+ struct termios attributes;
+
+ struct
+ {
+ struct wl_event_source *input;
+ struct wl_event_source *vt;
+ } wl;
+
+ struct
+ {
+ void (*func) (E_Wayland_Compositor *compositor, int event);
+ int current, starting;
+ Eina_Bool exists : 1;
+ } vt;
+};
+
struct _E_Wayland_Plane
{
pixman_region32_t damage, clip;
--
------------------------------------------------------------------------------
Precog is a next-generation analytics platform capable of advanced
analytics on semi-structured data. The platform includes APIs for building
apps and a phenomenal toolset for data science. Developers can use
our toolset for easy data analysis & visualization. Get a free account!
http://www2.precog.com/precogplatform/slashdotnewsletter
