[gtk+] broadway: Break out broadway protocol in its own header
- From: Alexander Larsson <alexl src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk+] broadway: Break out broadway protocol in its own header
- Date: Thu, 27 Dec 2012 21:51:07 +0000 (UTC)
commit 95a0c055da98e7718dc875e2b52f7feefed4140b
Author: Alexander Larsson <alexl redhat com>
Date: Thu Dec 20 13:07:29 2012 +0100
broadway: Break out broadway protocol in its own header
gdk/broadway/Makefile.am | 1 +
gdk/broadway/broadway-protocol.h | 83 +++++++++++++++++++++++++++++++++++++
gdk/broadway/gdkbroadway-server.h | 77 +---------------------------------
3 files changed, 85 insertions(+), 76 deletions(-)
---
diff --git a/gdk/broadway/Makefile.am b/gdk/broadway/Makefile.am
index d608b6e..2352c66 100644
--- a/gdk/broadway/Makefile.am
+++ b/gdk/broadway/Makefile.am
@@ -30,6 +30,7 @@ libgdkbroadwayinclude_HEADERS = \
libbroadway_la_SOURCES = \
gdkbroadway-server.h \
+ broadway-protocol.h \
gdkbroadway-server.c \
broadway.h \
broadway.c
diff --git a/gdk/broadway/broadway-protocol.h b/gdk/broadway/broadway-protocol.h
new file mode 100644
index 0000000..8fd1369
--- /dev/null
+++ b/gdk/broadway/broadway-protocol.h
@@ -0,0 +1,83 @@
+#ifndef __BROADWAY_PROTOCOL_H__
+#define __BROADWAY_PROTOCOL_H__
+
+#include <glib.h>
+
+typedef struct {
+ guint8 type;
+ guint32 serial;
+ guint64 time;
+} BroadwayInputBaseMsg;
+
+typedef struct {
+ BroadwayInputBaseMsg base;
+ guint32 mouse_window_id; /* The real window, not taking grabs into account */
+ guint32 event_window_id;
+ gint32 root_x;
+ gint32 root_y;
+ gint32 win_x;
+ gint32 win_y;
+ guint32 state;
+} BroadwayInputPointerMsg;
+
+typedef struct {
+ BroadwayInputPointerMsg pointer;
+ guint32 mode;
+} BroadwayInputCrossingMsg;
+
+typedef struct {
+ BroadwayInputPointerMsg pointer;
+ guint32 button;
+} BroadwayInputButtonMsg;
+
+typedef struct {
+ BroadwayInputPointerMsg pointer;
+ gint32 dir;
+} BroadwayInputScrollMsg;
+
+typedef struct {
+ BroadwayInputBaseMsg base;
+ guint32 mouse_window_id; /* The real window, not taking grabs into account */
+ guint32 state;
+ gint32 key;
+} BroadwayInputKeyMsg;
+
+typedef struct {
+ BroadwayInputBaseMsg base;
+ gint32 res;
+} BroadwayInputGrabReply;
+
+typedef struct {
+ BroadwayInputBaseMsg base;
+ gint32 id;
+ gint32 x;
+ gint32 y;
+ gint32 width;
+ gint32 height;
+} BroadwayInputConfigureNotify;
+
+typedef struct {
+ BroadwayInputBaseMsg base;
+ gint32 width;
+ gint32 height;
+} BroadwayInputScreenResizeNotify;
+
+typedef struct {
+ BroadwayInputBaseMsg base;
+ gint32 id;
+} BroadwayInputDeleteNotify;
+
+typedef union {
+ BroadwayInputBaseMsg base;
+ BroadwayInputPointerMsg pointer;
+ BroadwayInputCrossingMsg crossing;
+ BroadwayInputButtonMsg button;
+ BroadwayInputScrollMsg scroll;
+ BroadwayInputKeyMsg key;
+ BroadwayInputGrabReply grab_reply;
+ BroadwayInputConfigureNotify configure_notify;
+ BroadwayInputDeleteNotify delete_notify;
+ BroadwayInputScreenResizeNotify screen_resize_notify;
+} BroadwayInputMsg;
+
+#endif /* __BROADWAY_PROTOCOL_H__ */
diff --git a/gdk/broadway/gdkbroadway-server.h b/gdk/broadway/gdkbroadway-server.h
index e9f7742..fdd769a 100644
--- a/gdk/broadway/gdkbroadway-server.h
+++ b/gdk/broadway/gdkbroadway-server.h
@@ -2,6 +2,7 @@
#define __GDK_BROADWAY_SERVER__
#include <gdk/gdktypes.h>
+#include "broadway-protocol.h"
typedef struct _GdkBroadwayServer GdkBroadwayServer;
typedef struct _GdkBroadwayServerClass GdkBroadwayServerClass;
@@ -13,82 +14,6 @@ typedef struct _GdkBroadwayServerClass GdkBroadwayServerClass;
#define GDK_IS_BROADWAY_SERVER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GDK_TYPE_BROADWAY_SERVER))
#define GDK_BROADWAY_SERVER_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GDK_TYPE_BROADWAY_SERVER, GdkBroadwayServerClass))
-typedef struct {
- guint8 type;
- guint32 serial;
- guint64 time;
-} BroadwayInputBaseMsg;
-
-typedef struct {
- BroadwayInputBaseMsg base;
- guint32 mouse_window_id; /* The real window, not taking grabs into account */
- guint32 event_window_id;
- gint32 root_x;
- gint32 root_y;
- gint32 win_x;
- gint32 win_y;
- guint32 state;
-} BroadwayInputPointerMsg;
-
-typedef struct {
- BroadwayInputPointerMsg pointer;
- guint32 mode;
-} BroadwayInputCrossingMsg;
-
-typedef struct {
- BroadwayInputPointerMsg pointer;
- guint32 button;
-} BroadwayInputButtonMsg;
-
-typedef struct {
- BroadwayInputPointerMsg pointer;
- gint32 dir;
-} BroadwayInputScrollMsg;
-
-typedef struct {
- BroadwayInputBaseMsg base;
- guint32 mouse_window_id; /* The real window, not taking grabs into account */
- guint32 state;
- gint32 key;
-} BroadwayInputKeyMsg;
-
-typedef struct {
- BroadwayInputBaseMsg base;
- gint32 res;
-} BroadwayInputGrabReply;
-
-typedef struct {
- BroadwayInputBaseMsg base;
- gint32 id;
- gint32 x;
- gint32 y;
- gint32 width;
- gint32 height;
-} BroadwayInputConfigureNotify;
-
-typedef struct {
- BroadwayInputBaseMsg base;
- gint32 width;
- gint32 height;
-} BroadwayInputScreenResizeNotify;
-
-typedef struct {
- BroadwayInputBaseMsg base;
- gint32 id;
-} BroadwayInputDeleteNotify;
-
-typedef union {
- BroadwayInputBaseMsg base;
- BroadwayInputPointerMsg pointer;
- BroadwayInputCrossingMsg crossing;
- BroadwayInputButtonMsg button;
- BroadwayInputScrollMsg scroll;
- BroadwayInputKeyMsg key;
- BroadwayInputGrabReply grab_reply;
- BroadwayInputConfigureNotify configure_notify;
- BroadwayInputDeleteNotify delete_notify;
- BroadwayInputScreenResizeNotify screen_resize_notify;
-} BroadwayInputMsg;
GdkBroadwayServer *_gdk_broadway_server_new (int port,
GError **error);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]