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