From 52c2139ebc396e00fd5978695805749cc4fdeca7 Mon Sep 17 00:00:00 2001
From: girst <girst@users.noreply.github.com>
Date: Sat, 13 Feb 2016 22:20:56 +0100
Subject: [PATCH] moved tolay() from main.c to scancodes.c

---
 main.c      | 16 ----------------
 scancodes.c |  8 ++++++++
 scancodes.h |  8 ++++++++
 3 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/main.c b/main.c
index e4f34c8..1786371 100644
--- a/main.c
+++ b/main.c
@@ -19,12 +19,6 @@ enum params {//argv-indices:
 	P_STR, //string to type
 	NUM_P  //number of parameters
 };
-enum kbdl {  //keyboard layouts:
-	na_NA, //reserved
-	en_US, 
-	de_AT,
-	de_ND //de_AT-nodeadkeys
-};
 enum uni_m {//unicode methods:
 	SKIP, //ignore any keys not on the layout
 	GTK_HOLD, //hold ctrl and shift while entering hex values
@@ -40,7 +34,6 @@ enum errors {
 };
 
 void send_key (FILE* hid_dev, unsigned short key, unsigned short mod);
-struct layout* tolay (struct keysym* s, enum kbdl layout);
 enum errors send_unicode (FILE* hid_dev, unsigned int unicode, enum uni_m method, enum kbdl layout);
 
 int main (int argc, char** argv) {
@@ -99,15 +92,6 @@ void send_key (FILE* hid_dev, unsigned short key, unsigned short mod) {
 	fprintf (hid_dev, "%c%c%c%c%c%c%c%c", mod, '\0', key, '\0', '\0', '\0', '\0', '\0');
 }
 
-struct layout* tolay (struct keysym* s, enum kbdl layout) {
-	switch (layout) {
-	case en_US: return &(s->en_us);
-	case de_AT: return &(s->de_at);
-	case de_ND: return &(s->de_nd);
-	default: return NULL;
-	}
-}
-
 enum errors send_unicode (FILE* hid_dev, unsigned int unicode, enum uni_m method, enum kbdl layout) {
 	char buf[10];
 	struct keysym* s;
diff --git a/scancodes.c b/scancodes.c
index 93551f9..fa03ce7 100644
--- a/scancodes.c
+++ b/scancodes.c
@@ -122,3 +122,11 @@ struct keysym* toscan (const char* utf8) {
 	return NULL; // error
 }
 
+struct layout* tolay (struct keysym* s, enum kbdl layout) {
+        switch (layout) {
+        case en_US: return &(s->en_us);
+        case de_AT: return &(s->de_at);
+        case de_ND: return &(s->de_nd);
+        default: return NULL;
+        }
+}
diff --git a/scancodes.h b/scancodes.h
index 85dbcfa..e64124f 100644
--- a/scancodes.h
+++ b/scancodes.h
@@ -27,5 +27,13 @@ struct keysym {
 	unsigned int unicode; //the unicode number to send via alt+numpad or ^U if char is not available in a keyboard layout
 };
 
+enum kbdl {  //keyboard layouts:
+        na_NA, //reserved
+        en_US,
+        de_AT,
+        de_ND //de_AT-nodeadkeys
+};
+
 struct keysym* toscan (const char* utf8);//returns the layout struct of a keysym
+struct layout* tolay (struct keysym* s, enum kbdl layout); //returns layout struct from keysym struct
 #endif
-- 
2.39.3