Add configuration item to set keyboard name.

inwskatsube · Dec 31, 2017 · 8626ee0 · 8626ee0
1 parent 35b2ec1
commit 8626ee0
Show file tree

Hide file tree

Showing 3 changed files with 54 additions and 23 deletions.
diff --git a/src/config.c b/src/config.c
@@ -326,7 +326,10 @@ Boolean load_config(char* path)
 				set_inputdevice_path(devpath);
 			}
 		} else */
-		if (strcasecmp(key, "LOYAKEY")==0) {
+		if (strcasecmp(key, "KEYBOARDNAME")==0) {
+			printf("KEYBOARDNAME: %s\n", value);
+			set_keyboardname(value);
+		} else if (strcasecmp(key, "LOYAKEY")==0) {
 			kc = keyname_to_code(value);
 			if (kc != 0) {
 				printf("LOYAKEY: %s\n", value);
@@ -399,6 +402,9 @@ Boolean save_config(char *path)
 	if ((fp = fopen(path, "w")) == NULL) {
 		return FALSE;
 	}
+	fprintf(fp, "# キーボード名\n");
+	fprintf(fp, "#KEYBOARDNAME=XXXX\n");
+	fprintf(fp, "\n");
 	fprintf(fp, "# 左親指キー　(スペースキー＝SPACE, 無変換キー＝MUHENKAN)\n");
 	fprintf(fp, "LOYAKEY=SPACE\n");
 	fprintf(fp, "\n");

diff --git a/src/oyainput.c b/src/oyainput.c
@@ -26,11 +26,20 @@ static int paused = 0;
 static int imtype = 0; // (0: none, 1:fcitx, 2:ibus, 3:uim)
 static __u16 on_keycode = 0;
 static __u16 off_keycode = 0;
+static char keyboardname[BUFSIZE+1] = {};
 
 int get_kbdevie_output() {
 	return fdo;
 }
 
+void set_keyboardname(char* name) {
+	strncpy(keyboardname, name, BUFSIZE);
+}
+
+const char* get_keyboardname() {
+	return keyboardname;
+}
+
 int get_imtype() {
 	return imtype;
 }
@@ -187,28 +196,6 @@ int main(int argc, char *argv[]) {
 	// initialize oyayubi state by default values.
 	oyayubi_state_init();
 
-	// try search keyboard input device event file form /dev/input/event0-9
-	KBDDEVINFO devs[5];
-	int devcnt;
-	int usedevno = 0;
-	find_kbdevent_info(devs, &devcnt, 5);
-	if (devcnt == 0) {
-		die("error: Cannot find keyboard device.");
-	} else if (devcnt >= 2) {
-		printf("multiple keyboard is detected.\n");
-		for (int i = 0;i < devcnt; i++) {
-			printf("%d: %s\n", i, devs[i].name);
-		}
-		printf("Enter keyboard number:");
-		scanf("%d", &usedevno);
-		if (usedevno < 0 || usedevno > devcnt - 1) {
-			usedevno = 0;
-		}
-	}
-	strcpy(devpath, INPUT_EVENT_PATH);
-	strcat(devpath, "event");
-	strncat(devpath, devs[usedevno].devno, 2);
-
 	char user_name[BUFSIZE+1] = {};
 	if (getenv("USER")) {
 		strncpy(user_name, getenv("USER"), BUFSIZE);
@@ -237,6 +224,42 @@ int main(int argc, char *argv[]) {
 		die("error: Cannot load config file!\n");
 	}
 
+	// try search keyboard input device event file form /dev/input/event0-9
+	KBDDEVINFO devs[5];
+	int devcnt;
+	int usedevno = -1;
+	find_kbdevent_info(devs, &devcnt, 5);
+	if (devcnt == 0) {
+		die("error: Cannot find keyboard device.");
+	} else if (devcnt >= 2) {
+		printf("multiple keyboard is detected.\n");
+		if (strlen(get_keyboardname()) > 0) {
+			for (int i = 0;i < devcnt; i++) {
+				if (strncmp(devs[i].name, get_keyboardname(), strlen(get_keyboardname())) == 0) {
+					usedevno = i;
+					printf("use keyboard '%s'\n", devs[usedevno].name);
+					break;
+				}
+			}
+			if (usedevno < 0) {
+				printf("keyboardname '%s' not found\n\n", get_keyboardname());
+			}
+		}
+		if (usedevno < 0) {
+			for (int i = 0;i < devcnt; i++) {
+				printf("%d: %s\n", i, devs[i].name);
+			}
+			printf("Enter keyboard number:");
+			scanf("%d", &usedevno);
+		}
+		if (usedevno < 0 || usedevno > devcnt - 1) {
+			usedevno = 0;
+		}
+	}
+	strcpy(devpath, INPUT_EVENT_PATH);
+	strcat(devpath, "event");
+	strncat(devpath, devs[usedevno].devno, 2);
+
 	if (get_imtype() == 1 &&
 		0 != system("type fcitx-remote > /dev/null")) {
 		die("error: fcitx is not installed!");

diff --git a/src/oyainput.h b/src/oyainput.h
@@ -3,6 +3,8 @@
  */
 
 int get_kbdevie_output();
+void set_keyboardname(char* value);
+const char* get_keyboardname();
 void set_imtype(char* imname);
 int get_imtype();
 void set_inputdevice_path(char * new_devpath);