WebSVN – Kolibri OS – Diff – /programs/other/tte/tte.c

 *   GNU General Public License for more details.
+*
 *   You should have received a copy of the GNU General Public License
 *   along with this program.  If not, see .
 */
+/* Kolibri port by Siemargl 2018
+ * my fixes mostly commented with triple comment ///
+ * */
 /*** Include section ***/
 ///#include
 ///#include
 #include
 ///#include
 #include
 /*** Define section ***/
 // This mimics the Ctrl + whatever behavior, setting the
 // 3 upper bits of the character pressed to 0.
 /*** Data section ***/
 // Kolibri defaults
 int con_def_wnd_width   =    80;
+int	con_def_wnd_height  =    25;
-int	con_def_wnd_height  =    25;
+/// winFile support
 int	fileIsOd0a;
 typedef struct editor_row {
     int idx; // Row own index within the file.
     editorClearScreen();
     // perror looks for global errno variable and then prints
     // a descriptive error mesage for it.
     perror(s);
     printf("\r\n");
+    con_exit(0); /// KOS console
     exit(1);
+}
 void disableRawMode() {
 ///    if (tcsetattr(STDIN_FILENO, TCSAFLUSH, &raw) == -1)
 ///        die("Failed to set raw mode");
+}
-/*
-int editorReadKey() {
-    int nread;
-    char c;
-    while ((nread = read(STDIN_FILENO, &c, 1)) != 1) {
-        // Ignoring EAGAIN to make it work on Cygwin.
-        if (nread == -1 && errno != EAGAIN)
-            die("Error reading input");
-    }
-    // Check escape sequences, if first byte
-    // is an escape character then...
-    if (c == '\x1b') {
-        char seq[3];
-        if (read(STDIN_FILENO, &seq[0], 1) != 1 ||
-            read(STDIN_FILENO, &seq[1], 1) != 1)
-            return '\x1b';
-        if (seq[0] == '[') {
-            if (seq[1] >= '0' && seq[1] <= '9') {
-                if (read(STDIN_FILENO, &seq[2], 1) != 1)
-                    return '\x1b';
-                if (seq[2] == '~') {
-                    switch (seq[1]) {
-                        // Home and End keys may be sent in many ways depending on the OS
-                        // \x1b[1~, \x1b[7~, \x1b[4~, \x1b[8~
-                        case '1':
-                        case '7':
-                            return HOME_KEY;
-                        case '4':
-                        case '8':
-                            return END_KEY;
-                        // Del key is sent as \x1b[3~
-                        case '3':
-                            return DEL_KEY;
-                        // Page Up and Page Down send '\x1b', '[', '5' or '6' and '~'.
-                        case '5': return PAGE_UP;
-                        case '6': return PAGE_DOWN;
-                    }
-                }
-            } else {
-                switch (seq[1]) {
-                    // Arrow keys send multiple bytes starting with '\x1b', '[''
-                    // and followed by an 'A', 'B', 'C' or 'D' depending on which
-                    // arrow is pressed.
-                    case 'A': return ARROW_UP;
-                    case 'B': return ARROW_DOWN;
-                    case 'C': return ARROW_RIGHT;
-                    case 'D': return ARROW_LEFT;
-                    // Home key can also be sent as \x1b[H
-                    case 'H': return HOME_KEY;
-                    // End key can also be sent as \x1b[F
-                    case 'F': return END_KEY;
-                }
-            }
-        } else if (seq[0] == 'O') {
-            switch (seq[1]) {
-                // Yes, Home key can ALSO be sent as \x1bOH
-                case 'H': return HOME_KEY;
-                // And... End key as \x1bOF
-                case 'F': return END_KEY;
-            }
-        }
-        return '\x1b';
-    } else {
-        return c;
-*/
 /// by Siemargl rewritten, still Ctrl+ combination works only in english locale, so need analyze scancode
