ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/rxvt-unicode/src/screen.C
(Generate patch)

Comparing rxvt-unicode/src/screen.C (file contents):
Revision 1.222 by root, Wed Jan 11 05:14:26 2006 UTC vs.
Revision 1.245 by root, Fri Jan 20 10:35:25 2006 UTC

… …
115 * SCREEN `COMMON' ROUTINES * 115 * SCREEN `COMMON' ROUTINES *
116 * ------------------------------------------------------------------------- */ 116 * ------------------------------------------------------------------------- */
117 117
118/* Fill part/all of a line with blanks. */ 118/* Fill part/all of a line with blanks. */
119void 119void
120rxvt_term::scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs) 120rxvt_term::scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs) const NOTHROW
121{ 121{
122 if (!l.t) 122 if (!l.t)
123 { 123 {
124 lalloc (l); 124 lalloc (l);
125 col = 0; 125 col = 0;
… …
142} 142}
143 143
144/* ------------------------------------------------------------------------- */ 144/* ------------------------------------------------------------------------- */
145/* Fill a full line with blanks - make sure it is allocated first */ 145/* Fill a full line with blanks - make sure it is allocated first */
146void 146void
147rxvt_term::scr_blank_screen_mem (line_t &l, rend_t efs) 147rxvt_term::scr_blank_screen_mem (line_t &l, rend_t efs) const NOTHROW
148{ 148{
149 scr_blank_line (l, 0, ncol, efs); 149 scr_blank_line (l, 0, ncol, efs);
150 150
151 l.l = 0; 151 l.l = 0;
152 l.f = 0; 152 l.f = 0;
… …
179 if (nrow + saveLines < 2) 179 if (nrow + saveLines < 2)
180 { 180 {
181 //TODO//FIXME 181 //TODO//FIXME
182 saveLines++; 182 saveLines++;
183 prev_nrow--; 183 prev_nrow--;
184 nsaved++; 184 top_row--;
185 } 185 }
186 186
187 want_refresh = 1; 187 want_refresh = 1;
188 188
189 int prev_total_rows = prev_nrow + saveLines; 189 int prev_total_rows = prev_nrow + saveLines;
… …
195 if (!row_buf) 195 if (!row_buf)
196 { 196 {
197 /* 197 /*
198 * first time called so just malloc everything: don't rely on realloc 198 * first time called so just malloc everything: don't rely on realloc
199 */ 199 */
200 nsaved = 0; /* no saved lines */ 200 top_row = 0; /* no saved lines */
201 term_start = 0; 201 term_start = 0;
202 202
203 talloc = new rxvt_salloc (ncol * sizeof (text_t)); 203 talloc = new rxvt_salloc (ncol * sizeof (text_t));
204 ralloc = new rxvt_salloc (ncol * sizeof (rend_t)); 204 ralloc = new rxvt_salloc (ncol * sizeof (rend_t));
205 205
… …
234 selection.text = NULL; 234 selection.text = NULL;
235 selection.len = 0; 235 selection.len = 0;
236 selection.op = SELECTION_CLEAR; 236 selection.op = SELECTION_CLEAR;
237 selection.screen = PRIMARY; 237 selection.screen = PRIMARY;
238 selection.clicks = 0; 238 selection.clicks = 0;
239 CLEAR_ALL_SELECTION ();
240 rvideo = 0; 239 rvideo = 0;
241 } 240 }
242 else 241 else
243 { 242 {
244 /* 243 /*
… …
276 275
277 line_t *old_buf = row_buf; 276 line_t *old_buf = row_buf;
278 row_buf = (line_t *)rxvt_calloc (total_rows + nrow, sizeof (line_t)); 277 row_buf = (line_t *)rxvt_calloc (total_rows + nrow, sizeof (line_t));
279 278
280 int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row 279 int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row
281 int pend = MOD (term_start - nsaved , prev_total_rows); 280 int pend = MOD (term_start + top_row , prev_total_rows);
282 int q = total_rows; // rewrapped row 281 int q = total_rows; // rewrapped row
283 282
284 if (nsaved) 283 if (top_row)
285 { 284 {
286 // re-wrap lines, this is rather ugly, possibly because I am too dumb 285 // re-wrap lines, this is rather ugly, possibly because I am too dumb
287 // to come up with a lean and mean algorithm. 286 // to come up with a lean and mean algorithm.
288 287
289 row_col_t ocur = screen.cur; 288 row_col_t ocur = screen.cur;
… …
325 qline->l = ncol; 324 qline->l = ncol;
326 qline->is_longer (1); 325 qline->is_longer (1);
327 326
328 int qcol = 0; 327 int qcol = 0;
329 328
329 // see below for cursor adjustment rationale
330 if (p == ocur.row)
331 screen.cur.row = q - (total_rows - nrow);
332
330 // fill a single destination line 333 // fill a single destination line
331 while (lofs < llen && qcol < ncol) 334 while (lofs < llen && qcol < ncol)
332 { 335 {
333 int prow = lofs / prev_ncol; 336 int prow = lofs / prev_ncol;
334 int pcol = lofs % prev_ncol; 337 int pcol = lofs % prev_ncol;
… …
344 347
345 line_t &pline = old_buf [prow]; 348 line_t &pline = old_buf [prow];
346 349
347 int len = min (min (prev_ncol - pcol, ncol - qcol), llen - lofs); 350 int len = min (min (prev_ncol - pcol, ncol - qcol), llen - lofs);
348 351
352#if DEBUG_STRICT
349 assert (len); 353 assert (len);
350 assert (pline.t); 354 assert (pline.t);
355#endif
351 356
352 memcpy (qline->t + qcol, pline.t + pcol, len * sizeof (text_t)); 357 memcpy (qline->t + qcol, pline.t + pcol, len * sizeof (text_t));
353 memcpy (qline->r + qcol, pline.r + pcol, len * sizeof (rend_t)); 358 memcpy (qline->r + qcol, pline.r + pcol, len * sizeof (rend_t));
354 359
355 lofs += len; 360 lofs += len;
… …
362 scr_blank_line (*qline, qline->l, ncol - qline->l, DEFAULT_RSTYLE); 367 scr_blank_line (*qline, qline->l, ncol - qline->l, DEFAULT_RSTYLE);
363 } 368 }
364 while (p != pend && q > 0); 369 while (p != pend && q > 0);
365 370
366 term_start = total_rows - nrow; 371 term_start = total_rows - nrow;
367 nsaved = term_start - q; 372 top_row = q - term_start;
368 373
369 // make sure all terminal lines exist 374 // make sure all terminal lines exist
370 while (nsaved < 0) 375 while (top_row > 0)
371 scr_blank_screen_mem (ROW (-++nsaved), DEFAULT_RSTYLE); 376 scr_blank_screen_mem (ROW (--top_row), DEFAULT_RSTYLE);
372 } 377 }
373 else 378 else
374 { 379 {
375 // if no scrollback exists (yet), wing, instead of wrap 380 // if no scrollback exists (yet), wing, instead of wrap
376 381
… …
389 } 394 }
390 395
391 term_start = 0; 396 term_start = 0;
392 } 397 }
393 398
394#ifdef DEBUG_STRICT //TODO: remove
395 for (int i = -nsaved; i < nrow; i++)
396 assert (ROW (i).t);
397#endif
398
399 free (old_buf); 399 free (old_buf);
400 delete old_ta; 400 delete old_ta;
401 delete old_ra; 401 delete old_ra;
402 402
403 clamp_it (screen.cur.row, 0, nrow - 1); 403 clamp_it (screen.cur.row, 0, nrow - 1);
… …
405 405
406 if (tabs) 406 if (tabs)
407 free (tabs); 407 free (tabs);
408 } 408 }
409 409
410 CLEAR_ALL_SELECTION ();
411
410 prev_nrow = nrow; 412 prev_nrow = nrow;
411 prev_ncol = ncol; 413 prev_ncol = ncol;
412 414
413 tabs = (char *)rxvt_malloc (ncol * sizeof (char)); 415 tabs = (char *)rxvt_malloc (ncol * sizeof (char));
414 416
… …
423/* ------------------------------------------------------------------------- */ 425/* ------------------------------------------------------------------------- */
424/* 426/*
425 * Free everything. That way malloc debugging can find leakage. 427 * Free everything. That way malloc debugging can find leakage.
426 */ 428 */
427void 429void
428rxvt_term::scr_release () 430rxvt_term::scr_release () NOTHROW
429{ 431{
430 delete talloc; talloc = 0; 432 delete talloc; talloc = 0;
431 delete ralloc; ralloc = 0; 433 delete ralloc; ralloc = 0;
432 434
433 free (row_buf); 435 free (row_buf);
… …
441/* ------------------------------------------------------------------------- */ 443/* ------------------------------------------------------------------------- */
442/* 444/*
443 * Hard reset 445 * Hard reset
444 */ 446 */
445void 447void
446rxvt_term::scr_poweron () 448rxvt_term::scr_poweron () NOTHROW
447{ 449{
448 scr_release (); 450 scr_release ();
449 prev_nrow = prev_ncol = 0; 451 prev_nrow = prev_ncol = 0;
450 scr_reset (); 452 scr_reset ();
451 453
452 scr_clear (true); 454 scr_clear (true);
453 scr_refresh (SLOW_REFRESH); 455 scr_refresh ();
454} 456}
455 457
456/* ------------------------------------------------------------------------- * 458/* ------------------------------------------------------------------------- *
457 * PROCESS SCREEN COMMANDS * 459 * PROCESS SCREEN COMMANDS *
458 * ------------------------------------------------------------------------- */ 460 * ------------------------------------------------------------------------- */
… …
460 * Save and Restore cursor 462 * Save and Restore cursor
461 * XTERM_SEQ: Save cursor : ESC 7 463 * XTERM_SEQ: Save cursor : ESC 7
462 * XTERM_SEQ: Restore cursor: ESC 8 464 * XTERM_SEQ: Restore cursor: ESC 8
463 */ 465 */
464void 466void
465rxvt_term::scr_cursor (int mode) 467rxvt_term::scr_cursor (cursor_mode mode) NOTHROW
466{ 468{
467 screen_t *s; 469 screen_t *s;
468 470
469#if NSCREENS && !defined(NO_SECONDARY_SCREEN_CURSOR) 471#if NSCREENS && !defined(NO_SECONDARY_SCREEN_CURSOR)
470 if (current_screen == SECONDARY) 472 if (current_screen == SECONDARY)
… …
509 * Swap between primary and secondary screens 511 * Swap between primary and secondary screens
510 * XTERM_SEQ: Primary screen : ESC [ ? 4 7 h 512 * XTERM_SEQ: Primary screen : ESC [ ? 4 7 h
511 * XTERM_SEQ: Secondary screen: ESC [ ? 4 7 l 513 * XTERM_SEQ: Secondary screen: ESC [ ? 4 7 l
512 */ 514 */
513int 515int
514rxvt_term::scr_change_screen (int scrn) 516rxvt_term::scr_change_screen (int scrn) NOTHROW
515{ 517{
516 want_refresh = 1; 518 want_refresh = 1;
517 view_start = 0; 519 view_start = 0;
518 520
519 if (current_screen == scrn) 521 if (current_screen == scrn)
… …
550 return scrn; 552 return scrn;
551} 553}
552 554
553// clear WrapNext indicator, solidifying position on next line 555// clear WrapNext indicator, solidifying position on next line
554void 556void
555rxvt_term::scr_do_wrap () 557rxvt_term::scr_do_wrap () NOTHROW
556{ 558{
557 if (!(screen.flags & Screen_WrapNext)) 559 if (!(screen.flags & Screen_WrapNext))
558 return; 560 return;
559 561
560 screen.flags &= ~Screen_WrapNext; 562 screen.flags &= ~Screen_WrapNext;
… …
570/* ------------------------------------------------------------------------- */ 572/* ------------------------------------------------------------------------- */
571/* 573/*
572 * Change the colour for following text 574 * Change the colour for following text
573 */ 575 */
574void 576void
575rxvt_term::scr_color (unsigned int color, int fgbg) 577rxvt_term::scr_color (unsigned int color, int fgbg) NOTHROW
576{ 578{
577 if (!IN_RANGE_INC (color, minTermCOLOR, maxTermCOLOR)) 579 if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR))
578 color = fgbg; 580 color = fgbg;
579 581
580 if (fgbg == Color_fg) 582 if (fgbg == Color_fg)
581 rstyle = SET_FGCOLOR (rstyle, color); 583 rstyle = SET_FGCOLOR (rstyle, color);
582 else 584 else
… …
586/* ------------------------------------------------------------------------- */ 588/* ------------------------------------------------------------------------- */
587/* 589/*
588 * Change the rendition style for following text 590 * Change the rendition style for following text
589 */ 591 */
590void 592void
591rxvt_term::scr_rendition (int set, int style) 593rxvt_term::scr_rendition (int set, int style) NOTHROW
592 { 594 {
593 if (set) 595 if (set)
594 rstyle |= style; 596 rstyle |= style;
595 else if (style == ~RS_None) 597 else if (style == ~RS_None)
596 rstyle = DEFAULT_RSTYLE; 598 rstyle = DEFAULT_RSTYLE;
… …
603 * Scroll text between <row1> and <row2> inclusive, by <count> lines 605 * Scroll text between <row1> and <row2> inclusive, by <count> lines
604 * count positive ==> scroll up 606 * count positive ==> scroll up
605 * count negative ==> scroll down 607 * count negative ==> scroll down
606 */ 608 */
607int 609int
608rxvt_term::scr_scroll_text (int row1, int row2, int count) 610rxvt_term::scr_scroll_text (int row1, int row2, int count) NOTHROW
609{ 611{
610 if (count == 0 || (row1 > row2)) 612 if (count == 0 || (row1 > row2))
611 return 0; 613 return 0;
612 614
613 want_refresh = 1; 615 want_refresh = 1;
614 num_scr += count; 616 num_scr += count;
615 617
616 if (count > 0 618 if (count > 0
617 && row1 == 0 619 && row1 == 0
618 && row2 == nrow - 1
619 && (current_screen == PRIMARY || OPTION (Opt_secondaryScroll))) 620 && (current_screen == PRIMARY || OPTION (Opt_secondaryScroll)))
620 { 621 {
621 nsaved = min (nsaved + count, saveLines); 622 top_row = max (top_row - count, -saveLines);
622 623
623 HOOK_INVOKE ((this, HOOK_SCROLL_BACK, DT_INT, count, DT_INT, nsaved, DT_END)); 624 // scroll everything up 'count' lines
625 term_start = (term_start + count) % total_rows;
626
627 // sever bottommost line
628 {
629 line_t &l = ROW(row2 - count);
630 l.is_longer (0);
631 l.touch ();
632 }
633
634 // erase newly scrolled-in lines
635 for (int i = count; i--; )
636 {
637 // basically this is a slightly optimized scr_blank_screen_mem
638 // it is worth the effort on slower machines
639 line_t &l = ROW(nrow - 1 - i);
640
641 scr_blank_line (l, 0, l.l, rstyle);
642
643 l.l = 0;
644 l.f = 0;
645 }
646
647 // now copy lines below the scroll region bottom to the
648 // bottom of the screen again, so they look as if they
649 // hadn't moved.
650 for (int i = nrow; --i > row2; )
651 {
652 line_t &l1 = ROW(i - count);
653 line_t &l2 = ROW(i);
654
655 ::swap (l1, l2);
656 l2.touch ();
657 }
624 658
625 term_start = (term_start + count) % total_rows; 659 // move and/or clear selection, if any
626
627 if (selection.op && current_screen == selection.screen) 660 if (selection.op && current_screen == selection.screen)
628 { 661 {
629 selection.beg.row -= count; 662 selection.beg.row -= count;
630 selection.end.row -= count; 663 selection.end.row -= count;
631 selection.mark.row -= count; 664 selection.mark.row -= count;
632 665
633 if (selection.beg.row < -nsaved 666 if (selection.beg.row < top_row
634 || selection.end.row < -nsaved 667 || selection.end.row < top_row
635 || selection.mark.row < -nsaved) 668 || selection.mark.row < top_row)
636 { 669 {
637 CLEAR_ALL_SELECTION (); 670 CLEAR_ALL_SELECTION ();
638 selection.op = SELECTION_CLEAR; 671 selection.op = SELECTION_CLEAR;
639 } 672 }
640 } 673 }
641 674
642 for (int i = count; i--; ) 675 // finally move the view window, if desired
643 {
644 // basically thi is a slightly optimized scr_blank_screen_mem
645 // it is worth the effort on slower machines
646 line_t &l = ROW(row2 - i);
647
648 scr_blank_line (l, 0, l.l, rstyle);
649
650 l.l = 0;
651 l.f = 0;
652 }
653
654 if (OPTION (Opt_scrollWithBuffer) 676 if (OPTION (Opt_scrollWithBuffer)
655 && view_start != 0 677 && view_start != 0
656 && view_start != saveLines) 678 && view_start != -saveLines)
657 scr_page (UP, count); 679 scr_page (UP, count);
680
681 if (SHOULD_INVOKE (HOOK_SCROLL_BACK))
682 HOOK_INVOKE ((this, HOOK_SCROLL_BACK, DT_INT, count, DT_INT, top_row, DT_END));
658 } 683 }
659 else 684 else
660 { 685 {
661 if (selection.op && current_screen == selection.screen) 686 if (selection.op && current_screen == selection.screen)
662 { 687 {
… …
708/* ------------------------------------------------------------------------- */ 733/* ------------------------------------------------------------------------- */
709/* 734/*
710 * Add text given in <str> of length <len> to screen struct 735 * Add text given in <str> of length <len> to screen struct
711 */ 736 */
712void 737void
713rxvt_term::scr_add_lines (const wchar_t *str, int len, int minlines) 738rxvt_term::scr_add_lines (const wchar_t *str, int len, int minlines) NOTHROW
714{ 739{
715 if (len <= 0) /* sanity */ 740 if (len <= 0) /* sanity */
716 return; 741 return;
717 742
718 unsigned char checksel; 743 unsigned char checksel;
… …
738 } 763 }
739 764
740#ifdef DEBUG_STRICT 765#ifdef DEBUG_STRICT
741 assert (screen.cur.col < ncol); 766 assert (screen.cur.col < ncol);
742 assert (screen.cur.row < nrow 767 assert (screen.cur.row < nrow
743 && screen.cur.row >= -nsaved); 768 && screen.cur.row >= top_row);
744#endif 769#endif
745 int row = screen.cur.row; 770 int row = screen.cur.row;
746 771
747 checksel = selection.op && current_screen == selection.screen ? 1 : 0; 772 checksel = selection.op && current_screen == selection.screen ? 1 : 0;
748 773
… …
794 CLEAR_SELECTION (); 819 CLEAR_SELECTION ();
795 } 820 }
796 821
797 if (screen.flags & Screen_WrapNext) 822 if (screen.flags & Screen_WrapNext)
798 { 823 {
799 max_it (line->l, ncol);
800 line->is_longer (1);
801
802 scr_do_wrap (); 824 scr_do_wrap ();
803 825
826 line->l = ncol;
827 line->is_longer (1);
828
804 row = screen.cur.row; 829 row = screen.cur.row;
805 line = &ROW(row); /* _must_ refresh */ 830 line = &ROW(row); /* _must_ refresh */
806 } 831 }
807 832
808 // some utf-8 decoders "decode" surrogate characters: let's fix this. 833 // some utf-8 decoders "decode" surrogate characters: let's fix this.
… …
972/* 997/*
973 * Process Backspace. Move back the cursor back a position, wrap if have to 998 * Process Backspace. Move back the cursor back a position, wrap if have to
974 * XTERM_SEQ: CTRL-H 999 * XTERM_SEQ: CTRL-H
975 */ 1000 */
976void 1001void
977rxvt_term::scr_backspace () 1002rxvt_term::scr_backspace () NOTHROW
978{ 1003{
979 want_refresh = 1; 1004 want_refresh = 1;
980 1005
981 if (screen.cur.col == 0) 1006 if (screen.cur.col == 0)
982 { 1007 {
… …
1000 * Process Horizontal Tab 1025 * Process Horizontal Tab
1001 * count: +ve = forward; -ve = backwards 1026 * count: +ve = forward; -ve = backwards
1002 * XTERM_SEQ: CTRL-I 1027 * XTERM_SEQ: CTRL-I
1003 */ 1028 */
1004void 1029void
1005rxvt_term::scr_tab (int count, bool ht) 1030rxvt_term::scr_tab (int count, bool ht) NOTHROW
1006{ 1031{
1007 int i, x; 1032 int i, x;
1008 1033
1009 want_refresh = 1; 1034 want_refresh = 1;
1010 i = x = screen.cur.col; 1035 i = x = screen.cur.col;
… …
1077 * Move cursor left in row. If we're at the left boundary, shift everything 1102 * Move cursor left in row. If we're at the left boundary, shift everything
1078 * in that row right. Clear left column. 1103 * in that row right. Clear left column.
1079 */ 1104 */
1080#if ENABLE_FRILLS 1105#if ENABLE_FRILLS
1081void 1106void
1082rxvt_term::scr_backindex () 1107rxvt_term::scr_backindex () NOTHROW
1083{ 1108{
1084 if (screen.cur.col > 0) 1109 if (screen.cur.col > 0)
1085 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE); 1110 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE);
1086 else 1111 else
1087 scr_insdel_chars (1, INSERT); 1112 scr_insdel_chars (1, INSERT);
… …
1094 * Move cursor right in row. If we're at the right boundary, shift everything 1119 * Move cursor right in row. If we're at the right boundary, shift everything
1095 * in that row left. Clear right column. 1120 * in that row left. Clear right column.
1096 */ 1121 */
1097#if ENABLE_FRILLS 1122#if ENABLE_FRILLS
1098void 1123void
1099rxvt_term::scr_forwardindex () 1124rxvt_term::scr_forwardindex () NOTHROW
1100{ 1125{
1101 if (screen.cur.col < ncol - 1) 1126 if (screen.cur.col < ncol - 1)
1102 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE); 1127 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE);
1103 else 1128 else
1104 { 1129 {
… …
1117/* ------------------------------------------------------------------------- */ 1142/* ------------------------------------------------------------------------- */
1118/* 1143/*
1119 * Goto Row/Column 1144 * Goto Row/Column
1120 */ 1145 */
1121void 1146void
1122rxvt_term::scr_gotorc (int row, int col, int relative) 1147rxvt_term::scr_gotorc (int row, int col, int relative) NOTHROW
1123{ 1148{
1124 want_refresh = 1; 1149 want_refresh = 1;
1125 ZERO_SCROLLBACK (); 1150 ZERO_SCROLLBACK ();
1126 1151
1127 screen.cur.col = relative & C_RELATIVE ? screen.cur.col + col : col; 1152 screen.cur.col = relative & C_RELATIVE ? screen.cur.col + col : col;
… …
1165/* ------------------------------------------------------------------------- */ 1190/* ------------------------------------------------------------------------- */
1166/* 1191/*
1167 * direction should be UP or DN 1192 * direction should be UP or DN
1168 */ 1193 */
1169void 1194void
1170rxvt_term::scr_index (enum page_dirn direction) 1195rxvt_term::scr_index (enum page_dirn direction) NOTHROW
1171{ 1196{
1172 int dirn; 1197 int dirn;
1173 1198
1174 want_refresh = 1; 1199 want_refresh = 1;
1175 ZERO_SCROLLBACK (); 1200 ZERO_SCROLLBACK ();
… …
1194 * XTERM_SEQ: Clear line to right: ESC [ 0 K 1219 * XTERM_SEQ: Clear line to right: ESC [ 0 K
1195 * XTERM_SEQ: Clear line to left : ESC [ 1 K 1220 * XTERM_SEQ: Clear line to left : ESC [ 1 K
1196 * XTERM_SEQ: Clear whole line : ESC [ 2 K 1221 * XTERM_SEQ: Clear whole line : ESC [ 2 K
1197 */ 1222 */
1198void 1223void
1199rxvt_term::scr_erase_line (int mode) 1224rxvt_term::scr_erase_line (int mode) NOTHROW
1200{ 1225{
1201 unsigned int col, num; 1226 unsigned int col, num;
1202 1227
1203 want_refresh = 1; 1228 want_refresh = 1;
1204 ZERO_SCROLLBACK (); 1229 ZERO_SCROLLBACK ();
… …
1248 * XTERM_SEQ: Clear screen after cursor : ESC [ 0 J 1273 * XTERM_SEQ: Clear screen after cursor : ESC [ 0 J
1249 * XTERM_SEQ: Clear screen before cursor: ESC [ 1 J 1274 * XTERM_SEQ: Clear screen before cursor: ESC [ 1 J
1250 * XTERM_SEQ: Clear whole screen : ESC [ 2 J 1275 * XTERM_SEQ: Clear whole screen : ESC [ 2 J
1251 */ 1276 */
1252void 1277void
1253rxvt_term::scr_erase_screen (int mode) 1278rxvt_term::scr_erase_screen (int mode) NOTHROW
1254{ 1279{
1255 int num; 1280 int num;
1256 int32_t row; 1281 int32_t row;
1257 rend_t ren; 1282 rend_t ren;
1258 XGCValues gcvalue; 1283 XGCValues gcvalue;
… …
1318 } 1343 }
1319} 1344}
1320 1345
1321#if ENABLE_FRILLS 1346#if ENABLE_FRILLS
1322void 1347void
1323rxvt_term::scr_erase_savelines () 1348rxvt_term::scr_erase_savelines () NOTHROW
1324{ 1349{
1325 want_refresh = 1; 1350 want_refresh = 1;
1326 ZERO_SCROLLBACK (); 1351 ZERO_SCROLLBACK ();
1327 1352
1328 nsaved = 0; 1353 top_row = 0;
1329} 1354}
1330#endif 1355#endif
1331 1356
1332/* ------------------------------------------------------------------------- */ 1357/* ------------------------------------------------------------------------- */
1333/* 1358/*
1334 * Fill the screen with `E's 1359 * Fill the screen with `E's
1335 * XTERM_SEQ: Screen Alignment Test: ESC # 8 1360 * XTERM_SEQ: Screen Alignment Test: ESC # 8
1336 */ 1361 */
1337void 1362void
1338rxvt_term::scr_E () 1363rxvt_term::scr_E () NOTHROW
1339{ 1364{
1340 rend_t fs; 1365 rend_t fs;
1341 1366
1342 want_refresh = 1; 1367 want_refresh = 1;
1343 ZERO_SCROLLBACK (); 1368 ZERO_SCROLLBACK ();
… …
1364/* ------------------------------------------------------------------------- */ 1389/* ------------------------------------------------------------------------- */
1365/* 1390/*
1366 * Insert/Delete <count> lines 1391 * Insert/Delete <count> lines
1367 */ 1392 */
1368void 1393void
1369rxvt_term::scr_insdel_lines (int count, int insdel) 1394rxvt_term::scr_insdel_lines (int count, int insdel) NOTHROW
1370{ 1395{
1371 int end; 1396 int end;
1372 1397
1373 ZERO_SCROLLBACK (); 1398 ZERO_SCROLLBACK ();
1374 1399
… …
1394/* ------------------------------------------------------------------------- */ 1419/* ------------------------------------------------------------------------- */
1395/* 1420/*
1396 * Insert/Delete <count> characters from the current position 1421 * Insert/Delete <count> characters from the current position
1397 */ 1422 */
1398void 1423void
1399rxvt_term::scr_insdel_chars (int count, int insdel) 1424rxvt_term::scr_insdel_chars (int count, int insdel) NOTHROW
1400{ 1425{
1401 int col, row; 1426 int col, row;
1402 rend_t tr; 1427 rend_t tr;
1403 1428
1404 want_refresh = 1; 1429 want_refresh = 1;
… …
1492/* 1517/*
1493 * Set the scrolling region 1518 * Set the scrolling region
1494 * XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r 1519 * XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r
1495 */ 1520 */
1496void 1521void
1497rxvt_term::scr_scroll_region (int top, int bot) 1522rxvt_term::scr_scroll_region (int top, int bot) NOTHROW
1498{ 1523{
1499 max_it (top, 0); 1524 max_it (top, 0);
1500 min_it (bot, nrow - 1); 1525 min_it (bot, nrow - 1);
1501 1526
1502 if (top > bot) 1527 if (top > bot)
… …
1512 * Make the cursor visible/invisible 1537 * Make the cursor visible/invisible
1513 * XTERM_SEQ: Make cursor visible : ESC [ ? 25 h 1538 * XTERM_SEQ: Make cursor visible : ESC [ ? 25 h
1514 * XTERM_SEQ: Make cursor invisible: ESC [ ? 25 l 1539 * XTERM_SEQ: Make cursor invisible: ESC [ ? 25 l
1515 */ 1540 */
1516void 1541void
1517rxvt_term::scr_cursor_visible (int mode) 1542rxvt_term::scr_cursor_visible (int mode) NOTHROW
1518{ 1543{
1519 want_refresh = 1; 1544 want_refresh = 1;
1520 1545
1521 if (mode) 1546 if (mode)
1522 screen.flags |= Screen_VisibleCursor; 1547 screen.flags |= Screen_VisibleCursor;
… …
1529 * Set/unset automatic wrapping 1554 * Set/unset automatic wrapping
1530 * XTERM_SEQ: Set Wraparound : ESC [ ? 7 h 1555 * XTERM_SEQ: Set Wraparound : ESC [ ? 7 h
1531 * XTERM_SEQ: Unset Wraparound: ESC [ ? 7 l 1556 * XTERM_SEQ: Unset Wraparound: ESC [ ? 7 l
1532 */ 1557 */
1533void 1558void
1534rxvt_term::scr_autowrap (int mode) 1559rxvt_term::scr_autowrap (int mode) NOTHROW
1535{ 1560{
1536 if (mode) 1561 if (mode)
1537 screen.flags |= Screen_Autowrap; 1562 screen.flags |= Screen_Autowrap;
1538 else 1563 else
1539 screen.flags &= ~(Screen_Autowrap | Screen_WrapNext); 1564 screen.flags &= ~(Screen_Autowrap | Screen_WrapNext);
… …
1548 * and the cursor cannot be moved outside. 1573 * and the cursor cannot be moved outside.
1549 * XTERM_SEQ: Set Absolute: ESC [ ? 6 h 1574 * XTERM_SEQ: Set Absolute: ESC [ ? 6 h
1550 * XTERM_SEQ: Set Relative: ESC [ ? 6 l 1575 * XTERM_SEQ: Set Relative: ESC [ ? 6 l
1551 */ 1576 */
1552void 1577void
1553rxvt_term::scr_relative_origin (int mode) 1578rxvt_term::scr_relative_origin (int mode) NOTHROW
1554{ 1579{
1555 if (mode) 1580 if (mode)
1556 screen.flags |= Screen_Relative; 1581 screen.flags |= Screen_Relative;
1557 else 1582 else
1558 screen.flags &= ~Screen_Relative; 1583 screen.flags &= ~Screen_Relative;
… …
1565 * Set insert/replace mode 1590 * Set insert/replace mode
1566 * XTERM_SEQ: Set Insert mode : ESC [ ? 4 h 1591 * XTERM_SEQ: Set Insert mode : ESC [ ? 4 h
1567 * XTERM_SEQ: Set Replace mode: ESC [ ? 4 l 1592 * XTERM_SEQ: Set Replace mode: ESC [ ? 4 l
1568 */ 1593 */
1569void 1594void
1570rxvt_term::scr_insert_mode (int mode) 1595rxvt_term::scr_insert_mode (int mode) NOTHROW
1571{ 1596{
1572 if (mode) 1597 if (mode)
1573 screen.flags |= Screen_Insert; 1598 screen.flags |= Screen_Insert;
1574 else 1599 else
1575 screen.flags &= ~Screen_Insert; 1600 screen.flags &= ~Screen_Insert;
… …
1581 * XTERM_SEQ: Set tab at current column : ESC H 1606 * XTERM_SEQ: Set tab at current column : ESC H
1582 * XTERM_SEQ: Clear tab at current column: ESC [ 0 g 1607 * XTERM_SEQ: Clear tab at current column: ESC [ 0 g
1583 * XTERM_SEQ: Clear all tabs : ESC [ 3 g 1608 * XTERM_SEQ: Clear all tabs : ESC [ 3 g
1584 */ 1609 */
1585void 1610void
1586rxvt_term::scr_set_tab (int mode) 1611rxvt_term::scr_set_tab (int mode) NOTHROW
1587{ 1612{
1588 if (mode < 0) 1613 if (mode < 0)
1589 memset (tabs, 0, ncol * sizeof (char)); 1614 memset (tabs, 0, ncol * sizeof (char));
1590 else if (screen.cur.col < ncol) 1615 else if (screen.cur.col < ncol)
1591 tabs [screen.cur.col] = !!mode; 1616 tabs [screen.cur.col] = !!mode;
… …
1596 * Set reverse/normal video 1621 * Set reverse/normal video
1597 * XTERM_SEQ: Reverse video: ESC [ ? 5 h 1622 * XTERM_SEQ: Reverse video: ESC [ ? 5 h
1598 * XTERM_SEQ: Normal video : ESC [ ? 5 l 1623 * XTERM_SEQ: Normal video : ESC [ ? 5 l
1599 */ 1624 */
1600void 1625void
1601rxvt_term::scr_rvideo_mode (int mode) 1626rxvt_term::scr_rvideo_mode (int mode) NOTHROW
1602{ 1627{
1603 XGCValues gcvalue; 1628 XGCValues gcvalue;
1604 1629
1605 if (rvideo != mode) 1630 if (rvideo != mode)
1606 { 1631 {
… …
1628/* 1653/*
1629 * Report current cursor position 1654 * Report current cursor position
1630 * XTERM_SEQ: Report position: ESC [ 6 n 1655 * XTERM_SEQ: Report position: ESC [ 6 n
1631 */ 1656 */
1632void 1657void
1633rxvt_term::scr_report_position () 1658rxvt_term::scr_report_position () NOTHROW
1634{ 1659{
1635 tt_printf ("\033[%d;%dR", screen.cur.row + 1, screen.cur.col + 1); 1660 tt_printf ("\033[%d;%dR", screen.cur.row + 1, screen.cur.col + 1);
1636} 1661}
1637 1662
1638/* ------------------------------------------------------------------------- * 1663/* ------------------------------------------------------------------------- *
… …
1641 1666
1642/* 1667/*
1643 * Set font style 1668 * Set font style
1644 */ 1669 */
1645void 1670void
1646rxvt_term::set_font_style () 1671rxvt_term::set_font_style () NOTHROW
1647{ 1672{
1648#if 0 1673#if 0
1649 switch (charsets [screen.charset]) 1674 switch (charsets [screen.charset])
1650 { 1675 {
1651 case '0': /* DEC Special Character & Line Drawing Set */ 1676 case '0': /* DEC Special Character & Line Drawing Set */
… …
1673 * XTERM_SEQ: Invoke G1 character set: CTRL-N 1698 * XTERM_SEQ: Invoke G1 character set: CTRL-N
1674 * XTERM_SEQ: Invoke G2 character set: ESC N 1699 * XTERM_SEQ: Invoke G2 character set: ESC N
1675 * XTERM_SEQ: Invoke G3 character set: ESC O 1700 * XTERM_SEQ: Invoke G3 character set: ESC O
1676 */ 1701 */
1677void 1702void
1678rxvt_term::scr_charset_choose (int set) 1703rxvt_term::scr_charset_choose (int set) NOTHROW
1679{ 1704{
1680 screen.charset = set; 1705 screen.charset = set;
1681 set_font_style (); 1706 set_font_style ();
1682} 1707}
1683 1708
… …
1689 * XTERM_SEQ: Set G2 character set: ESC * <C> 1714 * XTERM_SEQ: Set G2 character set: ESC * <C>
1690 * XTERM_SEQ: Set G3 character set: ESC + <C> 1715 * XTERM_SEQ: Set G3 character set: ESC + <C>
1691 * See set_font_style for possible values for <C> 1716 * See set_font_style for possible values for <C>
1692 */ 1717 */
1693void 1718void
1694rxvt_term::scr_charset_set (int set, unsigned int ch) 1719rxvt_term::scr_charset_set (int set, unsigned int ch) NOTHROW
1695{ 1720{
1696 charsets[set] = (unsigned char)ch; 1721 charsets[set] = (unsigned char)ch;
1697 set_font_style (); 1722 set_font_style ();
1698} 1723}
1699 1724
… …
1704 1729
1705/* 1730/*
1706 * refresh matching text. 1731 * refresh matching text.
1707 */ 1732 */
1708bool 1733bool
1709rxvt_term::scr_refresh_rend (rend_t mask, rend_t value) 1734rxvt_term::scr_refresh_rend (rend_t mask, rend_t value) NOTHROW
1710{ 1735{
1711 bool found = false; 1736 bool found = false;
1712 1737
1713 for (int i = 0; i < nrow; i++) 1738 for (int i = 0; i < nrow; i++)
1714 { 1739 {
… …
1734 PART_END, 1759 PART_END,
1735 RC_COUNT 1760 RC_COUNT
1736}; 1761};
1737 1762
1738void 1763void
1739rxvt_term::scr_expose (int x, int y, int ewidth, int eheight, bool refresh) 1764rxvt_term::scr_expose (int x, int y, int ewidth, int eheight, bool refresh) NOTHROW
1740{ 1765{
1741 int i; 1766 int i;
1742 row_col_t rc[RC_COUNT]; 1767 row_col_t rc[RC_COUNT];
1743 1768
1744 if (!drawn_buf) /* sanity check */ 1769 if (!drawn_buf) /* sanity check */
… …
1767 } 1792 }
1768 1793
1769 for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++) 1794 for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++)
1770 fill_text (&drawn_buf[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1); 1795 fill_text (&drawn_buf[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1);
1771 1796
1797 num_scr_allow = 0;
1798
1772 if (refresh) 1799 if (refresh)
1773 scr_refresh (SLOW_REFRESH); 1800 scr_refresh ();
1774} 1801}
1775 1802
1776/* ------------------------------------------------------------------------- */ 1803/* ------------------------------------------------------------------------- */
1777/* 1804/*
1778 * Refresh the entire screen 1805 * Refresh the entire screen
1779 */ 1806 */
1780void 1807void
1781rxvt_term::scr_touch (bool refresh) 1808rxvt_term::scr_touch (bool refresh) NOTHROW
1782{ 1809{
1783 scr_expose (0, 0, width, height, refresh); 1810 scr_expose (0, 0, width, height, refresh);
1784} 1811}
1785 1812
1786/* ------------------------------------------------------------------------- */ 1813/* ------------------------------------------------------------------------- */
1787/* 1814/*
1788 * Move the display so that the line represented by scrollbar value Y is at 1815 * Move the display so that the line represented by scrollbar value Y is at
1789 * the top of the screen 1816 * the top of the screen
1790 */ 1817 */
1791int 1818void
1792rxvt_term::scr_move_to (int y, int len) 1819rxvt_term::scr_move_to (int y, int len) NOTHROW
1793{ 1820{
1794 long p = 0; 1821 scr_changeview ((top_row - nrow) * (len - y) / len + (nrow - 1));
1795 unsigned int oldviewstart;
1796
1797 oldviewstart = view_start;
1798
1799 if (y < len)
1800 {
1801 p = (nrow + nsaved) * (len - y) / len;
1802 p -= (long) (nrow - 1);
1803 p = max (p, 0);
1804 }
1805
1806 view_start = (unsigned int)min (p, nsaved);
1807
1808 return scr_changeview (oldviewstart);
1809} 1822}
1810 1823
1811/* ------------------------------------------------------------------------- */ 1824/* ------------------------------------------------------------------------- */
1812/* 1825/*
1813 * Page the screen up/down nlines 1826 * Page the screen up/down nlines
1814 * direction should be UP or DN 1827 * direction should be UP or DN
1815 */ 1828 */
1816int 1829bool
1817rxvt_term::scr_page (enum page_dirn direction, int nlines) 1830rxvt_term::scr_page (enum page_dirn direction, int nlines) NOTHROW
1818{ 1831{
1819 int n; 1832 int new_view_start =
1820 unsigned int oldviewstart;
1821
1822 oldviewstart = view_start;
1823
1824 if (direction == UP)
1825 {
1826 n = view_start + nlines;
1827 view_start = min (n, nsaved);
1828 }
1829 else
1830 {
1831 n = view_start - nlines; 1833 direction == UP ? view_start - nlines
1832 view_start = max (n, 0); 1834 : view_start + nlines;
1833 }
1834 1835
1835 return scr_changeview (oldviewstart); 1836 return scr_changeview (new_view_start);
1836} 1837}
1837 1838
1838int 1839bool
1839rxvt_term::scr_changeview (unsigned int oldviewstart) 1840rxvt_term::scr_changeview (int new_view_start) NOTHROW
1840{ 1841{
1842 clamp_it (new_view_start, top_row, 0);
1843
1841 if (view_start != oldviewstart) 1844 if (new_view_start == view_start)
1842 { 1845 return false;
1846
1847 num_scr += new_view_start - view_start;
1848 view_start = new_view_start;
1849 want_refresh = 1;
1850
1843 HOOK_INVOKE ((this, HOOK_VIEW_CHANGE, DT_INT, view_start, DT_END)); 1851 HOOK_INVOKE ((this, HOOK_VIEW_CHANGE, DT_INT, view_start, DT_END));
1844 1852
1845 want_refresh = 1; 1853 return true;
1846 num_scr -= (view_start - oldviewstart);
1847 }
1848
1849 return (int)view_start - (int)oldviewstart;
1850} 1854}
1851 1855
1852/* ------------------------------------------------------------------------- */ 1856/* ------------------------------------------------------------------------- */
1853void 1857void
1854rxvt_term::scr_bell () 1858rxvt_term::scr_bell () NOTHROW
1855{ 1859{
1856#ifndef NO_BELL 1860#ifndef NO_BELL
1857 1861
1858# ifndef NO_MAPALERT 1862# ifndef NO_MAPALERT
1859# ifdef MAPALERT_OPTION 1863# ifdef MAPALERT_OPTION
… …
1876} 1880}
1877 1881
1878/* ------------------------------------------------------------------------- */ 1882/* ------------------------------------------------------------------------- */
1879/* ARGSUSED */ 1883/* ARGSUSED */
1880void 1884void
1881rxvt_term::scr_printscreen (int fullhist) 1885rxvt_term::scr_printscreen (int fullhist) NOTHROW
1882{ 1886{
1883#ifdef PRINTPIPE 1887#ifdef PRINTPIPE
1884 int nrows, row_start; 1888 int nrows, row_start;
1885 FILE *fd; 1889 FILE *fd;
1886 1890
1887 if ((fd = popen_printer ()) == NULL) 1891 if ((fd = popen_printer ()) == NULL)
1888 return; 1892 return;
1889 1893
1890 if (fullhist) 1894 if (fullhist)
1891 { 1895 {
1892 nrows = nrow + nsaved; 1896 nrows = nrow - top_row;
1893 row_start = -nsaved; 1897 row_start = top_row;
1894 } 1898 }
1895 else 1899 else
1896 { 1900 {
1897 nrows = nrow; 1901 nrows = nrow;
1898 row_start = -view_start; 1902 row_start = view_start;
1899 } 1903 }
1900 1904
1901 wctomb (0, 0); 1905 wctomb (0, 0);
1902 1906
1903 for (int r1 = 0; r1 < nrows; r1++) 1907 for (int r1 = 0; r1 < nrows; r1++)
… …
1935 * Refresh the screen 1939 * Refresh the screen
1936 * drawn_text/drawn_rend contain the screen information before the update. 1940 * drawn_text/drawn_rend contain the screen information before the update.
1937 * screen.text/screen.rend contain what the screen will change to. 1941 * screen.text/screen.rend contain what the screen will change to.
1938 */ 1942 */
1939void 1943void
1940rxvt_term::scr_refresh (unsigned char refresh_type) 1944rxvt_term::scr_refresh () NOTHROW
1941{ 1945{
1942 unsigned char must_clear, /* use draw_string not draw_image_string */ 1946 unsigned char must_clear, /* use draw_string not draw_image_string */
1943 showcursor; /* show the cursor */ 1947 showcursor; /* show the cursor */
1944 int16_t col, row, /* column/row we're processing */ 1948 int16_t col, row, /* column/row we're processing */
1945 ocrow; /* old cursor row */ 1949 ocrow; /* old cursor row */
… …
2031 2035
2032 /* make sure no outline cursor is left around */ 2036 /* make sure no outline cursor is left around */
2033 setoldcursor = 0; 2037 setoldcursor = 0;
2034 if (ocrow != -1) 2038 if (ocrow != -1)
2035 { 2039 {
2036 if (screen.cur.row + view_start != ocrow 2040 if (screen.cur.row - view_start != ocrow
2037 || screen.cur.col != oldcursor.col) 2041 || screen.cur.col != oldcursor.col)
2038 { 2042 {
2039 if (ocrow < nrow 2043 if (ocrow < nrow
2040 && oldcursor.col < ncol) 2044 && oldcursor.col < ncol)
2041 drawn_buf[ocrow].r[oldcursor.col] ^= (RS_RVid | RS_Uline); 2045 drawn_buf[ocrow].r[oldcursor.col] ^= (RS_RVid | RS_Uline);
… …
2049 else if (!focus) 2053 else if (!focus)
2050 setoldcursor = 1; 2054 setoldcursor = 1;
2051 2055
2052 if (setoldcursor) 2056 if (setoldcursor)
2053 { 2057 {
2054 if (screen.cur.row + view_start >= nrow) 2058 if (screen.cur.row - view_start >= nrow)
2055 oldcursor.row = -1; 2059 oldcursor.row = -1;
2056 else 2060 else
2057 { 2061 {
2058 oldcursor.row = screen.cur.row + view_start; 2062 oldcursor.row = screen.cur.row - view_start;
2059 oldcursor.col = screen.cur.col; 2063 oldcursor.col = screen.cur.col;
2060 } 2064 }
2061 } 2065 }
2062 } 2066 }
2063 2067
… …
2069#ifndef NO_SLOW_LINK_SUPPORT 2073#ifndef NO_SLOW_LINK_SUPPORT
2070 /* 2074 /*
2071 * D: CopyArea pass - very useful for slower links 2075 * D: CopyArea pass - very useful for slower links
2072 * This has been deliberately kept simple. 2076 * This has been deliberately kept simple.
2073 */ 2077 */
2074 i = num_scr;
2075 if (!display->is_local 2078 if (!display->is_local
2076 && refresh_type == FAST_REFRESH && num_scr_allow && num_scr 2079 && refresh_type == FAST_REFRESH && num_scr_allow && num_scr
2077 && abs (num_scr) < nrow && !must_clear) 2080 && abs (num_scr) < nrow && !must_clear)
2078 { 2081 {
2079 int16_t nits; 2082 int16_t nits;
2080 int j; 2083 int j;
2081 int len, wlen; 2084 int len, wlen;
2085 dLocal (int, num_scr);
2082 2086
2083 j = nrow; 2087 j = nrow;
2084 wlen = len = -1; 2088 wlen = len = -1;
2085 row = i > 0 ? 0 : j - 1; 2089 row = i > 0 ? 0 : j - 1;
2086 for (; j-- >= 0; row += (i > 0 ? 1 : -1)) 2090 for (; j-- >= 0; row += (i > 0 ? 1 : -1))
2087 { 2091 {
2088 if (row + i >= 0 && row + i < nrow && row + i != ocrow) 2092 if (row + i >= 0 && row + i < nrow && row + i != ocrow)
2089 { 2093 {
2090 line_t s = ROW(row - view_start); 2094 line_t s = ROW(view_start + row);
2091 line_t d = drawn_buf[row]; 2095 line_t d = drawn_buf[row];
2092 line_t d2 = drawn_buf[row + i]; 2096 line_t d2 = drawn_buf[row + i];
2093 2097
2094 for (nits = 0, col = ncol; col--; ) 2098 for (nits = 0, col = ncol; col--; )
2095 if (s.t[col] != d2.t[col] || s.r[col] != d2.r[col]) 2099 if (s.t[col] != d2.t[col] || s.r[col] != d2.r[col])
… …
2133 /* 2137 /*
2134 * E: main pass across every character 2138 * E: main pass across every character
2135 */ 2139 */
2136 for (row = 0; row < nrow; row++) 2140 for (row = 0; row < nrow; row++)
2137 { 2141 {
2138 text_t *stp = ROW(row - view_start).t; 2142 text_t *stp = ROW(view_start + row).t;
2139 rend_t *srp = ROW(row - view_start).r; 2143 rend_t *srp = ROW(view_start + row).r;
2140 text_t *dtp = drawn_buf[row].t; 2144 text_t *dtp = drawn_buf[row].t;
2141 rend_t *drp = drawn_buf[row].r; 2145 rend_t *drp = drawn_buf[row].r;
2142 2146
2143 /* 2147 /*
2144 * E2: OK, now the real pass 2148 * E2: OK, now the real pass
… …
2386 num_scr = 0; 2390 num_scr = 0;
2387 num_scr_allow = 1; 2391 num_scr_allow = 1;
2388} 2392}
2389 2393
2390void 2394void
2391rxvt_term::scr_remap_chars (line_t &l) 2395rxvt_term::scr_remap_chars (line_t &l) NOTHROW
2392{ 2396{
2393 if (!l.t) 2397 if (!l.t)
2394 return; 2398 return;
2395 2399
2396 l.touch (); // maybe a bit of an overkill, but it's not performance-relevant 2400 l.touch (); // maybe a bit of an overkill, but it's not performance-relevant
… …
2398 for (int i = ncol; i--; ) 2402 for (int i = ncol; i--; )
2399 l.r[i] = SET_FONT (l.r[i], FONTSET (l.r[i])->find_font (l.t[i])); 2403 l.r[i] = SET_FONT (l.r[i], FONTSET (l.r[i])->find_font (l.t[i]));
2400} 2404}
2401 2405
2402void 2406void
2403rxvt_term::scr_remap_chars () 2407rxvt_term::scr_remap_chars () NOTHROW
2404{ 2408{
2405 for (int i = total_rows; i--; ) 2409 for (int i = total_rows; i--; )
2406 scr_remap_chars (row_buf [i]); 2410 scr_remap_chars (row_buf [i]);
2407 2411
2408 for (int i = nrow; i--; ) 2412 for (int i = nrow; i--; )
… …
2411 scr_remap_chars (swap_buf [i]); 2415 scr_remap_chars (swap_buf [i]);
2412 } 2416 }
2413} 2417}
2414 2418
2415void 2419void
2416rxvt_term::scr_recolour () 2420rxvt_term::scr_recolour () NOTHROW
2417{ 2421{
2418 if (1 2422 if (1
2419#if TRANSPARENT 2423#if TRANSPARENT
2420 && !am_transparent 2424 && !am_transparent
2421#endif 2425#endif
… …
2442 want_refresh = 1; 2446 want_refresh = 1;
2443} 2447}
2444 2448
2445/* ------------------------------------------------------------------------- */ 2449/* ------------------------------------------------------------------------- */
2446void 2450void
2447rxvt_term::scr_clear (bool really) 2451rxvt_term::scr_clear (bool really) NOTHROW
2448{ 2452{
2449 if (!mapped) 2453 if (!mapped)
2450 return; 2454 return;
2451 2455
2452 num_scr_allow = 0; 2456 num_scr_allow = 0;
… …
2455 if (really) 2459 if (really)
2456 XClearWindow (display->display, vt); 2460 XClearWindow (display->display, vt);
2457} 2461}
2458 2462
2459void 2463void
2460rxvt_term::scr_xor_rect (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle1, rend_t rstyle2) 2464rxvt_term::scr_xor_rect (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle1, rend_t rstyle2) NOTHROW
2461{ 2465{
2462 int view_end = -view_start + nrow; 2466 int view_end = view_start + nrow;
2463 int row, col; 2467 int row, col;
2464 2468
2465 for (row = max (beg_row, -view_start); row <= min (end_row, view_end); row++) 2469 for (row = max (beg_row, view_start); row <= min (end_row, view_end); row++)
2466 { 2470 {
2467 text_t *stp = ROW(row).t; 2471 text_t *stp = ROW(row).t;
2468 rend_t *srp = ROW(row).r; 2472 rend_t *srp = ROW(row).r;
2469 2473
2470 for (col = beg_col; col < end_col; col++) 2474 for (col = beg_col; col < end_col; col++)
… …
2477 srp[col] ^= rstyle2; 2481 srp[col] ^= rstyle2;
2478 } 2482 }
2479} 2483}
2480 2484
2481void 2485void
2482rxvt_term::scr_xor_span (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle) 2486rxvt_term::scr_xor_span (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle) NOTHROW
2483{ 2487{
2484 int view_end = -view_start + nrow; 2488 int view_end = view_start + nrow;
2485 int row, col; 2489 int row, col;
2486 2490
2487 if (beg_row >= -view_start) 2491 if (beg_row >= view_start)
2488 { 2492 {
2489 col = beg_col; 2493 col = beg_col;
2490 row = beg_row; 2494 row = beg_row;
2491 } 2495 }
2492 else 2496 else
2493 { 2497 {
2494 col = 0; 2498 col = 0;
2495 row = -view_start; 2499 row = view_start;
2496 } 2500 }
2497 2501
2498 for (; row < min (end_row, view_end); row++, col = 0) 2502 for (; row < min (end_row, view_end); row++, col = 0)
2499 for (rend_t *srp = ROW(row).r; col < ncol; col++) 2503 for (rend_t *srp = ROW(row).r; col < ncol; col++)
2500 srp[col] ^= rstyle; 2504 srp[col] ^= rstyle;
… …
2504 srp[col] ^= rstyle; 2508 srp[col] ^= rstyle;
2505} 2509}
2506 2510
2507/* ------------------------------------------------------------------------- */ 2511/* ------------------------------------------------------------------------- */
2508void 2512void
2509rxvt_term::scr_reverse_selection () 2513rxvt_term::scr_reverse_selection () NOTHROW
2510{ 2514{
2511 if (selection.op 2515 if (selection.op
2512 && current_screen == selection.screen 2516 && current_screen == selection.screen
2513 && selection.end.row >= -view_start) 2517 && selection.end.row >= view_start)
2514 { 2518 {
2515#if ENABLE_FRILLS 2519#if ENABLE_FRILLS
2516 if (selection.rect) 2520 if (selection.rect)
2517 scr_xor_rect (selection.beg.row, selection.beg.col, 2521 scr_xor_rect (selection.beg.row, selection.beg.col,
2518 selection.end.row, selection.end.col, 2522 selection.end.row, selection.end.col,
… …
2530 * Dump the whole scrollback and screen to the passed filedescriptor. The 2534 * Dump the whole scrollback and screen to the passed filedescriptor. The
2531 * invoking routine must close the fd. 2535 * invoking routine must close the fd.
2532 */ 2536 */
2533#if 0 2537#if 0
2534void 2538void
2535rxvt_term::scr_dump (int fd) 2539rxvt_term::scr_dump (int fd) NOTHROW
2536{ 2540{
2537 int row, wrote; 2541 int row, wrote;
2538 unsigned int width, towrite; 2542 unsigned int width, towrite;
2539 char r1[] = "\n"; 2543 char r1[] = "\n";
2540 2544
… …
2559 2563
2560/* ------------------------------------------------------------------------- * 2564/* ------------------------------------------------------------------------- *
2561 * CHARACTER SELECTION * 2565 * CHARACTER SELECTION *
2562 * ------------------------------------------------------------------------- */ 2566 * ------------------------------------------------------------------------- */
2563void 2567void
2564rxvt_term::selection_check (int check_more) 2568rxvt_term::selection_check (int check_more) NOTHROW
2565{ 2569{
2566 row_col_t pos; 2570 row_col_t pos;
2567 2571
2568 if (!selection.op) 2572 if (!selection.op)
2569 return; 2573 return;
2570 2574
2571 pos.row = pos.col = 0; 2575 pos.row = pos.col = 0;
2572 if (!IN_RANGE_EXC (selection.beg.row, -nsaved, nrow) 2576 if (!IN_RANGE_EXC (selection.beg.row, top_row, nrow)
2573 || !IN_RANGE_EXC (selection.mark.row, -nsaved, nrow) 2577 || !IN_RANGE_EXC (selection.mark.row, top_row, nrow)
2574 || !IN_RANGE_EXC (selection.end.row, -nsaved, nrow) 2578 || !IN_RANGE_EXC (selection.end.row, top_row, nrow)
2575 || (check_more == 1 2579 || (check_more == 1
2576 && current_screen == selection.screen 2580 && current_screen == selection.screen
2577 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) 2581 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
2578 && ROWCOL_IS_BEFORE (screen.cur, selection.end)) 2582 && ROWCOL_IS_BEFORE (screen.cur, selection.end))
2579 || (check_more == 2 2583 || (check_more == 2
… …
2590/* ------------------------------------------------------------------------- */ 2594/* ------------------------------------------------------------------------- */
2591/* 2595/*
2592 * Paste a selection direct to the command fd 2596 * Paste a selection direct to the command fd
2593 */ 2597 */
2594void 2598void
2595rxvt_term::paste (char *data, unsigned int len) 2599rxvt_term::paste (char *data, unsigned int len) NOTHROW
2596{ 2600{
2597 /* convert normal newline chars into common keyboard Return key sequence */ 2601 /* convert normal newline chars into common keyboard Return key sequence */
2598 for (unsigned int i = 0; i < len; i++) 2602 for (unsigned int i = 0; i < len; i++)
2599 if (data[i] == C0_LF) 2603 if (data[i] == C0_LF)
2600 data[i] = C0_CR; 2604 data[i] = C0_CR;
… …
2606/* 2610/*
2607 * Respond to a notification that a primary selection has been sent 2611 * Respond to a notification that a primary selection has been sent
2608 * EXT: SelectionNotify 2612 * EXT: SelectionNotify
2609 */ 2613 */
2610void 2614void
2611rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop) 2615rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop) NOTHROW
2612{ 2616{
2613 if (prop == None) /* check for failed XConvertSelection */ 2617 if (prop == None) /* check for failed XConvertSelection */
2614 { 2618 {
2615 if ((selection_type & Sel_CompoundText)) 2619 if ((selection_type & Sel_CompoundText))
2616 { 2620 {
… …
2768 if (selection_wait == Sel_normal) 2772 if (selection_wait == Sel_normal)
2769 selection_wait = Sel_none; 2773 selection_wait = Sel_none;
2770} 2774}
2771 2775
2772void 2776void
2773rxvt_term::incr_cb (time_watcher &w) 2777rxvt_term::incr_cb (time_watcher &w) NOTHROW
2774{ 2778{
2775 selection_wait = Sel_none; 2779 selection_wait = Sel_none;
2776 2780
2777 incr_buf_size = 0; 2781 incr_buf_size = 0;
2778 free (incr_buf); 2782 free (incr_buf);
2779 2783
2780 rxvt_warn ("data loss: timeout on INCR selection paste, ignoring.\n"); 2784 rxvt_warn ("data loss: timeout on INCR selection paste, ignoring.\n");
2781} 2785}
2782 2786
2783void 2787void
2784rxvt_term::selection_property (Window win, Atom prop) 2788rxvt_term::selection_property (Window win, Atom prop) NOTHROW
2785{ 2789{
2786 if (prop == None || selection_wait != Sel_incr) 2790 if (prop == None || selection_wait != Sel_incr)
2787 return; 2791 return;
2788 2792
2789 selection_paste (win, prop, true); 2793 selection_paste (win, prop, true);
… …
2798 * (+) if ownership is claimed but property is empty, rxvt_selection_paste () 2802 * (+) if ownership is claimed but property is empty, rxvt_selection_paste ()
2799 * will auto fallback to CUT_BUFFER0 2803 * will auto fallback to CUT_BUFFER0
2800 * EXT: button 2 release 2804 * EXT: button 2 release
2801 */ 2805 */
2802void 2806void
2803rxvt_term::selection_request (Time tm, int x, int y) 2807rxvt_term::selection_request (Time tm, int selnum) NOTHROW
2804{ 2808{
2805 if (x < 0 || x >= width || y < 0 || y >= height) 2809 if (selection.text && selnum == Sel_Primary)
2806 return; /* outside window */
2807
2808 if (selection.text)
2809 { /* internal selection */ 2810 { /* internal selection */
2810 char *str = rxvt_wcstombs (selection.text, selection.len); 2811 char *str = rxvt_wcstombs (selection.text, selection.len);
2811 paste (str, strlen (str)); 2812 paste (str, strlen (str));
2812 free (str); 2813 free (str);
2813 return; 2814 return;
2814 } 2815 }
2815 else 2816 else
2816 { 2817 {
2817 int i;
2818
2819 selection_request_time = tm; 2818 selection_request_time = tm;
2820 selection_wait = Sel_normal; 2819 selection_wait = Sel_normal;
2821 2820
2822 for (i = Sel_Primary; i <= Sel_Clipboard; i++)
2823 {
2824#if X_HAVE_UTF8_STRING 2821#if X_HAVE_UTF8_STRING
2825 selection_type = Sel_UTF8String; 2822 selection_type = Sel_UTF8String;
2826 if (selection_request_other (xa[XA_UTF8_STRING], i)) 2823 if (selection_request_other (xa[XA_UTF8_STRING], selnum))
2827 return; 2824 return;
2828#else 2825#else
2829 selection_type = Sel_CompoundText; 2826 selection_type = Sel_CompoundText;
2830 if (selection_request_other (xa[XA_COMPOUND_TEXT], i)) 2827 if (selection_request_other (xa[XA_COMPOUND_TEXT], selnum))
2831 return; 2828 return;
2832#endif 2829#endif
2833 }
2834 } 2830 }
2835 2831
2836 selection_wait = Sel_none; /* don't loop in selection_paste () */ 2832 selection_wait = Sel_none; /* don't loop in selection_paste () */
2837 selection_paste (display->root, XA_CUT_BUFFER0, false); 2833 selection_paste (display->root, XA_CUT_BUFFER0, false);
2838} 2834}
2839 2835
2840int 2836int
2841rxvt_term::selection_request_other (Atom target, int selnum) 2837rxvt_term::selection_request_other (Atom target, int selnum) NOTHROW
2842{ 2838{
2843 Atom sel; 2839 Atom sel;
2844 2840
2845 selection_type |= selnum; 2841 selection_type |= selnum;
2846 2842
… …
2865/* 2861/*
2866 * Clear all selected text 2862 * Clear all selected text
2867 * EXT: SelectionClear 2863 * EXT: SelectionClear
2868 */ 2864 */
2869void 2865void
2870rxvt_term::selection_clear () 2866rxvt_term::selection_clear () NOTHROW
2871{ 2867{
2872 want_refresh = 1; 2868 want_refresh = 1;
2873 free (selection.text); 2869 free (selection.text);
2874 selection.text = NULL; 2870 selection.text = NULL;
2875 selection.len = 0; 2871 selection.len = 0;
… …
3010 3006
3011 selection_grab (tm); 3007 selection_grab (tm);
3012} 3008}
3013 3009
3014bool 3010bool
3015rxvt_term::selection_grab (Time tm) 3011rxvt_term::selection_grab (Time tm) NOTHROW
3016{ 3012{
3017 selection_time = tm; 3013 selection_time = tm;
3018 3014
3019 XSetSelectionOwner (display->display, XA_PRIMARY, vt, tm); 3015 XSetSelectionOwner (display->display, XA_PRIMARY, vt, tm);
3020 if (XGetSelectionOwner (display->display, XA_PRIMARY) == vt) 3016 if (XGetSelectionOwner (display->display, XA_PRIMARY) == vt)
3021 { 3017 {
3022 display->set_selection_owner (this); 3018 display->set_selection_owner (this);
3023 return true; 3019 return true;
3024 } 3020 }
3025 else 3021 else
3022 {
3023 selection_clear ();
3026 return false; 3024 return false;
3025 }
3027 3026
3028#if 0 3027#if 0
3029 XTextProperty ct; 3028 XTextProperty ct;
3030 3029
3031 if (XwcTextListToTextProperty (display->display, &selection.text, 1, XStringStyle, &ct) >= 0) 3030 if (XwcTextListToTextProperty (display->display, &selection.text, 1, XStringStyle, &ct) >= 0)
… …
3040/* 3039/*
3041 * Mark or select text based upon number of clicks: 1, 2, or 3 3040 * Mark or select text based upon number of clicks: 1, 2, or 3
3042 * EXT: button 1 press 3041 * EXT: button 1 press
3043 */ 3042 */
3044void 3043void
3045rxvt_term::selection_click (int clicks, int x, int y) 3044rxvt_term::selection_click (int clicks, int x, int y) NOTHROW
3046{ 3045{
3047 clicks = ((clicks - 1) % 3) + 1; 3046 clicks = ((clicks - 1) % 3) + 1;
3048 selection.clicks = clicks; /* save clicks so extend will work */ 3047 selection.clicks = clicks; /* save clicks so extend will work */
3049 3048
3049 if (clicks == 2 && !selection.rect
3050 && HOOK_INVOKE ((this, HOOK_SEL_EXTEND, DT_END)))
3051 {
3052 MEvent.clicks = 1; // what a mess
3053 selection.screen = current_screen;
3054 selection.op = SELECTION_CONT;
3055 return;
3056 }
3057
3050 selection_start_colrow (Pixel2Col (x), Pixel2Row (y)); 3058 selection_start_colrow (Pixel2Col (x), Pixel2Row (y));
3051 3059
3052 if (clicks == 2 || clicks == 3) 3060 if (clicks == 2 || clicks == 3)
3053 selection_extend_colrow (selection.mark.col, 3061 selection_extend_colrow (selection.mark.col,
3054 selection.mark.row + view_start, 3062 selection.mark.row - view_start,
3055 0, /* button 3 */ 3063 0, /* button 3 */
3056 1, /* button press */ 3064 1, /* button press */
3057 0); /* click change */ 3065 0); /* click change */
3058} 3066}
3059 3067
3060/* ------------------------------------------------------------------------- */ 3068/* ------------------------------------------------------------------------- */
3061/* 3069/*
3062 * Mark a selection at the specified col/row 3070 * Mark a selection at the specified col/row
3063 */ 3071 */
3064void 3072void
3065rxvt_term::selection_start_colrow (int col, int row) 3073rxvt_term::selection_start_colrow (int col, int row) NOTHROW
3066{ 3074{
3067 want_refresh = 1; 3075 want_refresh = 1;
3068 3076
3069 selection.mark.row = row - view_start; 3077 selection.mark.row = row + view_start;
3070 selection.mark.col = col; 3078 selection.mark.col = col;
3071 3079
3072 selection.mark.row = clamp (selection.mark.row, -nsaved, nrow - 1); 3080 selection.mark.row = clamp (selection.mark.row, top_row, nrow - 1);
3073 selection.mark.col = clamp (selection.mark.col, 0, ncol - 1); 3081 selection.mark.col = clamp (selection.mark.col, 0, ncol - 1);
3074 3082
3075 while (selection.mark.col > 0 3083 while (selection.mark.col > 0
3076 && ROW(selection.mark.row).t[selection.mark.col] == NOCHAR) 3084 && ROW(selection.mark.row).t[selection.mark.col] == NOCHAR)
3077 --selection.mark.col; 3085 --selection.mark.col;
… …
3096#define DELIMIT_TEXT(x) \ 3104#define DELIMIT_TEXT(x) \
3097 (unicode::is_space (x) ? 2 : (x) <= 0xff && !!strchr (rs[Rs_cutchars], (x))) 3105 (unicode::is_space (x) ? 2 : (x) <= 0xff && !!strchr (rs[Rs_cutchars], (x)))
3098#define DELIMIT_REND(x) 1 3106#define DELIMIT_REND(x) 1
3099 3107
3100void 3108void
3101rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) 3109rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) NOTHROW
3102{ 3110{
3103 int col, row, dirnadd, tcol, trow, w1, w2; 3111 int col, row, dirnadd, tcol, trow, w1, w2;
3104 row_col_t bound; 3112 row_col_t bound;
3105 text_t *stp; 3113 text_t *stp;
3106 rend_t *srp; 3114 rend_t *srp;
3107 3115
3108 if (dirn == UP) 3116 if (dirn == UP)
3109 { 3117 {
3110 bound.row = - nsaved - 1; 3118 bound.row = top_row - 1;
3111 bound.col = 0; 3119 bound.col = 0;
3112 dirnadd = -1; 3120 dirnadd = -1;
3113 } 3121 }
3114 else 3122 else
3115 { 3123 {
… …
3180 * flag == 0 ==> button 1 3188 * flag == 0 ==> button 1
3181 * flag == 1 ==> button 3 press 3189 * flag == 1 ==> button 3 press
3182 * flag == 2 ==> button 3 motion 3190 * flag == 2 ==> button 3 motion
3183 */ 3191 */
3184void 3192void
3185rxvt_term::selection_extend (int x, int y, int flag) 3193rxvt_term::selection_extend (int x, int y, int flag) NOTHROW
3186{ 3194{
3187 int col = clamp (Pixel2Col (x), 0, ncol); 3195 int col = clamp (Pixel2Col (x), 0, ncol);
3188 int row = clamp (Pixel2Row (y), 0, nrow - 1); 3196 int row = clamp (Pixel2Row (y), 0, nrow - 1);
3189 3197
3190 /* 3198 /*
… …
3193 * select nothing. Otherwise, if we're to the right of the mark, you have to 3201 * select nothing. Otherwise, if we're to the right of the mark, you have to
3194 * be _past_ a character for it to be selected. 3202 * be _past_ a character for it to be selected.
3195 */ 3203 */
3196 if (((selection.clicks % 3) == 1) && !flag 3204 if (((selection.clicks % 3) == 1) && !flag
3197 && (col == selection.mark.col 3205 && (col == selection.mark.col
3198 && (row == selection.mark.row + view_start))) 3206 && (row == selection.mark.row - view_start)))
3199 { 3207 {
3200 /* select nothing */ 3208 /* select nothing */
3201 selection.beg.row = selection.end.row = 0; 3209 selection.beg.row = selection.end.row = 0;
3202 selection.beg.col = selection.end.col = 0; 3210 selection.beg.col = selection.end.col = 0;
3203 selection.clicks = 4; 3211 selection.clicks = 4;
… …
3216/* ------------------------------------------------------------------------- */ 3224/* ------------------------------------------------------------------------- */
3217/* 3225/*
3218 * Extend the selection to the specified col/row 3226 * Extend the selection to the specified col/row
3219 */ 3227 */
3220void 3228void
3221rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) 3229rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) NOTHROW
3222{ 3230{
3223 row_col_t pos; 3231 row_col_t pos;
3224 enum { 3232 enum {
3225 LEFT, RIGHT 3233 LEFT, RIGHT
3226 } closeto = RIGHT; 3234 } closeto = RIGHT;
… …
3258 selection.beg.col = selection.end.col = selection.mark.col; 3266 selection.beg.col = selection.end.col = selection.mark.col;
3259 selection.beg.row = selection.end.row = selection.mark.row; 3267 selection.beg.row = selection.end.row = selection.mark.row;
3260 } 3268 }
3261 3269
3262 pos.col = col; 3270 pos.col = col;
3263 pos.row = row - view_start; 3271 pos.row = view_start + row;
3264 3272
3265 /* 3273 /*
3266 * This is mainly xterm style selection with a couple of differences, mainly 3274 * This is mainly xterm style selection with a couple of differences, mainly
3267 * in the way button3 drag extension works. 3275 * in the way button3 drag extension works.
3268 * We're either doing: button1 drag; button3 press; or button3 drag 3276 * We're either doing: button1 drag; button3 press; or button3 drag
… …
3349 else if (selection.clicks == 2) 3357 else if (selection.clicks == 2)
3350 { 3358 {
3351 if (ROWCOL_IS_AFTER (selection.end, selection.beg)) 3359 if (ROWCOL_IS_AFTER (selection.end, selection.beg))
3352 selection.end.col--; 3360 selection.end.col--;
3353 3361
3354 if (!HOOK_INVOKE ((this, HOOK_SEL_EXTEND, DT_END)))
3355 {
3356 selection_delimit_word (UP, &selection.beg, &selection.beg); 3362 selection_delimit_word (UP, &selection.beg, &selection.beg);
3357 selection_delimit_word (DN, &selection.end, &selection.end); 3363 selection_delimit_word (DN, &selection.end, &selection.end);
3358 }
3359 } 3364 }
3360 else if (selection.clicks == 3) 3365 else if (selection.clicks == 3)
3361 { 3366 {
3362#if ENABLE_FRILLS 3367#if ENABLE_FRILLS
3363 if (OPTION (Opt_tripleclickwords)) 3368 if (OPTION (Opt_tripleclickwords))
… …
3415#endif 3420#endif
3416} 3421}
3417 3422
3418#if ENABLE_FRILLS 3423#if ENABLE_FRILLS
3419void 3424void
3420rxvt_term::selection_remove_trailing_spaces () 3425rxvt_term::selection_remove_trailing_spaces () NOTHROW
3421{ 3426{
3422 int32_t end_col, end_row; 3427 int32_t end_col, end_row;
3423 text_t *stp; 3428 text_t *stp;
3424 3429
3425 end_col = selection.end.col; 3430 end_col = selection.end.col;
… …
3463/* 3468/*
3464 * Double click on button 3 when already selected 3469 * Double click on button 3 when already selected
3465 * EXT: button 3 double click 3470 * EXT: button 3 double click
3466 */ 3471 */
3467void 3472void
3468rxvt_term::selection_rotate (int x, int y) 3473rxvt_term::selection_rotate (int x, int y) NOTHROW
3469{ 3474{
3470 selection.clicks = selection.clicks % 3 + 1; 3475 selection.clicks = selection.clicks % 3 + 1;
3471 selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1); 3476 selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1);
3472} 3477}
3473 3478
… …
3475/* 3480/*
3476 * Respond to a request for our current selection 3481 * Respond to a request for our current selection
3477 * EXT: SelectionRequest 3482 * EXT: SelectionRequest
3478 */ 3483 */
3479void 3484void
3480rxvt_term::selection_send (const XSelectionRequestEvent &rq) 3485rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW
3481{ 3486{
3482 XSelectionEvent ev; 3487 XSelectionEvent ev;
3483 dDisp; 3488 dDisp;
3484 3489
3485 ev.type = SelectionNotify; 3490 ev.type = SelectionNotify;
… …
3613 3618
3614/* 3619/*
3615 * return col/row values corresponding to x/y pixel values 3620 * return col/row values corresponding to x/y pixel values
3616 */ 3621 */
3617void 3622void
3618rxvt_term::pixel_position (int *x, int *y) 3623rxvt_term::pixel_position (int *x, int *y) NOTHROW
3619{ 3624{
3620 *x = Pixel2Col (*x); 3625 *x = Pixel2Col (*x);
3621 /* max_it (*x, 0); min_it (*x, (int)ncol - 1); */ 3626 /* max_it (*x, 0); min_it (*x, (int)ncol - 1); */
3622 *y = Pixel2Row (*y); 3627 *y = Pixel2Row (*y);
3623 /* max_it (*y, 0); min_it (*y, (int)nrow - 1); */ 3628 /* max_it (*y, 0); min_it (*y, (int)nrow - 1); */
3624} 3629}
3625 3630
3626/* ------------------------------------------------------------------------- */ 3631/* ------------------------------------------------------------------------- */
3627#ifdef USE_XIM 3632#ifdef USE_XIM
3628void 3633void
3629rxvt_term::im_set_position (XPoint &pos) 3634rxvt_term::im_set_position (XPoint &pos) NOTHROW
3630{ 3635{
3631 XWindowAttributes xwa; 3636 XWindowAttributes xwa;
3632 3637
3633 XGetWindowAttributes (display->display, vt, &xwa); 3638 XGetWindowAttributes (display->display, vt, &xwa);
3634 3639
… …
3637} 3642}
3638#endif 3643#endif
3639 3644
3640#if ENABLE_OVERLAY 3645#if ENABLE_OVERLAY
3641void 3646void
3642rxvt_term::scr_overlay_new (int x, int y, int w, int h) 3647rxvt_term::scr_overlay_new (int x, int y, int w, int h) NOTHROW
3643{ 3648{
3644 if (nrow < 1 || ncol < 1) 3649 if (nrow < 1 || ncol < 1)
3645 return; 3650 return;
3646 3651
3647 want_refresh = 1; 3652 want_refresh = 1;
… …
3692 *rp = r; 3697 *rp = r;
3693 } 3698 }
3694} 3699}
3695 3700
3696void 3701void
3697rxvt_term::scr_overlay_off () 3702rxvt_term::scr_overlay_off () NOTHROW
3698{ 3703{
3699 if (!ov_text) 3704 if (!ov_text)
3700 return; 3705 return;
3701 3706
3702 want_refresh = 1; 3707 want_refresh = 1;
… …
3710 delete [] ov_text; ov_text = 0; 3715 delete [] ov_text; ov_text = 0;
3711 delete [] ov_rend; ov_rend = 0; 3716 delete [] ov_rend; ov_rend = 0;
3712} 3717}
3713 3718
3714void 3719void
3715rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) 3720rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) NOTHROW
3716{ 3721{
3717 if (!ov_text || x >= ov_w - 2 || y >= ov_h - 2) 3722 if (!ov_text || x >= ov_w - 2 || y >= ov_h - 2)
3718 return; 3723 return;
3719 3724
3720 x++, y++; 3725 x++, y++;
… …
3722 ov_text[y][x] = text; 3727 ov_text[y][x] = text;
3723 ov_rend[y][x] = rend; 3728 ov_rend[y][x] = rend;
3724} 3729}
3725 3730
3726void 3731void
3727rxvt_term::scr_overlay_set (int x, int y, const char *s) 3732rxvt_term::scr_overlay_set (int x, int y, const char *s) NOTHROW
3728{ 3733{
3729 while (*s) 3734 while (*s)
3730 scr_overlay_set (x++, y, *s++); 3735 scr_overlay_set (x++, y, *s++);
3731} 3736}
3732 3737
3733void 3738void
3734rxvt_term::scr_overlay_set (int x, int y, const wchar_t *s) 3739rxvt_term::scr_overlay_set (int x, int y, const wchar_t *s) NOTHROW
3735{ 3740{
3736 while (*s) 3741 while (*s)
3737 { 3742 {
3738 text_t t = *s++; 3743 text_t t = *s++;
3739 int width = wcwidth (t); 3744 int width = wcwidth (t);
… …
3745 } 3750 }
3746 } 3751 }
3747} 3752}
3748 3753
3749void 3754void
3750rxvt_term::scr_swap_overlay () 3755rxvt_term::scr_swap_overlay () NOTHROW
3751{ 3756{
3752 if (!ov_text) 3757 if (!ov_text)
3753 return; 3758 return;
3754 3759
3755 // swap screen mem with overlay 3760 // swap screen mem with overlay
3756 for (int y = ov_h; y--; ) 3761 for (int y = ov_h; y--; )
3757 { 3762 {
3758 text_t *t1 = ov_text[y]; 3763 text_t *t1 = ov_text[y];
3759 rend_t *r1 = ov_rend[y]; 3764 rend_t *r1 = ov_rend[y];
3760 3765
3761 text_t *t2 = ROW(y + ov_y - view_start).t + ov_x; 3766 text_t *t2 = ROW(y + ov_y + view_start).t + ov_x;
3762 rend_t *r2 = ROW(y + ov_y - view_start).r + ov_x; 3767 rend_t *r2 = ROW(y + ov_y + view_start).r + ov_x;
3763 3768
3764 for (int x = ov_w; x--; ) 3769 for (int x = ov_w; x--; )
3765 { 3770 {
3766 text_t t = *t1; *t1++ = *t2; *t2++ = t; 3771 text_t t = *t1; *t1++ = *t2; *t2++ = t;
3767 rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t)); 3772 rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t));

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines