Ticket #23: mc-old_esc_mode.patch

src/key.c

@@ -72 +72 @@
 #define DIF_TIME(t1,t2) ((t2.tv_sec -t1.tv_sec) *1000+ \
                          (t2.tv_usec-t1.tv_usec)/1000)
 
-/* timeout for old_esc_mode in usec */
-#define ESCMODE_TIMEOUT 1000000
-
 /* Linux console keyboard modifiers */
 #define SHIFT_PRESSED           (1 << 0)
 #define ALTR_PRESSED            (1 << 1)
@@ -84 +81 @@
 int mou_auto_repeat = 100;
 int double_click_speed = 250;
 int old_esc_mode = 0;
+int old_esc_mode_timeout = 1000; /* timeout for old_esc_mode in msec */
 
 int use_8th_bit_as_meta = 0;
 
@@ -818 +819 @@
                 if (esctime.tv_sec == -1)
                     return -1;
                 GET_TIME (current);
-                timeout.tv_sec = ESCMODE_TIMEOUT / 1000000 + esctime.tv_sec;
-                timeout.tv_usec = ESCMODE_TIMEOUT % 1000000 + esctime.tv_usec;
+                timeout.tv_sec = old_esc_mode_timeout / 1000 + esctime.tv_sec;
+                timeout.tv_usec = (old_esc_mode_timeout % 1000) * 1000 + esctime.tv_usec;
                 if (timeout.tv_usec > 1000000) {
                     timeout.tv_usec -= 1000000;
                     timeout.tv_sec++;
@@ -1146 +1147 @@
     int c;
     struct timeval timeout;
 
-    timeout.tv_sec = ESCMODE_TIMEOUT / 1000000;
-    timeout.tv_usec = ESCMODE_TIMEOUT % 1000000;
+    timeout.tv_sec = old_esc_mode_timeout / 1000;
+    timeout.tv_usec = (old_esc_mode_timeout % 1000) * 1000;
     nodelay (stdscr, TRUE);
     FD_ZERO (&Read_FD_Set);
     FD_SET (input_fd, &Read_FD_Set);

src/key.h

@@ -26 +26 @@
 
 extern int double_click_speed;
 extern int old_esc_mode;
+extern int old_esc_mode_timeout;
 extern int irix_fn_keys;
 extern int use_8th_bit_as_meta;
 

src/boxes.c

@@ -1121 +1121 @@
     return return_value;
 }
 #endif /* WITH_SMBFS */
+
+#define KBD_MOUSE_SETUP_WIDGETS_COUNT 7
+#define KBD_MOUSE_SETUP_DLG_X_OFFSET 2 /* Horizontal offset */
+#define KBD_MOUSE_SETUP_DLG_Y_OFFSET 2 /* Vertical offset */
+#define KBD_MOUSE_SETUP_DLG_EMPTY_LINES_COUNT 3
+#define KBD_MOUSE_SETUP_LAST_LINE_Y 4
+
+void
+keyboard_mouse_setup_box (void)
+{
+    int dlg_width, dlg_height;
+    int line_length;
+    int cur_line;
+    int old_esc_mode_val;
+    char *old_esc_mode_timeout_val;
+    QuickWidget *widgets, *w, *endw;
+    QuickDialog *dlg;
+    char old_esc_mode_timeout_str[BUF_TINY];
+
+    old_esc_mode_val = old_esc_mode;
+    g_snprintf (old_esc_mode_timeout_str, sizeof (old_esc_mode_timeout_str),
+        " %4i", old_esc_mode_timeout);
+
+    widgets = g_new0 (QuickWidget, (KBD_MOUSE_SETUP_WIDGETS_COUNT + 1));
+    dlg = g_new0 (QuickDialog, 1);
+
+    endw = widgets + KBD_MOUSE_SETUP_WIDGETS_COUNT;
+
+    dlg->title = _(" Keayboard / Mouse Setup ");
+    dlg_width = strlen (dlg->title);
+    dlg_height = 0;
+
+    w = endw - 1;
+
+    /* First line of widgets */
+    w->widget_type = quick_checkbox;
+    w->relative_y = 1;
+    w->text = _("Escape key is cancel key");
+    w->result = &old_esc_mode_val;
+    w--;
+
+    /* Next line of widgets */
+    w->widget_type = quick_label;
+    w->relative_y = 2;
+    w->text = _("Escape key timeout ");
+    w--;
+
+    w->widget_type = quick_input;
+    w->relative_y = 2;
+    w->text = old_esc_mode_timeout_str;
+    /* hotkey_pos contains is used to set the length of the input field. */
+    w->hotkey_pos = strlen (widgets[4].text);
+    w->str_result = &old_esc_mode_timeout_val;
+    w->histname = "escape-key-timeout";
+    w--;
+
+    w->widget_type = quick_label;
+    w->relative_y = 2;
+    w->text = _(" msec");
+    w--;
+
+    /* Last line of widgets */
+    w->widget_type = quick_button;
+    w->relative_y = KBD_MOUSE_SETUP_LAST_LINE_Y;
+    w->text = _("&OK");
+    w->value = B_ENTER;
+    w--;
+
+    w->widget_type = quick_label;
+    w->relative_y = KBD_MOUSE_SETUP_LAST_LINE_Y;
+    w->text = "      "; /* padding */
+    w--;
+
+    w->widget_type = quick_button;
+    w->relative_y = KBD_MOUSE_SETUP_LAST_LINE_Y;
+    w->text = _("&Cancel");
+    w->value = B_CANCEL;
+    w--;
+
+    /* Calculate the dialog width and height based on the dimensions
+       of the enclosed widgets. */
+    w = endw - 1;
+    line_length = 0;
+    cur_line = w->relative_y;
+    for (; w >= widgets; w--) {
+        if (cur_line != w->relative_y) {
+            dlg_height++;
+
+            if (line_length > dlg_width)
+                dlg_width = line_length;
+
+            line_length = 0;
+            cur_line = w->relative_y;
+        }
+
+        w->relative_x = line_length;
+
+        if (w->widget_type == quick_button) {
+            line_length += button_len (w->text,
+                (w->value == B_ENTER ? DEFPUSH_BUTTON : NORMAL_BUTTON));
+        } else {
+            line_length += strlen (w->text);
+
+            if (w->widget_type == quick_checkbox)
+                line_length += 4; /* "[x] " */
+        }
+    }
+    dlg_height++;
+    if (line_length > dlg_width)
+        dlg_width = line_length;
+    else {
+        /* Special handling for the last line of widgets - assume
+           that they must be centered. */
+        line_length = (dlg_width - line_length) / 2;
+        for (w = widgets; w < endw; w++) {
+            if (w->relative_y == KBD_MOUSE_SETUP_LAST_LINE_Y)
+                w->relative_x += line_length;
+        }
+    }
+
+    dlg_width += KBD_MOUSE_SETUP_DLG_X_OFFSET * 2;
+    dlg_height += KBD_MOUSE_SETUP_DLG_Y_OFFSET * 2 +
+        KBD_MOUSE_SETUP_DLG_EMPTY_LINES_COUNT;
+    for (w = widgets; w < endw; w++) {
+        w->x_divisions = dlg_width;
+        w->y_divisions = dlg_height;
+        w->relative_x += KBD_MOUSE_SETUP_DLG_X_OFFSET;
+        w->relative_y += KBD_MOUSE_SETUP_DLG_Y_OFFSET;
+    }
+
+    dlg->xlen = dlg_width;
+    dlg->ylen = dlg_height;
+    dlg->xpos = dlg->ypos = -1;
+    dlg->widgets = widgets;
+    dlg->i18n = 1;
+
+    if (quick_dialog (dlg) != B_CANCEL) {
+        old_esc_mode = old_esc_mode_val;
+        if (strlen (old_esc_mode_timeout_val) > 4) /* i.e. 9999 */
+            old_esc_mode_timeout_val[4] = '\0';
+        old_esc_mode_timeout = atoi (old_esc_mode_timeout_val);
+        g_free (old_esc_mode_timeout_val);
+    }
+
+    g_free (widgets);
+    g_free (dlg);
+}

src/boxes.h

@@ -16 +16 @@
 void    symlink_dialog   (const char *existing, const char *new,
                           char **ret_existing, char **ret_new);
 char   *tree_box         (const char *current_dir);
+void    keyboard_mouse_setup_box (void);
 
 #endif

src/main.c

@@ -917 +935 @@
     {' ', N_("&Layout..."), 'L', layout_cmd},
     {' ', N_("c&Onfirmation..."), 'O', confirm_box},
     {' ', N_("&Display bits..."), 'D', display_bits_box},
+    {' ', N_("Keyboard and &Mouse..."), 'M', keyboard_mouse_setup_box},
     {' ', N_("learn &Keys..."), 'K', learn_keys},
 #ifdef USE_VFS
     {' ', N_("&Virtual FS..."), 'V', configure_vfs},

src/setup.c

@@ -176 +176 @@
     { "drop_menus", &drop_menus },
     { "wrap_mode",  &global_wrap_mode},
     { "old_esc_mode", &old_esc_mode },
+    { "old_esc_mode_timeout", &old_esc_mode_timeout },
     { "cd_symlinks", &cd_symlinks },
     { "show_all_if_ambiguous", &show_all_if_ambiguous },
     { "max_dirt_limit", &max_dirt_limit },