-int editorReadKey() {
+/// by Siemargl rewritten, still Ctrl+ combination works only in english locale, so need analyze scancode
-    int nread;
+int editorReadKey() {
     int key = con_getch2();
     if (key == 0)
-		die("Window closed by X-button");
+		die("Window closed by moused X-button");
 			case 12: // Ctrl+L
 				return CTRL_KEY('l');
 			case 17: // Ctrl+Q
-			case 17: // Ctrl+Q
+			case 26: // Ctrl+Z
 				return CTRL_KEY('q');
     int j;
     // Adding up the lengths of each row of text, adding 1
     // to each one for the newline character we'll add to
     // the end of each line.
     for (j = 0; j < ec.num_rows; j++) {
-        total_len += ec.row[j].size + 1;
+        total_len += ec.row[j].size + 1
+							+ (fileIsOd0a ? 1:0); /// winFile suppor
+    }
     *buf_len = total_len;
     char* buf = malloc(total_len);
     // buffer, appending a newline character after each
     // row.
     for (j = 0; j < ec.num_rows; j++) {
         memcpy(p, ec.row[j].chars, ec.row[j].size);
         p += ec.row[j].size;
+        /// winFile support
+        if (fileIsOd0a) *p++ = '\r';
         *p = '\n';
         p++;
+    }
     char* line = NULL;
     // Unsigned int of at least 16 bit.
     size_t line_cap = 0;
     // Bigger than int
     int line_len;  ///was ssize_t
+    fileIsOd0a = 0; /// winFile support
     while ((line_len = getline(&line, &line_cap, file)) != -1) {
         // We already know each row represents one line of text, there's no need
         // to keep carriage return and newline characters.
         if (line_len > 0 && (line[line_len - 1] == '\n' || line[line_len - 1] == '\r'))
             line_len--;
+/// Siemargl fix 0d0a windows file, save format flag
+         if (line_len > 0 && line[line_len - 1] == '\r')
+         {
+            line_len--;
+            fileIsOd0a = 1;
+		 }
-        editorInsertRow(ec.num_rows, line, line_len);
+       editorInsertRow(ec.num_rows, line, line_len);
+    }
     free(line);
     fclose(file);
     ec.dirty = 0;
         editorSelectSyntaxHighlight();
+    }
     int len;
-    char* buf = editorRowsToString(&len);
-///
+    char* buf = editorRowsToString(&len);
-/*
-    // We want to create if it doesn't already exist (O_CREAT flag), giving
-    // 0644 permissions (the standard ones). O_RDWR stands for reading and
-    // writing.
-    int fd = open(ec.file_name, O_RDWR | O_CREAT, 0644);
-    if (fd != -1) {
-        // ftruncate sets the file's size to the specified length.
-        if (ftruncate(fd, len) != -1) {
-            // Writing the file.
-            if (write(fd, buf, len) == len) {
-                close(fd);
-                free(buf);
-                ec.dirty = 0;
-                editorSetStatusMessage("%d bytes written to disk", len);
-                return;
-            }
-        }
-        close(fd);
-    }
-*/
+/// siemargl rewrite using standard FILE stream
+	FILE *fd = fopen(ec.file_name,"w+b");
-	FILE *fd = fopen(ec.file_name,"w+b");
+	int rc = -1;
 	if (fd) {
-		if (fwrite(buf, 1, len, fd) == len) {
+		if ((rc = fwrite(buf, 1, len, fd)) == len) {
 			fclose(fd);
 			free(buf);
 			ec.dirty = 0;
 			editorSetStatusMessage("%d bytes written to disk", len);
     abufAppend(ab, "\r\n", 2);
+}
 void editorDrawMessageBar(struct a_buf *ab) {
     // Clearing the message bar.
-    abufAppend(ab, "\x1b[K", 3);
+///    abufAppend(ab, "\x1b[K", 3);	/// not work in Kolibri
     int msg_len = strlen(ec.status_msg);
     if (msg_len > ec.screen_cols)
         msg_len = ec.screen_cols;
     // We only show the message if its less than 5 secons old, but
                         int c_len = snprintf(buf, sizeof(buf), "\x1b[%dm", current_color);
                         abufAppend(ab, buf, c_len);
+                    }
                 } else if (highlight[j] == HL_NORMAL) {
                     if (current_color != -1) {
-                        abufAppend(ab, "\x1b[39m", 5);
+                        abufAppend(ab, "\x1b[m", 3);  /// was [39, 5
                         current_color = -1;
+                    }
                     abufAppend(ab, &c[j], 1);
                 } else {
                     int color = editorSyntaxToColor(highlight[j]);
+                    }
                     abufAppend(ab, &c[j], 1);
+                }
             }
