alema/ste
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

basic save

Browse Source
This commit is contained in:
Alessandro Mauri 2019-12-27 15:10:44 +01:00
parent e85314ba0e
commit 83cdd65c71
2 changed files with 57 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/die.h
View File

@ -12,6 +12,7 @@ typedef enum {
AOK, AOK,
GENERIC_ERR, GENERIC_ERR,
BAD_FILE, BAD_FILE,
SAVE_ERR,
MALLOC_ERR, MALLOC_ERR,
REALLOC_ERR, REALLOC_ERR,
BAD_PNTR BAD_PNTR
@ -25,7 +26,8 @@ void die (const char *message, DeathStatus sn)
endwin(); endwin();
#endif #endif
if (sn) perror(message); if (sn && message != NULL)
perror(message);
exit(sn); exit(sn);
} }

70
src/ste.c
View File

@ -25,6 +25,8 @@
#define FIND_C 0x1 #define FIND_C 0x1
#define MODIFIED 0x80 #define MODIFIED 0x80
#define NEW_FILE 0x40
#define NAME_TRUNCATED 0x20
// Search buffer // Search buffer
typedef struct CharBuffer { typedef struct CharBuffer {
@ -56,9 +58,9 @@ struct term {
char statusbar[STAT_SIZE]; char statusbar[STAT_SIZE];
int pad; int pad;
char mode_b; char state;
CharBuffer search_buffer; CharBuffer search_buffer;
char filename[FILENAME_MAX_LENGTH]; char filename[FILENAME_MAX_LENGTH];
} t; } t;
FileBuffer rows; FileBuffer rows;
@ -78,7 +80,7 @@ static void termInit (void);
/* file operations */ /* file operations */
static void fileOpen (char *filename); static void fileOpen (char *filename);
void fileSave (char *filename); static void fileSave (char *filename);
/* buffer operations */ /* buffer operations */
static int editorFind (const char* needle, int* y, int* x); static int editorFind (const char* needle, int* y, int* x);
@ -108,7 +110,8 @@ int main (int argc, char *argv[])
/* Try to open the file */ /* Try to open the file */
if (argc < 2) die("File not found", BAD_FILE); if (argc < 2) die("File not found", BAD_FILE);
fileOpen(argv[1]); fileOpen(argv[1]);
snprintf(t.filename, FILENAME_MAX_LENGTH, "%s", argv[1]); if(snprintf(t.filename, FILENAME_MAX_LENGTH, "%s", argv[1]) >= FILENAME_MAX_LENGTH)
t.state |= NAME_TRUNCATED;
/* Initialize the terminal in raw mode, /* Initialize the terminal in raw mode,
* start curses and initialize the term struct */ * start curses and initialize the term struct */
@ -124,14 +127,33 @@ int main (int argc, char *argv[])
/* Wait for an event (keypress) */ /* Wait for an event (keypress) */
switch (c = getch()) { switch (c = getch()) {
case (CTRL('q')): case (CTRL('q')):
die("", AOK); if (!(t.state & MODIFIED)) {
if (t.state & NEW_FILE) {
if (t.state & NAME_TRUNCATED) {
if (remove(argv[1]) == -1)
die("Could not delete file (argv)", BAD_FILE);
} else {
if (remove(t.filename) == -1)
die("Could not delete file (stored filename)", BAD_FILE);
}
die("File not modified", AOK);
} else {
die(NULL, AOK);
}
} else {
if (t.state & NAME_TRUNCATED)
fileSave(argv[1]);
else
fileSave(t.filename);
die(NULL, AOK);
}
break; break;
case (KEY_MOVE_UP): case (KEY_MOVE_UP):
case (KEY_MOVE_DOWN): case (KEY_MOVE_DOWN):
case (KEY_MOVE_LEFT): case (KEY_MOVE_LEFT):
case (KEY_MOVE_RIGHT): case (KEY_MOVE_RIGHT):
if ((t.mode_b & MODE_MASK) == NORMAL_MODE) if ((t.state & MODE_MASK) == NORMAL_MODE)
cursorMove(c); cursorMove(c);
else else
switch (c) { switch (c) {
@ -146,7 +168,7 @@ int main (int argc, char *argv[])
case (KEY_BACKSPACE): case (KEY_BACKSPACE):
case (KEY_DC): case (KEY_DC):
if ((t.mode_b & MODE_MASK) == NORMAL_MODE) if ((t.state & MODE_MASK) == NORMAL_MODE)
handleDel(c); handleDel(c);
else else
sbPop(&t.search_buffer); sbPop(&t.search_buffer);
@ -155,14 +177,15 @@ int main (int argc, char *argv[])
case (KEY_ENTER): case (KEY_ENTER):
case (10): case (10):
case ('\r'): case ('\r'):
if ((t.mode_b & MODE_MASK) == NORMAL_MODE) { if ((t.state & MODE_MASK) == NORMAL_MODE) {
rowAddRow(&rows, t.cur.y, t.cur.x); rowAddRow(&rows, t.cur.y, t.cur.x);
t.state |= MODIFIED;
t.cur.y++; t.cur.y++;
t.cur.x = 0; t.cur.x = 0;
} else { } else {
editorFind(t.search_buffer.c, &t.cur.y, &t.cur.x); editorFind(t.search_buffer.c, &t.cur.y, &t.cur.x);
// Toggle mode // Toggle mode
t.mode_b ^= MODE_MASK; t.state ^= MODE_MASK;
sbFlush (&t.search_buffer); sbFlush (&t.search_buffer);
} }
break; break;
@ -185,16 +208,16 @@ int main (int argc, char *argv[])
case (KEY_FILE_FIND): case (KEY_FILE_FIND):
// Toggle mode // Toggle mode
t.mode_b ^= MODE_MASK; t.state ^= MODE_MASK;
sbFlush (&t.search_buffer); sbFlush (&t.search_buffer);
break; break;
default: default:
if ((t.mode_b & MODE_MASK) == NORMAL_MODE) { if ((t.state & MODE_MASK) == NORMAL_MODE) {
t.mode_b |= MODIFIED;
if (c == KEY_STAB) c = '\t'; if (c == KEY_STAB) c = '\t';
rowAddChar(&rows.rw[t.cur.y], c, t.cur.x); rowAddChar(&rows.rw[t.cur.y], c, t.cur.x);
t.state |= MODIFIED;
t.cur.x++; t.cur.x++;
} else { } else {
sbInsert(&t.search_buffer, c); sbInsert(&t.search_buffer, c);
@ -205,7 +228,7 @@ int main (int argc, char *argv[])
/* If by chance i find myself here be sure /* If by chance i find myself here be sure
* end curses mode and clenaup */ * end curses mode and clenaup */
die("", AOK); die(NULL, AOK);
return 0; return 0;
} }
@ -275,7 +298,7 @@ void drawScreen ()
drawLines(); drawLines();
/* draw the bar */ /* draw the bar */
drawBar( drawBar(
((t.mode_b & MODE_MASK) == NORMAL_MODE) ? t.statusbar : ((t.state & MODE_MASK) == NORMAL_MODE) ? t.statusbar :
t.search_buffer.c t.search_buffer.c
); );
/* move back to the cursor position */ /* move back to the cursor position */
@ -359,8 +382,13 @@ void drawBar (char *s)
/* Open a file and put it into a buffer line by line */ /* Open a file and put it into a buffer line by line */
void fileOpen (char *filename) void fileOpen (char *filename)
{ {
FILE *fd = fopen(filename, "a+"); FILE *fd = fd = fopen(filename, "r");
if (fd == NULL) die("Cannot open file", BAD_FILE); if (fd == NULL) {
t.state |= NEW_FILE;
fd = fopen(filename, "a+");
if (fd == NULL)
die("Could not open file: permission denied", BAD_FILE);
}
/* Check if the file is empty first */ /* Check if the file is empty first */
fseek (fd, 0, SEEK_END); fseek (fd, 0, SEEK_END);
@ -390,6 +418,16 @@ void fileOpen (char *filename)
fclose(fd); fclose(fd);
} }
void fileSave (char *filename)
{
FILE *fd = fopen(filename, "w");
if (fd == NULL)
die("Cannot open file (save)", SAVE_ERR);
for(int i = 0; i < rows.rownum; i++)
fprintf(fd, "%s\n", rows.rw[i].chars);
fclose(fd);
}
/*------------------------------------- file operations ----------------------------------*/ /*------------------------------------- file operations ----------------------------------*/
/* take care of the cursor movement */ /* take care of the cursor movement */