… | |
… | |
439 | uint16_t total_rows; |
439 | uint16_t total_rows; |
440 | int i; |
440 | int i; |
441 | |
441 | |
442 | total_rows = TermWin.nrow + TermWin.saveLines; |
442 | total_rows = TermWin.nrow + TermWin.saveLines; |
443 | |
443 | |
444 | #ifdef DEBUG_STRICT |
|
|
445 | for (i = 0; i < total_rows; i++) |
|
|
446 | { |
|
|
447 | if (screen.text[i]) |
|
|
448 | /* then so is screen.rend[i] */ |
|
|
449 | assert (screen.rend[i]); |
|
|
450 | } |
|
|
451 | #endif |
|
|
452 | |
|
|
453 | delete talloc; talloc = 0; |
444 | delete talloc; talloc = 0; |
454 | delete ralloc; ralloc = 0; |
445 | delete ralloc; ralloc = 0; |
455 | |
446 | |
456 | free (screen.text); |
447 | free (screen.text); |
457 | free (screen.tlen); |
448 | free (screen.tlen); |
… | |
… | |
500 | * XTERM_SEQ: Restore cursor: ESC 8 |
491 | * XTERM_SEQ: Restore cursor: ESC 8 |
501 | */ |
492 | */ |
502 | void |
493 | void |
503 | rxvt_term::scr_cursor (int mode) |
494 | rxvt_term::scr_cursor (int mode) |
504 | { |
495 | { |
505 | screen_t *s; |
496 | screen_t *s; |
506 | |
497 | |
507 | D_SCREEN ((stderr, "rxvt_scr_cursor (%c)", mode)); |
498 | D_SCREEN ((stderr, "rxvt_scr_cursor (%c)", mode)); |
508 | |
499 | |
509 | #if NSCREENS && !defined(NO_SECONDARY_SCREEN_CURSOR) |
500 | #if NSCREENS && !defined(NO_SECONDARY_SCREEN_CURSOR) |
510 | if (current_screen == SECONDARY) |
501 | if (current_screen == SECONDARY) |
511 | s = & (swap); |
502 | s = &swap; |
512 | else |
503 | else |
513 | #endif |
504 | #endif |
514 | s = & (screen); |
505 | s = &screen; |
|
|
506 | |
515 | switch (mode) |
507 | switch (mode) |
516 | { |
508 | { |
517 | case SAVE: |
509 | case SAVE: |
518 | s->s_cur.row = s->cur.row; |
510 | s->s_cur.row = s->cur.row; |
519 | s->s_cur.col = s->cur.col; |
511 | s->s_cur.col = s->cur.col; |
… | |
… | |
530 | s->charset = s->s_charset; |
522 | s->charset = s->s_charset; |
531 | charsets[s->charset] = s->s_charset_char; |
523 | charsets[s->charset] = s->s_charset_char; |
532 | set_font_style (); |
524 | set_font_style (); |
533 | break; |
525 | break; |
534 | } |
526 | } |
|
|
527 | |
535 | /* boundary check in case screen size changed between SAVE and RESTORE */ |
528 | /* boundary check in case screen size changed between SAVE and RESTORE */ |
536 | MIN_IT (s->cur.row, TermWin.nrow - 1); |
529 | MIN_IT (s->cur.row, TermWin.nrow - 1); |
537 | MIN_IT (s->cur.col, TermWin.ncol - 1); |
530 | MIN_IT (s->cur.col, TermWin.ncol - 1); |
538 | #ifdef DEBUG_STRICT |
531 | #ifdef DEBUG_STRICT |
539 | assert (s->cur.row >= 0); |
532 | assert (s->cur.row >= 0); |
… | |
… | |
551 | * XTERM_SEQ: Secondary screen: ESC [ ? 4 7 l |
544 | * XTERM_SEQ: Secondary screen: ESC [ ? 4 7 l |
552 | */ |
545 | */ |
553 | int |
546 | int |
554 | rxvt_term::scr_change_screen (int scrn) |
547 | rxvt_term::scr_change_screen (int scrn) |
555 | { |
548 | { |
556 | int i; |
549 | int i; |
557 | #if NSCREENS |
550 | #if NSCREENS |
558 | int offset; |
551 | int offset; |
559 | #endif |
552 | #endif |
560 | |
553 | |
561 | want_refresh = 1; |
554 | want_refresh = 1; |
562 | |
555 | |
563 | D_SCREEN ((stderr, "rxvt_scr_change_screen (%d)", scrn)); |
556 | D_SCREEN ((stderr, "rxvt_scr_change_screen (%d)", scrn)); |
… | |
… | |
762 | /* ------------------------------------------------------------------------- */ |
755 | /* ------------------------------------------------------------------------- */ |
763 | /* |
756 | /* |
764 | * Add text given in <str> of length <len> to screen struct |
757 | * Add text given in <str> of length <len> to screen struct |
765 | */ |
758 | */ |
766 | void |
759 | void |
767 | rxvt_term::scr_add_lines (const uint32_t *str, int nlines, int len) |
760 | rxvt_term::scr_add_lines (const unicode_t *str, int nlines, int len) |
768 | { |
761 | { |
769 | unsigned char checksel, clearsel; |
762 | unsigned char checksel, clearsel; |
770 | uint32_t c; |
763 | unicode_t c; |
771 | int i, row, last_col; |
764 | int i, row, last_col; |
772 | text_t *stp; |
765 | text_t *stp; |
773 | rend_t *srp; |
766 | rend_t *srp; |
774 | |
767 | |
775 | if (len <= 0) /* sanity */ |
768 | if (len <= 0) /* sanity */ |
… | |
… | |
801 | MIN_IT (screen.cur.row, (int32_t)TermWin.nrow - 1); |
794 | MIN_IT (screen.cur.row, (int32_t)TermWin.nrow - 1); |
802 | MAX_IT (screen.cur.row, - (int32_t)TermWin.nscrolled); |
795 | MAX_IT (screen.cur.row, - (int32_t)TermWin.nscrolled); |
803 | #endif |
796 | #endif |
804 | row = screen.cur.row + TermWin.saveLines; |
797 | row = screen.cur.row + TermWin.saveLines; |
805 | |
798 | |
806 | checksel = (selection.op |
799 | checksel = selection.op && current_screen == selection.screen ? 1 : 0; |
807 | && current_screen == selection.screen) ? 1 : 0; |
|
|
808 | clearsel = 0; |
800 | clearsel = 0; |
809 | |
801 | |
810 | stp = screen.text[row]; |
802 | stp = screen.text[row]; |
811 | srp = screen.rend[row]; |
803 | srp = screen.rend[row]; |
812 | |
804 | |
813 | for (i = 0; i < len;) |
805 | while (len--) |
814 | { |
806 | { |
815 | c = str[i++]; |
807 | c = *str++; |
|
|
808 | |
|
|
809 | if (c < 0x20) |
816 | switch (c) |
810 | switch (c) |
817 | { |
811 | { |
818 | case '\t': |
812 | case '\t': |
819 | scr_tab (1); |
813 | scr_tab (1); |
820 | continue; |
814 | continue; |
|
|
815 | |
821 | case '\n': |
816 | case '\n': |
822 | if (screen.tlen[row] != -1) /* XXX: think about this */ |
817 | if (screen.tlen[row] != -1) /* XXX: think about this */ |
823 | MAX_IT (screen.tlen[row], screen.cur.col); |
818 | MAX_IT (screen.tlen[row], screen.cur.col); |
|
|
819 | |
824 | screen.flags &= ~Screen_WrapNext; |
820 | screen.flags &= ~Screen_WrapNext; |
|
|
821 | |
825 | if (screen.cur.row == screen.bscroll) |
822 | if (screen.cur.row == screen.bscroll) |
826 | scr_scroll_text (screen.tscroll, screen.bscroll, 1, 0); |
823 | scr_scroll_text (screen.tscroll, screen.bscroll, 1, 0); |
827 | else if (screen.cur.row < (TermWin.nrow - 1)) |
824 | else if (screen.cur.row < (TermWin.nrow - 1)) |
828 | row = (++screen.cur.row) + TermWin.saveLines; |
825 | row = (++screen.cur.row) + TermWin.saveLines; |
|
|
826 | |
829 | stp = screen.text[row]; /* _must_ refresh */ |
827 | stp = screen.text[row]; /* _must_ refresh */ |
830 | srp = screen.rend[row]; /* _must_ refresh */ |
828 | srp = screen.rend[row]; /* _must_ refresh */ |
831 | continue; |
829 | continue; |
|
|
830 | |
832 | case '\r': |
831 | case '\r': |
833 | if (screen.tlen[row] != -1) /* XXX: think about this */ |
832 | if (screen.tlen[row] != -1) /* XXX: think about this */ |
834 | MAX_IT (screen.tlen[row], screen.cur.col); |
833 | MAX_IT (screen.tlen[row], screen.cur.col); |
|
|
834 | |
835 | screen.flags &= ~Screen_WrapNext; |
835 | screen.flags &= ~Screen_WrapNext; |
836 | screen.cur.col = 0; |
836 | screen.cur.col = 0; |
837 | continue; |
837 | continue; |
838 | default: |
|
|
839 | if (c == 127) |
|
|
840 | continue; /* yummmm..... */ |
|
|
841 | break; |
|
|
842 | } |
838 | } |
843 | |
839 | |
844 | if (checksel /* see if we're writing within selection */ |
840 | if (checksel /* see if we're writing within selection */ |
845 | && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) |
841 | && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) |
846 | && ROWCOL_IS_BEFORE (screen.cur, selection.end)) |
842 | && ROWCOL_IS_BEFORE (screen.cur, selection.end)) |
847 | { |
843 | { |
… | |
… | |
866 | if (screen.flags & Screen_Insert) |
862 | if (screen.flags & Screen_Insert) |
867 | scr_insdel_chars (1, INSERT); |
863 | scr_insdel_chars (1, INSERT); |
868 | |
864 | |
869 | // rely on wcwidth to tell us the character width, at least for non-latin1 |
865 | // rely on wcwidth to tell us the character width, at least for non-latin1 |
870 | // do wcwidth before further replacements, as wcwidth says that line-drawing |
866 | // do wcwidth before further replacements, as wcwidth says that line-drawing |
871 | // characters have width -1 (DOH!) on gnu/linux sometimes. |
867 | // characters have width -1 (DOH!) on GNU/Linux sometimes. |
872 | int width = c < 256 ? 1 : wcwidth (c); |
868 | int width = c < 256 ? 1 : wcwidth (c); |
873 | |
869 | |
874 | if (charsets[screen.charset] == '0') // DEC SPECIAL |
870 | if (charsets[screen.charset] == '0') // DEC SPECIAL |
875 | switch (c) |
|
|
876 | { |
871 | { |
877 | // vt100 special graphics and line drawing |
872 | // vt100 special graphics and line drawing |
878 | case '`': c = 0x25c6; break; case '_': c = 0x0020; break; |
873 | static uint16_t vt100_0[32] = { // 5f .. 7e |
879 | case 'a': c = 0x2592; break; case 'b': c = 0x2409; break; case 'c': c = 0x240c; break; |
874 | 0x0020, 0x25c6, 0x2592, 0x2409, 0x240c, 0x240d, 0x240a, 0x00b0, |
880 | case 'd': c = 0x240d; break; case 'e': c = 0x240a; break; case 'f': c = 0x00b0; break; |
875 | 0x00b1, 0x2424, 0x240b, 0x2518, 0x2510, 0x250c, 0x2514, 0x253c, |
881 | case 'g': c = 0x00b1; break; case 'h': c = 0x2424; break; case 'i': c = 0x240b; break; |
876 | 0x23ba, 0x23bb, 0x2500, 0x23bc, 0x23bd, 0x251c, 0x2524, 0x2534, |
882 | case 'j': c = 0x2518; break; case 'k': c = 0x2510; break; case 'l': c = 0x250c; break; |
877 | 0x252c, 0x2502, 0x2264, 0x2265, 0x03c0, 0x2260, 0x00a3, 0x00b7, |
883 | case 'm': c = 0x2514; break; case 'n': c = 0x253c; break; case 'o': c = 0x23ba; break; |
|
|
884 | case 'p': c = 0x23bb; break; case 'q': c = 0x2500; break; case 'r': c = 0x23bc; break; |
|
|
885 | case 's': c = 0x23bd; break; case 't': c = 0x251c; break; case 'u': c = 0x2524; break; |
|
|
886 | case 'v': c = 0x2534; break; case 'w': c = 0x252c; break; case 'x': c = 0x2502; break; |
|
|
887 | case 'y': c = 0x2264; break; case 'z': c = 0x2265; break; case '{': c = 0x03c0; break; |
|
|
888 | case '|': c = 0x2260; break; case '}': c = 0x00a3; break; case '~': c = 0x00b7; break; |
|
|
889 | } |
878 | }; |
|
|
879 | |
|
|
880 | if (c >= 0x5f && c <= 0x7e) |
|
|
881 | { |
|
|
882 | c = vt100_0[c - 0x5f]; |
|
|
883 | width = 1; |
|
|
884 | } |
|
|
885 | } |
890 | |
886 | |
891 | if (width > 0) |
887 | if (width > 0) |
892 | { |
888 | { |
893 | #if !UNICODE_3 && ENABLE_COMBINING |
889 | #if !UNICODE_3 && ENABLE_COMBINING |
894 | // trim characters we can't store directly :( |
890 | // trim characters we can't store directly :( |
… | |
… | |
951 | // handle double-width-chars by making them look extremely ugly |
947 | // handle double-width-chars by making them look extremely ugly |
952 | if (*tp == NOCHAR) |
948 | if (*tp == NOCHAR) |
953 | *tp = ' '; // hack //D //TODO //--tp, --rp; |
949 | *tp = ' '; // hack //D //TODO //--tp, --rp; |
954 | |
950 | |
955 | // first try to find a precomposed character |
951 | // first try to find a precomposed character |
956 | uint32_t n = rxvt_compose (*tp, c); |
952 | unicode_t n = rxvt_compose (*tp, c); |
957 | if (n == NOCHAR) |
953 | if (n == NOCHAR) |
958 | n = rxvt_composite.compose (*tp, c); |
954 | n = rxvt_composite.compose (*tp, c); |
959 | |
955 | |
960 | *tp = n; |
956 | *tp = n; |
961 | *rp = SET_FONT (*rp, TermWin.fontset->find_font (*tp)); |
957 | *rp = SET_FONT (*rp, TermWin.fontset->find_font (*tp)); |
… | |
… | |
1014 | * XTERM_SEQ: CTRL-I |
1010 | * XTERM_SEQ: CTRL-I |
1015 | */ |
1011 | */ |
1016 | void |
1012 | void |
1017 | rxvt_term::scr_tab (int count) |
1013 | rxvt_term::scr_tab (int count) |
1018 | { |
1014 | { |
1019 | int i, x; |
1015 | int i, x; |
1020 | |
1016 | |
1021 | D_SCREEN ((stderr, "rxvt_scr_tab (%d)", count)); |
1017 | D_SCREEN ((stderr, "rxvt_scr_tab (%d)", count)); |
1022 | want_refresh = 1; |
1018 | want_refresh = 1; |
1023 | i = x = screen.cur.col; |
1019 | i = x = screen.cur.col; |
|
|
1020 | |
1024 | if (count == 0) |
1021 | if (count == 0) |
1025 | return; |
1022 | return; |
1026 | else if (count > 0) |
1023 | else if (count > 0) |
1027 | { |
1024 | { |
1028 | for (; ++i < TermWin.ncol; ) |
1025 | for (; ++i < TermWin.ncol; ) |
… | |
… | |
1030 | { |
1027 | { |
1031 | x = i; |
1028 | x = i; |
1032 | if (!--count) |
1029 | if (!--count) |
1033 | break; |
1030 | break; |
1034 | } |
1031 | } |
|
|
1032 | |
1035 | if (count) |
1033 | if (count) |
1036 | x = TermWin.ncol - 1; |
1034 | x = TermWin.ncol - 1; |
1037 | } |
1035 | } |
1038 | else /* if (count < 0) */ |
1036 | else /* if (count < 0) */ |
1039 | { |
1037 | { |
… | |
… | |
1042 | { |
1040 | { |
1043 | x = i; |
1041 | x = i; |
1044 | if (!++count) |
1042 | if (!++count) |
1045 | break; |
1043 | break; |
1046 | } |
1044 | } |
|
|
1045 | |
1047 | if (count) |
1046 | if (count) |
1048 | x = 0; |
1047 | x = 0; |
1049 | } |
1048 | } |
|
|
1049 | |
1050 | if (x != screen.cur.col) |
1050 | if (x != screen.cur.col) |
1051 | scr_gotorc (0, x, R_RELATIVE); |
1051 | scr_gotorc (0, x, R_RELATIVE); |
1052 | } |
1052 | } |
1053 | |
1053 | |
1054 | /* ------------------------------------------------------------------------- */ |
1054 | /* ------------------------------------------------------------------------- */ |
… | |
… | |
1247 | * XTERM_SEQ: Clear whole screen : ESC [ 2 J |
1247 | * XTERM_SEQ: Clear whole screen : ESC [ 2 J |
1248 | */ |
1248 | */ |
1249 | void |
1249 | void |
1250 | rxvt_term::scr_erase_screen (int mode) |
1250 | rxvt_term::scr_erase_screen (int mode) |
1251 | { |
1251 | { |
1252 | int num; |
1252 | int num; |
1253 | int32_t row, row_offset; |
1253 | int32_t row, row_offset; |
1254 | rend_t ren; |
1254 | rend_t ren; |
1255 | XGCValues gcvalue; |
1255 | XGCValues gcvalue; |
1256 | |
1256 | |
1257 | want_refresh = 1; |
1257 | want_refresh = 1; |
1258 | D_SCREEN ((stderr, "rxvt_scr_erase_screen (%d) at screen row: %d", mode, screen.cur.row)); |
1258 | D_SCREEN ((stderr, "rxvt_scr_erase_screen (%d) at screen row: %d", mode, screen.cur.row)); |
1259 | ZERO_SCROLLBACK (); |
1259 | ZERO_SCROLLBACK (); |
1260 | row_offset = (int32_t)TermWin.saveLines; |
1260 | row_offset = (int32_t)TermWin.saveLines; |
… | |
… | |
1279 | num = TermWin.nrow; |
1279 | num = TermWin.nrow; |
1280 | break; |
1280 | break; |
1281 | default: |
1281 | default: |
1282 | return; |
1282 | return; |
1283 | } |
1283 | } |
|
|
1284 | |
1284 | refresh_type |= REFRESH_BOUNDS; |
1285 | refresh_type |= REFRESH_BOUNDS; |
|
|
1286 | |
1285 | if (selection.op && current_screen == selection.screen |
1287 | if (selection.op && current_screen == selection.screen |
1286 | && ((selection.beg.row >= row && selection.beg.row <= row + num) |
1288 | && ((selection.beg.row >= row && selection.beg.row <= row + num) |
1287 | || (selection.end.row >= row |
1289 | || (selection.end.row >= row |
1288 | && selection.end.row <= row + num))) |
1290 | && selection.end.row <= row + num))) |
1289 | CLEAR_SELECTION (); |
1291 | CLEAR_SELECTION (); |
|
|
1292 | |
1290 | if (row >= TermWin.nrow) /* Out Of Bounds */ |
1293 | if (row >= TermWin.nrow) /* Out Of Bounds */ |
1291 | return; |
1294 | return; |
|
|
1295 | |
1292 | MIN_IT (num, (TermWin.nrow - row)); |
1296 | MIN_IT (num, (TermWin.nrow - row)); |
|
|
1297 | |
1293 | if (rstyle & (RS_RVid | RS_Uline)) |
1298 | if (rstyle & (RS_RVid | RS_Uline)) |
1294 | ren = (rend_t) ~RS_None; |
1299 | ren = (rend_t) ~RS_None; |
1295 | else if (GET_BASEBG (rstyle) == Color_bg) |
1300 | else if (GET_BASEBG (rstyle) == Color_bg) |
1296 | { |
1301 | { |
1297 | ren = DEFAULT_RSTYLE; |
1302 | ren = DEFAULT_RSTYLE; |
… | |
… | |
1304 | XChangeGC (display->display, TermWin.gc, GCForeground, &gcvalue); |
1309 | XChangeGC (display->display, TermWin.gc, GCForeground, &gcvalue); |
1305 | ERASE_ROWS (row, num); |
1310 | ERASE_ROWS (row, num); |
1306 | gcvalue.foreground = PixColors[Color_fg]; |
1311 | gcvalue.foreground = PixColors[Color_fg]; |
1307 | XChangeGC (display->display, TermWin.gc, GCForeground, &gcvalue); |
1312 | XChangeGC (display->display, TermWin.gc, GCForeground, &gcvalue); |
1308 | } |
1313 | } |
|
|
1314 | |
1309 | for (; num--; row++) |
1315 | for (; num--; row++) |
1310 | { |
1316 | { |
1311 | scr_blank_screen_mem (screen.text, screen.rend, |
1317 | scr_blank_screen_mem (screen.text, screen.rend, |
1312 | (unsigned int) (row + row_offset), rstyle); |
1318 | (unsigned int) (row + row_offset), rstyle); |
1313 | screen.tlen[row + row_offset] = 0; |
1319 | screen.tlen[row + row_offset] = 0; |
… | |
… | |
1347 | * Insert/Delete <count> lines |
1353 | * Insert/Delete <count> lines |
1348 | */ |
1354 | */ |
1349 | void |
1355 | void |
1350 | rxvt_term::scr_insdel_lines (int count, int insdel) |
1356 | rxvt_term::scr_insdel_lines (int count, int insdel) |
1351 | { |
1357 | { |
1352 | int end; |
1358 | int end; |
1353 | |
1359 | |
1354 | ZERO_SCROLLBACK (); |
1360 | ZERO_SCROLLBACK (); |
1355 | |
1361 | |
1356 | selection_check (1); |
1362 | selection_check (1); |
1357 | |
1363 | |
… | |
… | |
1376 | * Insert/Delete <count> characters from the current position |
1382 | * Insert/Delete <count> characters from the current position |
1377 | */ |
1383 | */ |
1378 | void |
1384 | void |
1379 | rxvt_term::scr_insdel_chars (int count, int insdel) |
1385 | rxvt_term::scr_insdel_chars (int count, int insdel) |
1380 | { |
1386 | { |
1381 | int col, row; |
1387 | int col, row; |
1382 | rend_t tr; |
1388 | rend_t tr; |
1383 | text_t *stp; |
1389 | text_t *stp; |
1384 | rend_t *srp; |
1390 | rend_t *srp; |
1385 | int16_t *slp; |
1391 | int16_t *slp; |
1386 | |
1392 | |
1387 | want_refresh = 1; |
1393 | want_refresh = 1; |
1388 | ZERO_SCROLLBACK (); |
1394 | ZERO_SCROLLBACK (); |
1389 | |
1395 | |
1390 | if (count <= 0) |
1396 | if (count <= 0) |
… | |
… | |
1397 | screen.flags &= ~Screen_WrapNext; |
1403 | screen.flags &= ~Screen_WrapNext; |
1398 | |
1404 | |
1399 | stp = screen.text[row]; |
1405 | stp = screen.text[row]; |
1400 | srp = screen.rend[row]; |
1406 | srp = screen.rend[row]; |
1401 | slp = & (screen.tlen[row]); |
1407 | slp = & (screen.tlen[row]); |
|
|
1408 | |
1402 | switch (insdel) |
1409 | switch (insdel) |
1403 | { |
1410 | { |
1404 | case INSERT: |
1411 | case INSERT: |
1405 | for (col = TermWin.ncol - 1; (col - count) >= screen.cur.col; |
1412 | for (col = TermWin.ncol - 1; (col - count) >= screen.cur.col; |
1406 | col--) |
1413 | col--) |
1407 | { |
1414 | { |
1408 | stp[col] = stp[col - count]; |
1415 | stp[col] = stp[col - count]; |
1409 | srp[col] = srp[col - count]; |
1416 | srp[col] = srp[col - count]; |
1410 | } |
1417 | } |
|
|
1418 | |
1411 | if (*slp != -1) |
1419 | if (*slp != -1) |
1412 | { |
1420 | { |
1413 | *slp += count; |
1421 | *slp += count; |
1414 | MIN_IT (*slp, TermWin.ncol); |
1422 | MIN_IT (*slp, TermWin.ncol); |
1415 | } |
1423 | } |
|
|
1424 | |
1416 | if (selection.op && current_screen == selection.screen |
1425 | if (selection.op && current_screen == selection.screen |
1417 | && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) |
1426 | && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) |
1418 | { |
1427 | { |
1419 | if (selection.end.row != screen.cur.row |
1428 | if (selection.end.row != screen.cur.row |
1420 | || (selection.end.col + count >= TermWin.ncol)) |
1429 | || (selection.end.col + count >= TermWin.ncol)) |
… | |
… | |
1424 | selection.beg.col += count; |
1433 | selection.beg.col += count; |
1425 | selection.mark.col += count; /* XXX: yes? */ |
1434 | selection.mark.col += count; /* XXX: yes? */ |
1426 | selection.end.col += count; |
1435 | selection.end.col += count; |
1427 | } |
1436 | } |
1428 | } |
1437 | } |
|
|
1438 | |
1429 | scr_blank_line (& (stp[screen.cur.col]), & (srp[screen.cur.col]), |
1439 | scr_blank_line (& (stp[screen.cur.col]), & (srp[screen.cur.col]), |
1430 | (unsigned int)count, rstyle); |
1440 | (unsigned int)count, rstyle); |
1431 | break; |
1441 | break; |
|
|
1442 | |
1432 | case ERASE: |
1443 | case ERASE: |
1433 | screen.cur.col += count; /* don't worry if > TermWin.ncol */ |
1444 | screen.cur.col += count; /* don't worry if > TermWin.ncol */ |
1434 | selection_check (1); |
1445 | selection_check (1); |
1435 | screen.cur.col -= count; |
1446 | screen.cur.col -= count; |
1436 | scr_blank_line (& (stp[screen.cur.col]), & (srp[screen.cur.col]), |
1447 | scr_blank_line (& (stp[screen.cur.col]), & (srp[screen.cur.col]), |
1437 | (unsigned int)count, rstyle); |
1448 | (unsigned int)count, rstyle); |
1438 | break; |
1449 | break; |
|
|
1450 | |
1439 | case DELETE: |
1451 | case DELETE: |
1440 | tr = srp[TermWin.ncol - 1] |
|
|
1441 | & (RS_fgMask | RS_bgMask | RS_baseattrMask); |
1452 | tr = srp[TermWin.ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask); |
|
|
1453 | |
1442 | for (col = screen.cur.col; (col + count) < TermWin.ncol; col++) |
1454 | for (col = screen.cur.col; (col + count) < TermWin.ncol; col++) |
1443 | { |
1455 | { |
1444 | stp[col] = stp[col + count]; |
1456 | stp[col] = stp[col + count]; |
1445 | srp[col] = srp[col + count]; |
1457 | srp[col] = srp[col + count]; |
1446 | } |
1458 | } |
|
|
1459 | |
1447 | scr_blank_line (& (stp[TermWin.ncol - count]), |
1460 | scr_blank_line (& (stp[TermWin.ncol - count]), |
1448 | & (srp[TermWin.ncol - count]), |
1461 | & (srp[TermWin.ncol - count]), |
1449 | (unsigned int)count, tr); |
1462 | (unsigned int)count, tr); |
|
|
1463 | |
1450 | if (*slp == -1) /* break line continuation */ |
1464 | if (*slp == -1) /* break line continuation */ |
1451 | *slp = TermWin.ncol; |
1465 | *slp = TermWin.ncol; |
|
|
1466 | |
1452 | *slp -= count; |
1467 | *slp -= count; |
1453 | MAX_IT (*slp, 0); |
1468 | MAX_IT (*slp, 0); |
|
|
1469 | |
1454 | if (selection.op && current_screen == selection.screen |
1470 | if (selection.op && current_screen == selection.screen |
1455 | && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) |
1471 | && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) |
1456 | { |
1472 | { |
1457 | if (selection.end.row != screen.cur.row |
1473 | if (selection.end.row != screen.cur.row |
1458 | || (screen.cur.col >= selection.beg.col - count) |
1474 | || (screen.cur.col >= selection.beg.col - count) |
… | |
… | |
1464 | selection.beg.col -= count; |
1480 | selection.beg.col -= count; |
1465 | selection.mark.col -= count; /* XXX: yes? */ |
1481 | selection.mark.col -= count; /* XXX: yes? */ |
1466 | selection.end.col -= count; |
1482 | selection.end.col -= count; |
1467 | } |
1483 | } |
1468 | } |
1484 | } |
|
|
1485 | |
1469 | break; |
1486 | break; |
1470 | } |
1487 | } |
1471 | } |
1488 | } |
1472 | |
1489 | |
1473 | /* ------------------------------------------------------------------------- */ |
1490 | /* ------------------------------------------------------------------------- */ |
… | |
… | |
1478 | void |
1495 | void |
1479 | rxvt_term::scr_scroll_region (int top, int bot) |
1496 | rxvt_term::scr_scroll_region (int top, int bot) |
1480 | { |
1497 | { |
1481 | MAX_IT (top, 0); |
1498 | MAX_IT (top, 0); |
1482 | MIN_IT (bot, (int)TermWin.nrow - 1); |
1499 | MIN_IT (bot, (int)TermWin.nrow - 1); |
|
|
1500 | |
1483 | if (top > bot) |
1501 | if (top > bot) |
1484 | return; |
1502 | return; |
|
|
1503 | |
1485 | screen.tscroll = top; |
1504 | screen.tscroll = top; |
1486 | screen.bscroll = bot; |
1505 | screen.bscroll = bot; |
1487 | scr_gotorc (0, 0, 0); |
1506 | scr_gotorc (0, 0, 0); |
1488 | } |
1507 | } |
1489 | |
1508 | |
… | |
… | |
1947 | |
1966 | |
1948 | /* |
1967 | /* |
1949 | * C: set the cursor character (s) |
1968 | * C: set the cursor character (s) |
1950 | */ |
1969 | */ |
1951 | { |
1970 | { |
1952 | unsigned char setoldcursor; |
1971 | unsigned char setoldcursor; |
1953 | rend_t ccol1, /* Cursor colour */ |
1972 | rend_t ccol1, /* Cursor colour */ |
1954 | ccol2; /* Cursor colour2 */ |
1973 | ccol2; /* Cursor colour2 */ |
1955 | |
1974 | |
1956 | showcursor = (screen.flags & Screen_VisibleCursor); |
1975 | showcursor = (screen.flags & Screen_VisibleCursor); |
1957 | #ifdef CURSOR_BLINK |
1976 | #ifdef CURSOR_BLINK |
1958 | if (hidden_cursor) |
1977 | if (hidden_cursor) |
1959 | showcursor = 0; |
1978 | showcursor = 0; |
1960 | #endif |
1979 | #endif |
1961 | |
1980 | |
1962 | if (showcursor) |
1981 | if (showcursor) |
1963 | { |
1982 | { |
1964 | srp = & (screen.rend[screen.cur.row + TermWin.saveLines] |
1983 | srp = &(screen.rend[screen.cur.row + TermWin.saveLines][screen.cur.col]); |
1965 | [screen.cur.col]); |
|
|
1966 | |
1984 | |
1967 | if (showcursor && TermWin.focus) |
1985 | if (showcursor && TermWin.focus) |
1968 | { |
1986 | { |
1969 | *srp ^= RS_RVid; |
1987 | *srp ^= RS_RVid; |
1970 | #ifndef NO_CURSORCOLOR |
1988 | #ifndef NO_CURSORCOLOR |
… | |
… | |
1998 | if (screen.cur.row + TermWin.view_start != ocrow |
2016 | if (screen.cur.row + TermWin.view_start != ocrow |
1999 | || screen.cur.col != oldcursor.col) |
2017 | || screen.cur.col != oldcursor.col) |
2000 | { |
2018 | { |
2001 | if (ocrow < TermWin.nrow |
2019 | if (ocrow < TermWin.nrow |
2002 | && oldcursor.col < TermWin.ncol) |
2020 | && oldcursor.col < TermWin.ncol) |
2003 | { |
|
|
2004 | drawn_rend[ocrow][oldcursor.col] ^= (RS_RVid | RS_Uline); |
2021 | drawn_rend[ocrow][oldcursor.col] ^= (RS_RVid | RS_Uline); |
2005 | } |
2022 | |
2006 | if (TermWin.focus || !showcursor) |
2023 | if (TermWin.focus || !showcursor) |
2007 | oldcursor.row = -1; |
2024 | oldcursor.row = -1; |
2008 | else |
2025 | else |
2009 | setoldcursor = 1; |
2026 | setoldcursor = 1; |
2010 | } |
2027 | } |
2011 | } |
2028 | } |
2012 | else if (!TermWin.focus) |
2029 | else if (!TermWin.focus) |
2013 | setoldcursor = 1; |
2030 | setoldcursor = 1; |
|
|
2031 | |
2014 | if (setoldcursor) |
2032 | if (setoldcursor) |
2015 | { |
2033 | { |
2016 | if (screen.cur.row + TermWin.view_start >= TermWin.nrow) |
2034 | if (screen.cur.row + TermWin.view_start >= TermWin.nrow) |
2017 | oldcursor.row = -1; |
2035 | oldcursor.row = -1; |
2018 | else |
2036 | else |
… | |
… | |
2030 | */ |
2048 | */ |
2031 | i = num_scr; |
2049 | i = num_scr; |
2032 | if (refresh_type == FAST_REFRESH && num_scr_allow && i |
2050 | if (refresh_type == FAST_REFRESH && num_scr_allow && i |
2033 | && abs (i) < TermWin.nrow && !must_clear) |
2051 | && abs (i) < TermWin.nrow && !must_clear) |
2034 | { |
2052 | { |
2035 | int16_t nits; |
2053 | int16_t nits; |
2036 | int j; |
2054 | int j; |
2037 | rend_t *drp2; |
2055 | rend_t *drp2; |
2038 | text_t *dtp2; |
2056 | text_t *dtp2; |
2039 | int len, wlen; |
2057 | int len, wlen; |
2040 | |
2058 | |
2041 | j = TermWin.nrow; |
2059 | j = TermWin.nrow; |
2042 | wlen = len = -1; |
2060 | wlen = len = -1; |
2043 | row = i > 0 ? 0 : j - 1; |
2061 | row = i > 0 ? 0 : j - 1; |
2044 | for (; j-- >= 0; row += (i > 0 ? 1 : -1)) |
2062 | for (; j-- >= 0; row += (i > 0 ? 1 : -1)) |
… | |
… | |
2620 | void |
2638 | void |
2621 | rxvt_term::incr_cb (time_watcher &w) |
2639 | rxvt_term::incr_cb (time_watcher &w) |
2622 | { |
2640 | { |
2623 | selection_wait = Sel_none; |
2641 | selection_wait = Sel_none; |
2624 | |
2642 | |
2625 | rxvt_print_error ("data loss: timeout on INCR selection paste"); |
2643 | rxvt_warn ("data loss: timeout on INCR selection paste, ignoring.\n"); |
2626 | } |
2644 | } |
2627 | |
2645 | |
2628 | /* |
2646 | /* |
2629 | * INCR support originally provided by Paul Sheer <psheer@obsidian.co.za> |
2647 | * INCR support originally provided by Paul Sheer <psheer@obsidian.co.za> |
2630 | */ |
2648 | */ |
… | |
… | |
2709 | { |
2727 | { |
2710 | int i; |
2728 | int i; |
2711 | |
2729 | |
2712 | selection_request_time = tm; |
2730 | selection_request_time = tm; |
2713 | selection_wait = Sel_normal; |
2731 | selection_wait = Sel_normal; |
|
|
2732 | |
2714 | for (i = Sel_Primary; i <= Sel_Clipboard; i++) |
2733 | for (i = Sel_Primary; i <= Sel_Clipboard; i++) |
2715 | { |
2734 | { |
2716 | #if X_HAVE_UTF8_STRING |
2735 | #if X_HAVE_UTF8_STRING |
2717 | selection_type = Sel_UTF8String; |
2736 | selection_type = Sel_UTF8String; |
2718 | if (selection_request_other (xa[XA_UTF8_STRING], i)) |
2737 | if (selection_request_other (xa[XA_UTF8_STRING], i)) |
… | |
… | |
2772 | want_refresh = 1; |
2791 | want_refresh = 1; |
2773 | free (selection.text); |
2792 | free (selection.text); |
2774 | selection.text = NULL; |
2793 | selection.text = NULL; |
2775 | selection.len = 0; |
2794 | selection.len = 0; |
2776 | CLEAR_SELECTION (); |
2795 | CLEAR_SELECTION (); |
|
|
2796 | |
|
|
2797 | if (display->selection_owner == this) |
|
|
2798 | display->selection_owner = 0; |
2777 | } |
2799 | } |
2778 | |
2800 | |
2779 | /* ------------------------------------------------------------------------- */ |
2801 | /* ------------------------------------------------------------------------- */ |
2780 | /* |
2802 | /* |
2781 | * Copy a selection into the cut buffer |
2803 | * Copy a selection into the cut buffer |
… | |
… | |
2857 | |
2879 | |
2858 | if (screen.tlen[row] != -1 && row != end_row) |
2880 | if (screen.tlen[row] != -1 && row != end_row) |
2859 | new_selection_text[ofs++] = L'\n'; |
2881 | new_selection_text[ofs++] = L'\n'; |
2860 | } |
2882 | } |
2861 | |
2883 | |
2862 | #ifndef NO_OLD_SELECTION |
2884 | if (end_col != selection.end.col) |
2863 | if (selection_style == OLD_SELECT) |
|
|
2864 | if (end_col == TermWin.ncol) |
|
|
2865 | new_selection_text[ofs++] = L'\n'; |
2885 | new_selection_text[ofs++] = L'\n'; |
2866 | #endif |
2886 | |
2867 | #ifndef NO_NEW_SELECTION |
|
|
2868 | if (selection_style != OLD_SELECT) |
|
|
2869 | if (end_col != selection.end.col) |
|
|
2870 | new_selection_text[ofs++] = L'\n'; |
|
|
2871 | #endif |
|
|
2872 | new_selection_text[ofs] = 0; |
2887 | new_selection_text[ofs] = 0; |
2873 | |
2888 | |
2874 | if (ofs == 0) |
2889 | if (ofs == 0) |
2875 | { |
2890 | { |
2876 | free (new_selection_text); |
2891 | free (new_selection_text); |
… | |
… | |
2885 | |
2900 | |
2886 | XSetSelectionOwner (display->display, XA_PRIMARY, TermWin.vt, tm); |
2901 | XSetSelectionOwner (display->display, XA_PRIMARY, TermWin.vt, tm); |
2887 | if (XGetSelectionOwner (display->display, XA_PRIMARY) == TermWin.vt) |
2902 | if (XGetSelectionOwner (display->display, XA_PRIMARY) == TermWin.vt) |
2888 | display->set_selection_owner (this); |
2903 | display->set_selection_owner (this); |
2889 | else |
2904 | else |
2890 | rxvt_print_error ("can't get primary selection"); |
2905 | rxvt_warn ("can't get primary selection, ignoring.\n"); |
2891 | |
2906 | |
2892 | #if 0 |
2907 | #if 0 |
2893 | XTextProperty ct; |
2908 | XTextProperty ct; |
2894 | |
2909 | |
2895 | if (XwcTextListToTextProperty (display->display, &selection.text, 1, XStringStyle, &ct) >= 0) |
2910 | if (XwcTextListToTextProperty (display->display, &selection.text, 1, XStringStyle, &ct) >= 0) |
… | |
… | |
2935 | rxvt_term::selection_start_colrow (int col, int row) |
2950 | rxvt_term::selection_start_colrow (int col, int row) |
2936 | { |
2951 | { |
2937 | want_refresh = 1; |
2952 | want_refresh = 1; |
2938 | selection.mark.col = col; |
2953 | selection.mark.col = col; |
2939 | selection.mark.row = row - TermWin.view_start; |
2954 | selection.mark.row = row - TermWin.view_start; |
|
|
2955 | |
2940 | MAX_IT (selection.mark.row, - (int32_t)TermWin.nscrolled); |
2956 | MAX_IT (selection.mark.row, - (int32_t)TermWin.nscrolled); |
2941 | MIN_IT (selection.mark.row, (int32_t)TermWin.nrow - 1); |
2957 | MIN_IT (selection.mark.row, (int32_t)TermWin.nrow - 1); |
2942 | MAX_IT (selection.mark.col, 0); |
2958 | MAX_IT (selection.mark.col, 0); |
2943 | MIN_IT (selection.mark.col, (int32_t)TermWin.ncol - 1); |
2959 | MIN_IT (selection.mark.col, (int32_t)TermWin.ncol - 1); |
2944 | |
2960 | |
|
|
2961 | while (selection.mark.col > 0 |
|
|
2962 | && screen.text[selection.mark.row + TermWin.saveLines][selection.mark.col] == NOCHAR) |
|
|
2963 | --selection.mark.col; |
|
|
2964 | |
2945 | if (selection.op) |
2965 | if (selection.op) |
2946 | { /* clear the old selection */ |
2966 | { /* clear the old selection */ |
2947 | selection.beg.row = selection.end.row = selection.mark.row; |
2967 | selection.beg.row = selection.end.row = selection.mark.row; |
2948 | selection.beg.col = selection.end.col = selection.mark.col; |
2968 | selection.beg.col = selection.end.col = selection.mark.col; |
2949 | } |
2969 | } |
|
|
2970 | |
2950 | selection.op = SELECTION_INIT; |
2971 | selection.op = SELECTION_INIT; |
2951 | selection.screen = current_screen; |
2972 | selection.screen = current_screen; |
2952 | } |
2973 | } |
2953 | |
2974 | |
2954 | /* ------------------------------------------------------------------------- */ |
2975 | /* ------------------------------------------------------------------------- */ |
… | |
… | |
2956 | * Word select: select text for 2 clicks |
2977 | * Word select: select text for 2 clicks |
2957 | * We now only find out the boundary in one direction |
2978 | * We now only find out the boundary in one direction |
2958 | */ |
2979 | */ |
2959 | |
2980 | |
2960 | /* what do we want: spaces/tabs are delimiters or cutchars or non-cutchars */ |
2981 | /* what do we want: spaces/tabs are delimiters or cutchars or non-cutchars */ |
2961 | #define DELIMIT_TEXT(x) \ |
2982 | #define DELIMIT_TEXT(x) \ |
2962 | (((x) == ' ' || (x) == '\t') ? 2 : (STRCHR (rs[Rs_cutchars], (x)) != NULL)) |
2983 | (unicode::is_space (x) ? 2 : (x) <= 0xff && !!STRCHR (rs[Rs_cutchars], (x))) |
2963 | #define DELIMIT_REND(x) 1 |
2984 | #define DELIMIT_REND(x) 1 |
2964 | |
2985 | |
2965 | void |
2986 | void |
2966 | rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) |
2987 | rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) |
2967 | { |
2988 | { |
2968 | int col, row, dirnadd, tcol, trow, w1, w2; |
2989 | int col, row, dirnadd, tcol, trow, w1, w2; |
2969 | row_col_t bound; |
2990 | row_col_t bound; |
2970 | text_t *stp; |
2991 | text_t *stp; |
2971 | rend_t *srp; |
2992 | rend_t *srp; |
2972 | |
2993 | |
2973 | if (dirn == UP) |
2994 | if (dirn == UP) |
2974 | { |
2995 | { |
2975 | bound.row = TermWin.saveLines - TermWin.nscrolled - 1; |
2996 | bound.row = TermWin.saveLines - TermWin.nscrolled - 1; |
2976 | bound.col = 0; |
2997 | bound.col = 0; |
… | |
… | |
2980 | { |
3001 | { |
2981 | bound.row = TermWin.saveLines + TermWin.nrow; |
3002 | bound.row = TermWin.saveLines + TermWin.nrow; |
2982 | bound.col = TermWin.ncol - 1; |
3003 | bound.col = TermWin.ncol - 1; |
2983 | dirnadd = 1; |
3004 | dirnadd = 1; |
2984 | } |
3005 | } |
|
|
3006 | |
2985 | row = mark->row + TermWin.saveLines; |
3007 | row = mark->row + TermWin.saveLines; |
2986 | col = mark->col; |
3008 | col = mark->col; |
2987 | MAX_IT (col, 0); |
3009 | MAX_IT (col, 0); |
2988 | /* find the edge of a word */ |
3010 | /* find the edge of a word */ |
2989 | stp = & (screen.text[row][col]); |
3011 | stp = & (screen.text[row][col]); |
2990 | w1 = DELIMIT_TEXT (*stp); |
3012 | w1 = DELIMIT_TEXT (*stp); |
2991 | |
3013 | |
2992 | if (selection_style != NEW_SELECT) |
|
|
2993 | { |
|
|
2994 | if (w1 == 1) |
|
|
2995 | { |
|
|
2996 | stp += dirnadd; |
|
|
2997 | if (DELIMIT_TEXT (*stp) == 1) |
|
|
2998 | goto Old_Word_Selection_You_Die; |
|
|
2999 | col += dirnadd; |
|
|
3000 | } |
|
|
3001 | w1 = 0; |
|
|
3002 | } |
|
|
3003 | srp = (&screen.rend[row][col]); |
3014 | srp = (&screen.rend[row][col]); |
3004 | w2 = DELIMIT_REND (*srp); |
3015 | w2 = DELIMIT_REND (*srp); |
3005 | |
3016 | |
3006 | for (;;) |
3017 | for (;;) |
3007 | { |
3018 | { |
3008 | for (; col != bound.col; col += dirnadd) |
3019 | for (; col != bound.col; col += dirnadd) |
3009 | { |
3020 | { |
3010 | stp += dirnadd; |
3021 | stp += dirnadd; |
|
|
3022 | srp += dirnadd; |
|
|
3023 | |
|
|
3024 | if (*stp == NOCHAR) |
|
|
3025 | continue; |
|
|
3026 | |
3011 | if (DELIMIT_TEXT (*stp) != w1) |
3027 | if (DELIMIT_TEXT (*stp) != w1) |
3012 | break; |
3028 | break; |
3013 | srp += dirnadd; |
|
|
3014 | if (DELIMIT_REND (*srp) != w2) |
3029 | if (DELIMIT_REND (*srp) != w2) |
3015 | break; |
3030 | break; |
3016 | } |
3031 | } |
|
|
3032 | |
3017 | if ((col == bound.col) && (row != bound.row)) |
3033 | if ((col == bound.col) && (row != bound.row)) |
3018 | { |
3034 | { |
3019 | if (screen.tlen[ (row - (dirn == UP ? 1 : 0))] == -1) |
3035 | if (screen.tlen[ (row - (dirn == UP ? 1 : 0))] == -1) |
3020 | { |
3036 | { |
3021 | trow = row + dirnadd; |
3037 | trow = row + dirnadd; |
3022 | tcol = dirn == UP ? TermWin.ncol - 1 : 0; |
3038 | tcol = dirn == UP ? TermWin.ncol - 1 : 0; |
|
|
3039 | |
3023 | if (screen.text[trow] == NULL) |
3040 | if (screen.text[trow] == NULL) |
3024 | break; |
3041 | break; |
|
|
3042 | |
3025 | stp = & (screen.text[trow][tcol]); |
3043 | stp = & (screen.text[trow][tcol]); |
3026 | srp = & (screen.rend[trow][tcol]); |
3044 | srp = & (screen.rend[trow][tcol]); |
|
|
3045 | |
3027 | if (DELIMIT_TEXT (*stp) != w1 || DELIMIT_REND (*srp) != w2) |
3046 | if (DELIMIT_TEXT (*stp) != w1 || DELIMIT_REND (*srp) != w2) |
3028 | break; |
3047 | break; |
|
|
3048 | |
3029 | row = trow; |
3049 | row = trow; |
3030 | col = tcol; |
3050 | col = tcol; |
3031 | continue; |
3051 | continue; |
3032 | } |
3052 | } |
3033 | } |
3053 | } |
3034 | break; |
3054 | break; |
3035 | } |
3055 | } |
|
|
3056 | |
3036 | Old_Word_Selection_You_Die: |
3057 | Old_Word_Selection_You_Die: |
3037 | D_SELECT ((stderr, "rxvt_selection_delimit_word (%s,...) @ (r:%3d, c:%3d) has boundary (r:%3d, c:%3d)", (dirn == UP ? "up " : "down"), mark->row, mark->col, row - TermWin.saveLines, col)); |
3058 | D_SELECT ((stderr, "rxvt_selection_delimit_word (%s,...) @ (r:%3d, c:%3d) has boundary (r:%3d, c:%3d)", (dirn == UP ? "up " : "down"), mark->row, mark->col, row - TermWin.saveLines, col)); |
3038 | |
3059 | |
3039 | if (dirn == DN) |
3060 | if (dirn == DN) |
3040 | col++; /* put us on one past the end */ |
3061 | col++; /* put us on one past the end */ |
… | |
… | |
3062 | MAX_IT (row, 0); |
3083 | MAX_IT (row, 0); |
3063 | MIN_IT (row, (int)TermWin.nrow - 1); |
3084 | MIN_IT (row, (int)TermWin.nrow - 1); |
3064 | MAX_IT (col, 0); |
3085 | MAX_IT (col, 0); |
3065 | MIN_IT (col, (int)TermWin.ncol); |
3086 | MIN_IT (col, (int)TermWin.ncol); |
3066 | |
3087 | |
3067 | #ifndef NO_NEW_SELECTION |
|
|
3068 | /* |
3088 | /* |
3069 | * If we're selecting characters (single click) then we must check first |
3089 | * If we're selecting characters (single click) then we must check first |
3070 | * if we are at the same place as the original mark. If we are then |
3090 | * if we are at the same place as the original mark. If we are then |
3071 | * select nothing. Otherwise, if we're to the right of the mark, you have to |
3091 | * select nothing. Otherwise, if we're to the right of the mark, you have to |
3072 | * be _past_ a character for it to be selected. |
3092 | * be _past_ a character for it to be selected. |
3073 | */ |
3093 | */ |
3074 | if (selection_style != OLD_SELECT) |
|
|
3075 | { |
|
|
3076 | if (((selection.clicks % 3) == 1) && !flag |
3094 | if (((selection.clicks % 3) == 1) && !flag |
3077 | && (col == selection.mark.col |
3095 | && (col == selection.mark.col |
3078 | && (row == selection.mark.row + TermWin.view_start))) |
3096 | && (row == selection.mark.row + TermWin.view_start))) |
3079 | { |
3097 | { |
3080 | /* select nothing */ |
3098 | /* select nothing */ |
3081 | selection.beg.row = selection.end.row = 0; |
3099 | selection.beg.row = selection.end.row = 0; |
3082 | selection.beg.col = selection.end.col = 0; |
3100 | selection.beg.col = selection.end.col = 0; |
3083 | selection.clicks = 4; |
3101 | selection.clicks = 4; |
3084 | want_refresh = 1; |
3102 | want_refresh = 1; |
3085 | D_SELECT ((stderr, "rxvt_selection_extend () selection.clicks = 4")); |
3103 | D_SELECT ((stderr, "rxvt_selection_extend () selection.clicks = 4")); |
3086 | return; |
3104 | return; |
3087 | } |
|
|
3088 | } |
3105 | } |
3089 | #endif |
3106 | |
3090 | if (selection.clicks == 4) |
3107 | if (selection.clicks == 4) |
3091 | selection.clicks = 1; |
3108 | selection.clicks = 1; |
3092 | |
3109 | |
3093 | selection_extend_colrow (col, row, !!flag, /* ? button 3 */ |
3110 | selection_extend_colrow (col, row, !!flag, /* ? button 3 */ |
3094 | flag == 1 ? 1 : 0, /* ? button press */ |
3111 | flag == 1 ? 1 : 0, /* ? button press */ |
… | |
… | |
3148 | pos.col = col; |
3165 | pos.col = col; |
3149 | pos.row = row; |
3166 | pos.row = row; |
3150 | |
3167 | |
3151 | pos.row -= TermWin.view_start; /* adjust for scroll */ |
3168 | pos.row -= TermWin.view_start; /* adjust for scroll */ |
3152 | |
3169 | |
3153 | #ifndef NO_OLD_SELECTION |
|
|
3154 | /* |
|
|
3155 | * This mimics some of the selection behaviour of version 2.20 and before. |
|
|
3156 | * There are no ``selection modes'', button3 is always character extension. |
|
|
3157 | * Note: button3 drag is always available, c.f. v2.20 |
|
|
3158 | * Selection always terminates (left or right as appropriate) at the mark. |
|
|
3159 | */ |
|
|
3160 | if (selection_style == OLD_SELECT) |
|
|
3161 | { |
|
|
3162 | if (selection.clicks == 1 || button3) |
|
|
3163 | { |
|
|
3164 | if (hate_those_clicks) |
|
|
3165 | { |
|
|
3166 | hate_those_clicks = 0; |
|
|
3167 | if (selection.clicks == 1) |
|
|
3168 | { |
|
|
3169 | selection.beg.row = selection.mark.row; |
|
|
3170 | selection.beg.col = selection.mark.col; |
|
|
3171 | } |
|
|
3172 | else |
|
|
3173 | { |
|
|
3174 | selection.mark.row = selection.beg.row; |
|
|
3175 | selection.mark.col = selection.beg.col; |
|
|
3176 | } |
|
|
3177 | } |
|
|
3178 | if (ROWCOL_IS_BEFORE (pos, selection.mark)) |
|
|
3179 | { |
|
|
3180 | selection.end.row = selection.mark.row; |
|
|
3181 | selection.end.col = selection.mark.col + 1; |
|
|
3182 | selection.beg.row = pos.row; |
|
|
3183 | selection.beg.col = pos.col; |
|
|
3184 | } |
|
|
3185 | else |
|
|
3186 | { |
|
|
3187 | selection.beg.row = selection.mark.row; |
|
|
3188 | selection.beg.col = selection.mark.col; |
|
|
3189 | selection.end.row = pos.row; |
|
|
3190 | selection.end.col = pos.col + 1; |
|
|
3191 | } |
|
|
3192 | } |
|
|
3193 | else if (selection.clicks == 2) |
|
|
3194 | { |
|
|
3195 | selection_delimit_word (UP, & (selection.mark), |
|
|
3196 | & (selection.beg)); |
|
|
3197 | selection_delimit_word (DN, & (selection.mark), |
|
|
3198 | & (selection.end)); |
|
|
3199 | hate_those_clicks = 1; |
|
|
3200 | } |
|
|
3201 | else if (selection.clicks == 3) |
|
|
3202 | { |
|
|
3203 | selection.beg.row = selection.end.row = selection.mark.row; |
|
|
3204 | selection.beg.col = 0; |
|
|
3205 | selection.end.col = ncol; |
|
|
3206 | hate_those_clicks = 1; |
|
|
3207 | } |
|
|
3208 | D_SELECT ((stderr, "rxvt_selection_extend_colrow () EXIT b: (r:%d,c:%d) m: (r:%d,c:%d), e: (r:%d,c:%d)", selection.beg.row, selection.beg.col, selection.mark.row, selection.mark.col, selection.end.row, selection.end.col)); |
|
|
3209 | return; |
|
|
3210 | } |
|
|
3211 | #endif /* ! NO_OLD_SELECTION */ |
|
|
3212 | #ifndef NO_NEW_SELECTION |
|
|
3213 | /* selection_style must not be OLD_SELECT to get here */ |
|
|
3214 | /* |
3170 | /* |
3215 | * This is mainly xterm style selection with a couple of differences, mainly |
3171 | * This is mainly xterm style selection with a couple of differences, mainly |
3216 | * in the way button3 drag extension works. |
3172 | * in the way button3 drag extension works. |
3217 | * We're either doing: button1 drag; button3 press; or button3 drag |
3173 | * We're either doing: button1 drag; button3 press; or button3 drag |
3218 | * a) button1 drag : select around a midpoint/word/line - that point/word/line |
3174 | * a) button1 drag : select around a midpoint/word/line - that point/word/line |
… | |
… | |
3223 | * a point/word/line which is either the start or end of the selection |
3179 | * a point/word/line which is either the start or end of the selection |
3224 | * and it was decided by whichever point/word/line was `fixed' at the |
3180 | * and it was decided by whichever point/word/line was `fixed' at the |
3225 | * time of the most recent button3 press |
3181 | * time of the most recent button3 press |
3226 | */ |
3182 | */ |
3227 | if (button3 && buttonpress) |
3183 | if (button3 && buttonpress) |
3228 | { /* button3 press */ |
3184 | { /* button3 press */ |
3229 | /* |
3185 | /* |
3230 | * first determine which edge of the selection we are closest to |
3186 | * first determine which edge of the selection we are closest to |
3231 | */ |
3187 | */ |
3232 | if (ROWCOL_IS_BEFORE (pos, selection.beg) |
3188 | if (ROWCOL_IS_BEFORE (pos, selection.beg) |
3233 | || (!ROWCOL_IS_AFTER (pos, selection.end) |
3189 | || (!ROWCOL_IS_AFTER (pos, selection.end) |
3234 | && (((pos.col - selection.beg.col) |
3190 | && (((pos.col - selection.beg.col) |
3235 | + ((pos.row - selection.beg.row) * ncol)) |
3191 | + ((pos.row - selection.beg.row) * ncol)) |
3236 | < ((selection.end.col - pos.col) |
3192 | < ((selection.end.col - pos.col) |
3237 | + ((selection.end.row - pos.row) * ncol))))) |
3193 | + ((selection.end.row - pos.row) * ncol))))) |
3238 | closeto = LEFT; |
3194 | closeto = LEFT; |
|
|
3195 | |
3239 | if (closeto == LEFT) |
3196 | if (closeto == LEFT) |
3240 | { |
3197 | { |
3241 | selection.beg.row = pos.row; |
3198 | selection.beg.row = pos.row; |
3242 | selection.beg.col = pos.col; |
3199 | selection.beg.col = pos.col; |
3243 | selection.mark.row = selection.end.row; |
3200 | selection.mark.row = selection.end.row; |
3244 | selection.mark.col = selection.end.col |
3201 | selection.mark.col = selection.end.col - (selection.clicks == 2); |
3245 | - (selection.clicks == 2); |
|
|
3246 | } |
3202 | } |
3247 | else |
3203 | else |
3248 | { |
3204 | { |
3249 | selection.end.row = pos.row; |
3205 | selection.end.row = pos.row; |
3250 | selection.end.col = pos.col; |
3206 | selection.end.col = pos.col; |
3251 | selection.mark.row = selection.beg.row; |
3207 | selection.mark.row = selection.beg.row; |
3252 | selection.mark.col = selection.beg.col; |
3208 | selection.mark.col = selection.beg.col; |
3253 | } |
3209 | } |
3254 | } |
3210 | } |
3255 | else |
3211 | else |
3256 | { /* button1 drag or button3 drag */ |
3212 | { /* button1 drag or button3 drag */ |
3257 | if (ROWCOL_IS_AFTER (selection.mark, pos)) |
3213 | if (ROWCOL_IS_AFTER (selection.mark, pos)) |
3258 | { |
3214 | { |
3259 | if ((selection.mark.row == selection.end.row) |
3215 | if ((selection.mark.row == selection.end.row) |
3260 | && (selection.mark.col == selection.end.col) |
3216 | && (selection.mark.col == selection.end.col) |
3261 | && clickchange && selection.clicks == 2) |
3217 | && clickchange && selection.clicks == 2) |
3262 | selection.mark.col--; |
3218 | selection.mark.col--; |
|
|
3219 | |
3263 | selection.beg.row = pos.row; |
3220 | selection.beg.row = pos.row; |
3264 | selection.beg.col = pos.col; |
3221 | selection.beg.col = pos.col; |
3265 | selection.end.row = selection.mark.row; |
3222 | selection.end.row = selection.mark.row; |
3266 | selection.end.col = selection.mark.col |
3223 | selection.end.col = selection.mark.col + (selection.clicks == 2); |
3267 | + (selection.clicks == 2); |
|
|
3268 | } |
3224 | } |
3269 | else |
3225 | else |
3270 | { |
3226 | { |
3271 | selection.beg.row = selection.mark.row; |
3227 | selection.beg.row = selection.mark.row; |
3272 | selection.beg.col = selection.mark.col; |
3228 | selection.beg.col = selection.mark.col; |
… | |
… | |
3276 | } |
3232 | } |
3277 | |
3233 | |
3278 | if (selection.clicks == 1) |
3234 | if (selection.clicks == 1) |
3279 | { |
3235 | { |
3280 | end_col = screen.tlen[selection.beg.row + TermWin.saveLines]; |
3236 | end_col = screen.tlen[selection.beg.row + TermWin.saveLines]; |
|
|
3237 | |
3281 | if (end_col != -1 && selection.beg.col > end_col) |
3238 | if (end_col != -1 && selection.beg.col > end_col) |
3282 | { |
3239 | { |
3283 | #if 1 |
3240 | #if 1 |
3284 | selection.beg.col = ncol; |
3241 | selection.beg.col = ncol; |
3285 | #else |
3242 | #else |
3286 | if (selection.beg.row != selection.end.row) |
3243 | if (selection.beg.row != selection.end.row) |
3287 | selection.beg.col = ncol; |
3244 | selection.beg.col = ncol; |
3288 | else |
3245 | else |
3289 | selection.beg.col = selection.mark.col; |
3246 | selection.beg.col = selection.mark.col; |
3290 | #endif |
3247 | #endif |
3291 | |
|
|
3292 | } |
3248 | } |
|
|
3249 | |
3293 | end_col = screen.tlen[selection.end.row + TermWin.saveLines]; |
3250 | end_col = screen.tlen[selection.end.row + TermWin.saveLines]; |
|
|
3251 | |
3294 | if (end_col != -1 && selection.end.col > end_col) |
3252 | if (end_col != -1 && selection.end.col > end_col) |
3295 | selection.end.col = ncol; |
3253 | selection.end.col = ncol; |
3296 | |
|
|
3297 | } |
3254 | } |
3298 | else if (selection.clicks == 2) |
3255 | else if (selection.clicks == 2) |
3299 | { |
3256 | { |
3300 | if (ROWCOL_IS_AFTER (selection.end, selection.beg)) |
3257 | if (ROWCOL_IS_AFTER (selection.end, selection.beg)) |
3301 | selection.end.col--; |
3258 | selection.end.col--; |
|
|
3259 | |
3302 | selection_delimit_word (UP, & (selection.beg), |
3260 | selection_delimit_word (UP, & (selection.beg), & (selection.beg)); |
3303 | & (selection.beg)); |
|
|
3304 | selection_delimit_word (DN, & (selection.end), |
3261 | selection_delimit_word (DN, & (selection.end), & (selection.end)); |
3305 | & (selection.end)); |
|
|
3306 | } |
3262 | } |
3307 | else if (selection.clicks == 3) |
3263 | else if (selection.clicks == 3) |
3308 | { |
3264 | { |
3309 | #ifndef NO_FRILLS |
3265 | #ifndef NO_FRILLS |
3310 | if ((Options & Opt_tripleclickwords)) |
3266 | if ((Options & Opt_tripleclickwords)) |
3311 | { |
3267 | { |
3312 | int end_row; |
3268 | int end_row; |
3313 | |
3269 | |
3314 | selection_delimit_word (UP, & (selection.beg), |
3270 | selection_delimit_word (UP, & (selection.beg), & (selection.beg)); |
3315 | & (selection.beg)); |
|
|
3316 | end_row = screen.tlen[selection.mark.row |
3271 | end_row = screen.tlen[selection.mark.row + TermWin.saveLines]; |
3317 | + TermWin.saveLines]; |
3272 | |
3318 | for (end_row = selection.mark.row; end_row < TermWin.nrow; |
3273 | for (end_row = selection.mark.row; end_row < TermWin.nrow; end_row++) |
3319 | end_row++) |
|
|
3320 | { |
3274 | { |
3321 | end_col = screen.tlen[end_row + TermWin.saveLines]; |
3275 | end_col = screen.tlen[end_row + TermWin.saveLines]; |
|
|
3276 | |
3322 | if (end_col != -1) |
3277 | if (end_col != -1) |
3323 | { |
3278 | { |
3324 | selection.end.row = end_row; |
3279 | selection.end.row = end_row; |
3325 | selection.end.col = end_col; |
3280 | selection.end.col = end_col; |
3326 | selection_remove_trailing_spaces (); |
3281 | selection_remove_trailing_spaces (); |
… | |
… | |
3328 | } |
3283 | } |
3329 | } |
3284 | } |
3330 | } |
3285 | } |
3331 | else |
3286 | else |
3332 | #endif |
3287 | #endif |
3333 | |
|
|
3334 | { |
3288 | { |
3335 | if (ROWCOL_IS_AFTER (selection.mark, selection.beg)) |
3289 | if (ROWCOL_IS_AFTER (selection.mark, selection.beg)) |
3336 | selection.mark.col++; |
3290 | selection.mark.col++; |
3337 | selection.beg.col = 0; |
3291 | selection.beg.col = 0; |
3338 | selection.end.col = ncol; |
3292 | selection.end.col = ncol; |
3339 | } |
3293 | } |
3340 | } |
3294 | } |
|
|
3295 | |
3341 | if (button3 && buttonpress) |
3296 | if (button3 && buttonpress) |
3342 | { /* mark may need to be changed */ |
3297 | { /* mark may need to be changed */ |
3343 | if (closeto == LEFT) |
3298 | if (closeto == LEFT) |
3344 | { |
3299 | { |
3345 | selection.mark.row = selection.end.row; |
3300 | selection.mark.row = selection.end.row; |
3346 | selection.mark.col = selection.end.col |
3301 | selection.mark.col = selection.end.col |
3347 | - (selection.clicks == 2); |
3302 | - (selection.clicks == 2); |
… | |
… | |
3351 | selection.mark.row = selection.beg.row; |
3306 | selection.mark.row = selection.beg.row; |
3352 | selection.mark.col = selection.beg.col; |
3307 | selection.mark.col = selection.beg.col; |
3353 | } |
3308 | } |
3354 | } |
3309 | } |
3355 | D_SELECT ((stderr, "rxvt_selection_extend_colrow () EXIT b: (r:%d,c:%d) m: (r:%d,c:%d), e: (r:%d,c:%d)", selection.beg.row, selection.beg.col, selection.mark.row, selection.mark.col, selection.end.row, selection.end.col)); |
3310 | D_SELECT ((stderr, "rxvt_selection_extend_colrow () EXIT b: (r:%d,c:%d) m: (r:%d,c:%d), e: (r:%d,c:%d)", selection.beg.row, selection.beg.col, selection.mark.row, selection.mark.col, selection.end.row, selection.end.col)); |
3356 | #endif /* ! NO_NEW_SELECTION */ |
|
|
3357 | } |
3311 | } |
3358 | |
3312 | |
3359 | #ifndef NO_FRILLS |
3313 | #ifndef NO_FRILLS |
3360 | void |
3314 | void |
3361 | rxvt_term::selection_remove_trailing_spaces () |
3315 | rxvt_term::selection_remove_trailing_spaces () |
… | |
… | |
3460 | /* TODO: Handle MULTIPLE */ |
3414 | /* TODO: Handle MULTIPLE */ |
3461 | } |
3415 | } |
3462 | else if (rq.target == xa[XA_TIMESTAMP] && selection.text) |
3416 | else if (rq.target == xa[XA_TIMESTAMP] && selection.text) |
3463 | { |
3417 | { |
3464 | XChangeProperty (display->display, rq.requestor, rq.property, XA_INTEGER, |
3418 | XChangeProperty (display->display, rq.requestor, rq.property, XA_INTEGER, |
3465 | (8 * sizeof (Time)), PropModeReplace, |
3419 | (8 * sizeof (Time)), PropModeReplace, |
3466 | (unsigned char *)&selection_time, 1); |
3420 | (unsigned char *)&selection_time, 1); |
3467 | ev.property = rq.property; |
3421 | ev.property = rq.property; |
3468 | } |
3422 | } |
3469 | else if (rq.target == XA_STRING |
3423 | else if (rq.target == XA_STRING |
3470 | || rq.target == xa[XA_TEXT] |
3424 | || rq.target == xa[XA_TEXT] |
3471 | || rq.target == xa[XA_COMPOUND_TEXT] |
3425 | || rq.target == xa[XA_COMPOUND_TEXT] |