-            abufAppend(ab, "\x1b[39m", 5);
+            abufAppend(ab, "\x1b[m", 3);  /// was [39, 5
+        }
         // Redrawing each line instead of the whole screen.
-        abufAppend(ab, "\x1b[K", 3);
+///        abufAppend(ab, "\x1b[K", 3);  /// not work in Kolibri
         // Addind a new line
         abufAppend(ab, "\r\n", 2);
     struct a_buf ab = ABUF_INIT;
     // Hiding the cursor while the screen is refreshing.
     // See http://vt100.net/docs/vt100-ug/chapter3.html#S3.3.4
     // for more info.
-    abufAppend(&ab, "\x1b[?25l", 6);
+///    abufAppend(&ab, "\x1b[?25l", 6);
+    abufAppend(&ab, "\x1b[H", 3);
+/// full clear because "\x1b[K" not work in Kolibri
-    abufAppend(&ab, "\x1b[H", 3);
+    abufAppend(&ab, "\x1b[2J", 4);
     editorDrawRows(&ab);
     editorDrawStatusBar(&ab);
     editorDrawMessageBar(&ab);
+    // Moving the cursor where it should be.
+    char buf[32];
-    // Moving the cursor where it should be.
+///    snprintf(buf, sizeof(buf), "\x1b[%d;%dH", (ec.cursor_y - ec.row_offset) + 1, (ec.render_x - ec.col_offset) + 1);
-    char buf[32];
+/// a bit different in Kolibri
-    snprintf(buf, sizeof(buf), "\x1b[%d;%dH", (ec.cursor_y - ec.row_offset) + 1, (ec.render_x - ec.col_offset) + 1);
+    snprintf(buf, sizeof(buf), "\x1b[%d;%dH", (ec.render_x - ec.col_offset), (ec.cursor_y - ec.row_offset));
-    abufAppend(&ab, buf, strlen(buf));
+       abufAppend(&ab, buf, strlen(buf));
     // Showing again the cursor.
-    abufAppend(&ab, "\x1b[?25h", 6);
+///    abufAppend(&ab, "\x1b[?25h", 6);
         case '\r': // Enter key
             editorInsertNewline();
             break;
         case CTRL_KEY('q'):
             if (ec.dirty && quit_times > 0) {
-                editorSetStatusMessage("Warning! File has unsaved changes. Press Ctrl-Q %d more time%s to quit", quit_times, quit_times > 1 ? "s" : "");
+                editorSetStatusMessage("Warning! File has unsaved changes. Press Ctrl-Q or ^Z %d more time%s to quit", quit_times, quit_times > 1 ? "s" : "");
                 quit_times--;
                 return;
+            }
             editorClearScreen();
             consoleBufferClose();
+            con_exit(1); /// KOS console
             exit(0);
             break;
         case CTRL_KEY('s'):
             editorSave();
             break;
 void printHelp() {
     printf("Usage: tte [OPTIONS] [FILE]\n\n");
     printf("\nKEYBINDINGS\n-----------\n\n");
     printf("Keybinding\t\tAction\n\n");
-    printf("Ctrl-Q    \t\tExit\n");
+    printf("Ctrl-Q,^Z \t\tExit\n");
     printf("Ctrl-S    \t\tSave\n");
     printf("Ctrl-F    \t\tSearch. Esc, enter and arrows to interact once searching\n");
     printf("Ctrl-E    \t\tFlip line upwards\n");
     printf("Ctrl-D    \t\tFlip line downwards\n");
         editorOpen(argv[1]);
     else if (arg_response == -1)
         return 0;
     enableRawMode();
-    editorSetStatusMessage(" Ctrl-Q to quit | Ctrl-S to save | (tte -h | --help for more info)");
+    editorSetStatusMessage(" Ctrl-Q, ^Z to quit | Ctrl-S to save | (tte -h | --help for more info)");
     while (1) {
         editorRefreshScreen();
         editorProcessKeypress();
+    }

Subversion Repositories Kolibri OS

(root)/programs/other/tte/tte.c – Rev 7414 → 7419