uterm: move uterm.h to uterm_monitor.h

uterm.h contains only uterm-monitor related APIs so rename it.

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

diff --git a/Makefile.am b/Makefile.am
index dcb35b6..abc8e57 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -219,8 +219,8 @@ libtsm_la_LDFLAGS = \
 if BUILD_ENABLE_UTERM
 lib_LTLIBRARIES += libuterm.la
 include_HEADERS += \
-       src/uterm.h \
        src/uterm_input.h \
+       src/uterm_monitor.h \
        src/uterm_video.h \
        src/uterm_vt.h
 pkgconfig_DATA += docs/pc/libuterm.pc
@@ -230,8 +230,8 @@ libuterm_la_SOURCES = \
        $(SHL_DLIST) \
        $(SHL_HOOK) \
        $(SHL_MISC) \
-       src/uterm.h \
        src/uterm_input.h \
+       src/uterm_monitor.h \
        src/uterm_video.h \
        src/uterm_vt.h \
        src/uterm_input_internal.h \

diff --git a/src/kmscon_main.c b/src/kmscon_main.c
index 470b2fa..bf07cdc 100644 (file)
--- a/src/kmscon_main.c
+++ b/src/kmscon_main.c
@@ -40,8 +40,8 @@
 #include "shl_dlist.h"
 #include "shl_misc.h"
 #include "text.h"
-#include "uterm.h"
 #include "uterm_input.h"
+#include "uterm_monitor.h"
 #include "uterm_video.h"
 #include "uterm_vt.h"
 

diff --git a/src/uterm_monitor.c b/src/uterm_monitor.c
index 7080445..409b16e 100644 (file)
--- a/src/uterm_monitor.c
+++ b/src/uterm_monitor.c
@@ -42,7 +42,7 @@
 #include <unistd.h>
 #include "log.h"
 #include "shl_dlist.h"
-#include "uterm.h"
+#include "uterm_monitor.h"
 #include "uterm_systemd_internal.h"
 
 #define LOG_SUBSYSTEM "monitor"

diff --git a/src/uterm.h b/src/uterm_monitor.h
similarity index 71%
rename from src/uterm.h
rename to src/uterm_monitor.h
index c00e326..caf70c3 100644 (file)
--- a/src/uterm.h
+++ b/src/uterm_monitor.h
@@ -1,7 +1,7 @@
 /*
- * uterm - Linux User-Space Terminal
+ * uterm - Linux User-Space Terminal System Monitor
  *
- * Copyright (c) 2011-2012 David Herrmann <dh.herrmann@googlemail.com>
+ * Copyright (c) 2011-2013 David Herrmann <dh.herrmann@googlemail.com>
  *
  * Permission is hereby granted, free of charge, to any person obtaining
  * a copy of this software and associated documentation files
@@ -24,31 +24,18 @@
  */
 
 /*
- * Linux User-Space Terminal
- * Historically, terminals were implemented in kernel-space on linux. With the
- * development of KMS and the linux input-API it is now possible to implement
- * all we need in user-space. This allows to disable the in-kernel CONFIG_VT and
- * similar options and reduce the kernel-overhead.
- * This library provides an API to implement terminals in user-space. This is
- * not limited to classic text-terminals but rather to all kind of applications
- * that need graphical output (with OpenGL) or direct keyboard/mouse/etc. input
- * from the kernel.
+ * System Monitor
+ * This watches the system for new seats, graphics devices or other devices that
+ * are used by terminals.
  */
 
-#ifndef UTERM_UTERM_H
-#define UTERM_UTERM_H
+#ifndef UTERM_UTERM_MONITOR_H
+#define UTERM_UTERM_MONITOR_H
 
 #include <eloop.h>
 #include <inttypes.h>
 #include <stdbool.h>
 #include <stdlib.h>
-#include <uterm_input.h>
-
-/*
- * System Monitor
- * This watches the system for new seats, graphics devices or other devices that
- * are used by terminals.
- */
 
 struct uterm_monitor;
 struct uterm_monitor_seat;
@@ -89,13 +76,11 @@ struct uterm_monitor_event {
 };
 
 typedef void (*uterm_monitor_cb) (struct uterm_monitor *mon,
-                                       struct uterm_monitor_event *event,
-                                       void *data);
+                                 struct uterm_monitor_event *event,
+                                 void *data);
 
-int uterm_monitor_new(struct uterm_monitor **out,
-                       struct ev_eloop *eloop,
-                       uterm_monitor_cb cb,
-                       void *data);
+int uterm_monitor_new(struct uterm_monitor **out, struct ev_eloop *eloop,
+                     uterm_monitor_cb cb, void *data);
 void uterm_monitor_ref(struct uterm_monitor *mon);
 void uterm_monitor_unref(struct uterm_monitor *mon);
 void uterm_monitor_scan(struct uterm_monitor *mon);
@@ -103,4 +88,4 @@ void uterm_monitor_scan(struct uterm_monitor *mon);
 void uterm_monitor_set_seat_data(struct uterm_monitor_seat *seat, void *data);
 void uterm_monitor_set_dev_data(struct uterm_monitor_dev *dev, void *data);
 
-#endif /* UTERM_UTERM_H */
+#endif /* UTERM_UTERM_MONITOR_H */

diff --git a/src/uterm_systemd.c b/src/uterm_systemd.c
index 4587de1..0240370 100644 (file)
--- a/src/uterm_systemd.c
+++ b/src/uterm_systemd.c
@@ -37,7 +37,7 @@
 #include <systemd/sd-daemon.h>
 #include <systemd/sd-login.h>
 #include "log.h"
-#include "uterm.h"
+#include "uterm_monitor.h"
 #include "uterm_systemd_internal.h"
 
 #define LOG_SUBSYSTEM "systemd"

diff --git a/src/uterm_systemd_internal.h b/src/uterm_systemd_internal.h
index 1eef08a..c3a1fd4 100644 (file)
--- a/src/uterm_systemd_internal.h
+++ b/src/uterm_systemd_internal.h
@@ -33,7 +33,7 @@
 #define UTERM_SYSTEMD_H
 
 #include <stdlib.h>
-#include "uterm.h"
+#include "uterm_monitor.h"
 
 struct uterm_sd;