Aren/toaruos
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[bim] read-only buffers

Browse Source
This commit is contained in:
K. Lange 2018-08-18 20:05:43 +09:00
parent 9a9ff0f32e
commit 58dca9e8d7
1 changed files with 24 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
apps/bim.c
View File

@ -268,6 +268,7 @@ int csr_x_actual, csr_y_actual;
* Command-line options * Command-line options
*/ */
int hilight_on_open = 1; int hilight_on_open = 1;
int initial_file_is_read_only = 0;
void redraw_line(int j, int x); void redraw_line(int j, int x);
@ -322,7 +323,12 @@ int bim_getch(void) {
typedef struct _env { typedef struct _env {
int bottom_size; int bottom_size;
short lineno_width; short lineno_width;
short loading;
short loading:1;
short tabs:1;
short modified:1;
short readonly:1;
char * file_name; char * file_name;
int offset; int offset;
int coffset; int coffset;
@ -332,9 +338,7 @@ typedef struct _env {
int col_no; int col_no;
char * search; char * search;
struct syntax_definition * syntax; struct syntax_definition * syntax;
short modified;
short mode; short mode;
short tabs;
short tabstop; short tabstop;
line_t ** lines; line_t ** lines;
} buffer_t; } buffer_t;
@ -1166,6 +1170,7 @@ void setup_buffer(buffer_t * env) {
env->col_no = 1; env->col_no = 1;
env->line_count = 1; /* Buffers always have at least one line */ env->line_count = 1; /* Buffers always have at least one line */
env->modified = 0; env->modified = 0;
env->readonly = 0;
env->bottom_size = 2; env->bottom_size = 2;
env->offset = 0; env->offset = 0;
env->line_avail = 8; /* Default line buffer capacity */ env->line_avail = 8; /* Default line buffer capacity */
@ -1707,6 +1712,10 @@ void redraw_statusbar(void) {
printf("[+]"); printf("[+]");
} }
if (env->readonly) {
printf("[ro]");
}
/* Clear the rest of the status bar */ /* Clear the rest of the status bar */
clear_to_end(); clear_to_end();
@ -3326,7 +3335,6 @@ int handle_escape(int * this_buf, int * timeout, int c) {
break; break;
case '3': case '3':
if (env->mode == MODE_INSERT) { if (env->mode == MODE_INSERT) {
/* Page up */
if (env->col_no < env->lines[env->line_no - 1]->actual + 1) { if (env->col_no < env->lines[env->line_no - 1]->actual + 1) {
line_delete(env->lines[env->line_no - 1], env->col_no, env->line_no - 1); line_delete(env->lines[env->line_no - 1], env->col_no, env->line_no - 1);
redraw_line(env->line_no - env->offset - 1, env->line_no-1); redraw_line(env->line_no - env->offset - 1, env->line_no-1);
@ -3474,11 +3482,14 @@ static void show_usage(char * argv[]) {
int main(int argc, char * argv[]) { int main(int argc, char * argv[]) {
int opt; int opt;
while ((opt = getopt(argc, argv, "?s")) != -1) { while ((opt = getopt(argc, argv, "?sR")) != -1) {
switch (opt) { switch (opt) {
case 's': case 's':
hilight_on_open = 0; hilight_on_open = 0;
break; break;
case 'R':
initial_file_is_read_only = 1;
break;
case '?': case '?':
show_usage(argv); show_usage(argv);
return 0; return 0;
@ -3489,6 +3500,8 @@ int main(int argc, char * argv[]) {
if (argc > optind) { if (argc > optind) {
open_file(argv[optind]); open_file(argv[optind]);
if (initial_file_is_read_only);
env->readonly = 1;
} else { } else {
env = buffer_new(); env = buffer_new();
update_title(); update_title();
@ -3553,6 +3566,7 @@ int main(int argc, char * argv[]) {
break; break;
case 'O': case 'O':
{ {
if (env->readonly) goto _readonly;
env->lines = add_line(env->lines, env->line_no-1); env->lines = add_line(env->lines, env->line_no-1);
env->col_no = 1; env->col_no = 1;
redraw_text(); redraw_text();
@ -3562,6 +3576,7 @@ int main(int argc, char * argv[]) {
} }
case 'o': case 'o':
{ {
if (env->readonly) goto _readonly;
env->lines = add_line(env->lines, env->line_no); env->lines = add_line(env->lines, env->line_no);
env->col_no = 1; env->col_no = 1;
env->line_no += 1; env->line_no += 1;
@ -3586,11 +3601,15 @@ int main(int argc, char * argv[]) {
break; break;
case 'i': case 'i':
_insert: _insert:
if (env->readonly) goto _readonly;
insert_mode(); insert_mode();
redraw_statusbar(); redraw_statusbar();
redraw_commandline(); redraw_commandline();
timeout = 0; timeout = 0;
break; break;
_readonly:
render_error("Buffer is read-only");
break;
case 12: case 12:
redraw_all(); redraw_all();
break; break;