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

 #define _BSD_SOURCE
 #define _GNU_SOURCE
 #include
 #include
-#include
+///#include
-#include
+///#include
 #include
 #include
 #include
 #include
-#include
+///#include
-#include
+///#include
-#include
+///#include
 #include
-#include
+///#include
 #include
 /*** Define section ***/
 // This mimics the Ctrl + whatever behavior, setting the
+// 3 upper bits of the character pressed to 0.
+///#define CTRL_KEY(k) ((k) & 0x1f)
-// 3 upper bits of the character pressed to 0.
+// Siemargl - set top 4 bits
-#define CTRL_KEY(k) ((k) & 0x1f)
+#define CTRL_KEY(k) ((k) | 0xf000)
 // Empty buffer
 #define ABUF_INIT {NULL, 0}
 // Version code
 #define HL_HIGHLIGHT_NUMBERS (1 << 0)
 #define HL_HIGHLIGHT_STRINGS (1 << 1)
+/*** Data section ***/
+// Kolibri defaults
+int con_def_wnd_width   =    80;
+int	con_def_wnd_height  =    25;
 /*** Data section ***/
 typedef struct editor_row {
     int idx; // Row own index within the file.
     int size; // Size of the content (excluding NULL term)
     char* file_name;
     char status_msg[80];
     time_t status_msg_time;
     char* copied_char_buffer;
     struct editor_syntax* syntax;
-    struct termios orig_termios;
+///    struct termios orig_termios;
 } ec;
 // Having a dynamic buffer will allow us to write only one
 // time once the screen is refreshing, instead of doing
     char* buf;
     int len;
 };
 enum editor_key {
+///    BACKSPACE = 0x7f, // 127
-    BACKSPACE = 0x7f, // 127
+    BACKSPACE = 0x3e7, // fixed russian letter
     ARROW_LEFT = 0x3e8, // 1000, large value out of the range of a char.
     ARROW_RIGHT,
     ARROW_UP,
     ARROW_DOWN,
     printf("\r\n");
     exit(1);
+}
 void disableRawMode() {
-    if (tcsetattr(STDIN_FILENO, TCSAFLUSH, &ec.orig_termios) == -1)
+///    if (tcsetattr(STDIN_FILENO, TCSAFLUSH, &ec.orig_termios) == -1)
-        die("Failed to disable raw mode");
+///        die("Failed to disable raw mode");
+}
 void enableRawMode() {
     // Save original terminal state into orig_termios.
-    if (tcgetattr(STDIN_FILENO, &ec.orig_termios) == -1)
+///    if (tcgetattr(STDIN_FILENO, &ec.orig_termios) == -1)
-        die("Failed to get current terminal state");
+///        die("Failed to get current terminal state");
+    // At exit, restore the original state.
-    // At exit, restore the original state.
+///    atexit(disableRawMode);
-    atexit(disableRawMode);
+///
 /*
     // Modify the original state to enter in raw mode.
     struct termios raw = ec.orig_termios;
     // This disables Ctrl-M, Ctrl-S and Ctrl-Q commands.
     // input to be read.
     raw.c_cc[VMIN] = 0;
     // Forcing read() function to return every 1/10 of a
     // second if there is nothing to read.
     raw.c_cc[VTIME] = 1;
+*/
     consoleBufferOpen();
-    if (tcsetattr(STDIN_FILENO, TCSAFLUSH, &raw) == -1)
+///    if (tcsetattr(STDIN_FILENO, TCSAFLUSH, &raw) == -1)
-        die("Failed to set raw mode");
+///        die("Failed to set raw mode");
+}
 /*
 int editorReadKey() {
     int nread;
     char c;
         return '\x1b';
     } else {
         return c;
+    }
+}
+*/
+/// by Siemargl rewritten, still Ctrl+ combination works only in english locale, so need analyze scancode
+int editorReadKey() {
+    int nread;
+    int key = con_getch2();
+    if (key == 0)
+		die("Window closed by X-button");
+	if (0 != (key & 0xff)) {
+		key &= 0xff;
+		switch (key) {
+			case 27: // ESC
+				return '\x1b';
+			case 13: // ENTER
+				return '\r';
+			case 8: // BACKSPACE
+				return BACKSPACE;
+			case 9: // TAB
+				return	key;
+			case 22: // Ctrl+V
+				return CTRL_KEY('v');
+			case 3: // Ctrl+C
+				return CTRL_KEY('c');
+			case 12: // Ctrl+L
+				return CTRL_KEY('l');
+			case 17: // Ctrl+Q
+				return CTRL_KEY('q');
+			case 19: // Ctrl+S
+				return CTRL_KEY('s');
+			case 5: // Ctrl+E
+				return CTRL_KEY('e');
+			case 4: // Ctrl+D
+				return CTRL_KEY('d');
+			case 6: // Ctrl+F
+				return CTRL_KEY('f');
+			case 8: // Ctrl+H
+				return CTRL_KEY('h');
+			case 24: // Ctrl+X
+				return CTRL_KEY('x');
+			default:
+				return	key;
+		}
+	} else {
+		key = (key >> 8) & 0xff;
+		switch (key) {
+			case 83: // Del
+				return DEL_KEY;
+			case 75: // Left
+				return ARROW_LEFT;
+			case 77: // Right
+				return ARROW_RIGHT;
+			case 72: // Up
+				return ARROW_UP;
+			case 80: // Down
+				return ARROW_DOWN;
+			case 81: // PgDn
+				return PAGE_DOWN;
+			case 73: // PgUp
+				return PAGE_UP;
+			case 71: // Home
+				return HOME_KEY;
+			case 79: // End
+				return END_KEY;
+			default:
+				return	0;
+		}
+	}
+	return	0;
+}
 int getWindowSize(int* screen_rows, int* screen_cols) {
-    struct winsize ws;
+///    struct winsize ws;
+    // Getting window size thanks to ioctl into the given
-    // Getting window size thanks to ioctl into the given
+    // winsize struct.
-    // winsize struct.
+    /*
     if (ioctl(STDOUT_FILENO, TIOCGWINSZ, &ws) == -1 || ws.ws_col == 0) {
         return -1;
     } else {
         *screen_cols = ws.ws_col;
         *screen_rows = ws.ws_row;
+        return 0;
+    }
+    */
-        return 0;
+    *screen_cols = con_def_wnd_width;
     *screen_rows = con_def_wnd_height;
+}
+}
 void consoleBufferOpen() {
     // Switch to another terminal buffer in order to be able to restore state at exit
     // by calling consoleBufferClose().
-    if (write(STDOUT_FILENO, "\x1b[?47h", 6) == -1)
+///    if (write(STDOUT_FILENO, "\x1b[?47h", 6) == -1)
-        die("Error changing terminal buffer");
+///        die("Error changing terminal buffer");
+}
 void consoleBufferClose() {
     // Restore console to the state tte opened.
-    if (write(STDOUT_FILENO, "\x1b[?9l", 5) == -1 ||
+///    if (write(STDOUT_FILENO, "\x1b[?9l", 5) == -1 ||
-        write(STDOUT_FILENO, "\x1b[?47l", 6) == -1)
+///        write(STDOUT_FILENO, "\x1b[?47l", 6) == -1)
-        die("Error restoring buffer state");
+///        die("Error restoring buffer state");
     /*struct a_buf ab = {.buf = NULL, .len = 0};
+    }
     return buf;
+}
 extern int getline(char **buf, size_t *bufsiz, FILE *fp);
 void editorOpen(char* file_name) {
     free(ec.file_name);
     char* line = NULL;
     // Unsigned int of at least 16 bit.
     size_t line_cap = 0;
     // Bigger than int
-    ssize_t line_len;
+    int line_len;  ///was ssize_t
     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'))
         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);
                 return;
+            }
+        }
         close(fd);
+    }
+*/
+	FILE *fd = fopen(ec.file_name,"w+b");
+	if (fd) {
+		if (fwrite(buf, 1, len, fd) == len) {
+			fclose(fd);
+			free(buf);
+			ec.dirty = 0;
+			editorSetStatusMessage("%d bytes written to disk", len);
+			return;
+		}
+        fclose(fd);
+	}
     free(buf);
     editorSetStatusMessage("Cant's save file. Error occurred: %s", strerror(errno));
     // Showing again the cursor.
     abufAppend(&ab, "\x1b[?25h", 6);
+    // Writing all content at once
-    // Writing all content at once
+///    write(STDOUT_FILENO, ab.buf, ab.len);
-    write(STDOUT_FILENO, ab.buf, ab.len);
+	con_write_string(ab.buf, ab.len);
     abufFree(&ab);
+}
 void editorClearScreen() {
     // Writing 4 bytes out to the terminal:
     // - (1 byte) \x1b : escape character
     // - (3 bytes) [2J : Clears the entire screen, see
+    // http://vt100.net/docs/vt100-ug/chapter3.html#ED
+    // for more info.
-    // http://vt100.net/docs/vt100-ug/chapter3.html#ED
+///    write(STDOUT_FILENO, "\x1b[2J", 4);
-    // for more info.
+	con_write_string("\x1b[2J", 4);
     write(STDOUT_FILENO, "\x1b[2J", 4);
     // Writing 3 bytes to reposition the cursor back at
     // the top-left corner, see
+    // http://vt100.net/docs/vt100-ug/chapter3.html#CUP
-    // http://vt100.net/docs/vt100-ug/chapter3.html#CUP
+    // for more info.
-    // for more info.
+///    write(STDOUT_FILENO, "\x1b[H", 3);
-    write(STDOUT_FILENO, "\x1b[H", 3);
+	con_write_string("\x1b[H", 3);
             editorCopy(0);
             break;
         case CTRL_KEY('v'):
             editorPaste();
             break;
-        case CTRL_KEY('p'):
+///        case CTRL_KEY('p'):
-            consoleBufferClose();
+///            consoleBufferClose();
-            kill(0, SIGTSTP);
+///            kill(0, SIGTSTP);
         case ARROW_UP:
         case ARROW_DOWN:
         case ARROW_LEFT:
         case ARROW_RIGHT:
             editorMoveCursor(c);
     ec.syntax = NULL;
     editorUpdateWindowSize();
     // The SIGWINCH signal is sent to a process when its controlling
     // terminal changes its size (a window change).
-    signal(SIGWINCH, editorHandleSigwinch);
+///    signal(SIGWINCH, editorHandleSigwinch);
     // The SIGCONT signal instructs the operating system to continue
     // (restart) a process previously paused by the SIGSTOP or SIGTSTP
     // signal.
-    signal(SIGCONT, editorHandleSigcont);
+///    signal(SIGCONT, editorHandleSigcont);
+}
 void printHelp() {
     printf("Ctrl-E    \t\tFlip line upwards\n");
     printf("Ctrl-D    \t\tFlip line downwards\n");
     printf("Ctrl-C    \t\tCopy line\n");
     printf("Ctrl-X    \t\tCut line\n");
     printf("Ctrl-V    \t\tPaste line\n");
-    printf("Ctrl-P    \t\tPause tte (type \"fg\" to resume)\n");
+ ///   printf("Ctrl-P    \t\tPause tte (type \"fg\" to resume)\n");
     printf("\n\nOPTIONS\n-------\n\n");
     printf("Option        \t\tAction\n\n");
     printf("-h | --help   \t\tPrints the help\n");
     return 1;
+}
+int main(int argc, char* argv[]) {
 	if (con_init_console_dll()) return 1; // init fail
 int main(int argc, char* argv[]) {
     initEditor();
     int arg_response = handleArgs(argc, argv);
     if (arg_response == 1)
     while (1) {
         editorRefreshScreen();
         editorProcessKeypress();
+    }
 	con_exit(0);
     return 0;

Subversion Repositories Kolibri OS

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