From: David Herrmann <dh.herrmann@googlemail.com>
Date: Tue, 11 Sep 2012 17:33:58 +0000 (+0200)
Subject: uterm: move uterm_vt to the end
X-Git-Tag: kmscon-7~556
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=085aef9e38e063fd41ba14cd9cdeb412b9204a95;p=platform%2Fupstream%2Fkmscon.git

uterm: move uterm_vt to the end

Move uterm_vt to the end of the file to avoid forward declaration of
uterm_input.

Signed-off-by: David Herrmann <dh.herrmann@googlemail.com>
---

diff --git a/src/uterm.h b/src/uterm.h
index 71fe5bc..171e7e3 100644
--- a/src/uterm.h
+++ b/src/uterm.h
@@ -45,45 +45,6 @@
 #include "eloop.h"
 
 /*
- * Virtual Terminals
- * Virtual terminals allow controlling multiple virtual terminals on one real
- * terminal. It is multi-seat capable and fully asynchronous.
- */
-
-struct uterm_input;
-struct uterm_vt;
-struct uterm_vt_master;
-
-enum uterm_vt_action {
-	UTERM_VT_ACTIVATE,
-	UTERM_VT_DEACTIVATE,
-};
-
-enum uterm_vt_mode {
-	UTERM_VT_REAL,
-	UTERM_VT_FAKE,
-	UTERM_VT_DEAD,
-};
-
-typedef int (*uterm_vt_cb) (struct uterm_vt *vt, unsigned int action,
-			    void *data);
-
-int uterm_vt_master_new(struct uterm_vt_master **out,
-			struct ev_eloop *eloop);
-void uterm_vt_master_ref(struct uterm_vt_master *vtm);
-void uterm_vt_master_unref(struct uterm_vt_master *vtm);
-
-int uterm_vt_allocate(struct uterm_vt_master *vt, struct uterm_vt **out,
-		      const char *seat, struct uterm_input *input,
-		      uterm_vt_cb cb, void *data);
-void uterm_vt_deallocate(struct uterm_vt *vt);
-void uterm_vt_ref(struct uterm_vt *vt);
-void uterm_vt_unref(struct uterm_vt *vt);
-
-int uterm_vt_activate(struct uterm_vt *vt);
-int uterm_vt_deactivate(struct uterm_vt *vt);
-
-/*
  * Video Control
  * Linux provides 2 famous ways to access the video hardware: fbdev and drm
  * fbdev is the older one of both and is simply a mmap() of the framebuffer into
@@ -342,6 +303,44 @@ int uterm_input_string_to_keysym(struct uterm_input *input, const char *n,
 				 uint32_t *out);
 
 /*
+ * Virtual Terminals
+ * Virtual terminals allow controlling multiple virtual terminals on one real
+ * terminal. It is multi-seat capable and fully asynchronous.
+ */
+
+struct uterm_vt;
+struct uterm_vt_master;
+
+enum uterm_vt_action {
+	UTERM_VT_ACTIVATE,
+	UTERM_VT_DEACTIVATE,
+};
+
+enum uterm_vt_mode {
+	UTERM_VT_REAL,
+	UTERM_VT_FAKE,
+	UTERM_VT_DEAD,
+};
+
+typedef int (*uterm_vt_cb) (struct uterm_vt *vt, unsigned int action,
+			    void *data);
+
+int uterm_vt_master_new(struct uterm_vt_master **out,
+			struct ev_eloop *eloop);
+void uterm_vt_master_ref(struct uterm_vt_master *vtm);
+void uterm_vt_master_unref(struct uterm_vt_master *vtm);
+
+int uterm_vt_allocate(struct uterm_vt_master *vt, struct uterm_vt **out,
+		      const char *seat, struct uterm_input *input,
+		      uterm_vt_cb cb, void *data);
+void uterm_vt_deallocate(struct uterm_vt *vt);
+void uterm_vt_ref(struct uterm_vt *vt);
+void uterm_vt_unref(struct uterm_vt *vt);
+
+int uterm_vt_activate(struct uterm_vt *vt);
+int uterm_vt_deactivate(struct uterm_vt *vt);
+
+/*
  * System Monitor
  * This watches the system for new seats, graphics devices or other devices that
  * are used by terminals.