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.217 by root, Mon Jan 9 19:01:56 2006 UTC vs.
Revision 1.248 by root, Sun Jan 22 20:58:33 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;
173 nrow = 24; 173 nrow = 24;
174 174
175 if (ncol == prev_ncol && nrow == prev_nrow) 175 if (ncol == prev_ncol && nrow == prev_nrow)
176 return; 176 return;
177 177
178 if (current_screen != PRIMARY)
179 scr_swap_screen ();
180
178 // we need at least two lines for wrapping to work correctly 181 // we need at least two lines for wrapping to work correctly
179 if (nrow + saveLines < 2) 182 while (nrow + saveLines < 2)
180 { 183 {
181 //TODO//FIXME 184 //TODO//FIXME
182 saveLines++; 185 saveLines++;
183 prev_nrow--; 186 prev_nrow--;
184 nsaved++; 187 top_row--;
185 } 188 }
186 189
187 want_refresh = 1; 190 want_refresh = 1;
188 191
189 int prev_total_rows = prev_nrow + saveLines; 192 int prev_total_rows = prev_nrow + saveLines;
195 if (!row_buf) 198 if (!row_buf)
196 { 199 {
197 /* 200 /*
198 * first time called so just malloc everything: don't rely on realloc 201 * first time called so just malloc everything: don't rely on realloc
199 */ 202 */
200 nsaved = 0; /* no saved lines */ 203 top_row = 0;
201 term_start = 0; 204 term_start = 0;
202 205
203 talloc = new rxvt_salloc (ncol * sizeof (text_t)); 206 talloc = new rxvt_salloc (ncol * sizeof (text_t));
204 ralloc = new rxvt_salloc (ncol * sizeof (rend_t)); 207 ralloc = new rxvt_salloc (ncol * sizeof (rend_t));
205 208
234 selection.text = NULL; 237 selection.text = NULL;
235 selection.len = 0; 238 selection.len = 0;
236 selection.op = SELECTION_CLEAR; 239 selection.op = SELECTION_CLEAR;
237 selection.screen = PRIMARY; 240 selection.screen = PRIMARY;
238 selection.clicks = 0; 241 selection.clicks = 0;
239 CLEAR_ALL_SELECTION (); 242 rvideo_state = rvideo_mode = false;
240 rvideo = 0;
241 } 243 }
242 else 244 else
243 { 245 {
244 /* 246 /*
245 * add or delete rows as appropriate 247 * add or delete rows as appropriate
276 278
277 line_t *old_buf = row_buf; 279 line_t *old_buf = row_buf;
278 row_buf = (line_t *)rxvt_calloc (total_rows + nrow, sizeof (line_t)); 280 row_buf = (line_t *)rxvt_calloc (total_rows + nrow, sizeof (line_t));
279 281
280 int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row 282 int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row
281 int pend = MOD (term_start - nsaved , prev_total_rows); 283 int pend = MOD (term_start + top_row , prev_total_rows);
282 int q = total_rows; // rewrapped row 284 int q = total_rows; // rewrapped row
283 285
284 if (nsaved) 286 if (top_row)
285 { 287 {
286 // re-wrap lines, this is rather ugly, possibly because I am too dumb 288 // Re-wrap lines. This is rather ugly, possibly because I am too dumb
287 // to come up with a lean and mean algorithm. 289 // to come up with a lean and mean algorithm.
288 290
289 row_col_t ocur = screen.cur; 291 row_col_t ocur = screen.cur;
290 ocur.row = MOD (term_start + ocur.row, prev_total_rows); 292 ocur.row = MOD (term_start + ocur.row, prev_total_rows);
291 293
325 qline->l = ncol; 327 qline->l = ncol;
326 qline->is_longer (1); 328 qline->is_longer (1);
327 329
328 int qcol = 0; 330 int qcol = 0;
329 331
332 // see below for cursor adjustment rationale
333 if (p == ocur.row)
334 screen.cur.row = q - (total_rows - nrow);
335
330 // fill a single destination line 336 // fill a single destination line
331 while (lofs < llen && qcol < ncol) 337 while (lofs < llen && qcol < ncol)
332 { 338 {
333 int prow = lofs / prev_ncol; 339 int prow = lofs / prev_ncol;
334 int pcol = lofs % prev_ncol; 340 int pcol = lofs % prev_ncol;
344 350
345 line_t &pline = old_buf [prow]; 351 line_t &pline = old_buf [prow];
346 352
347 int len = min (min (prev_ncol - pcol, ncol - qcol), llen - lofs); 353 int len = min (min (prev_ncol - pcol, ncol - qcol), llen - lofs);
348 354
349 assert (len);
350 assert (pline.t);
351
352 memcpy (qline->t + qcol, pline.t + pcol, len * sizeof (text_t)); 355 memcpy (qline->t + qcol, pline.t + pcol, len * sizeof (text_t));
353 memcpy (qline->r + qcol, pline.r + pcol, len * sizeof (rend_t)); 356 memcpy (qline->r + qcol, pline.r + pcol, len * sizeof (rend_t));
354 357
355 lofs += len; 358 lofs += len;
356 qcol += len; 359 qcol += len;
362 scr_blank_line (*qline, qline->l, ncol - qline->l, DEFAULT_RSTYLE); 365 scr_blank_line (*qline, qline->l, ncol - qline->l, DEFAULT_RSTYLE);
363 } 366 }
364 while (p != pend && q > 0); 367 while (p != pend && q > 0);
365 368
366 term_start = total_rows - nrow; 369 term_start = total_rows - nrow;
367 nsaved = term_start - q; 370 top_row = q - term_start;
368 371
369 // make sure all terminal lines exist 372 // make sure all terminal lines exist
370 while (nsaved < 0) 373 while (top_row > 0)
371 scr_blank_screen_mem (ROW (-++nsaved), DEFAULT_RSTYLE); 374 scr_blank_screen_mem (ROW (--top_row), DEFAULT_RSTYLE);
372 } 375 }
373 else 376 else
374 { 377 {
375 // if no scrollback exists (yet), wing, instead of wrap 378 // if no scrollback exists (yet), wing, instead of wrap
376 379
389 } 392 }
390 393
391 term_start = 0; 394 term_start = 0;
392 } 395 }
393 396
394#ifdef DEBUG_STRICT //TODO: remove
395 for (int i = -nsaved; i < nrow; i++)
396 assert (ROW (i).t);
397#endif
398
399 free (old_buf); 397 free (old_buf);
400 delete old_ta; 398 delete old_ta;
401 delete old_ra; 399 delete old_ra;
402 400
403 clamp_it (screen.cur.row, 0, nrow - 1); 401 clamp_it (screen.cur.row, 0, nrow - 1);
404 clamp_it (screen.cur.col, 0, ncol - 1); 402 clamp_it (screen.cur.col, 0, ncol - 1);
405 403
406 if (tabs)
407 free (tabs); 404 free (tabs);
408 } 405 }
406
407 CLEAR_ALL_SELECTION ();
409 408
410 prev_nrow = nrow; 409 prev_nrow = nrow;
411 prev_ncol = ncol; 410 prev_ncol = ncol;
412 411
413 tabs = (char *)rxvt_malloc (ncol * sizeof (char)); 412 tabs = (char *)rxvt_malloc (ncol * sizeof (char));
414 413
415 for (int col = ncol; col--; ) 414 for (int col = ncol; col--; )
416 tabs [col] = col % TABSIZE == 0; 415 tabs [col] = col % TABSIZE == 0;
417 416
417 if (current_screen != PRIMARY)
418 scr_swap_screen ();
419
418 tt_winch (); 420 tt_winch ();
419 421
420 HOOK_INVOKE ((this, HOOK_RESET, DT_END)); 422 HOOK_INVOKE ((this, HOOK_RESET, DT_END));
421} 423}
422 424
423/* ------------------------------------------------------------------------- */ 425/* ------------------------------------------------------------------------- */
424/* 426/*
425 * Free everything. That way malloc debugging can find leakage. 427 * Free everything. That way malloc debugging can find leakage.
426 */ 428 */
427void 429void
428rxvt_term::scr_release () 430rxvt_term::scr_release () NOTHROW
429{ 431{
432 if (row_buf)
433 {
430 delete talloc; talloc = 0; 434 delete talloc; talloc = 0;
431 delete ralloc; ralloc = 0; 435 delete ralloc; ralloc = 0;
432 436
433 free (row_buf); 437 free (row_buf);
434 free (swap_buf); 438 free (swap_buf);
435 free (drawn_buf); 439 free (drawn_buf);
436 free (tabs); 440 free (tabs);
437 441
438 row_buf = 0; // signal that we freed all the arrays 442 row_buf = 0; // signal that we freed all the arrays
443 }
439} 444}
440 445
441/* ------------------------------------------------------------------------- */ 446/* ------------------------------------------------------------------------- */
442/* 447/*
443 * Hard reset 448 * Hard reset
448 scr_release (); 453 scr_release ();
449 prev_nrow = prev_ncol = 0; 454 prev_nrow = prev_ncol = 0;
450 scr_reset (); 455 scr_reset ();
451 456
452 scr_clear (true); 457 scr_clear (true);
453 scr_refresh (SLOW_REFRESH); 458 scr_refresh ();
454} 459}
455 460
456/* ------------------------------------------------------------------------- * 461/* ------------------------------------------------------------------------- *
457 * PROCESS SCREEN COMMANDS * 462 * PROCESS SCREEN COMMANDS *
458 * ------------------------------------------------------------------------- */ 463 * ------------------------------------------------------------------------- */
460 * Save and Restore cursor 465 * Save and Restore cursor
461 * XTERM_SEQ: Save cursor : ESC 7 466 * XTERM_SEQ: Save cursor : ESC 7
462 * XTERM_SEQ: Restore cursor: ESC 8 467 * XTERM_SEQ: Restore cursor: ESC 8
463 */ 468 */
464void 469void
465rxvt_term::scr_cursor (int mode) 470rxvt_term::scr_cursor (cursor_mode mode) NOTHROW
466{ 471{
467 screen_t *s; 472 screen_t *s;
468 473
469#if NSCREENS && !defined(NO_SECONDARY_SCREEN_CURSOR) 474#if NSCREENS && !defined(NO_SECONDARY_SCREEN_CURSOR)
470 if (current_screen == SECONDARY) 475 if (current_screen == SECONDARY)
502 assert (s->cur.row >= 0); 507 assert (s->cur.row >= 0);
503 assert (s->cur.col >= 0); 508 assert (s->cur.col >= 0);
504#endif 509#endif
505} 510}
506 511
512void
513rxvt_term::scr_swap_screen ()
514{
515 if (!OPTION (Opt_secondaryScreen))
516 return;
517
518 for (int i = prev_nrow; i--; )
519 ::swap (ROW(i), swap_buf [i]);
520
521 ::swap (screen.cur, swap.cur);
522
523 screen.cur.row = clamp (screen.cur.row, 0, prev_nrow - 1);
524 screen.cur.col = clamp (screen.cur.col, 0, prev_ncol - 1);
525}
526
507/* ------------------------------------------------------------------------- */ 527/* ------------------------------------------------------------------------- */
508/* 528/*
509 * Swap between primary and secondary screens 529 * Swap between primary and secondary screens
510 * XTERM_SEQ: Primary screen : ESC [ ? 4 7 h 530 * XTERM_SEQ: Primary screen : ESC [ ? 4 7 h
511 * XTERM_SEQ: Secondary screen: ESC [ ? 4 7 l 531 * XTERM_SEQ: Secondary screen: ESC [ ? 4 7 l
512 */ 532 */
513int 533void
514rxvt_term::scr_change_screen (int scrn) 534rxvt_term::scr_change_screen (int scrn)
515{ 535{
536 if (scrn == current_screen)
537 return;
538
516 want_refresh = 1; 539 want_refresh = 1;
517 view_start = 0; 540 view_start = 0;
518 541
519 if (current_screen == scrn)
520 return scrn;
521
522 selection_check (2); /* check for boundary cross */ 542 selection_check (2); /* check for boundary cross */
523 543
524 int i = current_screen; current_screen = scrn; scrn = i; 544 int i = current_screen; current_screen = scrn; scrn = i;
525
526 ::swap (screen.cur.row, swap.cur.row);
527 ::swap (screen.cur.col, swap.cur.col);
528
529 screen.cur.row = clamp (screen.cur.row, 0, prev_nrow - 1);
530 screen.cur.col = clamp (screen.cur.col, 0, prev_ncol - 1);
531 545
532#if NSCREENS 546#if NSCREENS
533 if (OPTION (Opt_secondaryScreen)) 547 if (OPTION (Opt_secondaryScreen))
534 { 548 {
535 num_scr = 0; 549 num_scr = 0;
536 550
537 for (int i = prev_nrow; i--; ) 551 scr_swap_screen ();
538 ::swap (ROW(i), swap_buf [i]);
539 552
540 ::swap (screen.charset, swap.charset); 553 ::swap (screen.charset, swap.charset);
541 ::swap (screen.flags, swap.flags); 554 ::swap (screen.flags, swap.flags);
542 screen.flags |= Screen_VisibleCursor; 555 screen.flags |= Screen_VisibleCursor;
543 swap.flags |= Screen_VisibleCursor; 556 swap.flags |= Screen_VisibleCursor;
544 } 557 }
545 else 558 else
546#endif 559#endif
547 if (OPTION (Opt_secondaryScroll)) 560 if (OPTION (Opt_secondaryScroll))
548 scr_scroll_text (0, prev_nrow - 1, prev_nrow); 561 scr_scroll_text (0, prev_nrow - 1, prev_nrow);
549
550 return scrn;
551} 562}
552 563
553// clear WrapNext indicator, solidifying position on next line 564// clear WrapNext indicator, solidifying position on next line
554void 565void
555rxvt_term::scr_do_wrap () 566rxvt_term::scr_do_wrap () NOTHROW
556{ 567{
557 if (!(screen.flags & Screen_WrapNext)) 568 if (!(screen.flags & Screen_WrapNext))
558 return; 569 return;
559 570
560 screen.flags &= ~Screen_WrapNext; 571 screen.flags &= ~Screen_WrapNext;
570/* ------------------------------------------------------------------------- */ 581/* ------------------------------------------------------------------------- */
571/* 582/*
572 * Change the colour for following text 583 * Change the colour for following text
573 */ 584 */
574void 585void
575rxvt_term::scr_color (unsigned int color, int fgbg) 586rxvt_term::scr_color (unsigned int color, int fgbg) NOTHROW
576{ 587{
577 if (color > maxTermCOLOR) 588 if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR))
578 color = fgbg; 589 color = fgbg;
579 590
580 if (fgbg == Color_fg) 591 if (fgbg == Color_fg)
581 rstyle = SET_FGCOLOR (rstyle, color); 592 rstyle = SET_FGCOLOR (rstyle, color);
582 else 593 else
586/* ------------------------------------------------------------------------- */ 597/* ------------------------------------------------------------------------- */
587/* 598/*
588 * Change the rendition style for following text 599 * Change the rendition style for following text
589 */ 600 */
590void 601void
591rxvt_term::scr_rendition (int set, int style) 602rxvt_term::scr_rendition (int set, int style) NOTHROW
592 { 603 {
593 if (set) 604 if (set)
594 rstyle |= style; 605 rstyle |= style;
595 else if (style == ~RS_None) 606 else if (style == ~RS_None)
596 rstyle = DEFAULT_RSTYLE; 607 rstyle = DEFAULT_RSTYLE;
603 * Scroll text between <row1> and <row2> inclusive, by <count> lines 614 * Scroll text between <row1> and <row2> inclusive, by <count> lines
604 * count positive ==> scroll up 615 * count positive ==> scroll up
605 * count negative ==> scroll down 616 * count negative ==> scroll down
606 */ 617 */
607int 618int
608rxvt_term::scr_scroll_text (int row1, int row2, int count) 619rxvt_term::scr_scroll_text (int row1, int row2, int count) NOTHROW
609{ 620{
610 if (count == 0 || (row1 > row2)) 621 if (count == 0 || (row1 > row2))
611 return 0; 622 return 0;
612 623
613 want_refresh = 1; 624 want_refresh = 1;
614 num_scr += count; 625 num_scr += count;
615 626
616 if (count > 0 627 if (count > 0
617 && row1 == 0 628 && row1 == 0
618 && row2 == nrow - 1
619 && (current_screen == PRIMARY || OPTION (Opt_secondaryScroll))) 629 && (current_screen == PRIMARY || OPTION (Opt_secondaryScroll)))
620 { 630 {
621 nsaved = min (nsaved + count, saveLines); 631 top_row = max (top_row - count, -saveLines);
622 632
623 HOOK_INVOKE ((this, HOOK_SCROLL_BACK, DT_INT, count, DT_INT, nsaved, DT_END)); 633 // scroll everything up 'count' lines
634 term_start = (term_start + count) % total_rows;
635
636 // sever bottommost line
637 {
638 line_t &l = ROW(row2 - count);
639 l.is_longer (0);
640 l.touch ();
641 }
642
643 // erase newly scrolled-in lines
644 for (int i = count; i--; )
645 {
646 // basically this is a slightly optimized scr_blank_screen_mem
647 // it is worth the effort on slower machines
648 line_t &l = ROW(nrow - 1 - i);
649
650 scr_blank_line (l, 0, l.l, rstyle);
651
652 l.l = 0;
653 l.f = 0;
654 }
655
656 // now copy lines below the scroll region bottom to the
657 // bottom of the screen again, so they look as if they
658 // hadn't moved.
659 for (int i = nrow; --i > row2; )
660 {
661 line_t &l1 = ROW(i - count);
662 line_t &l2 = ROW(i);
663
664 ::swap (l1, l2);
665 l2.touch ();
666 }
624 667
625 term_start = (term_start + count) % total_rows; 668 // move and/or clear selection, if any
626
627 if (selection.op && current_screen == selection.screen) 669 if (selection.op && current_screen == selection.screen)
628 { 670 {
629 selection.beg.row -= count; 671 selection.beg.row -= count;
630 selection.end.row -= count; 672 selection.end.row -= count;
631 selection.mark.row -= count; 673 selection.mark.row -= count;
632 674
633 if (selection.beg.row < -nsaved 675 if (selection.beg.row < top_row
634 || selection.end.row < -nsaved 676 || selection.end.row < top_row
635 || selection.mark.row < -nsaved) 677 || selection.mark.row < top_row)
636 { 678 {
637 CLEAR_ALL_SELECTION (); 679 CLEAR_ALL_SELECTION ();
638 selection.op = SELECTION_CLEAR; 680 selection.op = SELECTION_CLEAR;
639 } 681 }
640 } 682 }
641 683
642 for (int i = count; i--; ) 684 // finally move the view window, if desired
643 {
644 // basically thi is a slightly optimized scr_blank_screen_mem
645 // it is worth the effort on slower machines
646 line_t &l = ROW(row2 - i);
647
648 scr_blank_line (l, 0, l.l, rstyle);
649
650 l.l = 0;
651 l.f = 0;
652 }
653
654 if (OPTION (Opt_scrollWithBuffer) 685 if (OPTION (Opt_scrollWithBuffer)
655 && view_start != 0 686 && view_start != 0
656 && view_start != saveLines) 687 && view_start != -saveLines)
657 scr_page (UP, count); 688 scr_page (UP, count);
689
690 if (SHOULD_INVOKE (HOOK_SCROLL_BACK))
691 HOOK_INVOKE ((this, HOOK_SCROLL_BACK, DT_INT, count, DT_INT, top_row, DT_END));
658 } 692 }
659 else 693 else
660 { 694 {
661 if (selection.op && current_screen == selection.screen) 695 if (selection.op && current_screen == selection.screen)
662 { 696 {
708/* ------------------------------------------------------------------------- */ 742/* ------------------------------------------------------------------------- */
709/* 743/*
710 * Add text given in <str> of length <len> to screen struct 744 * Add text given in <str> of length <len> to screen struct
711 */ 745 */
712void 746void
713rxvt_term::scr_add_lines (const wchar_t *str, int len, int minlines) 747rxvt_term::scr_add_lines (const wchar_t *str, int len, int minlines) NOTHROW
714{ 748{
715 if (len <= 0) /* sanity */ 749 if (len <= 0) /* sanity */
716 return; 750 return;
717 751
718 unsigned char checksel; 752 unsigned char checksel;
724 ZERO_SCROLLBACK (); 758 ZERO_SCROLLBACK ();
725 759
726 if (minlines > 0) 760 if (minlines > 0)
727 { 761 {
728 minlines += screen.cur.row - screen.bscroll; 762 minlines += screen.cur.row - screen.bscroll;
763 min_it (minlines, screen.cur.row - top_row);
729 764
730 if (minlines > 0 765 if (minlines > 0
731 && screen.tscroll == 0 766 && screen.tscroll == 0
732 && screen.bscroll == nrow - 1) 767 && screen.bscroll == nrow - 1)
733 { 768 {
738 } 773 }
739 774
740#ifdef DEBUG_STRICT 775#ifdef DEBUG_STRICT
741 assert (screen.cur.col < ncol); 776 assert (screen.cur.col < ncol);
742 assert (screen.cur.row < nrow 777 assert (screen.cur.row < nrow
743 && screen.cur.row >= -nsaved); 778 && screen.cur.row >= top_row);
744#endif 779#endif
745 int row = screen.cur.row; 780 int row = screen.cur.row;
746 781
747 checksel = selection.op && current_screen == selection.screen ? 1 : 0; 782 checksel = selection.op && current_screen == selection.screen ? 1 : 0;
748 783
794 CLEAR_SELECTION (); 829 CLEAR_SELECTION ();
795 } 830 }
796 831
797 if (screen.flags & Screen_WrapNext) 832 if (screen.flags & Screen_WrapNext)
798 { 833 {
799 max_it (line->l, ncol);
800 line->is_longer (1);
801
802 scr_do_wrap (); 834 scr_do_wrap ();
803 835
836 line->l = ncol;
837 line->is_longer (1);
838
804 row = screen.cur.row; 839 row = screen.cur.row;
805 line = &ROW(row); /* _must_ refresh */ 840 line = &ROW(row); /* _must_ refresh */
806 } 841 }
807 842
808 // some utf-8 decoders "decode" surrogate characters: let's fix this. 843 // some utf-8 decoders "decode" surrogate characters: let's fix this.
972/* 1007/*
973 * Process Backspace. Move back the cursor back a position, wrap if have to 1008 * Process Backspace. Move back the cursor back a position, wrap if have to
974 * XTERM_SEQ: CTRL-H 1009 * XTERM_SEQ: CTRL-H
975 */ 1010 */
976void 1011void
977rxvt_term::scr_backspace () 1012rxvt_term::scr_backspace () NOTHROW
978{ 1013{
979 want_refresh = 1; 1014 want_refresh = 1;
980 1015
981 if (screen.cur.col == 0) 1016 if (screen.cur.col == 0)
982 { 1017 {
1000 * Process Horizontal Tab 1035 * Process Horizontal Tab
1001 * count: +ve = forward; -ve = backwards 1036 * count: +ve = forward; -ve = backwards
1002 * XTERM_SEQ: CTRL-I 1037 * XTERM_SEQ: CTRL-I
1003 */ 1038 */
1004void 1039void
1005rxvt_term::scr_tab (int count, bool ht) 1040rxvt_term::scr_tab (int count, bool ht) NOTHROW
1006{ 1041{
1007 int i, x; 1042 int i, x;
1008 1043
1009 want_refresh = 1; 1044 want_refresh = 1;
1010 i = x = screen.cur.col; 1045 i = x = screen.cur.col;
1077 * Move cursor left in row. If we're at the left boundary, shift everything 1112 * Move cursor left in row. If we're at the left boundary, shift everything
1078 * in that row right. Clear left column. 1113 * in that row right. Clear left column.
1079 */ 1114 */
1080#if ENABLE_FRILLS 1115#if ENABLE_FRILLS
1081void 1116void
1082rxvt_term::scr_backindex () 1117rxvt_term::scr_backindex () NOTHROW
1083{ 1118{
1084 if (screen.cur.col > 0) 1119 if (screen.cur.col > 0)
1085 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE); 1120 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE);
1086 else 1121 else
1087 scr_insdel_chars (1, INSERT); 1122 scr_insdel_chars (1, INSERT);
1094 * Move cursor right in row. If we're at the right boundary, shift everything 1129 * Move cursor right in row. If we're at the right boundary, shift everything
1095 * in that row left. Clear right column. 1130 * in that row left. Clear right column.
1096 */ 1131 */
1097#if ENABLE_FRILLS 1132#if ENABLE_FRILLS
1098void 1133void
1099rxvt_term::scr_forwardindex () 1134rxvt_term::scr_forwardindex () NOTHROW
1100{ 1135{
1101 if (screen.cur.col < ncol - 1) 1136 if (screen.cur.col < ncol - 1)
1102 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE); 1137 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE);
1103 else 1138 else
1104 { 1139 {
1117/* ------------------------------------------------------------------------- */ 1152/* ------------------------------------------------------------------------- */
1118/* 1153/*
1119 * Goto Row/Column 1154 * Goto Row/Column
1120 */ 1155 */
1121void 1156void
1122rxvt_term::scr_gotorc (int row, int col, int relative) 1157rxvt_term::scr_gotorc (int row, int col, int relative) NOTHROW
1123{ 1158{
1124 want_refresh = 1; 1159 want_refresh = 1;
1125 ZERO_SCROLLBACK (); 1160 ZERO_SCROLLBACK ();
1126 1161
1127 screen.cur.col = relative & C_RELATIVE ? screen.cur.col + col : col; 1162 screen.cur.col = relative & C_RELATIVE ? screen.cur.col + col : col;
1165/* ------------------------------------------------------------------------- */ 1200/* ------------------------------------------------------------------------- */
1166/* 1201/*
1167 * direction should be UP or DN 1202 * direction should be UP or DN
1168 */ 1203 */
1169void 1204void
1170rxvt_term::scr_index (enum page_dirn direction) 1205rxvt_term::scr_index (enum page_dirn direction) NOTHROW
1171{ 1206{
1172 int dirn; 1207 int dirn;
1173 1208
1174 want_refresh = 1; 1209 want_refresh = 1;
1175 ZERO_SCROLLBACK (); 1210 ZERO_SCROLLBACK ();
1194 * XTERM_SEQ: Clear line to right: ESC [ 0 K 1229 * XTERM_SEQ: Clear line to right: ESC [ 0 K
1195 * XTERM_SEQ: Clear line to left : ESC [ 1 K 1230 * XTERM_SEQ: Clear line to left : ESC [ 1 K
1196 * XTERM_SEQ: Clear whole line : ESC [ 2 K 1231 * XTERM_SEQ: Clear whole line : ESC [ 2 K
1197 */ 1232 */
1198void 1233void
1199rxvt_term::scr_erase_line (int mode) 1234rxvt_term::scr_erase_line (int mode) NOTHROW
1200{ 1235{
1201 unsigned int col, num; 1236 unsigned int col, num;
1202 1237
1203 want_refresh = 1; 1238 want_refresh = 1;
1204 ZERO_SCROLLBACK (); 1239 ZERO_SCROLLBACK ();
1248 * XTERM_SEQ: Clear screen after cursor : ESC [ 0 J 1283 * XTERM_SEQ: Clear screen after cursor : ESC [ 0 J
1249 * XTERM_SEQ: Clear screen before cursor: ESC [ 1 J 1284 * XTERM_SEQ: Clear screen before cursor: ESC [ 1 J
1250 * XTERM_SEQ: Clear whole screen : ESC [ 2 J 1285 * XTERM_SEQ: Clear whole screen : ESC [ 2 J
1251 */ 1286 */
1252void 1287void
1253rxvt_term::scr_erase_screen (int mode) 1288rxvt_term::scr_erase_screen (int mode) NOTHROW
1254{ 1289{
1255 int num; 1290 int num;
1256 int32_t row; 1291 int32_t row;
1257 rend_t ren; 1292 rend_t ren;
1258 XGCValues gcvalue; 1293 XGCValues gcvalue;
1318 } 1353 }
1319} 1354}
1320 1355
1321#if ENABLE_FRILLS 1356#if ENABLE_FRILLS
1322void 1357void
1323rxvt_term::scr_erase_savelines () 1358rxvt_term::scr_erase_savelines () NOTHROW
1324{ 1359{
1325 want_refresh = 1; 1360 want_refresh = 1;
1326 ZERO_SCROLLBACK (); 1361 ZERO_SCROLLBACK ();
1327 1362
1328 nsaved = 0; 1363 top_row = 0;
1329} 1364}
1330#endif 1365#endif
1331 1366
1332/* ------------------------------------------------------------------------- */ 1367/* ------------------------------------------------------------------------- */
1333/* 1368/*
1334 * Fill the screen with `E's 1369 * Fill the screen with `E's
1335 * XTERM_SEQ: Screen Alignment Test: ESC # 8 1370 * XTERM_SEQ: Screen Alignment Test: ESC # 8
1336 */ 1371 */
1337void 1372void
1338rxvt_term::scr_E () 1373rxvt_term::scr_E () NOTHROW
1339{ 1374{
1340 rend_t fs; 1375 rend_t fs;
1341 1376
1342 want_refresh = 1; 1377 want_refresh = 1;
1343 ZERO_SCROLLBACK (); 1378 ZERO_SCROLLBACK ();
1364/* ------------------------------------------------------------------------- */ 1399/* ------------------------------------------------------------------------- */
1365/* 1400/*
1366 * Insert/Delete <count> lines 1401 * Insert/Delete <count> lines
1367 */ 1402 */
1368void 1403void
1369rxvt_term::scr_insdel_lines (int count, int insdel) 1404rxvt_term::scr_insdel_lines (int count, int insdel) NOTHROW
1370{ 1405{
1371 int end; 1406 int end;
1372 1407
1373 ZERO_SCROLLBACK (); 1408 ZERO_SCROLLBACK ();
1374 1409
1394/* ------------------------------------------------------------------------- */ 1429/* ------------------------------------------------------------------------- */
1395/* 1430/*
1396 * Insert/Delete <count> characters from the current position 1431 * Insert/Delete <count> characters from the current position
1397 */ 1432 */
1398void 1433void
1399rxvt_term::scr_insdel_chars (int count, int insdel) 1434rxvt_term::scr_insdel_chars (int count, int insdel) NOTHROW
1400{ 1435{
1401 int col, row; 1436 int col, row;
1402 rend_t tr; 1437 rend_t tr;
1403 1438
1404 want_refresh = 1; 1439 want_refresh = 1;
1492/* 1527/*
1493 * Set the scrolling region 1528 * Set the scrolling region
1494 * XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r 1529 * XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r
1495 */ 1530 */
1496void 1531void
1497rxvt_term::scr_scroll_region (int top, int bot) 1532rxvt_term::scr_scroll_region (int top, int bot) NOTHROW
1498{ 1533{
1499 max_it (top, 0); 1534 max_it (top, 0);
1500 min_it (bot, nrow - 1); 1535 min_it (bot, nrow - 1);
1501 1536
1502 if (top > bot) 1537 if (top > bot)
1512 * Make the cursor visible/invisible 1547 * Make the cursor visible/invisible
1513 * XTERM_SEQ: Make cursor visible : ESC [ ? 25 h 1548 * XTERM_SEQ: Make cursor visible : ESC [ ? 25 h
1514 * XTERM_SEQ: Make cursor invisible: ESC [ ? 25 l 1549 * XTERM_SEQ: Make cursor invisible: ESC [ ? 25 l
1515 */ 1550 */
1516void 1551void
1517rxvt_term::scr_cursor_visible (int mode) 1552rxvt_term::scr_cursor_visible (int mode) NOTHROW
1518{ 1553{
1519 want_refresh = 1; 1554 want_refresh = 1;
1520 1555
1521 if (mode) 1556 if (mode)
1522 screen.flags |= Screen_VisibleCursor; 1557 screen.flags |= Screen_VisibleCursor;
1529 * Set/unset automatic wrapping 1564 * Set/unset automatic wrapping
1530 * XTERM_SEQ: Set Wraparound : ESC [ ? 7 h 1565 * XTERM_SEQ: Set Wraparound : ESC [ ? 7 h
1531 * XTERM_SEQ: Unset Wraparound: ESC [ ? 7 l 1566 * XTERM_SEQ: Unset Wraparound: ESC [ ? 7 l
1532 */ 1567 */
1533void 1568void
1534rxvt_term::scr_autowrap (int mode) 1569rxvt_term::scr_autowrap (int mode) NOTHROW
1535{ 1570{
1536 if (mode) 1571 if (mode)
1537 screen.flags |= Screen_Autowrap; 1572 screen.flags |= Screen_Autowrap;
1538 else 1573 else
1539 screen.flags &= ~(Screen_Autowrap | Screen_WrapNext); 1574 screen.flags &= ~(Screen_Autowrap | Screen_WrapNext);
1548 * and the cursor cannot be moved outside. 1583 * and the cursor cannot be moved outside.
1549 * XTERM_SEQ: Set Absolute: ESC [ ? 6 h 1584 * XTERM_SEQ: Set Absolute: ESC [ ? 6 h
1550 * XTERM_SEQ: Set Relative: ESC [ ? 6 l 1585 * XTERM_SEQ: Set Relative: ESC [ ? 6 l
1551 */ 1586 */
1552void 1587void
1553rxvt_term::scr_relative_origin (int mode) 1588rxvt_term::scr_relative_origin (int mode) NOTHROW
1554{ 1589{
1555 if (mode) 1590 if (mode)
1556 screen.flags |= Screen_Relative; 1591 screen.flags |= Screen_Relative;
1557 else 1592 else
1558 screen.flags &= ~Screen_Relative; 1593 screen.flags &= ~Screen_Relative;
1565 * Set insert/replace mode 1600 * Set insert/replace mode
1566 * XTERM_SEQ: Set Insert mode : ESC [ ? 4 h 1601 * XTERM_SEQ: Set Insert mode : ESC [ ? 4 h
1567 * XTERM_SEQ: Set Replace mode: ESC [ ? 4 l 1602 * XTERM_SEQ: Set Replace mode: ESC [ ? 4 l
1568 */ 1603 */
1569void 1604void
1570rxvt_term::scr_insert_mode (int mode) 1605rxvt_term::scr_insert_mode (int mode) NOTHROW
1571{ 1606{
1572 if (mode) 1607 if (mode)
1573 screen.flags |= Screen_Insert; 1608 screen.flags |= Screen_Insert;
1574 else 1609 else
1575 screen.flags &= ~Screen_Insert; 1610 screen.flags &= ~Screen_Insert;
1581 * XTERM_SEQ: Set tab at current column : ESC H 1616 * XTERM_SEQ: Set tab at current column : ESC H
1582 * XTERM_SEQ: Clear tab at current column: ESC [ 0 g 1617 * XTERM_SEQ: Clear tab at current column: ESC [ 0 g
1583 * XTERM_SEQ: Clear all tabs : ESC [ 3 g 1618 * XTERM_SEQ: Clear all tabs : ESC [ 3 g
1584 */ 1619 */
1585void 1620void
1586rxvt_term::scr_set_tab (int mode) 1621rxvt_term::scr_set_tab (int mode) NOTHROW
1587{ 1622{
1588 if (mode < 0) 1623 if (mode < 0)
1589 memset (tabs, 0, ncol * sizeof (char)); 1624 memset (tabs, 0, ncol * sizeof (char));
1590 else if (screen.cur.col < ncol) 1625 else if (screen.cur.col < ncol)
1591 tabs [screen.cur.col] = !!mode; 1626 tabs [screen.cur.col] = !!mode;
1596 * Set reverse/normal video 1631 * Set reverse/normal video
1597 * XTERM_SEQ: Reverse video: ESC [ ? 5 h 1632 * XTERM_SEQ: Reverse video: ESC [ ? 5 h
1598 * XTERM_SEQ: Normal video : ESC [ ? 5 l 1633 * XTERM_SEQ: Normal video : ESC [ ? 5 l
1599 */ 1634 */
1600void 1635void
1601rxvt_term::scr_rvideo_mode (int mode) 1636rxvt_term::scr_rvideo_mode (bool on) NOTHROW
1602{ 1637{
1603 XGCValues gcvalue; 1638 rvideo_mode = on;
1604 1639
1640#ifndef NO_BELL
1641 on ^= rvideo_bell;
1642#endif
1643
1605 if (rvideo != mode) 1644 if (rvideo_state != on)
1606 { 1645 {
1607 rvideo = mode; 1646 rvideo_state = on;
1647
1608 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]); 1648 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]);
1609#if XPM_BACKGROUND 1649#if XPM_BACKGROUND
1610 if (bgPixmap.pixmap == None) 1650 if (bgPixmap.pixmap == None)
1611#endif 1651#endif
1612#if TRANSPARENT 1652#if TRANSPARENT
1613 if (! OPTION (Opt_transparent) || am_transparent == 0) 1653 if (!OPTION (Opt_transparent) || am_transparent == 0)
1614#endif 1654#endif
1615 XSetWindowBackground (display->display, vt, 1655 XSetWindowBackground (display->display, vt, pix_colors[Color_bg]);
1616 pix_colors[Color_bg]);
1617 1656
1657 XGCValues gcvalue;
1618 gcvalue.foreground = pix_colors[Color_fg]; 1658 gcvalue.foreground = pix_colors[Color_fg];
1619 gcvalue.background = pix_colors[Color_bg]; 1659 gcvalue.background = pix_colors[Color_bg];
1620 XChangeGC (display->display, gc, GCBackground | GCForeground, 1660 XChangeGC (display->display, gc, GCBackground | GCForeground, &gcvalue);
1621 &gcvalue); 1661
1622 scr_clear (); 1662 scr_clear ();
1623 scr_touch (true); 1663 scr_touch (true);
1624 } 1664 }
1625} 1665}
1626 1666
1628/* 1668/*
1629 * Report current cursor position 1669 * Report current cursor position
1630 * XTERM_SEQ: Report position: ESC [ 6 n 1670 * XTERM_SEQ: Report position: ESC [ 6 n
1631 */ 1671 */
1632void 1672void
1633rxvt_term::scr_report_position () 1673rxvt_term::scr_report_position () NOTHROW
1634{ 1674{
1635 tt_printf ("\033[%d;%dR", screen.cur.row + 1, screen.cur.col + 1); 1675 tt_printf ("\033[%d;%dR", screen.cur.row + 1, screen.cur.col + 1);
1636} 1676}
1637 1677
1638/* ------------------------------------------------------------------------- * 1678/* ------------------------------------------------------------------------- *
1641 1681
1642/* 1682/*
1643 * Set font style 1683 * Set font style
1644 */ 1684 */
1645void 1685void
1646rxvt_term::set_font_style () 1686rxvt_term::set_font_style () NOTHROW
1647{ 1687{
1648#if 0 1688#if 0
1649 switch (charsets [screen.charset]) 1689 switch (charsets [screen.charset])
1650 { 1690 {
1651 case '0': /* DEC Special Character & Line Drawing Set */ 1691 case '0': /* DEC Special Character & Line Drawing Set */
1673 * XTERM_SEQ: Invoke G1 character set: CTRL-N 1713 * XTERM_SEQ: Invoke G1 character set: CTRL-N
1674 * XTERM_SEQ: Invoke G2 character set: ESC N 1714 * XTERM_SEQ: Invoke G2 character set: ESC N
1675 * XTERM_SEQ: Invoke G3 character set: ESC O 1715 * XTERM_SEQ: Invoke G3 character set: ESC O
1676 */ 1716 */
1677void 1717void
1678rxvt_term::scr_charset_choose (int set) 1718rxvt_term::scr_charset_choose (int set) NOTHROW
1679{ 1719{
1680 screen.charset = set; 1720 screen.charset = set;
1681 set_font_style (); 1721 set_font_style ();
1682} 1722}
1683 1723
1689 * XTERM_SEQ: Set G2 character set: ESC * <C> 1729 * XTERM_SEQ: Set G2 character set: ESC * <C>
1690 * XTERM_SEQ: Set G3 character set: ESC + <C> 1730 * XTERM_SEQ: Set G3 character set: ESC + <C>
1691 * See set_font_style for possible values for <C> 1731 * See set_font_style for possible values for <C>
1692 */ 1732 */
1693void 1733void
1694rxvt_term::scr_charset_set (int set, unsigned int ch) 1734rxvt_term::scr_charset_set (int set, unsigned int ch) NOTHROW
1695{ 1735{
1696 charsets[set] = (unsigned char)ch; 1736 charsets[set] = (unsigned char)ch;
1697 set_font_style (); 1737 set_font_style ();
1698} 1738}
1699 1739
1704 1744
1705/* 1745/*
1706 * refresh matching text. 1746 * refresh matching text.
1707 */ 1747 */
1708bool 1748bool
1709rxvt_term::scr_refresh_rend (rend_t mask, rend_t value) 1749rxvt_term::scr_refresh_rend (rend_t mask, rend_t value) NOTHROW
1710{ 1750{
1711 bool found = false; 1751 bool found = false;
1712 1752
1713 for (int i = 0; i < nrow; i++) 1753 for (int i = 0; i < nrow; i++)
1714 { 1754 {
1734 PART_END, 1774 PART_END,
1735 RC_COUNT 1775 RC_COUNT
1736}; 1776};
1737 1777
1738void 1778void
1739rxvt_term::scr_expose (int x, int y, int ewidth, int eheight, bool refresh) 1779rxvt_term::scr_expose (int x, int y, int ewidth, int eheight, bool refresh) NOTHROW
1740{ 1780{
1741 int i; 1781 int i;
1742 row_col_t rc[RC_COUNT]; 1782 row_col_t rc[RC_COUNT];
1743 1783
1744 if (!drawn_buf) /* sanity check */ 1784 if (!drawn_buf) /* sanity check */
1767 } 1807 }
1768 1808
1769 for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++) 1809 for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++)
1770 fill_text (&drawn_buf[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1); 1810 fill_text (&drawn_buf[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1);
1771 1811
1812 num_scr_allow = 0;
1813
1772 if (refresh) 1814 if (refresh)
1773 scr_refresh (SLOW_REFRESH); 1815 scr_refresh ();
1774} 1816}
1775 1817
1776/* ------------------------------------------------------------------------- */ 1818/* ------------------------------------------------------------------------- */
1777/* 1819/*
1778 * Refresh the entire screen 1820 * Refresh the entire screen
1779 */ 1821 */
1780void 1822void
1781rxvt_term::scr_touch (bool refresh) 1823rxvt_term::scr_touch (bool refresh) NOTHROW
1782{ 1824{
1783 scr_expose (0, 0, width, height, refresh); 1825 scr_expose (0, 0, width, height, refresh);
1784} 1826}
1785 1827
1786/* ------------------------------------------------------------------------- */ 1828/* ------------------------------------------------------------------------- */
1787/* 1829/*
1788 * Move the display so that the line represented by scrollbar value Y is at 1830 * Move the display so that the line represented by scrollbar value Y is at
1789 * the top of the screen 1831 * the top of the screen
1790 */ 1832 */
1791int 1833void
1792rxvt_term::scr_move_to (int y, int len) 1834rxvt_term::scr_move_to (int y, int len) NOTHROW
1793{ 1835{
1794 long p = 0; 1836 scr_changeview ((top_row - nrow) * (len - y) / len + (nrow - 1));
1795 unsigned int oldviewstart;
1796
1797 oldviewstart = view_start;
1798
1799 if (y < len)
1800 {
1801 p = (nrow + nsaved) * (len - y) / len;
1802 p -= (long) (nrow - 1);
1803 p = max (p, 0);
1804 }
1805
1806 view_start = (unsigned int)min (p, nsaved);
1807
1808 return scr_changeview (oldviewstart);
1809} 1837}
1810 1838
1811/* ------------------------------------------------------------------------- */ 1839/* ------------------------------------------------------------------------- */
1812/* 1840/*
1813 * Page the screen up/down nlines 1841 * Page the screen up/down nlines
1814 * direction should be UP or DN 1842 * direction should be UP or DN
1815 */ 1843 */
1816int 1844bool
1817rxvt_term::scr_page (enum page_dirn direction, int nlines) 1845rxvt_term::scr_page (enum page_dirn direction, int nlines) NOTHROW
1818{ 1846{
1819 int n; 1847 int new_view_start =
1820 unsigned int oldviewstart;
1821
1822 oldviewstart = view_start;
1823
1824 if (direction == UP)
1825 {
1826 n = view_start + nlines;
1827 view_start = min (n, nsaved);
1828 }
1829 else
1830 {
1831 n = view_start - nlines; 1848 direction == UP ? view_start - nlines
1832 view_start = max (n, 0); 1849 : view_start + nlines;
1833 }
1834 1850
1835 return scr_changeview (oldviewstart); 1851 return scr_changeview (new_view_start);
1836} 1852}
1837 1853
1838int 1854bool
1839rxvt_term::scr_changeview (unsigned int oldviewstart) 1855rxvt_term::scr_changeview (int new_view_start) NOTHROW
1840{ 1856{
1857 clamp_it (new_view_start, top_row, 0);
1858
1841 if (view_start != oldviewstart) 1859 if (new_view_start == view_start)
1842 { 1860 return false;
1861
1862 num_scr += new_view_start - view_start;
1863 view_start = new_view_start;
1864 want_refresh = 1;
1865
1843 HOOK_INVOKE ((this, HOOK_VIEW_CHANGE, DT_INT, view_start, DT_END)); 1866 HOOK_INVOKE ((this, HOOK_VIEW_CHANGE, DT_INT, view_start, DT_END));
1844 1867
1845 want_refresh = 1; 1868 return true;
1846 num_scr -= (view_start - oldviewstart);
1847 }
1848
1849 return (int)view_start - (int)oldviewstart;
1850} 1869}
1851 1870
1852/* ------------------------------------------------------------------------- */ 1871#ifndef NO_BELL
1853void 1872void
1873rxvt_term::bell_cb (time_watcher &w)
1874{
1875 rvideo_bell = false;
1876 scr_rvideo_mode (rvideo_mode);
1877}
1878#endif
1879
1880/* ------------------------------------------------------------------------- */
1881void
1854rxvt_term::scr_bell () 1882rxvt_term::scr_bell () NOTHROW
1855{ 1883{
1856#ifndef NO_BELL 1884#ifndef NO_BELL
1857 1885
1858# ifndef NO_MAPALERT 1886# ifndef NO_MAPALERT
1859# ifdef MAPALERT_OPTION 1887# ifdef MAPALERT_OPTION
1862 XMapWindow (display->display, parent[0]); 1890 XMapWindow (display->display, parent[0]);
1863# endif 1891# endif
1864 1892
1865 if (OPTION (Opt_visualBell)) 1893 if (OPTION (Opt_visualBell))
1866 { 1894 {
1867 scr_rvideo_mode (!rvideo); /* refresh also done */ 1895 rvideo_bell = true;
1868 rxvt_usleep (VISUAL_BELL_DURATION); 1896 scr_rvideo_mode (rvideo_mode);
1869 scr_rvideo_mode (!rvideo); /* refresh also done */ 1897 display->flush ();
1898
1899 bell_ev.start (NOW + VISUAL_BELL_DURATION);
1870 } 1900 }
1871 else 1901 else
1872 XBell (display->display, 0); 1902 XBell (display->display, 0);
1873 1903
1874#endif 1904#endif
1875} 1905}
1876 1906
1877/* ------------------------------------------------------------------------- */ 1907/* ------------------------------------------------------------------------- */
1878/* ARGSUSED */ 1908/* ARGSUSED */
1879void 1909void
1880rxvt_term::scr_printscreen (int fullhist) 1910rxvt_term::scr_printscreen (int fullhist) NOTHROW
1881{ 1911{
1882#ifdef PRINTPIPE 1912#ifdef PRINTPIPE
1883 int nrows, row_start; 1913 int nrows, row_start;
1884 FILE *fd; 1914 FILE *fd;
1885 1915
1886 if ((fd = popen_printer ()) == NULL) 1916 if ((fd = popen_printer ()) == NULL)
1887 return; 1917 return;
1888 1918
1889 if (fullhist) 1919 if (fullhist)
1890 { 1920 {
1891 nrows = nrow + nsaved; 1921 nrows = nrow - top_row;
1892 row_start = -nsaved; 1922 row_start = top_row;
1893 } 1923 }
1894 else 1924 else
1895 { 1925 {
1896 nrows = nrow; 1926 nrows = nrow;
1897 row_start = -view_start; 1927 row_start = view_start;
1898 } 1928 }
1899 1929
1900 wctomb (0, 0); 1930 wctomb (0, 0);
1901 1931
1902 for (int r1 = 0; r1 < nrows; r1++) 1932 for (int r1 = 0; r1 < nrows; r1++)
1934 * Refresh the screen 1964 * Refresh the screen
1935 * drawn_text/drawn_rend contain the screen information before the update. 1965 * drawn_text/drawn_rend contain the screen information before the update.
1936 * screen.text/screen.rend contain what the screen will change to. 1966 * screen.text/screen.rend contain what the screen will change to.
1937 */ 1967 */
1938void 1968void
1939rxvt_term::scr_refresh (unsigned char refresh_type) 1969rxvt_term::scr_refresh () NOTHROW
1940{ 1970{
1941 unsigned char must_clear, /* use draw_string not draw_image_string */ 1971 unsigned char must_clear, /* use draw_string not draw_image_string */
1942 showcursor; /* show the cursor */ 1972 showcursor; /* show the cursor */
1943 int16_t col, row, /* column/row we're processing */ 1973 int16_t col, row, /* column/row we're processing */
1944 ocrow; /* old cursor row */ 1974 ocrow; /* old cursor row */
2030 2060
2031 /* make sure no outline cursor is left around */ 2061 /* make sure no outline cursor is left around */
2032 setoldcursor = 0; 2062 setoldcursor = 0;
2033 if (ocrow != -1) 2063 if (ocrow != -1)
2034 { 2064 {
2035 if (screen.cur.row + view_start != ocrow 2065 if (screen.cur.row - view_start != ocrow
2036 || screen.cur.col != oldcursor.col) 2066 || screen.cur.col != oldcursor.col)
2037 { 2067 {
2038 if (ocrow < nrow 2068 if (ocrow < nrow
2039 && oldcursor.col < ncol) 2069 && oldcursor.col < ncol)
2040 drawn_buf[ocrow].r[oldcursor.col] ^= (RS_RVid | RS_Uline); 2070 drawn_buf[ocrow].r[oldcursor.col] ^= (RS_RVid | RS_Uline);
2048 else if (!focus) 2078 else if (!focus)
2049 setoldcursor = 1; 2079 setoldcursor = 1;
2050 2080
2051 if (setoldcursor) 2081 if (setoldcursor)
2052 { 2082 {
2053 if (screen.cur.row + view_start >= nrow) 2083 if (screen.cur.row - view_start >= nrow)
2054 oldcursor.row = -1; 2084 oldcursor.row = -1;
2055 else 2085 else
2056 { 2086 {
2057 oldcursor.row = screen.cur.row + view_start; 2087 oldcursor.row = screen.cur.row - view_start;
2058 oldcursor.col = screen.cur.col; 2088 oldcursor.col = screen.cur.col;
2059 } 2089 }
2060 } 2090 }
2061 } 2091 }
2062 2092
2068#ifndef NO_SLOW_LINK_SUPPORT 2098#ifndef NO_SLOW_LINK_SUPPORT
2069 /* 2099 /*
2070 * D: CopyArea pass - very useful for slower links 2100 * D: CopyArea pass - very useful for slower links
2071 * This has been deliberately kept simple. 2101 * This has been deliberately kept simple.
2072 */ 2102 */
2073 i = num_scr;
2074 if (!display->is_local 2103 if (!display->is_local
2075 && refresh_type == FAST_REFRESH && num_scr_allow && num_scr 2104 && refresh_type == FAST_REFRESH && num_scr_allow && num_scr
2076 && abs (num_scr) < nrow && !must_clear) 2105 && abs (num_scr) < nrow && !must_clear)
2077 { 2106 {
2078 int16_t nits; 2107 int16_t nits;
2079 int j; 2108 int j;
2080 int len, wlen; 2109 int len, wlen;
2110 dLocal (int, num_scr);
2081 2111
2082 j = nrow; 2112 j = nrow;
2083 wlen = len = -1; 2113 wlen = len = -1;
2084 row = i > 0 ? 0 : j - 1; 2114 row = i > 0 ? 0 : j - 1;
2085 for (; j-- >= 0; row += (i > 0 ? 1 : -1)) 2115 for (; j-- >= 0; row += (i > 0 ? 1 : -1))
2086 { 2116 {
2087 if (row + i >= 0 && row + i < nrow && row + i != ocrow) 2117 if (row + i >= 0 && row + i < nrow && row + i != ocrow)
2088 { 2118 {
2089 line_t s = ROW(row - view_start); 2119 line_t s = ROW(view_start + row);
2090 line_t d = drawn_buf[row]; 2120 line_t d = drawn_buf[row];
2091 line_t d2 = drawn_buf[row + i]; 2121 line_t d2 = drawn_buf[row + i];
2092 2122
2093 for (nits = 0, col = ncol; col--; ) 2123 for (nits = 0, col = ncol; col--; )
2094 if (s.t[col] != d2.t[col] || s.r[col] != d2.r[col]) 2124 if (s.t[col] != d2.t[col] || s.r[col] != d2.r[col])
2132 /* 2162 /*
2133 * E: main pass across every character 2163 * E: main pass across every character
2134 */ 2164 */
2135 for (row = 0; row < nrow; row++) 2165 for (row = 0; row < nrow; row++)
2136 { 2166 {
2137 text_t *stp = ROW(row - view_start).t; 2167 text_t *stp = ROW(view_start + row).t;
2138 rend_t *srp = ROW(row - view_start).r; 2168 rend_t *srp = ROW(view_start + row).r;
2139 text_t *dtp = drawn_buf[row].t; 2169 text_t *dtp = drawn_buf[row].t;
2140 rend_t *drp = drawn_buf[row].r; 2170 rend_t *drp = drawn_buf[row].r;
2141 2171
2142 /* 2172 /*
2143 * E2: OK, now the real pass 2173 * E2: OK, now the real pass
2380 /* 2410 /*
2381 * H: cleanup selection 2411 * H: cleanup selection
2382 */ 2412 */
2383 scr_reverse_selection (); 2413 scr_reverse_selection ();
2384 2414
2385 if (refresh_type & SMOOTH_REFRESH)
2386 XFlush (display->display);
2387
2388 num_scr = 0; 2415 num_scr = 0;
2389 num_scr_allow = 1; 2416 num_scr_allow = 1;
2390} 2417}
2391 2418
2392void 2419void
2393rxvt_term::scr_remap_chars (line_t &l) 2420rxvt_term::scr_remap_chars (line_t &l) NOTHROW
2394{ 2421{
2395 if (!l.t) 2422 if (!l.t)
2396 return; 2423 return;
2397 2424
2398 l.touch (); // maybe a bit of an overkill, but it's not performance-relevant 2425 l.touch (); // maybe a bit of an overkill, but it's not performance-relevant
2400 for (int i = ncol; i--; ) 2427 for (int i = ncol; i--; )
2401 l.r[i] = SET_FONT (l.r[i], FONTSET (l.r[i])->find_font (l.t[i])); 2428 l.r[i] = SET_FONT (l.r[i], FONTSET (l.r[i])->find_font (l.t[i]));
2402} 2429}
2403 2430
2404void 2431void
2405rxvt_term::scr_remap_chars () 2432rxvt_term::scr_remap_chars () NOTHROW
2406{ 2433{
2407 for (int i = total_rows; i--; ) 2434 for (int i = total_rows; i--; )
2408 scr_remap_chars (row_buf [i]); 2435 scr_remap_chars (row_buf [i]);
2409 2436
2410 for (int i = nrow; i--; ) 2437 for (int i = nrow; i--; )
2413 scr_remap_chars (swap_buf [i]); 2440 scr_remap_chars (swap_buf [i]);
2414 } 2441 }
2415} 2442}
2416 2443
2417void 2444void
2418rxvt_term::scr_recolour () 2445rxvt_term::scr_recolour () NOTHROW
2419{ 2446{
2420 if (1 2447 if (1
2421#if TRANSPARENT 2448#if TRANSPARENT
2422 && !am_transparent 2449 && !am_transparent
2423#endif 2450#endif
2444 want_refresh = 1; 2471 want_refresh = 1;
2445} 2472}
2446 2473
2447/* ------------------------------------------------------------------------- */ 2474/* ------------------------------------------------------------------------- */
2448void 2475void
2449rxvt_term::scr_clear (bool really) 2476rxvt_term::scr_clear (bool really) NOTHROW
2450{ 2477{
2451 if (!mapped) 2478 if (!mapped)
2452 return; 2479 return;
2453 2480
2454 num_scr_allow = 0; 2481 num_scr_allow = 0;
2456 2483
2457 if (really) 2484 if (really)
2458 XClearWindow (display->display, vt); 2485 XClearWindow (display->display, vt);
2459} 2486}
2460 2487
2461/* ------------------------------------------------------------------------- */
2462void 2488void
2489rxvt_term::scr_xor_rect (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle1, rend_t rstyle2) NOTHROW
2490{
2491 int view_end = view_start + nrow;
2492 int row, col;
2493
2494 for (row = max (beg_row, view_start); row <= min (end_row, view_end); row++)
2495 {
2496 text_t *stp = ROW(row).t;
2497 rend_t *srp = ROW(row).r;
2498
2499 for (col = beg_col; col < end_col; col++)
2500 srp[col] ^= rstyle1;
2501
2502 while (col-- > beg_col && (stp[col] == NOCHAR || unicode::is_space (stp[col])))
2503 srp[col] ^= rstyle2;
2504
2505 if (++col < end_col)
2506 srp[col] ^= rstyle2;
2507 }
2508}
2509
2510void
2511rxvt_term::scr_xor_span (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle) NOTHROW
2512{
2513 int view_end = view_start + nrow;
2514 int row, col;
2515
2516 if (beg_row >= view_start)
2517 {
2518 col = beg_col;
2519 row = beg_row;
2520 }
2521 else
2522 {
2523 col = 0;
2524 row = view_start;
2525 }
2526
2527 for (; row < min (end_row, view_end); row++, col = 0)
2528 for (rend_t *srp = ROW(row).r; col < ncol; col++)
2529 srp[col] ^= rstyle;
2530
2531 if (row == end_row)
2532 for (rend_t *srp = ROW(row).r; col < end_col; col++)
2533 srp[col] ^= rstyle;
2534}
2535
2536/* ------------------------------------------------------------------------- */
2537void
2463rxvt_term::scr_reverse_selection () 2538rxvt_term::scr_reverse_selection () NOTHROW
2464{ 2539{
2465 if (selection.op 2540 if (selection.op
2466 && current_screen == selection.screen 2541 && current_screen == selection.screen
2467 && selection.end.row >= -view_start) 2542 && selection.end.row >= view_start)
2468 { 2543 {
2469 int view_end = -view_start + nrow;
2470 int row, col;
2471
2472#if ENABLE_FRILLS 2544#if ENABLE_FRILLS
2473 if (selection.rect) 2545 if (selection.rect)
2474 { 2546 scr_xor_rect (selection.beg.row, selection.beg.col,
2475 for (row = max (selection.beg.row, -view_start); row <= min (selection.end.row, view_end); row++) 2547 selection.end.row, selection.end.col,
2476 { 2548 RS_RVid, RS_RVid | RS_Uline);
2477 text_t *stp = ROW(row).t;
2478 rend_t *srp = ROW(row).r;
2479
2480 for (col = selection.beg.col; col < selection.end.col; col++)
2481 srp[col] ^= RS_RVid;
2482
2483 while (col-- > selection.beg.col && (stp[col] == NOCHAR || unicode::is_space (stp[col])))
2484 srp[col] ^= RS_RVid | RS_Uline;
2485
2486 if (++col < selection.end.col)
2487 srp[col] ^= RS_RVid | RS_Uline;
2488 }
2489 }
2490 else 2549 else
2491#endif 2550#endif
2492 { 2551 scr_xor_span (selection.beg.row, selection.beg.col,
2493 if (selection.beg.row >= -view_start) 2552 selection.end.row, selection.end.col,
2494 { 2553 RS_RVid);
2495 col = selection.beg.col;
2496 row = selection.beg.row;
2497 }
2498 else
2499 {
2500 col = 0;
2501 row = -view_start;
2502 }
2503
2504 for (; row < min (selection.end.row, view_end); row++, col = 0)
2505 for (rend_t *srp = ROW(row).r; col < ncol; col++)
2506 srp[col] ^= RS_RVid;
2507
2508 if (row == selection.end.row)
2509 for (rend_t *srp = ROW(row).r; col < selection.end.col; col++)
2510 srp[col] ^= RS_RVid;
2511 }
2512 } 2554 }
2513} 2555}
2514 2556
2515/* ------------------------------------------------------------------------- */ 2557/* ------------------------------------------------------------------------- */
2516/* 2558/*
2517 * Dump the whole scrollback and screen to the passed filedescriptor. The 2559 * Dump the whole scrollback and screen to the passed filedescriptor. The
2518 * invoking routine must close the fd. 2560 * invoking routine must close the fd.
2519 */ 2561 */
2520#if 0 2562#if 0
2521void 2563void
2522rxvt_term::scr_dump (int fd) 2564rxvt_term::scr_dump (int fd) NOTHROW
2523{ 2565{
2524 int row, wrote; 2566 int row, wrote;
2525 unsigned int width, towrite; 2567 unsigned int width, towrite;
2526 char r1[] = "\n"; 2568 char r1[] = "\n";
2527 2569
2546 2588
2547/* ------------------------------------------------------------------------- * 2589/* ------------------------------------------------------------------------- *
2548 * CHARACTER SELECTION * 2590 * CHARACTER SELECTION *
2549 * ------------------------------------------------------------------------- */ 2591 * ------------------------------------------------------------------------- */
2550void 2592void
2551rxvt_term::selection_check (int check_more) 2593rxvt_term::selection_check (int check_more) NOTHROW
2552{ 2594{
2553 row_col_t pos; 2595 row_col_t pos;
2554 2596
2555 if (!selection.op) 2597 if (!selection.op)
2556 return; 2598 return;
2557 2599
2558 pos.row = pos.col = 0; 2600 pos.row = pos.col = 0;
2559 if (!IN_RANGE_EXC (selection.beg.row, -nsaved, nrow) 2601 if (!IN_RANGE_EXC (selection.beg.row, top_row, nrow)
2560 || !IN_RANGE_EXC (selection.mark.row, -nsaved, nrow) 2602 || !IN_RANGE_EXC (selection.mark.row, top_row, nrow)
2561 || !IN_RANGE_EXC (selection.end.row, -nsaved, nrow) 2603 || !IN_RANGE_EXC (selection.end.row, top_row, nrow)
2562 || (check_more == 1 2604 || (check_more == 1
2563 && current_screen == selection.screen 2605 && current_screen == selection.screen
2564 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) 2606 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
2565 && ROWCOL_IS_BEFORE (screen.cur, selection.end)) 2607 && ROWCOL_IS_BEFORE (screen.cur, selection.end))
2566 || (check_more == 2 2608 || (check_more == 2
2577/* ------------------------------------------------------------------------- */ 2619/* ------------------------------------------------------------------------- */
2578/* 2620/*
2579 * Paste a selection direct to the command fd 2621 * Paste a selection direct to the command fd
2580 */ 2622 */
2581void 2623void
2582rxvt_term::paste (char *data, unsigned int len) 2624rxvt_term::paste (char *data, unsigned int len) NOTHROW
2583{ 2625{
2584 /* convert normal newline chars into common keyboard Return key sequence */ 2626 /* convert normal newline chars into common keyboard Return key sequence */
2585 for (unsigned int i = 0; i < len; i++) 2627 for (unsigned int i = 0; i < len; i++)
2586 if (data[i] == C0_LF) 2628 if (data[i] == C0_LF)
2587 data[i] = C0_CR; 2629 data[i] = C0_CR;
2593/* 2635/*
2594 * Respond to a notification that a primary selection has been sent 2636 * Respond to a notification that a primary selection has been sent
2595 * EXT: SelectionNotify 2637 * EXT: SelectionNotify
2596 */ 2638 */
2597void 2639void
2598rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop) 2640rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop) NOTHROW
2599{ 2641{
2600 if (prop == None) /* check for failed XConvertSelection */ 2642 if (prop == None) /* check for failed XConvertSelection */
2601 { 2643 {
2602 if ((selection_type & Sel_CompoundText)) 2644 if ((selection_type & Sel_CompoundText))
2603 { 2645 {
2755 if (selection_wait == Sel_normal) 2797 if (selection_wait == Sel_normal)
2756 selection_wait = Sel_none; 2798 selection_wait = Sel_none;
2757} 2799}
2758 2800
2759void 2801void
2760rxvt_term::incr_cb (time_watcher &w) 2802rxvt_term::incr_cb (time_watcher &w) NOTHROW
2761{ 2803{
2762 selection_wait = Sel_none; 2804 selection_wait = Sel_none;
2763 2805
2764 incr_buf_size = 0; 2806 incr_buf_size = 0;
2765 free (incr_buf); 2807 free (incr_buf);
2766 2808
2767 rxvt_warn ("data loss: timeout on INCR selection paste, ignoring.\n"); 2809 rxvt_warn ("data loss: timeout on INCR selection paste, ignoring.\n");
2768} 2810}
2769 2811
2770void 2812void
2771rxvt_term::selection_property (Window win, Atom prop) 2813rxvt_term::selection_property (Window win, Atom prop) NOTHROW
2772{ 2814{
2773 if (prop == None || selection_wait != Sel_incr) 2815 if (prop == None || selection_wait != Sel_incr)
2774 return; 2816 return;
2775 2817
2776 selection_paste (win, prop, true); 2818 selection_paste (win, prop, true);
2785 * (+) if ownership is claimed but property is empty, rxvt_selection_paste () 2827 * (+) if ownership is claimed but property is empty, rxvt_selection_paste ()
2786 * will auto fallback to CUT_BUFFER0 2828 * will auto fallback to CUT_BUFFER0
2787 * EXT: button 2 release 2829 * EXT: button 2 release
2788 */ 2830 */
2789void 2831void
2790rxvt_term::selection_request (Time tm, int x, int y) 2832rxvt_term::selection_request (Time tm, int selnum) NOTHROW
2791{ 2833{
2792 if (x < 0 || x >= width || y < 0 || y >= height) 2834 if (selection.text && selnum == Sel_Primary)
2793 return; /* outside window */
2794
2795 if (selection.text)
2796 { /* internal selection */ 2835 { /* internal selection */
2797 char *str = rxvt_wcstombs (selection.text, selection.len); 2836 char *str = rxvt_wcstombs (selection.text, selection.len);
2798 paste (str, strlen (str)); 2837 paste (str, strlen (str));
2799 free (str); 2838 free (str);
2800 return; 2839 return;
2801 } 2840 }
2802 else 2841 else
2803 { 2842 {
2804 int i;
2805
2806 selection_request_time = tm; 2843 selection_request_time = tm;
2807 selection_wait = Sel_normal; 2844 selection_wait = Sel_normal;
2808 2845
2809 for (i = Sel_Primary; i <= Sel_Clipboard; i++)
2810 {
2811#if X_HAVE_UTF8_STRING 2846#if X_HAVE_UTF8_STRING
2812 selection_type = Sel_UTF8String; 2847 selection_type = Sel_UTF8String;
2813 if (selection_request_other (xa[XA_UTF8_STRING], i)) 2848 if (selection_request_other (xa[XA_UTF8_STRING], selnum))
2814 return; 2849 return;
2815#else 2850#else
2816 selection_type = Sel_CompoundText; 2851 selection_type = Sel_CompoundText;
2817 if (selection_request_other (xa[XA_COMPOUND_TEXT], i)) 2852 if (selection_request_other (xa[XA_COMPOUND_TEXT], selnum))
2818 return; 2853 return;
2819#endif 2854#endif
2820 }
2821 } 2855 }
2822 2856
2823 selection_wait = Sel_none; /* don't loop in selection_paste () */ 2857 selection_wait = Sel_none; /* don't loop in selection_paste () */
2824 selection_paste (display->root, XA_CUT_BUFFER0, false); 2858 selection_paste (display->root, XA_CUT_BUFFER0, false);
2825} 2859}
2826 2860
2827int 2861int
2828rxvt_term::selection_request_other (Atom target, int selnum) 2862rxvt_term::selection_request_other (Atom target, int selnum) NOTHROW
2829{ 2863{
2830 Atom sel; 2864 Atom sel;
2831 2865
2832 selection_type |= selnum; 2866 selection_type |= selnum;
2833 2867
2852/* 2886/*
2853 * Clear all selected text 2887 * Clear all selected text
2854 * EXT: SelectionClear 2888 * EXT: SelectionClear
2855 */ 2889 */
2856void 2890void
2857rxvt_term::selection_clear () 2891rxvt_term::selection_clear () NOTHROW
2858{ 2892{
2859 want_refresh = 1; 2893 want_refresh = 1;
2860 free (selection.text); 2894 free (selection.text);
2861 selection.text = NULL; 2895 selection.text = NULL;
2862 selection.len = 0; 2896 selection.len = 0;
2997 3031
2998 selection_grab (tm); 3032 selection_grab (tm);
2999} 3033}
3000 3034
3001bool 3035bool
3002rxvt_term::selection_grab (Time tm) 3036rxvt_term::selection_grab (Time tm) NOTHROW
3003{ 3037{
3004 selection_time = tm; 3038 selection_time = tm;
3005 3039
3006 XSetSelectionOwner (display->display, XA_PRIMARY, vt, tm); 3040 XSetSelectionOwner (display->display, XA_PRIMARY, vt, tm);
3007 if (XGetSelectionOwner (display->display, XA_PRIMARY) == vt) 3041 if (XGetSelectionOwner (display->display, XA_PRIMARY) == vt)
3008 { 3042 {
3009 display->set_selection_owner (this); 3043 display->set_selection_owner (this);
3010 return true; 3044 return true;
3011 } 3045 }
3012 else 3046 else
3047 {
3048 selection_clear ();
3013 return false; 3049 return false;
3050 }
3014 3051
3015#if 0 3052#if 0
3016 XTextProperty ct; 3053 XTextProperty ct;
3017 3054
3018 if (XwcTextListToTextProperty (display->display, &selection.text, 1, XStringStyle, &ct) >= 0) 3055 if (XwcTextListToTextProperty (display->display, &selection.text, 1, XStringStyle, &ct) >= 0)
3027/* 3064/*
3028 * Mark or select text based upon number of clicks: 1, 2, or 3 3065 * Mark or select text based upon number of clicks: 1, 2, or 3
3029 * EXT: button 1 press 3066 * EXT: button 1 press
3030 */ 3067 */
3031void 3068void
3032rxvt_term::selection_click (int clicks, int x, int y) 3069rxvt_term::selection_click (int clicks, int x, int y) NOTHROW
3033{ 3070{
3034 clicks = ((clicks - 1) % 3) + 1; 3071 clicks = ((clicks - 1) % 3) + 1;
3035 selection.clicks = clicks; /* save clicks so extend will work */ 3072 selection.clicks = clicks; /* save clicks so extend will work */
3036 3073
3074 if (clicks == 2 && !selection.rect
3075 && HOOK_INVOKE ((this, HOOK_SEL_EXTEND, DT_END)))
3076 {
3077 MEvent.clicks = 1; // what a mess
3078 selection.screen = current_screen;
3079 selection.op = SELECTION_CONT;
3080 return;
3081 }
3082
3037 selection_start_colrow (Pixel2Col (x), Pixel2Row (y)); 3083 selection_start_colrow (Pixel2Col (x), Pixel2Row (y));
3038 3084
3039 if (clicks == 2 || clicks == 3) 3085 if (clicks == 2 || clicks == 3)
3040 selection_extend_colrow (selection.mark.col, 3086 selection_extend_colrow (selection.mark.col,
3041 selection.mark.row + view_start, 3087 selection.mark.row - view_start,
3042 0, /* button 3 */ 3088 0, /* button 3 */
3043 1, /* button press */ 3089 1, /* button press */
3044 0); /* click change */ 3090 0); /* click change */
3045} 3091}
3046 3092
3047/* ------------------------------------------------------------------------- */ 3093/* ------------------------------------------------------------------------- */
3048/* 3094/*
3049 * Mark a selection at the specified col/row 3095 * Mark a selection at the specified col/row
3050 */ 3096 */
3051void 3097void
3052rxvt_term::selection_start_colrow (int col, int row) 3098rxvt_term::selection_start_colrow (int col, int row) NOTHROW
3053{ 3099{
3054 want_refresh = 1; 3100 want_refresh = 1;
3055 3101
3056 selection.mark.row = row - view_start; 3102 selection.mark.row = row + view_start;
3057 selection.mark.col = col; 3103 selection.mark.col = col;
3058 3104
3059 selection.mark.row = clamp (selection.mark.row, -nsaved, nrow - 1); 3105 selection.mark.row = clamp (selection.mark.row, top_row, nrow - 1);
3060 selection.mark.col = clamp (selection.mark.col, 0, ncol - 1); 3106 selection.mark.col = clamp (selection.mark.col, 0, ncol - 1);
3061 3107
3062 while (selection.mark.col > 0 3108 while (selection.mark.col > 0
3063 && ROW(selection.mark.row).t[selection.mark.col] == NOCHAR) 3109 && ROW(selection.mark.row).t[selection.mark.col] == NOCHAR)
3064 --selection.mark.col; 3110 --selection.mark.col;
3083#define DELIMIT_TEXT(x) \ 3129#define DELIMIT_TEXT(x) \
3084 (unicode::is_space (x) ? 2 : (x) <= 0xff && !!strchr (rs[Rs_cutchars], (x))) 3130 (unicode::is_space (x) ? 2 : (x) <= 0xff && !!strchr (rs[Rs_cutchars], (x)))
3085#define DELIMIT_REND(x) 1 3131#define DELIMIT_REND(x) 1
3086 3132
3087void 3133void
3088rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) 3134rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) NOTHROW
3089{ 3135{
3090 int col, row, dirnadd, tcol, trow, w1, w2; 3136 int col, row, dirnadd, tcol, trow, w1, w2;
3091 row_col_t bound; 3137 row_col_t bound;
3092 text_t *stp; 3138 text_t *stp;
3093 rend_t *srp; 3139 rend_t *srp;
3094 3140
3095 if (dirn == UP) 3141 if (dirn == UP)
3096 { 3142 {
3097 bound.row = - nsaved - 1; 3143 bound.row = top_row - 1;
3098 bound.col = 0; 3144 bound.col = 0;
3099 dirnadd = -1; 3145 dirnadd = -1;
3100 } 3146 }
3101 else 3147 else
3102 { 3148 {
3167 * flag == 0 ==> button 1 3213 * flag == 0 ==> button 1
3168 * flag == 1 ==> button 3 press 3214 * flag == 1 ==> button 3 press
3169 * flag == 2 ==> button 3 motion 3215 * flag == 2 ==> button 3 motion
3170 */ 3216 */
3171void 3217void
3172rxvt_term::selection_extend (int x, int y, int flag) 3218rxvt_term::selection_extend (int x, int y, int flag) NOTHROW
3173{ 3219{
3174 int col = clamp (Pixel2Col (x), 0, ncol); 3220 int col = clamp (Pixel2Col (x), 0, ncol);
3175 int row = clamp (Pixel2Row (y), 0, nrow - 1); 3221 int row = clamp (Pixel2Row (y), 0, nrow - 1);
3176 3222
3177 /* 3223 /*
3180 * select nothing. Otherwise, if we're to the right of the mark, you have to 3226 * select nothing. Otherwise, if we're to the right of the mark, you have to
3181 * be _past_ a character for it to be selected. 3227 * be _past_ a character for it to be selected.
3182 */ 3228 */
3183 if (((selection.clicks % 3) == 1) && !flag 3229 if (((selection.clicks % 3) == 1) && !flag
3184 && (col == selection.mark.col 3230 && (col == selection.mark.col
3185 && (row == selection.mark.row + view_start))) 3231 && (row == selection.mark.row - view_start)))
3186 { 3232 {
3187 /* select nothing */ 3233 /* select nothing */
3188 selection.beg.row = selection.end.row = 0; 3234 selection.beg.row = selection.end.row = 0;
3189 selection.beg.col = selection.end.col = 0; 3235 selection.beg.col = selection.end.col = 0;
3190 selection.clicks = 4; 3236 selection.clicks = 4;
3203/* ------------------------------------------------------------------------- */ 3249/* ------------------------------------------------------------------------- */
3204/* 3250/*
3205 * Extend the selection to the specified col/row 3251 * Extend the selection to the specified col/row
3206 */ 3252 */
3207void 3253void
3208rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) 3254rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) NOTHROW
3209{ 3255{
3210 row_col_t pos; 3256 row_col_t pos;
3211 enum { 3257 enum {
3212 LEFT, RIGHT 3258 LEFT, RIGHT
3213 } closeto = RIGHT; 3259 } closeto = RIGHT;
3245 selection.beg.col = selection.end.col = selection.mark.col; 3291 selection.beg.col = selection.end.col = selection.mark.col;
3246 selection.beg.row = selection.end.row = selection.mark.row; 3292 selection.beg.row = selection.end.row = selection.mark.row;
3247 } 3293 }
3248 3294
3249 pos.col = col; 3295 pos.col = col;
3250 pos.row = row - view_start; 3296 pos.row = view_start + row;
3251 3297
3252 /* 3298 /*
3253 * This is mainly xterm style selection with a couple of differences, mainly 3299 * This is mainly xterm style selection with a couple of differences, mainly
3254 * in the way button3 drag extension works. 3300 * in the way button3 drag extension works.
3255 * We're either doing: button1 drag; button3 press; or button3 drag 3301 * We're either doing: button1 drag; button3 press; or button3 drag
3336 else if (selection.clicks == 2) 3382 else if (selection.clicks == 2)
3337 { 3383 {
3338 if (ROWCOL_IS_AFTER (selection.end, selection.beg)) 3384 if (ROWCOL_IS_AFTER (selection.end, selection.beg))
3339 selection.end.col--; 3385 selection.end.col--;
3340 3386
3341 if (!HOOK_INVOKE ((this, HOOK_SEL_EXTEND, DT_END)))
3342 {
3343 selection_delimit_word (UP, &selection.beg, &selection.beg); 3387 selection_delimit_word (UP, &selection.beg, &selection.beg);
3344 selection_delimit_word (DN, &selection.end, &selection.end); 3388 selection_delimit_word (DN, &selection.end, &selection.end);
3345 }
3346 } 3389 }
3347 else if (selection.clicks == 3) 3390 else if (selection.clicks == 3)
3348 { 3391 {
3349#if ENABLE_FRILLS 3392#if ENABLE_FRILLS
3350 if (OPTION (Opt_tripleclickwords)) 3393 if (OPTION (Opt_tripleclickwords))
3402#endif 3445#endif
3403} 3446}
3404 3447
3405#if ENABLE_FRILLS 3448#if ENABLE_FRILLS
3406void 3449void
3407rxvt_term::selection_remove_trailing_spaces () 3450rxvt_term::selection_remove_trailing_spaces () NOTHROW
3408{ 3451{
3409 int32_t end_col, end_row; 3452 int32_t end_col, end_row;
3410 text_t *stp; 3453 text_t *stp;
3411 3454
3412 end_col = selection.end.col; 3455 end_col = selection.end.col;
3450/* 3493/*
3451 * Double click on button 3 when already selected 3494 * Double click on button 3 when already selected
3452 * EXT: button 3 double click 3495 * EXT: button 3 double click
3453 */ 3496 */
3454void 3497void
3455rxvt_term::selection_rotate (int x, int y) 3498rxvt_term::selection_rotate (int x, int y) NOTHROW
3456{ 3499{
3457 selection.clicks = selection.clicks % 3 + 1; 3500 selection.clicks = selection.clicks % 3 + 1;
3458 selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1); 3501 selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1);
3459} 3502}
3460 3503
3462/* 3505/*
3463 * Respond to a request for our current selection 3506 * Respond to a request for our current selection
3464 * EXT: SelectionRequest 3507 * EXT: SelectionRequest
3465 */ 3508 */
3466void 3509void
3467rxvt_term::selection_send (const XSelectionRequestEvent &rq) 3510rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW
3468{ 3511{
3469 XSelectionEvent ev; 3512 XSelectionEvent ev;
3470 dDisp; 3513 dDisp;
3471 3514
3472 ev.type = SelectionNotify; 3515 ev.type = SelectionNotify;
3600 3643
3601/* 3644/*
3602 * return col/row values corresponding to x/y pixel values 3645 * return col/row values corresponding to x/y pixel values
3603 */ 3646 */
3604void 3647void
3605rxvt_term::pixel_position (int *x, int *y) 3648rxvt_term::pixel_position (int *x, int *y) NOTHROW
3606{ 3649{
3607 *x = Pixel2Col (*x); 3650 *x = Pixel2Col (*x);
3608 /* max_it (*x, 0); min_it (*x, (int)ncol - 1); */ 3651 /* max_it (*x, 0); min_it (*x, (int)ncol - 1); */
3609 *y = Pixel2Row (*y); 3652 *y = Pixel2Row (*y);
3610 /* max_it (*y, 0); min_it (*y, (int)nrow - 1); */ 3653 /* max_it (*y, 0); min_it (*y, (int)nrow - 1); */
3611} 3654}
3612 3655
3613/* ------------------------------------------------------------------------- */ 3656/* ------------------------------------------------------------------------- */
3614#ifdef USE_XIM 3657#ifdef USE_XIM
3615void 3658void
3616rxvt_term::im_set_position (XPoint &pos) 3659rxvt_term::im_set_position (XPoint &pos) NOTHROW
3617{ 3660{
3618 XWindowAttributes xwa; 3661 XWindowAttributes xwa;
3619 3662
3620 XGetWindowAttributes (display->display, vt, &xwa); 3663 XGetWindowAttributes (display->display, vt, &xwa);
3621 3664
3624} 3667}
3625#endif 3668#endif
3626 3669
3627#if ENABLE_OVERLAY 3670#if ENABLE_OVERLAY
3628void 3671void
3629rxvt_term::scr_overlay_new (int x, int y, int w, int h) 3672rxvt_term::scr_overlay_new (int x, int y, int w, int h) NOTHROW
3630{ 3673{
3631 if (nrow < 1 || ncol < 1) 3674 if (nrow < 1 || ncol < 1)
3632 return; 3675 return;
3633 3676
3634 want_refresh = 1; 3677 want_refresh = 1;
3679 *rp = r; 3722 *rp = r;
3680 } 3723 }
3681} 3724}
3682 3725
3683void 3726void
3684rxvt_term::scr_overlay_off () 3727rxvt_term::scr_overlay_off () NOTHROW
3685{ 3728{
3686 if (!ov_text) 3729 if (!ov_text)
3687 return; 3730 return;
3688 3731
3689 want_refresh = 1; 3732 want_refresh = 1;
3697 delete [] ov_text; ov_text = 0; 3740 delete [] ov_text; ov_text = 0;
3698 delete [] ov_rend; ov_rend = 0; 3741 delete [] ov_rend; ov_rend = 0;
3699} 3742}
3700 3743
3701void 3744void
3702rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) 3745rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) NOTHROW
3703{ 3746{
3704 if (!ov_text || x >= ov_w - 2 || y >= ov_h - 2) 3747 if (!ov_text || x >= ov_w - 2 || y >= ov_h - 2)
3705 return; 3748 return;
3706 3749
3707 x++, y++; 3750 x++, y++;
3709 ov_text[y][x] = text; 3752 ov_text[y][x] = text;
3710 ov_rend[y][x] = rend; 3753 ov_rend[y][x] = rend;
3711} 3754}
3712 3755
3713void 3756void
3714rxvt_term::scr_overlay_set (int x, int y, const char *s) 3757rxvt_term::scr_overlay_set (int x, int y, const char *s) NOTHROW
3715{ 3758{
3716 while (*s) 3759 while (*s)
3717 scr_overlay_set (x++, y, *s++); 3760 scr_overlay_set (x++, y, *s++);
3718} 3761}
3719 3762
3720void 3763void
3721rxvt_term::scr_overlay_set (int x, int y, const wchar_t *s) 3764rxvt_term::scr_overlay_set (int x, int y, const wchar_t *s) NOTHROW
3722{ 3765{
3723 while (*s) 3766 while (*s)
3724 { 3767 {
3725 text_t t = *s++; 3768 text_t t = *s++;
3726 int width = wcwidth (t); 3769 int width = wcwidth (t);
3732 } 3775 }
3733 } 3776 }
3734} 3777}
3735 3778
3736void 3779void
3737rxvt_term::scr_swap_overlay () 3780rxvt_term::scr_swap_overlay () NOTHROW
3738{ 3781{
3739 if (!ov_text) 3782 if (!ov_text)
3740 return; 3783 return;
3741 3784
3742 // swap screen mem with overlay 3785 // swap screen mem with overlay
3743 for (int y = ov_h; y--; ) 3786 for (int y = ov_h; y--; )
3744 { 3787 {
3745 text_t *t1 = ov_text[y]; 3788 text_t *t1 = ov_text[y];
3746 rend_t *r1 = ov_rend[y]; 3789 rend_t *r1 = ov_rend[y];
3747 3790
3748 text_t *t2 = ROW(y + ov_y - view_start).t + ov_x; 3791 text_t *t2 = ROW(y + ov_y + view_start).t + ov_x;
3749 rend_t *r2 = ROW(y + ov_y - view_start).r + ov_x; 3792 rend_t *r2 = ROW(y + ov_y + view_start).r + ov_x;
3750 3793
3751 for (int x = ov_w; x--; ) 3794 for (int x = ov_w; x--; )
3752 { 3795 {
3753 text_t t = *t1; *t1++ = *t2; *t2++ = t; 3796 text_t t = *t1; *t1++ = *t2; *t2++ = t;
3754 rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t)); 3797 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