Changes in uspace/app/edit/edit.c [cd82bb1:a000878c] in mainline
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
uspace/app/edit/edit.c
rcd82bb1 ra000878c 98 98 static bool done; 99 99 static pane_t pane; 100 static bool cursor_visible; 100 101 101 102 static int scr_rows, scr_columns; … … 108 109 /** Maximum filename length that can be entered. */ 109 110 #define INFNAME_MAX_LEN 128 111 112 static void cursor_show(void); 113 static void cursor_hide(void); 114 static void cursor_setvis(bool visible); 110 115 111 116 static void key_handle_unmod(console_event_t const *ev); … … 199 204 200 205 /* Initial display */ 206 cursor_visible = true; 207 208 cursor_hide(); 201 209 console_clear(con); 202 210 pane_text_display(); … … 205 213 status_display("File not found. Starting empty file."); 206 214 pane_caret_display(); 207 215 cursor_show(); 208 216 209 217 done = false; … … 230 238 /* Redraw as necessary. */ 231 239 240 cursor_hide(); 241 232 242 if (pane.rflags & REDRAW_TEXT) 233 243 pane_text_display(); … … 238 248 if (pane.rflags & REDRAW_CARET) 239 249 pane_caret_display(); 250 251 cursor_show(); 240 252 } 241 253 … … 243 255 244 256 return 0; 257 } 258 259 static void cursor_show(void) 260 { 261 cursor_setvis(true); 262 } 263 264 static void cursor_hide(void) 265 { 266 cursor_setvis(false); 267 } 268 269 static void cursor_setvis(bool visible) 270 { 271 if (cursor_visible != visible) { 272 console_cursor_visibility(con, visible); 273 cursor_visible = visible; 274 } 245 275 } 246 276 … … 445 475 static void file_save_as(void) 446 476 { 447 char *old_fname, *fname; 448 int rc; 449 450 old_fname = (doc.file_name != NULL) ? doc.file_name : ""; 477 const char *old_fname = (doc.file_name != NULL) ? doc.file_name : ""; 478 char *fname; 479 451 480 fname = filename_prompt("Save As", old_fname); 452 481 if (fname == NULL) { … … 455 484 } 456 485 457 rc = file_save(fname);486 int rc = file_save(fname); 458 487 if (rc != EOK) 459 488 return; … … 688 717 wchar_t c; 689 718 size_t pos, size; 690 unsigneds_column;719 int s_column; 691 720 coord_t csel_start, csel_end, ctmp; 692 721 … … 736 765 s_column = pane.sh_column; 737 766 while (pos < size) { 738 if ( csel_start.row == rbc.row && csel_start.column == s_column) {767 if ((csel_start.row == rbc.row) && (csel_start.column == s_column)) { 739 768 fflush(stdout); 740 769 console_set_color(con, COLOR_BLACK, COLOR_RED, 0); … … 742 771 } 743 772 744 if ( csel_end.row == rbc.row && csel_end.column == s_column) {773 if ((csel_end.row == rbc.row) && (csel_end.column == s_column)) { 745 774 fflush(stdout); 746 775 console_set_color(con, COLOR_BLACK, COLOR_WHITE, 0); … … 762 791 } 763 792 764 if ( csel_end.row == rbc.row && csel_end.column == s_column) {793 if ((csel_end.row == rbc.row) && (csel_end.column == s_column)) { 765 794 fflush(stdout); 766 795 console_set_color(con, COLOR_BLACK, COLOR_WHITE, 0); … … 789 818 spt_t caret_pt; 790 819 coord_t coord; 791 char *fname;792 int n;793 820 794 821 tag_get_pt(&pane.caret_pos, &caret_pt); 795 822 spt_get_coord(&caret_pt, &coord); 796 823 797 fname = (doc.file_name != NULL) ? doc.file_name : "<unnamed>";824 const char *fname = (doc.file_name != NULL) ? doc.file_name : "<unnamed>"; 798 825 799 826 console_goto(con, 0, scr_rows - 1); 800 827 console_set_color(con, COLOR_WHITE, COLOR_BLACK, 0); 801 n = printf(" %d, %d: File '%s'. Ctrl-Q Quit Ctrl-S Save "828 int n = printf(" %d, %d: File '%s'. Ctrl-Q Quit Ctrl-S Save " 802 829 "Ctrl-E Save As", coord.row, coord.column, fname); 803 830 printf("%*s", scr_columns - 1 - n, "");
Note:
See TracChangeset
for help on using the changeset viewer.