Merge pull request #25 from briskt/master

add an option to disable layout toggle
tbocek · May 29, 2023 · b6fa657 · b6fa657
2 parents f404fbe + e5ec4f7
commit b6fa657
Showing 1 changed file with 11 additions and 6 deletions.
diff --git a/dvorak.c b/dvorak.c
@@ -212,7 +212,9 @@ void usage(const char *path) {
                     "Specifies which device should be captured.\n");
     fprintf(stderr, "  -m STRING\t\t"
                     "Match only the STRING with the USB device name. \n"
-                    "\t\t\tSTRING can contain multiple words, separated by space.\n\n");
+                    "\t\t\tSTRING can contain multiple words, separated by space.\n");
+    fprintf(stderr, "  -t\t\t\t"
+                    "Disable layout toggle feature (press Left-Alt 3 times to switch layout).\n\n");
     fprintf(stderr, "example: %s -u -d /dev/input/by-id/usb-Logitech_USB_Receiver-if02-event-kbd -m \"k750 k350\"\n", basename);
 }
 
@@ -222,12 +224,12 @@ int main(int argc, char *argv[]) {
     struct uinput_setup usetup;
     ssize_t n;
     int fdi, fdo, i, mod_current, code, name_ret, mod_state = 0, array_qwerty_counter = 0, array_umlaut_counter = 0, lAlt = 0, opt;
-    bool alt_gr = false, isDvorak = false, isUmlaut = false, lshift = false, rshift = false;
+    bool alt_gr = false, isDvorak = false, isUmlaut = false, lshift = false, rshift = false, noToggle = false;
     int array_qwerty[MAX_LENGTH] = {0}, array_umlaut[MAX_LENGTH] = {0};
     char keyboard_name[UINPUT_MAX_NAME_SIZE] = "Unknown";
 
     char *device = NULL, *match = NULL;
-    while ((opt = getopt(argc, argv, "ud:m:")) != -1) {
+    while ((opt = getopt(argc, argv, "ud:m:t")) != -1) {
         switch (opt) {
             case 'u':
                 isUmlaut = true;
@@ -238,6 +240,9 @@ int main(int argc, char *argv[]) {
             case 'm':
                 match = optarg;
                 break;
+            case 't':
+                noToggle = true;
+                break;
             case '?':
                 usage(argv[0]);
                 return EXIT_FAILURE;
@@ -410,9 +415,9 @@ int main(int argc, char *argv[]) {
             break;
         }
 
-        //if l-alt is pressed 3 times, the dvorak mapping is disabled, if it is
-        //again pressed 3 times, it will be enabled again
-        if (ev.code == 56) {
+        //when not disabled by the -t option, if l-alt is pressed 3 times, the dvorak mapping is disabled,
+        //if it is again pressed 3 times, it will be enabled again
+        if (!noToggle && ev.code == 56) {
             if (ev.value == 1 && ++lAlt >= 3) {
                 isDvorak = !isDvorak;
                 lAlt = 0;