uterm: move uterm_internal.h to uterm_input.h

uterm_internal.h contains only input related content so we can rename it
and remove all the inclusions where it is not needed.

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

diff --git a/src/uterm_input.c b/src/uterm_input.c
index 45790f5..9146937 100644 (file)
--- a/src/uterm_input.c
+++ b/src/uterm_input.c
@@ -40,7 +40,7 @@
 #include "log.h"
 #include "static_misc.h"
 #include "uterm.h"
-#include "uterm_internal.h"
+#include "uterm_input.h"
 
 #define LOG_SUBSYSTEM "input"
 

diff --git a/src/uterm_internal.h b/src/uterm_input.h
similarity index 97%
rename from src/uterm_internal.h
rename to src/uterm_input.h
index 568b6e9..b5cd2df 100644 (file)
--- a/src/uterm_internal.h
+++ b/src/uterm_input.h
@@ -25,11 +25,10 @@
 
 /* Internal definitions */
 
-#ifndef UTERM_INTERNAL_H
-#define UTERM_INTERNAL_H
+#ifndef UTERM_INPUT_H
+#define UTERM_INPUT_H
 
 #include <inttypes.h>
-#include <libudev.h>
 #include <limits.h>
 #include <stdbool.h>
 #include <stdlib.h>
@@ -37,13 +36,6 @@
 #include "static_misc.h"
 #include "uterm.h"
 
-static inline bool input_bit_is_set(const unsigned long *array, int bit)
-{
-       return !!(array[bit / LONG_BIT] & (1LL << (bit % LONG_BIT)));
-}
-
-/* kbd API */
-
 struct kbd_desc;
 struct kbd_dev;
 
@@ -247,4 +239,9 @@ static inline int kbd_dev_process(struct kbd_dev *dev,
        return dev->ops->process(dev, key_state, code, out);
 }
 
-#endif /* UTERM_INTERNAL_H */
+static inline bool input_bit_is_set(const unsigned long *array, int bit)
+{
+       return !!(array[bit / LONG_BIT] & (1LL << (bit % LONG_BIT)));
+}
+
+#endif /* UTERM_INPUT_H */

diff --git a/src/uterm_input_plain.c b/src/uterm_input_plain.c
index 40c42eb..19e138b 100644 (file)
--- a/src/uterm_input_plain.c
+++ b/src/uterm_input_plain.c
@@ -45,7 +45,7 @@
 #include "imKStoUCS.h"
 #include "log.h"
 #include "uterm.h"
-#include "uterm_internal.h"
+#include "uterm_input.h"
 
 #define LOG_SUBSYSTEM "input_plain"
 

diff --git a/src/uterm_input_uxkb.c b/src/uterm_input_uxkb.c
index 6b9a6a5..59a5b85 100644 (file)
--- a/src/uterm_input_uxkb.c
+++ b/src/uterm_input_uxkb.c
@@ -33,7 +33,7 @@
 #include <xkbcommon/xkbcommon.h>
 #include "log.h"
 #include "uterm.h"
-#include "uterm_internal.h"
+#include "uterm_input.h"
 
 #define LOG_SUBSYSTEM "input_uxkb"
 

diff --git a/src/uterm_monitor.c b/src/uterm_monitor.c
index b95082d..398a8a2 100644 (file)
--- a/src/uterm_monitor.c
+++ b/src/uterm_monitor.c
@@ -40,7 +40,6 @@
 #include "log.h"
 #include "static_misc.h"
 #include "uterm.h"
-#include "uterm_internal.h"
 
 #ifdef UTERM_HAVE_SYSTEMD
        #include <systemd/sd-login.h>

diff --git a/src/uterm_video.c b/src/uterm_video.c
index 652dd3a..7c3dcf3 100644 (file)
--- a/src/uterm_video.c
+++ b/src/uterm_video.c
@@ -39,7 +39,6 @@
 #include "log.h"
 #include "static_misc.h"
 #include "uterm.h"
-#include "uterm_internal.h"
 #include "uterm_video.h"
 
 #define LOG_SUBSYSTEM "video"

diff --git a/src/uterm_video_drm.c b/src/uterm_video_drm.c
index 4a819b8..8d23e49 100644 (file)
--- a/src/uterm_video_drm.c
+++ b/src/uterm_video_drm.c
@@ -48,7 +48,6 @@
 #include "log.h"
 #include "static_misc.h"
 #include "uterm.h"
-#include "uterm_internal.h"
 #include "uterm_video.h"
 
 #define LOG_SUBSYSTEM "video_drm"

diff --git a/src/uterm_video_dumb.c b/src/uterm_video_dumb.c
index b5dadc3..8da518a 100644 (file)
--- a/src/uterm_video_dumb.c
+++ b/src/uterm_video_dumb.c
@@ -41,7 +41,6 @@
 #include "log.h"
 #include "static_misc.h"
 #include "uterm.h"
-#include "uterm_internal.h"
 #include "uterm_video.h"
 
 #define LOG_SUBSYSTEM "video_dumb"

diff --git a/src/uterm_video_fbdev.c b/src/uterm_video_fbdev.c
index 49a7c06..e9f5c1d 100644 (file)
--- a/src/uterm_video_fbdev.c
+++ b/src/uterm_video_fbdev.c
@@ -39,7 +39,6 @@
 #include "log.h"
 #include "static_misc.h"
 #include "uterm.h"
-#include "uterm_internal.h"
 #include "uterm_video.h"
 
 #define LOG_SUBSYSTEM "video_fbdev"

diff --git a/src/uterm_vt.c b/src/uterm_vt.c
index 2e53d58..b056959 100644 (file)
--- a/src/uterm_vt.c
+++ b/src/uterm_vt.c
@@ -45,7 +45,6 @@
 #include "log.h"
 #include "static_misc.h"
 #include "uterm.h"
-#include "uterm_internal.h"
 
 #define LOG_SUBSYSTEM "vt"