Changeset 7cfe5c0 in mainline for uspace/app/edit/edit.c
- Timestamp:
- 2012-08-20T19:16:24Z (12 years ago)
- Branches:
- lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
- Children:
- 6b99156
- Parents:
- b9cb911 (diff), 01e397ac (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the(diff)
links above to see all the changes relative to each parent. - File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
uspace/app/edit/edit.c
rb9cb911 r7cfe5c0 1 1 /* 2 2 * Copyright (c) 2009 Jiri Svoboda 3 * Copyright (c) 2012 Martin Sucha 3 4 * All rights reserved. 4 5 * … … 49 50 50 51 #include "sheet.h" 52 #include "search.h" 51 53 52 54 enum redraw_flags { … … 83 85 */ 84 86 int ideal_column; 87 88 char *previous_search; 89 bool previous_search_reverse; 85 90 } pane_t; 86 91 … … 91 96 typedef struct { 92 97 char *file_name; 93 sheet_t sh;98 sheet_t *sh; 94 99 } doc_t; 95 100 … … 126 131 static int file_save_range(char const *fname, spt_t const *spos, 127 132 spt_t const *epos); 128 static char *filename_prompt(char const *prompt, char const *init_value);129 133 static char *range_get_str(spt_t const *spos, spt_t const *epos); 134 135 static char *prompt(char const *prompt, char const *init_value); 130 136 131 137 static void pane_text_display(void); … … 139 145 static void delete_char_after(void); 140 146 static void caret_update(void); 141 static void caret_move(int drow, int dcolumn, enum dir_spec align_dir); 142 static void caret_move_word_left(void); 143 static void caret_move_word_right(void); 147 static void caret_move_relative(int drow, int dcolumn, enum dir_spec align_dir, bool select); 148 static void caret_move_absolute(int row, int column, enum dir_spec align_dir, bool select); 149 static void caret_move(spt_t spt, bool select, bool update_ideal_column); 150 static void caret_move_word_left(bool select); 151 static void caret_move_word_right(bool select); 152 static void caret_go_to_line_ask(void); 144 153 145 154 static bool selection_active(void); 146 155 static void selection_sel_all(void); 147 156 static void selection_sel_range(spt_t pa, spt_t pb); 148 static void selection_sel_prev_word(void);149 static void selection_sel_next_word(void);150 157 static void selection_get_points(spt_t *pa, spt_t *pb); 151 158 static void selection_delete(void); 152 159 static void selection_copy(void); 153 160 static void insert_clipboard_data(void); 161 162 static void search(char *pattern, bool reverse); 163 static void search_prompt(bool reverse); 164 static void search_repeat(void); 154 165 155 166 static void pt_get_sof(spt_t *pt); … … 160 171 static bool pt_is_delimiter(spt_t *pt); 161 172 static bool pt_is_punctuation(spt_t *pt); 173 static spt_t pt_find_word_left(spt_t spt); 174 static spt_t pt_find_word_left(spt_t spt); 175 162 176 static int tag_cmp(tag_t const *a, tag_t const *b); 163 177 static int spt_cmp(spt_t const *a, spt_t const *b); … … 170 184 { 171 185 kbd_event_t ev; 172 coord_t coord;173 186 bool new_file; 174 175 spt_t pt; 187 int rc; 176 188 177 189 con = console_init(stdin, stdout); … … 186 198 187 199 /* Start with an empty sheet. */ 188 sheet_init(&doc.sh); 200 rc = sheet_create(&doc.sh); 201 if (rc != EOK) { 202 printf("Out of memory.\n"); 203 return -1; 204 } 189 205 190 206 /* Place caret at the beginning of file. */ 191 coord.row = coord.column = 1;192 sheet_get_cell_pt(&doc.sh, &coord, dir_before, &pt);193 sheet_place_tag( &doc.sh, &pt, &pane.caret_pos);194 pane.ideal_column = coord.column;207 spt_t sof; 208 pt_get_sof(&sof); 209 sheet_place_tag(doc.sh, &sof, &pane.caret_pos); 210 pane.ideal_column = 1; 195 211 196 212 if (argc == 2) { … … 208 224 new_file = true; 209 225 226 /* Place selection start tag. */ 227 sheet_place_tag(doc.sh, &sof, &pane.sel_start); 228 210 229 /* Move to beginning of file. */ 211 caret_move(-ED_INFTY, -ED_INFTY, dir_before); 212 213 /* Place selection start tag. */ 214 tag_get_pt(&pane.caret_pos, &pt); 215 sheet_place_tag(&doc.sh, &pt, &pane.sel_start); 230 pt_get_sof(&sof); 231 caret_move(sof, true, true); 216 232 217 233 /* Initial display */ … … 361 377 static void key_handle_ctrl(kbd_event_t const *ev) 362 378 { 379 spt_t pt; 363 380 switch (ev->key) { 364 381 case KC_Q: … … 392 409 selection_sel_all(); 393 410 break; 394 case KC_W:395 if (selection_active())396 break;397 selection_sel_prev_word();398 selection_delete();399 break;400 411 case KC_RIGHT: 401 caret_move_word_right( );412 caret_move_word_right(false); 402 413 break; 403 414 case KC_LEFT: 404 caret_move_word_left(); 415 caret_move_word_left(false); 416 break; 417 case KC_L: 418 caret_go_to_line_ask(); 419 break; 420 case KC_F: 421 search_prompt(false); 422 break; 423 case KC_N: 424 search_repeat(); 425 break; 426 case KC_HOME: 427 pt_get_sof(&pt); 428 caret_move(pt, false, true); 429 break; 430 case KC_END: 431 pt_get_eof(&pt); 432 caret_move(pt, false, true); 405 433 break; 406 434 default: … … 411 439 static void key_handle_shift_ctrl(kbd_event_t const *ev) 412 440 { 441 spt_t pt; 413 442 switch(ev->key) { 414 443 case KC_LEFT: 415 selection_sel_prev_word();444 caret_move_word_left(true); 416 445 break; 417 446 case KC_RIGHT: 418 selection_sel_next_word(); 447 caret_move_word_right(true); 448 break; 449 case KC_F: 450 search_prompt(true); 451 break; 452 case KC_HOME: 453 pt_get_sof(&pt); 454 caret_move(pt, true, true); 455 break; 456 case KC_END: 457 pt_get_eof(&pt); 458 caret_move(pt, true, true); 419 459 break; 420 460 default: … … 423 463 } 424 464 425 static void key_handle_movement(unsigned int key, bool select) 426 { 427 spt_t pt; 428 spt_t caret_pt;465 /** Move caret while preserving or resetting selection. */ 466 static void caret_move(spt_t new_caret_pt, bool select, bool update_ideal_column) 467 { 468 spt_t old_caret_pt, old_sel_pt; 429 469 coord_t c_old, c_new; 430 470 bool had_sel; 431 471 432 472 /* Check if we had selection before. */ 433 tag_get_pt(&pane.caret_pos, &caret_pt); 434 tag_get_pt(&pane.sel_start, &pt); 435 had_sel = !spt_equal(&caret_pt, &pt); 436 437 switch (key) { 438 case KC_LEFT: 439 caret_move(0, -1, dir_before); 440 break; 441 case KC_RIGHT: 442 caret_move(0, 0, dir_after); 443 break; 444 case KC_UP: 445 caret_move(-1, 0, dir_before); 446 break; 447 case KC_DOWN: 448 caret_move(+1, 0, dir_before); 449 break; 450 case KC_HOME: 451 caret_move(0, -ED_INFTY, dir_before); 452 break; 453 case KC_END: 454 caret_move(0, +ED_INFTY, dir_before); 455 break; 456 case KC_PAGE_UP: 457 caret_move(-pane.rows, 0, dir_before); 458 break; 459 case KC_PAGE_DOWN: 460 caret_move(+pane.rows, 0, dir_before); 461 break; 462 default: 463 break; 464 } 473 tag_get_pt(&pane.caret_pos, &old_caret_pt); 474 tag_get_pt(&pane.sel_start, &old_sel_pt); 475 had_sel = !spt_equal(&old_caret_pt, &old_sel_pt); 476 477 /* Place tag of the caret */ 478 sheet_remove_tag(doc.sh, &pane.caret_pos); 479 sheet_place_tag(doc.sh, &new_caret_pt, &pane.caret_pos); 465 480 466 481 if (select == false) { 467 482 /* Move sel_start to the same point as caret. */ 468 sheet_remove_tag( &doc.sh, &pane.sel_start);469 tag_get_pt(&pane.caret_pos, &pt);470 sheet_place_tag(&doc.sh, &pt, &pane.sel_start);471 } 472 483 sheet_remove_tag(doc.sh, &pane.sel_start); 484 sheet_place_tag(doc.sh, &new_caret_pt, &pane.sel_start); 485 } 486 487 spt_get_coord(&new_caret_pt, &c_new); 473 488 if (select) { 474 tag_get_pt(&pane.caret_pos, &pt); 475 spt_get_coord(&caret_pt, &c_old); 476 spt_get_coord(&pt, &c_new); 489 spt_get_coord(&old_caret_pt, &c_old); 477 490 478 491 if (c_old.row == c_new.row) … … 485 498 pane.rflags |= REDRAW_TEXT; 486 499 } 500 501 if (update_ideal_column) 502 pane.ideal_column = c_new.column; 503 504 caret_update(); 505 } 506 507 static void key_handle_movement(unsigned int key, bool select) 508 { 509 switch (key) { 510 case KC_LEFT: 511 caret_move_relative(0, -1, dir_before, select); 512 break; 513 case KC_RIGHT: 514 caret_move_relative(0, 0, dir_after, select); 515 break; 516 case KC_UP: 517 caret_move_relative(-1, 0, dir_before, select); 518 break; 519 case KC_DOWN: 520 caret_move_relative(+1, 0, dir_before, select); 521 break; 522 case KC_HOME: 523 caret_move_relative(0, -ED_INFTY, dir_after, select); 524 break; 525 case KC_END: 526 caret_move_relative(0, +ED_INFTY, dir_before, select); 527 break; 528 case KC_PAGE_UP: 529 caret_move_relative(-pane.rows, 0, dir_before, select); 530 break; 531 case KC_PAGE_DOWN: 532 caret_move_relative(+pane.rows, 0, dir_before, select); 533 break; 534 default: 535 break; 536 } 487 537 } 488 538 … … 520 570 char *fname; 521 571 522 fname = filename_prompt("Save As", old_fname);572 fname = prompt("Save As", old_fname); 523 573 if (fname == NULL) { 524 574 status_display("Save cancelled."); … … 535 585 } 536 586 537 /** Ask for a file name. */538 static char * filename_prompt(char const *prompt, char const *init_value)587 /** Ask for a string. */ 588 static char *prompt(char const *prompt, char const *init_value) 539 589 { 540 590 kbd_event_t ev; … … 657 707 658 708 do { 659 sheet_copy_out( &doc.sh, &sp, epos, buf, BUF_SIZE, &bep);709 sheet_copy_out(doc.sh, &sp, epos, buf, BUF_SIZE, &bep); 660 710 bytes = str_size(buf); 661 711 … … 692 742 693 743 while (true) { 694 sheet_copy_out( &doc.sh, &sp, epos, &buf[bpos], buf_size - bpos,744 sheet_copy_out(doc.sh, &sp, epos, &buf[bpos], buf_size - bpos, 695 745 &bep); 696 746 bytes = str_size(&buf[bpos]); … … 714 764 int sh_rows, rows; 715 765 716 sheet_get_num_rows( &doc.sh, &sh_rows);766 sheet_get_num_rows(doc.sh, &sh_rows); 717 767 rows = min(sh_rows - pane.sh_row + 1, pane.rows); 718 768 … … 784 834 rbc.row = pane.sh_row + i; 785 835 rbc.column = pane.sh_column; 786 sheet_get_cell_pt( &doc.sh, &rbc, dir_before, &rb);836 sheet_get_cell_pt(doc.sh, &rbc, dir_before, &rb); 787 837 788 838 /* Ending point for row display */ 789 839 rec.row = pane.sh_row + i; 790 840 rec.column = pane.sh_column + pane.columns; 791 sheet_get_cell_pt( &doc.sh, &rec, dir_before, &re);841 sheet_get_cell_pt(doc.sh, &rec, dir_before, &re); 792 842 793 843 /* Copy the text of the row to the buffer. */ 794 sheet_copy_out( &doc.sh, &rb, &re, row_buf, ROW_BUF_SIZE, &dep);844 sheet_copy_out(doc.sh, &rb, &re, row_buf, ROW_BUF_SIZE, &dep); 795 845 796 846 /* Display text from the buffer. */ … … 842 892 /* Fill until the end of display area. */ 843 893 844 if ( str_length(row_buf) < (unsigned)scr_columns)845 fill = scr_columns - str_length(row_buf);894 if ((unsigned)s_column - 1 < scr_columns) 895 fill = scr_columns - (s_column - 1); 846 896 else 847 897 fill = 0; … … 861 911 spt_t caret_pt; 862 912 coord_t coord; 913 int last_row; 863 914 864 915 tag_get_pt(&pane.caret_pos, &caret_pt); 865 916 spt_get_coord(&caret_pt, &coord); 866 917 918 sheet_get_num_rows(doc.sh, &last_row); 919 867 920 const char *fname = (doc.file_name != NULL) ? doc.file_name : "<unnamed>"; 868 921 869 922 console_set_pos(con, 0, scr_rows - 1); 870 923 console_set_style(con, STYLE_INVERTED); 871 int n = printf(" %d, %d : File '%s'. Ctrl-Q Quit Ctrl-S Save "872 "Ctrl-E Save As", coord.row, coord.column, fname);924 int n = printf(" %d, %d (%d): File '%s'. Ctrl-Q Quit Ctrl-S Save " 925 "Ctrl-E Save As", coord.row, coord.column, last_row, fname); 873 926 874 927 int pos = scr_columns - 1 - n; … … 906 959 cbuf[offs] = '\0'; 907 960 908 (void) sheet_insert( &doc.sh, &pt, dir_before, cbuf);961 (void) sheet_insert(doc.sh, &pt, dir_before, cbuf); 909 962 910 963 pane.rflags |= REDRAW_ROW; … … 923 976 924 977 coord.column -= 1; 925 sheet_get_cell_pt( &doc.sh, &coord, dir_before, &sp);926 927 (void) sheet_delete( &doc.sh, &sp, &ep);978 sheet_get_cell_pt(doc.sh, &coord, dir_before, &sp); 979 980 (void) sheet_delete(doc.sh, &sp, &ep); 928 981 929 982 pane.rflags |= REDRAW_ROW; … … 941 994 spt_get_coord(&sp, &sc); 942 995 943 sheet_get_cell_pt( &doc.sh, &sc, dir_after, &ep);996 sheet_get_cell_pt(doc.sh, &sc, dir_after, &ep); 944 997 spt_get_coord(&ep, &ec); 945 998 946 (void) sheet_delete( &doc.sh, &sp, &ep);999 (void) sheet_delete(doc.sh, &sp, &ep); 947 1000 948 1001 pane.rflags |= REDRAW_ROW; … … 991 1044 } 992 1045 993 /** Change the caret position.1046 /** Relatively move caret position. 994 1047 * 995 1048 * Moves caret relatively to the current position. Looking at the first … … 997 1050 * to a new character cell, and thus a new character. Then we either go to the 998 1051 * point before the the character or after it, depending on @a align_dir. 1052 * 1053 * @param select true if the selection tag should stay where it is 999 1054 */ 1000 static void caret_move(int drow, int dcolumn, enum dir_spec align_dir) 1055 static void caret_move_relative(int drow, int dcolumn, enum dir_spec align_dir, 1056 bool select) 1001 1057 { 1002 1058 spt_t pt; … … 1016 1072 else { 1017 1073 coord.row--; 1018 sheet_get_row_width( &doc.sh, coord.row, &coord.column);1074 sheet_get_row_width(doc.sh, coord.row, &coord.column); 1019 1075 } 1020 1076 } 1021 1077 if (drow > 0) { 1022 sheet_get_num_rows( &doc.sh, &num_rows);1078 sheet_get_num_rows(doc.sh, &num_rows); 1023 1079 if (coord.row > num_rows) coord.row = num_rows; 1024 1080 } … … 1033 1089 * coordinates. The character can be wider than one cell (e.g. tab). 1034 1090 */ 1035 sheet_get_cell_pt(&doc.sh, &coord, align_dir, &pt); 1036 sheet_remove_tag(&doc.sh, &pane.caret_pos); 1037 sheet_place_tag(&doc.sh, &pt, &pane.caret_pos); 1091 sheet_get_cell_pt(doc.sh, &coord, align_dir, &pt); 1038 1092 1039 1093 /* For non-vertical movement set the new value for @c ideal_column. */ 1040 if (!pure_vertical) { 1041 spt_get_coord(&pt, &coord); 1042 pane.ideal_column = coord.column; 1043 } 1044 1045 caret_update(); 1046 } 1047 1048 static void caret_move_word_left(void) 1049 { 1094 caret_move(pt, select, !pure_vertical); 1095 } 1096 1097 /** Absolutely move caret position. 1098 * 1099 * Moves caret to a specified position. We get to a new character cell, and 1100 * thus a new character. Then we either go to the point before the the character 1101 * or after it, depending on @a align_dir. 1102 * 1103 * @param select true if the selection tag should stay where it is 1104 */ 1105 static void caret_move_absolute(int row, int column, enum dir_spec align_dir, 1106 bool select) 1107 { 1108 coord_t coord; 1109 coord.row = row; 1110 coord.column = column; 1111 1050 1112 spt_t pt; 1051 1113 sheet_get_cell_pt(doc.sh, &coord, align_dir, &pt); 1114 1115 caret_move(pt, select, true); 1116 } 1117 1118 /** Find beginning of a word to the left of spt */ 1119 static spt_t pt_find_word_left(spt_t spt) 1120 { 1052 1121 do { 1053 caret_move(0, -1, dir_before); 1054 1055 tag_get_pt(&pane.caret_pos, &pt); 1056 1057 sheet_remove_tag(&doc.sh, &pane.sel_start); 1058 sheet_place_tag(&doc.sh, &pt, &pane.sel_start); 1059 } while (!pt_is_word_beginning(&pt)); 1060 1061 pane.rflags |= REDRAW_TEXT; 1062 } 1063 1064 static void caret_move_word_right(void) 1122 spt_prev_char(spt, &spt); 1123 } while (!pt_is_word_beginning(&spt)); 1124 return spt; 1125 } 1126 1127 /** Find beginning of a word to the right of spt */ 1128 static spt_t pt_find_word_right(spt_t spt) 1129 { 1130 do { 1131 spt_next_char(spt, &spt); 1132 } while (!pt_is_word_beginning(&spt)); 1133 return spt; 1134 } 1135 1136 static void caret_move_word_left(bool select) 1065 1137 { 1066 1138 spt_t pt; 1067 1068 do { 1069 caret_move(0, 0, dir_after); 1070 1071 tag_get_pt(&pane.caret_pos, &pt); 1072 1073 sheet_remove_tag(&doc.sh, &pane.sel_start); 1074 sheet_place_tag(&doc.sh, &pt, &pane.sel_start); 1075 } while (!pt_is_word_beginning(&pt)); 1076 1077 pane.rflags |= REDRAW_TEXT; 1139 tag_get_pt(&pane.caret_pos, &pt); 1140 spt_t word_left = pt_find_word_left(pt); 1141 caret_move(word_left, select, true); 1142 } 1143 1144 static void caret_move_word_right(bool select) 1145 { 1146 spt_t pt; 1147 tag_get_pt(&pane.caret_pos, &pt); 1148 spt_t word_right = pt_find_word_right(pt); 1149 caret_move(word_right, select, true); 1150 } 1151 1152 /** Ask for line and go to it. */ 1153 static void caret_go_to_line_ask(void) 1154 { 1155 char *sline; 1156 1157 sline = prompt("Go to line", ""); 1158 if (sline == NULL) { 1159 status_display("Go to line cancelled."); 1160 return; 1161 } 1162 1163 char *endptr; 1164 int line = strtol(sline, &endptr, 10); 1165 if (*endptr != '\0') { 1166 free(sline); 1167 status_display("Invalid number entered."); 1168 return; 1169 } 1170 free(sline); 1171 1172 caret_move_absolute(line, pane.ideal_column, dir_before, false); 1173 } 1174 1175 /* Search operations */ 1176 static int search_spt_producer(void *data, wchar_t *ret) 1177 { 1178 assert(data != NULL); 1179 assert(ret != NULL); 1180 spt_t *spt = data; 1181 *ret = spt_next_char(*spt, spt); 1182 return EOK; 1183 } 1184 1185 static int search_spt_reverse_producer(void *data, wchar_t *ret) 1186 { 1187 assert(data != NULL); 1188 assert(ret != NULL); 1189 spt_t *spt = data; 1190 *ret = spt_prev_char(*spt, spt); 1191 return EOK; 1192 } 1193 1194 static int search_spt_mark(void *data, void **mark) 1195 { 1196 assert(data != NULL); 1197 assert(mark != NULL); 1198 spt_t *spt = data; 1199 spt_t *new = calloc(1, sizeof(spt_t)); 1200 *mark = new; 1201 if (new == NULL) 1202 return ENOMEM; 1203 *new = *spt; 1204 return EOK; 1205 } 1206 1207 static void search_spt_mark_free(void *data) 1208 { 1209 free(data); 1210 } 1211 1212 static search_ops_t search_spt_ops = { 1213 .equals = char_exact_equals, 1214 .producer = search_spt_producer, 1215 .mark = search_spt_mark, 1216 .mark_free = search_spt_mark_free, 1217 }; 1218 1219 static search_ops_t search_spt_reverse_ops = { 1220 .equals = char_exact_equals, 1221 .producer = search_spt_reverse_producer, 1222 .mark = search_spt_mark, 1223 .mark_free = search_spt_mark_free, 1224 }; 1225 1226 /** Ask for line and go to it. */ 1227 static void search_prompt(bool reverse) 1228 { 1229 char *pattern; 1230 1231 const char *prompt_text = "Find next"; 1232 if (reverse) 1233 prompt_text = "Find previous"; 1234 1235 const char *default_value = ""; 1236 if (pane.previous_search) 1237 default_value = pane.previous_search; 1238 1239 pattern = prompt(prompt_text, default_value); 1240 if (pattern == NULL) { 1241 status_display("Search cancelled."); 1242 return; 1243 } 1244 1245 if (pane.previous_search) 1246 free(pane.previous_search); 1247 pane.previous_search = pattern; 1248 pane.previous_search_reverse = reverse; 1249 1250 search(pattern, reverse); 1251 } 1252 1253 static void search_repeat(void) 1254 { 1255 if (pane.previous_search == NULL) { 1256 status_display("No previous search to repeat."); 1257 return; 1258 } 1259 1260 search(pane.previous_search, pane.previous_search_reverse); 1261 } 1262 1263 static void search(char *pattern, bool reverse) 1264 { 1265 status_display("Searching..."); 1266 1267 spt_t sp, producer_pos; 1268 tag_get_pt(&pane.caret_pos, &sp); 1269 1270 /* Start searching on the position before/after caret */ 1271 if (!reverse) { 1272 spt_next_char(sp, &sp); 1273 } 1274 else { 1275 spt_prev_char(sp, &sp); 1276 } 1277 producer_pos = sp; 1278 1279 search_ops_t ops = search_spt_ops; 1280 if (reverse) 1281 ops = search_spt_reverse_ops; 1282 1283 search_t *search = search_init(pattern, &producer_pos, ops, reverse); 1284 if (search == NULL) { 1285 status_display("Failed initializing search."); 1286 return; 1287 } 1288 1289 match_t match; 1290 int rc = search_next_match(search, &match); 1291 if (rc != EOK) { 1292 status_display("Failed searching."); 1293 search_fini(search); 1294 } 1295 1296 if (match.end) { 1297 status_display("Match found."); 1298 assert(match.end != NULL); 1299 spt_t *end = match.end; 1300 caret_move(*end, false, true); 1301 while (match.length > 0) { 1302 match.length--; 1303 if (reverse) { 1304 spt_next_char(*end, end); 1305 } 1306 else { 1307 spt_prev_char(*end, end); 1308 } 1309 } 1310 caret_move(*end, true, true); 1311 free(end); 1312 } 1313 else { 1314 status_display("Not found."); 1315 } 1316 1317 search_fini(search); 1078 1318 } 1079 1319 … … 1115 1355 1116 1356 if (rel < 0) 1117 sheet_delete( &doc.sh, &pa, &pb);1357 sheet_delete(doc.sh, &pa, &pb); 1118 1358 else 1119 sheet_delete( &doc.sh, &pb, &pa);1359 sheet_delete(doc.sh, &pb, &pa); 1120 1360 1121 1361 if (ca.row == cb.row) … … 1139 1379 static void selection_sel_range(spt_t pa, spt_t pb) 1140 1380 { 1141 sheet_remove_tag( &doc.sh, &pane.sel_start);1142 sheet_place_tag( &doc.sh, &pa, &pane.sel_start);1143 sheet_remove_tag( &doc.sh, &pane.caret_pos);1144 sheet_place_tag( &doc.sh, &pb, &pane.caret_pos);1381 sheet_remove_tag(doc.sh, &pane.sel_start); 1382 sheet_place_tag(doc.sh, &pa, &pane.sel_start); 1383 sheet_remove_tag(doc.sh, &pane.caret_pos); 1384 sheet_place_tag(doc.sh, &pb, &pane.caret_pos); 1145 1385 1146 1386 pane.rflags |= REDRAW_TEXT; 1147 1387 caret_update(); 1148 }1149 1150 /** Add the previous word to the selection */1151 static void selection_sel_prev_word(void)1152 {1153 spt_t cpt, wpt, spt, ept;1154 1155 selection_get_points(&spt, &ept);1156 1157 tag_get_pt(&pane.caret_pos, &cpt);1158 caret_move_word_left();1159 tag_get_pt(&pane.caret_pos, &wpt);1160 1161 if (spt_cmp(&spt, &cpt) == 0)1162 selection_sel_range(ept, wpt);1163 else1164 selection_sel_range(spt, wpt);1165 }1166 1167 /** Add the next word to the selection */1168 static void selection_sel_next_word(void)1169 {1170 spt_t cpt, wpt, spt, ept;1171 1172 selection_get_points(&spt, &ept);1173 1174 tag_get_pt(&pane.caret_pos, &cpt);1175 caret_move_word_right();1176 tag_get_pt(&pane.caret_pos, &wpt);1177 1178 if (spt_cmp(&ept, &cpt) == 0)1179 selection_sel_range(spt, wpt);1180 else1181 selection_sel_range(ept, wpt);1182 1388 } 1183 1389 … … 1225 1431 1226 1432 coord.row = coord.column = 1; 1227 sheet_get_cell_pt( &doc.sh, &coord, dir_before, pt);1433 sheet_get_cell_pt(doc.sh, &coord, dir_before, pt); 1228 1434 } 1229 1435 … … 1234 1440 int num_rows; 1235 1441 1236 sheet_get_num_rows( &doc.sh, &num_rows);1442 sheet_get_num_rows(doc.sh, &num_rows); 1237 1443 coord.row = num_rows + 1; 1238 1444 coord.column = 1; 1239 1445 1240 sheet_get_cell_pt( &doc.sh, &coord, dir_after, pt);1446 sheet_get_cell_pt(doc.sh, &coord, dir_after, pt); 1241 1447 } 1242 1448 … … 1249 1455 coord.column = 1; 1250 1456 1251 sheet_get_cell_pt( &doc.sh, &coord, dir_before, spt);1457 sheet_get_cell_pt(doc.sh, &coord, dir_before, spt); 1252 1458 } 1253 1459 … … 1259 1465 1260 1466 spt_get_coord(cpt, &coord); 1261 sheet_get_row_width( &doc.sh, coord.row, &row_width);1467 sheet_get_row_width(doc.sh, coord.row, &row_width); 1262 1468 coord.column = row_width - 1; 1263 1469 1264 sheet_get_cell_pt( &doc.sh, &coord, dir_after, ept);1470 sheet_get_cell_pt(doc.sh, &coord, dir_after, ept); 1265 1471 } 1266 1472 … … 1288 1494 1289 1495 coord.column -= 1; 1290 sheet_get_cell_pt( &doc.sh, &coord, dir_before, &lp);1496 sheet_get_cell_pt(doc.sh, &coord, dir_before, &lp); 1291 1497 1292 1498 return pt_is_delimiter(&lp) … … 1310 1516 1311 1517 coord.column += 1; 1312 sheet_get_cell_pt( &doc.sh, &coord, dir_after, &rp);1518 sheet_get_cell_pt(doc.sh, &coord, dir_after, &rp); 1313 1519 1314 1520 ch = range_get_str(pt, &rp); … … 1336 1542 1337 1543 coord.column += 1; 1338 sheet_get_cell_pt( &doc.sh, &coord, dir_after, &rp);1544 sheet_get_cell_pt(doc.sh, &coord, dir_after, &rp); 1339 1545 1340 1546 ch = range_get_str(pt, &rp);
Note:
See TracChangeset
for help on using the changeset viewer.