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.212 by root, Fri Jan 6 05:37:59 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
151 l.l = 0;
152 l.f = 0;
150} 153}
151 154
152/* ------------------------------------------------------------------------- * 155/* ------------------------------------------------------------------------- *
153 * SCREEN INITIALISATION * 156 * SCREEN INITIALISATION *
154 * ------------------------------------------------------------------------- */ 157 * ------------------------------------------------------------------------- */
176 if (nrow + saveLines < 2) 179 if (nrow + saveLines < 2)
177 { 180 {
178 //TODO//FIXME 181 //TODO//FIXME
179 saveLines++; 182 saveLines++;
180 prev_nrow--; 183 prev_nrow--;
181 nsaved++; 184 top_row--;
182 } 185 }
183 186
184 want_refresh = 1; 187 want_refresh = 1;
185 188
186 int prev_total_rows = prev_nrow + saveLines; 189 int prev_total_rows = prev_nrow + saveLines;
191 194
192 if (!row_buf) 195 if (!row_buf)
193 { 196 {
194 /* 197 /*
195 * 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
196 * Note: this is still needed so that all the scrollback lines are NULL
197 */ 199 */
198 nsaved = 0; /* no saved lines */ 200 top_row = 0; /* no saved lines */
199 term_start = 0; 201 term_start = 0;
200 202
201 talloc = new rxvt_salloc (ncol * sizeof (text_t)); 203 talloc = new rxvt_salloc (ncol * sizeof (text_t));
202 ralloc = new rxvt_salloc (ncol * sizeof (rend_t)); 204 ralloc = new rxvt_salloc (ncol * sizeof (rend_t));
203 205
204 row_buf = (line_t *)rxvt_calloc (total_rows, sizeof (line_t)); 206 row_buf = (line_t *)rxvt_calloc (total_rows + nrow, sizeof (line_t));
205 temp_buf = (line_t *)rxvt_calloc (total_rows, sizeof (line_t));
206 drawn_buf = (line_t *)rxvt_calloc (nrow , sizeof (line_t)); 207 drawn_buf = (line_t *)rxvt_calloc (nrow , sizeof (line_t));
207 swap_buf = (line_t *)rxvt_calloc (nrow , sizeof (line_t)); 208 swap_buf = (line_t *)rxvt_calloc (nrow , sizeof (line_t));
208 209
209 for (int row = nrow; row--; ) 210 for (int row = nrow; row--; )
210 { 211 {
211 scr_blank_screen_mem (ROW (row), DEFAULT_RSTYLE); 212 scr_blank_screen_mem (ROW (row), DEFAULT_RSTYLE);
212 scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE); 213 scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE);
233 selection.text = NULL; 234 selection.text = NULL;
234 selection.len = 0; 235 selection.len = 0;
235 selection.op = SELECTION_CLEAR; 236 selection.op = SELECTION_CLEAR;
236 selection.screen = PRIMARY; 237 selection.screen = PRIMARY;
237 selection.clicks = 0; 238 selection.clicks = 0;
238 CLEAR_ALL_SELECTION (); 239 rvideo_state = rvideo_mode = false;
239 rvideo = 0;
240 } 240 }
241 else 241 else
242 { 242 {
243 /* 243 /*
244 * add or delete rows as appropriate 244 * add or delete rows as appropriate
257 } 257 }
258 } 258 }
259#endif 259#endif
260 260
261 drawn_buf = (line_t *)rxvt_realloc (drawn_buf, nrow * sizeof (line_t)); 261 drawn_buf = (line_t *)rxvt_realloc (drawn_buf, nrow * sizeof (line_t));
262 temp_buf = (line_t *)rxvt_realloc (temp_buf , nrow * sizeof (line_t));
263 swap_buf = (line_t *)rxvt_realloc (swap_buf , nrow * sizeof (line_t)); 262 swap_buf = (line_t *)rxvt_realloc (swap_buf , nrow * sizeof (line_t));
264 263
265 for (int row = min (nrow, prev_nrow); row--; ) 264 for (int row = min (nrow, prev_nrow); row--; )
266 { 265 {
267 lresize (drawn_buf[row]); 266 lresize (drawn_buf[row]);
272 { 271 {
273 swap_buf [row].clear (); scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE); 272 swap_buf [row].clear (); scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE);
274 drawn_buf[row].clear (); scr_blank_screen_mem (drawn_buf[row], DEFAULT_RSTYLE); 273 drawn_buf[row].clear (); scr_blank_screen_mem (drawn_buf[row], DEFAULT_RSTYLE);
275 } 274 }
276 275
276 line_t *old_buf = row_buf;
277 line_t *old_buf = row_buf; row_buf = (line_t *)rxvt_calloc (total_rows, sizeof (line_t)); 277 row_buf = (line_t *)rxvt_calloc (total_rows + nrow, sizeof (line_t));
278 278
279 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
280 int pend = MOD (term_start - nsaved , prev_total_rows); 280 int pend = MOD (term_start + top_row , prev_total_rows);
281 int q = total_rows; // rewrapped row 281 int q = total_rows; // rewrapped row
282 282
283 if (nsaved) 283 if (top_row)
284 { 284 {
285 // 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
286 // to come up with a lean and mean algorithm. 286 // to come up with a lean and mean algorithm.
287 287
288 row_col_t ocur = screen.cur; 288 row_col_t ocur = screen.cur;
324 qline->l = ncol; 324 qline->l = ncol;
325 qline->is_longer (1); 325 qline->is_longer (1);
326 326
327 int qcol = 0; 327 int qcol = 0;
328 328
329 // see below for cursor adjustment rationale
330 if (p == ocur.row)
331 screen.cur.row = q - (total_rows - nrow);
332
329 // fill a single destination line 333 // fill a single destination line
330 while (lofs < llen && qcol < ncol) 334 while (lofs < llen && qcol < ncol)
331 { 335 {
332 int prow = lofs / prev_ncol; 336 int prow = lofs / prev_ncol;
333 int pcol = lofs % prev_ncol; 337 int pcol = lofs % prev_ncol;
343 347
344 line_t &pline = old_buf [prow]; 348 line_t &pline = old_buf [prow];
345 349
346 int len = min (min (prev_ncol - pcol, ncol - qcol), llen - lofs); 350 int len = min (min (prev_ncol - pcol, ncol - qcol), llen - lofs);
347 351
352#if DEBUG_STRICT
348 assert (len); 353 assert (len);
349 assert (pline.t); 354 assert (pline.t);
355#endif
350 356
351 memcpy (qline->t + qcol, pline.t + pcol, len * sizeof (text_t)); 357 memcpy (qline->t + qcol, pline.t + pcol, len * sizeof (text_t));
352 memcpy (qline->r + qcol, pline.r + pcol, len * sizeof (rend_t)); 358 memcpy (qline->r + qcol, pline.r + pcol, len * sizeof (rend_t));
353 359
354 lofs += len; 360 lofs += len;
361 scr_blank_line (*qline, qline->l, ncol - qline->l, DEFAULT_RSTYLE); 367 scr_blank_line (*qline, qline->l, ncol - qline->l, DEFAULT_RSTYLE);
362 } 368 }
363 while (p != pend && q > 0); 369 while (p != pend && q > 0);
364 370
365 term_start = total_rows - nrow; 371 term_start = total_rows - nrow;
366 nsaved = term_start - q; 372 top_row = q - term_start;
367 373
368 // make sure all terminal lines exist 374 // make sure all terminal lines exist
369 while (nsaved < 0) 375 while (top_row > 0)
370 scr_blank_screen_mem (ROW (-++nsaved), DEFAULT_RSTYLE); 376 scr_blank_screen_mem (ROW (--top_row), DEFAULT_RSTYLE);
371 } 377 }
372 else 378 else
373 { 379 {
374 // if no scrollback exists (yet), wing, instead of wrap 380 // if no scrollback exists (yet), wing, instead of wrap
375 381
388 } 394 }
389 395
390 term_start = 0; 396 term_start = 0;
391 } 397 }
392 398
393#ifdef DEBUG_STRICT //TODO: remove
394 for (int i = -nsaved; i < nrow; i++)
395 assert (ROW (i).t);
396#endif
397
398 free (old_buf); 399 free (old_buf);
399 delete old_ta; 400 delete old_ta;
400 delete old_ra; 401 delete old_ra;
401 402
402 clamp_it (screen.cur.row, 0, nrow - 1); 403 clamp_it (screen.cur.row, 0, nrow - 1);
404 405
405 if (tabs) 406 if (tabs)
406 free (tabs); 407 free (tabs);
407 } 408 }
408 409
410 CLEAR_ALL_SELECTION ();
411
409 prev_nrow = nrow; 412 prev_nrow = nrow;
410 prev_ncol = ncol; 413 prev_ncol = ncol;
411 414
412 tabs = (char *)rxvt_malloc (ncol * sizeof (char)); 415 tabs = (char *)rxvt_malloc (ncol * sizeof (char));
413 416
422/* ------------------------------------------------------------------------- */ 425/* ------------------------------------------------------------------------- */
423/* 426/*
424 * Free everything. That way malloc debugging can find leakage. 427 * Free everything. That way malloc debugging can find leakage.
425 */ 428 */
426void 429void
427rxvt_term::scr_release () 430rxvt_term::scr_release () NOTHROW
428{ 431{
429 delete talloc; talloc = 0; 432 delete talloc; talloc = 0;
430 delete ralloc; ralloc = 0; 433 delete ralloc; ralloc = 0;
431 434
432 free (row_buf); 435 free (row_buf);
433 free (swap_buf); 436 free (swap_buf);
434 free (drawn_buf); 437 free (drawn_buf);
435 free (temp_buf);
436 free (tabs); 438 free (tabs);
437 439
438 row_buf = 0; // signal that we freed all the arrays 440 row_buf = 0; // signal that we freed all the arrays
439} 441}
440 442
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 (color > 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 ROW(row2 - i).l = 0;
645 scr_blank_screen_mem (ROW(row2 - i), rstyle);
646 }
647
648 if (OPTION (Opt_scrollWithBuffer) 676 if (OPTION (Opt_scrollWithBuffer)
649 && view_start != 0 677 && view_start != 0
650 && view_start != saveLines) 678 && view_start != -saveLines)
651 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));
652 } 683 }
653 else 684 else
654 { 685 {
655 if (selection.op && current_screen == selection.screen) 686 if (selection.op && current_screen == selection.screen)
656 { 687 {
680 711
681 int rows = row2 - row1 + 1; 712 int rows = row2 - row1 + 1;
682 713
683 min_it (count, rows); 714 min_it (count, rows);
684 715
716 line_t *temp_buf = row_buf + total_rows;
717
685 for (int row = 0; row < rows; row++) 718 for (int row = 0; row < rows; row++)
686 { 719 {
687 temp_buf [row] = ROW(row1 + (row + count + rows) % rows); 720 temp_buf [row] = ROW(row1 + (row + count + rows) % rows);
688 721
689 if (!IN_RANGE_EXC (row + count, 0, rows)) 722 if (!IN_RANGE_EXC (row + count, 0, rows))
700/* ------------------------------------------------------------------------- */ 733/* ------------------------------------------------------------------------- */
701/* 734/*
702 * Add text given in <str> of length <len> to screen struct 735 * Add text given in <str> of length <len> to screen struct
703 */ 736 */
704void 737void
705rxvt_term::scr_add_lines (const unicode_t *str, int nlines, int len) 738rxvt_term::scr_add_lines (const wchar_t *str, int len, int minlines) NOTHROW
706{ 739{
707 if (len <= 0) /* sanity */ 740 if (len <= 0) /* sanity */
708 return; 741 return;
709 742
710 unsigned char checksel; 743 unsigned char checksel;
711 unicode_t c; 744 unicode_t c;
712 int ncol = this->ncol; 745 int ncol = this->ncol;
713 const unicode_t *strend = str + len; 746 const wchar_t *strend = str + len;
714 747
715 want_refresh = 1; 748 want_refresh = 1;
716 ZERO_SCROLLBACK (); 749 ZERO_SCROLLBACK ();
717 750
718 if (nlines > 0) 751 if (minlines > 0)
719 { 752 {
720 nlines += screen.cur.row - screen.bscroll; 753 minlines += screen.cur.row - screen.bscroll;
721 754
722 if (nlines > 0 755 if (minlines > 0
723 && screen.tscroll == 0 756 && screen.tscroll == 0
724 && screen.bscroll == nrow - 1) 757 && screen.bscroll == nrow - 1)
725 { 758 {
726 /* _at least_ this many lines need to be scrolled */ 759 /* _at least_ this many lines need to be scrolled */
727 scr_scroll_text (screen.tscroll, screen.bscroll, nlines); 760 scr_scroll_text (screen.tscroll, screen.bscroll, minlines);
728 screen.cur.row -= nlines; 761 screen.cur.row -= minlines;
729 } 762 }
730 } 763 }
731 764
732#ifdef DEBUG_STRICT 765#ifdef DEBUG_STRICT
733 assert (screen.cur.col < ncol); 766 assert (screen.cur.col < ncol);
734 assert (screen.cur.row < nrow 767 assert (screen.cur.row < nrow
735 && screen.cur.row >= -nsaved); 768 && screen.cur.row >= top_row);
736#endif 769#endif
737 int row = screen.cur.row; 770 int row = screen.cur.row;
738 771
739 checksel = selection.op && current_screen == selection.screen ? 1 : 0; 772 checksel = selection.op && current_screen == selection.screen ? 1 : 0;
740 773
741 line_t *line = &ROW(row); 774 line_t *line = &ROW(row);
742 775
743 while (str < strend) 776 while (str < strend)
744 { 777 {
745 c = *str++; 778 c = (unicode_t)*str++; // convert to rxvt-unicodes representation
746 779
747 if (c < 0x20) 780 if (c < 0x20)
748 if (c == C0_LF) 781 if (c == C0_LF)
749 { 782 {
750 max_it (line->l, screen.cur.col); 783 max_it (line->l, screen.cur.col);
786 CLEAR_SELECTION (); 819 CLEAR_SELECTION ();
787 } 820 }
788 821
789 if (screen.flags & Screen_WrapNext) 822 if (screen.flags & Screen_WrapNext)
790 { 823 {
791 max_it (line->l, ncol);
792 line->is_longer (1);
793
794 scr_do_wrap (); 824 scr_do_wrap ();
795 825
826 line->l = ncol;
827 line->is_longer (1);
828
796 row = screen.cur.row; 829 row = screen.cur.row;
797 line = &ROW(row); /* _must_ refresh */ 830 line = &ROW(row); /* _must_ refresh */
798 } 831 }
799 832
800 // some utf-8 decoders "decode" surrogate characters: let's fix this. 833 // some utf-8 decoders "decode" surrogate characters: let's fix this.
964/* 997/*
965 * 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
966 * XTERM_SEQ: CTRL-H 999 * XTERM_SEQ: CTRL-H
967 */ 1000 */
968void 1001void
969rxvt_term::scr_backspace () 1002rxvt_term::scr_backspace () NOTHROW
970{ 1003{
971 want_refresh = 1; 1004 want_refresh = 1;
972 1005
973 if (screen.cur.col == 0) 1006 if (screen.cur.col == 0)
974 { 1007 {
992 * Process Horizontal Tab 1025 * Process Horizontal Tab
993 * count: +ve = forward; -ve = backwards 1026 * count: +ve = forward; -ve = backwards
994 * XTERM_SEQ: CTRL-I 1027 * XTERM_SEQ: CTRL-I
995 */ 1028 */
996void 1029void
997rxvt_term::scr_tab (int count, bool ht) 1030rxvt_term::scr_tab (int count, bool ht) NOTHROW
998{ 1031{
999 int i, x; 1032 int i, x;
1000 1033
1001 want_refresh = 1; 1034 want_refresh = 1;
1002 i = x = screen.cur.col; 1035 i = x = screen.cur.col;
1069 * 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
1070 * in that row right. Clear left column. 1103 * in that row right. Clear left column.
1071 */ 1104 */
1072#if ENABLE_FRILLS 1105#if ENABLE_FRILLS
1073void 1106void
1074rxvt_term::scr_backindex () 1107rxvt_term::scr_backindex () NOTHROW
1075{ 1108{
1076 if (screen.cur.col > 0) 1109 if (screen.cur.col > 0)
1077 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE); 1110 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE);
1078 else 1111 else
1079 scr_insdel_chars (1, INSERT); 1112 scr_insdel_chars (1, INSERT);
1086 * 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
1087 * in that row left. Clear right column. 1120 * in that row left. Clear right column.
1088 */ 1121 */
1089#if ENABLE_FRILLS 1122#if ENABLE_FRILLS
1090void 1123void
1091rxvt_term::scr_forwardindex () 1124rxvt_term::scr_forwardindex () NOTHROW
1092{ 1125{
1093 if (screen.cur.col < ncol - 1) 1126 if (screen.cur.col < ncol - 1)
1094 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE); 1127 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE);
1095 else 1128 else
1096 { 1129 {
1109/* ------------------------------------------------------------------------- */ 1142/* ------------------------------------------------------------------------- */
1110/* 1143/*
1111 * Goto Row/Column 1144 * Goto Row/Column
1112 */ 1145 */
1113void 1146void
1114rxvt_term::scr_gotorc (int row, int col, int relative) 1147rxvt_term::scr_gotorc (int row, int col, int relative) NOTHROW
1115{ 1148{
1116 want_refresh = 1; 1149 want_refresh = 1;
1117 ZERO_SCROLLBACK (); 1150 ZERO_SCROLLBACK ();
1118 1151
1119 screen.cur.col = relative & C_RELATIVE ? screen.cur.col + col : col; 1152 screen.cur.col = relative & C_RELATIVE ? screen.cur.col + col : col;
1157/* ------------------------------------------------------------------------- */ 1190/* ------------------------------------------------------------------------- */
1158/* 1191/*
1159 * direction should be UP or DN 1192 * direction should be UP or DN
1160 */ 1193 */
1161void 1194void
1162rxvt_term::scr_index (enum page_dirn direction) 1195rxvt_term::scr_index (enum page_dirn direction) NOTHROW
1163{ 1196{
1164 int dirn; 1197 int dirn;
1165 1198
1166 want_refresh = 1; 1199 want_refresh = 1;
1167 ZERO_SCROLLBACK (); 1200 ZERO_SCROLLBACK ();
1186 * XTERM_SEQ: Clear line to right: ESC [ 0 K 1219 * XTERM_SEQ: Clear line to right: ESC [ 0 K
1187 * XTERM_SEQ: Clear line to left : ESC [ 1 K 1220 * XTERM_SEQ: Clear line to left : ESC [ 1 K
1188 * XTERM_SEQ: Clear whole line : ESC [ 2 K 1221 * XTERM_SEQ: Clear whole line : ESC [ 2 K
1189 */ 1222 */
1190void 1223void
1191rxvt_term::scr_erase_line (int mode) 1224rxvt_term::scr_erase_line (int mode) NOTHROW
1192{ 1225{
1193 unsigned int col, num; 1226 unsigned int col, num;
1194 1227
1195 want_refresh = 1; 1228 want_refresh = 1;
1196 ZERO_SCROLLBACK (); 1229 ZERO_SCROLLBACK ();
1240 * XTERM_SEQ: Clear screen after cursor : ESC [ 0 J 1273 * XTERM_SEQ: Clear screen after cursor : ESC [ 0 J
1241 * XTERM_SEQ: Clear screen before cursor: ESC [ 1 J 1274 * XTERM_SEQ: Clear screen before cursor: ESC [ 1 J
1242 * XTERM_SEQ: Clear whole screen : ESC [ 2 J 1275 * XTERM_SEQ: Clear whole screen : ESC [ 2 J
1243 */ 1276 */
1244void 1277void
1245rxvt_term::scr_erase_screen (int mode) 1278rxvt_term::scr_erase_screen (int mode) NOTHROW
1246{ 1279{
1247 int num; 1280 int num;
1248 int32_t row; 1281 int32_t row;
1249 rend_t ren; 1282 rend_t ren;
1250 XGCValues gcvalue; 1283 XGCValues gcvalue;
1303 XChangeGC (display->display, gc, GCForeground, &gcvalue); 1336 XChangeGC (display->display, gc, GCForeground, &gcvalue);
1304 } 1337 }
1305 1338
1306 for (; num--; row++) 1339 for (; num--; row++)
1307 { 1340 {
1308 line_t &l = ROW(row);
1309 l.l = 0;
1310 l.is_longer (0);
1311 scr_blank_screen_mem (l, rstyle); 1341 scr_blank_screen_mem (ROW(row), rstyle);
1312 scr_blank_line (drawn_buf [row], 0, ncol, ren); 1342 scr_blank_line (drawn_buf [row], 0, ncol, ren);
1313 } 1343 }
1314} 1344}
1315 1345
1316#if ENABLE_FRILLS 1346#if ENABLE_FRILLS
1317void 1347void
1318rxvt_term::scr_erase_savelines () 1348rxvt_term::scr_erase_savelines () NOTHROW
1319{ 1349{
1320 want_refresh = 1; 1350 want_refresh = 1;
1321 ZERO_SCROLLBACK (); 1351 ZERO_SCROLLBACK ();
1322 1352
1323 nsaved = 0; 1353 top_row = 0;
1324} 1354}
1325#endif 1355#endif
1326 1356
1327/* ------------------------------------------------------------------------- */ 1357/* ------------------------------------------------------------------------- */
1328/* 1358/*
1329 * Fill the screen with `E's 1359 * Fill the screen with `E's
1330 * XTERM_SEQ: Screen Alignment Test: ESC # 8 1360 * XTERM_SEQ: Screen Alignment Test: ESC # 8
1331 */ 1361 */
1332void 1362void
1333rxvt_term::scr_E () 1363rxvt_term::scr_E () NOTHROW
1334{ 1364{
1335 rend_t fs; 1365 rend_t fs;
1336 1366
1337 want_refresh = 1; 1367 want_refresh = 1;
1338 ZERO_SCROLLBACK (); 1368 ZERO_SCROLLBACK ();
1359/* ------------------------------------------------------------------------- */ 1389/* ------------------------------------------------------------------------- */
1360/* 1390/*
1361 * Insert/Delete <count> lines 1391 * Insert/Delete <count> lines
1362 */ 1392 */
1363void 1393void
1364rxvt_term::scr_insdel_lines (int count, int insdel) 1394rxvt_term::scr_insdel_lines (int count, int insdel) NOTHROW
1365{ 1395{
1366 int end; 1396 int end;
1367 1397
1368 ZERO_SCROLLBACK (); 1398 ZERO_SCROLLBACK ();
1369 1399
1389/* ------------------------------------------------------------------------- */ 1419/* ------------------------------------------------------------------------- */
1390/* 1420/*
1391 * Insert/Delete <count> characters from the current position 1421 * Insert/Delete <count> characters from the current position
1392 */ 1422 */
1393void 1423void
1394rxvt_term::scr_insdel_chars (int count, int insdel) 1424rxvt_term::scr_insdel_chars (int count, int insdel) NOTHROW
1395{ 1425{
1396 int col, row; 1426 int col, row;
1397 rend_t tr; 1427 rend_t tr;
1398 1428
1399 want_refresh = 1; 1429 want_refresh = 1;
1487/* 1517/*
1488 * Set the scrolling region 1518 * Set the scrolling region
1489 * XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r 1519 * XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r
1490 */ 1520 */
1491void 1521void
1492rxvt_term::scr_scroll_region (int top, int bot) 1522rxvt_term::scr_scroll_region (int top, int bot) NOTHROW
1493{ 1523{
1494 max_it (top, 0); 1524 max_it (top, 0);
1495 min_it (bot, nrow - 1); 1525 min_it (bot, nrow - 1);
1496 1526
1497 if (top > bot) 1527 if (top > bot)
1507 * Make the cursor visible/invisible 1537 * Make the cursor visible/invisible
1508 * XTERM_SEQ: Make cursor visible : ESC [ ? 25 h 1538 * XTERM_SEQ: Make cursor visible : ESC [ ? 25 h
1509 * XTERM_SEQ: Make cursor invisible: ESC [ ? 25 l 1539 * XTERM_SEQ: Make cursor invisible: ESC [ ? 25 l
1510 */ 1540 */
1511void 1541void
1512rxvt_term::scr_cursor_visible (int mode) 1542rxvt_term::scr_cursor_visible (int mode) NOTHROW
1513{ 1543{
1514 want_refresh = 1; 1544 want_refresh = 1;
1515 1545
1516 if (mode) 1546 if (mode)
1517 screen.flags |= Screen_VisibleCursor; 1547 screen.flags |= Screen_VisibleCursor;
1524 * Set/unset automatic wrapping 1554 * Set/unset automatic wrapping
1525 * XTERM_SEQ: Set Wraparound : ESC [ ? 7 h 1555 * XTERM_SEQ: Set Wraparound : ESC [ ? 7 h
1526 * XTERM_SEQ: Unset Wraparound: ESC [ ? 7 l 1556 * XTERM_SEQ: Unset Wraparound: ESC [ ? 7 l
1527 */ 1557 */
1528void 1558void
1529rxvt_term::scr_autowrap (int mode) 1559rxvt_term::scr_autowrap (int mode) NOTHROW
1530{ 1560{
1531 if (mode) 1561 if (mode)
1532 screen.flags |= Screen_Autowrap; 1562 screen.flags |= Screen_Autowrap;
1533 else 1563 else
1534 screen.flags &= ~(Screen_Autowrap | Screen_WrapNext); 1564 screen.flags &= ~(Screen_Autowrap | Screen_WrapNext);
1543 * and the cursor cannot be moved outside. 1573 * and the cursor cannot be moved outside.
1544 * XTERM_SEQ: Set Absolute: ESC [ ? 6 h 1574 * XTERM_SEQ: Set Absolute: ESC [ ? 6 h
1545 * XTERM_SEQ: Set Relative: ESC [ ? 6 l 1575 * XTERM_SEQ: Set Relative: ESC [ ? 6 l
1546 */ 1576 */
1547void 1577void
1548rxvt_term::scr_relative_origin (int mode) 1578rxvt_term::scr_relative_origin (int mode) NOTHROW
1549{ 1579{
1550 if (mode) 1580 if (mode)
1551 screen.flags |= Screen_Relative; 1581 screen.flags |= Screen_Relative;
1552 else 1582 else
1553 screen.flags &= ~Screen_Relative; 1583 screen.flags &= ~Screen_Relative;
1560 * Set insert/replace mode 1590 * Set insert/replace mode
1561 * XTERM_SEQ: Set Insert mode : ESC [ ? 4 h 1591 * XTERM_SEQ: Set Insert mode : ESC [ ? 4 h
1562 * XTERM_SEQ: Set Replace mode: ESC [ ? 4 l 1592 * XTERM_SEQ: Set Replace mode: ESC [ ? 4 l
1563 */ 1593 */
1564void 1594void
1565rxvt_term::scr_insert_mode (int mode) 1595rxvt_term::scr_insert_mode (int mode) NOTHROW
1566{ 1596{
1567 if (mode) 1597 if (mode)
1568 screen.flags |= Screen_Insert; 1598 screen.flags |= Screen_Insert;
1569 else 1599 else
1570 screen.flags &= ~Screen_Insert; 1600 screen.flags &= ~Screen_Insert;
1576 * XTERM_SEQ: Set tab at current column : ESC H 1606 * XTERM_SEQ: Set tab at current column : ESC H
1577 * XTERM_SEQ: Clear tab at current column: ESC [ 0 g 1607 * XTERM_SEQ: Clear tab at current column: ESC [ 0 g
1578 * XTERM_SEQ: Clear all tabs : ESC [ 3 g 1608 * XTERM_SEQ: Clear all tabs : ESC [ 3 g
1579 */ 1609 */
1580void 1610void
1581rxvt_term::scr_set_tab (int mode) 1611rxvt_term::scr_set_tab (int mode) NOTHROW
1582{ 1612{
1583 if (mode < 0) 1613 if (mode < 0)
1584 memset (tabs, 0, ncol * sizeof (char)); 1614 memset (tabs, 0, ncol * sizeof (char));
1585 else if (screen.cur.col < ncol) 1615 else if (screen.cur.col < ncol)
1586 tabs [screen.cur.col] = !!mode; 1616 tabs [screen.cur.col] = !!mode;
1591 * Set reverse/normal video 1621 * Set reverse/normal video
1592 * XTERM_SEQ: Reverse video: ESC [ ? 5 h 1622 * XTERM_SEQ: Reverse video: ESC [ ? 5 h
1593 * XTERM_SEQ: Normal video : ESC [ ? 5 l 1623 * XTERM_SEQ: Normal video : ESC [ ? 5 l
1594 */ 1624 */
1595void 1625void
1596rxvt_term::scr_rvideo_mode (int mode) 1626rxvt_term::scr_rvideo_mode (bool on) NOTHROW
1597{ 1627{
1598 XGCValues gcvalue; 1628 rvideo_mode = on;
1599 1629
1630#ifndef NO_BELL
1631 on ^= rvideo_bell;
1632#endif
1633
1600 if (rvideo != mode) 1634 if (rvideo_state != on)
1601 { 1635 {
1602 rvideo = mode; 1636 rvideo_state = on;
1637
1603 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]); 1638 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]);
1604#if XPM_BACKGROUND 1639#if XPM_BACKGROUND
1605 if (bgPixmap.pixmap == None) 1640 if (bgPixmap.pixmap == None)
1606#endif 1641#endif
1607#if TRANSPARENT 1642#if TRANSPARENT
1608 if (! OPTION (Opt_transparent) || am_transparent == 0) 1643 if (!OPTION (Opt_transparent) || am_transparent == 0)
1609#endif 1644#endif
1610 XSetWindowBackground (display->display, vt, 1645 XSetWindowBackground (display->display, vt, pix_colors[Color_bg]);
1611 pix_colors[Color_bg]);
1612 1646
1647 XGCValues gcvalue;
1613 gcvalue.foreground = pix_colors[Color_fg]; 1648 gcvalue.foreground = pix_colors[Color_fg];
1614 gcvalue.background = pix_colors[Color_bg]; 1649 gcvalue.background = pix_colors[Color_bg];
1615 XChangeGC (display->display, gc, GCBackground | GCForeground, 1650 XChangeGC (display->display, gc, GCBackground | GCForeground, &gcvalue);
1616 &gcvalue); 1651
1617 scr_clear (); 1652 scr_clear ();
1618 scr_touch (true); 1653 scr_touch (true);
1619 } 1654 }
1620} 1655}
1621 1656
1623/* 1658/*
1624 * Report current cursor position 1659 * Report current cursor position
1625 * XTERM_SEQ: Report position: ESC [ 6 n 1660 * XTERM_SEQ: Report position: ESC [ 6 n
1626 */ 1661 */
1627void 1662void
1628rxvt_term::scr_report_position () 1663rxvt_term::scr_report_position () NOTHROW
1629{ 1664{
1630 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);
1631} 1666}
1632 1667
1633/* ------------------------------------------------------------------------- * 1668/* ------------------------------------------------------------------------- *
1636 1671
1637/* 1672/*
1638 * Set font style 1673 * Set font style
1639 */ 1674 */
1640void 1675void
1641rxvt_term::set_font_style () 1676rxvt_term::set_font_style () NOTHROW
1642{ 1677{
1643#if 0 1678#if 0
1644 switch (charsets [screen.charset]) 1679 switch (charsets [screen.charset])
1645 { 1680 {
1646 case '0': /* DEC Special Character & Line Drawing Set */ 1681 case '0': /* DEC Special Character & Line Drawing Set */
1668 * XTERM_SEQ: Invoke G1 character set: CTRL-N 1703 * XTERM_SEQ: Invoke G1 character set: CTRL-N
1669 * XTERM_SEQ: Invoke G2 character set: ESC N 1704 * XTERM_SEQ: Invoke G2 character set: ESC N
1670 * XTERM_SEQ: Invoke G3 character set: ESC O 1705 * XTERM_SEQ: Invoke G3 character set: ESC O
1671 */ 1706 */
1672void 1707void
1673rxvt_term::scr_charset_choose (int set) 1708rxvt_term::scr_charset_choose (int set) NOTHROW
1674{ 1709{
1675 screen.charset = set; 1710 screen.charset = set;
1676 set_font_style (); 1711 set_font_style ();
1677} 1712}
1678 1713
1684 * XTERM_SEQ: Set G2 character set: ESC * <C> 1719 * XTERM_SEQ: Set G2 character set: ESC * <C>
1685 * XTERM_SEQ: Set G3 character set: ESC + <C> 1720 * XTERM_SEQ: Set G3 character set: ESC + <C>
1686 * See set_font_style for possible values for <C> 1721 * See set_font_style for possible values for <C>
1687 */ 1722 */
1688void 1723void
1689rxvt_term::scr_charset_set (int set, unsigned int ch) 1724rxvt_term::scr_charset_set (int set, unsigned int ch) NOTHROW
1690{ 1725{
1691 charsets[set] = (unsigned char)ch; 1726 charsets[set] = (unsigned char)ch;
1692 set_font_style (); 1727 set_font_style ();
1693} 1728}
1694 1729
1699 1734
1700/* 1735/*
1701 * refresh matching text. 1736 * refresh matching text.
1702 */ 1737 */
1703bool 1738bool
1704rxvt_term::scr_refresh_rend (rend_t mask, rend_t value) 1739rxvt_term::scr_refresh_rend (rend_t mask, rend_t value) NOTHROW
1705{ 1740{
1706 bool found = false; 1741 bool found = false;
1707 1742
1708 for (int i = 0; i < nrow; i++) 1743 for (int i = 0; i < nrow; i++)
1709 { 1744 {
1729 PART_END, 1764 PART_END,
1730 RC_COUNT 1765 RC_COUNT
1731}; 1766};
1732 1767
1733void 1768void
1734rxvt_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
1735{ 1770{
1736 int i; 1771 int i;
1737 row_col_t rc[RC_COUNT]; 1772 row_col_t rc[RC_COUNT];
1738 1773
1739 if (!drawn_buf) /* sanity check */ 1774 if (!drawn_buf) /* sanity check */
1762 } 1797 }
1763 1798
1764 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++)
1765 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);
1766 1801
1802 num_scr_allow = 0;
1803
1767 if (refresh) 1804 if (refresh)
1768 scr_refresh (SLOW_REFRESH); 1805 scr_refresh ();
1769} 1806}
1770 1807
1771/* ------------------------------------------------------------------------- */ 1808/* ------------------------------------------------------------------------- */
1772/* 1809/*
1773 * Refresh the entire screen 1810 * Refresh the entire screen
1774 */ 1811 */
1775void 1812void
1776rxvt_term::scr_touch (bool refresh) 1813rxvt_term::scr_touch (bool refresh) NOTHROW
1777{ 1814{
1778 scr_expose (0, 0, width, height, refresh); 1815 scr_expose (0, 0, width, height, refresh);
1779} 1816}
1780 1817
1781/* ------------------------------------------------------------------------- */ 1818/* ------------------------------------------------------------------------- */
1782/* 1819/*
1783 * 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
1784 * the top of the screen 1821 * the top of the screen
1785 */ 1822 */
1786int 1823void
1787rxvt_term::scr_move_to (int y, int len) 1824rxvt_term::scr_move_to (int y, int len) NOTHROW
1788{ 1825{
1789 long p = 0; 1826 scr_changeview ((top_row - nrow) * (len - y) / len + (nrow - 1));
1790 unsigned int oldviewstart;
1791
1792 oldviewstart = view_start;
1793
1794 if (y < len)
1795 {
1796 p = (nrow + nsaved) * (len - y) / len;
1797 p -= (long) (nrow - 1);
1798 p = max (p, 0);
1799 }
1800
1801 view_start = (unsigned int)min (p, nsaved);
1802
1803 return scr_changeview (oldviewstart);
1804} 1827}
1805 1828
1806/* ------------------------------------------------------------------------- */ 1829/* ------------------------------------------------------------------------- */
1807/* 1830/*
1808 * Page the screen up/down nlines 1831 * Page the screen up/down nlines
1809 * direction should be UP or DN 1832 * direction should be UP or DN
1810 */ 1833 */
1811int 1834bool
1812rxvt_term::scr_page (enum page_dirn direction, int nlines) 1835rxvt_term::scr_page (enum page_dirn direction, int nlines) NOTHROW
1813{ 1836{
1814 int n; 1837 int new_view_start =
1815 unsigned int oldviewstart;
1816
1817 oldviewstart = view_start;
1818
1819 if (direction == UP)
1820 {
1821 n = view_start + nlines;
1822 view_start = min (n, nsaved);
1823 }
1824 else
1825 {
1826 n = view_start - nlines; 1838 direction == UP ? view_start - nlines
1827 view_start = max (n, 0); 1839 : view_start + nlines;
1828 }
1829 1840
1830 return scr_changeview (oldviewstart); 1841 return scr_changeview (new_view_start);
1831} 1842}
1832 1843
1833int 1844bool
1834rxvt_term::scr_changeview (unsigned int oldviewstart) 1845rxvt_term::scr_changeview (int new_view_start) NOTHROW
1835{ 1846{
1847 clamp_it (new_view_start, top_row, 0);
1848
1836 if (view_start != oldviewstart) 1849 if (new_view_start == view_start)
1837 { 1850 return false;
1851
1852 num_scr += new_view_start - view_start;
1853 view_start = new_view_start;
1854 want_refresh = 1;
1855
1838 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));
1839 1857
1840 want_refresh = 1; 1858 return true;
1841 num_scr -= (view_start - oldviewstart);
1842 }
1843
1844 return (int)view_start - (int)oldviewstart;
1845} 1859}
1846 1860
1847/* ------------------------------------------------------------------------- */ 1861#ifndef NO_BELL
1848void 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
1849rxvt_term::scr_bell () 1872rxvt_term::scr_bell () NOTHROW
1850{ 1873{
1851#ifndef NO_BELL 1874#ifndef NO_BELL
1852 1875
1853# ifndef NO_MAPALERT 1876# ifndef NO_MAPALERT
1854# ifdef MAPALERT_OPTION 1877# ifdef MAPALERT_OPTION
1857 XMapWindow (display->display, parent[0]); 1880 XMapWindow (display->display, parent[0]);
1858# endif 1881# endif
1859 1882
1860 if (OPTION (Opt_visualBell)) 1883 if (OPTION (Opt_visualBell))
1861 { 1884 {
1862 scr_rvideo_mode (!rvideo); /* refresh also done */ 1885 rvideo_bell = true;
1863 rxvt_usleep (VISUAL_BELL_DURATION); 1886 scr_rvideo_mode (rvideo_mode);
1864 scr_rvideo_mode (!rvideo); /* refresh also done */ 1887 display->flush ();
1888
1889 bell_ev.start (NOW + VISUAL_BELL_DURATION);
1865 } 1890 }
1866 else 1891 else
1867 XBell (display->display, 0); 1892 XBell (display->display, 0);
1868 1893
1869#endif 1894#endif
1870} 1895}
1871 1896
1872/* ------------------------------------------------------------------------- */ 1897/* ------------------------------------------------------------------------- */
1873/* ARGSUSED */ 1898/* ARGSUSED */
1874void 1899void
1875rxvt_term::scr_printscreen (int fullhist) 1900rxvt_term::scr_printscreen (int fullhist) NOTHROW
1876{ 1901{
1877#ifdef PRINTPIPE 1902#ifdef PRINTPIPE
1878 int nrows, row_start; 1903 int nrows, row_start;
1879 FILE *fd; 1904 FILE *fd;
1880 1905
1881 if ((fd = popen_printer ()) == NULL) 1906 if ((fd = popen_printer ()) == NULL)
1882 return; 1907 return;
1883 1908
1884 if (fullhist) 1909 if (fullhist)
1885 { 1910 {
1886 nrows = nrow + nsaved; 1911 nrows = nrow - top_row;
1887 row_start = -nsaved; 1912 row_start = top_row;
1888 } 1913 }
1889 else 1914 else
1890 { 1915 {
1891 nrows = nrow; 1916 nrows = nrow;
1892 row_start = -view_start; 1917 row_start = view_start;
1893 } 1918 }
1894 1919
1895 wctomb (0, 0); 1920 wctomb (0, 0);
1896 1921
1897 for (int r1 = 0; r1 < nrows; r1++) 1922 for (int r1 = 0; r1 < nrows; r1++)
1929 * Refresh the screen 1954 * Refresh the screen
1930 * drawn_text/drawn_rend contain the screen information before the update. 1955 * drawn_text/drawn_rend contain the screen information before the update.
1931 * screen.text/screen.rend contain what the screen will change to. 1956 * screen.text/screen.rend contain what the screen will change to.
1932 */ 1957 */
1933void 1958void
1934rxvt_term::scr_refresh (unsigned char refresh_type) 1959rxvt_term::scr_refresh () NOTHROW
1935{ 1960{
1936 unsigned char must_clear, /* use draw_string not draw_image_string */ 1961 unsigned char must_clear, /* use draw_string not draw_image_string */
1937 showcursor; /* show the cursor */ 1962 showcursor; /* show the cursor */
1938 int16_t col, row, /* column/row we're processing */ 1963 int16_t col, row, /* column/row we're processing */
1939 ocrow; /* old cursor row */ 1964 ocrow; /* old cursor row */
2025 2050
2026 /* make sure no outline cursor is left around */ 2051 /* make sure no outline cursor is left around */
2027 setoldcursor = 0; 2052 setoldcursor = 0;
2028 if (ocrow != -1) 2053 if (ocrow != -1)
2029 { 2054 {
2030 if (screen.cur.row + view_start != ocrow 2055 if (screen.cur.row - view_start != ocrow
2031 || screen.cur.col != oldcursor.col) 2056 || screen.cur.col != oldcursor.col)
2032 { 2057 {
2033 if (ocrow < nrow 2058 if (ocrow < nrow
2034 && oldcursor.col < ncol) 2059 && oldcursor.col < ncol)
2035 drawn_buf[ocrow].r[oldcursor.col] ^= (RS_RVid | RS_Uline); 2060 drawn_buf[ocrow].r[oldcursor.col] ^= (RS_RVid | RS_Uline);
2043 else if (!focus) 2068 else if (!focus)
2044 setoldcursor = 1; 2069 setoldcursor = 1;
2045 2070
2046 if (setoldcursor) 2071 if (setoldcursor)
2047 { 2072 {
2048 if (screen.cur.row + view_start >= nrow) 2073 if (screen.cur.row - view_start >= nrow)
2049 oldcursor.row = -1; 2074 oldcursor.row = -1;
2050 else 2075 else
2051 { 2076 {
2052 oldcursor.row = screen.cur.row + view_start; 2077 oldcursor.row = screen.cur.row - view_start;
2053 oldcursor.col = screen.cur.col; 2078 oldcursor.col = screen.cur.col;
2054 } 2079 }
2055 } 2080 }
2056 } 2081 }
2057 2082
2063#ifndef NO_SLOW_LINK_SUPPORT 2088#ifndef NO_SLOW_LINK_SUPPORT
2064 /* 2089 /*
2065 * D: CopyArea pass - very useful for slower links 2090 * D: CopyArea pass - very useful for slower links
2066 * This has been deliberately kept simple. 2091 * This has been deliberately kept simple.
2067 */ 2092 */
2068 i = num_scr;
2069 if (!display->is_local 2093 if (!display->is_local
2070 && refresh_type == FAST_REFRESH && num_scr_allow && num_scr 2094 && refresh_type == FAST_REFRESH && num_scr_allow && num_scr
2071 && abs (num_scr) < nrow && !must_clear) 2095 && abs (num_scr) < nrow && !must_clear)
2072 { 2096 {
2073 int16_t nits; 2097 int16_t nits;
2074 int j; 2098 int j;
2075 int len, wlen; 2099 int len, wlen;
2100 dLocal (int, num_scr);
2076 2101
2077 j = nrow; 2102 j = nrow;
2078 wlen = len = -1; 2103 wlen = len = -1;
2079 row = i > 0 ? 0 : j - 1; 2104 row = i > 0 ? 0 : j - 1;
2080 for (; j-- >= 0; row += (i > 0 ? 1 : -1)) 2105 for (; j-- >= 0; row += (i > 0 ? 1 : -1))
2081 { 2106 {
2082 if (row + i >= 0 && row + i < nrow && row + i != ocrow) 2107 if (row + i >= 0 && row + i < nrow && row + i != ocrow)
2083 { 2108 {
2084 line_t s = ROW(row - view_start); 2109 line_t s = ROW(view_start + row);
2085 line_t d = drawn_buf[row]; 2110 line_t d = drawn_buf[row];
2086 line_t d2 = drawn_buf[row + i]; 2111 line_t d2 = drawn_buf[row + i];
2087 2112
2088 for (nits = 0, col = ncol; col--; ) 2113 for (nits = 0, col = ncol; col--; )
2089 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])
2127 /* 2152 /*
2128 * E: main pass across every character 2153 * E: main pass across every character
2129 */ 2154 */
2130 for (row = 0; row < nrow; row++) 2155 for (row = 0; row < nrow; row++)
2131 { 2156 {
2132 text_t *stp = ROW(row - view_start).t; 2157 text_t *stp = ROW(view_start + row).t;
2133 rend_t *srp = ROW(row - view_start).r; 2158 rend_t *srp = ROW(view_start + row).r;
2134 text_t *dtp = drawn_buf[row].t; 2159 text_t *dtp = drawn_buf[row].t;
2135 rend_t *drp = drawn_buf[row].r; 2160 rend_t *drp = drawn_buf[row].r;
2136 2161
2137 /* 2162 /*
2138 * E2: OK, now the real pass 2163 * E2: OK, now the real pass
2375 /* 2400 /*
2376 * H: cleanup selection 2401 * H: cleanup selection
2377 */ 2402 */
2378 scr_reverse_selection (); 2403 scr_reverse_selection ();
2379 2404
2380 if (refresh_type & SMOOTH_REFRESH)
2381 XFlush (display->display);
2382
2383 num_scr = 0; 2405 num_scr = 0;
2384 num_scr_allow = 1; 2406 num_scr_allow = 1;
2385} 2407}
2386 2408
2387void 2409void
2388rxvt_term::scr_remap_chars (line_t &l) 2410rxvt_term::scr_remap_chars (line_t &l) NOTHROW
2389{ 2411{
2390 if (!l.t) 2412 if (!l.t)
2391 return; 2413 return;
2392 2414
2393 l.touch (); // maybe a bit of an overkill, but its not performance-relevant 2415 l.touch (); // maybe a bit of an overkill, but it's not performance-relevant
2394 2416
2395 for (int i = ncol; i--; ) 2417 for (int i = ncol; i--; )
2396 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]));
2397} 2419}
2398 2420
2399void 2421void
2400rxvt_term::scr_remap_chars () 2422rxvt_term::scr_remap_chars () NOTHROW
2401{ 2423{
2402 for (int i = total_rows; i--; ) 2424 for (int i = total_rows; i--; )
2403 scr_remap_chars (row_buf [i]); 2425 scr_remap_chars (row_buf [i]);
2404 2426
2405 for (int i = nrow; i--; ) 2427 for (int i = nrow; i--; )
2408 scr_remap_chars (swap_buf [i]); 2430 scr_remap_chars (swap_buf [i]);
2409 } 2431 }
2410} 2432}
2411 2433
2412void 2434void
2413rxvt_term::scr_recolour () 2435rxvt_term::scr_recolour () NOTHROW
2414{ 2436{
2415 if (1 2437 if (1
2416#if TRANSPARENT 2438#if TRANSPARENT
2417 && !am_transparent 2439 && !am_transparent
2418#endif 2440#endif
2439 want_refresh = 1; 2461 want_refresh = 1;
2440} 2462}
2441 2463
2442/* ------------------------------------------------------------------------- */ 2464/* ------------------------------------------------------------------------- */
2443void 2465void
2444rxvt_term::scr_clear (bool really) 2466rxvt_term::scr_clear (bool really) NOTHROW
2445{ 2467{
2446 if (!mapped) 2468 if (!mapped)
2447 return; 2469 return;
2448 2470
2449 num_scr_allow = 0; 2471 num_scr_allow = 0;
2451 2473
2452 if (really) 2474 if (really)
2453 XClearWindow (display->display, vt); 2475 XClearWindow (display->display, vt);
2454} 2476}
2455 2477
2456/* ------------------------------------------------------------------------- */
2457void 2478void
2479rxvt_term::scr_xor_rect (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle1, rend_t rstyle2) NOTHROW
2480{
2481 int view_end = view_start + nrow;
2482 int row, col;
2483
2484 for (row = max (beg_row, view_start); row <= min (end_row, view_end); row++)
2485 {
2486 text_t *stp = ROW(row).t;
2487 rend_t *srp = ROW(row).r;
2488
2489 for (col = beg_col; col < end_col; col++)
2490 srp[col] ^= rstyle1;
2491
2492 while (col-- > beg_col && (stp[col] == NOCHAR || unicode::is_space (stp[col])))
2493 srp[col] ^= rstyle2;
2494
2495 if (++col < end_col)
2496 srp[col] ^= rstyle2;
2497 }
2498}
2499
2500void
2501rxvt_term::scr_xor_span (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle) NOTHROW
2502{
2503 int view_end = view_start + nrow;
2504 int row, col;
2505
2506 if (beg_row >= view_start)
2507 {
2508 col = beg_col;
2509 row = beg_row;
2510 }
2511 else
2512 {
2513 col = 0;
2514 row = view_start;
2515 }
2516
2517 for (; row < min (end_row, view_end); row++, col = 0)
2518 for (rend_t *srp = ROW(row).r; col < ncol; col++)
2519 srp[col] ^= rstyle;
2520
2521 if (row == end_row)
2522 for (rend_t *srp = ROW(row).r; col < end_col; col++)
2523 srp[col] ^= rstyle;
2524}
2525
2526/* ------------------------------------------------------------------------- */
2527void
2458rxvt_term::scr_reverse_selection () 2528rxvt_term::scr_reverse_selection () NOTHROW
2459{ 2529{
2460 if (selection.op 2530 if (selection.op
2461 && current_screen == selection.screen 2531 && current_screen == selection.screen
2462 && selection.end.row >= -view_start) 2532 && selection.end.row >= view_start)
2463 { 2533 {
2464 int view_end = -view_start + nrow;
2465 int row, col;
2466
2467#if ENABLE_FRILLS 2534#if ENABLE_FRILLS
2468 if (selection.rect) 2535 if (selection.rect)
2469 { 2536 scr_xor_rect (selection.beg.row, selection.beg.col,
2470 for (row = max (selection.beg.row, -view_start); row <= min (selection.end.row, view_end); row++) 2537 selection.end.row, selection.end.col,
2471 { 2538 RS_RVid, RS_RVid | RS_Uline);
2472 text_t *stp = ROW(row).t;
2473 rend_t *srp = ROW(row).r;
2474
2475 for (col = selection.beg.col; col < selection.end.col; col++)
2476 srp[col] ^= RS_RVid;
2477
2478 while (col-- > selection.beg.col && (stp[col] == NOCHAR || unicode::is_space (stp[col])))
2479 srp[col] ^= RS_RVid | RS_Uline;
2480
2481 if (++col < selection.end.col)
2482 srp[col] ^= RS_RVid | RS_Uline;
2483 }
2484 }
2485 else 2539 else
2486#endif 2540#endif
2487 { 2541 scr_xor_span (selection.beg.row, selection.beg.col,
2488 if (selection.beg.row >= -view_start) 2542 selection.end.row, selection.end.col,
2489 { 2543 RS_RVid);
2490 col = selection.beg.col;
2491 row = selection.beg.row;
2492 }
2493 else
2494 {
2495 col = 0;
2496 row = -view_start;
2497 }
2498
2499 for (; row < min (selection.end.row, view_end); row++, col = 0)
2500 for (rend_t *srp = ROW(row).r; col < ncol; col++)
2501 srp[col] ^= RS_RVid;
2502
2503 if (row == selection.end.row)
2504 for (rend_t *srp = ROW(row).r; col < selection.end.col; col++)
2505 srp[col] ^= RS_RVid;
2506 }
2507 } 2544 }
2508} 2545}
2509 2546
2510/* ------------------------------------------------------------------------- */ 2547/* ------------------------------------------------------------------------- */
2511/* 2548/*
2512 * Dump the whole scrollback and screen to the passed filedescriptor. The 2549 * Dump the whole scrollback and screen to the passed filedescriptor. The
2513 * invoking routine must close the fd. 2550 * invoking routine must close the fd.
2514 */ 2551 */
2515#if 0 2552#if 0
2516void 2553void
2517rxvt_term::scr_dump (int fd) 2554rxvt_term::scr_dump (int fd) NOTHROW
2518{ 2555{
2519 int row, wrote; 2556 int row, wrote;
2520 unsigned int width, towrite; 2557 unsigned int width, towrite;
2521 char r1[] = "\n"; 2558 char r1[] = "\n";
2522 2559
2541 2578
2542/* ------------------------------------------------------------------------- * 2579/* ------------------------------------------------------------------------- *
2543 * CHARACTER SELECTION * 2580 * CHARACTER SELECTION *
2544 * ------------------------------------------------------------------------- */ 2581 * ------------------------------------------------------------------------- */
2545void 2582void
2546rxvt_term::selection_check (int check_more) 2583rxvt_term::selection_check (int check_more) NOTHROW
2547{ 2584{
2548 row_col_t pos; 2585 row_col_t pos;
2549 2586
2550 if (!selection.op) 2587 if (!selection.op)
2551 return; 2588 return;
2552 2589
2553 pos.row = pos.col = 0; 2590 pos.row = pos.col = 0;
2554 if (!IN_RANGE_EXC (selection.beg.row, -nsaved, nrow) 2591 if (!IN_RANGE_EXC (selection.beg.row, top_row, nrow)
2555 || !IN_RANGE_EXC (selection.mark.row, -nsaved, nrow) 2592 || !IN_RANGE_EXC (selection.mark.row, top_row, nrow)
2556 || !IN_RANGE_EXC (selection.end.row, -nsaved, nrow) 2593 || !IN_RANGE_EXC (selection.end.row, top_row, nrow)
2557 || (check_more == 1 2594 || (check_more == 1
2558 && current_screen == selection.screen 2595 && current_screen == selection.screen
2559 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) 2596 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
2560 && ROWCOL_IS_BEFORE (screen.cur, selection.end)) 2597 && ROWCOL_IS_BEFORE (screen.cur, selection.end))
2561 || (check_more == 2 2598 || (check_more == 2
2572/* ------------------------------------------------------------------------- */ 2609/* ------------------------------------------------------------------------- */
2573/* 2610/*
2574 * Paste a selection direct to the command fd 2611 * Paste a selection direct to the command fd
2575 */ 2612 */
2576void 2613void
2577rxvt_term::paste (char *data, unsigned int len) 2614rxvt_term::paste (char *data, unsigned int len) NOTHROW
2578{ 2615{
2579 /* convert normal newline chars into common keyboard Return key sequence */ 2616 /* convert normal newline chars into common keyboard Return key sequence */
2580 for (unsigned int i = 0; i < len; i++) 2617 for (unsigned int i = 0; i < len; i++)
2581 if (data[i] == C0_LF) 2618 if (data[i] == C0_LF)
2582 data[i] = C0_CR; 2619 data[i] = C0_CR;
2588/* 2625/*
2589 * Respond to a notification that a primary selection has been sent 2626 * Respond to a notification that a primary selection has been sent
2590 * EXT: SelectionNotify 2627 * EXT: SelectionNotify
2591 */ 2628 */
2592void 2629void
2593rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop) 2630rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop) NOTHROW
2594{ 2631{
2595 if (prop == None) /* check for failed XConvertSelection */ 2632 if (prop == None) /* check for failed XConvertSelection */
2596 { 2633 {
2597 if ((selection_type & Sel_CompoundText)) 2634 if ((selection_type & Sel_CompoundText))
2598 { 2635 {
2750 if (selection_wait == Sel_normal) 2787 if (selection_wait == Sel_normal)
2751 selection_wait = Sel_none; 2788 selection_wait = Sel_none;
2752} 2789}
2753 2790
2754void 2791void
2755rxvt_term::incr_cb (time_watcher &w) 2792rxvt_term::incr_cb (time_watcher &w) NOTHROW
2756{ 2793{
2757 selection_wait = Sel_none; 2794 selection_wait = Sel_none;
2758 2795
2759 incr_buf_size = 0; 2796 incr_buf_size = 0;
2760 free (incr_buf); 2797 free (incr_buf);
2761 2798
2762 rxvt_warn ("data loss: timeout on INCR selection paste, ignoring.\n"); 2799 rxvt_warn ("data loss: timeout on INCR selection paste, ignoring.\n");
2763} 2800}
2764 2801
2765void 2802void
2766rxvt_term::selection_property (Window win, Atom prop) 2803rxvt_term::selection_property (Window win, Atom prop) NOTHROW
2767{ 2804{
2768 if (prop == None || selection_wait != Sel_incr) 2805 if (prop == None || selection_wait != Sel_incr)
2769 return; 2806 return;
2770 2807
2771 selection_paste (win, prop, true); 2808 selection_paste (win, prop, true);
2780 * (+) if ownership is claimed but property is empty, rxvt_selection_paste () 2817 * (+) if ownership is claimed but property is empty, rxvt_selection_paste ()
2781 * will auto fallback to CUT_BUFFER0 2818 * will auto fallback to CUT_BUFFER0
2782 * EXT: button 2 release 2819 * EXT: button 2 release
2783 */ 2820 */
2784void 2821void
2785rxvt_term::selection_request (Time tm, int x, int y) 2822rxvt_term::selection_request (Time tm, int selnum) NOTHROW
2786{ 2823{
2787 if (x < 0 || x >= width || y < 0 || y >= height) 2824 if (selection.text && selnum == Sel_Primary)
2788 return; /* outside window */
2789
2790 if (selection.text)
2791 { /* internal selection */ 2825 { /* internal selection */
2792 char *str = rxvt_wcstombs (selection.text, selection.len); 2826 char *str = rxvt_wcstombs (selection.text, selection.len);
2793 paste (str, strlen (str)); 2827 paste (str, strlen (str));
2794 free (str); 2828 free (str);
2795 return; 2829 return;
2796 } 2830 }
2797 else 2831 else
2798 { 2832 {
2799 int i;
2800
2801 selection_request_time = tm; 2833 selection_request_time = tm;
2802 selection_wait = Sel_normal; 2834 selection_wait = Sel_normal;
2803 2835
2804 for (i = Sel_Primary; i <= Sel_Clipboard; i++)
2805 {
2806#if X_HAVE_UTF8_STRING 2836#if X_HAVE_UTF8_STRING
2807 selection_type = Sel_UTF8String; 2837 selection_type = Sel_UTF8String;
2808 if (selection_request_other (xa[XA_UTF8_STRING], i)) 2838 if (selection_request_other (xa[XA_UTF8_STRING], selnum))
2809 return; 2839 return;
2810#else 2840#else
2811 selection_type = Sel_CompoundText; 2841 selection_type = Sel_CompoundText;
2812 if (selection_request_other (xa[XA_COMPOUND_TEXT], i)) 2842 if (selection_request_other (xa[XA_COMPOUND_TEXT], selnum))
2813 return; 2843 return;
2814#endif 2844#endif
2815 }
2816 } 2845 }
2817 2846
2818 selection_wait = Sel_none; /* don't loop in selection_paste () */ 2847 selection_wait = Sel_none; /* don't loop in selection_paste () */
2819 selection_paste (display->root, XA_CUT_BUFFER0, false); 2848 selection_paste (display->root, XA_CUT_BUFFER0, false);
2820} 2849}
2821 2850
2822int 2851int
2823rxvt_term::selection_request_other (Atom target, int selnum) 2852rxvt_term::selection_request_other (Atom target, int selnum) NOTHROW
2824{ 2853{
2825 Atom sel; 2854 Atom sel;
2826 2855
2827 selection_type |= selnum; 2856 selection_type |= selnum;
2828 2857
2847/* 2876/*
2848 * Clear all selected text 2877 * Clear all selected text
2849 * EXT: SelectionClear 2878 * EXT: SelectionClear
2850 */ 2879 */
2851void 2880void
2852rxvt_term::selection_clear () 2881rxvt_term::selection_clear () NOTHROW
2853{ 2882{
2854 want_refresh = 1; 2883 want_refresh = 1;
2855 free (selection.text); 2884 free (selection.text);
2856 selection.text = NULL; 2885 selection.text = NULL;
2857 selection.len = 0; 2886 selection.len = 0;
2992 3021
2993 selection_grab (tm); 3022 selection_grab (tm);
2994} 3023}
2995 3024
2996bool 3025bool
2997rxvt_term::selection_grab (Time tm) 3026rxvt_term::selection_grab (Time tm) NOTHROW
2998{ 3027{
2999 selection_time = tm; 3028 selection_time = tm;
3000 3029
3001 XSetSelectionOwner (display->display, XA_PRIMARY, vt, tm); 3030 XSetSelectionOwner (display->display, XA_PRIMARY, vt, tm);
3002 if (XGetSelectionOwner (display->display, XA_PRIMARY) == vt) 3031 if (XGetSelectionOwner (display->display, XA_PRIMARY) == vt)
3003 { 3032 {
3004 display->set_selection_owner (this); 3033 display->set_selection_owner (this);
3005 return true; 3034 return true;
3006 } 3035 }
3007 else 3036 else
3037 {
3038 selection_clear ();
3008 return false; 3039 return false;
3040 }
3009 3041
3010#if 0 3042#if 0
3011 XTextProperty ct; 3043 XTextProperty ct;
3012 3044
3013 if (XwcTextListToTextProperty (display->display, &selection.text, 1, XStringStyle, &ct) >= 0) 3045 if (XwcTextListToTextProperty (display->display, &selection.text, 1, XStringStyle, &ct) >= 0)
3022/* 3054/*
3023 * 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
3024 * EXT: button 1 press 3056 * EXT: button 1 press
3025 */ 3057 */
3026void 3058void
3027rxvt_term::selection_click (int clicks, int x, int y) 3059rxvt_term::selection_click (int clicks, int x, int y) NOTHROW
3028{ 3060{
3029 clicks = ((clicks - 1) % 3) + 1; 3061 clicks = ((clicks - 1) % 3) + 1;
3030 selection.clicks = clicks; /* save clicks so extend will work */ 3062 selection.clicks = clicks; /* save clicks so extend will work */
3031 3063
3064 if (clicks == 2 && !selection.rect
3065 && HOOK_INVOKE ((this, HOOK_SEL_EXTEND, DT_END)))
3066 {
3067 MEvent.clicks = 1; // what a mess
3068 selection.screen = current_screen;
3069 selection.op = SELECTION_CONT;
3070 return;
3071 }
3072
3032 selection_start_colrow (Pixel2Col (x), Pixel2Row (y)); 3073 selection_start_colrow (Pixel2Col (x), Pixel2Row (y));
3033 3074
3034 if (clicks == 2 || clicks == 3) 3075 if (clicks == 2 || clicks == 3)
3035 selection_extend_colrow (selection.mark.col, 3076 selection_extend_colrow (selection.mark.col,
3036 selection.mark.row + view_start, 3077 selection.mark.row - view_start,
3037 0, /* button 3 */ 3078 0, /* button 3 */
3038 1, /* button press */ 3079 1, /* button press */
3039 0); /* click change */ 3080 0); /* click change */
3040} 3081}
3041 3082
3042/* ------------------------------------------------------------------------- */ 3083/* ------------------------------------------------------------------------- */
3043/* 3084/*
3044 * Mark a selection at the specified col/row 3085 * Mark a selection at the specified col/row
3045 */ 3086 */
3046void 3087void
3047rxvt_term::selection_start_colrow (int col, int row) 3088rxvt_term::selection_start_colrow (int col, int row) NOTHROW
3048{ 3089{
3049 want_refresh = 1; 3090 want_refresh = 1;
3050 3091
3051 selection.mark.row = row - view_start; 3092 selection.mark.row = row + view_start;
3052 selection.mark.col = col; 3093 selection.mark.col = col;
3053 3094
3054 selection.mark.row = clamp (selection.mark.row, -nsaved, nrow - 1); 3095 selection.mark.row = clamp (selection.mark.row, top_row, nrow - 1);
3055 selection.mark.col = clamp (selection.mark.col, 0, ncol - 1); 3096 selection.mark.col = clamp (selection.mark.col, 0, ncol - 1);
3056 3097
3057 while (selection.mark.col > 0 3098 while (selection.mark.col > 0
3058 && ROW(selection.mark.row).t[selection.mark.col] == NOCHAR) 3099 && ROW(selection.mark.row).t[selection.mark.col] == NOCHAR)
3059 --selection.mark.col; 3100 --selection.mark.col;
3078#define DELIMIT_TEXT(x) \ 3119#define DELIMIT_TEXT(x) \
3079 (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)))
3080#define DELIMIT_REND(x) 1 3121#define DELIMIT_REND(x) 1
3081 3122
3082void 3123void
3083rxvt_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
3084{ 3125{
3085 int col, row, dirnadd, tcol, trow, w1, w2; 3126 int col, row, dirnadd, tcol, trow, w1, w2;
3086 row_col_t bound; 3127 row_col_t bound;
3087 text_t *stp; 3128 text_t *stp;
3088 rend_t *srp; 3129 rend_t *srp;
3089 3130
3090 if (dirn == UP) 3131 if (dirn == UP)
3091 { 3132 {
3092 bound.row = - nsaved - 1; 3133 bound.row = top_row - 1;
3093 bound.col = 0; 3134 bound.col = 0;
3094 dirnadd = -1; 3135 dirnadd = -1;
3095 } 3136 }
3096 else 3137 else
3097 { 3138 {
3162 * flag == 0 ==> button 1 3203 * flag == 0 ==> button 1
3163 * flag == 1 ==> button 3 press 3204 * flag == 1 ==> button 3 press
3164 * flag == 2 ==> button 3 motion 3205 * flag == 2 ==> button 3 motion
3165 */ 3206 */
3166void 3207void
3167rxvt_term::selection_extend (int x, int y, int flag) 3208rxvt_term::selection_extend (int x, int y, int flag) NOTHROW
3168{ 3209{
3169 int col = clamp (Pixel2Col (x), 0, ncol); 3210 int col = clamp (Pixel2Col (x), 0, ncol);
3170 int row = clamp (Pixel2Row (y), 0, nrow - 1); 3211 int row = clamp (Pixel2Row (y), 0, nrow - 1);
3171 3212
3172 /* 3213 /*
3175 * 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
3176 * be _past_ a character for it to be selected. 3217 * be _past_ a character for it to be selected.
3177 */ 3218 */
3178 if (((selection.clicks % 3) == 1) && !flag 3219 if (((selection.clicks % 3) == 1) && !flag
3179 && (col == selection.mark.col 3220 && (col == selection.mark.col
3180 && (row == selection.mark.row + view_start))) 3221 && (row == selection.mark.row - view_start)))
3181 { 3222 {
3182 /* select nothing */ 3223 /* select nothing */
3183 selection.beg.row = selection.end.row = 0; 3224 selection.beg.row = selection.end.row = 0;
3184 selection.beg.col = selection.end.col = 0; 3225 selection.beg.col = selection.end.col = 0;
3185 selection.clicks = 4; 3226 selection.clicks = 4;
3198/* ------------------------------------------------------------------------- */ 3239/* ------------------------------------------------------------------------- */
3199/* 3240/*
3200 * Extend the selection to the specified col/row 3241 * Extend the selection to the specified col/row
3201 */ 3242 */
3202void 3243void
3203rxvt_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
3204{ 3245{
3205 row_col_t pos; 3246 row_col_t pos;
3206 enum { 3247 enum {
3207 LEFT, RIGHT 3248 LEFT, RIGHT
3208 } closeto = RIGHT; 3249 } closeto = RIGHT;
3240 selection.beg.col = selection.end.col = selection.mark.col; 3281 selection.beg.col = selection.end.col = selection.mark.col;
3241 selection.beg.row = selection.end.row = selection.mark.row; 3282 selection.beg.row = selection.end.row = selection.mark.row;
3242 } 3283 }
3243 3284
3244 pos.col = col; 3285 pos.col = col;
3245 pos.row = row - view_start; 3286 pos.row = view_start + row;
3246 3287
3247 /* 3288 /*
3248 * 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
3249 * in the way button3 drag extension works. 3290 * in the way button3 drag extension works.
3250 * We're either doing: button1 drag; button3 press; or button3 drag 3291 * We're either doing: button1 drag; button3 press; or button3 drag
3331 else if (selection.clicks == 2) 3372 else if (selection.clicks == 2)
3332 { 3373 {
3333 if (ROWCOL_IS_AFTER (selection.end, selection.beg)) 3374 if (ROWCOL_IS_AFTER (selection.end, selection.beg))
3334 selection.end.col--; 3375 selection.end.col--;
3335 3376
3336 if (!HOOK_INVOKE ((this, HOOK_SEL_EXTEND, DT_END)))
3337 {
3338 selection_delimit_word (UP, &selection.beg, &selection.beg); 3377 selection_delimit_word (UP, &selection.beg, &selection.beg);
3339 selection_delimit_word (DN, &selection.end, &selection.end); 3378 selection_delimit_word (DN, &selection.end, &selection.end);
3340 }
3341 } 3379 }
3342 else if (selection.clicks == 3) 3380 else if (selection.clicks == 3)
3343 { 3381 {
3344#if ENABLE_FRILLS 3382#if ENABLE_FRILLS
3345 if (OPTION (Opt_tripleclickwords)) 3383 if (OPTION (Opt_tripleclickwords))
3397#endif 3435#endif
3398} 3436}
3399 3437
3400#if ENABLE_FRILLS 3438#if ENABLE_FRILLS
3401void 3439void
3402rxvt_term::selection_remove_trailing_spaces () 3440rxvt_term::selection_remove_trailing_spaces () NOTHROW
3403{ 3441{
3404 int32_t end_col, end_row; 3442 int32_t end_col, end_row;
3405 text_t *stp; 3443 text_t *stp;
3406 3444
3407 end_col = selection.end.col; 3445 end_col = selection.end.col;
3445/* 3483/*
3446 * Double click on button 3 when already selected 3484 * Double click on button 3 when already selected
3447 * EXT: button 3 double click 3485 * EXT: button 3 double click
3448 */ 3486 */
3449void 3487void
3450rxvt_term::selection_rotate (int x, int y) 3488rxvt_term::selection_rotate (int x, int y) NOTHROW
3451{ 3489{
3452 selection.clicks = selection.clicks % 3 + 1; 3490 selection.clicks = selection.clicks % 3 + 1;
3453 selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1); 3491 selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1);
3454} 3492}
3455 3493
3457/* 3495/*
3458 * Respond to a request for our current selection 3496 * Respond to a request for our current selection
3459 * EXT: SelectionRequest 3497 * EXT: SelectionRequest
3460 */ 3498 */
3461void 3499void
3462rxvt_term::selection_send (const XSelectionRequestEvent &rq) 3500rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW
3463{ 3501{
3464 XSelectionEvent ev; 3502 XSelectionEvent ev;
3465 dDisp; 3503 dDisp;
3466 3504
3467 ev.type = SelectionNotify; 3505 ev.type = SelectionNotify;
3595 3633
3596/* 3634/*
3597 * return col/row values corresponding to x/y pixel values 3635 * return col/row values corresponding to x/y pixel values
3598 */ 3636 */
3599void 3637void
3600rxvt_term::pixel_position (int *x, int *y) 3638rxvt_term::pixel_position (int *x, int *y) NOTHROW
3601{ 3639{
3602 *x = Pixel2Col (*x); 3640 *x = Pixel2Col (*x);
3603 /* max_it (*x, 0); min_it (*x, (int)ncol - 1); */ 3641 /* max_it (*x, 0); min_it (*x, (int)ncol - 1); */
3604 *y = Pixel2Row (*y); 3642 *y = Pixel2Row (*y);
3605 /* max_it (*y, 0); min_it (*y, (int)nrow - 1); */ 3643 /* max_it (*y, 0); min_it (*y, (int)nrow - 1); */
3606} 3644}
3607 3645
3608/* ------------------------------------------------------------------------- */ 3646/* ------------------------------------------------------------------------- */
3609#ifdef USE_XIM 3647#ifdef USE_XIM
3610void 3648void
3611rxvt_term::im_set_position (XPoint &pos) 3649rxvt_term::im_set_position (XPoint &pos) NOTHROW
3612{ 3650{
3613 XWindowAttributes xwa; 3651 XWindowAttributes xwa;
3614 3652
3615 XGetWindowAttributes (display->display, vt, &xwa); 3653 XGetWindowAttributes (display->display, vt, &xwa);
3616 3654
3619} 3657}
3620#endif 3658#endif
3621 3659
3622#if ENABLE_OVERLAY 3660#if ENABLE_OVERLAY
3623void 3661void
3624rxvt_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
3625{ 3663{
3626 if (nrow < 1 || ncol < 1) 3664 if (nrow < 1 || ncol < 1)
3627 return; 3665 return;
3628 3666
3629 want_refresh = 1; 3667 want_refresh = 1;
3674 *rp = r; 3712 *rp = r;
3675 } 3713 }
3676} 3714}
3677 3715
3678void 3716void
3679rxvt_term::scr_overlay_off () 3717rxvt_term::scr_overlay_off () NOTHROW
3680{ 3718{
3681 if (!ov_text) 3719 if (!ov_text)
3682 return; 3720 return;
3683 3721
3684 want_refresh = 1; 3722 want_refresh = 1;
3692 delete [] ov_text; ov_text = 0; 3730 delete [] ov_text; ov_text = 0;
3693 delete [] ov_rend; ov_rend = 0; 3731 delete [] ov_rend; ov_rend = 0;
3694} 3732}
3695 3733
3696void 3734void
3697rxvt_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
3698{ 3736{
3699 if (!ov_text || x >= ov_w - 2 || y >= ov_h - 2) 3737 if (!ov_text || x >= ov_w - 2 || y >= ov_h - 2)
3700 return; 3738 return;
3701 3739
3702 x++, y++; 3740 x++, y++;
3704 ov_text[y][x] = text; 3742 ov_text[y][x] = text;
3705 ov_rend[y][x] = rend; 3743 ov_rend[y][x] = rend;
3706} 3744}
3707 3745
3708void 3746void
3709rxvt_term::scr_overlay_set (int x, int y, const char *s) 3747rxvt_term::scr_overlay_set (int x, int y, const char *s) NOTHROW
3710{ 3748{
3711 while (*s) 3749 while (*s)
3712 scr_overlay_set (x++, y, *s++); 3750 scr_overlay_set (x++, y, *s++);
3713} 3751}
3714 3752
3715void 3753void
3716rxvt_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
3717{ 3755{
3718 while (*s) 3756 while (*s)
3719 { 3757 {
3720 text_t t = *s++; 3758 text_t t = *s++;
3721 int width = wcwidth (t); 3759 int width = wcwidth (t);
3727 } 3765 }
3728 } 3766 }
3729} 3767}
3730 3768
3731void 3769void
3732rxvt_term::scr_swap_overlay () 3770rxvt_term::scr_swap_overlay () NOTHROW
3733{ 3771{
3734 if (!ov_text) 3772 if (!ov_text)
3735 return; 3773 return;
3736 3774
3737 // swap screen mem with overlay 3775 // swap screen mem with overlay
3738 for (int y = ov_h; y--; ) 3776 for (int y = ov_h; y--; )
3739 { 3777 {
3740 text_t *t1 = ov_text[y]; 3778 text_t *t1 = ov_text[y];
3741 rend_t *r1 = ov_rend[y]; 3779 rend_t *r1 = ov_rend[y];
3742 3780
3743 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;
3744 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;
3745 3783
3746 for (int x = ov_w; x--; ) 3784 for (int x = ov_w; x--; )
3747 { 3785 {
3748 text_t t = *t1; *t1++ = *t2; *t2++ = t; 3786 text_t t = *t1; *t1++ = *t2; *t2++ = t;
3749 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