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.268 by root, Tue May 1 21:30:01 2007 UTC

1/*--------------------------------*-C-*--------------------------------------* 1/*---------------------------------------------------------------------------*
2 * File: screen.C 2 * File: screen.C
3 *---------------------------------------------------------------------------* 3 *---------------------------------------------------------------------------*
4 * 4 *
5 * Copyright (c) 1997-2001 Geoff Wing <gcw@pobox.com> 5 * Copyright (c) 1997-2001 Geoff Wing <gcw@pobox.com>
6 * Copyright (c) 2003-2006 Marc Lehmann <pcg@goof.com> 6 * Copyright (c) 2003-2006 Marc Lehmann <pcg@goof.com>
… …
47 47
48/* ------------------------------------------------------------------------- * 48/* ------------------------------------------------------------------------- *
49 * GENERAL SCREEN AND SELECTION UPDATE ROUTINES * 49 * GENERAL SCREEN AND SELECTION UPDATE ROUTINES *
50 * ------------------------------------------------------------------------- */ 50 * ------------------------------------------------------------------------- */
51#define ZERO_SCROLLBACK() \ 51#define ZERO_SCROLLBACK() \
52 if (OPTION (Opt_scrollTtyOutput)) \ 52 if (option (Opt_scrollTtyOutput)) \
53 view_start = 0 53 view_start = 0
54#define CLEAR_SELECTION() \ 54#define CLEAR_SELECTION() \
55 selection.beg.row = selection.beg.col \ 55 selection.beg.row = selection.beg.col \
56 = selection.end.row = selection.end.col = 0 56 = selection.end.row = selection.end.col = 0
57#define CLEAR_ALL_SELECTION() \ 57#define CLEAR_ALL_SELECTION() \
… …
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 (dpy, 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 (dpy, 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 (dpy, 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 545
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
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)))
630 {
631 top_row = max (top_row - count, -saveLines);
632
633 // scroll everything up 'count' lines
634 term_start = (term_start + count) % total_rows;
635
636 // sever bottommost line
620 { 637 {
621 nsaved = min (nsaved + count, saveLines); 638 line_t &l = ROW(row2 - count);
639 l.is_longer (0);
640 l.touch ();
641 }
622 642
623 HOOK_INVOKE ((this, HOOK_SCROLL_BACK, DT_INT, count, DT_INT, nsaved, DT_END)); 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_fgMask | 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;
… …
1032 if (count) 1071 if (count)
1033 x = ncol - 1; 1072 x = ncol - 1;
1034 1073
1035 // store horizontal tab commands as characters inside the text 1074 // store horizontal tab commands as characters inside the text
1036 // buffer so they can be selected and pasted. 1075 // buffer so they can be selected and pasted.
1037 if (ht && OPTION (Opt_pastableTabs)) 1076 if (ht && option (Opt_pastableTabs))
1038 { 1077 {
1039 base_rend = SET_FONT (base_rend, 0); 1078 base_rend = SET_FONT (base_rend, 0);
1040 1079
1041 l.touch (x); 1080 l.touch (x);
1042 1081
… …
1075 * Process DEC Back Index 1114 * Process DEC Back Index
1076 * XTERM_SEQ: ESC 6 1115 * XTERM_SEQ: ESC 6
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_MINIMAL
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);
… …
1092 * Process DEC Forward Index 1131 * Process DEC Forward Index
1093 * XTERM_SEQ: ESC 9 1132 * XTERM_SEQ: ESC 9
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_MINIMAL
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 (dpy, 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 (dpy, 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);
1317 scr_blank_line (drawn_buf [row], 0, ncol, ren); 1356 scr_blank_line (drawn_buf [row], 0, ncol, ren);
1318 } 1357 }
1319} 1358}
1320 1359
1321#if ENABLE_FRILLS 1360#if !ENABLE_MINIMAL
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 (dpy, 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 (dpy, 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 {
1715 int col = 0;
1716 rend_t *drp = drawn_buf[i].r; 1759 rend_t *drp = drawn_buf[i].r;
1717 1760
1718 for (; col < ncol; col++, drp++) 1761 for (int col = 0; col < ncol; col++, drp++)
1719 if ((*drp & mask) == value) 1762 if ((*drp & mask) == value)
1720 { 1763 {
1721 found = true; 1764 found = true;
1722 *drp = ~value; 1765 *drp = ~value;
1723 } 1766 }
… …
1734 PART_END, 1777 PART_END,
1735 RC_COUNT 1778 RC_COUNT
1736}; 1779};
1737 1780
1738void 1781void
1739rxvt_term::scr_expose (int x, int y, int ewidth, int eheight, bool refresh) 1782rxvt_term::scr_expose (int x, int y, int ewidth, int eheight, bool refresh) NOTHROW
1740{ 1783{
1741 int i; 1784 int i;
1742 row_col_t rc[RC_COUNT]; 1785 row_col_t rc[RC_COUNT];
1743 1786
1744 if (!drawn_buf) /* sanity check */ 1787 if (!drawn_buf) /* sanity check */
… …
1767 } 1810 }
1768 1811
1769 for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++) 1812 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); 1813 fill_text (&drawn_buf[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1);
1771 1814
1815 num_scr_allow = 0;
1816
1772 if (refresh) 1817 if (refresh)
1773 scr_refresh (SLOW_REFRESH); 1818 scr_refresh ();
1774} 1819}
1775 1820
1776/* ------------------------------------------------------------------------- */ 1821/* ------------------------------------------------------------------------- */
1777/* 1822/*
1778 * Refresh the entire screen 1823 * Refresh the entire screen
1779 */ 1824 */
1780void 1825void
1781rxvt_term::scr_touch (bool refresh) 1826rxvt_term::scr_touch (bool refresh) NOTHROW
1782{ 1827{
1783 scr_expose (0, 0, width, height, refresh); 1828 scr_expose (0, 0, width, height, refresh);
1784} 1829}
1785 1830
1786/* ------------------------------------------------------------------------- */ 1831/* ------------------------------------------------------------------------- */
1787/* 1832/*
1788 * Move the display so that the line represented by scrollbar value Y is at 1833 * Move the display so that the line represented by scrollbar value Y is at
1789 * the top of the screen 1834 * the top of the screen
1790 */ 1835 */
1791int 1836void
1792rxvt_term::scr_move_to (int y, int len) 1837rxvt_term::scr_move_to (int y, int len) NOTHROW
1793{ 1838{
1794 long p = 0; 1839 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} 1840}
1810 1841
1811/* ------------------------------------------------------------------------- */ 1842/* ------------------------------------------------------------------------- */
1812/* 1843/*
1813 * Page the screen up/down nlines 1844 * Page the screen up/down nlines
1814 * direction should be UP or DN 1845 * direction should be UP or DN
1815 */ 1846 */
1816int 1847bool
1817rxvt_term::scr_page (enum page_dirn direction, int nlines) 1848rxvt_term::scr_page (enum page_dirn direction, int nlines) NOTHROW
1818{ 1849{
1819 int n; 1850 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; 1851 direction == UP ? view_start - nlines
1832 view_start = max (n, 0); 1852 : view_start + nlines;
1833 }
1834 1853
1835 return scr_changeview (oldviewstart); 1854 return scr_changeview (new_view_start);
1836} 1855}
1837 1856
1838int 1857bool
1839rxvt_term::scr_changeview (unsigned int oldviewstart) 1858rxvt_term::scr_changeview (int new_view_start) NOTHROW
1840{ 1859{
1860 clamp_it (new_view_start, top_row, 0);
1861
1841 if (view_start != oldviewstart) 1862 if (new_view_start == view_start)
1842 { 1863 return false;
1864
1865 num_scr += new_view_start - view_start;
1866 view_start = new_view_start;
1867 want_refresh = 1;
1868
1843 HOOK_INVOKE ((this, HOOK_VIEW_CHANGE, DT_INT, view_start, DT_END)); 1869 HOOK_INVOKE ((this, HOOK_VIEW_CHANGE, DT_INT, view_start, DT_END));
1844 1870
1845 want_refresh = 1; 1871 return true;
1846 num_scr -= (view_start - oldviewstart);
1847 }
1848
1849 return (int)view_start - (int)oldviewstart;
1850} 1872}
1851 1873
1852/* ------------------------------------------------------------------------- */ 1874#ifndef NO_BELL
1853void 1875void
1876rxvt_term::bell_cb (time_watcher &w)
1877{
1878 rvideo_bell = false;
1879 scr_rvideo_mode (rvideo_mode);
1880}
1881#endif
1882
1883/* ------------------------------------------------------------------------- */
1884void
1854rxvt_term::scr_bell () 1885rxvt_term::scr_bell () NOTHROW
1855{ 1886{
1856#ifndef NO_BELL 1887#ifndef NO_BELL
1857 1888
1858# ifndef NO_MAPALERT 1889# ifndef NO_MAPALERT
1859# ifdef MAPALERT_OPTION 1890# ifdef MAPALERT_OPTION
1860 if (OPTION (Opt_mapAlert)) 1891 if (option (Opt_mapAlert))
1861# endif 1892# endif
1862 XMapWindow (display->display, parent[0]); 1893 XMapWindow (dpy, parent[0]);
1863# endif 1894# endif
1864 1895
1865 if (OPTION (Opt_visualBell)) 1896 if (option (Opt_visualBell))
1866 { 1897 {
1867 scr_rvideo_mode (!rvideo); /* refresh also done */ 1898 rvideo_bell = true;
1868 rxvt_usleep (VISUAL_BELL_DURATION); 1899 scr_rvideo_mode (rvideo_mode);
1869 scr_rvideo_mode (!rvideo); /* refresh also done */ 1900 display->flush ();
1901
1902 bell_ev.start (NOW + VISUAL_BELL_DURATION);
1870 } 1903 }
1871 else 1904 else
1872 XBell (display->display, 0); 1905 XBell (dpy, 0);
1873 1906
1874#endif 1907#endif
1875} 1908}
1876 1909
1877/* ------------------------------------------------------------------------- */ 1910/* ------------------------------------------------------------------------- */
1878/* ARGSUSED */ 1911/* ARGSUSED */
1879void 1912void
1880rxvt_term::scr_printscreen (int fullhist) 1913rxvt_term::scr_printscreen (int fullhist) NOTHROW
1881{ 1914{
1882#ifdef PRINTPIPE 1915#ifdef PRINTPIPE
1883 int nrows, row_start; 1916 int nrows, row_start;
1884 FILE *fd; 1917 FILE *fd;
1885 1918
1886 if ((fd = popen_printer ()) == NULL) 1919 if ((fd = popen_printer ()) == NULL)
1887 return; 1920 return;
1888 1921
1889 if (fullhist) 1922 if (fullhist)
1890 { 1923 {
1891 nrows = nrow + nsaved; 1924 nrows = nrow - top_row;
1892 row_start = -nsaved; 1925 row_start = top_row;
1893 } 1926 }
1894 else 1927 else
1895 { 1928 {
1896 nrows = nrow; 1929 nrows = nrow;
1897 row_start = -view_start; 1930 row_start = view_start;
1898 } 1931 }
1899 1932
1900 wctomb (0, 0); 1933 wctomb (0, 0);
1901 1934
1902 for (int r1 = 0; r1 < nrows; r1++) 1935 for (int r1 = 0; r1 < nrows; r1++)
… …
1934 * Refresh the screen 1967 * Refresh the screen
1935 * drawn_text/drawn_rend contain the screen information before the update. 1968 * drawn_text/drawn_rend contain the screen information before the update.
1936 * screen.text/screen.rend contain what the screen will change to. 1969 * screen.text/screen.rend contain what the screen will change to.
1937 */ 1970 */
1938void 1971void
1939rxvt_term::scr_refresh (unsigned char refresh_type) 1972rxvt_term::scr_refresh () NOTHROW
1940{ 1973{
1941 unsigned char must_clear, /* use draw_string not draw_image_string */ 1974 unsigned char have_bg,
1942 showcursor; /* show the cursor */ 1975 showcursor; /* show the cursor */
1943 int16_t col, row, /* column/row we're processing */ 1976 int16_t col, row, /* column/row we're processing */
1944 ocrow; /* old cursor row */ 1977 ocrow; /* old cursor row */
1945 int i; /* tmp */ 1978 int i; /* tmp */
1946#ifndef NO_CURSORCOLOR 1979#ifndef NO_CURSORCOLOR
1947 rend_t cc1; /* store colours at cursor position (s) */ 1980 rend_t cc1; /* store colours at cursor position (s) */
1948#endif 1981#endif
1949 rend_t *crp; // cursor rendition pointer 1982 rend_t *crp; // cursor rendition pointer
1983 rend_t ccol1, /* Cursor colour */
1984 ccol2; /* Cursor colour2 */
1950 1985
1951 want_refresh = 0; /* screen is current */ 1986 want_refresh = 0; /* screen is current */
1952 1987
1953 if (refresh_type == NO_REFRESH || !mapped) 1988 if (refresh_type == NO_REFRESH || !mapped)
1954 return; 1989 return;
1955 1990
1956 /* 1991 /*
1957 * A: set up vars 1992 * A: set up vars
1958 */ 1993 */
1959 must_clear = 0; 1994 have_bg = 0;
1960 refresh_count = 0; 1995 refresh_count = 0;
1961 1996
1962#if XPM_BACKGROUND 1997#if XPM_BACKGROUND
1963 must_clear |= bgPixmap.pixmap != None; 1998 have_bg |= bgPixmap.pixmap != None;
1964#endif 1999#endif
1965#if TRANSPARENT 2000#if TRANSPARENT
1966 must_clear |= OPTION (Opt_transparent) && am_transparent; 2001 have_bg |= option (Opt_transparent) && am_transparent;
1967#endif 2002#endif
1968 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ 2003 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
1969 2004
1970 /* 2005 /*
1971 * B: reverse any characters which are selected 2006 * B: reverse any characters which are selected
… …
1975 /* 2010 /*
1976 * C: set the cursor character (s) 2011 * C: set the cursor character (s)
1977 */ 2012 */
1978 { 2013 {
1979 unsigned char setoldcursor; 2014 unsigned char setoldcursor;
1980 rend_t ccol1, /* Cursor colour */
1981 ccol2; /* Cursor colour2 */
1982 2015
1983 showcursor = (screen.flags & Screen_VisibleCursor); 2016 showcursor = (screen.flags & Screen_VisibleCursor);
1984#ifdef CURSOR_BLINK 2017#ifdef CURSOR_BLINK
1985 if (hidden_cursor) 2018 if (hidden_cursor)
1986 showcursor = 0; 2019 showcursor = 0;
… …
1993 while (col && ROW(screen.cur.row).t[col] == NOCHAR) 2026 while (col && ROW(screen.cur.row).t[col] == NOCHAR)
1994 col--; 2027 col--;
1995 2028
1996 crp = &ROW(screen.cur.row).r[col]; 2029 crp = &ROW(screen.cur.row).r[col];
1997 2030
2031#ifndef NO_CURSORCOLOR
2032 cc1 = *crp & (RS_fgMask | RS_bgMask);
2033 if (ISSET_PIXCOLOR (Color_cursor))
2034 ccol1 = Color_cursor;
2035 else
2036#endif
2037#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
2038 ccol1 = fgcolor_of (rstyle);
2039#else
2040 ccol1 = Color_fg;
2041#endif
2042
2043#ifndef NO_CURSORCOLOR
2044 if (ISSET_PIXCOLOR (Color_cursor2))
2045 ccol2 = Color_cursor2;
2046 else
2047#endif
2048#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
2049 ccol2 = bgcolor_of (rstyle);
2050#else
2051 ccol2 = Color_bg;
2052#endif
2053
1998 if (showcursor && focus) 2054 if (showcursor && focus)
1999 { 2055 {
2000 if (OPTION (Opt_cursorUnderline)) 2056 if (option (Opt_cursorUnderline))
2001 *crp ^= RS_Uline; 2057 *crp ^= RS_Uline;
2002 else 2058 else
2003 { 2059 {
2004 *crp ^= RS_RVid; 2060 *crp ^= RS_RVid;
2005
2006#ifndef NO_CURSORCOLOR
2007 cc1 = *crp & (RS_fgMask | RS_bgMask);
2008 if (ISSET_PIXCOLOR (Color_cursor))
2009 ccol1 = Color_cursor;
2010 else
2011#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
2012 ccol1 = fgcolor_of (rstyle);
2013#else
2014 ccol1 = Color_fg;
2015#endif
2016 if (ISSET_PIXCOLOR (Color_cursor2))
2017 ccol2 = Color_cursor2;
2018 else
2019#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
2020 ccol2 = bgcolor_of (rstyle);
2021#else
2022 ccol2 = Color_bg;
2023#endif
2024 *crp = SET_FGCOLOR (*crp, ccol1); 2061 *crp = SET_FGCOLOR (*crp, ccol1);
2025 *crp = SET_BGCOLOR (*crp, ccol2); 2062 *crp = SET_BGCOLOR (*crp, ccol2);
2026#endif
2027 } 2063 }
2028 } 2064 }
2029 } 2065 }
2030 2066
2031 /* make sure no outline cursor is left around */ 2067 /* make sure no outline cursor is left around */
2032 setoldcursor = 0; 2068 setoldcursor = 0;
2033 if (ocrow != -1) 2069 if (ocrow != -1)
2034 { 2070 {
2035 if (screen.cur.row + view_start != ocrow 2071 if (screen.cur.row - view_start != ocrow
2036 || screen.cur.col != oldcursor.col) 2072 || screen.cur.col != oldcursor.col)
2037 { 2073 {
2038 if (ocrow < nrow 2074 if (ocrow < nrow
2039 && oldcursor.col < ncol) 2075 && oldcursor.col < ncol)
2040 drawn_buf[ocrow].r[oldcursor.col] ^= (RS_RVid | RS_Uline); 2076 drawn_buf[ocrow].r[oldcursor.col] ^= (RS_RVid | RS_Uline);
… …
2048 else if (!focus) 2084 else if (!focus)
2049 setoldcursor = 1; 2085 setoldcursor = 1;
2050 2086
2051 if (setoldcursor) 2087 if (setoldcursor)
2052 { 2088 {
2053 if (screen.cur.row + view_start >= nrow) 2089 if (screen.cur.row - view_start >= nrow)
2054 oldcursor.row = -1; 2090 oldcursor.row = -1;
2055 else 2091 else
2056 { 2092 {
2057 oldcursor.row = screen.cur.row + view_start; 2093 oldcursor.row = screen.cur.row - view_start;
2058 oldcursor.col = screen.cur.col; 2094 oldcursor.col = screen.cur.col;
2059 } 2095 }
2060 } 2096 }
2061 } 2097 }
2062 2098
… …
2068#ifndef NO_SLOW_LINK_SUPPORT 2104#ifndef NO_SLOW_LINK_SUPPORT
2069 /* 2105 /*
2070 * D: CopyArea pass - very useful for slower links 2106 * D: CopyArea pass - very useful for slower links
2071 * This has been deliberately kept simple. 2107 * This has been deliberately kept simple.
2072 */ 2108 */
2073 i = num_scr;
2074 if (!display->is_local 2109 if (!display->is_local
2075 && refresh_type == FAST_REFRESH && num_scr_allow && num_scr 2110 && refresh_type == FAST_REFRESH && num_scr_allow && num_scr
2076 && abs (num_scr) < nrow && !must_clear) 2111 && abs (num_scr) < nrow && !have_bg)
2077 { 2112 {
2078 int16_t nits; 2113 int16_t nits;
2114 int i = num_scr;
2079 int j; 2115 int j;
2080 int len, wlen; 2116 int len, wlen;
2117 dLocal (int, num_scr);
2081 2118
2082 j = nrow; 2119 j = nrow;
2083 wlen = len = -1; 2120 wlen = len = -1;
2084 row = i > 0 ? 0 : j - 1; 2121 row = i > 0 ? 0 : j - 1;
2122
2085 for (; j-- >= 0; row += (i > 0 ? 1 : -1)) 2123 for (; j-- >= 0; row += (i > 0 ? 1 : -1))
2086 { 2124 {
2087 if (row + i >= 0 && row + i < nrow && row + i != ocrow) 2125 if (row + i >= 0 && row + i < nrow && row + i != ocrow)
2088 { 2126 {
2089 line_t s = ROW(row - view_start); 2127 line_t s = ROW(view_start + row);
2090 line_t d = drawn_buf[row]; 2128 line_t d = drawn_buf[row];
2091 line_t d2 = drawn_buf[row + i]; 2129 line_t d2 = drawn_buf[row + i];
2092 2130
2093 for (nits = 0, col = ncol; col--; ) 2131 for (nits = 0, col = ncol; col--; )
2094 if (s.t[col] != d2.t[col] || s.r[col] != d2.r[col]) 2132 if (s.t[col] != d2.t[col] || s.r[col] != d2.r[col])
… …
2110 wlen = row; 2148 wlen = row;
2111 continue; 2149 continue;
2112 } 2150 }
2113 } 2151 }
2114 2152
2115 if (len != -1) 2153 if (len >= 0)
2116 { 2154 {
2117 /* also comes here at end if needed because of >= above */ 2155 /* also comes here at end if needed because of >= above */
2118 if (wlen < len) 2156 if (wlen < len)
2119 ::swap (wlen, len); 2157 ::swap (wlen, len);
2120 2158
2159 XGCValues gcv;
2160
2161 gcv.graphics_exposures = 1; XChangeGC (dpy, gc, GCGraphicsExposures, &gcv);
2121 XCopyArea (display->display, vt, vt, 2162 XCopyArea (dpy, vt, vt,
2122 gc, 0, Row2Pixel (len + i), 2163 gc, 0, Row2Pixel (len + i),
2123 (unsigned int)this->width, 2164 (unsigned int)this->width,
2124 (unsigned int)Height2Pixel (wlen - len + 1), 2165 (unsigned int)Height2Pixel (wlen - len + 1),
2125 0, Row2Pixel (len)); 2166 0, Row2Pixel (len));
2167 gcv.graphics_exposures = 0; XChangeGC (dpy, gc, GCGraphicsExposures, &gcv);
2168
2126 len = -1; 2169 len = -1;
2127 } 2170 }
2128 } 2171 }
2129 } 2172 }
2130#endif 2173#endif
… …
2132 /* 2175 /*
2133 * E: main pass across every character 2176 * E: main pass across every character
2134 */ 2177 */
2135 for (row = 0; row < nrow; row++) 2178 for (row = 0; row < nrow; row++)
2136 { 2179 {
2137 text_t *stp = ROW(row - view_start).t; 2180 text_t *stp = ROW(view_start + row).t;
2138 rend_t *srp = ROW(row - view_start).r; 2181 rend_t *srp = ROW(view_start + row).r;
2139 text_t *dtp = drawn_buf[row].t; 2182 text_t *dtp = drawn_buf[row].t;
2140 rend_t *drp = drawn_buf[row].r; 2183 rend_t *drp = drawn_buf[row].r;
2141 2184
2142 /* 2185 /*
2143 * E2: OK, now the real pass 2186 * E2: OK, now the real pass
… …
2186 count++; 2229 count++;
2187 2230
2188 if (stp[col] != dtp[col] 2231 if (stp[col] != dtp[col]
2189 || !RS_SAME (srp[col], drp[col])) 2232 || !RS_SAME (srp[col], drp[col]))
2190 { 2233 {
2191 if (must_clear && (i++ > count / 2)) 2234 if (have_bg && (i++ > count / 2))
2192 break; 2235 break;
2193 2236
2194 dtp[col] = stp[col]; 2237 dtp[col] = stp[col];
2195 drp[col] = rend; 2238 drp[col] = rend;
2196 i = 0; 2239 i = 0;
2197 } 2240 }
2198 else if (must_clear || (stp[col] != ' ' && ++i >= 16)) 2241 else if (have_bg || (stp[col] != ' ' && ++i >= 16))
2199 break; 2242 break;
2200 } 2243 }
2201 2244
2202 col--; /* went one too far. move back */ 2245 col--; /* went one too far. move back */
2203 count -= i; /* dump any matching trailing chars */ 2246 count -= i; /* dump any matching trailing chars */
… …
2213 int back = bgcolor_of (rend); // desired background 2256 int back = bgcolor_of (rend); // desired background
2214 2257
2215 // only do special processing if any attributes are set, which is unlikely 2258 // only do special processing if any attributes are set, which is unlikely
2216 if (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful)) 2259 if (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful))
2217 { 2260 {
2218#if ENABLE_STYLES
2219 // force redraw after "careful" characters to avoid pixel droppings
2220 if (srp[col] & RS_Careful && col < ncol - 1 && 0)
2221 drp[col + 1] = ~srp[col + 1];
2222
2223 // include previous careful character(s) if possible, looks nicer (best effort...)
2224 while (text > stp
2225 && srp[text - stp - 1] & RS_Careful
2226 && RS_SAME (rend, srp[text - stp - 1]))
2227 text--, count++, xpixel -= fwidth;
2228#endif
2229
2230 bool invert = rend & RS_RVid; 2261 bool invert = rend & RS_RVid;
2231 2262
2232#ifndef NO_BOLD_UNDERLINE_REVERSE 2263#ifndef NO_BOLD_UNDERLINE_REVERSE
2233 if (rend & RS_Bold 2264 if (rend & RS_Bold
2234 && fore == Color_fg) 2265 && fore == Color_fg)
… …
2250 else 2281 else
2251 invert = !invert; 2282 invert = !invert;
2252# endif 2283# endif
2253 } 2284 }
2254 2285
2255 if (rend & RS_Uline && ISSET_PIXCOLOR (Color_UL)) 2286 if (rend & RS_Uline && fore == Color_fg && ISSET_PIXCOLOR (Color_UL))
2256 fore = Color_UL; 2287 fore = Color_UL;
2257#endif 2288#endif
2258 2289
2259 if (invert) 2290 if (invert)
2260 { 2291 {
2292#ifdef OPTION_HC
2293 if ((showcursor && row == screen.cur.row && text - stp == screen.cur.col)
2294 || !ISSET_PIXCOLOR (Color_HC))
2295#endif
2296 /* invert the column if no highlightColor is set or it is the
2297 * current cursor column */
2261 ::swap (fore, back); 2298 ::swap (fore, back);
2299#ifdef OPTION_HC
2300 else if (ISSET_PIXCOLOR (Color_HC))
2301 back = Color_HC;
2302#endif
2262 2303
2263#ifndef NO_BOLD_UNDERLINE_REVERSE 2304#ifndef NO_BOLD_UNDERLINE_REVERSE
2305# ifndef OPTION_HC
2264 if (ISSET_PIXCOLOR (Color_RV)) 2306 if (ISSET_PIXCOLOR (Color_RV))
2265 back = Color_RV; 2307 back = Color_RV;
2266 2308# endif
2267 if (fore == back) 2309 if (fore == back)
2268 { 2310 {
2269 fore = Color_bg; 2311 fore = Color_bg;
2270 back = Color_fg; 2312 back = Color_fg;
2271 } 2313 }
… …
2282 } 2324 }
2283 else if (hidden_text) 2325 else if (hidden_text)
2284 fore = back; 2326 fore = back;
2285 } 2327 }
2286#endif 2328#endif
2329
2330#if ENABLE_STYLES
2331 // "careful" (too wide) character handling
2332
2333 // include previous careful character(s) if possible, looks nicer (best effort...)
2334 while (text > stp
2335 && srp[text - stp - 1] & RS_Careful
2336 && RS_SAME (rend, srp[text - stp - 1]))
2337 text--, count++, xpixel -= fwidth;
2338
2339 // force redraw after "careful" characters to avoid pixel droppings
2340 for (int i = 0; srp[col + i] & RS_Careful && col + i < ncol - 1; i++)
2341 drp[col + i + 1] = srp[col + i + 1] ^ RS_redraw;
2342
2343 // force redraw before "careful" characters to avoid pixel droppings
2344 for (int i = 0; srp[text - stp - i] & RS_Careful && text - i > stp; i++)
2345 drp[text - stp - i - 1] = srp[text - stp - i - 1] ^ RS_redraw;
2346#endif
2287 } 2347 }
2288 2348
2289 /* 2349 /*
2290 * Actually do the drawing of the string here 2350 * Actually do the drawing of the string here
2291 */ 2351 */
2292 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)]; 2352 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)];
2293 2353
2294 if (back == fore)
2295 font->clear_rect (*drawable, xpixel, ypixel,
2296 fwidth * count, fheight,
2297 back);
2298 else if (back == Color_bg) 2354 if (have_bg && back == Color_bg)
2299 { 2355 {
2300 if (must_clear) 2356 // this is very ugly, maybe push it into ->draw?
2301 {
2302 CLEAR_CHARS (xpixel, ypixel, count);
2303 2357
2304 for (i = 0; i < count; i++) /* don't draw empty strings */ 2358 for (i = 0; i < count; i++) /* don't draw empty strings */
2305 if (text[i] != ' ') 2359 if (text[i] != ' ')
2306 { 2360 {
2307 font->draw (*drawable, xpixel, ypixel, text, count, fore, -1); 2361 font->draw (*drawable, xpixel, ypixel, text, count, fore, Color_transparent);
2308 break; 2362 goto did_clear;
2309 }
2310 } 2363 }
2311 else 2364
2312 font->draw (*drawable, xpixel, ypixel, text, count, fore, Color_bg); 2365 CLEAR_CHARS (xpixel, ypixel, count);
2366 did_clear: ;
2313 } 2367 }
2314 else 2368 else
2315 font->draw (*drawable, xpixel, ypixel, text, count, fore, back); 2369 font->draw (*drawable, xpixel, ypixel, text, count, fore, back);
2316 2370
2317 if (rend & RS_Uline && font->descent > 1 && fore != back) 2371 if (rend & RS_Uline && font->descent > 1 && fore != back)
2318 { 2372 {
2319#if ENABLE_FRILLS 2373#if ENABLE_FRILLS
2320 if (ISSET_PIXCOLOR (Color_underline)) 2374 if (ISSET_PIXCOLOR (Color_underline))
2321 XSetForeground (display->display, gc, pix_colors[Color_underline]); 2375 XSetForeground (dpy, gc, pix_colors[Color_underline]);
2322 else 2376 else
2323#endif 2377#endif
2324 XSetForeground (display->display, gc, pix_colors[fore]); 2378 XSetForeground (dpy, gc, pix_colors[fore]);
2325 2379
2326 XDrawLine (display->display, drawBuffer, gc, 2380 XDrawLine (dpy, drawBuffer, gc,
2327 xpixel, ypixel + font->ascent + 1, 2381 xpixel, ypixel + font->ascent + 1,
2328 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1); 2382 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1);
2329 } 2383 }
2330 } /* for (col....) */ 2384 } /* for (col....) */
2331 } /* for (row....) */ 2385 } /* for (row....) */
… …
2340 */ 2394 */
2341 if (showcursor) 2395 if (showcursor)
2342 { 2396 {
2343 if (focus) 2397 if (focus)
2344 { 2398 {
2345 if (OPTION (Opt_cursorUnderline)) 2399 if (option (Opt_cursorUnderline))
2346 *crp ^= RS_Uline; 2400 *crp ^= RS_Uline;
2347 else 2401 else
2348 { 2402 {
2349 *crp ^= RS_RVid; 2403 *crp ^= RS_RVid;
2350#ifndef NO_CURSORCOLOR 2404#ifndef NO_CURSORCOLOR
… …
2364 && drawn_buf[oldcursor.row].t[col + cursorwidth] == NOCHAR) 2418 && drawn_buf[oldcursor.row].t[col + cursorwidth] == NOCHAR)
2365 cursorwidth++; 2419 cursorwidth++;
2366 2420
2367#ifndef NO_CURSORCOLOR 2421#ifndef NO_CURSORCOLOR
2368 if (ISSET_PIXCOLOR (Color_cursor)) 2422 if (ISSET_PIXCOLOR (Color_cursor))
2369 XSetForeground (display->display, gc, pix_colors[Color_cursor]); 2423 XSetForeground (dpy, gc, pix_colors[Color_cursor]);
2424 else
2370#endif 2425#endif
2426 XSetForeground (dpy, gc, pix_colors[ccol1]);
2371 2427
2372 XDrawRectangle (display->display, drawBuffer, gc, 2428 XDrawRectangle (dpy, drawBuffer, gc,
2373 Col2Pixel (col), 2429 Col2Pixel (col),
2374 Row2Pixel (oldcursor.row), 2430 Row2Pixel (oldcursor.row),
2375 (unsigned int) (Width2Pixel (cursorwidth) - 1), 2431 (unsigned int) (Width2Pixel (cursorwidth) - 1),
2376 (unsigned int) (Height2Pixel (1) - lineSpace - 1)); 2432 (unsigned int) (Height2Pixel (1) - lineSpace - 1));
2377 } 2433 }
… …
2380 /* 2436 /*
2381 * H: cleanup selection 2437 * H: cleanup selection
2382 */ 2438 */
2383 scr_reverse_selection (); 2439 scr_reverse_selection ();
2384 2440
2385 if (refresh_type & SMOOTH_REFRESH)
2386 XFlush (display->display);
2387
2388 num_scr = 0; 2441 num_scr = 0;
2389 num_scr_allow = 1; 2442 num_scr_allow = 1;
2390} 2443}
2391 2444
2392void 2445void
2393rxvt_term::scr_remap_chars (line_t &l) 2446rxvt_term::scr_remap_chars (line_t &l) NOTHROW
2394{ 2447{
2395 if (!l.t) 2448 if (!l.t)
2396 return; 2449 return;
2397 2450
2398 l.touch (); // maybe a bit of an overkill, but it's not performance-relevant 2451 l.touch (); // maybe a bit of an overkill, but it's not performance-relevant
… …
2400 for (int i = ncol; i--; ) 2453 for (int i = ncol; i--; )
2401 l.r[i] = SET_FONT (l.r[i], FONTSET (l.r[i])->find_font (l.t[i])); 2454 l.r[i] = SET_FONT (l.r[i], FONTSET (l.r[i])->find_font (l.t[i]));
2402} 2455}
2403 2456
2404void 2457void
2405rxvt_term::scr_remap_chars () 2458rxvt_term::scr_remap_chars () NOTHROW
2406{ 2459{
2407 for (int i = total_rows; i--; ) 2460 for (int i = total_rows; i--; )
2408 scr_remap_chars (row_buf [i]); 2461 scr_remap_chars (row_buf [i]);
2409 2462
2410 for (int i = nrow; i--; ) 2463 for (int i = nrow; i--; )
… …
2413 scr_remap_chars (swap_buf [i]); 2466 scr_remap_chars (swap_buf [i]);
2414 } 2467 }
2415} 2468}
2416 2469
2417void 2470void
2418rxvt_term::scr_recolour () 2471rxvt_term::scr_recolour () NOTHROW
2419{ 2472{
2420 if (1 2473 if (1
2421#if TRANSPARENT 2474#if TRANSPARENT
2422 && !am_transparent 2475 && !am_transparent
2423#endif 2476#endif
2424#if XPM_BACKGROUND 2477#if XPM_BACKGROUND
2425 && !bgPixmap.pixmap 2478 && !bgPixmap.pixmap
2426#endif 2479#endif
2427 ) 2480 )
2428 { 2481 {
2429 XSetWindowBackground (display->display, parent[0], pix_colors[Color_border]); 2482 XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]);
2430 XClearWindow (display->display, parent[0]); 2483 XClearWindow (dpy, parent[0]);
2431 XSetWindowBackground (display->display, vt, pix_colors[Color_bg]); 2484 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
2432#if HAVE_SCROLLBARS 2485#if HAVE_SCROLLBARS
2433 if (scrollBar.win) 2486 if (scrollBar.win)
2434 { 2487 {
2435 XSetWindowBackground (display->display, scrollBar.win, pix_colors[Color_border]); 2488 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]);
2436 scrollBar.setIdle (); 2489 scrollBar.setIdle ();
2437 scrollbar_show (0); 2490 scrollbar_show (0);
2438 } 2491 }
2439#endif 2492#endif
2440 } 2493 }
… …
2444 want_refresh = 1; 2497 want_refresh = 1;
2445} 2498}
2446 2499
2447/* ------------------------------------------------------------------------- */ 2500/* ------------------------------------------------------------------------- */
2448void 2501void
2449rxvt_term::scr_clear (bool really) 2502rxvt_term::scr_clear (bool really) NOTHROW
2450{ 2503{
2451 if (!mapped) 2504 if (!mapped)
2452 return; 2505 return;
2453 2506
2454 num_scr_allow = 0; 2507 num_scr_allow = 0;
2455 want_refresh = 1; 2508 want_refresh = 1;
2456 2509
2457 if (really) 2510 if (really)
2458 XClearWindow (display->display, vt); 2511 XClearWindow (dpy, vt);
2459} 2512}
2460 2513
2461/* ------------------------------------------------------------------------- */
2462void 2514void
2515rxvt_term::scr_xor_rect (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle1, rend_t rstyle2) NOTHROW
2516{
2517 int view_end = view_start + nrow;
2518 int row, col;
2519
2520 for (row = max (beg_row, view_start); row <= min (end_row, view_end); row++)
2521 {
2522 text_t *stp = ROW(row).t;
2523 rend_t *srp = ROW(row).r;
2524
2525 for (col = beg_col; col < end_col; col++)
2526 srp[col] ^= rstyle1;
2527
2528 while (col-- > beg_col && (stp[col] == NOCHAR || unicode::is_space (stp[col])))
2529 srp[col] ^= rstyle2;
2530
2531 if (++col < end_col)
2532 srp[col] ^= rstyle2;
2533 }
2534}
2535
2536void
2537rxvt_term::scr_xor_span (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle) NOTHROW
2538{
2539 int view_end = view_start + nrow;
2540 int row, col;
2541
2542 if (beg_row >= view_start)
2543 {
2544 col = beg_col;
2545 row = beg_row;
2546 }
2547 else
2548 {
2549 col = 0;
2550 row = view_start;
2551 }
2552
2553 for (; row < min (end_row, view_end); row++, col = 0)
2554 for (rend_t *srp = ROW(row).r; col < ncol; col++)
2555 srp[col] ^= rstyle;
2556
2557 if (row == end_row)
2558 for (rend_t *srp = ROW(row).r; col < end_col; col++)
2559 srp[col] ^= rstyle;
2560}
2561
2562/* ------------------------------------------------------------------------- */
2563void
2463rxvt_term::scr_reverse_selection () 2564rxvt_term::scr_reverse_selection () NOTHROW
2464{ 2565{
2465 if (selection.op 2566 if (selection.op
2466 && current_screen == selection.screen 2567 && current_screen == selection.screen
2467 && selection.end.row >= -view_start) 2568 && selection.end.row >= view_start)
2468 { 2569 {
2469 int view_end = -view_start + nrow; 2570#if !ENABLE_MINIMAL
2470 int row, col;
2471
2472#if ENABLE_FRILLS
2473 if (selection.rect) 2571 if (selection.rect)
2474 { 2572 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++) 2573 selection.end.row, selection.end.col,
2476 { 2574 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 2575 else
2491#endif 2576#endif
2492 { 2577 scr_xor_span (selection.beg.row, selection.beg.col,
2493 if (selection.beg.row >= -view_start) 2578 selection.end.row, selection.end.col,
2494 { 2579 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 } 2580 }
2513} 2581}
2514 2582
2515/* ------------------------------------------------------------------------- */ 2583/* ------------------------------------------------------------------------- */
2516/* 2584/*
2517 * Dump the whole scrollback and screen to the passed filedescriptor. The 2585 * Dump the whole scrollback and screen to the passed filedescriptor. The
2518 * invoking routine must close the fd. 2586 * invoking routine must close the fd.
2519 */ 2587 */
2520#if 0 2588#if 0
2521void 2589void
2522rxvt_term::scr_dump (int fd) 2590rxvt_term::scr_dump (int fd) NOTHROW
2523{ 2591{
2524 int row, wrote; 2592 int row, wrote;
2525 unsigned int width, towrite; 2593 unsigned int width, towrite;
2526 char r1[] = "\n"; 2594 char r1[] = "\n";
2527 2595
… …
2546 2614
2547/* ------------------------------------------------------------------------- * 2615/* ------------------------------------------------------------------------- *
2548 * CHARACTER SELECTION * 2616 * CHARACTER SELECTION *
2549 * ------------------------------------------------------------------------- */ 2617 * ------------------------------------------------------------------------- */
2550void 2618void
2551rxvt_term::selection_check (int check_more) 2619rxvt_term::selection_check (int check_more) NOTHROW
2552{ 2620{
2553 row_col_t pos; 2621 row_col_t pos;
2554 2622
2555 if (!selection.op) 2623 if (!selection.op)
2556 return; 2624 return;
2557 2625
2558 pos.row = pos.col = 0; 2626 pos.row = pos.col = 0;
2559 if (!IN_RANGE_EXC (selection.beg.row, -nsaved, nrow) 2627 if (!IN_RANGE_EXC (selection.beg.row, top_row, nrow)
2560 || !IN_RANGE_EXC (selection.mark.row, -nsaved, nrow) 2628 || !IN_RANGE_EXC (selection.mark.row, top_row, nrow)
2561 || !IN_RANGE_EXC (selection.end.row, -nsaved, nrow) 2629 || !IN_RANGE_EXC (selection.end.row, top_row, nrow)
2562 || (check_more == 1 2630 || (check_more == 1
2563 && current_screen == selection.screen 2631 && current_screen == selection.screen
2564 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) 2632 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
2565 && ROWCOL_IS_BEFORE (screen.cur, selection.end)) 2633 && ROWCOL_IS_BEFORE (screen.cur, selection.end))
2566 || (check_more == 2 2634 || (check_more == 2
… …
2577/* ------------------------------------------------------------------------- */ 2645/* ------------------------------------------------------------------------- */
2578/* 2646/*
2579 * Paste a selection direct to the command fd 2647 * Paste a selection direct to the command fd
2580 */ 2648 */
2581void 2649void
2582rxvt_term::paste (char *data, unsigned int len) 2650rxvt_term::paste (char *data, unsigned int len) NOTHROW
2583{ 2651{
2584 /* convert normal newline chars into common keyboard Return key sequence */ 2652 /* convert normal newline chars into common keyboard Return key sequence */
2585 for (unsigned int i = 0; i < len; i++) 2653 for (unsigned int i = 0; i < len; i++)
2586 if (data[i] == C0_LF) 2654 if (data[i] == C0_LF)
2587 data[i] = C0_CR; 2655 data[i] = C0_CR;
… …
2593/* 2661/*
2594 * Respond to a notification that a primary selection has been sent 2662 * Respond to a notification that a primary selection has been sent
2595 * EXT: SelectionNotify 2663 * EXT: SelectionNotify
2596 */ 2664 */
2597void 2665void
2598rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop) 2666rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop) NOTHROW
2599{ 2667{
2600 if (prop == None) /* check for failed XConvertSelection */ 2668 if (prop == None) /* check for failed XConvertSelection */
2601 { 2669 {
2602 if ((selection_type & Sel_CompoundText)) 2670 if ((selection_type & Sel_CompoundText))
2603 { 2671 {
… …
2623 } 2691 }
2624 2692
2625 unsigned long bytes_after; 2693 unsigned long bytes_after;
2626 XTextProperty ct; 2694 XTextProperty ct;
2627 2695
2628 if (XGetWindowProperty (display->display, win, prop, 2696 if (XGetWindowProperty (dpy, win, prop,
2629 0, PROP_SIZE / 4, 2697 0, PROP_SIZE / 4,
2630 delete_prop, AnyPropertyType, 2698 delete_prop, AnyPropertyType,
2631 &ct.encoding, &ct.format, 2699 &ct.encoding, &ct.format,
2632 &ct.nitems, &bytes_after, 2700 &ct.nitems, &bytes_after,
2633 &ct.value) != Success) 2701 &ct.value) != Success)
… …
2642 if (bytes_after) 2710 if (bytes_after)
2643 { 2711 {
2644 // fetch and append remaining data 2712 // fetch and append remaining data
2645 XTextProperty ct2; 2713 XTextProperty ct2;
2646 2714
2647 if (XGetWindowProperty (display->display, win, prop, 2715 if (XGetWindowProperty (dpy, win, prop,
2648 ct.nitems / 4, (bytes_after + 3) / 4, 2716 ct.nitems / 4, (bytes_after + 3) / 4,
2649 delete_prop, AnyPropertyType, 2717 delete_prop, AnyPropertyType,
2650 &ct2.encoding, &ct2.format, 2718 &ct2.encoding, &ct2.format,
2651 &ct2.nitems, &bytes_after, 2719 &ct2.nitems, &bytes_after,
2652 &ct2.value) != Success) 2720 &ct2.value) != Success)
… …
2665 2733
2666 if (ct.encoding == xa[XA_INCR]) 2734 if (ct.encoding == xa[XA_INCR])
2667 { 2735 {
2668 // INCR selection, start handshake 2736 // INCR selection, start handshake
2669 if (!delete_prop) 2737 if (!delete_prop)
2670 XDeleteProperty (display->display, win, prop); 2738 XDeleteProperty (dpy, win, prop);
2671 2739
2672 selection_wait = Sel_incr; 2740 selection_wait = Sel_incr;
2673 incr_buf_fill = 0; 2741 incr_buf_fill = 0;
2674 incr_ev.start (NOW + 10); 2742 incr_ev.start (NOW + 10);
2675 2743
… …
2722 } 2790 }
2723 2791
2724 char **cl; 2792 char **cl;
2725 int cr; 2793 int cr;
2726 2794
2727#if ENABLE_FRILLS 2795#if !ENABLE_MINIMAL
2728 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it 2796 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it
2729 // so recode it manually 2797 // so recode it manually
2730 if (ct.encoding == xa[XA_UTF8_STRING]) 2798 if (ct.encoding == xa[XA_UTF8_STRING])
2731 { 2799 {
2732 wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems); 2800 wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems);
… …
2736 paste (s, strlen (s)); 2804 paste (s, strlen (s));
2737 free (s); 2805 free (s);
2738 } 2806 }
2739 else 2807 else
2740#endif 2808#endif
2741 if (XmbTextPropertyToTextList (display->display, &ct, &cl, &cr) >= 0 2809 if (XmbTextPropertyToTextList (dpy, &ct, &cl, &cr) >= 0
2742 && cl) 2810 && cl)
2743 { 2811 {
2744 for (int i = 0; i < cr; i++) 2812 for (int i = 0; i < cr; i++)
2745 paste (cl[i], strlen (cl[i])); 2813 paste (cl[i], strlen (cl[i]));
2746 2814
… …
2755 if (selection_wait == Sel_normal) 2823 if (selection_wait == Sel_normal)
2756 selection_wait = Sel_none; 2824 selection_wait = Sel_none;
2757} 2825}
2758 2826
2759void 2827void
2760rxvt_term::incr_cb (time_watcher &w) 2828rxvt_term::incr_cb (time_watcher &w) NOTHROW
2761{ 2829{
2762 selection_wait = Sel_none; 2830 selection_wait = Sel_none;
2763 2831
2764 incr_buf_size = 0; 2832 incr_buf_size = 0;
2765 free (incr_buf); 2833 free (incr_buf);
2766 2834
2767 rxvt_warn ("data loss: timeout on INCR selection paste, ignoring.\n"); 2835 rxvt_warn ("data loss: timeout on INCR selection paste, ignoring.\n");
2768} 2836}
2769 2837
2770void 2838void
2771rxvt_term::selection_property (Window win, Atom prop) 2839rxvt_term::selection_property (Window win, Atom prop) NOTHROW
2772{ 2840{
2773 if (prop == None || selection_wait != Sel_incr) 2841 if (prop == None || selection_wait != Sel_incr)
2774 return; 2842 return;
2775 2843
2776 selection_paste (win, prop, true); 2844 selection_paste (win, prop, true);
… …
2785 * (+) if ownership is claimed but property is empty, rxvt_selection_paste () 2853 * (+) if ownership is claimed but property is empty, rxvt_selection_paste ()
2786 * will auto fallback to CUT_BUFFER0 2854 * will auto fallback to CUT_BUFFER0
2787 * EXT: button 2 release 2855 * EXT: button 2 release
2788 */ 2856 */
2789void 2857void
2790rxvt_term::selection_request (Time tm, int x, int y) 2858rxvt_term::selection_request (Time tm, int selnum) NOTHROW
2791{ 2859{
2792 if (x < 0 || x >= width || y < 0 || y >= height) 2860 if (selection.text && selnum == Sel_Primary)
2793 return; /* outside window */
2794
2795 if (selection.text)
2796 { /* internal selection */ 2861 { /* internal selection */
2797 char *str = rxvt_wcstombs (selection.text, selection.len); 2862 char *str = rxvt_wcstombs (selection.text, selection.len);
2798 paste (str, strlen (str)); 2863 paste (str, strlen (str));
2799 free (str); 2864 free (str);
2800 return; 2865 return;
2801 } 2866 }
2802 else 2867 else
2803 { 2868 {
2804 int i;
2805
2806 selection_request_time = tm; 2869 selection_request_time = tm;
2807 selection_wait = Sel_normal; 2870 selection_wait = Sel_normal;
2808 2871
2809 for (i = Sel_Primary; i <= Sel_Clipboard; i++)
2810 {
2811#if X_HAVE_UTF8_STRING 2872#if X_HAVE_UTF8_STRING
2812 selection_type = Sel_UTF8String; 2873 selection_type = Sel_UTF8String;
2813 if (selection_request_other (xa[XA_UTF8_STRING], i)) 2874 if (selection_request_other (xa[XA_UTF8_STRING], selnum))
2814 return; 2875 return;
2815#else 2876#else
2816 selection_type = Sel_CompoundText; 2877 selection_type = Sel_CompoundText;
2817 if (selection_request_other (xa[XA_COMPOUND_TEXT], i)) 2878 if (selection_request_other (xa[XA_COMPOUND_TEXT], selnum))
2818 return; 2879 return;
2819#endif 2880#endif
2820 }
2821 } 2881 }
2822 2882
2823 selection_wait = Sel_none; /* don't loop in selection_paste () */ 2883 selection_wait = Sel_none; /* don't loop in selection_paste () */
2824 selection_paste (display->root, XA_CUT_BUFFER0, false); 2884 selection_paste (display->root, XA_CUT_BUFFER0, false);
2825} 2885}
2826 2886
2827int 2887int
2828rxvt_term::selection_request_other (Atom target, int selnum) 2888rxvt_term::selection_request_other (Atom target, int selnum) NOTHROW
2829{ 2889{
2830 Atom sel; 2890 Atom sel;
2831 2891
2832 selection_type |= selnum; 2892 selection_type |= selnum;
2833 2893
… …
2836 else if (selnum == Sel_Secondary) 2896 else if (selnum == Sel_Secondary)
2837 sel = XA_SECONDARY; 2897 sel = XA_SECONDARY;
2838 else 2898 else
2839 sel = xa[XA_CLIPBOARD]; 2899 sel = xa[XA_CLIPBOARD];
2840 2900
2841 if (XGetSelectionOwner (display->display, sel) != None) 2901 if (XGetSelectionOwner (dpy, sel) != None)
2842 { 2902 {
2843 XConvertSelection (display->display, sel, target, xa[XA_VT_SELECTION], 2903 XConvertSelection (dpy, sel, target, xa[XA_VT_SELECTION],
2844 vt, selection_request_time); 2904 vt, selection_request_time);
2845 return 1; 2905 return 1;
2846 } 2906 }
2847 2907
2848 return 0; 2908 return 0;
… …
2852/* 2912/*
2853 * Clear all selected text 2913 * Clear all selected text
2854 * EXT: SelectionClear 2914 * EXT: SelectionClear
2855 */ 2915 */
2856void 2916void
2857rxvt_term::selection_clear () 2917rxvt_term::selection_clear () NOTHROW
2858{ 2918{
2859 want_refresh = 1; 2919 want_refresh = 1;
2860 free (selection.text); 2920 free (selection.text);
2861 selection.text = NULL; 2921 selection.text = NULL;
2862 selection.len = 0; 2922 selection.len = 0;
… …
2911 2971
2912 int end_col; 2972 int end_col;
2913 2973
2914 for (; row <= selection.end.row; row++, col = 0) 2974 for (; row <= selection.end.row; row++, col = 0)
2915 { 2975 {
2916#if ENABLE_FRILLS 2976#if !ENABLE_MINIMAL
2917 if (selection.rect) 2977 if (selection.rect)
2918 { 2978 {
2919 col = selection.beg.col; 2979 col = selection.beg.col;
2920 end_col = ncol + 1; 2980 end_col = ncol + 1;
2921 } 2981 }
… …
2924 end_col = ROW(row).l; 2984 end_col = ROW(row).l;
2925 2985
2926 col = max (col, 0); 2986 col = max (col, 0);
2927 2987
2928 if (row == selection.end.row 2988 if (row == selection.end.row
2929#if ENABLE_FRILLS 2989#if !ENABLE_MINIMAL
2930 || selection.rect 2990 || selection.rect
2931#endif 2991#endif
2932 ) 2992 )
2933 min_it (end_col, selection.end.col); 2993 min_it (end_col, selection.end.col);
2934 2994
… …
2957#endif 3017#endif
2958 else 3018 else
2959 new_selection_text[ofs++] = *t++; 3019 new_selection_text[ofs++] = *t++;
2960 } 3020 }
2961 3021
2962#if ENABLE_FRILLS 3022#if !ENABLE_MINIMAL
2963 if (selection.rect) 3023 if (selection.rect)
2964 { 3024 {
2965 while (ofs 3025 while (ofs
2966 && new_selection_text[ofs - 1] != C0_LF 3026 && new_selection_text[ofs - 1] != C0_LF
2967 && unicode::is_space (new_selection_text[ofs - 1])) 3027 && unicode::is_space (new_selection_text[ofs - 1]))
… …
2997 3057
2998 selection_grab (tm); 3058 selection_grab (tm);
2999} 3059}
3000 3060
3001bool 3061bool
3002rxvt_term::selection_grab (Time tm) 3062rxvt_term::selection_grab (Time tm) NOTHROW
3003{ 3063{
3004 selection_time = tm; 3064 selection_time = tm;
3005 3065
3006 XSetSelectionOwner (display->display, XA_PRIMARY, vt, tm); 3066 XSetSelectionOwner (dpy, XA_PRIMARY, vt, tm);
3007 if (XGetSelectionOwner (display->display, XA_PRIMARY) == vt) 3067 if (XGetSelectionOwner (dpy, XA_PRIMARY) == vt)
3008 { 3068 {
3009 display->set_selection_owner (this); 3069 display->set_selection_owner (this);
3010 return true; 3070 return true;
3011 } 3071 }
3012 else 3072 else
3073 {
3074 selection_clear ();
3013 return false; 3075 return false;
3076 }
3014 3077
3015#if 0 3078#if 0
3016 XTextProperty ct; 3079 XTextProperty ct;
3017 3080
3018 if (XwcTextListToTextProperty (display->display, &selection.text, 1, XStringStyle, &ct) >= 0) 3081 if (XwcTextListToTextProperty (dpy, &selection.text, 1, XStringStyle, &ct) >= 0)
3019 { 3082 {
3020 set_string_property (XA_CUT_BUFFER0, ct.value, ct.nitems); 3083 set_string_property (XA_CUT_BUFFER0, ct.value, ct.nitems);
3021 XFree (ct.value); 3084 XFree (ct.value);
3022 } 3085 }
3023#endif 3086#endif
… …
3027/* 3090/*
3028 * Mark or select text based upon number of clicks: 1, 2, or 3 3091 * Mark or select text based upon number of clicks: 1, 2, or 3
3029 * EXT: button 1 press 3092 * EXT: button 1 press
3030 */ 3093 */
3031void 3094void
3032rxvt_term::selection_click (int clicks, int x, int y) 3095rxvt_term::selection_click (int clicks, int x, int y) NOTHROW
3033{ 3096{
3034 clicks = ((clicks - 1) % 3) + 1; 3097 clicks = ((clicks - 1) % 3) + 1;
3035 selection.clicks = clicks; /* save clicks so extend will work */ 3098 selection.clicks = clicks; /* save clicks so extend will work */
3036 3099
3100 if (clicks == 2 && !selection.rect
3101 && HOOK_INVOKE ((this, HOOK_SEL_EXTEND, DT_END)))
3102 {
3103 MEvent.clicks = 1; // what a mess
3104 selection.screen = current_screen;
3105 selection.op = SELECTION_CONT;
3106 return;
3107 }
3108
3037 selection_start_colrow (Pixel2Col (x), Pixel2Row (y)); 3109 selection_start_colrow (Pixel2Col (x), Pixel2Row (y));
3038 3110
3039 if (clicks == 2 || clicks == 3) 3111 if (clicks == 2 || clicks == 3)
3040 selection_extend_colrow (selection.mark.col, 3112 selection_extend_colrow (selection.mark.col,
3041 selection.mark.row + view_start, 3113 selection.mark.row - view_start,
3042 0, /* button 3 */ 3114 0, /* button 3 */
3043 1, /* button press */ 3115 1, /* button press */
3044 0); /* click change */ 3116 0); /* click change */
3045} 3117}
3046 3118
3047/* ------------------------------------------------------------------------- */ 3119/* ------------------------------------------------------------------------- */
3048/* 3120/*
3049 * Mark a selection at the specified col/row 3121 * Mark a selection at the specified col/row
3050 */ 3122 */
3051void 3123void
3052rxvt_term::selection_start_colrow (int col, int row) 3124rxvt_term::selection_start_colrow (int col, int row) NOTHROW
3053{ 3125{
3054 want_refresh = 1; 3126 want_refresh = 1;
3055 3127
3056 selection.mark.row = row - view_start; 3128 selection.mark.row = row + view_start;
3057 selection.mark.col = col; 3129 selection.mark.col = col;
3058 3130
3059 selection.mark.row = clamp (selection.mark.row, -nsaved, nrow - 1); 3131 selection.mark.row = clamp (selection.mark.row, top_row, nrow - 1);
3060 selection.mark.col = clamp (selection.mark.col, 0, ncol - 1); 3132 selection.mark.col = clamp (selection.mark.col, 0, ncol - 1);
3061 3133
3062 while (selection.mark.col > 0 3134 while (selection.mark.col > 0
3063 && ROW(selection.mark.row).t[selection.mark.col] == NOCHAR) 3135 && ROW(selection.mark.row).t[selection.mark.col] == NOCHAR)
3064 --selection.mark.col; 3136 --selection.mark.col;
… …
3083#define DELIMIT_TEXT(x) \ 3155#define DELIMIT_TEXT(x) \
3084 (unicode::is_space (x) ? 2 : (x) <= 0xff && !!strchr (rs[Rs_cutchars], (x))) 3156 (unicode::is_space (x) ? 2 : (x) <= 0xff && !!strchr (rs[Rs_cutchars], (x)))
3085#define DELIMIT_REND(x) 1 3157#define DELIMIT_REND(x) 1
3086 3158
3087void 3159void
3088rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) 3160rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) NOTHROW
3089{ 3161{
3090 int col, row, dirnadd, tcol, trow, w1, w2; 3162 int col, row, dirnadd, tcol, trow, w1, w2;
3091 row_col_t bound; 3163 row_col_t bound;
3092 text_t *stp; 3164 text_t *stp;
3093 rend_t *srp; 3165 rend_t *srp;
3094 3166
3095 if (dirn == UP) 3167 if (dirn == UP)
3096 { 3168 {
3097 bound.row = - nsaved - 1; 3169 bound.row = top_row - 1;
3098 bound.col = 0; 3170 bound.col = 0;
3099 dirnadd = -1; 3171 dirnadd = -1;
3100 } 3172 }
3101 else 3173 else
3102 { 3174 {
… …
3167 * flag == 0 ==> button 1 3239 * flag == 0 ==> button 1
3168 * flag == 1 ==> button 3 press 3240 * flag == 1 ==> button 3 press
3169 * flag == 2 ==> button 3 motion 3241 * flag == 2 ==> button 3 motion
3170 */ 3242 */
3171void 3243void
3172rxvt_term::selection_extend (int x, int y, int flag) 3244rxvt_term::selection_extend (int x, int y, int flag) NOTHROW
3173{ 3245{
3174 int col = clamp (Pixel2Col (x), 0, ncol); 3246 int col = clamp (Pixel2Col (x), 0, ncol);
3175 int row = clamp (Pixel2Row (y), 0, nrow - 1); 3247 int row = clamp (Pixel2Row (y), 0, nrow - 1);
3176 3248
3177 /* 3249 /*
… …
3180 * select nothing. Otherwise, if we're to the right of the mark, you have to 3252 * 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. 3253 * be _past_ a character for it to be selected.
3182 */ 3254 */
3183 if (((selection.clicks % 3) == 1) && !flag 3255 if (((selection.clicks % 3) == 1) && !flag
3184 && (col == selection.mark.col 3256 && (col == selection.mark.col
3185 && (row == selection.mark.row + view_start))) 3257 && (row == selection.mark.row - view_start)))
3186 { 3258 {
3187 /* select nothing */ 3259 /* select nothing */
3188 selection.beg.row = selection.end.row = 0; 3260 selection.beg.row = selection.end.row = 0;
3189 selection.beg.col = selection.end.col = 0; 3261 selection.beg.col = selection.end.col = 0;
3190 selection.clicks = 4; 3262 selection.clicks = 4;
… …
3203/* ------------------------------------------------------------------------- */ 3275/* ------------------------------------------------------------------------- */
3204/* 3276/*
3205 * Extend the selection to the specified col/row 3277 * Extend the selection to the specified col/row
3206 */ 3278 */
3207void 3279void
3208rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) 3280rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) NOTHROW
3209{ 3281{
3210 row_col_t pos; 3282 row_col_t pos;
3211 enum { 3283 enum {
3212 LEFT, RIGHT 3284 LEFT, RIGHT
3213 } closeto = RIGHT; 3285 } closeto = RIGHT;
… …
3245 selection.beg.col = selection.end.col = selection.mark.col; 3317 selection.beg.col = selection.end.col = selection.mark.col;
3246 selection.beg.row = selection.end.row = selection.mark.row; 3318 selection.beg.row = selection.end.row = selection.mark.row;
3247 } 3319 }
3248 3320
3249 pos.col = col; 3321 pos.col = col;
3250 pos.row = row - view_start; 3322 pos.row = view_start + row;
3251 3323
3252 /* 3324 /*
3253 * This is mainly xterm style selection with a couple of differences, mainly 3325 * This is mainly xterm style selection with a couple of differences, mainly
3254 * in the way button3 drag extension works. 3326 * in the way button3 drag extension works.
3255 * We're either doing: button1 drag; button3 press; or button3 drag 3327 * We're either doing: button1 drag; button3 press; or button3 drag
… …
3316 3388
3317 if (selection.clicks == 1) 3389 if (selection.clicks == 1)
3318 { 3390 {
3319 if (selection.beg.col > ROW(selection.beg.row).l //TODO//FIXME//LEN 3391 if (selection.beg.col > ROW(selection.beg.row).l //TODO//FIXME//LEN
3320 && !ROW(selection.beg.row).is_longer () 3392 && !ROW(selection.beg.row).is_longer ()
3321#if ENABLE_FRILLS 3393#if !ENABLE_MINIMAL
3322 && !selection.rect 3394 && !selection.rect
3323#endif 3395#endif
3324 ) 3396 )
3325 selection.beg.col = ncol; 3397 selection.beg.col = ncol;
3326 3398
3327 if ( 3399 if (
3328 selection.end.col > ROW(selection.end.row).l //TODO//FIXME//LEN 3400 selection.end.col > ROW(selection.end.row).l //TODO//FIXME//LEN
3329 && !ROW(selection.end.row).is_longer () 3401 && !ROW(selection.end.row).is_longer ()
3330#if ENABLE_FRILLS 3402#if !ENABLE_MINIMAL
3331 && !selection.rect 3403 && !selection.rect
3332#endif 3404#endif
3333 ) 3405 )
3334 selection.end.col = ncol; 3406 selection.end.col = ncol;
3335 } 3407 }
3336 else if (selection.clicks == 2) 3408 else if (selection.clicks == 2)
3337 { 3409 {
3338 if (ROWCOL_IS_AFTER (selection.end, selection.beg)) 3410 if (ROWCOL_IS_AFTER (selection.end, selection.beg))
3339 selection.end.col--; 3411 selection.end.col--;
3340 3412
3341 if (!HOOK_INVOKE ((this, HOOK_SEL_EXTEND, DT_END)))
3342 {
3343 selection_delimit_word (UP, &selection.beg, &selection.beg); 3413 selection_delimit_word (UP, &selection.beg, &selection.beg);
3344 selection_delimit_word (DN, &selection.end, &selection.end); 3414 selection_delimit_word (DN, &selection.end, &selection.end);
3345 }
3346 } 3415 }
3347 else if (selection.clicks == 3) 3416 else if (selection.clicks == 3)
3348 { 3417 {
3349#if ENABLE_FRILLS 3418#if ENABLE_FRILLS
3350 if (OPTION (Opt_tripleclickwords)) 3419 if (option (Opt_tripleclickwords))
3351 { 3420 {
3352 selection_delimit_word (UP, &selection.beg, &selection.beg); 3421 selection_delimit_word (UP, &selection.beg, &selection.beg);
3353 3422
3354 for (int end_row = selection.mark.row; end_row < nrow; end_row++) 3423 for (int end_row = selection.mark.row; end_row < nrow; end_row++)
3355 { 3424 {
3356 if (!ROW(end_row).is_longer ()) 3425 if (!ROW(end_row).is_longer ())
3357 { 3426 {
3358 selection.end.row = end_row; 3427 selection.end.row = end_row;
3359 selection.end.col = ROW(end_row).l; 3428 selection.end.col = ROW(end_row).l;
3429# if !ENABLE_MINIMAL
3360 selection_remove_trailing_spaces (); 3430 selection_remove_trailing_spaces ();
3431# endif
3361 break; 3432 break;
3362 } 3433 }
3363 } 3434 }
3364 } 3435 }
3365 else 3436 else
… …
3394 selection.mark.row = selection.beg.row; 3465 selection.mark.row = selection.beg.row;
3395 selection.mark.col = selection.beg.col; 3466 selection.mark.col = selection.beg.col;
3396 } 3467 }
3397 } 3468 }
3398 3469
3399#if ENABLE_FRILLS 3470#if !ENABLE_MINIMAL
3400 if (selection.rect && selection.beg.col > selection.end.col) 3471 if (selection.rect && selection.beg.col > selection.end.col)
3401 ::swap (selection.beg.col, selection.end.col); 3472 ::swap (selection.beg.col, selection.end.col);
3402#endif 3473#endif
3403} 3474}
3404 3475
3405#if ENABLE_FRILLS 3476#if !ENABLE_MINIMAL
3406void 3477void
3407rxvt_term::selection_remove_trailing_spaces () 3478rxvt_term::selection_remove_trailing_spaces () NOTHROW
3408{ 3479{
3409 int32_t end_col, end_row; 3480 int32_t end_col, end_row;
3410 text_t *stp; 3481 text_t *stp;
3411 3482
3412 end_col = selection.end.col; 3483 end_col = selection.end.col;
… …
3450/* 3521/*
3451 * Double click on button 3 when already selected 3522 * Double click on button 3 when already selected
3452 * EXT: button 3 double click 3523 * EXT: button 3 double click
3453 */ 3524 */
3454void 3525void
3455rxvt_term::selection_rotate (int x, int y) 3526rxvt_term::selection_rotate (int x, int y) NOTHROW
3456{ 3527{
3457 selection.clicks = selection.clicks % 3 + 1; 3528 selection.clicks = selection.clicks % 3 + 1;
3458 selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1); 3529 selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1);
3459} 3530}
3460 3531
… …
3462/* 3533/*
3463 * Respond to a request for our current selection 3534 * Respond to a request for our current selection
3464 * EXT: SelectionRequest 3535 * EXT: SelectionRequest
3465 */ 3536 */
3466void 3537void
3467rxvt_term::selection_send (const XSelectionRequestEvent &rq) 3538rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW
3468{ 3539{
3469 XSelectionEvent ev; 3540 XSelectionEvent ev;
3470 dDisp;
3471 3541
3472 ev.type = SelectionNotify; 3542 ev.type = SelectionNotify;
3473 ev.property = None; 3543 ev.property = None;
3474 ev.display = rq.display; 3544 ev.display = rq.display;
3475 ev.requestor = rq.requestor; 3545 ev.requestor = rq.requestor;
… …
3489 *target++ = xa[XA_COMPOUND_TEXT]; 3559 *target++ = xa[XA_COMPOUND_TEXT];
3490#if X_HAVE_UTF8_STRING 3560#if X_HAVE_UTF8_STRING
3491 *target++ = xa[XA_UTF8_STRING]; 3561 *target++ = xa[XA_UTF8_STRING];
3492#endif 3562#endif
3493 3563
3494 XChangeProperty (disp, rq.requestor, rq.property, XA_ATOM, 3564 XChangeProperty (dpy, rq.requestor, rq.property, XA_ATOM,
3495 32, PropModeReplace, 3565 32, PropModeReplace,
3496 (unsigned char *)target_list, target - target_list); 3566 (unsigned char *)target_list, target - target_list);
3497 ev.property = rq.property; 3567 ev.property = rq.property;
3498 } 3568 }
3499#if TODO // TODO 3569#if TODO // TODO
… …
3502 /* TODO: Handle MULTIPLE */ 3572 /* TODO: Handle MULTIPLE */
3503 } 3573 }
3504#endif 3574#endif
3505 else if (rq.target == xa[XA_TIMESTAMP] && selection.text) 3575 else if (rq.target == xa[XA_TIMESTAMP] && selection.text)
3506 { 3576 {
3507 XChangeProperty (disp, rq.requestor, rq.property, rq.target, 3577 XChangeProperty (dpy, rq.requestor, rq.property, rq.target,
3508 32, PropModeReplace, (unsigned char *)&selection_time, 1); 3578 32, PropModeReplace, (unsigned char *)&selection_time, 1);
3509 ev.property = rq.property; 3579 ev.property = rq.property;
3510 } 3580 }
3511 else if (rq.target == XA_STRING 3581 else if (rq.target == XA_STRING
3512 || rq.target == xa[XA_TEXT] 3582 || rq.target == xa[XA_TEXT]
… …
3536 style = enc_string; 3606 style = enc_string;
3537 else if (target == xa[XA_TEXT]) 3607 else if (target == xa[XA_TEXT])
3538 style = enc_text; 3608 style = enc_text;
3539 else if (target == xa[XA_COMPOUND_TEXT]) 3609 else if (target == xa[XA_COMPOUND_TEXT])
3540 style = enc_compound_text; 3610 style = enc_compound_text;
3541#if ENABLE_FRILLS 3611#if !ENABLE_MINIMAL
3542 else if (target == xa[XA_UTF8_STRING]) 3612 else if (target == xa[XA_UTF8_STRING])
3543 style = enc_utf8; 3613 style = enc_utf8;
3544#endif 3614#endif
3545 else 3615 else
3546 { 3616 {
… …
3557 { 3627 {
3558 cl = L""; 3628 cl = L"";
3559 selectlen = 0; 3629 selectlen = 0;
3560 } 3630 }
3561 3631
3562#if ENABLE_FRILLS 3632#if !ENABLE_MINIMAL
3563 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it 3633 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it
3564 // so recode it manually 3634 // so recode it manually
3565 if (style == enc_utf8) 3635 if (style == enc_utf8)
3566 { 3636 {
3567 freect = 1; 3637 freect = 1;
… …
3570 ct.value = (unsigned char *)rxvt_wcstoutf8 (cl, selectlen); 3640 ct.value = (unsigned char *)rxvt_wcstoutf8 (cl, selectlen);
3571 ct.nitems = strlen ((char *)ct.value); 3641 ct.nitems = strlen ((char *)ct.value);
3572 } 3642 }
3573 else 3643 else
3574#endif 3644#endif
3575 if (XwcTextListToTextProperty (disp, &cl, 1, (XICCEncodingStyle) style, &ct) >= 0) 3645 if (XwcTextListToTextProperty (dpy, &cl, 1, (XICCEncodingStyle) style, &ct) >= 0)
3576 freect = 1; 3646 freect = 1;
3577 else 3647 else
3578 { 3648 {
3579 /* if we failed to convert then send it raw */ 3649 /* if we failed to convert then send it raw */
3580 ct.value = (unsigned char *)cl; 3650 ct.value = (unsigned char *)cl;
3581 ct.nitems = selectlen; 3651 ct.nitems = selectlen;
3582 ct.encoding = target; 3652 ct.encoding = target;
3583 } 3653 }
3584 3654
3585 XChangeProperty (disp, rq.requestor, rq.property, 3655 XChangeProperty (dpy, rq.requestor, rq.property,
3586 ct.encoding, 8, PropModeReplace, 3656 ct.encoding, 8, PropModeReplace,
3587 ct.value, (int)ct.nitems); 3657 ct.value, (int)ct.nitems);
3588 ev.property = rq.property; 3658 ev.property = rq.property;
3589 3659
3590 if (freect) 3660 if (freect)
3591 XFree (ct.value); 3661 XFree (ct.value);
3592 } 3662 }
3593 3663
3594 XSendEvent (disp, rq.requestor, False, 0L, (XEvent *)&ev); 3664 XSendEvent (dpy, rq.requestor, False, 0L, (XEvent *)&ev);
3595} 3665}
3596 3666
3597/* ------------------------------------------------------------------------- * 3667/* ------------------------------------------------------------------------- *
3598 * MOUSE ROUTINES * 3668 * MOUSE ROUTINES *
3599 * ------------------------------------------------------------------------- */ 3669 * ------------------------------------------------------------------------- */
3600 3670
3601/* 3671/*
3602 * return col/row values corresponding to x/y pixel values 3672 * return col/row values corresponding to x/y pixel values
3603 */ 3673 */
3604void 3674void
3605rxvt_term::pixel_position (int *x, int *y) 3675rxvt_term::pixel_position (int *x, int *y) NOTHROW
3606{ 3676{
3607 *x = Pixel2Col (*x); 3677 *x = Pixel2Col (*x);
3608 /* max_it (*x, 0); min_it (*x, (int)ncol - 1); */ 3678 /* max_it (*x, 0); min_it (*x, (int)ncol - 1); */
3609 *y = Pixel2Row (*y); 3679 *y = Pixel2Row (*y);
3610 /* max_it (*y, 0); min_it (*y, (int)nrow - 1); */ 3680 /* max_it (*y, 0); min_it (*y, (int)nrow - 1); */
3611} 3681}
3612 3682
3613/* ------------------------------------------------------------------------- */ 3683/* ------------------------------------------------------------------------- */
3614#ifdef USE_XIM 3684#ifdef USE_XIM
3615void 3685void
3616rxvt_term::im_set_position (XPoint &pos) 3686rxvt_term::im_set_position (XPoint &pos) NOTHROW
3617{ 3687{
3618 XWindowAttributes xwa; 3688 XWindowAttributes xwa;
3619 3689
3620 XGetWindowAttributes (display->display, vt, &xwa); 3690 XGetWindowAttributes (dpy, vt, &xwa);
3621 3691
3622 pos.x = xwa.x + Col2Pixel (screen.cur.col); 3692 pos.x = xwa.x + Col2Pixel (screen.cur.col);
3623 pos.y = xwa.y + Height2Pixel (screen.cur.row) + fbase; 3693 pos.y = xwa.y + Height2Pixel (screen.cur.row) + fbase;
3624} 3694}
3625#endif 3695#endif
3626 3696
3627#if ENABLE_OVERLAY 3697#if ENABLE_OVERLAY
3628void 3698void
3629rxvt_term::scr_overlay_new (int x, int y, int w, int h) 3699rxvt_term::scr_overlay_new (int x, int y, int w, int h) NOTHROW
3630{ 3700{
3631 if (nrow < 1 || ncol < 1) 3701 if (nrow < 1 || ncol < 1)
3632 return; 3702 return;
3633 3703
3634 want_refresh = 1; 3704 want_refresh = 1;
… …
3679 *rp = r; 3749 *rp = r;
3680 } 3750 }
3681} 3751}
3682 3752
3683void 3753void
3684rxvt_term::scr_overlay_off () 3754rxvt_term::scr_overlay_off () NOTHROW
3685{ 3755{
3686 if (!ov_text) 3756 if (!ov_text)
3687 return; 3757 return;
3688 3758
3689 want_refresh = 1; 3759 want_refresh = 1;
… …
3697 delete [] ov_text; ov_text = 0; 3767 delete [] ov_text; ov_text = 0;
3698 delete [] ov_rend; ov_rend = 0; 3768 delete [] ov_rend; ov_rend = 0;
3699} 3769}
3700 3770
3701void 3771void
3702rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) 3772rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) NOTHROW
3703{ 3773{
3704 if (!ov_text || x >= ov_w - 2 || y >= ov_h - 2) 3774 if (!ov_text || x >= ov_w - 2 || y >= ov_h - 2)
3705 return; 3775 return;
3706 3776
3707 x++, y++; 3777 x++, y++;
… …
3709 ov_text[y][x] = text; 3779 ov_text[y][x] = text;
3710 ov_rend[y][x] = rend; 3780 ov_rend[y][x] = rend;
3711} 3781}
3712 3782
3713void 3783void
3714rxvt_term::scr_overlay_set (int x, int y, const char *s) 3784rxvt_term::scr_overlay_set (int x, int y, const char *s) NOTHROW
3715{ 3785{
3716 while (*s) 3786 while (*s)
3717 scr_overlay_set (x++, y, *s++); 3787 scr_overlay_set (x++, y, *s++);
3718} 3788}
3719 3789
3720void 3790void
3721rxvt_term::scr_overlay_set (int x, int y, const wchar_t *s) 3791rxvt_term::scr_overlay_set (int x, int y, const wchar_t *s) NOTHROW
3722{ 3792{
3723 while (*s) 3793 while (*s)
3724 { 3794 {
3725 text_t t = *s++; 3795 text_t t = *s++;
3726 int width = wcwidth (t); 3796 int width = WCWIDTH (t);
3727 3797
3728 while (width--) 3798 while (width--)
3729 { 3799 {
3730 scr_overlay_set (x++, y, t); 3800 scr_overlay_set (x++, y, t);
3731 t = NOCHAR; 3801 t = NOCHAR;
3732 } 3802 }
3733 } 3803 }
3734} 3804}
3735 3805
3736void 3806void
3737rxvt_term::scr_swap_overlay () 3807rxvt_term::scr_swap_overlay () NOTHROW
3738{ 3808{
3739 if (!ov_text) 3809 if (!ov_text)
3740 return; 3810 return;
3741 3811
3742 // swap screen mem with overlay 3812 // swap screen mem with overlay
3743 for (int y = ov_h; y--; ) 3813 for (int y = ov_h; y--; )
3744 { 3814 {
3745 text_t *t1 = ov_text[y]; 3815 text_t *t1 = ov_text[y];
3746 rend_t *r1 = ov_rend[y]; 3816 rend_t *r1 = ov_rend[y];
3747 3817
3748 text_t *t2 = ROW(y + ov_y - view_start).t + ov_x; 3818 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; 3819 rend_t *r2 = ROW(y + ov_y + view_start).r + ov_x;
3750 3820
3751 for (int x = ov_w; x--; ) 3821 for (int x = ov_w; x--; )
3752 { 3822 {
3753 text_t t = *t1; *t1++ = *t2; *t2++ = t; 3823 text_t t = *t1; *t1++ = *t2; *t2++ = t;
3754 rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t)); 3824 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