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.227 by root, Sun Jan 15 05:14:12 2006 UTC vs.
Revision 1.246 by root, Sat Jan 21 14:25:05 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 (); 239 rvideo_state = rvideo_mode = false;
240 rvideo = 0;
241 } 240 }
242 else 241 else
243 { 242 {
244 /* 243 /*
245 * add or delete rows as appropriate 244 * add or delete rows as appropriate
… …
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, minCOLOR, 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)
… …
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;
… …
615 617
616 if (count > 0 618 if (count > 0
617 && row1 == 0 619 && row1 == 0
618 && (current_screen == PRIMARY || OPTION (Opt_secondaryScroll))) 620 && (current_screen == PRIMARY || OPTION (Opt_secondaryScroll)))
619 { 621 {
620 nsaved = min (nsaved + count, saveLines); 622 top_row = max (top_row - count, -saveLines);
621 623
622 HOOK_INVOKE ((this, HOOK_SCROLL_BACK, DT_INT, count, DT_INT, nsaved, DT_END));
623
624 // scroll everything up 'count' lines 624 // scroll everything up 'count' lines
625 term_start = (term_start + count) % total_rows; 625 term_start = (term_start + count) % total_rows;
626 626
627 // sever bottommost line
627 { 628 {
628 // severe bottommost scrolled line
629 line_t &l = ROW(row2 - count); 629 line_t &l = ROW(row2 - count);
630 l.is_longer (0);
630 l.touch (); 631 l.touch ();
631 l.is_longer (0);
632 } 632 }
633 633
634 // erase newly scorlled-in lines 634 // erase newly scrolled-in lines
635 for (int i = count; i; --i ) 635 for (int i = count; i--; )
636 { 636 {
637 // basically this is a slightly optimized scr_blank_screen_mem 637 // basically this is a slightly optimized scr_blank_screen_mem
638 // it is worth the effort on slower machines 638 // it is worth the effort on slower machines
639 line_t &l = ROW(nrow - i); 639 line_t &l = ROW(nrow - 1 - i);
640 640
641 scr_blank_line (l, 0, l.l, rstyle); 641 scr_blank_line (l, 0, l.l, rstyle);
642 642
643 l.l = 0; 643 l.l = 0;
644 l.f = 0; 644 l.f = 0;
… …
661 { 661 {
662 selection.beg.row -= count; 662 selection.beg.row -= count;
663 selection.end.row -= count; 663 selection.end.row -= count;
664 selection.mark.row -= count; 664 selection.mark.row -= count;
665 665
666 if (selection.beg.row < -nsaved 666 if (selection.beg.row < top_row
667 || selection.end.row < -nsaved 667 || selection.end.row < top_row
668 || selection.mark.row < -nsaved) 668 || selection.mark.row < top_row)
669 { 669 {
670 CLEAR_ALL_SELECTION (); 670 CLEAR_ALL_SELECTION ();
671 selection.op = SELECTION_CLEAR; 671 selection.op = SELECTION_CLEAR;
672 } 672 }
673 } 673 }
674 674
675 // finally move the view window, if desired 675 // finally move the view window, if desired
676 if (OPTION (Opt_scrollWithBuffer) 676 if (OPTION (Opt_scrollWithBuffer)
677 && view_start != 0 677 && view_start != 0
678 && view_start != saveLines) 678 && view_start != -saveLines)
679 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));
680 } 683 }
681 else 684 else
682 { 685 {
683 if (selection.op && current_screen == selection.screen) 686 if (selection.op && current_screen == selection.screen)
684 { 687 {
… …
730/* ------------------------------------------------------------------------- */ 733/* ------------------------------------------------------------------------- */
731/* 734/*
732 * Add text given in <str> of length <len> to screen struct 735 * Add text given in <str> of length <len> to screen struct
733 */ 736 */
734void 737void
735rxvt_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
736{ 739{
737 if (len <= 0) /* sanity */ 740 if (len <= 0) /* sanity */
738 return; 741 return;
739 742
740 unsigned char checksel; 743 unsigned char checksel;
… …
760 } 763 }
761 764
762#ifdef DEBUG_STRICT 765#ifdef DEBUG_STRICT
763 assert (screen.cur.col < ncol); 766 assert (screen.cur.col < ncol);
764 assert (screen.cur.row < nrow 767 assert (screen.cur.row < nrow
765 && screen.cur.row >= -nsaved); 768 && screen.cur.row >= top_row);
766#endif 769#endif
767 int row = screen.cur.row; 770 int row = screen.cur.row;
768 771
769 checksel = selection.op && current_screen == selection.screen ? 1 : 0; 772 checksel = selection.op && current_screen == selection.screen ? 1 : 0;
770 773
… …
816 CLEAR_SELECTION (); 819 CLEAR_SELECTION ();
817 } 820 }
818 821
819 if (screen.flags & Screen_WrapNext) 822 if (screen.flags & Screen_WrapNext)
820 { 823 {
821 max_it (line->l, ncol);
822 line->is_longer (1);
823
824 scr_do_wrap (); 824 scr_do_wrap ();
825 825
826 line->l = ncol;
827 line->is_longer (1);
828
826 row = screen.cur.row; 829 row = screen.cur.row;
827 line = &ROW(row); /* _must_ refresh */ 830 line = &ROW(row); /* _must_ refresh */
828 } 831 }
829 832
830 // some utf-8 decoders "decode" surrogate characters: let's fix this. 833 // some utf-8 decoders "decode" surrogate characters: let's fix this.
… …
994/* 997/*
995 * 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
996 * XTERM_SEQ: CTRL-H 999 * XTERM_SEQ: CTRL-H
997 */ 1000 */
998void 1001void
999rxvt_term::scr_backspace () 1002rxvt_term::scr_backspace () NOTHROW
1000{ 1003{
1001 want_refresh = 1; 1004 want_refresh = 1;
1002 1005
1003 if (screen.cur.col == 0) 1006 if (screen.cur.col == 0)
1004 { 1007 {
… …
1022 * Process Horizontal Tab 1025 * Process Horizontal Tab
1023 * count: +ve = forward; -ve = backwards 1026 * count: +ve = forward; -ve = backwards
1024 * XTERM_SEQ: CTRL-I 1027 * XTERM_SEQ: CTRL-I
1025 */ 1028 */
1026void 1029void
1027rxvt_term::scr_tab (int count, bool ht) 1030rxvt_term::scr_tab (int count, bool ht) NOTHROW
1028{ 1031{
1029 int i, x; 1032 int i, x;
1030 1033
1031 want_refresh = 1; 1034 want_refresh = 1;
1032 i = x = screen.cur.col; 1035 i = x = screen.cur.col;
… …
1099 * 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
1100 * in that row right. Clear left column. 1103 * in that row right. Clear left column.
1101 */ 1104 */
1102#if ENABLE_FRILLS 1105#if ENABLE_FRILLS
1103void 1106void
1104rxvt_term::scr_backindex () 1107rxvt_term::scr_backindex () NOTHROW
1105{ 1108{
1106 if (screen.cur.col > 0) 1109 if (screen.cur.col > 0)
1107 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE); 1110 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE);
1108 else 1111 else
1109 scr_insdel_chars (1, INSERT); 1112 scr_insdel_chars (1, INSERT);
… …
1116 * 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
1117 * in that row left. Clear right column. 1120 * in that row left. Clear right column.
1118 */ 1121 */
1119#if ENABLE_FRILLS 1122#if ENABLE_FRILLS
1120void 1123void
1121rxvt_term::scr_forwardindex () 1124rxvt_term::scr_forwardindex () NOTHROW
1122{ 1125{
1123 if (screen.cur.col < ncol - 1) 1126 if (screen.cur.col < ncol - 1)
1124 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE); 1127 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE);
1125 else 1128 else
1126 { 1129 {
… …
1139/* ------------------------------------------------------------------------- */ 1142/* ------------------------------------------------------------------------- */
1140/* 1143/*
1141 * Goto Row/Column 1144 * Goto Row/Column
1142 */ 1145 */
1143void 1146void
1144rxvt_term::scr_gotorc (int row, int col, int relative) 1147rxvt_term::scr_gotorc (int row, int col, int relative) NOTHROW
1145{ 1148{
1146 want_refresh = 1; 1149 want_refresh = 1;
1147 ZERO_SCROLLBACK (); 1150 ZERO_SCROLLBACK ();
1148 1151
1149 screen.cur.col = relative & C_RELATIVE ? screen.cur.col + col : col; 1152 screen.cur.col = relative & C_RELATIVE ? screen.cur.col + col : col;
… …
1187/* ------------------------------------------------------------------------- */ 1190/* ------------------------------------------------------------------------- */
1188/* 1191/*
1189 * direction should be UP or DN 1192 * direction should be UP or DN
1190 */ 1193 */
1191void 1194void
1192rxvt_term::scr_index (enum page_dirn direction) 1195rxvt_term::scr_index (enum page_dirn direction) NOTHROW
1193{ 1196{
1194 int dirn; 1197 int dirn;
1195 1198
1196 want_refresh = 1; 1199 want_refresh = 1;
1197 ZERO_SCROLLBACK (); 1200 ZERO_SCROLLBACK ();
… …
1216 * XTERM_SEQ: Clear line to right: ESC [ 0 K 1219 * XTERM_SEQ: Clear line to right: ESC [ 0 K
1217 * XTERM_SEQ: Clear line to left : ESC [ 1 K 1220 * XTERM_SEQ: Clear line to left : ESC [ 1 K
1218 * XTERM_SEQ: Clear whole line : ESC [ 2 K 1221 * XTERM_SEQ: Clear whole line : ESC [ 2 K
1219 */ 1222 */
1220void 1223void
1221rxvt_term::scr_erase_line (int mode) 1224rxvt_term::scr_erase_line (int mode) NOTHROW
1222{ 1225{
1223 unsigned int col, num; 1226 unsigned int col, num;
1224 1227
1225 want_refresh = 1; 1228 want_refresh = 1;
1226 ZERO_SCROLLBACK (); 1229 ZERO_SCROLLBACK ();
… …
1270 * XTERM_SEQ: Clear screen after cursor : ESC [ 0 J 1273 * XTERM_SEQ: Clear screen after cursor : ESC [ 0 J
1271 * XTERM_SEQ: Clear screen before cursor: ESC [ 1 J 1274 * XTERM_SEQ: Clear screen before cursor: ESC [ 1 J
1272 * XTERM_SEQ: Clear whole screen : ESC [ 2 J 1275 * XTERM_SEQ: Clear whole screen : ESC [ 2 J
1273 */ 1276 */
1274void 1277void
1275rxvt_term::scr_erase_screen (int mode) 1278rxvt_term::scr_erase_screen (int mode) NOTHROW
1276{ 1279{
1277 int num; 1280 int num;
1278 int32_t row; 1281 int32_t row;
1279 rend_t ren; 1282 rend_t ren;
1280 XGCValues gcvalue; 1283 XGCValues gcvalue;
… …
1340 } 1343 }
1341} 1344}
1342 1345
1343#if ENABLE_FRILLS 1346#if ENABLE_FRILLS
1344void 1347void
1345rxvt_term::scr_erase_savelines () 1348rxvt_term::scr_erase_savelines () NOTHROW
1346{ 1349{
1347 want_refresh = 1; 1350 want_refresh = 1;
1348 ZERO_SCROLLBACK (); 1351 ZERO_SCROLLBACK ();
1349 1352
1350 nsaved = 0; 1353 top_row = 0;
1351} 1354}
1352#endif 1355#endif
1353 1356
1354/* ------------------------------------------------------------------------- */ 1357/* ------------------------------------------------------------------------- */
1355/* 1358/*
1356 * Fill the screen with `E's 1359 * Fill the screen with `E's
1357 * XTERM_SEQ: Screen Alignment Test: ESC # 8 1360 * XTERM_SEQ: Screen Alignment Test: ESC # 8
1358 */ 1361 */
1359void 1362void
1360rxvt_term::scr_E () 1363rxvt_term::scr_E () NOTHROW
1361{ 1364{
1362 rend_t fs; 1365 rend_t fs;
1363 1366
1364 want_refresh = 1; 1367 want_refresh = 1;
1365 ZERO_SCROLLBACK (); 1368 ZERO_SCROLLBACK ();
… …
1386/* ------------------------------------------------------------------------- */ 1389/* ------------------------------------------------------------------------- */
1387/* 1390/*
1388 * Insert/Delete <count> lines 1391 * Insert/Delete <count> lines
1389 */ 1392 */
1390void 1393void
1391rxvt_term::scr_insdel_lines (int count, int insdel) 1394rxvt_term::scr_insdel_lines (int count, int insdel) NOTHROW
1392{ 1395{
1393 int end; 1396 int end;
1394 1397
1395 ZERO_SCROLLBACK (); 1398 ZERO_SCROLLBACK ();
1396 1399
… …
1416/* ------------------------------------------------------------------------- */ 1419/* ------------------------------------------------------------------------- */
1417/* 1420/*
1418 * Insert/Delete <count> characters from the current position 1421 * Insert/Delete <count> characters from the current position
1419 */ 1422 */
1420void 1423void
1421rxvt_term::scr_insdel_chars (int count, int insdel) 1424rxvt_term::scr_insdel_chars (int count, int insdel) NOTHROW
1422{ 1425{
1423 int col, row; 1426 int col, row;
1424 rend_t tr; 1427 rend_t tr;
1425 1428
1426 want_refresh = 1; 1429 want_refresh = 1;
… …
1514/* 1517/*
1515 * Set the scrolling region 1518 * Set the scrolling region
1516 * XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r 1519 * XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r
1517 */ 1520 */
1518void 1521void
1519rxvt_term::scr_scroll_region (int top, int bot) 1522rxvt_term::scr_scroll_region (int top, int bot) NOTHROW
1520{ 1523{
1521 max_it (top, 0); 1524 max_it (top, 0);
1522 min_it (bot, nrow - 1); 1525 min_it (bot, nrow - 1);
1523 1526
1524 if (top > bot) 1527 if (top > bot)
… …
1534 * Make the cursor visible/invisible 1537 * Make the cursor visible/invisible
1535 * XTERM_SEQ: Make cursor visible : ESC [ ? 25 h 1538 * XTERM_SEQ: Make cursor visible : ESC [ ? 25 h
1536 * XTERM_SEQ: Make cursor invisible: ESC [ ? 25 l 1539 * XTERM_SEQ: Make cursor invisible: ESC [ ? 25 l
1537 */ 1540 */
1538void 1541void
1539rxvt_term::scr_cursor_visible (int mode) 1542rxvt_term::scr_cursor_visible (int mode) NOTHROW
1540{ 1543{
1541 want_refresh = 1; 1544 want_refresh = 1;
1542 1545
1543 if (mode) 1546 if (mode)
1544 screen.flags |= Screen_VisibleCursor; 1547 screen.flags |= Screen_VisibleCursor;
… …
1551 * Set/unset automatic wrapping 1554 * Set/unset automatic wrapping
1552 * XTERM_SEQ: Set Wraparound : ESC [ ? 7 h 1555 * XTERM_SEQ: Set Wraparound : ESC [ ? 7 h
1553 * XTERM_SEQ: Unset Wraparound: ESC [ ? 7 l 1556 * XTERM_SEQ: Unset Wraparound: ESC [ ? 7 l
1554 */ 1557 */
1555void 1558void
1556rxvt_term::scr_autowrap (int mode) 1559rxvt_term::scr_autowrap (int mode) NOTHROW
1557{ 1560{
1558 if (mode) 1561 if (mode)
1559 screen.flags |= Screen_Autowrap; 1562 screen.flags |= Screen_Autowrap;
1560 else 1563 else
1561 screen.flags &= ~(Screen_Autowrap | Screen_WrapNext); 1564 screen.flags &= ~(Screen_Autowrap | Screen_WrapNext);
… …
1570 * and the cursor cannot be moved outside. 1573 * and the cursor cannot be moved outside.
1571 * XTERM_SEQ: Set Absolute: ESC [ ? 6 h 1574 * XTERM_SEQ: Set Absolute: ESC [ ? 6 h
1572 * XTERM_SEQ: Set Relative: ESC [ ? 6 l 1575 * XTERM_SEQ: Set Relative: ESC [ ? 6 l
1573 */ 1576 */
1574void 1577void
1575rxvt_term::scr_relative_origin (int mode) 1578rxvt_term::scr_relative_origin (int mode) NOTHROW
1576{ 1579{
1577 if (mode) 1580 if (mode)
1578 screen.flags |= Screen_Relative; 1581 screen.flags |= Screen_Relative;
1579 else 1582 else
1580 screen.flags &= ~Screen_Relative; 1583 screen.flags &= ~Screen_Relative;
… …
1587 * Set insert/replace mode 1590 * Set insert/replace mode
1588 * XTERM_SEQ: Set Insert mode : ESC [ ? 4 h 1591 * XTERM_SEQ: Set Insert mode : ESC [ ? 4 h
1589 * XTERM_SEQ: Set Replace mode: ESC [ ? 4 l 1592 * XTERM_SEQ: Set Replace mode: ESC [ ? 4 l
1590 */ 1593 */
1591void 1594void
1592rxvt_term::scr_insert_mode (int mode) 1595rxvt_term::scr_insert_mode (int mode) NOTHROW
1593{ 1596{
1594 if (mode) 1597 if (mode)
1595 screen.flags |= Screen_Insert; 1598 screen.flags |= Screen_Insert;
1596 else 1599 else
1597 screen.flags &= ~Screen_Insert; 1600 screen.flags &= ~Screen_Insert;
… …
1603 * XTERM_SEQ: Set tab at current column : ESC H 1606 * XTERM_SEQ: Set tab at current column : ESC H
1604 * XTERM_SEQ: Clear tab at current column: ESC [ 0 g 1607 * XTERM_SEQ: Clear tab at current column: ESC [ 0 g
1605 * XTERM_SEQ: Clear all tabs : ESC [ 3 g 1608 * XTERM_SEQ: Clear all tabs : ESC [ 3 g
1606 */ 1609 */
1607void 1610void
1608rxvt_term::scr_set_tab (int mode) 1611rxvt_term::scr_set_tab (int mode) NOTHROW
1609{ 1612{
1610 if (mode < 0) 1613 if (mode < 0)
1611 memset (tabs, 0, ncol * sizeof (char)); 1614 memset (tabs, 0, ncol * sizeof (char));
1612 else if (screen.cur.col < ncol) 1615 else if (screen.cur.col < ncol)
1613 tabs [screen.cur.col] = !!mode; 1616 tabs [screen.cur.col] = !!mode;
… …
1618 * Set reverse/normal video 1621 * Set reverse/normal video
1619 * XTERM_SEQ: Reverse video: ESC [ ? 5 h 1622 * XTERM_SEQ: Reverse video: ESC [ ? 5 h
1620 * XTERM_SEQ: Normal video : ESC [ ? 5 l 1623 * XTERM_SEQ: Normal video : ESC [ ? 5 l
1621 */ 1624 */
1622void 1625void
1623rxvt_term::scr_rvideo_mode (int mode) 1626rxvt_term::scr_rvideo_mode (bool on) NOTHROW
1624{ 1627{
1625 XGCValues gcvalue; 1628 rvideo_mode = on;
1626 1629
1630#ifndef NO_BELL
1631 on ^= rvideo_bell;
1632#endif
1633
1627 if (rvideo != mode) 1634 if (rvideo_state != on)
1628 { 1635 {
1629 rvideo = mode; 1636 rvideo_state = on;
1637
1630 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]); 1638 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]);
1631#if XPM_BACKGROUND 1639#if XPM_BACKGROUND
1632 if (bgPixmap.pixmap == None) 1640 if (bgPixmap.pixmap == None)
1633#endif 1641#endif
1634#if TRANSPARENT 1642#if TRANSPARENT
1635 if (! OPTION (Opt_transparent) || am_transparent == 0) 1643 if (!OPTION (Opt_transparent) || am_transparent == 0)
1636#endif 1644#endif
1637 XSetWindowBackground (display->display, vt, 1645 XSetWindowBackground (display->display, vt, pix_colors[Color_bg]);
1638 pix_colors[Color_bg]);
1639 1646
1647 XGCValues gcvalue;
1640 gcvalue.foreground = pix_colors[Color_fg]; 1648 gcvalue.foreground = pix_colors[Color_fg];
1641 gcvalue.background = pix_colors[Color_bg]; 1649 gcvalue.background = pix_colors[Color_bg];
1642 XChangeGC (display->display, gc, GCBackground | GCForeground, 1650 XChangeGC (display->display, gc, GCBackground | GCForeground, &gcvalue);
1643 &gcvalue); 1651
1644 scr_clear (); 1652 scr_clear ();
1645 scr_touch (true); 1653 scr_touch (true);
1646 } 1654 }
1647} 1655}
1648 1656
… …
1650/* 1658/*
1651 * Report current cursor position 1659 * Report current cursor position
1652 * XTERM_SEQ: Report position: ESC [ 6 n 1660 * XTERM_SEQ: Report position: ESC [ 6 n
1653 */ 1661 */
1654void 1662void
1655rxvt_term::scr_report_position () 1663rxvt_term::scr_report_position () NOTHROW
1656{ 1664{
1657 tt_printf ("\033[%d;%dR", screen.cur.row + 1, screen.cur.col + 1); 1665 tt_printf ("\033[%d;%dR", screen.cur.row + 1, screen.cur.col + 1);
1658} 1666}
1659 1667
1660/* ------------------------------------------------------------------------- * 1668/* ------------------------------------------------------------------------- *
… …
1663 1671
1664/* 1672/*
1665 * Set font style 1673 * Set font style
1666 */ 1674 */
1667void 1675void
1668rxvt_term::set_font_style () 1676rxvt_term::set_font_style () NOTHROW
1669{ 1677{
1670#if 0 1678#if 0
1671 switch (charsets [screen.charset]) 1679 switch (charsets [screen.charset])
1672 { 1680 {
1673 case '0': /* DEC Special Character & Line Drawing Set */ 1681 case '0': /* DEC Special Character & Line Drawing Set */
… …
1695 * XTERM_SEQ: Invoke G1 character set: CTRL-N 1703 * XTERM_SEQ: Invoke G1 character set: CTRL-N
1696 * XTERM_SEQ: Invoke G2 character set: ESC N 1704 * XTERM_SEQ: Invoke G2 character set: ESC N
1697 * XTERM_SEQ: Invoke G3 character set: ESC O 1705 * XTERM_SEQ: Invoke G3 character set: ESC O
1698 */ 1706 */
1699void 1707void
1700rxvt_term::scr_charset_choose (int set) 1708rxvt_term::scr_charset_choose (int set) NOTHROW
1701{ 1709{
1702 screen.charset = set; 1710 screen.charset = set;
1703 set_font_style (); 1711 set_font_style ();
1704} 1712}
1705 1713
… …
1711 * XTERM_SEQ: Set G2 character set: ESC * <C> 1719 * XTERM_SEQ: Set G2 character set: ESC * <C>
1712 * XTERM_SEQ: Set G3 character set: ESC + <C> 1720 * XTERM_SEQ: Set G3 character set: ESC + <C>
1713 * See set_font_style for possible values for <C> 1721 * See set_font_style for possible values for <C>
1714 */ 1722 */
1715void 1723void
1716rxvt_term::scr_charset_set (int set, unsigned int ch) 1724rxvt_term::scr_charset_set (int set, unsigned int ch) NOTHROW
1717{ 1725{
1718 charsets[set] = (unsigned char)ch; 1726 charsets[set] = (unsigned char)ch;
1719 set_font_style (); 1727 set_font_style ();
1720} 1728}
1721 1729
… …
1726 1734
1727/* 1735/*
1728 * refresh matching text. 1736 * refresh matching text.
1729 */ 1737 */
1730bool 1738bool
1731rxvt_term::scr_refresh_rend (rend_t mask, rend_t value) 1739rxvt_term::scr_refresh_rend (rend_t mask, rend_t value) NOTHROW
1732{ 1740{
1733 bool found = false; 1741 bool found = false;
1734 1742
1735 for (int i = 0; i < nrow; i++) 1743 for (int i = 0; i < nrow; i++)
1736 { 1744 {
… …
1756 PART_END, 1764 PART_END,
1757 RC_COUNT 1765 RC_COUNT
1758}; 1766};
1759 1767
1760void 1768void
1761rxvt_term::scr_expose (int x, int y, int ewidth, int eheight, bool refresh) 1769rxvt_term::scr_expose (int x, int y, int ewidth, int eheight, bool refresh) NOTHROW
1762{ 1770{
1763 int i; 1771 int i;
1764 row_col_t rc[RC_COUNT]; 1772 row_col_t rc[RC_COUNT];
1765 1773
1766 if (!drawn_buf) /* sanity check */ 1774 if (!drawn_buf) /* sanity check */
… …
1789 } 1797 }
1790 1798
1791 for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++) 1799 for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++)
1792 fill_text (&drawn_buf[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1); 1800 fill_text (&drawn_buf[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1);
1793 1801
1802 num_scr_allow = 0;
1803
1794 if (refresh) 1804 if (refresh)
1795 scr_refresh (SLOW_REFRESH); 1805 scr_refresh ();
1796} 1806}
1797 1807
1798/* ------------------------------------------------------------------------- */ 1808/* ------------------------------------------------------------------------- */
1799/* 1809/*
1800 * Refresh the entire screen 1810 * Refresh the entire screen
1801 */ 1811 */
1802void 1812void
1803rxvt_term::scr_touch (bool refresh) 1813rxvt_term::scr_touch (bool refresh) NOTHROW
1804{ 1814{
1805 scr_expose (0, 0, width, height, refresh); 1815 scr_expose (0, 0, width, height, refresh);
1806} 1816}
1807 1817
1808/* ------------------------------------------------------------------------- */ 1818/* ------------------------------------------------------------------------- */
1809/* 1819/*
1810 * Move the display so that the line represented by scrollbar value Y is at 1820 * Move the display so that the line represented by scrollbar value Y is at
1811 * the top of the screen 1821 * the top of the screen
1812 */ 1822 */
1813int 1823void
1814rxvt_term::scr_move_to (int y, int len) 1824rxvt_term::scr_move_to (int y, int len) NOTHROW
1815{ 1825{
1816 long p = 0; 1826 scr_changeview ((top_row - nrow) * (len - y) / len + (nrow - 1));
1817 unsigned int oldviewstart;
1818
1819 oldviewstart = view_start;
1820
1821 if (y < len)
1822 {
1823 p = (nrow + nsaved) * (len - y) / len;
1824 p -= (long) (nrow - 1);
1825 p = max (p, 0);
1826 }
1827
1828 view_start = (unsigned int)min (p, nsaved);
1829
1830 return scr_changeview (oldviewstart);
1831} 1827}
1832 1828
1833/* ------------------------------------------------------------------------- */ 1829/* ------------------------------------------------------------------------- */
1834/* 1830/*
1835 * Page the screen up/down nlines 1831 * Page the screen up/down nlines
1836 * direction should be UP or DN 1832 * direction should be UP or DN
1837 */ 1833 */
1838int 1834bool
1839rxvt_term::scr_page (enum page_dirn direction, int nlines) 1835rxvt_term::scr_page (enum page_dirn direction, int nlines) NOTHROW
1840{ 1836{
1841 int n; 1837 int new_view_start =
1842 unsigned int oldviewstart;
1843
1844 oldviewstart = view_start;
1845
1846 if (direction == UP)
1847 {
1848 n = view_start + nlines;
1849 view_start = min (n, nsaved);
1850 }
1851 else
1852 {
1853 n = view_start - nlines; 1838 direction == UP ? view_start - nlines
1854 view_start = max (n, 0); 1839 : view_start + nlines;
1855 }
1856 1840
1857 return scr_changeview (oldviewstart); 1841 return scr_changeview (new_view_start);
1858} 1842}
1859 1843
1860int 1844bool
1861rxvt_term::scr_changeview (unsigned int oldviewstart) 1845rxvt_term::scr_changeview (int new_view_start) NOTHROW
1862{ 1846{
1847 clamp_it (new_view_start, top_row, 0);
1848
1863 if (view_start != oldviewstart) 1849 if (new_view_start == view_start)
1864 { 1850 return false;
1851
1852 num_scr += new_view_start - view_start;
1853 view_start = new_view_start;
1854 want_refresh = 1;
1855
1865 HOOK_INVOKE ((this, HOOK_VIEW_CHANGE, DT_INT, view_start, DT_END)); 1856 HOOK_INVOKE ((this, HOOK_VIEW_CHANGE, DT_INT, view_start, DT_END));
1866 1857
1867 want_refresh = 1; 1858 return true;
1868 num_scr -= (view_start - oldviewstart);
1869 }
1870
1871 return (int)view_start - (int)oldviewstart;
1872} 1859}
1873 1860
1874/* ------------------------------------------------------------------------- */ 1861#ifndef NO_BELL
1875void 1862void
1863rxvt_term::bell_cb (time_watcher &w)
1864{
1865 rvideo_bell = false;
1866 scr_rvideo_mode (rvideo_mode);
1867}
1868#endif
1869
1870/* ------------------------------------------------------------------------- */
1871void
1876rxvt_term::scr_bell () 1872rxvt_term::scr_bell () NOTHROW
1877{ 1873{
1878#ifndef NO_BELL 1874#ifndef NO_BELL
1879 1875
1880# ifndef NO_MAPALERT 1876# ifndef NO_MAPALERT
1881# ifdef MAPALERT_OPTION 1877# ifdef MAPALERT_OPTION
… …
1884 XMapWindow (display->display, parent[0]); 1880 XMapWindow (display->display, parent[0]);
1885# endif 1881# endif
1886 1882
1887 if (OPTION (Opt_visualBell)) 1883 if (OPTION (Opt_visualBell))
1888 { 1884 {
1889 scr_rvideo_mode (!rvideo); /* refresh also done */ 1885 rvideo_bell = true;
1886 scr_rvideo_mode (rvideo_mode);
1890 display->flush (); 1887 display->flush ();
1891 rxvt_usleep (VISUAL_BELL_DURATION); 1888
1892 scr_rvideo_mode (!rvideo); /* refresh also done */ 1889 bell_ev.start (NOW + VISUAL_BELL_DURATION);
1893 } 1890 }
1894 else 1891 else
1895 XBell (display->display, 0); 1892 XBell (display->display, 0);
1896 1893
1897#endif 1894#endif
1898} 1895}
1899 1896
1900/* ------------------------------------------------------------------------- */ 1897/* ------------------------------------------------------------------------- */
1901/* ARGSUSED */ 1898/* ARGSUSED */
1902void 1899void
1903rxvt_term::scr_printscreen (int fullhist) 1900rxvt_term::scr_printscreen (int fullhist) NOTHROW
1904{ 1901{
1905#ifdef PRINTPIPE 1902#ifdef PRINTPIPE
1906 int nrows, row_start; 1903 int nrows, row_start;
1907 FILE *fd; 1904 FILE *fd;
1908 1905
1909 if ((fd = popen_printer ()) == NULL) 1906 if ((fd = popen_printer ()) == NULL)
1910 return; 1907 return;
1911 1908
1912 if (fullhist) 1909 if (fullhist)
1913 { 1910 {
1914 nrows = nrow + nsaved; 1911 nrows = nrow - top_row;
1915 row_start = -nsaved; 1912 row_start = top_row;
1916 } 1913 }
1917 else 1914 else
1918 { 1915 {
1919 nrows = nrow; 1916 nrows = nrow;
1920 row_start = -view_start; 1917 row_start = view_start;
1921 } 1918 }
1922 1919
1923 wctomb (0, 0); 1920 wctomb (0, 0);
1924 1921
1925 for (int r1 = 0; r1 < nrows; r1++) 1922 for (int r1 = 0; r1 < nrows; r1++)
… …
1957 * Refresh the screen 1954 * Refresh the screen
1958 * drawn_text/drawn_rend contain the screen information before the update. 1955 * drawn_text/drawn_rend contain the screen information before the update.
1959 * screen.text/screen.rend contain what the screen will change to. 1956 * screen.text/screen.rend contain what the screen will change to.
1960 */ 1957 */
1961void 1958void
1962rxvt_term::scr_refresh (unsigned char refresh_type) 1959rxvt_term::scr_refresh () NOTHROW
1963{ 1960{
1964 unsigned char must_clear, /* use draw_string not draw_image_string */ 1961 unsigned char must_clear, /* use draw_string not draw_image_string */
1965 showcursor; /* show the cursor */ 1962 showcursor; /* show the cursor */
1966 int16_t col, row, /* column/row we're processing */ 1963 int16_t col, row, /* column/row we're processing */
1967 ocrow; /* old cursor row */ 1964 ocrow; /* old cursor row */
… …
2053 2050
2054 /* make sure no outline cursor is left around */ 2051 /* make sure no outline cursor is left around */
2055 setoldcursor = 0; 2052 setoldcursor = 0;
2056 if (ocrow != -1) 2053 if (ocrow != -1)
2057 { 2054 {
2058 if (screen.cur.row + view_start != ocrow 2055 if (screen.cur.row - view_start != ocrow
2059 || screen.cur.col != oldcursor.col) 2056 || screen.cur.col != oldcursor.col)
2060 { 2057 {
2061 if (ocrow < nrow 2058 if (ocrow < nrow
2062 && oldcursor.col < ncol) 2059 && oldcursor.col < ncol)
2063 drawn_buf[ocrow].r[oldcursor.col] ^= (RS_RVid | RS_Uline); 2060 drawn_buf[ocrow].r[oldcursor.col] ^= (RS_RVid | RS_Uline);
… …
2071 else if (!focus) 2068 else if (!focus)
2072 setoldcursor = 1; 2069 setoldcursor = 1;
2073 2070
2074 if (setoldcursor) 2071 if (setoldcursor)
2075 { 2072 {
2076 if (screen.cur.row + view_start >= nrow) 2073 if (screen.cur.row - view_start >= nrow)
2077 oldcursor.row = -1; 2074 oldcursor.row = -1;
2078 else 2075 else
2079 { 2076 {
2080 oldcursor.row = screen.cur.row + view_start; 2077 oldcursor.row = screen.cur.row - view_start;
2081 oldcursor.col = screen.cur.col; 2078 oldcursor.col = screen.cur.col;
2082 } 2079 }
2083 } 2080 }
2084 } 2081 }
2085 2082
… …
2091#ifndef NO_SLOW_LINK_SUPPORT 2088#ifndef NO_SLOW_LINK_SUPPORT
2092 /* 2089 /*
2093 * D: CopyArea pass - very useful for slower links 2090 * D: CopyArea pass - very useful for slower links
2094 * This has been deliberately kept simple. 2091 * This has been deliberately kept simple.
2095 */ 2092 */
2096 i = num_scr;
2097 if (!display->is_local 2093 if (!display->is_local
2098 && refresh_type == FAST_REFRESH && num_scr_allow && num_scr 2094 && refresh_type == FAST_REFRESH && num_scr_allow && num_scr
2099 && abs (num_scr) < nrow && !must_clear) 2095 && abs (num_scr) < nrow && !must_clear)
2100 { 2096 {
2101 int16_t nits; 2097 int16_t nits;
2102 int j; 2098 int j;
2103 int len, wlen; 2099 int len, wlen;
2100 dLocal (int, num_scr);
2104 2101
2105 j = nrow; 2102 j = nrow;
2106 wlen = len = -1; 2103 wlen = len = -1;
2107 row = i > 0 ? 0 : j - 1; 2104 row = i > 0 ? 0 : j - 1;
2108 for (; j-- >= 0; row += (i > 0 ? 1 : -1)) 2105 for (; j-- >= 0; row += (i > 0 ? 1 : -1))
2109 { 2106 {
2110 if (row + i >= 0 && row + i < nrow && row + i != ocrow) 2107 if (row + i >= 0 && row + i < nrow && row + i != ocrow)
2111 { 2108 {
2112 line_t s = ROW(row - view_start); 2109 line_t s = ROW(view_start + row);
2113 line_t d = drawn_buf[row]; 2110 line_t d = drawn_buf[row];
2114 line_t d2 = drawn_buf[row + i]; 2111 line_t d2 = drawn_buf[row + i];
2115 2112
2116 for (nits = 0, col = ncol; col--; ) 2113 for (nits = 0, col = ncol; col--; )
2117 if (s.t[col] != d2.t[col] || s.r[col] != d2.r[col]) 2114 if (s.t[col] != d2.t[col] || s.r[col] != d2.r[col])
… …
2155 /* 2152 /*
2156 * E: main pass across every character 2153 * E: main pass across every character
2157 */ 2154 */
2158 for (row = 0; row < nrow; row++) 2155 for (row = 0; row < nrow; row++)
2159 { 2156 {
2160 text_t *stp = ROW(row - view_start).t; 2157 text_t *stp = ROW(view_start + row).t;
2161 rend_t *srp = ROW(row - view_start).r; 2158 rend_t *srp = ROW(view_start + row).r;
2162 text_t *dtp = drawn_buf[row].t; 2159 text_t *dtp = drawn_buf[row].t;
2163 rend_t *drp = drawn_buf[row].r; 2160 rend_t *drp = drawn_buf[row].r;
2164 2161
2165 /* 2162 /*
2166 * E2: OK, now the real pass 2163 * E2: OK, now the real pass
… …
2408 num_scr = 0; 2405 num_scr = 0;
2409 num_scr_allow = 1; 2406 num_scr_allow = 1;
2410} 2407}
2411 2408
2412void 2409void
2413rxvt_term::scr_remap_chars (line_t &l) 2410rxvt_term::scr_remap_chars (line_t &l) NOTHROW
2414{ 2411{
2415 if (!l.t) 2412 if (!l.t)
2416 return; 2413 return;
2417 2414
2418 l.touch (); // maybe a bit of an overkill, but it's not performance-relevant 2415 l.touch (); // maybe a bit of an overkill, but it's not performance-relevant
… …
2420 for (int i = ncol; i--; ) 2417 for (int i = ncol; i--; )
2421 l.r[i] = SET_FONT (l.r[i], FONTSET (l.r[i])->find_font (l.t[i])); 2418 l.r[i] = SET_FONT (l.r[i], FONTSET (l.r[i])->find_font (l.t[i]));
2422} 2419}
2423 2420
2424void 2421void
2425rxvt_term::scr_remap_chars () 2422rxvt_term::scr_remap_chars () NOTHROW
2426{ 2423{
2427 for (int i = total_rows; i--; ) 2424 for (int i = total_rows; i--; )
2428 scr_remap_chars (row_buf [i]); 2425 scr_remap_chars (row_buf [i]);
2429 2426
2430 for (int i = nrow; i--; ) 2427 for (int i = nrow; i--; )
… …
2433 scr_remap_chars (swap_buf [i]); 2430 scr_remap_chars (swap_buf [i]);
2434 } 2431 }
2435} 2432}
2436 2433
2437void 2434void
2438rxvt_term::scr_recolour () 2435rxvt_term::scr_recolour () NOTHROW
2439{ 2436{
2440 if (1 2437 if (1
2441#if TRANSPARENT 2438#if TRANSPARENT
2442 && !am_transparent 2439 && !am_transparent
2443#endif 2440#endif
… …
2464 want_refresh = 1; 2461 want_refresh = 1;
2465} 2462}
2466 2463
2467/* ------------------------------------------------------------------------- */ 2464/* ------------------------------------------------------------------------- */
2468void 2465void
2469rxvt_term::scr_clear (bool really) 2466rxvt_term::scr_clear (bool really) NOTHROW
2470{ 2467{
2471 if (!mapped) 2468 if (!mapped)
2472 return; 2469 return;
2473 2470
2474 num_scr_allow = 0; 2471 num_scr_allow = 0;
… …
2477 if (really) 2474 if (really)
2478 XClearWindow (display->display, vt); 2475 XClearWindow (display->display, vt);
2479} 2476}
2480 2477
2481void 2478void
2482rxvt_term::scr_xor_rect (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle1, rend_t rstyle2) 2479rxvt_term::scr_xor_rect (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle1, rend_t rstyle2) NOTHROW
2483{ 2480{
2484 int view_end = -view_start + nrow; 2481 int view_end = view_start + nrow;
2485 int row, col; 2482 int row, col;
2486 2483
2487 for (row = max (beg_row, -view_start); row <= min (end_row, view_end); row++) 2484 for (row = max (beg_row, view_start); row <= min (end_row, view_end); row++)
2488 { 2485 {
2489 text_t *stp = ROW(row).t; 2486 text_t *stp = ROW(row).t;
2490 rend_t *srp = ROW(row).r; 2487 rend_t *srp = ROW(row).r;
2491 2488
2492 for (col = beg_col; col < end_col; col++) 2489 for (col = beg_col; col < end_col; col++)
… …
2499 srp[col] ^= rstyle2; 2496 srp[col] ^= rstyle2;
2500 } 2497 }
2501} 2498}
2502 2499
2503void 2500void
2504rxvt_term::scr_xor_span (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle) 2501rxvt_term::scr_xor_span (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle) NOTHROW
2505{ 2502{
2506 int view_end = -view_start + nrow; 2503 int view_end = view_start + nrow;
2507 int row, col; 2504 int row, col;
2508 2505
2509 if (beg_row >= -view_start) 2506 if (beg_row >= view_start)
2510 { 2507 {
2511 col = beg_col; 2508 col = beg_col;
2512 row = beg_row; 2509 row = beg_row;
2513 } 2510 }
2514 else 2511 else
2515 { 2512 {
2516 col = 0; 2513 col = 0;
2517 row = -view_start; 2514 row = view_start;
2518 } 2515 }
2519 2516
2520 for (; row < min (end_row, view_end); row++, col = 0) 2517 for (; row < min (end_row, view_end); row++, col = 0)
2521 for (rend_t *srp = ROW(row).r; col < ncol; col++) 2518 for (rend_t *srp = ROW(row).r; col < ncol; col++)
2522 srp[col] ^= rstyle; 2519 srp[col] ^= rstyle;
… …
2526 srp[col] ^= rstyle; 2523 srp[col] ^= rstyle;
2527} 2524}
2528 2525
2529/* ------------------------------------------------------------------------- */ 2526/* ------------------------------------------------------------------------- */
2530void 2527void
2531rxvt_term::scr_reverse_selection () 2528rxvt_term::scr_reverse_selection () NOTHROW
2532{ 2529{
2533 if (selection.op 2530 if (selection.op
2534 && current_screen == selection.screen 2531 && current_screen == selection.screen
2535 && selection.end.row >= -view_start) 2532 && selection.end.row >= view_start)
2536 { 2533 {
2537#if ENABLE_FRILLS 2534#if ENABLE_FRILLS
2538 if (selection.rect) 2535 if (selection.rect)
2539 scr_xor_rect (selection.beg.row, selection.beg.col, 2536 scr_xor_rect (selection.beg.row, selection.beg.col,
2540 selection.end.row, selection.end.col, 2537 selection.end.row, selection.end.col,
… …
2552 * Dump the whole scrollback and screen to the passed filedescriptor. The 2549 * Dump the whole scrollback and screen to the passed filedescriptor. The
2553 * invoking routine must close the fd. 2550 * invoking routine must close the fd.
2554 */ 2551 */
2555#if 0 2552#if 0
2556void 2553void
2557rxvt_term::scr_dump (int fd) 2554rxvt_term::scr_dump (int fd) NOTHROW
2558{ 2555{
2559 int row, wrote; 2556 int row, wrote;
2560 unsigned int width, towrite; 2557 unsigned int width, towrite;
2561 char r1[] = "\n"; 2558 char r1[] = "\n";
2562 2559
… …
2581 2578
2582/* ------------------------------------------------------------------------- * 2579/* ------------------------------------------------------------------------- *
2583 * CHARACTER SELECTION * 2580 * CHARACTER SELECTION *
2584 * ------------------------------------------------------------------------- */ 2581 * ------------------------------------------------------------------------- */
2585void 2582void
2586rxvt_term::selection_check (int check_more) 2583rxvt_term::selection_check (int check_more) NOTHROW
2587{ 2584{
2588 row_col_t pos; 2585 row_col_t pos;
2589 2586
2590 if (!selection.op) 2587 if (!selection.op)
2591 return; 2588 return;
2592 2589
2593 pos.row = pos.col = 0; 2590 pos.row = pos.col = 0;
2594 if (!IN_RANGE_EXC (selection.beg.row, -nsaved, nrow) 2591 if (!IN_RANGE_EXC (selection.beg.row, top_row, nrow)
2595 || !IN_RANGE_EXC (selection.mark.row, -nsaved, nrow) 2592 || !IN_RANGE_EXC (selection.mark.row, top_row, nrow)
2596 || !IN_RANGE_EXC (selection.end.row, -nsaved, nrow) 2593 || !IN_RANGE_EXC (selection.end.row, top_row, nrow)
2597 || (check_more == 1 2594 || (check_more == 1
2598 && current_screen == selection.screen 2595 && current_screen == selection.screen
2599 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) 2596 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
2600 && ROWCOL_IS_BEFORE (screen.cur, selection.end)) 2597 && ROWCOL_IS_BEFORE (screen.cur, selection.end))
2601 || (check_more == 2 2598 || (check_more == 2
… …
2612/* ------------------------------------------------------------------------- */ 2609/* ------------------------------------------------------------------------- */
2613/* 2610/*
2614 * Paste a selection direct to the command fd 2611 * Paste a selection direct to the command fd
2615 */ 2612 */
2616void 2613void
2617rxvt_term::paste (char *data, unsigned int len) 2614rxvt_term::paste (char *data, unsigned int len) NOTHROW
2618{ 2615{
2619 /* convert normal newline chars into common keyboard Return key sequence */ 2616 /* convert normal newline chars into common keyboard Return key sequence */
2620 for (unsigned int i = 0; i < len; i++) 2617 for (unsigned int i = 0; i < len; i++)
2621 if (data[i] == C0_LF) 2618 if (data[i] == C0_LF)
2622 data[i] = C0_CR; 2619 data[i] = C0_CR;
… …
2628/* 2625/*
2629 * Respond to a notification that a primary selection has been sent 2626 * Respond to a notification that a primary selection has been sent
2630 * EXT: SelectionNotify 2627 * EXT: SelectionNotify
2631 */ 2628 */
2632void 2629void
2633rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop) 2630rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop) NOTHROW
2634{ 2631{
2635 if (prop == None) /* check for failed XConvertSelection */ 2632 if (prop == None) /* check for failed XConvertSelection */
2636 { 2633 {
2637 if ((selection_type & Sel_CompoundText)) 2634 if ((selection_type & Sel_CompoundText))
2638 { 2635 {
… …
2790 if (selection_wait == Sel_normal) 2787 if (selection_wait == Sel_normal)
2791 selection_wait = Sel_none; 2788 selection_wait = Sel_none;
2792} 2789}
2793 2790
2794void 2791void
2795rxvt_term::incr_cb (time_watcher &w) 2792rxvt_term::incr_cb (time_watcher &w) NOTHROW
2796{ 2793{
2797 selection_wait = Sel_none; 2794 selection_wait = Sel_none;
2798 2795
2799 incr_buf_size = 0; 2796 incr_buf_size = 0;
2800 free (incr_buf); 2797 free (incr_buf);
2801 2798
2802 rxvt_warn ("data loss: timeout on INCR selection paste, ignoring.\n"); 2799 rxvt_warn ("data loss: timeout on INCR selection paste, ignoring.\n");
2803} 2800}
2804 2801
2805void 2802void
2806rxvt_term::selection_property (Window win, Atom prop) 2803rxvt_term::selection_property (Window win, Atom prop) NOTHROW
2807{ 2804{
2808 if (prop == None || selection_wait != Sel_incr) 2805 if (prop == None || selection_wait != Sel_incr)
2809 return; 2806 return;
2810 2807
2811 selection_paste (win, prop, true); 2808 selection_paste (win, prop, true);
… …
2820 * (+) if ownership is claimed but property is empty, rxvt_selection_paste () 2817 * (+) if ownership is claimed but property is empty, rxvt_selection_paste ()
2821 * will auto fallback to CUT_BUFFER0 2818 * will auto fallback to CUT_BUFFER0
2822 * EXT: button 2 release 2819 * EXT: button 2 release
2823 */ 2820 */
2824void 2821void
2825rxvt_term::selection_request (Time tm, int x, int y) 2822rxvt_term::selection_request (Time tm, int selnum) NOTHROW
2826{ 2823{
2827 if (x < 0 || x >= width || y < 0 || y >= height) 2824 if (selection.text && selnum == Sel_Primary)
2828 return; /* outside window */
2829
2830 if (selection.text)
2831 { /* internal selection */ 2825 { /* internal selection */
2832 char *str = rxvt_wcstombs (selection.text, selection.len); 2826 char *str = rxvt_wcstombs (selection.text, selection.len);
2833 paste (str, strlen (str)); 2827 paste (str, strlen (str));
2834 free (str); 2828 free (str);
2835 return; 2829 return;
2836 } 2830 }
2837 else 2831 else
2838 { 2832 {
2839 int i;
2840
2841 selection_request_time = tm; 2833 selection_request_time = tm;
2842 selection_wait = Sel_normal; 2834 selection_wait = Sel_normal;
2843 2835
2844 for (i = Sel_Primary; i <= Sel_Clipboard; i++)
2845 {
2846#if X_HAVE_UTF8_STRING 2836#if X_HAVE_UTF8_STRING
2847 selection_type = Sel_UTF8String; 2837 selection_type = Sel_UTF8String;
2848 if (selection_request_other (xa[XA_UTF8_STRING], i)) 2838 if (selection_request_other (xa[XA_UTF8_STRING], selnum))
2849 return; 2839 return;
2850#else 2840#else
2851 selection_type = Sel_CompoundText; 2841 selection_type = Sel_CompoundText;
2852 if (selection_request_other (xa[XA_COMPOUND_TEXT], i)) 2842 if (selection_request_other (xa[XA_COMPOUND_TEXT], selnum))
2853 return; 2843 return;
2854#endif 2844#endif
2855 }
2856 } 2845 }
2857 2846
2858 selection_wait = Sel_none; /* don't loop in selection_paste () */ 2847 selection_wait = Sel_none; /* don't loop in selection_paste () */
2859 selection_paste (display->root, XA_CUT_BUFFER0, false); 2848 selection_paste (display->root, XA_CUT_BUFFER0, false);
2860} 2849}
2861 2850
2862int 2851int
2863rxvt_term::selection_request_other (Atom target, int selnum) 2852rxvt_term::selection_request_other (Atom target, int selnum) NOTHROW
2864{ 2853{
2865 Atom sel; 2854 Atom sel;
2866 2855
2867 selection_type |= selnum; 2856 selection_type |= selnum;
2868 2857
… …
2887/* 2876/*
2888 * Clear all selected text 2877 * Clear all selected text
2889 * EXT: SelectionClear 2878 * EXT: SelectionClear
2890 */ 2879 */
2891void 2880void
2892rxvt_term::selection_clear () 2881rxvt_term::selection_clear () NOTHROW
2893{ 2882{
2894 want_refresh = 1; 2883 want_refresh = 1;
2895 free (selection.text); 2884 free (selection.text);
2896 selection.text = NULL; 2885 selection.text = NULL;
2897 selection.len = 0; 2886 selection.len = 0;
… …
3032 3021
3033 selection_grab (tm); 3022 selection_grab (tm);
3034} 3023}
3035 3024
3036bool 3025bool
3037rxvt_term::selection_grab (Time tm) 3026rxvt_term::selection_grab (Time tm) NOTHROW
3038{ 3027{
3039 selection_time = tm; 3028 selection_time = tm;
3040 3029
3041 XSetSelectionOwner (display->display, XA_PRIMARY, vt, tm); 3030 XSetSelectionOwner (display->display, XA_PRIMARY, vt, tm);
3042 if (XGetSelectionOwner (display->display, XA_PRIMARY) == vt) 3031 if (XGetSelectionOwner (display->display, XA_PRIMARY) == vt)
… …
3065/* 3054/*
3066 * Mark or select text based upon number of clicks: 1, 2, or 3 3055 * Mark or select text based upon number of clicks: 1, 2, or 3
3067 * EXT: button 1 press 3056 * EXT: button 1 press
3068 */ 3057 */
3069void 3058void
3070rxvt_term::selection_click (int clicks, int x, int y) 3059rxvt_term::selection_click (int clicks, int x, int y) NOTHROW
3071{ 3060{
3072 clicks = ((clicks - 1) % 3) + 1; 3061 clicks = ((clicks - 1) % 3) + 1;
3073 selection.clicks = clicks; /* save clicks so extend will work */ 3062 selection.clicks = clicks; /* save clicks so extend will work */
3074 3063
3075 if (clicks == 2 && !selection.rect 3064 if (clicks == 2 && !selection.rect
… …
3083 3072
3084 selection_start_colrow (Pixel2Col (x), Pixel2Row (y)); 3073 selection_start_colrow (Pixel2Col (x), Pixel2Row (y));
3085 3074
3086 if (clicks == 2 || clicks == 3) 3075 if (clicks == 2 || clicks == 3)
3087 selection_extend_colrow (selection.mark.col, 3076 selection_extend_colrow (selection.mark.col,
3088 selection.mark.row + view_start, 3077 selection.mark.row - view_start,
3089 0, /* button 3 */ 3078 0, /* button 3 */
3090 1, /* button press */ 3079 1, /* button press */
3091 0); /* click change */ 3080 0); /* click change */
3092} 3081}
3093 3082
3094/* ------------------------------------------------------------------------- */ 3083/* ------------------------------------------------------------------------- */
3095/* 3084/*
3096 * Mark a selection at the specified col/row 3085 * Mark a selection at the specified col/row
3097 */ 3086 */
3098void 3087void
3099rxvt_term::selection_start_colrow (int col, int row) 3088rxvt_term::selection_start_colrow (int col, int row) NOTHROW
3100{ 3089{
3101 want_refresh = 1; 3090 want_refresh = 1;
3102 3091
3103 selection.mark.row = row - view_start; 3092 selection.mark.row = row + view_start;
3104 selection.mark.col = col; 3093 selection.mark.col = col;
3105 3094
3106 selection.mark.row = clamp (selection.mark.row, -nsaved, nrow - 1); 3095 selection.mark.row = clamp (selection.mark.row, top_row, nrow - 1);
3107 selection.mark.col = clamp (selection.mark.col, 0, ncol - 1); 3096 selection.mark.col = clamp (selection.mark.col, 0, ncol - 1);
3108 3097
3109 while (selection.mark.col > 0 3098 while (selection.mark.col > 0
3110 && ROW(selection.mark.row).t[selection.mark.col] == NOCHAR) 3099 && ROW(selection.mark.row).t[selection.mark.col] == NOCHAR)
3111 --selection.mark.col; 3100 --selection.mark.col;
… …
3130#define DELIMIT_TEXT(x) \ 3119#define DELIMIT_TEXT(x) \
3131 (unicode::is_space (x) ? 2 : (x) <= 0xff && !!strchr (rs[Rs_cutchars], (x))) 3120 (unicode::is_space (x) ? 2 : (x) <= 0xff && !!strchr (rs[Rs_cutchars], (x)))
3132#define DELIMIT_REND(x) 1 3121#define DELIMIT_REND(x) 1
3133 3122
3134void 3123void
3135rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) 3124rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) NOTHROW
3136{ 3125{
3137 int col, row, dirnadd, tcol, trow, w1, w2; 3126 int col, row, dirnadd, tcol, trow, w1, w2;
3138 row_col_t bound; 3127 row_col_t bound;
3139 text_t *stp; 3128 text_t *stp;
3140 rend_t *srp; 3129 rend_t *srp;
3141 3130
3142 if (dirn == UP) 3131 if (dirn == UP)
3143 { 3132 {
3144 bound.row = - nsaved - 1; 3133 bound.row = top_row - 1;
3145 bound.col = 0; 3134 bound.col = 0;
3146 dirnadd = -1; 3135 dirnadd = -1;
3147 } 3136 }
3148 else 3137 else
3149 { 3138 {
… …
3214 * flag == 0 ==> button 1 3203 * flag == 0 ==> button 1
3215 * flag == 1 ==> button 3 press 3204 * flag == 1 ==> button 3 press
3216 * flag == 2 ==> button 3 motion 3205 * flag == 2 ==> button 3 motion
3217 */ 3206 */
3218void 3207void
3219rxvt_term::selection_extend (int x, int y, int flag) 3208rxvt_term::selection_extend (int x, int y, int flag) NOTHROW
3220{ 3209{
3221 int col = clamp (Pixel2Col (x), 0, ncol); 3210 int col = clamp (Pixel2Col (x), 0, ncol);
3222 int row = clamp (Pixel2Row (y), 0, nrow - 1); 3211 int row = clamp (Pixel2Row (y), 0, nrow - 1);
3223 3212
3224 /* 3213 /*
… …
3227 * select nothing. Otherwise, if we're to the right of the mark, you have to 3216 * select nothing. Otherwise, if we're to the right of the mark, you have to
3228 * be _past_ a character for it to be selected. 3217 * be _past_ a character for it to be selected.
3229 */ 3218 */
3230 if (((selection.clicks % 3) == 1) && !flag 3219 if (((selection.clicks % 3) == 1) && !flag
3231 && (col == selection.mark.col 3220 && (col == selection.mark.col
3232 && (row == selection.mark.row + view_start))) 3221 && (row == selection.mark.row - view_start)))
3233 { 3222 {
3234 /* select nothing */ 3223 /* select nothing */
3235 selection.beg.row = selection.end.row = 0; 3224 selection.beg.row = selection.end.row = 0;
3236 selection.beg.col = selection.end.col = 0; 3225 selection.beg.col = selection.end.col = 0;
3237 selection.clicks = 4; 3226 selection.clicks = 4;
… …
3250/* ------------------------------------------------------------------------- */ 3239/* ------------------------------------------------------------------------- */
3251/* 3240/*
3252 * Extend the selection to the specified col/row 3241 * Extend the selection to the specified col/row
3253 */ 3242 */
3254void 3243void
3255rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) 3244rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) NOTHROW
3256{ 3245{
3257 row_col_t pos; 3246 row_col_t pos;
3258 enum { 3247 enum {
3259 LEFT, RIGHT 3248 LEFT, RIGHT
3260 } closeto = RIGHT; 3249 } closeto = RIGHT;
… …
3292 selection.beg.col = selection.end.col = selection.mark.col; 3281 selection.beg.col = selection.end.col = selection.mark.col;
3293 selection.beg.row = selection.end.row = selection.mark.row; 3282 selection.beg.row = selection.end.row = selection.mark.row;
3294 } 3283 }
3295 3284
3296 pos.col = col; 3285 pos.col = col;
3297 pos.row = row - view_start; 3286 pos.row = view_start + row;
3298 3287
3299 /* 3288 /*
3300 * This is mainly xterm style selection with a couple of differences, mainly 3289 * This is mainly xterm style selection with a couple of differences, mainly
3301 * in the way button3 drag extension works. 3290 * in the way button3 drag extension works.
3302 * We're either doing: button1 drag; button3 press; or button3 drag 3291 * We're either doing: button1 drag; button3 press; or button3 drag
… …
3446#endif 3435#endif
3447} 3436}
3448 3437
3449#if ENABLE_FRILLS 3438#if ENABLE_FRILLS
3450void 3439void
3451rxvt_term::selection_remove_trailing_spaces () 3440rxvt_term::selection_remove_trailing_spaces () NOTHROW
3452{ 3441{
3453 int32_t end_col, end_row; 3442 int32_t end_col, end_row;
3454 text_t *stp; 3443 text_t *stp;
3455 3444
3456 end_col = selection.end.col; 3445 end_col = selection.end.col;
… …
3494/* 3483/*
3495 * Double click on button 3 when already selected 3484 * Double click on button 3 when already selected
3496 * EXT: button 3 double click 3485 * EXT: button 3 double click
3497 */ 3486 */
3498void 3487void
3499rxvt_term::selection_rotate (int x, int y) 3488rxvt_term::selection_rotate (int x, int y) NOTHROW
3500{ 3489{
3501 selection.clicks = selection.clicks % 3 + 1; 3490 selection.clicks = selection.clicks % 3 + 1;
3502 selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1); 3491 selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1);
3503} 3492}
3504 3493
… …
3506/* 3495/*
3507 * Respond to a request for our current selection 3496 * Respond to a request for our current selection
3508 * EXT: SelectionRequest 3497 * EXT: SelectionRequest
3509 */ 3498 */
3510void 3499void
3511rxvt_term::selection_send (const XSelectionRequestEvent &rq) 3500rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW
3512{ 3501{
3513 XSelectionEvent ev; 3502 XSelectionEvent ev;
3514 dDisp; 3503 dDisp;
3515 3504
3516 ev.type = SelectionNotify; 3505 ev.type = SelectionNotify;
… …
3644 3633
3645/* 3634/*
3646 * return col/row values corresponding to x/y pixel values 3635 * return col/row values corresponding to x/y pixel values
3647 */ 3636 */
3648void 3637void
3649rxvt_term::pixel_position (int *x, int *y) 3638rxvt_term::pixel_position (int *x, int *y) NOTHROW
3650{ 3639{
3651 *x = Pixel2Col (*x); 3640 *x = Pixel2Col (*x);
3652 /* max_it (*x, 0); min_it (*x, (int)ncol - 1); */ 3641 /* max_it (*x, 0); min_it (*x, (int)ncol - 1); */
3653 *y = Pixel2Row (*y); 3642 *y = Pixel2Row (*y);
3654 /* max_it (*y, 0); min_it (*y, (int)nrow - 1); */ 3643 /* max_it (*y, 0); min_it (*y, (int)nrow - 1); */
3655} 3644}
3656 3645
3657/* ------------------------------------------------------------------------- */ 3646/* ------------------------------------------------------------------------- */
3658#ifdef USE_XIM 3647#ifdef USE_XIM
3659void 3648void
3660rxvt_term::im_set_position (XPoint &pos) 3649rxvt_term::im_set_position (XPoint &pos) NOTHROW
3661{ 3650{
3662 XWindowAttributes xwa; 3651 XWindowAttributes xwa;
3663 3652
3664 XGetWindowAttributes (display->display, vt, &xwa); 3653 XGetWindowAttributes (display->display, vt, &xwa);
3665 3654
… …
3668} 3657}
3669#endif 3658#endif
3670 3659
3671#if ENABLE_OVERLAY 3660#if ENABLE_OVERLAY
3672void 3661void
3673rxvt_term::scr_overlay_new (int x, int y, int w, int h) 3662rxvt_term::scr_overlay_new (int x, int y, int w, int h) NOTHROW
3674{ 3663{
3675 if (nrow < 1 || ncol < 1) 3664 if (nrow < 1 || ncol < 1)
3676 return; 3665 return;
3677 3666
3678 want_refresh = 1; 3667 want_refresh = 1;
… …
3723 *rp = r; 3712 *rp = r;
3724 } 3713 }
3725} 3714}
3726 3715
3727void 3716void
3728rxvt_term::scr_overlay_off () 3717rxvt_term::scr_overlay_off () NOTHROW
3729{ 3718{
3730 if (!ov_text) 3719 if (!ov_text)
3731 return; 3720 return;
3732 3721
3733 want_refresh = 1; 3722 want_refresh = 1;
… …
3741 delete [] ov_text; ov_text = 0; 3730 delete [] ov_text; ov_text = 0;
3742 delete [] ov_rend; ov_rend = 0; 3731 delete [] ov_rend; ov_rend = 0;
3743} 3732}
3744 3733
3745void 3734void
3746rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) 3735rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) NOTHROW
3747{ 3736{
3748 if (!ov_text || x >= ov_w - 2 || y >= ov_h - 2) 3737 if (!ov_text || x >= ov_w - 2 || y >= ov_h - 2)
3749 return; 3738 return;
3750 3739
3751 x++, y++; 3740 x++, y++;
… …
3753 ov_text[y][x] = text; 3742 ov_text[y][x] = text;
3754 ov_rend[y][x] = rend; 3743 ov_rend[y][x] = rend;
3755} 3744}
3756 3745
3757void 3746void
3758rxvt_term::scr_overlay_set (int x, int y, const char *s) 3747rxvt_term::scr_overlay_set (int x, int y, const char *s) NOTHROW
3759{ 3748{
3760 while (*s) 3749 while (*s)
3761 scr_overlay_set (x++, y, *s++); 3750 scr_overlay_set (x++, y, *s++);
3762} 3751}
3763 3752
3764void 3753void
3765rxvt_term::scr_overlay_set (int x, int y, const wchar_t *s) 3754rxvt_term::scr_overlay_set (int x, int y, const wchar_t *s) NOTHROW
3766{ 3755{
3767 while (*s) 3756 while (*s)
3768 { 3757 {
3769 text_t t = *s++; 3758 text_t t = *s++;
3770 int width = wcwidth (t); 3759 int width = wcwidth (t);
… …
3776 } 3765 }
3777 } 3766 }
3778} 3767}
3779 3768
3780void 3769void
3781rxvt_term::scr_swap_overlay () 3770rxvt_term::scr_swap_overlay () NOTHROW
3782{ 3771{
3783 if (!ov_text) 3772 if (!ov_text)
3784 return; 3773 return;
3785 3774
3786 // swap screen mem with overlay 3775 // swap screen mem with overlay
3787 for (int y = ov_h; y--; ) 3776 for (int y = ov_h; y--; )
3788 { 3777 {
3789 text_t *t1 = ov_text[y]; 3778 text_t *t1 = ov_text[y];
3790 rend_t *r1 = ov_rend[y]; 3779 rend_t *r1 = ov_rend[y];
3791 3780
3792 text_t *t2 = ROW(y + ov_y - view_start).t + ov_x; 3781 text_t *t2 = ROW(y + ov_y + view_start).t + ov_x;
3793 rend_t *r2 = ROW(y + ov_y - view_start).r + ov_x; 3782 rend_t *r2 = ROW(y + ov_y + view_start).r + ov_x;
3794 3783
3795 for (int x = ov_w; x--; ) 3784 for (int x = ov_w; x--; )
3796 { 3785 {
3797 text_t t = *t1; *t1++ = *t2; *t2++ = t; 3786 text_t t = *t1; *t1++ = *t2; *t2++ = t;
3798 rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t)); 3787 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