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.225 by root, Thu Jan 12 05:22:47 2006 UTC vs.
Revision 1.254 by root, Sat Jan 28 14:23:16 2006 UTC

… …
93 */ 93 */
94#define drawBuffer vt 94#define drawBuffer vt
95 95
96#define CLEAR_ROWS(row, num) \ 96#define CLEAR_ROWS(row, num) \
97 if (mapped) \ 97 if (mapped) \
98 XClearArea (display->display, drawBuffer, 0, \ 98 XClearArea (xdisp, drawBuffer, 0, \
99 Row2Pixel (row), (unsigned int)width, \ 99 Row2Pixel (row), (unsigned int)width, \
100 (unsigned int)Height2Pixel (num), False) 100 (unsigned int)Height2Pixel (num), False)
101 101
102#define CLEAR_CHARS(x, y, num) \ 102#define CLEAR_CHARS(x, y, num) \
103 if (mapped) \ 103 if (mapped) \
104 XClearArea (display->display, drawBuffer, x, y, \ 104 XClearArea (xdisp, drawBuffer, x, y, \
105 (unsigned int)Width2Pixel (num), \ 105 (unsigned int)Width2Pixel (num), \
106 (unsigned int)Height2Pixel (1), False) 106 (unsigned int)Height2Pixel (1), False)
107 107
108#define ERASE_ROWS(row, num) \ 108#define ERASE_ROWS(row, num) \
109 XFillRectangle (display->display, drawBuffer, gc, \ 109 XFillRectangle (xdisp, drawBuffer, gc, \
110 0, Row2Pixel (row), \ 110 0, Row2Pixel (row), \
111 (unsigned int)width, \ 111 (unsigned int)width, \
112 (unsigned int)Height2Pixel (num)) 112 (unsigned int)Height2Pixel (num))
113 113
114/* ------------------------------------------------------------------------- * 114/* ------------------------------------------------------------------------- *
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;
126 width = ncol; 126 width = ncol;
127 } 127 }
128 128
129 l.touch (); 129 l.touch ();
130 130
131 efs &= ~RS_baseattrMask; 131 efs &= ~RS_baseattrMask; // remove italic etc. fontstyles
132 efs = SET_FONT (efs, FONTSET (efs)->find_font (' ')); 132 efs = SET_FONT (efs, FONTSET (efs)->find_font (' '));
133 133
134 text_t *et = l.t + col; 134 text_t *et = l.t + col;
135 rend_t *er = l.r + col; 135 rend_t *er = l.r + col;
136 136
… …
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 (!IN_RANGE_INC (color, minCOLOR, 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)
… …
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 line_t &l = ROW(nrow - 1 - i);
647
648 // optimize if already cleared, can be significant on slow machines
649 // could be rolled into scr_blank_screen_mem
650 if (l.r && l.l < ncol - 1 && !((l.r[l.l + 1] ^ rstyle) & RS_bgMask))
651 {
652 scr_blank_line (l, 0, l.l, rstyle);
653 l.l = 0;
654 l.f = 0;
655 }
656 else
657 scr_blank_screen_mem (l, rstyle);
658 }
659
660 // now copy lines below the scroll region bottom to the
661 // bottom of the screen again, so they look as if they
662 // hadn't moved.
663 for (int i = nrow; --i > row2; )
664 {
665 line_t &l1 = ROW(i - count);
666 line_t &l2 = ROW(i);
667
668 ::swap (l1, l2);
669 l2.touch ();
670 }
624 671
625 term_start = (term_start + count) % total_rows; 672 // move and/or clear selection, if any
626
627 if (selection.op && current_screen == selection.screen) 673 if (selection.op && current_screen == selection.screen)
628 { 674 {
629 selection.beg.row -= count; 675 selection.beg.row -= count;
630 selection.end.row -= count; 676 selection.end.row -= count;
631 selection.mark.row -= count; 677 selection.mark.row -= count;
632 678
633 if (selection.beg.row < -nsaved 679 if (selection.beg.row < top_row
634 || selection.end.row < -nsaved 680 || selection.end.row < top_row
635 || selection.mark.row < -nsaved) 681 || selection.mark.row < top_row)
636 { 682 {
637 CLEAR_ALL_SELECTION (); 683 CLEAR_ALL_SELECTION ();
638 selection.op = SELECTION_CLEAR; 684 selection.op = SELECTION_CLEAR;
639 } 685 }
640 } 686 }
641 687
642 for (int i = count; i--; ) 688 // 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) 689 if (OPTION (Opt_scrollWithBuffer)
655 && view_start != 0 690 && view_start != 0
656 && view_start != saveLines) 691 && view_start != -saveLines)
657 scr_page (UP, count); 692 scr_page (UP, count);
693
694 if (SHOULD_INVOKE (HOOK_SCROLL_BACK))
695 HOOK_INVOKE ((this, HOOK_SCROLL_BACK, DT_INT, count, DT_INT, top_row, DT_END));
658 } 696 }
659 else 697 else
660 { 698 {
661 if (selection.op && current_screen == selection.screen) 699 if (selection.op && current_screen == selection.screen)
662 { 700 {
… …
708/* ------------------------------------------------------------------------- */ 746/* ------------------------------------------------------------------------- */
709/* 747/*
710 * Add text given in <str> of length <len> to screen struct 748 * Add text given in <str> of length <len> to screen struct
711 */ 749 */
712void 750void
713rxvt_term::scr_add_lines (const wchar_t *str, int len, int minlines) 751rxvt_term::scr_add_lines (const wchar_t *str, int len, int minlines) NOTHROW
714{ 752{
715 if (len <= 0) /* sanity */ 753 if (len <= 0) /* sanity */
716 return; 754 return;
717 755
718 unsigned char checksel; 756 unsigned char checksel;
… …
724 ZERO_SCROLLBACK (); 762 ZERO_SCROLLBACK ();
725 763
726 if (minlines > 0) 764 if (minlines > 0)
727 { 765 {
728 minlines += screen.cur.row - screen.bscroll; 766 minlines += screen.cur.row - screen.bscroll;
767 min_it (minlines, screen.cur.row - top_row);
729 768
730 if (minlines > 0 769 if (minlines > 0
731 && screen.tscroll == 0 770 && screen.tscroll == 0
732 && screen.bscroll == nrow - 1) 771 && screen.bscroll == nrow - 1)
733 { 772 {
… …
738 } 777 }
739 778
740#ifdef DEBUG_STRICT 779#ifdef DEBUG_STRICT
741 assert (screen.cur.col < ncol); 780 assert (screen.cur.col < ncol);
742 assert (screen.cur.row < nrow 781 assert (screen.cur.row < nrow
743 && screen.cur.row >= -nsaved); 782 && screen.cur.row >= top_row);
744#endif 783#endif
745 int row = screen.cur.row; 784 int row = screen.cur.row;
746 785
747 checksel = selection.op && current_screen == selection.screen ? 1 : 0; 786 checksel = selection.op && current_screen == selection.screen ? 1 : 0;
748 787
… …
794 CLEAR_SELECTION (); 833 CLEAR_SELECTION ();
795 } 834 }
796 835
797 if (screen.flags & Screen_WrapNext) 836 if (screen.flags & Screen_WrapNext)
798 { 837 {
799 max_it (line->l, ncol);
800 line->is_longer (1);
801
802 scr_do_wrap (); 838 scr_do_wrap ();
803 839
840 line->l = ncol;
841 line->is_longer (1);
842
804 row = screen.cur.row; 843 row = screen.cur.row;
805 line = &ROW(row); /* _must_ refresh */ 844 line = &ROW(row); /* _must_ refresh */
806 } 845 }
807 846
808 // some utf-8 decoders "decode" surrogate characters: let's fix this. 847 // some utf-8 decoders "decode" surrogate characters: let's fix this.
809 if (IN_RANGE_INC (c, 0xd800, 0xdfff)) 848 if (IN_RANGE_INC (c, 0xd800, 0xdfff))
810 c = 0xfffd; 849 c = 0xfffd;
811 850
812 // rely on wcwidth to tell us the character width, at least for non-latin1 851 // rely on wcwidth to tell us the character width, do wcwidth before
813 // do wcwidth before further replacements, as wcwidth might return -1 852 // further replacements, as wcwidth might return -1 for the line
814 // for the line drawing characters below as they might be invalid in the current 853 // drawing characters below as they might be invalid in the current
815 // locale. 854 // locale.
816 int width = c < 0x100 ? 1 : wcwidth (c); 855 int width = WCWIDTH (c);
817 856
818 if (charsets [screen.charset] == '0') // DEC SPECIAL 857 if (charsets [screen.charset] == '0') // DEC SPECIAL
819 { 858 {
820 // vt100 special graphics and line drawing 859 // vt100 special graphics and line drawing
821 // 5f-7e standard vt100 860 // 5f-7e standard vt100
… …
972/* 1011/*
973 * Process Backspace. Move back the cursor back a position, wrap if have to 1012 * Process Backspace. Move back the cursor back a position, wrap if have to
974 * XTERM_SEQ: CTRL-H 1013 * XTERM_SEQ: CTRL-H
975 */ 1014 */
976void 1015void
977rxvt_term::scr_backspace () 1016rxvt_term::scr_backspace () NOTHROW
978{ 1017{
979 want_refresh = 1; 1018 want_refresh = 1;
980 1019
981 if (screen.cur.col == 0) 1020 if (screen.cur.col == 0)
982 { 1021 {
… …
1000 * Process Horizontal Tab 1039 * Process Horizontal Tab
1001 * count: +ve = forward; -ve = backwards 1040 * count: +ve = forward; -ve = backwards
1002 * XTERM_SEQ: CTRL-I 1041 * XTERM_SEQ: CTRL-I
1003 */ 1042 */
1004void 1043void
1005rxvt_term::scr_tab (int count, bool ht) 1044rxvt_term::scr_tab (int count, bool ht) NOTHROW
1006{ 1045{
1007 int i, x; 1046 int i, x;
1008 1047
1009 want_refresh = 1; 1048 want_refresh = 1;
1010 i = x = screen.cur.col; 1049 i = x = screen.cur.col;
… …
1077 * Move cursor left in row. If we're at the left boundary, shift everything 1116 * Move cursor left in row. If we're at the left boundary, shift everything
1078 * in that row right. Clear left column. 1117 * in that row right. Clear left column.
1079 */ 1118 */
1080#if ENABLE_FRILLS 1119#if ENABLE_FRILLS
1081void 1120void
1082rxvt_term::scr_backindex () 1121rxvt_term::scr_backindex () NOTHROW
1083{ 1122{
1084 if (screen.cur.col > 0) 1123 if (screen.cur.col > 0)
1085 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE); 1124 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE);
1086 else 1125 else
1087 scr_insdel_chars (1, INSERT); 1126 scr_insdel_chars (1, INSERT);
… …
1094 * Move cursor right in row. If we're at the right boundary, shift everything 1133 * Move cursor right in row. If we're at the right boundary, shift everything
1095 * in that row left. Clear right column. 1134 * in that row left. Clear right column.
1096 */ 1135 */
1097#if ENABLE_FRILLS 1136#if ENABLE_FRILLS
1098void 1137void
1099rxvt_term::scr_forwardindex () 1138rxvt_term::scr_forwardindex () NOTHROW
1100{ 1139{
1101 if (screen.cur.col < ncol - 1) 1140 if (screen.cur.col < ncol - 1)
1102 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE); 1141 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE);
1103 else 1142 else
1104 { 1143 {
… …
1117/* ------------------------------------------------------------------------- */ 1156/* ------------------------------------------------------------------------- */
1118/* 1157/*
1119 * Goto Row/Column 1158 * Goto Row/Column
1120 */ 1159 */
1121void 1160void
1122rxvt_term::scr_gotorc (int row, int col, int relative) 1161rxvt_term::scr_gotorc (int row, int col, int relative) NOTHROW
1123{ 1162{
1124 want_refresh = 1; 1163 want_refresh = 1;
1125 ZERO_SCROLLBACK (); 1164 ZERO_SCROLLBACK ();
1126 1165
1127 screen.cur.col = relative & C_RELATIVE ? screen.cur.col + col : col; 1166 screen.cur.col = relative & C_RELATIVE ? screen.cur.col + col : col;
… …
1165/* ------------------------------------------------------------------------- */ 1204/* ------------------------------------------------------------------------- */
1166/* 1205/*
1167 * direction should be UP or DN 1206 * direction should be UP or DN
1168 */ 1207 */
1169void 1208void
1170rxvt_term::scr_index (enum page_dirn direction) 1209rxvt_term::scr_index (enum page_dirn direction) NOTHROW
1171{ 1210{
1172 int dirn; 1211 int dirn;
1173 1212
1174 want_refresh = 1; 1213 want_refresh = 1;
1175 ZERO_SCROLLBACK (); 1214 ZERO_SCROLLBACK ();
… …
1194 * XTERM_SEQ: Clear line to right: ESC [ 0 K 1233 * XTERM_SEQ: Clear line to right: ESC [ 0 K
1195 * XTERM_SEQ: Clear line to left : ESC [ 1 K 1234 * XTERM_SEQ: Clear line to left : ESC [ 1 K
1196 * XTERM_SEQ: Clear whole line : ESC [ 2 K 1235 * XTERM_SEQ: Clear whole line : ESC [ 2 K
1197 */ 1236 */
1198void 1237void
1199rxvt_term::scr_erase_line (int mode) 1238rxvt_term::scr_erase_line (int mode) NOTHROW
1200{ 1239{
1201 unsigned int col, num; 1240 unsigned int col, num;
1202 1241
1203 want_refresh = 1; 1242 want_refresh = 1;
1204 ZERO_SCROLLBACK (); 1243 ZERO_SCROLLBACK ();
… …
1248 * XTERM_SEQ: Clear screen after cursor : ESC [ 0 J 1287 * XTERM_SEQ: Clear screen after cursor : ESC [ 0 J
1249 * XTERM_SEQ: Clear screen before cursor: ESC [ 1 J 1288 * XTERM_SEQ: Clear screen before cursor: ESC [ 1 J
1250 * XTERM_SEQ: Clear whole screen : ESC [ 2 J 1289 * XTERM_SEQ: Clear whole screen : ESC [ 2 J
1251 */ 1290 */
1252void 1291void
1253rxvt_term::scr_erase_screen (int mode) 1292rxvt_term::scr_erase_screen (int mode) NOTHROW
1254{ 1293{
1255 int num; 1294 int num;
1256 int32_t row; 1295 int32_t row;
1257 rend_t ren; 1296 rend_t ren;
1258 XGCValues gcvalue; 1297 XGCValues gcvalue;
… …
1303 } 1342 }
1304 else 1343 else
1305 { 1344 {
1306 ren = rstyle & (RS_fgMask | RS_bgMask); 1345 ren = rstyle & (RS_fgMask | RS_bgMask);
1307 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)]; 1346 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)];
1308 XChangeGC (display->display, gc, GCForeground, &gcvalue); 1347 XChangeGC (xdisp, gc, GCForeground, &gcvalue);
1309 ERASE_ROWS (row, num); 1348 ERASE_ROWS (row, num);
1310 gcvalue.foreground = pix_colors[Color_fg]; 1349 gcvalue.foreground = pix_colors[Color_fg];
1311 XChangeGC (display->display, gc, GCForeground, &gcvalue); 1350 XChangeGC (xdisp, gc, GCForeground, &gcvalue);
1312 } 1351 }
1313 1352
1314 for (; num--; row++) 1353 for (; num--; row++)
1315 { 1354 {
1316 scr_blank_screen_mem (ROW(row), rstyle); 1355 scr_blank_screen_mem (ROW(row), rstyle);
… …
1318 } 1357 }
1319} 1358}
1320 1359
1321#if ENABLE_FRILLS 1360#if ENABLE_FRILLS
1322void 1361void
1323rxvt_term::scr_erase_savelines () 1362rxvt_term::scr_erase_savelines () NOTHROW
1324{ 1363{
1325 want_refresh = 1; 1364 want_refresh = 1;
1326 ZERO_SCROLLBACK (); 1365 ZERO_SCROLLBACK ();
1327 1366
1328 nsaved = 0; 1367 top_row = 0;
1329} 1368}
1330#endif 1369#endif
1331 1370
1332/* ------------------------------------------------------------------------- */ 1371/* ------------------------------------------------------------------------- */
1333/* 1372/*
1334 * Fill the screen with `E's 1373 * Fill the screen with `E's
1335 * XTERM_SEQ: Screen Alignment Test: ESC # 8 1374 * XTERM_SEQ: Screen Alignment Test: ESC # 8
1336 */ 1375 */
1337void 1376void
1338rxvt_term::scr_E () 1377rxvt_term::scr_E () NOTHROW
1339{ 1378{
1340 rend_t fs; 1379 rend_t fs;
1341 1380
1342 want_refresh = 1; 1381 want_refresh = 1;
1343 ZERO_SCROLLBACK (); 1382 ZERO_SCROLLBACK ();
… …
1364/* ------------------------------------------------------------------------- */ 1403/* ------------------------------------------------------------------------- */
1365/* 1404/*
1366 * Insert/Delete <count> lines 1405 * Insert/Delete <count> lines
1367 */ 1406 */
1368void 1407void
1369rxvt_term::scr_insdel_lines (int count, int insdel) 1408rxvt_term::scr_insdel_lines (int count, int insdel) NOTHROW
1370{ 1409{
1371 int end; 1410 int end;
1372 1411
1373 ZERO_SCROLLBACK (); 1412 ZERO_SCROLLBACK ();
1374 1413
… …
1394/* ------------------------------------------------------------------------- */ 1433/* ------------------------------------------------------------------------- */
1395/* 1434/*
1396 * Insert/Delete <count> characters from the current position 1435 * Insert/Delete <count> characters from the current position
1397 */ 1436 */
1398void 1437void
1399rxvt_term::scr_insdel_chars (int count, int insdel) 1438rxvt_term::scr_insdel_chars (int count, int insdel) NOTHROW
1400{ 1439{
1401 int col, row; 1440 int col, row;
1402 rend_t tr; 1441 rend_t tr;
1403 1442
1404 want_refresh = 1; 1443 want_refresh = 1;
… …
1492/* 1531/*
1493 * Set the scrolling region 1532 * Set the scrolling region
1494 * XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r 1533 * XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r
1495 */ 1534 */
1496void 1535void
1497rxvt_term::scr_scroll_region (int top, int bot) 1536rxvt_term::scr_scroll_region (int top, int bot) NOTHROW
1498{ 1537{
1499 max_it (top, 0); 1538 max_it (top, 0);
1500 min_it (bot, nrow - 1); 1539 min_it (bot, nrow - 1);
1501 1540
1502 if (top > bot) 1541 if (top > bot)
… …
1512 * Make the cursor visible/invisible 1551 * Make the cursor visible/invisible
1513 * XTERM_SEQ: Make cursor visible : ESC [ ? 25 h 1552 * XTERM_SEQ: Make cursor visible : ESC [ ? 25 h
1514 * XTERM_SEQ: Make cursor invisible: ESC [ ? 25 l 1553 * XTERM_SEQ: Make cursor invisible: ESC [ ? 25 l
1515 */ 1554 */
1516void 1555void
1517rxvt_term::scr_cursor_visible (int mode) 1556rxvt_term::scr_cursor_visible (int mode) NOTHROW
1518{ 1557{
1519 want_refresh = 1; 1558 want_refresh = 1;
1520 1559
1521 if (mode) 1560 if (mode)
1522 screen.flags |= Screen_VisibleCursor; 1561 screen.flags |= Screen_VisibleCursor;
… …
1529 * Set/unset automatic wrapping 1568 * Set/unset automatic wrapping
1530 * XTERM_SEQ: Set Wraparound : ESC [ ? 7 h 1569 * XTERM_SEQ: Set Wraparound : ESC [ ? 7 h
1531 * XTERM_SEQ: Unset Wraparound: ESC [ ? 7 l 1570 * XTERM_SEQ: Unset Wraparound: ESC [ ? 7 l
1532 */ 1571 */
1533void 1572void
1534rxvt_term::scr_autowrap (int mode) 1573rxvt_term::scr_autowrap (int mode) NOTHROW
1535{ 1574{
1536 if (mode) 1575 if (mode)
1537 screen.flags |= Screen_Autowrap; 1576 screen.flags |= Screen_Autowrap;
1538 else 1577 else
1539 screen.flags &= ~(Screen_Autowrap | Screen_WrapNext); 1578 screen.flags &= ~(Screen_Autowrap | Screen_WrapNext);
… …
1548 * and the cursor cannot be moved outside. 1587 * and the cursor cannot be moved outside.
1549 * XTERM_SEQ: Set Absolute: ESC [ ? 6 h 1588 * XTERM_SEQ: Set Absolute: ESC [ ? 6 h
1550 * XTERM_SEQ: Set Relative: ESC [ ? 6 l 1589 * XTERM_SEQ: Set Relative: ESC [ ? 6 l
1551 */ 1590 */
1552void 1591void
1553rxvt_term::scr_relative_origin (int mode) 1592rxvt_term::scr_relative_origin (int mode) NOTHROW
1554{ 1593{
1555 if (mode) 1594 if (mode)
1556 screen.flags |= Screen_Relative; 1595 screen.flags |= Screen_Relative;
1557 else 1596 else
1558 screen.flags &= ~Screen_Relative; 1597 screen.flags &= ~Screen_Relative;
… …
1565 * Set insert/replace mode 1604 * Set insert/replace mode
1566 * XTERM_SEQ: Set Insert mode : ESC [ ? 4 h 1605 * XTERM_SEQ: Set Insert mode : ESC [ ? 4 h
1567 * XTERM_SEQ: Set Replace mode: ESC [ ? 4 l 1606 * XTERM_SEQ: Set Replace mode: ESC [ ? 4 l
1568 */ 1607 */
1569void 1608void
1570rxvt_term::scr_insert_mode (int mode) 1609rxvt_term::scr_insert_mode (int mode) NOTHROW
1571{ 1610{
1572 if (mode) 1611 if (mode)
1573 screen.flags |= Screen_Insert; 1612 screen.flags |= Screen_Insert;
1574 else 1613 else
1575 screen.flags &= ~Screen_Insert; 1614 screen.flags &= ~Screen_Insert;
… …
1581 * XTERM_SEQ: Set tab at current column : ESC H 1620 * XTERM_SEQ: Set tab at current column : ESC H
1582 * XTERM_SEQ: Clear tab at current column: ESC [ 0 g 1621 * XTERM_SEQ: Clear tab at current column: ESC [ 0 g
1583 * XTERM_SEQ: Clear all tabs : ESC [ 3 g 1622 * XTERM_SEQ: Clear all tabs : ESC [ 3 g
1584 */ 1623 */
1585void 1624void
1586rxvt_term::scr_set_tab (int mode) 1625rxvt_term::scr_set_tab (int mode) NOTHROW
1587{ 1626{
1588 if (mode < 0) 1627 if (mode < 0)
1589 memset (tabs, 0, ncol * sizeof (char)); 1628 memset (tabs, 0, ncol * sizeof (char));
1590 else if (screen.cur.col < ncol) 1629 else if (screen.cur.col < ncol)
1591 tabs [screen.cur.col] = !!mode; 1630 tabs [screen.cur.col] = !!mode;
… …
1596 * Set reverse/normal video 1635 * Set reverse/normal video
1597 * XTERM_SEQ: Reverse video: ESC [ ? 5 h 1636 * XTERM_SEQ: Reverse video: ESC [ ? 5 h
1598 * XTERM_SEQ: Normal video : ESC [ ? 5 l 1637 * XTERM_SEQ: Normal video : ESC [ ? 5 l
1599 */ 1638 */
1600void 1639void
1601rxvt_term::scr_rvideo_mode (int mode) 1640rxvt_term::scr_rvideo_mode (bool on) NOTHROW
1602{ 1641{
1603 XGCValues gcvalue; 1642 rvideo_mode = on;
1604 1643
1644#ifndef NO_BELL
1645 on ^= rvideo_bell;
1646#endif
1647
1605 if (rvideo != mode) 1648 if (rvideo_state != on)
1606 { 1649 {
1607 rvideo = mode; 1650 rvideo_state = on;
1651
1608 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]); 1652 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]);
1609#if XPM_BACKGROUND 1653#if XPM_BACKGROUND
1610 if (bgPixmap.pixmap == None) 1654 if (bgPixmap.pixmap == None)
1611#endif 1655#endif
1612#if TRANSPARENT 1656#if TRANSPARENT
1613 if (! OPTION (Opt_transparent) || am_transparent == 0) 1657 if (!OPTION (Opt_transparent) || am_transparent == 0)
1614#endif 1658#endif
1615 XSetWindowBackground (display->display, vt, 1659 XSetWindowBackground (xdisp, vt, pix_colors[Color_bg]);
1616 pix_colors[Color_bg]);
1617 1660
1661 XGCValues gcvalue;
1618 gcvalue.foreground = pix_colors[Color_fg]; 1662 gcvalue.foreground = pix_colors[Color_fg];
1619 gcvalue.background = pix_colors[Color_bg]; 1663 gcvalue.background = pix_colors[Color_bg];
1620 XChangeGC (display->display, gc, GCBackground | GCForeground, 1664 XChangeGC (xdisp, gc, GCBackground | GCForeground, &gcvalue);
1621 &gcvalue); 1665
1622 scr_clear (); 1666 scr_clear ();
1623 scr_touch (true); 1667 scr_touch (true);
1624 } 1668 }
1625} 1669}
1626 1670
… …
1628/* 1672/*
1629 * Report current cursor position 1673 * Report current cursor position
1630 * XTERM_SEQ: Report position: ESC [ 6 n 1674 * XTERM_SEQ: Report position: ESC [ 6 n
1631 */ 1675 */
1632void 1676void
1633rxvt_term::scr_report_position () 1677rxvt_term::scr_report_position () NOTHROW
1634{ 1678{
1635 tt_printf ("\033[%d;%dR", screen.cur.row + 1, screen.cur.col + 1); 1679 tt_printf ("\033[%d;%dR", screen.cur.row + 1, screen.cur.col + 1);
1636} 1680}
1637 1681
1638/* ------------------------------------------------------------------------- * 1682/* ------------------------------------------------------------------------- *
… …
1641 1685
1642/* 1686/*
1643 * Set font style 1687 * Set font style
1644 */ 1688 */
1645void 1689void
1646rxvt_term::set_font_style () 1690rxvt_term::set_font_style () NOTHROW
1647{ 1691{
1648#if 0 1692#if 0
1649 switch (charsets [screen.charset]) 1693 switch (charsets [screen.charset])
1650 { 1694 {
1651 case '0': /* DEC Special Character & Line Drawing Set */ 1695 case '0': /* DEC Special Character & Line Drawing Set */
… …
1673 * XTERM_SEQ: Invoke G1 character set: CTRL-N 1717 * XTERM_SEQ: Invoke G1 character set: CTRL-N
1674 * XTERM_SEQ: Invoke G2 character set: ESC N 1718 * XTERM_SEQ: Invoke G2 character set: ESC N
1675 * XTERM_SEQ: Invoke G3 character set: ESC O 1719 * XTERM_SEQ: Invoke G3 character set: ESC O
1676 */ 1720 */
1677void 1721void
1678rxvt_term::scr_charset_choose (int set) 1722rxvt_term::scr_charset_choose (int set) NOTHROW
1679{ 1723{
1680 screen.charset = set; 1724 screen.charset = set;
1681 set_font_style (); 1725 set_font_style ();
1682} 1726}
1683 1727
… …
1689 * XTERM_SEQ: Set G2 character set: ESC * <C> 1733 * XTERM_SEQ: Set G2 character set: ESC * <C>
1690 * XTERM_SEQ: Set G3 character set: ESC + <C> 1734 * XTERM_SEQ: Set G3 character set: ESC + <C>
1691 * See set_font_style for possible values for <C> 1735 * See set_font_style for possible values for <C>
1692 */ 1736 */
1693void 1737void
1694rxvt_term::scr_charset_set (int set, unsigned int ch) 1738rxvt_term::scr_charset_set (int set, unsigned int ch) NOTHROW
1695{ 1739{
1696 charsets[set] = (unsigned char)ch; 1740 charsets[set] = (unsigned char)ch;
1697 set_font_style (); 1741 set_font_style ();
1698} 1742}
1699 1743
… …
1704 1748
1705/* 1749/*
1706 * refresh matching text. 1750 * refresh matching text.
1707 */ 1751 */
1708bool 1752bool
1709rxvt_term::scr_refresh_rend (rend_t mask, rend_t value) 1753rxvt_term::scr_refresh_rend (rend_t mask, rend_t value) NOTHROW
1710{ 1754{
1711 bool found = false; 1755 bool found = false;
1712 1756
1713 for (int i = 0; i < nrow; i++) 1757 for (int i = 0; i < nrow; i++)
1714 { 1758 {
… …
1734 PART_END, 1778 PART_END,
1735 RC_COUNT 1779 RC_COUNT
1736}; 1780};
1737 1781
1738void 1782void
1739rxvt_term::scr_expose (int x, int y, int ewidth, int eheight, bool refresh) 1783rxvt_term::scr_expose (int x, int y, int ewidth, int eheight, bool refresh) NOTHROW
1740{ 1784{
1741 int i; 1785 int i;
1742 row_col_t rc[RC_COUNT]; 1786 row_col_t rc[RC_COUNT];
1743 1787
1744 if (!drawn_buf) /* sanity check */ 1788 if (!drawn_buf) /* sanity check */
… …
1767 } 1811 }
1768 1812
1769 for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++) 1813 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); 1814 fill_text (&drawn_buf[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1);
1771 1815
1816 num_scr_allow = 0;
1817
1772 if (refresh) 1818 if (refresh)
1773 scr_refresh (SLOW_REFRESH); 1819 scr_refresh ();
1774} 1820}
1775 1821
1776/* ------------------------------------------------------------------------- */ 1822/* ------------------------------------------------------------------------- */
1777/* 1823/*
1778 * Refresh the entire screen 1824 * Refresh the entire screen
1779 */ 1825 */
1780void 1826void
1781rxvt_term::scr_touch (bool refresh) 1827rxvt_term::scr_touch (bool refresh) NOTHROW
1782{ 1828{
1783 scr_expose (0, 0, width, height, refresh); 1829 scr_expose (0, 0, width, height, refresh);
1784} 1830}
1785 1831
1786/* ------------------------------------------------------------------------- */ 1832/* ------------------------------------------------------------------------- */
1787/* 1833/*
1788 * Move the display so that the line represented by scrollbar value Y is at 1834 * Move the display so that the line represented by scrollbar value Y is at
1789 * the top of the screen 1835 * the top of the screen
1790 */ 1836 */
1791int 1837void
1792rxvt_term::scr_move_to (int y, int len) 1838rxvt_term::scr_move_to (int y, int len) NOTHROW
1793{ 1839{
1794 long p = 0; 1840 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} 1841}
1810 1842
1811/* ------------------------------------------------------------------------- */ 1843/* ------------------------------------------------------------------------- */
1812/* 1844/*
1813 * Page the screen up/down nlines 1845 * Page the screen up/down nlines
1814 * direction should be UP or DN 1846 * direction should be UP or DN
1815 */ 1847 */
1816int 1848bool
1817rxvt_term::scr_page (enum page_dirn direction, int nlines) 1849rxvt_term::scr_page (enum page_dirn direction, int nlines) NOTHROW
1818{ 1850{
1819 int n; 1851 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; 1852 direction == UP ? view_start - nlines
1832 view_start = max (n, 0); 1853 : view_start + nlines;
1833 }
1834 1854
1835 return scr_changeview (oldviewstart); 1855 return scr_changeview (new_view_start);
1836} 1856}
1837 1857
1838int 1858bool
1839rxvt_term::scr_changeview (unsigned int oldviewstart) 1859rxvt_term::scr_changeview (int new_view_start) NOTHROW
1840{ 1860{
1861 clamp_it (new_view_start, top_row, 0);
1862
1841 if (view_start != oldviewstart) 1863 if (new_view_start == view_start)
1842 { 1864 return false;
1865
1866 num_scr += new_view_start - view_start;
1867 view_start = new_view_start;
1868 want_refresh = 1;
1869
1843 HOOK_INVOKE ((this, HOOK_VIEW_CHANGE, DT_INT, view_start, DT_END)); 1870 HOOK_INVOKE ((this, HOOK_VIEW_CHANGE, DT_INT, view_start, DT_END));
1844 1871
1845 want_refresh = 1; 1872 return true;
1846 num_scr -= (view_start - oldviewstart);
1847 }
1848
1849 return (int)view_start - (int)oldviewstart;
1850} 1873}
1851 1874
1852/* ------------------------------------------------------------------------- */ 1875#ifndef NO_BELL
1853void 1876void
1877rxvt_term::bell_cb (time_watcher &w)
1878{
1879 rvideo_bell = false;
1880 scr_rvideo_mode (rvideo_mode);
1881}
1882#endif
1883
1884/* ------------------------------------------------------------------------- */
1885void
1854rxvt_term::scr_bell () 1886rxvt_term::scr_bell () NOTHROW
1855{ 1887{
1856#ifndef NO_BELL 1888#ifndef NO_BELL
1857 1889
1858# ifndef NO_MAPALERT 1890# ifndef NO_MAPALERT
1859# ifdef MAPALERT_OPTION 1891# ifdef MAPALERT_OPTION
1860 if (OPTION (Opt_mapAlert)) 1892 if (OPTION (Opt_mapAlert))
1861# endif 1893# endif
1862 XMapWindow (display->display, parent[0]); 1894 XMapWindow (xdisp, parent[0]);
1863# endif 1895# endif
1864 1896
1865 if (OPTION (Opt_visualBell)) 1897 if (OPTION (Opt_visualBell))
1866 { 1898 {
1867 scr_rvideo_mode (!rvideo); /* refresh also done */ 1899 rvideo_bell = true;
1900 scr_rvideo_mode (rvideo_mode);
1868 display->flush (); 1901 display->flush ();
1869 rxvt_usleep (VISUAL_BELL_DURATION); 1902
1870 scr_rvideo_mode (!rvideo); /* refresh also done */ 1903 bell_ev.start (NOW + VISUAL_BELL_DURATION);
1871 } 1904 }
1872 else 1905 else
1873 XBell (display->display, 0); 1906 XBell (xdisp, 0);
1874 1907
1875#endif 1908#endif
1876} 1909}
1877 1910
1878/* ------------------------------------------------------------------------- */ 1911/* ------------------------------------------------------------------------- */
1879/* ARGSUSED */ 1912/* ARGSUSED */
1880void 1913void
1881rxvt_term::scr_printscreen (int fullhist) 1914rxvt_term::scr_printscreen (int fullhist) NOTHROW
1882{ 1915{
1883#ifdef PRINTPIPE 1916#ifdef PRINTPIPE
1884 int nrows, row_start; 1917 int nrows, row_start;
1885 FILE *fd; 1918 FILE *fd;
1886 1919
1887 if ((fd = popen_printer ()) == NULL) 1920 if ((fd = popen_printer ()) == NULL)
1888 return; 1921 return;
1889 1922
1890 if (fullhist) 1923 if (fullhist)
1891 { 1924 {
1892 nrows = nrow + nsaved; 1925 nrows = nrow - top_row;
1893 row_start = -nsaved; 1926 row_start = top_row;
1894 } 1927 }
1895 else 1928 else
1896 { 1929 {
1897 nrows = nrow; 1930 nrows = nrow;
1898 row_start = -view_start; 1931 row_start = view_start;
1899 } 1932 }
1900 1933
1901 wctomb (0, 0); 1934 wctomb (0, 0);
1902 1935
1903 for (int r1 = 0; r1 < nrows; r1++) 1936 for (int r1 = 0; r1 < nrows; r1++)
… …
1935 * Refresh the screen 1968 * Refresh the screen
1936 * drawn_text/drawn_rend contain the screen information before the update. 1969 * drawn_text/drawn_rend contain the screen information before the update.
1937 * screen.text/screen.rend contain what the screen will change to. 1970 * screen.text/screen.rend contain what the screen will change to.
1938 */ 1971 */
1939void 1972void
1940rxvt_term::scr_refresh (unsigned char refresh_type) 1973rxvt_term::scr_refresh () NOTHROW
1941{ 1974{
1942 unsigned char must_clear, /* use draw_string not draw_image_string */ 1975 unsigned char must_clear, /* use draw_string not draw_image_string */
1943 showcursor; /* show the cursor */ 1976 showcursor; /* show the cursor */
1944 int16_t col, row, /* column/row we're processing */ 1977 int16_t col, row, /* column/row we're processing */
1945 ocrow; /* old cursor row */ 1978 ocrow; /* old cursor row */
… …
2031 2064
2032 /* make sure no outline cursor is left around */ 2065 /* make sure no outline cursor is left around */
2033 setoldcursor = 0; 2066 setoldcursor = 0;
2034 if (ocrow != -1) 2067 if (ocrow != -1)
2035 { 2068 {
2036 if (screen.cur.row + view_start != ocrow 2069 if (screen.cur.row - view_start != ocrow
2037 || screen.cur.col != oldcursor.col) 2070 || screen.cur.col != oldcursor.col)
2038 { 2071 {
2039 if (ocrow < nrow 2072 if (ocrow < nrow
2040 && oldcursor.col < ncol) 2073 && oldcursor.col < ncol)
2041 drawn_buf[ocrow].r[oldcursor.col] ^= (RS_RVid | RS_Uline); 2074 drawn_buf[ocrow].r[oldcursor.col] ^= (RS_RVid | RS_Uline);
… …
2049 else if (!focus) 2082 else if (!focus)
2050 setoldcursor = 1; 2083 setoldcursor = 1;
2051 2084
2052 if (setoldcursor) 2085 if (setoldcursor)
2053 { 2086 {
2054 if (screen.cur.row + view_start >= nrow) 2087 if (screen.cur.row - view_start >= nrow)
2055 oldcursor.row = -1; 2088 oldcursor.row = -1;
2056 else 2089 else
2057 { 2090 {
2058 oldcursor.row = screen.cur.row + view_start; 2091 oldcursor.row = screen.cur.row - view_start;
2059 oldcursor.col = screen.cur.col; 2092 oldcursor.col = screen.cur.col;
2060 } 2093 }
2061 } 2094 }
2062 } 2095 }
2063 2096
… …
2069#ifndef NO_SLOW_LINK_SUPPORT 2102#ifndef NO_SLOW_LINK_SUPPORT
2070 /* 2103 /*
2071 * D: CopyArea pass - very useful for slower links 2104 * D: CopyArea pass - very useful for slower links
2072 * This has been deliberately kept simple. 2105 * This has been deliberately kept simple.
2073 */ 2106 */
2074 i = num_scr;
2075 if (!display->is_local 2107 if (!display->is_local
2076 && refresh_type == FAST_REFRESH && num_scr_allow && num_scr 2108 && refresh_type == FAST_REFRESH && num_scr_allow && num_scr
2077 && abs (num_scr) < nrow && !must_clear) 2109 && abs (num_scr) < nrow && !must_clear)
2078 { 2110 {
2079 int16_t nits; 2111 int16_t nits;
2080 int j; 2112 int j;
2081 int len, wlen; 2113 int len, wlen;
2114 dLocal (int, num_scr);
2082 2115
2083 j = nrow; 2116 j = nrow;
2084 wlen = len = -1; 2117 wlen = len = -1;
2085 row = i > 0 ? 0 : j - 1; 2118 row = i > 0 ? 0 : j - 1;
2086 for (; j-- >= 0; row += (i > 0 ? 1 : -1)) 2119 for (; j-- >= 0; row += (i > 0 ? 1 : -1))
2087 { 2120 {
2088 if (row + i >= 0 && row + i < nrow && row + i != ocrow) 2121 if (row + i >= 0 && row + i < nrow && row + i != ocrow)
2089 { 2122 {
2090 line_t s = ROW(row - view_start); 2123 line_t s = ROW(view_start + row);
2091 line_t d = drawn_buf[row]; 2124 line_t d = drawn_buf[row];
2092 line_t d2 = drawn_buf[row + i]; 2125 line_t d2 = drawn_buf[row + i];
2093 2126
2094 for (nits = 0, col = ncol; col--; ) 2127 for (nits = 0, col = ncol; col--; )
2095 if (s.t[col] != d2.t[col] || s.r[col] != d2.r[col]) 2128 if (s.t[col] != d2.t[col] || s.r[col] != d2.r[col])
… …
2117 { 2150 {
2118 /* also comes here at end if needed because of >= above */ 2151 /* also comes here at end if needed because of >= above */
2119 if (wlen < len) 2152 if (wlen < len)
2120 ::swap (wlen, len); 2153 ::swap (wlen, len);
2121 2154
2122 XCopyArea (display->display, vt, vt, 2155 XCopyArea (xdisp, vt, vt,
2123 gc, 0, Row2Pixel (len + i), 2156 gc, 0, Row2Pixel (len + i),
2124 (unsigned int)this->width, 2157 (unsigned int)this->width,
2125 (unsigned int)Height2Pixel (wlen - len + 1), 2158 (unsigned int)Height2Pixel (wlen - len + 1),
2126 0, Row2Pixel (len)); 2159 0, Row2Pixel (len));
2127 len = -1; 2160 len = -1;
… …
2133 /* 2166 /*
2134 * E: main pass across every character 2167 * E: main pass across every character
2135 */ 2168 */
2136 for (row = 0; row < nrow; row++) 2169 for (row = 0; row < nrow; row++)
2137 { 2170 {
2138 text_t *stp = ROW(row - view_start).t; 2171 text_t *stp = ROW(view_start + row).t;
2139 rend_t *srp = ROW(row - view_start).r; 2172 rend_t *srp = ROW(view_start + row).r;
2140 text_t *dtp = drawn_buf[row].t; 2173 text_t *dtp = drawn_buf[row].t;
2141 rend_t *drp = drawn_buf[row].r; 2174 rend_t *drp = drawn_buf[row].r;
2142 2175
2143 /* 2176 /*
2144 * E2: OK, now the real pass 2177 * E2: OK, now the real pass
… …
2215 2248
2216 // only do special processing if any attributes are set, which is unlikely 2249 // only do special processing if any attributes are set, which is unlikely
2217 if (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful)) 2250 if (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful))
2218 { 2251 {
2219#if ENABLE_STYLES 2252#if ENABLE_STYLES
2220 // force redraw after "careful" characters to avoid pixel droppings 2253 // "careful" (too wide) character handling
2221 if (srp[col] & RS_Careful && col < ncol - 1 && 0)
2222 drp[col + 1] = ~srp[col + 1];
2223 2254
2224 // include previous careful character(s) if possible, looks nicer (best effort...) 2255 // include previous careful character(s) if possible, looks nicer (best effort...)
2225 while (text > stp 2256 while (text > stp
2226 && srp[text - stp - 1] & RS_Careful 2257 && srp[text - stp - 1] & RS_Careful
2227 && RS_SAME (rend, srp[text - stp - 1])) 2258 && RS_SAME (rend, srp[text - stp - 1]))
2228 text--, count++, xpixel -= fwidth; 2259 text--, count++, xpixel -= fwidth;
2260
2261 // force redraw after "careful" characters to avoid pixel droppings
2262 for (int i = 0; srp[col + i] & RS_Careful && col + i < ncol - 1; i++)
2263 drp[col + i + 1] = ~srp[col + i + 1];
2264
2265 // force redraw before "careful" characters to avoid pixel droppings
2266 for (int i = 0; srp[text - stp - i] & RS_Careful && text - i > stp; i++)
2267 drp[text - stp - i - 1] = ~srp[text - stp - i - 1];
2229#endif 2268#endif
2230 2269
2231 bool invert = rend & RS_RVid; 2270 bool invert = rend & RS_RVid;
2232 2271
2233#ifndef NO_BOLD_UNDERLINE_REVERSE 2272#ifndef NO_BOLD_UNDERLINE_REVERSE
… …
2317 2356
2318 if (rend & RS_Uline && font->descent > 1 && fore != back) 2357 if (rend & RS_Uline && font->descent > 1 && fore != back)
2319 { 2358 {
2320#if ENABLE_FRILLS 2359#if ENABLE_FRILLS
2321 if (ISSET_PIXCOLOR (Color_underline)) 2360 if (ISSET_PIXCOLOR (Color_underline))
2322 XSetForeground (display->display, gc, pix_colors[Color_underline]); 2361 XSetForeground (xdisp, gc, pix_colors[Color_underline]);
2323 else 2362 else
2324#endif 2363#endif
2325 XSetForeground (display->display, gc, pix_colors[fore]); 2364 XSetForeground (xdisp, gc, pix_colors[fore]);
2326 2365
2327 XDrawLine (display->display, drawBuffer, gc, 2366 XDrawLine (xdisp, drawBuffer, gc,
2328 xpixel, ypixel + font->ascent + 1, 2367 xpixel, ypixel + font->ascent + 1,
2329 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1); 2368 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1);
2330 } 2369 }
2331 } /* for (col....) */ 2370 } /* for (col....) */
2332 } /* for (row....) */ 2371 } /* for (row....) */
… …
2365 && drawn_buf[oldcursor.row].t[col + cursorwidth] == NOCHAR) 2404 && drawn_buf[oldcursor.row].t[col + cursorwidth] == NOCHAR)
2366 cursorwidth++; 2405 cursorwidth++;
2367 2406
2368#ifndef NO_CURSORCOLOR 2407#ifndef NO_CURSORCOLOR
2369 if (ISSET_PIXCOLOR (Color_cursor)) 2408 if (ISSET_PIXCOLOR (Color_cursor))
2370 XSetForeground (display->display, gc, pix_colors[Color_cursor]); 2409 XSetForeground (xdisp, gc, pix_colors[Color_cursor]);
2371#endif 2410#endif
2372 2411
2373 XDrawRectangle (display->display, drawBuffer, gc, 2412 XDrawRectangle (xdisp, drawBuffer, gc,
2374 Col2Pixel (col), 2413 Col2Pixel (col),
2375 Row2Pixel (oldcursor.row), 2414 Row2Pixel (oldcursor.row),
2376 (unsigned int) (Width2Pixel (cursorwidth) - 1), 2415 (unsigned int) (Width2Pixel (cursorwidth) - 1),
2377 (unsigned int) (Height2Pixel (1) - lineSpace - 1)); 2416 (unsigned int) (Height2Pixel (1) - lineSpace - 1));
2378 } 2417 }
… …
2386 num_scr = 0; 2425 num_scr = 0;
2387 num_scr_allow = 1; 2426 num_scr_allow = 1;
2388} 2427}
2389 2428
2390void 2429void
2391rxvt_term::scr_remap_chars (line_t &l) 2430rxvt_term::scr_remap_chars (line_t &l) NOTHROW
2392{ 2431{
2393 if (!l.t) 2432 if (!l.t)
2394 return; 2433 return;
2395 2434
2396 l.touch (); // maybe a bit of an overkill, but it's not performance-relevant 2435 l.touch (); // maybe a bit of an overkill, but it's not performance-relevant
… …
2398 for (int i = ncol; i--; ) 2437 for (int i = ncol; i--; )
2399 l.r[i] = SET_FONT (l.r[i], FONTSET (l.r[i])->find_font (l.t[i])); 2438 l.r[i] = SET_FONT (l.r[i], FONTSET (l.r[i])->find_font (l.t[i]));
2400} 2439}
2401 2440
2402void 2441void
2403rxvt_term::scr_remap_chars () 2442rxvt_term::scr_remap_chars () NOTHROW
2404{ 2443{
2405 for (int i = total_rows; i--; ) 2444 for (int i = total_rows; i--; )
2406 scr_remap_chars (row_buf [i]); 2445 scr_remap_chars (row_buf [i]);
2407 2446
2408 for (int i = nrow; i--; ) 2447 for (int i = nrow; i--; )
… …
2411 scr_remap_chars (swap_buf [i]); 2450 scr_remap_chars (swap_buf [i]);
2412 } 2451 }
2413} 2452}
2414 2453
2415void 2454void
2416rxvt_term::scr_recolour () 2455rxvt_term::scr_recolour () NOTHROW
2417{ 2456{
2418 if (1 2457 if (1
2419#if TRANSPARENT 2458#if TRANSPARENT
2420 && !am_transparent 2459 && !am_transparent
2421#endif 2460#endif
2422#if XPM_BACKGROUND 2461#if XPM_BACKGROUND
2423 && !bgPixmap.pixmap 2462 && !bgPixmap.pixmap
2424#endif 2463#endif
2425 ) 2464 )
2426 { 2465 {
2427 XSetWindowBackground (display->display, parent[0], pix_colors[Color_border]); 2466 XSetWindowBackground (xdisp, parent[0], pix_colors[Color_border]);
2428 XClearWindow (display->display, parent[0]); 2467 XClearWindow (xdisp, parent[0]);
2429 XSetWindowBackground (display->display, vt, pix_colors[Color_bg]); 2468 XSetWindowBackground (xdisp, vt, pix_colors[Color_bg]);
2430#if HAVE_SCROLLBARS 2469#if HAVE_SCROLLBARS
2431 if (scrollBar.win) 2470 if (scrollBar.win)
2432 { 2471 {
2433 XSetWindowBackground (display->display, scrollBar.win, pix_colors[Color_border]); 2472 XSetWindowBackground (xdisp, scrollBar.win, pix_colors[Color_border]);
2434 scrollBar.setIdle (); 2473 scrollBar.setIdle ();
2435 scrollbar_show (0); 2474 scrollbar_show (0);
2436 } 2475 }
2437#endif 2476#endif
2438 } 2477 }
… …
2442 want_refresh = 1; 2481 want_refresh = 1;
2443} 2482}
2444 2483
2445/* ------------------------------------------------------------------------- */ 2484/* ------------------------------------------------------------------------- */
2446void 2485void
2447rxvt_term::scr_clear (bool really) 2486rxvt_term::scr_clear (bool really) NOTHROW
2448{ 2487{
2449 if (!mapped) 2488 if (!mapped)
2450 return; 2489 return;
2451 2490
2452 num_scr_allow = 0; 2491 num_scr_allow = 0;
2453 want_refresh = 1; 2492 want_refresh = 1;
2454 2493
2455 if (really) 2494 if (really)
2456 XClearWindow (display->display, vt); 2495 XClearWindow (xdisp, vt);
2457} 2496}
2458 2497
2459void 2498void
2460rxvt_term::scr_xor_rect (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle1, rend_t rstyle2) 2499rxvt_term::scr_xor_rect (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle1, rend_t rstyle2) NOTHROW
2461{ 2500{
2462 int view_end = -view_start + nrow; 2501 int view_end = view_start + nrow;
2463 int row, col; 2502 int row, col;
2464 2503
2465 for (row = max (beg_row, -view_start); row <= min (end_row, view_end); row++) 2504 for (row = max (beg_row, view_start); row <= min (end_row, view_end); row++)
2466 { 2505 {
2467 text_t *stp = ROW(row).t; 2506 text_t *stp = ROW(row).t;
2468 rend_t *srp = ROW(row).r; 2507 rend_t *srp = ROW(row).r;
2469 2508
2470 for (col = beg_col; col < end_col; col++) 2509 for (col = beg_col; col < end_col; col++)
… …
2477 srp[col] ^= rstyle2; 2516 srp[col] ^= rstyle2;
2478 } 2517 }
2479} 2518}
2480 2519
2481void 2520void
2482rxvt_term::scr_xor_span (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle) 2521rxvt_term::scr_xor_span (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle) NOTHROW
2483{ 2522{
2484 int view_end = -view_start + nrow; 2523 int view_end = view_start + nrow;
2485 int row, col; 2524 int row, col;
2486 2525
2487 if (beg_row >= -view_start) 2526 if (beg_row >= view_start)
2488 { 2527 {
2489 col = beg_col; 2528 col = beg_col;
2490 row = beg_row; 2529 row = beg_row;
2491 } 2530 }
2492 else 2531 else
2493 { 2532 {
2494 col = 0; 2533 col = 0;
2495 row = -view_start; 2534 row = view_start;
2496 } 2535 }
2497 2536
2498 for (; row < min (end_row, view_end); row++, col = 0) 2537 for (; row < min (end_row, view_end); row++, col = 0)
2499 for (rend_t *srp = ROW(row).r; col < ncol; col++) 2538 for (rend_t *srp = ROW(row).r; col < ncol; col++)
2500 srp[col] ^= rstyle; 2539 srp[col] ^= rstyle;
… …
2504 srp[col] ^= rstyle; 2543 srp[col] ^= rstyle;
2505} 2544}
2506 2545
2507/* ------------------------------------------------------------------------- */ 2546/* ------------------------------------------------------------------------- */
2508void 2547void
2509rxvt_term::scr_reverse_selection () 2548rxvt_term::scr_reverse_selection () NOTHROW
2510{ 2549{
2511 if (selection.op 2550 if (selection.op
2512 && current_screen == selection.screen 2551 && current_screen == selection.screen
2513 && selection.end.row >= -view_start) 2552 && selection.end.row >= view_start)
2514 { 2553 {
2515#if ENABLE_FRILLS 2554#if ENABLE_FRILLS
2516 if (selection.rect) 2555 if (selection.rect)
2517 scr_xor_rect (selection.beg.row, selection.beg.col, 2556 scr_xor_rect (selection.beg.row, selection.beg.col,
2518 selection.end.row, selection.end.col, 2557 selection.end.row, selection.end.col,
… …
2530 * Dump the whole scrollback and screen to the passed filedescriptor. The 2569 * Dump the whole scrollback and screen to the passed filedescriptor. The
2531 * invoking routine must close the fd. 2570 * invoking routine must close the fd.
2532 */ 2571 */
2533#if 0 2572#if 0
2534void 2573void
2535rxvt_term::scr_dump (int fd) 2574rxvt_term::scr_dump (int fd) NOTHROW
2536{ 2575{
2537 int row, wrote; 2576 int row, wrote;
2538 unsigned int width, towrite; 2577 unsigned int width, towrite;
2539 char r1[] = "\n"; 2578 char r1[] = "\n";
2540 2579
… …
2559 2598
2560/* ------------------------------------------------------------------------- * 2599/* ------------------------------------------------------------------------- *
2561 * CHARACTER SELECTION * 2600 * CHARACTER SELECTION *
2562 * ------------------------------------------------------------------------- */ 2601 * ------------------------------------------------------------------------- */
2563void 2602void
2564rxvt_term::selection_check (int check_more) 2603rxvt_term::selection_check (int check_more) NOTHROW
2565{ 2604{
2566 row_col_t pos; 2605 row_col_t pos;
2567 2606
2568 if (!selection.op) 2607 if (!selection.op)
2569 return; 2608 return;
2570 2609
2571 pos.row = pos.col = 0; 2610 pos.row = pos.col = 0;
2572 if (!IN_RANGE_EXC (selection.beg.row, -nsaved, nrow) 2611 if (!IN_RANGE_EXC (selection.beg.row, top_row, nrow)
2573 || !IN_RANGE_EXC (selection.mark.row, -nsaved, nrow) 2612 || !IN_RANGE_EXC (selection.mark.row, top_row, nrow)
2574 || !IN_RANGE_EXC (selection.end.row, -nsaved, nrow) 2613 || !IN_RANGE_EXC (selection.end.row, top_row, nrow)
2575 || (check_more == 1 2614 || (check_more == 1
2576 && current_screen == selection.screen 2615 && current_screen == selection.screen
2577 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) 2616 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
2578 && ROWCOL_IS_BEFORE (screen.cur, selection.end)) 2617 && ROWCOL_IS_BEFORE (screen.cur, selection.end))
2579 || (check_more == 2 2618 || (check_more == 2
… …
2590/* ------------------------------------------------------------------------- */ 2629/* ------------------------------------------------------------------------- */
2591/* 2630/*
2592 * Paste a selection direct to the command fd 2631 * Paste a selection direct to the command fd
2593 */ 2632 */
2594void 2633void
2595rxvt_term::paste (char *data, unsigned int len) 2634rxvt_term::paste (char *data, unsigned int len) NOTHROW
2596{ 2635{
2597 /* convert normal newline chars into common keyboard Return key sequence */ 2636 /* convert normal newline chars into common keyboard Return key sequence */
2598 for (unsigned int i = 0; i < len; i++) 2637 for (unsigned int i = 0; i < len; i++)
2599 if (data[i] == C0_LF) 2638 if (data[i] == C0_LF)
2600 data[i] = C0_CR; 2639 data[i] = C0_CR;
… …
2606/* 2645/*
2607 * Respond to a notification that a primary selection has been sent 2646 * Respond to a notification that a primary selection has been sent
2608 * EXT: SelectionNotify 2647 * EXT: SelectionNotify
2609 */ 2648 */
2610void 2649void
2611rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop) 2650rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop) NOTHROW
2612{ 2651{
2613 if (prop == None) /* check for failed XConvertSelection */ 2652 if (prop == None) /* check for failed XConvertSelection */
2614 { 2653 {
2615 if ((selection_type & Sel_CompoundText)) 2654 if ((selection_type & Sel_CompoundText))
2616 { 2655 {
… …
2636 } 2675 }
2637 2676
2638 unsigned long bytes_after; 2677 unsigned long bytes_after;
2639 XTextProperty ct; 2678 XTextProperty ct;
2640 2679
2641 if (XGetWindowProperty (display->display, win, prop, 2680 if (XGetWindowProperty (xdisp, win, prop,
2642 0, PROP_SIZE / 4, 2681 0, PROP_SIZE / 4,
2643 delete_prop, AnyPropertyType, 2682 delete_prop, AnyPropertyType,
2644 &ct.encoding, &ct.format, 2683 &ct.encoding, &ct.format,
2645 &ct.nitems, &bytes_after, 2684 &ct.nitems, &bytes_after,
2646 &ct.value) != Success) 2685 &ct.value) != Success)
… …
2655 if (bytes_after) 2694 if (bytes_after)
2656 { 2695 {
2657 // fetch and append remaining data 2696 // fetch and append remaining data
2658 XTextProperty ct2; 2697 XTextProperty ct2;
2659 2698
2660 if (XGetWindowProperty (display->display, win, prop, 2699 if (XGetWindowProperty (xdisp, win, prop,
2661 ct.nitems / 4, (bytes_after + 3) / 4, 2700 ct.nitems / 4, (bytes_after + 3) / 4,
2662 delete_prop, AnyPropertyType, 2701 delete_prop, AnyPropertyType,
2663 &ct2.encoding, &ct2.format, 2702 &ct2.encoding, &ct2.format,
2664 &ct2.nitems, &bytes_after, 2703 &ct2.nitems, &bytes_after,
2665 &ct2.value) != Success) 2704 &ct2.value) != Success)
… …
2678 2717
2679 if (ct.encoding == xa[XA_INCR]) 2718 if (ct.encoding == xa[XA_INCR])
2680 { 2719 {
2681 // INCR selection, start handshake 2720 // INCR selection, start handshake
2682 if (!delete_prop) 2721 if (!delete_prop)
2683 XDeleteProperty (display->display, win, prop); 2722 XDeleteProperty (xdisp, win, prop);
2684 2723
2685 selection_wait = Sel_incr; 2724 selection_wait = Sel_incr;
2686 incr_buf_fill = 0; 2725 incr_buf_fill = 0;
2687 incr_ev.start (NOW + 10); 2726 incr_ev.start (NOW + 10);
2688 2727
… …
2749 paste (s, strlen (s)); 2788 paste (s, strlen (s));
2750 free (s); 2789 free (s);
2751 } 2790 }
2752 else 2791 else
2753#endif 2792#endif
2754 if (XmbTextPropertyToTextList (display->display, &ct, &cl, &cr) >= 0 2793 if (XmbTextPropertyToTextList (xdisp, &ct, &cl, &cr) >= 0
2755 && cl) 2794 && cl)
2756 { 2795 {
2757 for (int i = 0; i < cr; i++) 2796 for (int i = 0; i < cr; i++)
2758 paste (cl[i], strlen (cl[i])); 2797 paste (cl[i], strlen (cl[i]));
2759 2798
… …
2768 if (selection_wait == Sel_normal) 2807 if (selection_wait == Sel_normal)
2769 selection_wait = Sel_none; 2808 selection_wait = Sel_none;
2770} 2809}
2771 2810
2772void 2811void
2773rxvt_term::incr_cb (time_watcher &w) 2812rxvt_term::incr_cb (time_watcher &w) NOTHROW
2774{ 2813{
2775 selection_wait = Sel_none; 2814 selection_wait = Sel_none;
2776 2815
2777 incr_buf_size = 0; 2816 incr_buf_size = 0;
2778 free (incr_buf); 2817 free (incr_buf);
2779 2818
2780 rxvt_warn ("data loss: timeout on INCR selection paste, ignoring.\n"); 2819 rxvt_warn ("data loss: timeout on INCR selection paste, ignoring.\n");
2781} 2820}
2782 2821
2783void 2822void
2784rxvt_term::selection_property (Window win, Atom prop) 2823rxvt_term::selection_property (Window win, Atom prop) NOTHROW
2785{ 2824{
2786 if (prop == None || selection_wait != Sel_incr) 2825 if (prop == None || selection_wait != Sel_incr)
2787 return; 2826 return;
2788 2827
2789 selection_paste (win, prop, true); 2828 selection_paste (win, prop, true);
… …
2798 * (+) if ownership is claimed but property is empty, rxvt_selection_paste () 2837 * (+) if ownership is claimed but property is empty, rxvt_selection_paste ()
2799 * will auto fallback to CUT_BUFFER0 2838 * will auto fallback to CUT_BUFFER0
2800 * EXT: button 2 release 2839 * EXT: button 2 release
2801 */ 2840 */
2802void 2841void
2803rxvt_term::selection_request (Time tm, int x, int y) 2842rxvt_term::selection_request (Time tm, int selnum) NOTHROW
2804{ 2843{
2805 if (x < 0 || x >= width || y < 0 || y >= height) 2844 if (selection.text && selnum == Sel_Primary)
2806 return; /* outside window */
2807
2808 if (selection.text)
2809 { /* internal selection */ 2845 { /* internal selection */
2810 char *str = rxvt_wcstombs (selection.text, selection.len); 2846 char *str = rxvt_wcstombs (selection.text, selection.len);
2811 paste (str, strlen (str)); 2847 paste (str, strlen (str));
2812 free (str); 2848 free (str);
2813 return; 2849 return;
2814 } 2850 }
2815 else 2851 else
2816 { 2852 {
2817 int i;
2818
2819 selection_request_time = tm; 2853 selection_request_time = tm;
2820 selection_wait = Sel_normal; 2854 selection_wait = Sel_normal;
2821 2855
2822 for (i = Sel_Primary; i <= Sel_Clipboard; i++)
2823 {
2824#if X_HAVE_UTF8_STRING 2856#if X_HAVE_UTF8_STRING
2825 selection_type = Sel_UTF8String; 2857 selection_type = Sel_UTF8String;
2826 if (selection_request_other (xa[XA_UTF8_STRING], i)) 2858 if (selection_request_other (xa[XA_UTF8_STRING], selnum))
2827 return; 2859 return;
2828#else 2860#else
2829 selection_type = Sel_CompoundText; 2861 selection_type = Sel_CompoundText;
2830 if (selection_request_other (xa[XA_COMPOUND_TEXT], i)) 2862 if (selection_request_other (xa[XA_COMPOUND_TEXT], selnum))
2831 return; 2863 return;
2832#endif 2864#endif
2833 }
2834 } 2865 }
2835 2866
2836 selection_wait = Sel_none; /* don't loop in selection_paste () */ 2867 selection_wait = Sel_none; /* don't loop in selection_paste () */
2837 selection_paste (display->root, XA_CUT_BUFFER0, false); 2868 selection_paste (display->root, XA_CUT_BUFFER0, false);
2838} 2869}
2839 2870
2840int 2871int
2841rxvt_term::selection_request_other (Atom target, int selnum) 2872rxvt_term::selection_request_other (Atom target, int selnum) NOTHROW
2842{ 2873{
2843 Atom sel; 2874 Atom sel;
2844 2875
2845 selection_type |= selnum; 2876 selection_type |= selnum;
2846 2877
… …
2849 else if (selnum == Sel_Secondary) 2880 else if (selnum == Sel_Secondary)
2850 sel = XA_SECONDARY; 2881 sel = XA_SECONDARY;
2851 else 2882 else
2852 sel = xa[XA_CLIPBOARD]; 2883 sel = xa[XA_CLIPBOARD];
2853 2884
2854 if (XGetSelectionOwner (display->display, sel) != None) 2885 if (XGetSelectionOwner (xdisp, sel) != None)
2855 { 2886 {
2856 XConvertSelection (display->display, sel, target, xa[XA_VT_SELECTION], 2887 XConvertSelection (xdisp, sel, target, xa[XA_VT_SELECTION],
2857 vt, selection_request_time); 2888 vt, selection_request_time);
2858 return 1; 2889 return 1;
2859 } 2890 }
2860 2891
2861 return 0; 2892 return 0;
… …
2865/* 2896/*
2866 * Clear all selected text 2897 * Clear all selected text
2867 * EXT: SelectionClear 2898 * EXT: SelectionClear
2868 */ 2899 */
2869void 2900void
2870rxvt_term::selection_clear () 2901rxvt_term::selection_clear () NOTHROW
2871{ 2902{
2872 want_refresh = 1; 2903 want_refresh = 1;
2873 free (selection.text); 2904 free (selection.text);
2874 selection.text = NULL; 2905 selection.text = NULL;
2875 selection.len = 0; 2906 selection.len = 0;
… …
3010 3041
3011 selection_grab (tm); 3042 selection_grab (tm);
3012} 3043}
3013 3044
3014bool 3045bool
3015rxvt_term::selection_grab (Time tm) 3046rxvt_term::selection_grab (Time tm) NOTHROW
3016{ 3047{
3017 selection_time = tm; 3048 selection_time = tm;
3018 3049
3019 XSetSelectionOwner (display->display, XA_PRIMARY, vt, tm); 3050 XSetSelectionOwner (xdisp, XA_PRIMARY, vt, tm);
3020 if (XGetSelectionOwner (display->display, XA_PRIMARY) == vt) 3051 if (XGetSelectionOwner (xdisp, XA_PRIMARY) == vt)
3021 { 3052 {
3022 display->set_selection_owner (this); 3053 display->set_selection_owner (this);
3023 return true; 3054 return true;
3024 } 3055 }
3025 else 3056 else
… …
3029 } 3060 }
3030 3061
3031#if 0 3062#if 0
3032 XTextProperty ct; 3063 XTextProperty ct;
3033 3064
3034 if (XwcTextListToTextProperty (display->display, &selection.text, 1, XStringStyle, &ct) >= 0) 3065 if (XwcTextListToTextProperty (xdisp, &selection.text, 1, XStringStyle, &ct) >= 0)
3035 { 3066 {
3036 set_string_property (XA_CUT_BUFFER0, ct.value, ct.nitems); 3067 set_string_property (XA_CUT_BUFFER0, ct.value, ct.nitems);
3037 XFree (ct.value); 3068 XFree (ct.value);
3038 } 3069 }
3039#endif 3070#endif
… …
3043/* 3074/*
3044 * Mark or select text based upon number of clicks: 1, 2, or 3 3075 * Mark or select text based upon number of clicks: 1, 2, or 3
3045 * EXT: button 1 press 3076 * EXT: button 1 press
3046 */ 3077 */
3047void 3078void
3048rxvt_term::selection_click (int clicks, int x, int y) 3079rxvt_term::selection_click (int clicks, int x, int y) NOTHROW
3049{ 3080{
3050 clicks = ((clicks - 1) % 3) + 1; 3081 clicks = ((clicks - 1) % 3) + 1;
3051 selection.clicks = clicks; /* save clicks so extend will work */ 3082 selection.clicks = clicks; /* save clicks so extend will work */
3052 3083
3053 if (clicks == 2 && !selection.rect 3084 if (clicks == 2 && !selection.rect
3054 && HOOK_INVOKE ((this, HOOK_SEL_EXTEND, DT_END))) 3085 && HOOK_INVOKE ((this, HOOK_SEL_EXTEND, DT_END)))
3055 { 3086 {
3056 MEvent.clicks = 1; // what a mess 3087 MEvent.clicks = 1; // what a mess
3088 selection.screen = current_screen;
3089 selection.op = SELECTION_CONT;
3057 return; 3090 return;
3058 } 3091 }
3059 3092
3060 selection_start_colrow (Pixel2Col (x), Pixel2Row (y)); 3093 selection_start_colrow (Pixel2Col (x), Pixel2Row (y));
3061 3094
3062 if (clicks == 2 || clicks == 3) 3095 if (clicks == 2 || clicks == 3)
3063 selection_extend_colrow (selection.mark.col, 3096 selection_extend_colrow (selection.mark.col,
3064 selection.mark.row + view_start, 3097 selection.mark.row - view_start,
3065 0, /* button 3 */ 3098 0, /* button 3 */
3066 1, /* button press */ 3099 1, /* button press */
3067 0); /* click change */ 3100 0); /* click change */
3068} 3101}
3069 3102
3070/* ------------------------------------------------------------------------- */ 3103/* ------------------------------------------------------------------------- */
3071/* 3104/*
3072 * Mark a selection at the specified col/row 3105 * Mark a selection at the specified col/row
3073 */ 3106 */
3074void 3107void
3075rxvt_term::selection_start_colrow (int col, int row) 3108rxvt_term::selection_start_colrow (int col, int row) NOTHROW
3076{ 3109{
3077 want_refresh = 1; 3110 want_refresh = 1;
3078 3111
3079 selection.mark.row = row - view_start; 3112 selection.mark.row = row + view_start;
3080 selection.mark.col = col; 3113 selection.mark.col = col;
3081 3114
3082 selection.mark.row = clamp (selection.mark.row, -nsaved, nrow - 1); 3115 selection.mark.row = clamp (selection.mark.row, top_row, nrow - 1);
3083 selection.mark.col = clamp (selection.mark.col, 0, ncol - 1); 3116 selection.mark.col = clamp (selection.mark.col, 0, ncol - 1);
3084 3117
3085 while (selection.mark.col > 0 3118 while (selection.mark.col > 0
3086 && ROW(selection.mark.row).t[selection.mark.col] == NOCHAR) 3119 && ROW(selection.mark.row).t[selection.mark.col] == NOCHAR)
3087 --selection.mark.col; 3120 --selection.mark.col;
… …
3106#define DELIMIT_TEXT(x) \ 3139#define DELIMIT_TEXT(x) \
3107 (unicode::is_space (x) ? 2 : (x) <= 0xff && !!strchr (rs[Rs_cutchars], (x))) 3140 (unicode::is_space (x) ? 2 : (x) <= 0xff && !!strchr (rs[Rs_cutchars], (x)))
3108#define DELIMIT_REND(x) 1 3141#define DELIMIT_REND(x) 1
3109 3142
3110void 3143void
3111rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) 3144rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) NOTHROW
3112{ 3145{
3113 int col, row, dirnadd, tcol, trow, w1, w2; 3146 int col, row, dirnadd, tcol, trow, w1, w2;
3114 row_col_t bound; 3147 row_col_t bound;
3115 text_t *stp; 3148 text_t *stp;
3116 rend_t *srp; 3149 rend_t *srp;
3117 3150
3118 if (dirn == UP) 3151 if (dirn == UP)
3119 { 3152 {
3120 bound.row = - nsaved - 1; 3153 bound.row = top_row - 1;
3121 bound.col = 0; 3154 bound.col = 0;
3122 dirnadd = -1; 3155 dirnadd = -1;
3123 } 3156 }
3124 else 3157 else
3125 { 3158 {
… …
3190 * flag == 0 ==> button 1 3223 * flag == 0 ==> button 1
3191 * flag == 1 ==> button 3 press 3224 * flag == 1 ==> button 3 press
3192 * flag == 2 ==> button 3 motion 3225 * flag == 2 ==> button 3 motion
3193 */ 3226 */
3194void 3227void
3195rxvt_term::selection_extend (int x, int y, int flag) 3228rxvt_term::selection_extend (int x, int y, int flag) NOTHROW
3196{ 3229{
3197 int col = clamp (Pixel2Col (x), 0, ncol); 3230 int col = clamp (Pixel2Col (x), 0, ncol);
3198 int row = clamp (Pixel2Row (y), 0, nrow - 1); 3231 int row = clamp (Pixel2Row (y), 0, nrow - 1);
3199 3232
3200 /* 3233 /*
… …
3203 * select nothing. Otherwise, if we're to the right of the mark, you have to 3236 * select nothing. Otherwise, if we're to the right of the mark, you have to
3204 * be _past_ a character for it to be selected. 3237 * be _past_ a character for it to be selected.
3205 */ 3238 */
3206 if (((selection.clicks % 3) == 1) && !flag 3239 if (((selection.clicks % 3) == 1) && !flag
3207 && (col == selection.mark.col 3240 && (col == selection.mark.col
3208 && (row == selection.mark.row + view_start))) 3241 && (row == selection.mark.row - view_start)))
3209 { 3242 {
3210 /* select nothing */ 3243 /* select nothing */
3211 selection.beg.row = selection.end.row = 0; 3244 selection.beg.row = selection.end.row = 0;
3212 selection.beg.col = selection.end.col = 0; 3245 selection.beg.col = selection.end.col = 0;
3213 selection.clicks = 4; 3246 selection.clicks = 4;
… …
3226/* ------------------------------------------------------------------------- */ 3259/* ------------------------------------------------------------------------- */
3227/* 3260/*
3228 * Extend the selection to the specified col/row 3261 * Extend the selection to the specified col/row
3229 */ 3262 */
3230void 3263void
3231rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) 3264rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) NOTHROW
3232{ 3265{
3233 row_col_t pos; 3266 row_col_t pos;
3234 enum { 3267 enum {
3235 LEFT, RIGHT 3268 LEFT, RIGHT
3236 } closeto = RIGHT; 3269 } closeto = RIGHT;
… …
3268 selection.beg.col = selection.end.col = selection.mark.col; 3301 selection.beg.col = selection.end.col = selection.mark.col;
3269 selection.beg.row = selection.end.row = selection.mark.row; 3302 selection.beg.row = selection.end.row = selection.mark.row;
3270 } 3303 }
3271 3304
3272 pos.col = col; 3305 pos.col = col;
3273 pos.row = row - view_start; 3306 pos.row = view_start + row;
3274 3307
3275 /* 3308 /*
3276 * This is mainly xterm style selection with a couple of differences, mainly 3309 * This is mainly xterm style selection with a couple of differences, mainly
3277 * in the way button3 drag extension works. 3310 * in the way button3 drag extension works.
3278 * We're either doing: button1 drag; button3 press; or button3 drag 3311 * We're either doing: button1 drag; button3 press; or button3 drag
… …
3422#endif 3455#endif
3423} 3456}
3424 3457
3425#if ENABLE_FRILLS 3458#if ENABLE_FRILLS
3426void 3459void
3427rxvt_term::selection_remove_trailing_spaces () 3460rxvt_term::selection_remove_trailing_spaces () NOTHROW
3428{ 3461{
3429 int32_t end_col, end_row; 3462 int32_t end_col, end_row;
3430 text_t *stp; 3463 text_t *stp;
3431 3464
3432 end_col = selection.end.col; 3465 end_col = selection.end.col;
… …
3470/* 3503/*
3471 * Double click on button 3 when already selected 3504 * Double click on button 3 when already selected
3472 * EXT: button 3 double click 3505 * EXT: button 3 double click
3473 */ 3506 */
3474void 3507void
3475rxvt_term::selection_rotate (int x, int y) 3508rxvt_term::selection_rotate (int x, int y) NOTHROW
3476{ 3509{
3477 selection.clicks = selection.clicks % 3 + 1; 3510 selection.clicks = selection.clicks % 3 + 1;
3478 selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1); 3511 selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1);
3479} 3512}
3480 3513
… …
3482/* 3515/*
3483 * Respond to a request for our current selection 3516 * Respond to a request for our current selection
3484 * EXT: SelectionRequest 3517 * EXT: SelectionRequest
3485 */ 3518 */
3486void 3519void
3487rxvt_term::selection_send (const XSelectionRequestEvent &rq) 3520rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW
3488{ 3521{
3489 XSelectionEvent ev; 3522 XSelectionEvent ev;
3490 dDisp;
3491 3523
3492 ev.type = SelectionNotify; 3524 ev.type = SelectionNotify;
3493 ev.property = None; 3525 ev.property = None;
3494 ev.display = rq.display; 3526 ev.display = rq.display;
3495 ev.requestor = rq.requestor; 3527 ev.requestor = rq.requestor;
… …
3509 *target++ = xa[XA_COMPOUND_TEXT]; 3541 *target++ = xa[XA_COMPOUND_TEXT];
3510#if X_HAVE_UTF8_STRING 3542#if X_HAVE_UTF8_STRING
3511 *target++ = xa[XA_UTF8_STRING]; 3543 *target++ = xa[XA_UTF8_STRING];
3512#endif 3544#endif
3513 3545
3514 XChangeProperty (disp, rq.requestor, rq.property, XA_ATOM, 3546 XChangeProperty (xdisp, rq.requestor, rq.property, XA_ATOM,
3515 32, PropModeReplace, 3547 32, PropModeReplace,
3516 (unsigned char *)target_list, target - target_list); 3548 (unsigned char *)target_list, target - target_list);
3517 ev.property = rq.property; 3549 ev.property = rq.property;
3518 } 3550 }
3519#if TODO // TODO 3551#if TODO // TODO
… …
3522 /* TODO: Handle MULTIPLE */ 3554 /* TODO: Handle MULTIPLE */
3523 } 3555 }
3524#endif 3556#endif
3525 else if (rq.target == xa[XA_TIMESTAMP] && selection.text) 3557 else if (rq.target == xa[XA_TIMESTAMP] && selection.text)
3526 { 3558 {
3527 XChangeProperty (disp, rq.requestor, rq.property, rq.target, 3559 XChangeProperty (xdisp, rq.requestor, rq.property, rq.target,
3528 32, PropModeReplace, (unsigned char *)&selection_time, 1); 3560 32, PropModeReplace, (unsigned char *)&selection_time, 1);
3529 ev.property = rq.property; 3561 ev.property = rq.property;
3530 } 3562 }
3531 else if (rq.target == XA_STRING 3563 else if (rq.target == XA_STRING
3532 || rq.target == xa[XA_TEXT] 3564 || rq.target == xa[XA_TEXT]
… …
3590 ct.value = (unsigned char *)rxvt_wcstoutf8 (cl, selectlen); 3622 ct.value = (unsigned char *)rxvt_wcstoutf8 (cl, selectlen);
3591 ct.nitems = strlen ((char *)ct.value); 3623 ct.nitems = strlen ((char *)ct.value);
3592 } 3624 }
3593 else 3625 else
3594#endif 3626#endif
3595 if (XwcTextListToTextProperty (disp, &cl, 1, (XICCEncodingStyle) style, &ct) >= 0) 3627 if (XwcTextListToTextProperty (xdisp, &cl, 1, (XICCEncodingStyle) style, &ct) >= 0)
3596 freect = 1; 3628 freect = 1;
3597 else 3629 else
3598 { 3630 {
3599 /* if we failed to convert then send it raw */ 3631 /* if we failed to convert then send it raw */
3600 ct.value = (unsigned char *)cl; 3632 ct.value = (unsigned char *)cl;
3601 ct.nitems = selectlen; 3633 ct.nitems = selectlen;
3602 ct.encoding = target; 3634 ct.encoding = target;
3603 } 3635 }
3604 3636
3605 XChangeProperty (disp, rq.requestor, rq.property, 3637 XChangeProperty (xdisp, rq.requestor, rq.property,
3606 ct.encoding, 8, PropModeReplace, 3638 ct.encoding, 8, PropModeReplace,
3607 ct.value, (int)ct.nitems); 3639 ct.value, (int)ct.nitems);
3608 ev.property = rq.property; 3640 ev.property = rq.property;
3609 3641
3610 if (freect) 3642 if (freect)
3611 XFree (ct.value); 3643 XFree (ct.value);
3612 } 3644 }
3613 3645
3614 XSendEvent (disp, rq.requestor, False, 0L, (XEvent *)&ev); 3646 XSendEvent (xdisp, rq.requestor, False, 0L, (XEvent *)&ev);
3615} 3647}
3616 3648
3617/* ------------------------------------------------------------------------- * 3649/* ------------------------------------------------------------------------- *
3618 * MOUSE ROUTINES * 3650 * MOUSE ROUTINES *
3619 * ------------------------------------------------------------------------- */ 3651 * ------------------------------------------------------------------------- */
3620 3652
3621/* 3653/*
3622 * return col/row values corresponding to x/y pixel values 3654 * return col/row values corresponding to x/y pixel values
3623 */ 3655 */
3624void 3656void
3625rxvt_term::pixel_position (int *x, int *y) 3657rxvt_term::pixel_position (int *x, int *y) NOTHROW
3626{ 3658{
3627 *x = Pixel2Col (*x); 3659 *x = Pixel2Col (*x);
3628 /* max_it (*x, 0); min_it (*x, (int)ncol - 1); */ 3660 /* max_it (*x, 0); min_it (*x, (int)ncol - 1); */
3629 *y = Pixel2Row (*y); 3661 *y = Pixel2Row (*y);
3630 /* max_it (*y, 0); min_it (*y, (int)nrow - 1); */ 3662 /* max_it (*y, 0); min_it (*y, (int)nrow - 1); */
3631} 3663}
3632 3664
3633/* ------------------------------------------------------------------------- */ 3665/* ------------------------------------------------------------------------- */
3634#ifdef USE_XIM 3666#ifdef USE_XIM
3635void 3667void
3636rxvt_term::im_set_position (XPoint &pos) 3668rxvt_term::im_set_position (XPoint &pos) NOTHROW
3637{ 3669{
3638 XWindowAttributes xwa; 3670 XWindowAttributes xwa;
3639 3671
3640 XGetWindowAttributes (display->display, vt, &xwa); 3672 XGetWindowAttributes (xdisp, vt, &xwa);
3641 3673
3642 pos.x = xwa.x + Col2Pixel (screen.cur.col); 3674 pos.x = xwa.x + Col2Pixel (screen.cur.col);
3643 pos.y = xwa.y + Height2Pixel (screen.cur.row) + fbase; 3675 pos.y = xwa.y + Height2Pixel (screen.cur.row) + fbase;
3644} 3676}
3645#endif 3677#endif
3646 3678
3647#if ENABLE_OVERLAY 3679#if ENABLE_OVERLAY
3648void 3680void
3649rxvt_term::scr_overlay_new (int x, int y, int w, int h) 3681rxvt_term::scr_overlay_new (int x, int y, int w, int h) NOTHROW
3650{ 3682{
3651 if (nrow < 1 || ncol < 1) 3683 if (nrow < 1 || ncol < 1)
3652 return; 3684 return;
3653 3685
3654 want_refresh = 1; 3686 want_refresh = 1;
… …
3699 *rp = r; 3731 *rp = r;
3700 } 3732 }
3701} 3733}
3702 3734
3703void 3735void
3704rxvt_term::scr_overlay_off () 3736rxvt_term::scr_overlay_off () NOTHROW
3705{ 3737{
3706 if (!ov_text) 3738 if (!ov_text)
3707 return; 3739 return;
3708 3740
3709 want_refresh = 1; 3741 want_refresh = 1;
… …
3717 delete [] ov_text; ov_text = 0; 3749 delete [] ov_text; ov_text = 0;
3718 delete [] ov_rend; ov_rend = 0; 3750 delete [] ov_rend; ov_rend = 0;
3719} 3751}
3720 3752
3721void 3753void
3722rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) 3754rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) NOTHROW
3723{ 3755{
3724 if (!ov_text || x >= ov_w - 2 || y >= ov_h - 2) 3756 if (!ov_text || x >= ov_w - 2 || y >= ov_h - 2)
3725 return; 3757 return;
3726 3758
3727 x++, y++; 3759 x++, y++;
… …
3729 ov_text[y][x] = text; 3761 ov_text[y][x] = text;
3730 ov_rend[y][x] = rend; 3762 ov_rend[y][x] = rend;
3731} 3763}
3732 3764
3733void 3765void
3734rxvt_term::scr_overlay_set (int x, int y, const char *s) 3766rxvt_term::scr_overlay_set (int x, int y, const char *s) NOTHROW
3735{ 3767{
3736 while (*s) 3768 while (*s)
3737 scr_overlay_set (x++, y, *s++); 3769 scr_overlay_set (x++, y, *s++);
3738} 3770}
3739 3771
3740void 3772void
3741rxvt_term::scr_overlay_set (int x, int y, const wchar_t *s) 3773rxvt_term::scr_overlay_set (int x, int y, const wchar_t *s) NOTHROW
3742{ 3774{
3743 while (*s) 3775 while (*s)
3744 { 3776 {
3745 text_t t = *s++; 3777 text_t t = *s++;
3746 int width = wcwidth (t); 3778 int width = WCWIDTH (t);
3747 3779
3748 while (width--) 3780 while (width--)
3749 { 3781 {
3750 scr_overlay_set (x++, y, t); 3782 scr_overlay_set (x++, y, t);
3751 t = NOCHAR; 3783 t = NOCHAR;
3752 } 3784 }
3753 } 3785 }
3754} 3786}
3755 3787
3756void 3788void
3757rxvt_term::scr_swap_overlay () 3789rxvt_term::scr_swap_overlay () NOTHROW
3758{ 3790{
3759 if (!ov_text) 3791 if (!ov_text)
3760 return; 3792 return;
3761 3793
3762 // swap screen mem with overlay 3794 // swap screen mem with overlay
3763 for (int y = ov_h; y--; ) 3795 for (int y = ov_h; y--; )
3764 { 3796 {
3765 text_t *t1 = ov_text[y]; 3797 text_t *t1 = ov_text[y];
3766 rend_t *r1 = ov_rend[y]; 3798 rend_t *r1 = ov_rend[y];
3767 3799
3768 text_t *t2 = ROW(y + ov_y - view_start).t + ov_x; 3800 text_t *t2 = ROW(y + ov_y + view_start).t + ov_x;
3769 rend_t *r2 = ROW(y + ov_y - view_start).r + ov_x; 3801 rend_t *r2 = ROW(y + ov_y + view_start).r + ov_x;
3770 3802
3771 for (int x = ov_w; x--; ) 3803 for (int x = ov_w; x--; )
3772 { 3804 {
3773 text_t t = *t1; *t1++ = *t2; *t2++ = t; 3805 text_t t = *t1; *t1++ = *t2; *t2++ = t;
3774 rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t)); 3806 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