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.245 by root, Fri Jan 20 10:35:25 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/* ------------------------------------------------------------------------- *
… …
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
… …
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 top_row--; 187 top_row--;
… …
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 top_row = 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 rvideo = 0; 242 rvideo_state = rvideo_mode = false;
240 } 243 }
241 else 244 else
242 { 245 {
243 /* 246 /*
244 * add or delete rows as appropriate 247 * add or delete rows as appropriate
… …
280 int pend = MOD (term_start + top_row , prev_total_rows); 283 int pend = MOD (term_start + top_row , prev_total_rows);
281 int q = total_rows; // rewrapped row 284 int q = total_rows; // rewrapped row
282 285
283 if (top_row) 286 if (top_row)
284 { 287 {
285 // 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
286 // to come up with a lean and mean algorithm. 289 // to come up with a lean and mean algorithm.
287 290
288 row_col_t ocur = screen.cur; 291 row_col_t ocur = screen.cur;
289 ocur.row = MOD (term_start + ocur.row, prev_total_rows); 292 ocur.row = MOD (term_start + ocur.row, prev_total_rows);
290 293
… …
347 350
348 line_t &pline = old_buf [prow]; 351 line_t &pline = old_buf [prow];
349 352
350 int len = min (min (prev_ncol - pcol, ncol - qcol), llen - lofs); 353 int len = min (min (prev_ncol - pcol, ncol - qcol), llen - lofs);
351 354
352#if DEBUG_STRICT
353 assert (len);
354 assert (pline.t);
355#endif
356
357 memcpy (qline->t + qcol, pline.t + pcol, len * sizeof (text_t)); 355 memcpy (qline->t + qcol, pline.t + pcol, len * sizeof (text_t));
358 memcpy (qline->r + qcol, pline.r + pcol, len * sizeof (rend_t)); 356 memcpy (qline->r + qcol, pline.r + pcol, len * sizeof (rend_t));
359 357
360 lofs += len; 358 lofs += len;
361 qcol += len; 359 qcol += len;
… …
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 }
409 406
410 CLEAR_ALL_SELECTION (); 407 CLEAR_ALL_SELECTION ();
411 408
412 prev_nrow = nrow; 409 prev_nrow = nrow;
413 prev_ncol = ncol; 410 prev_ncol = ncol;
414 411
415 tabs = (char *)rxvt_malloc (ncol * sizeof (char)); 412 tabs = (char *)rxvt_malloc (ncol * sizeof (char));
416 413
417 for (int col = ncol; col--; ) 414 for (int col = ncol; --col; )
418 tabs [col] = col % TABSIZE == 0; 415 tabs [col] = col % TABSIZE == 0;
419 416
417 if (current_screen != PRIMARY)
418 scr_swap_screen ();
419
420 tt_winch (); 420 tt_winch ();
421 421
422 HOOK_INVOKE ((this, HOOK_RESET, DT_END)); 422 HOOK_INVOKE ((this, HOOK_RESET, DT_END));
423} 423}
424 424
… …
427 * Free everything. That way malloc debugging can find leakage. 427 * Free everything. That way malloc debugging can find leakage.
428 */ 428 */
429void 429void
430rxvt_term::scr_release () NOTHROW 430rxvt_term::scr_release () NOTHROW
431{ 431{
432 if (row_buf)
433 {
432 delete talloc; talloc = 0; 434 delete talloc; talloc = 0;
433 delete ralloc; ralloc = 0; 435 delete ralloc; ralloc = 0;
434 436
435 free (row_buf); 437 free (row_buf);
436 free (swap_buf); 438 free (swap_buf);
437 free (drawn_buf); 439 free (drawn_buf);
438 free (tabs); 440 free (tabs);
439 441
440 row_buf = 0; // signal that we freed all the arrays 442 row_buf = 0; // signal that we freed all the arrays
443 }
441} 444}
442 445
443/* ------------------------------------------------------------------------- */ 446/* ------------------------------------------------------------------------- */
444/* 447/*
445 * Hard reset 448 * Hard reset
446 */ 449 */
447void 450void
448rxvt_term::scr_poweron () NOTHROW 451rxvt_term::scr_poweron ()
449{ 452{
450 scr_release (); 453 scr_release ();
451 prev_nrow = prev_ncol = 0; 454 prev_nrow = prev_ncol = 0;
452 scr_reset (); 455 scr_reset ();
453 456
… …
504 assert (s->cur.row >= 0); 507 assert (s->cur.row >= 0);
505 assert (s->cur.col >= 0); 508 assert (s->cur.col >= 0);
506#endif 509#endif
507} 510}
508 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
509/* ------------------------------------------------------------------------- */ 527/* ------------------------------------------------------------------------- */
510/* 528/*
511 * Swap between primary and secondary screens 529 * Swap between primary and secondary screens
512 * XTERM_SEQ: Primary screen : ESC [ ? 4 7 h 530 * XTERM_SEQ: Primary screen : ESC [ ? 4 7 h
513 * XTERM_SEQ: Secondary screen: ESC [ ? 4 7 l 531 * XTERM_SEQ: Secondary screen: ESC [ ? 4 7 l
514 */ 532 */
515int 533void
516rxvt_term::scr_change_screen (int scrn) NOTHROW 534rxvt_term::scr_change_screen (int scrn)
517{ 535{
536 if (scrn == current_screen)
537 return;
538
518 want_refresh = 1; 539 want_refresh = 1;
519 view_start = 0; 540 view_start = 0;
520 541
521 if (current_screen == scrn)
522 return scrn;
523
524 selection_check (2); /* check for boundary cross */ 542 selection_check (2); /* check for boundary cross */
525 543
526 int i = current_screen; current_screen = scrn; scrn = i; 544 int i = current_screen; current_screen = scrn; scrn = i;
527 545
528 ::swap (screen.cur.row, swap.cur.row);
529 ::swap (screen.cur.col, swap.cur.col);
530
531 screen.cur.row = clamp (screen.cur.row, 0, prev_nrow - 1);
532 screen.cur.col = clamp (screen.cur.col, 0, prev_ncol - 1);
533
534#if NSCREENS 546#if NSCREENS
535 if (OPTION (Opt_secondaryScreen)) 547 if (option (Opt_secondaryScreen))
536 { 548 {
537 num_scr = 0; 549 num_scr = 0;
538 550
539 for (int i = prev_nrow; i--; ) 551 scr_swap_screen ();
540 ::swap (ROW(i), swap_buf [i]);
541 552
542 ::swap (screen.charset, swap.charset); 553 ::swap (screen.charset, swap.charset);
543 ::swap (screen.flags, swap.flags); 554 ::swap (screen.flags, swap.flags);
544 screen.flags |= Screen_VisibleCursor; 555 screen.flags |= Screen_VisibleCursor;
545 swap.flags |= Screen_VisibleCursor; 556 swap.flags |= Screen_VisibleCursor;
546 } 557 }
547 else 558 else
548#endif 559#endif
549 if (OPTION (Opt_secondaryScroll)) 560 if (option (Opt_secondaryScroll))
550 scr_scroll_text (0, prev_nrow - 1, prev_nrow); 561 scr_scroll_text (0, prev_nrow - 1, prev_nrow);
551
552 return scrn;
553} 562}
554 563
555// clear WrapNext indicator, solidifying position on next line 564// clear WrapNext indicator, solidifying position on next line
556void 565void
557rxvt_term::scr_do_wrap () NOTHROW 566rxvt_term::scr_do_wrap () NOTHROW
… …
615 want_refresh = 1; 624 want_refresh = 1;
616 num_scr += count; 625 num_scr += count;
617 626
618 if (count > 0 627 if (count > 0
619 && row1 == 0 628 && row1 == 0
620 && (current_screen == PRIMARY || OPTION (Opt_secondaryScroll))) 629 && (current_screen == PRIMARY || option (Opt_secondaryScroll)))
621 { 630 {
622 top_row = max (top_row - count, -saveLines); 631 top_row = max (top_row - count, -saveLines);
623 632
624 // scroll everything up 'count' lines 633 // scroll everything up 'count' lines
625 term_start = (term_start + count) % total_rows; 634 term_start = (term_start + count) % total_rows;
… …
632 } 641 }
633 642
634 // erase newly scrolled-in lines 643 // erase newly scrolled-in lines
635 for (int i = count; i--; ) 644 for (int i = count; i--; )
636 { 645 {
637 // basically this is a slightly optimized scr_blank_screen_mem
638 // it is worth the effort on slower machines
639 line_t &l = ROW(nrow - 1 - i); 646 line_t &l = ROW(nrow - 1 - i);
640 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 {
641 scr_blank_line (l, 0, l.l, rstyle); 652 scr_blank_line (l, 0, l.l, rstyle);
642
643 l.l = 0; 653 l.l = 0;
644 l.f = 0; 654 l.f = 0;
655 }
656 else
657 scr_blank_screen_mem (l, rstyle);
645 } 658 }
646 659
647 // now copy lines below the scroll region bottom to the 660 // now copy lines below the scroll region bottom to the
648 // bottom of the screen again, so they look as if they 661 // bottom of the screen again, so they look as if they
649 // hadn't moved. 662 // hadn't moved.
… …
671 selection.op = SELECTION_CLEAR; 684 selection.op = SELECTION_CLEAR;
672 } 685 }
673 } 686 }
674 687
675 // finally move the view window, if desired 688 // finally move the view window, if desired
676 if (OPTION (Opt_scrollWithBuffer) 689 if (option (Opt_scrollWithBuffer)
677 && view_start != 0 690 && view_start != 0
678 && view_start != -saveLines) 691 && view_start != -saveLines)
679 scr_page (UP, count); 692 scr_page (UP, count);
680 693
681 if (SHOULD_INVOKE (HOOK_SCROLL_BACK)) 694 if (SHOULD_INVOKE (HOOK_SCROLL_BACK))
… …
749 ZERO_SCROLLBACK (); 762 ZERO_SCROLLBACK ();
750 763
751 if (minlines > 0) 764 if (minlines > 0)
752 { 765 {
753 minlines += screen.cur.row - screen.bscroll; 766 minlines += screen.cur.row - screen.bscroll;
767 min_it (minlines, screen.cur.row - top_row);
754 768
755 if (minlines > 0 769 if (minlines > 0
756 && screen.tscroll == 0 770 && screen.tscroll == 0
757 && screen.bscroll == nrow - 1) 771 && screen.bscroll == nrow - 1)
758 { 772 {
… …
832 846
833 // some utf-8 decoders "decode" surrogate characters: let's fix this. 847 // some utf-8 decoders "decode" surrogate characters: let's fix this.
834 if (IN_RANGE_INC (c, 0xd800, 0xdfff)) 848 if (IN_RANGE_INC (c, 0xd800, 0xdfff))
835 c = 0xfffd; 849 c = 0xfffd;
836 850
837 // 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
838 // do wcwidth before further replacements, as wcwidth might return -1 852 // further replacements, as wcwidth might return -1 for the line
839 // 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
840 // locale. 854 // locale.
841 int width = c < 0x100 ? 1 : wcwidth (c); 855 int width = WCWIDTH (c);
842 856
843 if (charsets [screen.charset] == '0') // DEC SPECIAL 857 if (charsets [screen.charset] == '0') // DEC SPECIAL
844 { 858 {
845 // vt100 special graphics and line drawing 859 // vt100 special graphics and line drawing
846 // 5f-7e standard vt100 860 // 5f-7e standard vt100
… …
1057 if (count) 1071 if (count)
1058 x = ncol - 1; 1072 x = ncol - 1;
1059 1073
1060 // store horizontal tab commands as characters inside the text 1074 // store horizontal tab commands as characters inside the text
1061 // buffer so they can be selected and pasted. 1075 // buffer so they can be selected and pasted.
1062 if (ht && OPTION (Opt_pastableTabs)) 1076 if (ht && option (Opt_pastableTabs))
1063 { 1077 {
1064 base_rend = SET_FONT (base_rend, 0); 1078 base_rend = SET_FONT (base_rend, 0);
1065 1079
1066 l.touch (x); 1080 l.touch (x);
1067 1081
… …
1100 * Process DEC Back Index 1114 * Process DEC Back Index
1101 * XTERM_SEQ: ESC 6 1115 * XTERM_SEQ: ESC 6
1102 * 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
1103 * in that row right. Clear left column. 1117 * in that row right. Clear left column.
1104 */ 1118 */
1105#if ENABLE_FRILLS 1119#if !ENABLE_MINIMAL
1106void 1120void
1107rxvt_term::scr_backindex () NOTHROW 1121rxvt_term::scr_backindex () NOTHROW
1108{ 1122{
1109 if (screen.cur.col > 0) 1123 if (screen.cur.col > 0)
1110 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE); 1124 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE);
… …
1117 * Process DEC Forward Index 1131 * Process DEC Forward Index
1118 * XTERM_SEQ: ESC 9 1132 * XTERM_SEQ: ESC 9
1119 * 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
1120 * in that row left. Clear right column. 1134 * in that row left. Clear right column.
1121 */ 1135 */
1122#if ENABLE_FRILLS 1136#if !ENABLE_MINIMAL
1123void 1137void
1124rxvt_term::scr_forwardindex () NOTHROW 1138rxvt_term::scr_forwardindex () NOTHROW
1125{ 1139{
1126 if (screen.cur.col < ncol - 1) 1140 if (screen.cur.col < ncol - 1)
1127 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE); 1141 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE);
… …
1328 } 1342 }
1329 else 1343 else
1330 { 1344 {
1331 ren = rstyle & (RS_fgMask | RS_bgMask); 1345 ren = rstyle & (RS_fgMask | RS_bgMask);
1332 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)]; 1346 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)];
1333 XChangeGC (display->display, gc, GCForeground, &gcvalue); 1347 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1334 ERASE_ROWS (row, num); 1348 ERASE_ROWS (row, num);
1335 gcvalue.foreground = pix_colors[Color_fg]; 1349 gcvalue.foreground = pix_colors[Color_fg];
1336 XChangeGC (display->display, gc, GCForeground, &gcvalue); 1350 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1337 } 1351 }
1338 1352
1339 for (; num--; row++) 1353 for (; num--; row++)
1340 { 1354 {
1341 scr_blank_screen_mem (ROW(row), rstyle); 1355 scr_blank_screen_mem (ROW(row), rstyle);
1342 scr_blank_line (drawn_buf [row], 0, ncol, ren); 1356 scr_blank_line (drawn_buf [row], 0, ncol, ren);
1343 } 1357 }
1344} 1358}
1345 1359
1346#if ENABLE_FRILLS 1360#if !ENABLE_MINIMAL
1347void 1361void
1348rxvt_term::scr_erase_savelines () NOTHROW 1362rxvt_term::scr_erase_savelines () NOTHROW
1349{ 1363{
1350 want_refresh = 1; 1364 want_refresh = 1;
1351 ZERO_SCROLLBACK (); 1365 ZERO_SCROLLBACK ();
… …
1621 * Set reverse/normal video 1635 * Set reverse/normal video
1622 * XTERM_SEQ: Reverse video: ESC [ ? 5 h 1636 * XTERM_SEQ: Reverse video: ESC [ ? 5 h
1623 * XTERM_SEQ: Normal video : ESC [ ? 5 l 1637 * XTERM_SEQ: Normal video : ESC [ ? 5 l
1624 */ 1638 */
1625void 1639void
1626rxvt_term::scr_rvideo_mode (int mode) NOTHROW 1640rxvt_term::scr_rvideo_mode (bool on) NOTHROW
1627{ 1641{
1628 XGCValues gcvalue; 1642 rvideo_mode = on;
1629 1643
1644#ifndef NO_BELL
1645 on ^= rvideo_bell;
1646#endif
1647
1630 if (rvideo != mode) 1648 if (rvideo_state != on)
1631 { 1649 {
1632 rvideo = mode; 1650 rvideo_state = on;
1651
1633 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]); 1652 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]);
1634#if XPM_BACKGROUND 1653#if XPM_BACKGROUND
1635 if (bgPixmap.pixmap == None) 1654 if (bgPixmap.pixmap == None)
1636#endif 1655#endif
1637#if TRANSPARENT 1656#if TRANSPARENT
1638 if (! OPTION (Opt_transparent) || am_transparent == 0) 1657 if (!option (Opt_transparent) || am_transparent == 0)
1639#endif 1658#endif
1640 XSetWindowBackground (display->display, vt, 1659 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
1641 pix_colors[Color_bg]);
1642 1660
1661 XGCValues gcvalue;
1643 gcvalue.foreground = pix_colors[Color_fg]; 1662 gcvalue.foreground = pix_colors[Color_fg];
1644 gcvalue.background = pix_colors[Color_bg]; 1663 gcvalue.background = pix_colors[Color_bg];
1645 XChangeGC (display->display, gc, GCBackground | GCForeground, 1664 XChangeGC (dpy, gc, GCBackground | GCForeground, &gcvalue);
1646 &gcvalue); 1665
1647 scr_clear (); 1666 scr_clear ();
1648 scr_touch (true); 1667 scr_touch (true);
1649 } 1668 }
1650} 1669}
1651 1670
… …
1735{ 1754{
1736 bool found = false; 1755 bool found = false;
1737 1756
1738 for (int i = 0; i < nrow; i++) 1757 for (int i = 0; i < nrow; i++)
1739 { 1758 {
1740 int col = 0;
1741 rend_t *drp = drawn_buf[i].r; 1759 rend_t *drp = drawn_buf[i].r;
1742 1760
1743 for (; col < ncol; col++, drp++) 1761 for (int col = 0; col < ncol; col++, drp++)
1744 if ((*drp & mask) == value) 1762 if ((*drp & mask) == value)
1745 { 1763 {
1746 found = true; 1764 found = true;
1747 *drp = ~value; 1765 *drp = ~value;
1748 } 1766 }
… …
1851 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));
1852 1870
1853 return true; 1871 return true;
1854} 1872}
1855 1873
1874#ifndef NO_BELL
1875void
1876rxvt_term::bell_cb (time_watcher &w)
1877{
1878 rvideo_bell = false;
1879 scr_rvideo_mode (rvideo_mode);
1880}
1881#endif
1882
1856/* ------------------------------------------------------------------------- */ 1883/* ------------------------------------------------------------------------- */
1857void 1884void
1858rxvt_term::scr_bell () NOTHROW 1885rxvt_term::scr_bell () NOTHROW
1859{ 1886{
1860#ifndef NO_BELL 1887#ifndef NO_BELL
1861 1888
1862# ifndef NO_MAPALERT 1889# ifndef NO_MAPALERT
1863# ifdef MAPALERT_OPTION 1890# ifdef MAPALERT_OPTION
1864 if (OPTION (Opt_mapAlert)) 1891 if (option (Opt_mapAlert))
1865# endif 1892# endif
1866 XMapWindow (display->display, parent[0]); 1893 XMapWindow (dpy, parent[0]);
1867# endif 1894# endif
1868 1895
1869 if (OPTION (Opt_visualBell)) 1896 if (option (Opt_visualBell))
1870 { 1897 {
1871 scr_rvideo_mode (!rvideo); /* refresh also done */ 1898 rvideo_bell = true;
1899 scr_rvideo_mode (rvideo_mode);
1872 display->flush (); 1900 display->flush ();
1873 rxvt_usleep (VISUAL_BELL_DURATION); 1901
1874 scr_rvideo_mode (!rvideo); /* refresh also done */ 1902 bell_ev.start (NOW + VISUAL_BELL_DURATION);
1875 } 1903 }
1876 else 1904 else
1877 XBell (display->display, 0); 1905 XBell (dpy, 0);
1878 1906
1879#endif 1907#endif
1880} 1908}
1881 1909
1882/* ------------------------------------------------------------------------- */ 1910/* ------------------------------------------------------------------------- */
… …
1941 * screen.text/screen.rend contain what the screen will change to. 1969 * screen.text/screen.rend contain what the screen will change to.
1942 */ 1970 */
1943void 1971void
1944rxvt_term::scr_refresh () NOTHROW 1972rxvt_term::scr_refresh () NOTHROW
1945{ 1973{
1946 unsigned char must_clear, /* use draw_string not draw_image_string */ 1974 unsigned char have_bg,
1947 showcursor; /* show the cursor */ 1975 showcursor; /* show the cursor */
1948 int16_t col, row, /* column/row we're processing */ 1976 int16_t col, row, /* column/row we're processing */
1949 ocrow; /* old cursor row */ 1977 ocrow; /* old cursor row */
1950 int i; /* tmp */ 1978 int i; /* tmp */
1951#ifndef NO_CURSORCOLOR 1979#ifndef NO_CURSORCOLOR
1952 rend_t cc1; /* store colours at cursor position (s) */ 1980 rend_t cc1; /* store colours at cursor position (s) */
1953#endif 1981#endif
1954 rend_t *crp; // cursor rendition pointer 1982 rend_t *crp; // cursor rendition pointer
1983 rend_t ccol1, /* Cursor colour */
1984 ccol2; /* Cursor colour2 */
1955 1985
1956 want_refresh = 0; /* screen is current */ 1986 want_refresh = 0; /* screen is current */
1957 1987
1958 if (refresh_type == NO_REFRESH || !mapped) 1988 if (refresh_type == NO_REFRESH || !mapped)
1959 return; 1989 return;
1960 1990
1961 /* 1991 /*
1962 * A: set up vars 1992 * A: set up vars
1963 */ 1993 */
1964 must_clear = 0; 1994 have_bg = 0;
1965 refresh_count = 0; 1995 refresh_count = 0;
1966 1996
1967#if XPM_BACKGROUND 1997#if XPM_BACKGROUND
1968 must_clear |= bgPixmap.pixmap != None; 1998 have_bg |= bgPixmap.pixmap != None;
1969#endif 1999#endif
1970#if TRANSPARENT 2000#if TRANSPARENT
1971 must_clear |= OPTION (Opt_transparent) && am_transparent; 2001 have_bg |= option (Opt_transparent) && am_transparent;
1972#endif 2002#endif
1973 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ 2003 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
1974 2004
1975 /* 2005 /*
1976 * B: reverse any characters which are selected 2006 * B: reverse any characters which are selected
… …
1980 /* 2010 /*
1981 * C: set the cursor character (s) 2011 * C: set the cursor character (s)
1982 */ 2012 */
1983 { 2013 {
1984 unsigned char setoldcursor; 2014 unsigned char setoldcursor;
1985 rend_t ccol1, /* Cursor colour */
1986 ccol2; /* Cursor colour2 */
1987 2015
1988 showcursor = (screen.flags & Screen_VisibleCursor); 2016 showcursor = (screen.flags & Screen_VisibleCursor);
1989#ifdef CURSOR_BLINK 2017#ifdef CURSOR_BLINK
1990 if (hidden_cursor) 2018 if (hidden_cursor)
1991 showcursor = 0; 2019 showcursor = 0;
… …
1998 while (col && ROW(screen.cur.row).t[col] == NOCHAR) 2026 while (col && ROW(screen.cur.row).t[col] == NOCHAR)
1999 col--; 2027 col--;
2000 2028
2001 crp = &ROW(screen.cur.row).r[col]; 2029 crp = &ROW(screen.cur.row).r[col];
2002 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
2003 if (showcursor && focus) 2054 if (showcursor && focus)
2004 { 2055 {
2005 if (OPTION (Opt_cursorUnderline)) 2056 if (option (Opt_cursorUnderline))
2006 *crp ^= RS_Uline; 2057 *crp ^= RS_Uline;
2007 else 2058 else
2008 { 2059 {
2009 *crp ^= RS_RVid; 2060 *crp ^= RS_RVid;
2010
2011#ifndef NO_CURSORCOLOR
2012 cc1 = *crp & (RS_fgMask | RS_bgMask);
2013 if (ISSET_PIXCOLOR (Color_cursor))
2014 ccol1 = Color_cursor;
2015 else
2016#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
2017 ccol1 = fgcolor_of (rstyle);
2018#else
2019 ccol1 = Color_fg;
2020#endif
2021 if (ISSET_PIXCOLOR (Color_cursor2))
2022 ccol2 = Color_cursor2;
2023 else
2024#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
2025 ccol2 = bgcolor_of (rstyle);
2026#else
2027 ccol2 = Color_bg;
2028#endif
2029 *crp = SET_FGCOLOR (*crp, ccol1); 2061 *crp = SET_FGCOLOR (*crp, ccol1);
2030 *crp = SET_BGCOLOR (*crp, ccol2); 2062 *crp = SET_BGCOLOR (*crp, ccol2);
2031#endif
2032 } 2063 }
2033 } 2064 }
2034 } 2065 }
2035 2066
2036 /* make sure no outline cursor is left around */ 2067 /* make sure no outline cursor is left around */
… …
2075 * D: CopyArea pass - very useful for slower links 2106 * D: CopyArea pass - very useful for slower links
2076 * This has been deliberately kept simple. 2107 * This has been deliberately kept simple.
2077 */ 2108 */
2078 if (!display->is_local 2109 if (!display->is_local
2079 && refresh_type == FAST_REFRESH && num_scr_allow && num_scr 2110 && refresh_type == FAST_REFRESH && num_scr_allow && num_scr
2080 && abs (num_scr) < nrow && !must_clear) 2111 && abs (num_scr) < nrow && !have_bg)
2081 { 2112 {
2082 int16_t nits; 2113 int16_t nits;
2114 int i = num_scr;
2083 int j; 2115 int j;
2084 int len, wlen; 2116 int len, wlen;
2085 dLocal (int, num_scr); 2117 dLocal (int, num_scr);
2086 2118
2087 j = nrow; 2119 j = nrow;
2088 wlen = len = -1; 2120 wlen = len = -1;
2089 row = i > 0 ? 0 : j - 1; 2121 row = i > 0 ? 0 : j - 1;
2122
2090 for (; j-- >= 0; row += (i > 0 ? 1 : -1)) 2123 for (; j-- >= 0; row += (i > 0 ? 1 : -1))
2091 { 2124 {
2092 if (row + i >= 0 && row + i < nrow && row + i != ocrow) 2125 if (row + i >= 0 && row + i < nrow && row + i != ocrow)
2093 { 2126 {
2094 line_t s = ROW(view_start + row); 2127 line_t s = ROW(view_start + row);
… …
2115 wlen = row; 2148 wlen = row;
2116 continue; 2149 continue;
2117 } 2150 }
2118 } 2151 }
2119 2152
2120 if (len != -1) 2153 if (len >= 0)
2121 { 2154 {
2122 /* also comes here at end if needed because of >= above */ 2155 /* also comes here at end if needed because of >= above */
2123 if (wlen < len) 2156 if (wlen < len)
2124 ::swap (wlen, len); 2157 ::swap (wlen, len);
2125 2158
2159 XGCValues gcv;
2160
2161 gcv.graphics_exposures = 1; XChangeGC (dpy, gc, GCGraphicsExposures, &gcv);
2126 XCopyArea (display->display, vt, vt, 2162 XCopyArea (dpy, vt, vt,
2127 gc, 0, Row2Pixel (len + i), 2163 gc, 0, Row2Pixel (len + i),
2128 (unsigned int)this->width, 2164 (unsigned int)this->width,
2129 (unsigned int)Height2Pixel (wlen - len + 1), 2165 (unsigned int)Height2Pixel (wlen - len + 1),
2130 0, Row2Pixel (len)); 2166 0, Row2Pixel (len));
2167 gcv.graphics_exposures = 0; XChangeGC (dpy, gc, GCGraphicsExposures, &gcv);
2168
2131 len = -1; 2169 len = -1;
2132 } 2170 }
2133 } 2171 }
2134 } 2172 }
2135#endif 2173#endif
… …
2191 count++; 2229 count++;
2192 2230
2193 if (stp[col] != dtp[col] 2231 if (stp[col] != dtp[col]
2194 || !RS_SAME (srp[col], drp[col])) 2232 || !RS_SAME (srp[col], drp[col]))
2195 { 2233 {
2196 if (must_clear && (i++ > count / 2)) 2234 if (have_bg && (i++ > count / 2))
2197 break; 2235 break;
2198 2236
2199 dtp[col] = stp[col]; 2237 dtp[col] = stp[col];
2200 drp[col] = rend; 2238 drp[col] = rend;
2201 i = 0; 2239 i = 0;
2202 } 2240 }
2203 else if (must_clear || (stp[col] != ' ' && ++i >= 16)) 2241 else if (have_bg || (stp[col] != ' ' && ++i >= 16))
2204 break; 2242 break;
2205 } 2243 }
2206 2244
2207 col--; /* went one too far. move back */ 2245 col--; /* went one too far. move back */
2208 count -= i; /* dump any matching trailing chars */ 2246 count -= i; /* dump any matching trailing chars */
… …
2218 int back = bgcolor_of (rend); // desired background 2256 int back = bgcolor_of (rend); // desired background
2219 2257
2220 // 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
2221 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))
2222 { 2260 {
2223#if ENABLE_STYLES
2224 // force redraw after "careful" characters to avoid pixel droppings
2225 if (srp[col] & RS_Careful && col < ncol - 1 && 0)
2226 drp[col + 1] = ~srp[col + 1];
2227
2228 // include previous careful character(s) if possible, looks nicer (best effort...)
2229 while (text > stp
2230 && srp[text - stp - 1] & RS_Careful
2231 && RS_SAME (rend, srp[text - stp - 1]))
2232 text--, count++, xpixel -= fwidth;
2233#endif
2234
2235 bool invert = rend & RS_RVid; 2261 bool invert = rend & RS_RVid;
2236 2262
2237#ifndef NO_BOLD_UNDERLINE_REVERSE 2263#ifndef NO_BOLD_UNDERLINE_REVERSE
2238 if (rend & RS_Bold 2264 if (rend & RS_Bold
2239 && fore == Color_fg) 2265 && fore == Color_fg)
… …
2255 else 2281 else
2256 invert = !invert; 2282 invert = !invert;
2257# endif 2283# endif
2258 } 2284 }
2259 2285
2260 if (rend & RS_Uline && ISSET_PIXCOLOR (Color_UL)) 2286 if (rend & RS_Uline && fore == Color_fg && ISSET_PIXCOLOR (Color_UL))
2261 fore = Color_UL; 2287 fore = Color_UL;
2262#endif 2288#endif
2263 2289
2264 if (invert) 2290 if (invert)
2265 { 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 */
2266 ::swap (fore, back); 2298 ::swap (fore, back);
2299#ifdef OPTION_HC
2300 else if (ISSET_PIXCOLOR (Color_HC))
2301 back = Color_HC;
2302#endif
2267 2303
2268#ifndef NO_BOLD_UNDERLINE_REVERSE 2304#ifndef NO_BOLD_UNDERLINE_REVERSE
2305# ifndef OPTION_HC
2269 if (ISSET_PIXCOLOR (Color_RV)) 2306 if (ISSET_PIXCOLOR (Color_RV))
2270 back = Color_RV; 2307 back = Color_RV;
2271 2308# endif
2272 if (fore == back) 2309 if (fore == back)
2273 { 2310 {
2274 fore = Color_bg; 2311 fore = Color_bg;
2275 back = Color_fg; 2312 back = Color_fg;
2276 } 2313 }
… …
2287 } 2324 }
2288 else if (hidden_text) 2325 else if (hidden_text)
2289 fore = back; 2326 fore = back;
2290 } 2327 }
2291#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
2292 } 2347 }
2293 2348
2294 /* 2349 /*
2295 * Actually do the drawing of the string here 2350 * Actually do the drawing of the string here
2296 */ 2351 */
2297 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)]; 2352 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)];
2298 2353
2299 if (back == fore)
2300 font->clear_rect (*drawable, xpixel, ypixel,
2301 fwidth * count, fheight,
2302 back);
2303 else if (back == Color_bg) 2354 if (have_bg && back == Color_bg)
2304 { 2355 {
2305 if (must_clear) 2356 // this is very ugly, maybe push it into ->draw?
2306 {
2307 CLEAR_CHARS (xpixel, ypixel, count);
2308 2357
2309 for (i = 0; i < count; i++) /* don't draw empty strings */ 2358 for (i = 0; i < count; i++) /* don't draw empty strings */
2310 if (text[i] != ' ') 2359 if (text[i] != ' ')
2311 { 2360 {
2312 font->draw (*drawable, xpixel, ypixel, text, count, fore, -1); 2361 font->draw (*drawable, xpixel, ypixel, text, count, fore, Color_transparent);
2313 break; 2362 goto did_clear;
2314 }
2315 } 2363 }
2316 else 2364
2317 font->draw (*drawable, xpixel, ypixel, text, count, fore, Color_bg); 2365 CLEAR_CHARS (xpixel, ypixel, count);
2366 did_clear: ;
2318 } 2367 }
2319 else 2368 else
2320 font->draw (*drawable, xpixel, ypixel, text, count, fore, back); 2369 font->draw (*drawable, xpixel, ypixel, text, count, fore, back);
2321 2370
2322 if (rend & RS_Uline && font->descent > 1 && fore != back) 2371 if (rend & RS_Uline && font->descent > 1 && fore != back)
2323 { 2372 {
2324#if ENABLE_FRILLS 2373#if ENABLE_FRILLS
2325 if (ISSET_PIXCOLOR (Color_underline)) 2374 if (ISSET_PIXCOLOR (Color_underline))
2326 XSetForeground (display->display, gc, pix_colors[Color_underline]); 2375 XSetForeground (dpy, gc, pix_colors[Color_underline]);
2327 else 2376 else
2328#endif 2377#endif
2329 XSetForeground (display->display, gc, pix_colors[fore]); 2378 XSetForeground (dpy, gc, pix_colors[fore]);
2330 2379
2331 XDrawLine (display->display, drawBuffer, gc, 2380 XDrawLine (dpy, drawBuffer, gc,
2332 xpixel, ypixel + font->ascent + 1, 2381 xpixel, ypixel + font->ascent + 1,
2333 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1); 2382 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1);
2334 } 2383 }
2335 } /* for (col....) */ 2384 } /* for (col....) */
2336 } /* for (row....) */ 2385 } /* for (row....) */
… …
2345 */ 2394 */
2346 if (showcursor) 2395 if (showcursor)
2347 { 2396 {
2348 if (focus) 2397 if (focus)
2349 { 2398 {
2350 if (OPTION (Opt_cursorUnderline)) 2399 if (option (Opt_cursorUnderline))
2351 *crp ^= RS_Uline; 2400 *crp ^= RS_Uline;
2352 else 2401 else
2353 { 2402 {
2354 *crp ^= RS_RVid; 2403 *crp ^= RS_RVid;
2355#ifndef NO_CURSORCOLOR 2404#ifndef NO_CURSORCOLOR
… …
2369 && drawn_buf[oldcursor.row].t[col + cursorwidth] == NOCHAR) 2418 && drawn_buf[oldcursor.row].t[col + cursorwidth] == NOCHAR)
2370 cursorwidth++; 2419 cursorwidth++;
2371 2420
2372#ifndef NO_CURSORCOLOR 2421#ifndef NO_CURSORCOLOR
2373 if (ISSET_PIXCOLOR (Color_cursor)) 2422 if (ISSET_PIXCOLOR (Color_cursor))
2374 XSetForeground (display->display, gc, pix_colors[Color_cursor]); 2423 XSetForeground (dpy, gc, pix_colors[Color_cursor]);
2424 else
2375#endif 2425#endif
2426 XSetForeground (dpy, gc, pix_colors[ccol1]);
2376 2427
2377 XDrawRectangle (display->display, drawBuffer, gc, 2428 XDrawRectangle (dpy, drawBuffer, gc,
2378 Col2Pixel (col), 2429 Col2Pixel (col),
2379 Row2Pixel (oldcursor.row), 2430 Row2Pixel (oldcursor.row),
2380 (unsigned int) (Width2Pixel (cursorwidth) - 1), 2431 (unsigned int) (Width2Pixel (cursorwidth) - 1),
2381 (unsigned int) (Height2Pixel (1) - lineSpace - 1)); 2432 (unsigned int) (Height2Pixel (1) - lineSpace - 1));
2382 } 2433 }
… …
2426#if XPM_BACKGROUND 2477#if XPM_BACKGROUND
2427 && !bgPixmap.pixmap 2478 && !bgPixmap.pixmap
2428#endif 2479#endif
2429 ) 2480 )
2430 { 2481 {
2431 XSetWindowBackground (display->display, parent[0], pix_colors[Color_border]); 2482 XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]);
2432 XClearWindow (display->display, parent[0]); 2483 XClearWindow (dpy, parent[0]);
2433 XSetWindowBackground (display->display, vt, pix_colors[Color_bg]); 2484 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
2434#if HAVE_SCROLLBARS 2485#if HAVE_SCROLLBARS
2435 if (scrollBar.win) 2486 if (scrollBar.win)
2436 { 2487 {
2437 XSetWindowBackground (display->display, scrollBar.win, pix_colors[Color_border]); 2488 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]);
2438 scrollBar.setIdle (); 2489 scrollBar.setIdle ();
2439 scrollbar_show (0); 2490 scrollbar_show (0);
2440 } 2491 }
2441#endif 2492#endif
2442 } 2493 }
… …
2455 2506
2456 num_scr_allow = 0; 2507 num_scr_allow = 0;
2457 want_refresh = 1; 2508 want_refresh = 1;
2458 2509
2459 if (really) 2510 if (really)
2460 XClearWindow (display->display, vt); 2511 XClearWindow (dpy, vt);
2461} 2512}
2462 2513
2463void 2514void
2464rxvt_term::scr_xor_rect (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle1, rend_t rstyle2) NOTHROW 2515rxvt_term::scr_xor_rect (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle1, rend_t rstyle2) NOTHROW
2465{ 2516{
… …
2514{ 2565{
2515 if (selection.op 2566 if (selection.op
2516 && current_screen == selection.screen 2567 && current_screen == selection.screen
2517 && selection.end.row >= view_start) 2568 && selection.end.row >= view_start)
2518 { 2569 {
2519#if ENABLE_FRILLS 2570#if !ENABLE_MINIMAL
2520 if (selection.rect) 2571 if (selection.rect)
2521 scr_xor_rect (selection.beg.row, selection.beg.col, 2572 scr_xor_rect (selection.beg.row, selection.beg.col,
2522 selection.end.row, selection.end.col, 2573 selection.end.row, selection.end.col,
2523 RS_RVid, RS_RVid | RS_Uline); 2574 RS_RVid, RS_RVid | RS_Uline);
2524 else 2575 else
… …
2640 } 2691 }
2641 2692
2642 unsigned long bytes_after; 2693 unsigned long bytes_after;
2643 XTextProperty ct; 2694 XTextProperty ct;
2644 2695
2645 if (XGetWindowProperty (display->display, win, prop, 2696 if (XGetWindowProperty (dpy, win, prop,
2646 0, PROP_SIZE / 4, 2697 0, PROP_SIZE / 4,
2647 delete_prop, AnyPropertyType, 2698 delete_prop, AnyPropertyType,
2648 &ct.encoding, &ct.format, 2699 &ct.encoding, &ct.format,
2649 &ct.nitems, &bytes_after, 2700 &ct.nitems, &bytes_after,
2650 &ct.value) != Success) 2701 &ct.value) != Success)
… …
2659 if (bytes_after) 2710 if (bytes_after)
2660 { 2711 {
2661 // fetch and append remaining data 2712 // fetch and append remaining data
2662 XTextProperty ct2; 2713 XTextProperty ct2;
2663 2714
2664 if (XGetWindowProperty (display->display, win, prop, 2715 if (XGetWindowProperty (dpy, win, prop,
2665 ct.nitems / 4, (bytes_after + 3) / 4, 2716 ct.nitems / 4, (bytes_after + 3) / 4,
2666 delete_prop, AnyPropertyType, 2717 delete_prop, AnyPropertyType,
2667 &ct2.encoding, &ct2.format, 2718 &ct2.encoding, &ct2.format,
2668 &ct2.nitems, &bytes_after, 2719 &ct2.nitems, &bytes_after,
2669 &ct2.value) != Success) 2720 &ct2.value) != Success)
… …
2682 2733
2683 if (ct.encoding == xa[XA_INCR]) 2734 if (ct.encoding == xa[XA_INCR])
2684 { 2735 {
2685 // INCR selection, start handshake 2736 // INCR selection, start handshake
2686 if (!delete_prop) 2737 if (!delete_prop)
2687 XDeleteProperty (display->display, win, prop); 2738 XDeleteProperty (dpy, win, prop);
2688 2739
2689 selection_wait = Sel_incr; 2740 selection_wait = Sel_incr;
2690 incr_buf_fill = 0; 2741 incr_buf_fill = 0;
2691 incr_ev.start (NOW + 10); 2742 incr_ev.start (NOW + 10);
2692 2743
… …
2739 } 2790 }
2740 2791
2741 char **cl; 2792 char **cl;
2742 int cr; 2793 int cr;
2743 2794
2744#if ENABLE_FRILLS 2795#if !ENABLE_MINIMAL
2745 // 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
2746 // so recode it manually 2797 // so recode it manually
2747 if (ct.encoding == xa[XA_UTF8_STRING]) 2798 if (ct.encoding == xa[XA_UTF8_STRING])
2748 { 2799 {
2749 wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems); 2800 wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems);
… …
2753 paste (s, strlen (s)); 2804 paste (s, strlen (s));
2754 free (s); 2805 free (s);
2755 } 2806 }
2756 else 2807 else
2757#endif 2808#endif
2758 if (XmbTextPropertyToTextList (display->display, &ct, &cl, &cr) >= 0 2809 if (XmbTextPropertyToTextList (dpy, &ct, &cl, &cr) >= 0
2759 && cl) 2810 && cl)
2760 { 2811 {
2761 for (int i = 0; i < cr; i++) 2812 for (int i = 0; i < cr; i++)
2762 paste (cl[i], strlen (cl[i])); 2813 paste (cl[i], strlen (cl[i]));
2763 2814
… …
2845 else if (selnum == Sel_Secondary) 2896 else if (selnum == Sel_Secondary)
2846 sel = XA_SECONDARY; 2897 sel = XA_SECONDARY;
2847 else 2898 else
2848 sel = xa[XA_CLIPBOARD]; 2899 sel = xa[XA_CLIPBOARD];
2849 2900
2850 if (XGetSelectionOwner (display->display, sel) != None) 2901 if (XGetSelectionOwner (dpy, sel) != None)
2851 { 2902 {
2852 XConvertSelection (display->display, sel, target, xa[XA_VT_SELECTION], 2903 XConvertSelection (dpy, sel, target, xa[XA_VT_SELECTION],
2853 vt, selection_request_time); 2904 vt, selection_request_time);
2854 return 1; 2905 return 1;
2855 } 2906 }
2856 2907
2857 return 0; 2908 return 0;
… …
2920 2971
2921 int end_col; 2972 int end_col;
2922 2973
2923 for (; row <= selection.end.row; row++, col = 0) 2974 for (; row <= selection.end.row; row++, col = 0)
2924 { 2975 {
2925#if ENABLE_FRILLS 2976#if !ENABLE_MINIMAL
2926 if (selection.rect) 2977 if (selection.rect)
2927 { 2978 {
2928 col = selection.beg.col; 2979 col = selection.beg.col;
2929 end_col = ncol + 1; 2980 end_col = ncol + 1;
2930 } 2981 }
… …
2933 end_col = ROW(row).l; 2984 end_col = ROW(row).l;
2934 2985
2935 col = max (col, 0); 2986 col = max (col, 0);
2936 2987
2937 if (row == selection.end.row 2988 if (row == selection.end.row
2938#if ENABLE_FRILLS 2989#if !ENABLE_MINIMAL
2939 || selection.rect 2990 || selection.rect
2940#endif 2991#endif
2941 ) 2992 )
2942 min_it (end_col, selection.end.col); 2993 min_it (end_col, selection.end.col);
2943 2994
… …
2966#endif 3017#endif
2967 else 3018 else
2968 new_selection_text[ofs++] = *t++; 3019 new_selection_text[ofs++] = *t++;
2969 } 3020 }
2970 3021
2971#if ENABLE_FRILLS 3022#if !ENABLE_MINIMAL
2972 if (selection.rect) 3023 if (selection.rect)
2973 { 3024 {
2974 while (ofs 3025 while (ofs
2975 && new_selection_text[ofs - 1] != C0_LF 3026 && new_selection_text[ofs - 1] != C0_LF
2976 && unicode::is_space (new_selection_text[ofs - 1])) 3027 && unicode::is_space (new_selection_text[ofs - 1]))
… …
3010bool 3061bool
3011rxvt_term::selection_grab (Time tm) NOTHROW 3062rxvt_term::selection_grab (Time tm) NOTHROW
3012{ 3063{
3013 selection_time = tm; 3064 selection_time = tm;
3014 3065
3015 XSetSelectionOwner (display->display, XA_PRIMARY, vt, tm); 3066 XSetSelectionOwner (dpy, XA_PRIMARY, vt, tm);
3016 if (XGetSelectionOwner (display->display, XA_PRIMARY) == vt) 3067 if (XGetSelectionOwner (dpy, XA_PRIMARY) == vt)
3017 { 3068 {
3018 display->set_selection_owner (this); 3069 display->set_selection_owner (this);
3019 return true; 3070 return true;
3020 } 3071 }
3021 else 3072 else
… …
3025 } 3076 }
3026 3077
3027#if 0 3078#if 0
3028 XTextProperty ct; 3079 XTextProperty ct;
3029 3080
3030 if (XwcTextListToTextProperty (display->display, &selection.text, 1, XStringStyle, &ct) >= 0) 3081 if (XwcTextListToTextProperty (dpy, &selection.text, 1, XStringStyle, &ct) >= 0)
3031 { 3082 {
3032 set_string_property (XA_CUT_BUFFER0, ct.value, ct.nitems); 3083 set_string_property (XA_CUT_BUFFER0, ct.value, ct.nitems);
3033 XFree (ct.value); 3084 XFree (ct.value);
3034 } 3085 }
3035#endif 3086#endif
… …
3337 3388
3338 if (selection.clicks == 1) 3389 if (selection.clicks == 1)
3339 { 3390 {
3340 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
3341 && !ROW(selection.beg.row).is_longer () 3392 && !ROW(selection.beg.row).is_longer ()
3342#if ENABLE_FRILLS 3393#if !ENABLE_MINIMAL
3343 && !selection.rect 3394 && !selection.rect
3344#endif 3395#endif
3345 ) 3396 )
3346 selection.beg.col = ncol; 3397 selection.beg.col = ncol;
3347 3398
3348 if ( 3399 if (
3349 selection.end.col > ROW(selection.end.row).l //TODO//FIXME//LEN 3400 selection.end.col > ROW(selection.end.row).l //TODO//FIXME//LEN
3350 && !ROW(selection.end.row).is_longer () 3401 && !ROW(selection.end.row).is_longer ()
3351#if ENABLE_FRILLS 3402#if !ENABLE_MINIMAL
3352 && !selection.rect 3403 && !selection.rect
3353#endif 3404#endif
3354 ) 3405 )
3355 selection.end.col = ncol; 3406 selection.end.col = ncol;
3356 } 3407 }
… …
3363 selection_delimit_word (DN, &selection.end, &selection.end); 3414 selection_delimit_word (DN, &selection.end, &selection.end);
3364 } 3415 }
3365 else if (selection.clicks == 3) 3416 else if (selection.clicks == 3)
3366 { 3417 {
3367#if ENABLE_FRILLS 3418#if ENABLE_FRILLS
3368 if (OPTION (Opt_tripleclickwords)) 3419 if (option (Opt_tripleclickwords))
3369 { 3420 {
3370 selection_delimit_word (UP, &selection.beg, &selection.beg); 3421 selection_delimit_word (UP, &selection.beg, &selection.beg);
3371 3422
3372 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++)
3373 { 3424 {
3374 if (!ROW(end_row).is_longer ()) 3425 if (!ROW(end_row).is_longer ())
3375 { 3426 {
3376 selection.end.row = end_row; 3427 selection.end.row = end_row;
3377 selection.end.col = ROW(end_row).l; 3428 selection.end.col = ROW(end_row).l;
3429# if !ENABLE_MINIMAL
3378 selection_remove_trailing_spaces (); 3430 selection_remove_trailing_spaces ();
3431# endif
3379 break; 3432 break;
3380 } 3433 }
3381 } 3434 }
3382 } 3435 }
3383 else 3436 else
… …
3412 selection.mark.row = selection.beg.row; 3465 selection.mark.row = selection.beg.row;
3413 selection.mark.col = selection.beg.col; 3466 selection.mark.col = selection.beg.col;
3414 } 3467 }
3415 } 3468 }
3416 3469
3417#if ENABLE_FRILLS 3470#if !ENABLE_MINIMAL
3418 if (selection.rect && selection.beg.col > selection.end.col) 3471 if (selection.rect && selection.beg.col > selection.end.col)
3419 ::swap (selection.beg.col, selection.end.col); 3472 ::swap (selection.beg.col, selection.end.col);
3420#endif 3473#endif
3421} 3474}
3422 3475
3423#if ENABLE_FRILLS 3476#if !ENABLE_MINIMAL
3424void 3477void
3425rxvt_term::selection_remove_trailing_spaces () NOTHROW 3478rxvt_term::selection_remove_trailing_spaces () NOTHROW
3426{ 3479{
3427 int32_t end_col, end_row; 3480 int32_t end_col, end_row;
3428 text_t *stp; 3481 text_t *stp;
… …
3483 */ 3536 */
3484void 3537void
3485rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW 3538rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW
3486{ 3539{
3487 XSelectionEvent ev; 3540 XSelectionEvent ev;
3488 dDisp;
3489 3541
3490 ev.type = SelectionNotify; 3542 ev.type = SelectionNotify;
3491 ev.property = None; 3543 ev.property = None;
3492 ev.display = rq.display; 3544 ev.display = rq.display;
3493 ev.requestor = rq.requestor; 3545 ev.requestor = rq.requestor;
… …
3507 *target++ = xa[XA_COMPOUND_TEXT]; 3559 *target++ = xa[XA_COMPOUND_TEXT];
3508#if X_HAVE_UTF8_STRING 3560#if X_HAVE_UTF8_STRING
3509 *target++ = xa[XA_UTF8_STRING]; 3561 *target++ = xa[XA_UTF8_STRING];
3510#endif 3562#endif
3511 3563
3512 XChangeProperty (disp, rq.requestor, rq.property, XA_ATOM, 3564 XChangeProperty (dpy, rq.requestor, rq.property, XA_ATOM,
3513 32, PropModeReplace, 3565 32, PropModeReplace,
3514 (unsigned char *)target_list, target - target_list); 3566 (unsigned char *)target_list, target - target_list);
3515 ev.property = rq.property; 3567 ev.property = rq.property;
3516 } 3568 }
3517#if TODO // TODO 3569#if TODO // TODO
… …
3520 /* TODO: Handle MULTIPLE */ 3572 /* TODO: Handle MULTIPLE */
3521 } 3573 }
3522#endif 3574#endif
3523 else if (rq.target == xa[XA_TIMESTAMP] && selection.text) 3575 else if (rq.target == xa[XA_TIMESTAMP] && selection.text)
3524 { 3576 {
3525 XChangeProperty (disp, rq.requestor, rq.property, rq.target, 3577 XChangeProperty (dpy, rq.requestor, rq.property, rq.target,
3526 32, PropModeReplace, (unsigned char *)&selection_time, 1); 3578 32, PropModeReplace, (unsigned char *)&selection_time, 1);
3527 ev.property = rq.property; 3579 ev.property = rq.property;
3528 } 3580 }
3529 else if (rq.target == XA_STRING 3581 else if (rq.target == XA_STRING
3530 || rq.target == xa[XA_TEXT] 3582 || rq.target == xa[XA_TEXT]
… …
3554 style = enc_string; 3606 style = enc_string;
3555 else if (target == xa[XA_TEXT]) 3607 else if (target == xa[XA_TEXT])
3556 style = enc_text; 3608 style = enc_text;
3557 else if (target == xa[XA_COMPOUND_TEXT]) 3609 else if (target == xa[XA_COMPOUND_TEXT])
3558 style = enc_compound_text; 3610 style = enc_compound_text;
3559#if ENABLE_FRILLS 3611#if !ENABLE_MINIMAL
3560 else if (target == xa[XA_UTF8_STRING]) 3612 else if (target == xa[XA_UTF8_STRING])
3561 style = enc_utf8; 3613 style = enc_utf8;
3562#endif 3614#endif
3563 else 3615 else
3564 { 3616 {
… …
3575 { 3627 {
3576 cl = L""; 3628 cl = L"";
3577 selectlen = 0; 3629 selectlen = 0;
3578 } 3630 }
3579 3631
3580#if ENABLE_FRILLS 3632#if !ENABLE_MINIMAL
3581 // 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
3582 // so recode it manually 3634 // so recode it manually
3583 if (style == enc_utf8) 3635 if (style == enc_utf8)
3584 { 3636 {
3585 freect = 1; 3637 freect = 1;
… …
3588 ct.value = (unsigned char *)rxvt_wcstoutf8 (cl, selectlen); 3640 ct.value = (unsigned char *)rxvt_wcstoutf8 (cl, selectlen);
3589 ct.nitems = strlen ((char *)ct.value); 3641 ct.nitems = strlen ((char *)ct.value);
3590 } 3642 }
3591 else 3643 else
3592#endif 3644#endif
3593 if (XwcTextListToTextProperty (disp, &cl, 1, (XICCEncodingStyle) style, &ct) >= 0) 3645 if (XwcTextListToTextProperty (dpy, &cl, 1, (XICCEncodingStyle) style, &ct) >= 0)
3594 freect = 1; 3646 freect = 1;
3595 else 3647 else
3596 { 3648 {
3597 /* if we failed to convert then send it raw */ 3649 /* if we failed to convert then send it raw */
3598 ct.value = (unsigned char *)cl; 3650 ct.value = (unsigned char *)cl;
3599 ct.nitems = selectlen; 3651 ct.nitems = selectlen;
3600 ct.encoding = target; 3652 ct.encoding = target;
3601 } 3653 }
3602 3654
3603 XChangeProperty (disp, rq.requestor, rq.property, 3655 XChangeProperty (dpy, rq.requestor, rq.property,
3604 ct.encoding, 8, PropModeReplace, 3656 ct.encoding, 8, PropModeReplace,
3605 ct.value, (int)ct.nitems); 3657 ct.value, (int)ct.nitems);
3606 ev.property = rq.property; 3658 ev.property = rq.property;
3607 3659
3608 if (freect) 3660 if (freect)
3609 XFree (ct.value); 3661 XFree (ct.value);
3610 } 3662 }
3611 3663
3612 XSendEvent (disp, rq.requestor, False, 0L, (XEvent *)&ev); 3664 XSendEvent (dpy, rq.requestor, False, 0L, (XEvent *)&ev);
3613} 3665}
3614 3666
3615/* ------------------------------------------------------------------------- * 3667/* ------------------------------------------------------------------------- *
3616 * MOUSE ROUTINES * 3668 * MOUSE ROUTINES *
3617 * ------------------------------------------------------------------------- */ 3669 * ------------------------------------------------------------------------- */
… …
3633void 3685void
3634rxvt_term::im_set_position (XPoint &pos) NOTHROW 3686rxvt_term::im_set_position (XPoint &pos) NOTHROW
3635{ 3687{
3636 XWindowAttributes xwa; 3688 XWindowAttributes xwa;
3637 3689
3638 XGetWindowAttributes (display->display, vt, &xwa); 3690 XGetWindowAttributes (dpy, vt, &xwa);
3639 3691
3640 pos.x = xwa.x + Col2Pixel (screen.cur.col); 3692 pos.x = xwa.x + Col2Pixel (screen.cur.col);
3641 pos.y = xwa.y + Height2Pixel (screen.cur.row) + fbase; 3693 pos.y = xwa.y + Height2Pixel (screen.cur.row) + fbase;
3642} 3694}
3643#endif 3695#endif
… …
3739rxvt_term::scr_overlay_set (int x, int y, const wchar_t *s) NOTHROW 3791rxvt_term::scr_overlay_set (int x, int y, const wchar_t *s) NOTHROW
3740{ 3792{
3741 while (*s) 3793 while (*s)
3742 { 3794 {
3743 text_t t = *s++; 3795 text_t t = *s++;
3744 int width = wcwidth (t); 3796 int width = WCWIDTH (t);
3745 3797
3746 while (width--) 3798 while (width--)
3747 { 3799 {
3748 scr_overlay_set (x++, y, t); 3800 scr_overlay_set (x++, y, t);
3749 t = NOCHAR; 3801 t = NOCHAR;

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines