Ticket #1819: 1819-While__pressingPrtScr-comment__pressingDelete-uncomm.patch

edit/edit.c

@@ -2732 +2732 @@
                 break;
             }
         }
-        edit_delete (edit, 0);
+        case_CK_Delete (edit);
         break;
     case CK_Delete_Word_Left:
         edit->over_col = 0;
@@ -3177 +3177 @@
     case CK_Ext_Mode:
         edit->extmod = 1;
         break;
+    case CK_PrtScr:
+        case_CK_PrtScr (edit);
+        break;
     default:
         break;
     }
@@ -3336 +3339 @@
             edit_stack_iterator++)
         g_free (edit_history_moveto[edit_stack_iterator].filename);
 }
+
+void edit_show_bottom (WEdit * edit)
+{
+    edit_cursor_to_bol (edit);
+    if (edit->curs_line >= (edit->total_lines - 1)) {
+        edit->force |= REDRAW_PAGE;
+        return;
+    }
+    edit_move_down (edit, 1, 0);
+    edit_cursor_to_bol (edit);
+    edit->force |= REDRAW_PAGE;
+    if (edit->curs_line > (edit->start_line + edit->num_widget_lines - 3)) {
+        edit_update_screen (edit);
+        edit_move_display (edit, edit->start_line + 1);
+        edit->force |= REDRAW_PAGE;
+    }
+}
+
+int it_is_ELF (WEdit * edit)
+{
+    if ('E' == edit_get_byte (edit, 1)) {
+        if ('L' == edit_get_byte (edit, 2)) {
+            if ('F' == edit_get_byte (edit, 3)) {
+                return 1;
+            }
+        }
+    }
+    return 0;
+}
+
+/* for "*.[s,S]" filenames */
+int it_is_ASM (WEdit * edit)
+{
+    int fn_len = (int) strlen ((char *) edit->filename);
+    if (fn_len > 2 && '.' == edit->filename[fn_len - 2]) {
+        if ('s' == edit->filename[fn_len - 1]
+                || 'S' == edit->filename[fn_len - 1]) {
+            edit_cursor_to_bol (edit);
+            return 1;
+        }
+    }
+    return 0;
+}
+
+/* for "*.[h,H,c,C]" | "*.[c,C]??" filenames */
+int it_is_C (WEdit * edit)
+{
+    int fn_len = (int) strlen ((char *) edit->filename);
+
+    if (fn_len < 3) 
+        return 0;
+
+    if ('.' == edit->filename[fn_len - 2]) {
+        if ('h' == edit->filename[fn_len - 1]
+                || 'H' == edit->filename[fn_len - 1]
+                || 'c' == edit->filename[fn_len - 1]
+                || 'C' == edit->filename[fn_len - 1]) {
+            edit_cursor_to_bol (edit);
+            return 1;
+        }
+    }
+
+    if ((fn_len = (fn_len - 2)) < 3)
+        return 0;
+
+    if ('.' == edit->filename[fn_len - 2]) {
+        if ('h' == edit->filename[fn_len - 1]
+                || 'H' == edit->filename[fn_len - 1]
+                || 'c' == edit->filename[fn_len - 1]
+                || 'C' == edit->filename[fn_len - 1]) {
+            edit_cursor_to_bol (edit);
+            return 1;
+        }
+    }
+    return 0;
+}
+
+void case_CK_Delete (WEdit * edit)
+{
+    int c1;
+
+    if (edit->curs_col) {
+        edit_delete (edit, 0);
+        return;
+    }
+    c1 = edit_get_byte (edit, edit->curs1);
+    edit_delete (edit, 0);
+
+    if ('/' == c1) {
+        if (it_is_C (edit)) {
+            if ('/' == edit_get_byte (edit, edit->curs1)) 
+                edit_delete (edit, 1);
+            else
+                return;
+        }
+    } else if (!( '#' == c1 || ';' == c1 )) {
+        return;
+    }
+    edit_show_bottom (edit);
+}
+
+void case_CK_PrtScr (WEdit * edit)
+{
+    if (edit->curs_line >= edit->total_lines) {
+        return;
+    } else if (it_is_ELF (edit)) {
+        return;
+    } else if (it_is_ASM (edit)) { /* for "*.[s,S]" filenames */
+        if ((edit->total_lines - 1) == edit->curs_line) {
+            if (';' == edit_get_byte (edit, edit->curs1))
+                return;
+        }
+        edit_insert (edit, ';');
+    } else if (it_is_C (edit)) { /* for "*.[h,H,c,C]" | "*.[c,C]??" filenames */
+        if ((edit->total_lines - 1) == edit->curs_line) {
+            if ('/' == edit_get_byte (edit, edit->curs1))
+                return;
+        }
+        edit_insert (edit, '/');
+        edit_insert (edit, '/');
+    } else {
+        edit_cursor_to_bol (edit);
+        if ((edit->total_lines - 1) == edit->curs_line) {
+            if ('#' == edit_get_byte (edit, edit->curs1))
+                return;
+        }
+        edit_insert (edit, '#');
+    }
+    edit_show_bottom (edit);
+}

edit/edit.h

@@ -55 +55 @@
 extern char *option_backup_ext;
 
 extern int edit_confirm_save;
-
 extern int visible_tabs;
 extern int visible_tws;
-
 extern int simple_statusbar;
 extern int option_check_nl_at_eof;
 
@@ -72 +70 @@
 int edit_get_curs_col (const WEdit *edit);
 const char *edit_get_syntax_type (const WEdit *edit);
 
+/* While pressing:
+      PrtScr comments lines
+      Delete uncomments lines */
+int it_is_ELF (WEdit * edit);
+int it_is_ASM (WEdit * edit);
+int it_is_C (WEdit * edit);
+void edit_show_bottom (WEdit * edit);
+void case_CK_PrtScr (WEdit * edit);
+void case_CK_Delete (WEdit * edit);
+
 #endif                          /* MC_EDIT_H */

edit/editkeys.c

@@ -160 +160 @@
             }
         }
     }
+
   fin:
     *cmd = command;
     *ch = char_for_insertion;
 
+    if (16412 == x_key) {
+        *ch = -1;
+        *cmd = CK_PrtScr;
+        return 1;
+    }
+
     return (command == CK_Insert_Char && char_for_insertion == -1) ? 0 : 1;
 }

src/cmddef.h

@@ -364 +364 @@
 #define CK_PanelSortOrderBySize         8038
 #define CK_PanelSortOrderByMTime        8039
 
+/* While pressing:
+      PrtScr comments lines
+      Delete uncomments lines */
+#define CK_PrtScr                      16412
+
 /*
    Process a block through a shell command: CK_Pipe_Block(i) executes shell_cmd[i].
    shell_cmd[i] must process the file ~/cooledit.block and output ~/cooledit.block
@@ -377 +382 @@
 #define SHELL_COMMANDS_i {"/edit.indent.rc", "/edit.spell.rc", /* and so on */ 0 }
 #define CK_Macro(i)             (2000+(i))
 #define CK_Last_Macro           CK_Macro(0x7FFF)
-#else
-
-#define CK_User_Command(i)      ((i) | (1 << 16))
-#define IS_USER_COMMAND(i)      ((i) & (1 << 16))
-#define CK_Macro(i)             ((i) | (1 << 17))
-#define IS_MACRO_COMMAND(i)     ((i) & (1 << 17))
 
+#else
+    #define CK_User_Command(i)  ((i) | (1 << 16))
+    #define IS_USER_COMMAND(i)  ((i) & (1 << 16))
+    #define CK_Macro(i)         ((i) | (1 << 17))
+    #define IS_MACRO_COMMAND(i) ((i) & (1 << 17))
 #endif                                  /* MC_CMD_DEF_H */