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.244 by root, Fri Jan 20 10:27:08 2006 UTC vs.
Revision 1.273 by ayin, Mon Aug 13 07:18:58 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>
… …
26 26
27#include "../config.h" /* NECESSARY */ 27#include "../config.h" /* NECESSARY */
28#include "rxvt.h" /* NECESSARY */ 28#include "rxvt.h" /* NECESSARY */
29#include "rxvtperl.h" /* NECESSARY */ 29#include "rxvtperl.h" /* NECESSARY */
30 30
31#include <X11/Xmd.h> /* get the typedef for CARD32 */
32
33#include <inttypes.h> 31#include <inttypes.h>
34 32
35#include "salloc.C" // HACK, should be a seperate compile! 33#include "salloc.C" // HACK, should be a seperate compile!
36 34
37inline void fill_text (text_t *start, text_t value, int len) 35inline void fill_text (text_t *start, text_t value, int len)
… …
47 45
48/* ------------------------------------------------------------------------- * 46/* ------------------------------------------------------------------------- *
49 * GENERAL SCREEN AND SELECTION UPDATE ROUTINES * 47 * GENERAL SCREEN AND SELECTION UPDATE ROUTINES *
50 * ------------------------------------------------------------------------- */ 48 * ------------------------------------------------------------------------- */
51#define ZERO_SCROLLBACK() \ 49#define ZERO_SCROLLBACK() \
52 if (OPTION (Opt_scrollTtyOutput)) \ 50 if (option (Opt_scrollTtyOutput)) \
53 view_start = 0 51 view_start = 0
54#define CLEAR_SELECTION() \ 52#define CLEAR_SELECTION() \
55 selection.beg.row = selection.beg.col \ 53 selection.beg.row = selection.beg.col \
56 = selection.end.row = selection.end.col = 0 54 = selection.end.row = selection.end.col = 0
57#define CLEAR_ALL_SELECTION() \ 55#define CLEAR_ALL_SELECTION() \
… …
93 */ 91 */
94#define drawBuffer vt 92#define drawBuffer vt
95 93
96#define CLEAR_ROWS(row, num) \ 94#define CLEAR_ROWS(row, num) \
97 if (mapped) \ 95 if (mapped) \
98 XClearArea (display->display, drawBuffer, 0, \ 96 XClearArea (dpy, drawBuffer, 0, \
99 Row2Pixel (row), (unsigned int)width, \ 97 Row2Pixel (row), (unsigned int)width, \
100 (unsigned int)Height2Pixel (num), False) 98 (unsigned int)Height2Pixel (num), False)
101 99
102#define CLEAR_CHARS(x, y, num) \ 100#define CLEAR_CHARS(x, y, num) \
103 if (mapped) \ 101 if (mapped) \
104 XClearArea (display->display, drawBuffer, x, y, \ 102 XClearArea (dpy, drawBuffer, x, y, \
105 (unsigned int)Width2Pixel (num), \ 103 (unsigned int)Width2Pixel (num), \
106 (unsigned int)Height2Pixel (1), False) 104 (unsigned int)Height2Pixel (1), False)
107 105
108#define ERASE_ROWS(row, num) \ 106#define ERASE_ROWS(row, num) \
109 XFillRectangle (display->display, drawBuffer, gc, \ 107 XFillRectangle (dpy, drawBuffer, gc, \
110 0, Row2Pixel (row), \ 108 0, Row2Pixel (row), \
111 (unsigned int)width, \ 109 (unsigned int)width, \
112 (unsigned int)Height2Pixel (num)) 110 (unsigned int)Height2Pixel (num))
113 111
114/* ------------------------------------------------------------------------- * 112/* ------------------------------------------------------------------------- *
… …
126 width = ncol; 124 width = ncol;
127 } 125 }
128 126
129 l.touch (); 127 l.touch ();
130 128
131 efs &= ~RS_baseattrMask; 129 efs &= ~RS_baseattrMask; // remove italic etc. fontstyles
132 efs = SET_FONT (efs, FONTSET (efs)->find_font (' ')); 130 efs = SET_FONT (efs, FONTSET (efs)->find_font (' '));
133 131
134 text_t *et = l.t + col; 132 text_t *et = l.t + col;
135 rend_t *er = l.r + col; 133 rend_t *er = l.r + col;
136 134
… …
161{ 159{
162#if ENABLE_OVERLAY 160#if ENABLE_OVERLAY
163 scr_overlay_off (); 161 scr_overlay_off ();
164#endif 162#endif
165 163
164 rvideo_mode = false;
166 view_start = 0; 165 view_start = 0;
167 num_scr = 0; 166 num_scr = 0;
168 167
169 if (ncol == 0) 168 if (ncol == 0)
170 ncol = 80; 169 ncol = 80;
… …
173 nrow = 24; 172 nrow = 24;
174 173
175 if (ncol == prev_ncol && nrow == prev_nrow) 174 if (ncol == prev_ncol && nrow == prev_nrow)
176 return; 175 return;
177 176
177 if (current_screen != PRIMARY)
178 scr_swap_screen ();
179
178 // we need at least two lines for wrapping to work correctly 180 // we need at least two lines for wrapping to work correctly
179 if (nrow + saveLines < 2) 181 while (nrow + saveLines < 2)
180 { 182 {
181 //TODO//FIXME 183 //TODO//FIXME
182 saveLines++; 184 saveLines++;
183 prev_nrow--; 185 prev_nrow--;
184 top_row--; 186 top_row--;
… …
195 if (!row_buf) 197 if (!row_buf)
196 { 198 {
197 /* 199 /*
198 * first time called so just malloc everything: don't rely on realloc 200 * first time called so just malloc everything: don't rely on realloc
199 */ 201 */
200 top_row = 0; /* no saved lines */ 202 top_row = 0;
201 term_start = 0; 203 term_start = 0;
202 204
203 talloc = new rxvt_salloc (ncol * sizeof (text_t)); 205 talloc = new rxvt_salloc (ncol * sizeof (text_t));
204 ralloc = new rxvt_salloc (ncol * sizeof (rend_t)); 206 ralloc = new rxvt_salloc (ncol * sizeof (rend_t));
205 207
… …
234 selection.text = NULL; 236 selection.text = NULL;
235 selection.len = 0; 237 selection.len = 0;
236 selection.op = SELECTION_CLEAR; 238 selection.op = SELECTION_CLEAR;
237 selection.screen = PRIMARY; 239 selection.screen = PRIMARY;
238 selection.clicks = 0; 240 selection.clicks = 0;
239 rvideo = 0;
240 } 241 }
241 else 242 else
242 { 243 {
243 /* 244 /*
244 * add or delete rows as appropriate 245 * add or delete rows as appropriate
… …
280 int pend = MOD (term_start + top_row , prev_total_rows); 281 int pend = MOD (term_start + top_row , prev_total_rows);
281 int q = total_rows; // rewrapped row 282 int q = total_rows; // rewrapped row
282 283
283 if (top_row) 284 if (top_row)
284 { 285 {
285 // re-wrap lines, this is rather ugly, possibly because I am too dumb 286 // Re-wrap lines. This is rather ugly, possibly because I am too dumb
286 // to come up with a lean and mean algorithm. 287 // to come up with a lean and mean algorithm.
287 288
288 row_col_t ocur = screen.cur; 289 row_col_t ocur = screen.cur;
289 ocur.row = MOD (term_start + ocur.row, prev_total_rows); 290 ocur.row = MOD (term_start + ocur.row, prev_total_rows);
290 291
… …
347 348
348 line_t &pline = old_buf [prow]; 349 line_t &pline = old_buf [prow];
349 350
350 int len = min (min (prev_ncol - pcol, ncol - qcol), llen - lofs); 351 int len = min (min (prev_ncol - pcol, ncol - qcol), llen - lofs);
351 352
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)); 353 memcpy (qline->t + qcol, pline.t + pcol, len * sizeof (text_t));
358 memcpy (qline->r + qcol, pline.r + pcol, len * sizeof (rend_t)); 354 memcpy (qline->r + qcol, pline.r + pcol, len * sizeof (rend_t));
359 355
360 lofs += len; 356 lofs += len;
361 qcol += len; 357 qcol += len;
… …
401 delete old_ra; 397 delete old_ra;
402 398
403 clamp_it (screen.cur.row, 0, nrow - 1); 399 clamp_it (screen.cur.row, 0, nrow - 1);
404 clamp_it (screen.cur.col, 0, ncol - 1); 400 clamp_it (screen.cur.col, 0, ncol - 1);
405 401
406 if (tabs)
407 free (tabs); 402 free (tabs);
408 } 403 }
409 404
410 CLEAR_ALL_SELECTION (); 405 CLEAR_ALL_SELECTION ();
411 406
412 prev_nrow = nrow; 407 prev_nrow = nrow;
413 prev_ncol = ncol; 408 prev_ncol = ncol;
414 409
415 tabs = (char *)rxvt_malloc (ncol * sizeof (char)); 410 tabs = (char *)rxvt_malloc (ncol * sizeof (char));
416 411
417 for (int col = ncol; col--; ) 412 for (int col = ncol; --col; )
418 tabs [col] = col % TABSIZE == 0; 413 tabs [col] = col % TABSIZE == 0;
419 414
415 if (current_screen != PRIMARY)
416 scr_swap_screen ();
417
420 tt_winch (); 418 tt_winch ();
421 419
422 HOOK_INVOKE ((this, HOOK_RESET, DT_END)); 420 HOOK_INVOKE ((this, HOOK_RESET, DT_END));
423} 421}
424 422
… …
427 * Free everything. That way malloc debugging can find leakage. 425 * Free everything. That way malloc debugging can find leakage.
428 */ 426 */
429void 427void
430rxvt_term::scr_release () NOTHROW 428rxvt_term::scr_release () NOTHROW
431{ 429{
430 if (row_buf)
431 {
432 delete talloc; talloc = 0; 432 delete talloc; talloc = 0;
433 delete ralloc; ralloc = 0; 433 delete ralloc; ralloc = 0;
434 434
435 free (row_buf); 435 free (row_buf);
436 free (swap_buf); 436 free (swap_buf);
437 free (drawn_buf); 437 free (drawn_buf);
438 free (tabs); 438 free (tabs);
439 439
440 row_buf = 0; // signal that we freed all the arrays 440 row_buf = 0; // signal that we freed all the arrays
441 }
441} 442}
442 443
443/* ------------------------------------------------------------------------- */ 444/* ------------------------------------------------------------------------- */
444/* 445/*
445 * Hard reset 446 * Hard reset
446 */ 447 */
447void 448void
448rxvt_term::scr_poweron () NOTHROW 449rxvt_term::scr_poweron ()
449{ 450{
450 scr_release (); 451 scr_release ();
451 prev_nrow = prev_ncol = 0; 452 prev_nrow = prev_ncol = 0;
452 scr_reset (); 453 scr_reset ();
453 454
… …
504 assert (s->cur.row >= 0); 505 assert (s->cur.row >= 0);
505 assert (s->cur.col >= 0); 506 assert (s->cur.col >= 0);
506#endif 507#endif
507} 508}
508 509
510void
511rxvt_term::scr_swap_screen ()
512{
513 if (!option (Opt_secondaryScreen))
514 return;
515
516 for (int i = prev_nrow; i--; )
517 ::swap (ROW(i), swap_buf [i]);
518
519 ::swap (screen.cur, swap.cur);
520
521 screen.cur.row = clamp (screen.cur.row, 0, prev_nrow - 1);
522 screen.cur.col = clamp (screen.cur.col, 0, prev_ncol - 1);
523}
524
509/* ------------------------------------------------------------------------- */ 525/* ------------------------------------------------------------------------- */
510/* 526/*
511 * Swap between primary and secondary screens 527 * Swap between primary and secondary screens
512 * XTERM_SEQ: Primary screen : ESC [ ? 4 7 h 528 * XTERM_SEQ: Primary screen : ESC [ ? 4 7 h
513 * XTERM_SEQ: Secondary screen: ESC [ ? 4 7 l 529 * XTERM_SEQ: Secondary screen: ESC [ ? 4 7 l
514 */ 530 */
515int 531void
516rxvt_term::scr_change_screen (int scrn) NOTHROW 532rxvt_term::scr_change_screen (int scrn)
517{ 533{
534 if (scrn == current_screen)
535 return;
536
518 want_refresh = 1; 537 want_refresh = 1;
519 view_start = 0; 538 view_start = 0;
520 539
521 if (current_screen == scrn)
522 return scrn;
523
524 selection_check (2); /* check for boundary cross */ 540 selection_check (2); /* check for boundary cross */
525 541
526 int i = current_screen; current_screen = scrn; scrn = i; 542 int i = current_screen; current_screen = scrn; scrn = i;
527 543
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 544#if NSCREENS
535 if (OPTION (Opt_secondaryScreen)) 545 if (option (Opt_secondaryScreen))
536 { 546 {
537 num_scr = 0; 547 num_scr = 0;
538 548
539 for (int i = prev_nrow; i--; ) 549 scr_swap_screen ();
540 ::swap (ROW(i), swap_buf [i]);
541 550
542 ::swap (screen.charset, swap.charset); 551 ::swap (screen.charset, swap.charset);
543 ::swap (screen.flags, swap.flags); 552 ::swap (screen.flags, swap.flags);
544 screen.flags |= Screen_VisibleCursor; 553 screen.flags |= Screen_VisibleCursor;
545 swap.flags |= Screen_VisibleCursor; 554 swap.flags |= Screen_VisibleCursor;
546 } 555 }
547 else 556 else
548#endif 557#endif
549 if (OPTION (Opt_secondaryScroll)) 558 if (option (Opt_secondaryScroll))
550 scr_scroll_text (0, prev_nrow - 1, prev_nrow); 559 scr_scroll_text (0, prev_nrow - 1, prev_nrow);
551
552 return scrn;
553} 560}
554 561
555// clear WrapNext indicator, solidifying position on next line 562// clear WrapNext indicator, solidifying position on next line
556void 563void
557rxvt_term::scr_do_wrap () NOTHROW 564rxvt_term::scr_do_wrap () NOTHROW
… …
615 want_refresh = 1; 622 want_refresh = 1;
616 num_scr += count; 623 num_scr += count;
617 624
618 if (count > 0 625 if (count > 0
619 && row1 == 0 626 && row1 == 0
620 && (current_screen == PRIMARY || OPTION (Opt_secondaryScroll))) 627 && (current_screen == PRIMARY || option (Opt_secondaryScroll)))
621 { 628 {
622 top_row = max (top_row - count, -saveLines); 629 top_row = max (top_row - count, -saveLines);
623 630
624 // scroll everything up 'count' lines 631 // scroll everything up 'count' lines
625 term_start = (term_start + count) % total_rows; 632 term_start = (term_start + count) % total_rows;
… …
632 } 639 }
633 640
634 // erase newly scrolled-in lines 641 // erase newly scrolled-in lines
635 for (int i = count; i--; ) 642 for (int i = count; i--; )
636 { 643 {
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); 644 line_t &l = ROW(nrow - 1 - i);
640 645
646 // optimize if already cleared, can be significant on slow machines
647 // could be rolled into scr_blank_screen_mem
648 if (l.r && l.l < ncol - 1 && !((l.r[l.l + 1] ^ rstyle) & (RS_fgMask | RS_bgMask)))
649 {
641 scr_blank_line (l, 0, l.l, rstyle); 650 scr_blank_line (l, 0, l.l, rstyle);
642
643 l.l = 0; 651 l.l = 0;
644 l.f = 0; 652 l.f = 0;
653 }
654 else
655 scr_blank_screen_mem (l, rstyle);
645 } 656 }
646 657
647 // now copy lines below the scroll region bottom to the 658 // now copy lines below the scroll region bottom to the
648 // bottom of the screen again, so they look as if they 659 // bottom of the screen again, so they look as if they
649 // hadn't moved. 660 // hadn't moved.
… …
671 selection.op = SELECTION_CLEAR; 682 selection.op = SELECTION_CLEAR;
672 } 683 }
673 } 684 }
674 685
675 // finally move the view window, if desired 686 // finally move the view window, if desired
676 if (OPTION (Opt_scrollWithBuffer) 687 if (option (Opt_scrollWithBuffer)
677 && view_start != 0 688 && view_start != 0
678 && view_start != -saveLines) 689 && view_start != -saveLines)
679 scr_page (UP, count); 690 scr_page (UP, count);
680 691
681 if (SHOULD_INVOKE (HOOK_SCROLL_BACK)) 692 if (SHOULD_INVOKE (HOOK_SCROLL_BACK))
… …
749 ZERO_SCROLLBACK (); 760 ZERO_SCROLLBACK ();
750 761
751 if (minlines > 0) 762 if (minlines > 0)
752 { 763 {
753 minlines += screen.cur.row - screen.bscroll; 764 minlines += screen.cur.row - screen.bscroll;
765 min_it (minlines, screen.cur.row - top_row);
754 766
755 if (minlines > 0 767 if (minlines > 0
756 && screen.tscroll == 0 768 && screen.tscroll == 0
757 && screen.bscroll == nrow - 1) 769 && screen.bscroll == nrow - 1)
758 { 770 {
… …
832 844
833 // some utf-8 decoders "decode" surrogate characters: let's fix this. 845 // some utf-8 decoders "decode" surrogate characters: let's fix this.
834 if (IN_RANGE_INC (c, 0xd800, 0xdfff)) 846 if (IN_RANGE_INC (c, 0xd800, 0xdfff))
835 c = 0xfffd; 847 c = 0xfffd;
836 848
837 // rely on wcwidth to tell us the character width, at least for non-latin1 849 // rely on wcwidth to tell us the character width, do wcwidth before
838 // do wcwidth before further replacements, as wcwidth might return -1 850 // 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 851 // drawing characters below as they might be invalid in the current
840 // locale. 852 // locale.
841 int width = c < 0x100 ? 1 : wcwidth (c); 853 int width = WCWIDTH (c);
842 854
843 if (charsets [screen.charset] == '0') // DEC SPECIAL 855 if (charsets [screen.charset] == '0') // DEC SPECIAL
844 { 856 {
845 // vt100 special graphics and line drawing 857 // vt100 special graphics and line drawing
846 // 5f-7e standard vt100 858 // 5f-7e standard vt100
… …
1057 if (count) 1069 if (count)
1058 x = ncol - 1; 1070 x = ncol - 1;
1059 1071
1060 // store horizontal tab commands as characters inside the text 1072 // store horizontal tab commands as characters inside the text
1061 // buffer so they can be selected and pasted. 1073 // buffer so they can be selected and pasted.
1062 if (ht && OPTION (Opt_pastableTabs)) 1074 if (ht && option (Opt_pastableTabs))
1063 { 1075 {
1064 base_rend = SET_FONT (base_rend, 0); 1076 base_rend = SET_FONT (base_rend, 0);
1065 1077
1066 l.touch (x); 1078 l.touch (x);
1067 1079
… …
1100 * Process DEC Back Index 1112 * Process DEC Back Index
1101 * XTERM_SEQ: ESC 6 1113 * XTERM_SEQ: ESC 6
1102 * Move cursor left in row. If we're at the left boundary, shift everything 1114 * Move cursor left in row. If we're at the left boundary, shift everything
1103 * in that row right. Clear left column. 1115 * in that row right. Clear left column.
1104 */ 1116 */
1105#if ENABLE_FRILLS 1117#if !ENABLE_MINIMAL
1106void 1118void
1107rxvt_term::scr_backindex () NOTHROW 1119rxvt_term::scr_backindex () NOTHROW
1108{ 1120{
1109 if (screen.cur.col > 0) 1121 if (screen.cur.col > 0)
1110 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE); 1122 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE);
… …
1117 * Process DEC Forward Index 1129 * Process DEC Forward Index
1118 * XTERM_SEQ: ESC 9 1130 * XTERM_SEQ: ESC 9
1119 * Move cursor right in row. If we're at the right boundary, shift everything 1131 * Move cursor right in row. If we're at the right boundary, shift everything
1120 * in that row left. Clear right column. 1132 * in that row left. Clear right column.
1121 */ 1133 */
1122#if ENABLE_FRILLS 1134#if !ENABLE_MINIMAL
1123void 1135void
1124rxvt_term::scr_forwardindex () NOTHROW 1136rxvt_term::scr_forwardindex () NOTHROW
1125{ 1137{
1126 if (screen.cur.col < ncol - 1) 1138 if (screen.cur.col < ncol - 1)
1127 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE); 1139 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE);
… …
1328 } 1340 }
1329 else 1341 else
1330 { 1342 {
1331 ren = rstyle & (RS_fgMask | RS_bgMask); 1343 ren = rstyle & (RS_fgMask | RS_bgMask);
1332 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)]; 1344 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)];
1333 XChangeGC (display->display, gc, GCForeground, &gcvalue); 1345 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1334 ERASE_ROWS (row, num); 1346 ERASE_ROWS (row, num);
1335 gcvalue.foreground = pix_colors[Color_fg]; 1347 gcvalue.foreground = pix_colors[Color_fg];
1336 XChangeGC (display->display, gc, GCForeground, &gcvalue); 1348 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1337 } 1349 }
1338 1350
1339 for (; num--; row++) 1351 for (; num--; row++)
1340 { 1352 {
1341 scr_blank_screen_mem (ROW(row), rstyle); 1353 scr_blank_screen_mem (ROW(row), rstyle);
1342 scr_blank_line (drawn_buf [row], 0, ncol, ren); 1354 scr_blank_line (drawn_buf [row], 0, ncol, ren);
1343 } 1355 }
1344} 1356}
1345 1357
1346#if ENABLE_FRILLS 1358#if !ENABLE_MINIMAL
1347void 1359void
1348rxvt_term::scr_erase_savelines () NOTHROW 1360rxvt_term::scr_erase_savelines () NOTHROW
1349{ 1361{
1350 want_refresh = 1; 1362 want_refresh = 1;
1351 ZERO_SCROLLBACK (); 1363 ZERO_SCROLLBACK ();
… …
1621 * Set reverse/normal video 1633 * Set reverse/normal video
1622 * XTERM_SEQ: Reverse video: ESC [ ? 5 h 1634 * XTERM_SEQ: Reverse video: ESC [ ? 5 h
1623 * XTERM_SEQ: Normal video : ESC [ ? 5 l 1635 * XTERM_SEQ: Normal video : ESC [ ? 5 l
1624 */ 1636 */
1625void 1637void
1626rxvt_term::scr_rvideo_mode (int mode) NOTHROW 1638rxvt_term::scr_rvideo_mode (bool on) NOTHROW
1627{ 1639{
1628 XGCValues gcvalue; 1640 rvideo_mode = on;
1629 1641
1642#ifndef NO_BELL
1643 on ^= rvideo_bell;
1644#endif
1645
1630 if (rvideo != mode) 1646 if (rvideo_state != on)
1631 { 1647 {
1632 rvideo = mode; 1648 rvideo_state = on;
1649
1633 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]); 1650 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]);
1634#if XPM_BACKGROUND 1651#ifdef HAVE_BG_PIXMAP
1635 if (bgPixmap.pixmap == None) 1652 if (bgPixmap.pixmap == None)
1636#endif 1653#endif
1637#if TRANSPARENT 1654#if ENABLE_TRANSPARENCY
1638 if (! OPTION (Opt_transparent) || am_transparent == 0) 1655 if (!option (Opt_transparent) || am_transparent == 0)
1639#endif 1656#endif
1640 XSetWindowBackground (display->display, vt, 1657 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
1641 pix_colors[Color_bg]);
1642 1658
1659 XGCValues gcvalue;
1643 gcvalue.foreground = pix_colors[Color_fg]; 1660 gcvalue.foreground = pix_colors[Color_fg];
1644 gcvalue.background = pix_colors[Color_bg]; 1661 gcvalue.background = pix_colors[Color_bg];
1645 XChangeGC (display->display, gc, GCBackground | GCForeground, 1662 XChangeGC (dpy, gc, GCBackground | GCForeground, &gcvalue);
1646 &gcvalue); 1663
1647 scr_clear (); 1664 scr_clear ();
1648 scr_touch (true); 1665 scr_touch (true);
1649 } 1666 }
1650} 1667}
1651 1668
… …
1735{ 1752{
1736 bool found = false; 1753 bool found = false;
1737 1754
1738 for (int i = 0; i < nrow; i++) 1755 for (int i = 0; i < nrow; i++)
1739 { 1756 {
1740 int col = 0;
1741 rend_t *drp = drawn_buf[i].r; 1757 rend_t *drp = drawn_buf[i].r;
1742 1758
1743 for (; col < ncol; col++, drp++) 1759 for (int col = 0; col < ncol; col++, drp++)
1744 if ((*drp & mask) == value) 1760 if ((*drp & mask) == value)
1745 { 1761 {
1746 found = true; 1762 found = true;
1747 *drp = ~value; 1763 *drp = ~value;
1748 } 1764 }
… …
1851 HOOK_INVOKE ((this, HOOK_VIEW_CHANGE, DT_INT, view_start, DT_END)); 1867 HOOK_INVOKE ((this, HOOK_VIEW_CHANGE, DT_INT, view_start, DT_END));
1852 1868
1853 return true; 1869 return true;
1854} 1870}
1855 1871
1872#ifndef NO_BELL
1873void
1874rxvt_term::bell_cb (time_watcher &w)
1875{
1876 rvideo_bell = false;
1877 scr_rvideo_mode (rvideo_mode);
1878}
1879#endif
1880
1856/* ------------------------------------------------------------------------- */ 1881/* ------------------------------------------------------------------------- */
1857void 1882void
1858rxvt_term::scr_bell () NOTHROW 1883rxvt_term::scr_bell () NOTHROW
1859{ 1884{
1860#ifndef NO_BELL 1885#ifndef NO_BELL
1861 1886
1862# ifndef NO_MAPALERT 1887# ifndef NO_MAPALERT
1863# ifdef MAPALERT_OPTION 1888# ifdef MAPALERT_OPTION
1864 if (OPTION (Opt_mapAlert)) 1889 if (option (Opt_mapAlert))
1865# endif 1890# endif
1866 XMapWindow (display->display, parent[0]); 1891 XMapWindow (dpy, parent[0]);
1867# endif 1892# endif
1893# if ENABLE_FRILLS
1894 if (option (Opt_urgentOnBell))
1895 {
1896 XWMHints *h;
1868 1897
1869 if (OPTION (Opt_visualBell)) 1898 h = XGetWMHints(dpy, parent[0]);
1899 if (h != NULL)
1900 {
1901 h->flags |= XUrgencyHint;
1902 XSetWMHints(dpy, parent[0], h);
1903 }
1870 { 1904 }
1871 scr_rvideo_mode (!rvideo); /* refresh also done */ 1905# endif
1906
1907 if (option (Opt_visualBell))
1908 {
1909 rvideo_bell = true;
1910 scr_rvideo_mode (rvideo_mode);
1872 display->flush (); 1911 display->flush ();
1873 rxvt_usleep (VISUAL_BELL_DURATION); 1912
1874 scr_rvideo_mode (!rvideo); /* refresh also done */ 1913 bell_ev.start (NOW + VISUAL_BELL_DURATION);
1875 } 1914 }
1876 else 1915 else
1877 XBell (display->display, 0); 1916 XBell (dpy, 0);
1878
1879#endif 1917#endif
1880} 1918}
1881 1919
1882/* ------------------------------------------------------------------------- */ 1920/* ------------------------------------------------------------------------- */
1883/* ARGSUSED */ 1921/* ARGSUSED */
… …
1941 * screen.text/screen.rend contain what the screen will change to. 1979 * screen.text/screen.rend contain what the screen will change to.
1942 */ 1980 */
1943void 1981void
1944rxvt_term::scr_refresh () NOTHROW 1982rxvt_term::scr_refresh () NOTHROW
1945{ 1983{
1946 unsigned char must_clear, /* use draw_string not draw_image_string */ 1984 unsigned char have_bg,
1947 showcursor; /* show the cursor */ 1985 showcursor; /* show the cursor */
1948 int16_t col, row, /* column/row we're processing */ 1986 int16_t col, row, /* column/row we're processing */
1949 ocrow; /* old cursor row */ 1987 ocrow; /* old cursor row */
1950 int i; /* tmp */ 1988 int i; /* tmp */
1951#ifndef NO_CURSORCOLOR 1989#ifndef NO_CURSORCOLOR
1952 rend_t cc1; /* store colours at cursor position (s) */ 1990 rend_t cc1; /* store colours at cursor position (s) */
1953#endif 1991#endif
1954 rend_t *crp; // cursor rendition pointer 1992 rend_t *crp; // cursor rendition pointer
1993 rend_t ccol1, /* Cursor colour */
1994 ccol2; /* Cursor colour2 */
1955 1995
1956 want_refresh = 0; /* screen is current */ 1996 want_refresh = 0; /* screen is current */
1957 1997
1958 if (refresh_type == NO_REFRESH || !mapped) 1998 if (refresh_type == NO_REFRESH || !mapped)
1959 return; 1999 return;
1960 2000
1961 /* 2001 /*
1962 * A: set up vars 2002 * A: set up vars
1963 */ 2003 */
1964 must_clear = 0; 2004 have_bg = 0;
1965 refresh_count = 0; 2005 refresh_count = 0;
1966 2006
1967#if XPM_BACKGROUND 2007#ifdef HAVE_BG_PIXMAP
1968 must_clear |= bgPixmap.pixmap != None; 2008 have_bg |= bgPixmap.pixmap != None;
1969#endif 2009#endif
1970#if TRANSPARENT 2010#if ENABLE_TRANSPARENCY
1971 must_clear |= OPTION (Opt_transparent) && am_transparent; 2011 have_bg |= option (Opt_transparent) && am_transparent;
1972#endif 2012#endif
1973 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ 2013 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
1974 2014
1975 /* 2015 /*
1976 * B: reverse any characters which are selected 2016 * B: reverse any characters which are selected
… …
1980 /* 2020 /*
1981 * C: set the cursor character (s) 2021 * C: set the cursor character (s)
1982 */ 2022 */
1983 { 2023 {
1984 unsigned char setoldcursor; 2024 unsigned char setoldcursor;
1985 rend_t ccol1, /* Cursor colour */
1986 ccol2; /* Cursor colour2 */
1987 2025
1988 showcursor = (screen.flags & Screen_VisibleCursor); 2026 showcursor = (screen.flags & Screen_VisibleCursor);
1989#ifdef CURSOR_BLINK 2027#ifdef CURSOR_BLINK
1990 if (hidden_cursor) 2028 if (hidden_cursor)
1991 showcursor = 0; 2029 showcursor = 0;
… …
1998 while (col && ROW(screen.cur.row).t[col] == NOCHAR) 2036 while (col && ROW(screen.cur.row).t[col] == NOCHAR)
1999 col--; 2037 col--;
2000 2038
2001 crp = &ROW(screen.cur.row).r[col]; 2039 crp = &ROW(screen.cur.row).r[col];
2002 2040
2041#ifndef NO_CURSORCOLOR
2042 cc1 = *crp & (RS_fgMask | RS_bgMask);
2043 if (ISSET_PIXCOLOR (Color_cursor))
2044 ccol1 = Color_cursor;
2045 else
2046#endif
2047#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
2048 ccol1 = fgcolor_of (rstyle);
2049#else
2050 ccol1 = Color_fg;
2051#endif
2052
2053#ifndef NO_CURSORCOLOR
2054 if (ISSET_PIXCOLOR (Color_cursor2))
2055 ccol2 = Color_cursor2;
2056 else
2057#endif
2058#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
2059 ccol2 = bgcolor_of (rstyle);
2060#else
2061 ccol2 = Color_bg;
2062#endif
2063
2003 if (showcursor && focus) 2064 if (showcursor && focus)
2004 { 2065 {
2005 if (OPTION (Opt_cursorUnderline)) 2066 if (option (Opt_cursorUnderline))
2006 *crp ^= RS_Uline; 2067 *crp ^= RS_Uline;
2007 else 2068 else
2008 { 2069 {
2009 *crp ^= RS_RVid; 2070 *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); 2071 *crp = SET_FGCOLOR (*crp, ccol1);
2030 *crp = SET_BGCOLOR (*crp, ccol2); 2072 *crp = SET_BGCOLOR (*crp, ccol2);
2031#endif
2032 } 2073 }
2033 } 2074 }
2034 } 2075 }
2035 2076
2036 /* make sure no outline cursor is left around */ 2077 /* make sure no outline cursor is left around */
… …
2075 * D: CopyArea pass - very useful for slower links 2116 * D: CopyArea pass - very useful for slower links
2076 * This has been deliberately kept simple. 2117 * This has been deliberately kept simple.
2077 */ 2118 */
2078 if (!display->is_local 2119 if (!display->is_local
2079 && refresh_type == FAST_REFRESH && num_scr_allow && num_scr 2120 && refresh_type == FAST_REFRESH && num_scr_allow && num_scr
2080 && abs (num_scr) < nrow && !must_clear) 2121 && abs (num_scr) < nrow && !have_bg)
2081 { 2122 {
2082 int16_t nits; 2123 int16_t nits;
2124 int i = num_scr;
2083 int j; 2125 int j;
2084 int len, wlen; 2126 int len, wlen;
2085 dLocal (int, num_scr); 2127 dLocal (int, num_scr);
2086 2128
2087 j = nrow; 2129 j = nrow;
2088 wlen = len = -1; 2130 wlen = len = -1;
2089 row = i > 0 ? 0 : j - 1; 2131 row = i > 0 ? 0 : j - 1;
2132
2090 for (; j-- >= 0; row += (i > 0 ? 1 : -1)) 2133 for (; j-- >= 0; row += (i > 0 ? 1 : -1))
2091 { 2134 {
2092 if (row + i >= 0 && row + i < nrow && row + i != ocrow) 2135 if (row + i >= 0 && row + i < nrow && row + i != ocrow)
2093 { 2136 {
2094 line_t s = ROW(view_start + row); 2137 line_t s = ROW(view_start + row);
… …
2115 wlen = row; 2158 wlen = row;
2116 continue; 2159 continue;
2117 } 2160 }
2118 } 2161 }
2119 2162
2120 if (len != -1) 2163 if (len >= 0)
2121 { 2164 {
2122 /* also comes here at end if needed because of >= above */ 2165 /* also comes here at end if needed because of >= above */
2123 if (wlen < len) 2166 if (wlen < len)
2124 ::swap (wlen, len); 2167 ::swap (wlen, len);
2125 2168
2169 XGCValues gcv;
2170
2171 gcv.graphics_exposures = 1; XChangeGC (dpy, gc, GCGraphicsExposures, &gcv);
2126 XCopyArea (display->display, vt, vt, 2172 XCopyArea (dpy, vt, vt,
2127 gc, 0, Row2Pixel (len + i), 2173 gc, 0, Row2Pixel (len + i),
2128 (unsigned int)this->width, 2174 (unsigned int)this->width,
2129 (unsigned int)Height2Pixel (wlen - len + 1), 2175 (unsigned int)Height2Pixel (wlen - len + 1),
2130 0, Row2Pixel (len)); 2176 0, Row2Pixel (len));
2177 gcv.graphics_exposures = 0; XChangeGC (dpy, gc, GCGraphicsExposures, &gcv);
2178
2131 len = -1; 2179 len = -1;
2132 } 2180 }
2133 } 2181 }
2134 } 2182 }
2135#endif 2183#endif
… …
2191 count++; 2239 count++;
2192 2240
2193 if (stp[col] != dtp[col] 2241 if (stp[col] != dtp[col]
2194 || !RS_SAME (srp[col], drp[col])) 2242 || !RS_SAME (srp[col], drp[col]))
2195 { 2243 {
2196 if (must_clear && (i++ > count / 2)) 2244 if (have_bg && (i++ > count / 2))
2197 break; 2245 break;
2198 2246
2199 dtp[col] = stp[col]; 2247 dtp[col] = stp[col];
2200 drp[col] = rend; 2248 drp[col] = rend;
2201 i = 0; 2249 i = 0;
2202 } 2250 }
2203 else if (must_clear || (stp[col] != ' ' && ++i >= 16)) 2251 else if (have_bg || (stp[col] != ' ' && ++i >= 16))
2204 break; 2252 break;
2205 } 2253 }
2206 2254
2207 col--; /* went one too far. move back */ 2255 col--; /* went one too far. move back */
2208 count -= i; /* dump any matching trailing chars */ 2256 count -= i; /* dump any matching trailing chars */
… …
2218 int back = bgcolor_of (rend); // desired background 2266 int back = bgcolor_of (rend); // desired background
2219 2267
2220 // only do special processing if any attributes are set, which is unlikely 2268 // 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)) 2269 if (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful))
2222 { 2270 {
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; 2271 bool invert = rend & RS_RVid;
2236 2272
2237#ifndef NO_BOLD_UNDERLINE_REVERSE 2273#ifndef NO_BOLD_UNDERLINE_REVERSE
2238 if (rend & RS_Bold 2274 if (rend & RS_Bold
2239 && fore == Color_fg) 2275 && fore == Color_fg)
… …
2255 else 2291 else
2256 invert = !invert; 2292 invert = !invert;
2257# endif 2293# endif
2258 } 2294 }
2259 2295
2260 if (rend & RS_Uline && ISSET_PIXCOLOR (Color_UL)) 2296 if (rend & RS_Uline && fore == Color_fg && ISSET_PIXCOLOR (Color_UL))
2261 fore = Color_UL; 2297 fore = Color_UL;
2262#endif 2298#endif
2263 2299
2264 if (invert) 2300 if (invert)
2265 { 2301 {
2302#ifdef OPTION_HC
2303 if ((showcursor && row == screen.cur.row && text - stp == screen.cur.col)
2304 || !ISSET_PIXCOLOR (Color_HC))
2305#endif
2306 /* invert the column if no highlightColor is set or it is the
2307 * current cursor column */
2266 ::swap (fore, back); 2308 ::swap (fore, back);
2309#ifdef OPTION_HC
2310 else if (ISSET_PIXCOLOR (Color_HC))
2311 back = Color_HC;
2312#endif
2267 2313
2268#ifndef NO_BOLD_UNDERLINE_REVERSE 2314#ifndef NO_BOLD_UNDERLINE_REVERSE
2315# ifndef OPTION_HC
2269 if (ISSET_PIXCOLOR (Color_RV)) 2316 if (ISSET_PIXCOLOR (Color_RV))
2270 back = Color_RV; 2317 back = Color_RV;
2271 2318# endif
2272 if (fore == back) 2319 if (fore == back)
2273 { 2320 {
2274 fore = Color_bg; 2321 fore = Color_bg;
2275 back = Color_fg; 2322 back = Color_fg;
2276 } 2323 }
… …
2287 } 2334 }
2288 else if (hidden_text) 2335 else if (hidden_text)
2289 fore = back; 2336 fore = back;
2290 } 2337 }
2291#endif 2338#endif
2339
2340#if ENABLE_STYLES
2341 // "careful" (too wide) character handling
2342
2343 // include previous careful character(s) if possible, looks nicer (best effort...)
2344 while (text > stp
2345 && srp[text - stp - 1] & RS_Careful
2346 && RS_SAME (rend, srp[text - stp - 1]))
2347 text--, count++, xpixel -= fwidth;
2348
2349 // force redraw after "careful" characters to avoid pixel droppings
2350 for (int i = 0; srp[col + i] & RS_Careful && col + i < ncol - 1; i++)
2351 drp[col + i + 1] = srp[col + i + 1] ^ RS_redraw;
2352
2353 // force redraw before "careful" characters to avoid pixel droppings
2354 for (int i = 0; srp[text - stp - i] & RS_Careful && text - i > stp; i++)
2355 drp[text - stp - i - 1] = srp[text - stp - i - 1] ^ RS_redraw;
2356#endif
2292 } 2357 }
2293 2358
2294 /* 2359 /*
2295 * Actually do the drawing of the string here 2360 * Actually do the drawing of the string here
2296 */ 2361 */
2297 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)]; 2362 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)];
2298 2363
2299 if (back == fore)
2300 font->clear_rect (*drawable, xpixel, ypixel,
2301 fwidth * count, fheight,
2302 back);
2303 else if (back == Color_bg) 2364 if (have_bg && back == Color_bg)
2304 { 2365 {
2305 if (must_clear) 2366 // this is very ugly, maybe push it into ->draw?
2306 {
2307 CLEAR_CHARS (xpixel, ypixel, count);
2308 2367
2309 for (i = 0; i < count; i++) /* don't draw empty strings */ 2368 for (i = 0; i < count; i++) /* don't draw empty strings */
2310 if (text[i] != ' ') 2369 if (text[i] != ' ')
2311 { 2370 {
2312 font->draw (*drawable, xpixel, ypixel, text, count, fore, -1); 2371 font->draw (*drawable, xpixel, ypixel, text, count, fore, Color_transparent);
2313 break; 2372 goto did_clear;
2314 }
2315 } 2373 }
2316 else 2374
2317 font->draw (*drawable, xpixel, ypixel, text, count, fore, Color_bg); 2375 CLEAR_CHARS (xpixel, ypixel, count);
2376 did_clear: ;
2318 } 2377 }
2319 else 2378 else
2320 font->draw (*drawable, xpixel, ypixel, text, count, fore, back); 2379 font->draw (*drawable, xpixel, ypixel, text, count, fore, back);
2321 2380
2322 if (rend & RS_Uline && font->descent > 1 && fore != back) 2381 if (rend & RS_Uline && font->descent > 1 && fore != back)
2323 { 2382 {
2324#if ENABLE_FRILLS 2383#if ENABLE_FRILLS
2325 if (ISSET_PIXCOLOR (Color_underline)) 2384 if (ISSET_PIXCOLOR (Color_underline))
2326 XSetForeground (display->display, gc, pix_colors[Color_underline]); 2385 XSetForeground (dpy, gc, pix_colors[Color_underline]);
2327 else 2386 else
2328#endif 2387#endif
2329 XSetForeground (display->display, gc, pix_colors[fore]); 2388 XSetForeground (dpy, gc, pix_colors[fore]);
2330 2389
2331 XDrawLine (display->display, drawBuffer, gc, 2390 XDrawLine (dpy, drawBuffer, gc,
2332 xpixel, ypixel + font->ascent + 1, 2391 xpixel, ypixel + font->ascent + 1,
2333 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1); 2392 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1);
2334 } 2393 }
2335 } /* for (col....) */ 2394 } /* for (col....) */
2336 } /* for (row....) */ 2395 } /* for (row....) */
… …
2345 */ 2404 */
2346 if (showcursor) 2405 if (showcursor)
2347 { 2406 {
2348 if (focus) 2407 if (focus)
2349 { 2408 {
2350 if (OPTION (Opt_cursorUnderline)) 2409 if (option (Opt_cursorUnderline))
2351 *crp ^= RS_Uline; 2410 *crp ^= RS_Uline;
2352 else 2411 else
2353 { 2412 {
2354 *crp ^= RS_RVid; 2413 *crp ^= RS_RVid;
2355#ifndef NO_CURSORCOLOR 2414#ifndef NO_CURSORCOLOR
… …
2369 && drawn_buf[oldcursor.row].t[col + cursorwidth] == NOCHAR) 2428 && drawn_buf[oldcursor.row].t[col + cursorwidth] == NOCHAR)
2370 cursorwidth++; 2429 cursorwidth++;
2371 2430
2372#ifndef NO_CURSORCOLOR 2431#ifndef NO_CURSORCOLOR
2373 if (ISSET_PIXCOLOR (Color_cursor)) 2432 if (ISSET_PIXCOLOR (Color_cursor))
2374 XSetForeground (display->display, gc, pix_colors[Color_cursor]); 2433 XSetForeground (dpy, gc, pix_colors[Color_cursor]);
2434 else
2375#endif 2435#endif
2436 XSetForeground (dpy, gc, pix_colors[ccol1]);
2376 2437
2377 XDrawRectangle (display->display, drawBuffer, gc, 2438 XDrawRectangle (dpy, drawBuffer, gc,
2378 Col2Pixel (col), 2439 Col2Pixel (col),
2379 Row2Pixel (oldcursor.row), 2440 Row2Pixel (oldcursor.row),
2380 (unsigned int) (Width2Pixel (cursorwidth) - 1), 2441 (unsigned int) (Width2Pixel (cursorwidth) - 1),
2381 (unsigned int) (Height2Pixel (1) - lineSpace - 1)); 2442 (unsigned int) (Height2Pixel (1) - lineSpace - 1));
2382 } 2443 }
… …
2418 2479
2419void 2480void
2420rxvt_term::scr_recolour () NOTHROW 2481rxvt_term::scr_recolour () NOTHROW
2421{ 2482{
2422 if (1 2483 if (1
2423#if TRANSPARENT 2484#if ENABLE_TRANSPARENCY
2424 && !am_transparent 2485 && !am_transparent
2425#endif 2486#endif
2426#if XPM_BACKGROUND 2487#ifdef HAVE_BG_PIXMAP
2427 && !bgPixmap.pixmap 2488 && !bgPixmap.pixmap
2428#endif 2489#endif
2429 ) 2490 )
2430 { 2491 {
2431 XSetWindowBackground (display->display, parent[0], pix_colors[Color_border]); 2492 XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]);
2432 XClearWindow (display->display, parent[0]); 2493 XClearWindow (dpy, parent[0]);
2433 XSetWindowBackground (display->display, vt, pix_colors[Color_bg]); 2494 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
2434#if HAVE_SCROLLBARS 2495#if HAVE_SCROLLBARS
2435 if (scrollBar.win) 2496 if (scrollBar.win)
2436 { 2497 {
2437 XSetWindowBackground (display->display, scrollBar.win, pix_colors[Color_border]); 2498 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]);
2438 scrollBar.setIdle (); 2499 scrollBar.setIdle ();
2439 scrollbar_show (0); 2500 scrollbar_show (0);
2440 } 2501 }
2441#endif 2502#endif
2442 } 2503 }
… …
2455 2516
2456 num_scr_allow = 0; 2517 num_scr_allow = 0;
2457 want_refresh = 1; 2518 want_refresh = 1;
2458 2519
2459 if (really) 2520 if (really)
2460 XClearWindow (display->display, vt); 2521 XClearWindow (dpy, vt);
2461} 2522}
2462 2523
2463void 2524void
2464rxvt_term::scr_xor_rect (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle1, rend_t rstyle2) NOTHROW 2525rxvt_term::scr_xor_rect (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle1, rend_t rstyle2) NOTHROW
2465{ 2526{
… …
2514{ 2575{
2515 if (selection.op 2576 if (selection.op
2516 && current_screen == selection.screen 2577 && current_screen == selection.screen
2517 && selection.end.row >= view_start) 2578 && selection.end.row >= view_start)
2518 { 2579 {
2519#if ENABLE_FRILLS 2580#if !ENABLE_MINIMAL
2520 if (selection.rect) 2581 if (selection.rect)
2521 scr_xor_rect (selection.beg.row, selection.beg.col, 2582 scr_xor_rect (selection.beg.row, selection.beg.col,
2522 selection.end.row, selection.end.col, 2583 selection.end.row, selection.end.col,
2523 RS_RVid, RS_RVid | RS_Uline); 2584 RS_RVid, RS_RVid | RS_Uline);
2524 else 2585 else
… …
2640 } 2701 }
2641 2702
2642 unsigned long bytes_after; 2703 unsigned long bytes_after;
2643 XTextProperty ct; 2704 XTextProperty ct;
2644 2705
2645 if (XGetWindowProperty (display->display, win, prop, 2706 if (XGetWindowProperty (dpy, win, prop,
2646 0, PROP_SIZE / 4, 2707 0, PROP_SIZE / 4,
2647 delete_prop, AnyPropertyType, 2708 delete_prop, AnyPropertyType,
2648 &ct.encoding, &ct.format, 2709 &ct.encoding, &ct.format,
2649 &ct.nitems, &bytes_after, 2710 &ct.nitems, &bytes_after,
2650 &ct.value) != Success) 2711 &ct.value) != Success)
… …
2659 if (bytes_after) 2720 if (bytes_after)
2660 { 2721 {
2661 // fetch and append remaining data 2722 // fetch and append remaining data
2662 XTextProperty ct2; 2723 XTextProperty ct2;
2663 2724
2664 if (XGetWindowProperty (display->display, win, prop, 2725 if (XGetWindowProperty (dpy, win, prop,
2665 ct.nitems / 4, (bytes_after + 3) / 4, 2726 ct.nitems / 4, (bytes_after + 3) / 4,
2666 delete_prop, AnyPropertyType, 2727 delete_prop, AnyPropertyType,
2667 &ct2.encoding, &ct2.format, 2728 &ct2.encoding, &ct2.format,
2668 &ct2.nitems, &bytes_after, 2729 &ct2.nitems, &bytes_after,
2669 &ct2.value) != Success) 2730 &ct2.value) != Success)
… …
2682 2743
2683 if (ct.encoding == xa[XA_INCR]) 2744 if (ct.encoding == xa[XA_INCR])
2684 { 2745 {
2685 // INCR selection, start handshake 2746 // INCR selection, start handshake
2686 if (!delete_prop) 2747 if (!delete_prop)
2687 XDeleteProperty (display->display, win, prop); 2748 XDeleteProperty (dpy, win, prop);
2688 2749
2689 selection_wait = Sel_incr; 2750 selection_wait = Sel_incr;
2690 incr_buf_fill = 0; 2751 incr_buf_fill = 0;
2691 incr_ev.start (NOW + 10); 2752 incr_ev.start (NOW + 10);
2692 2753
… …
2739 } 2800 }
2740 2801
2741 char **cl; 2802 char **cl;
2742 int cr; 2803 int cr;
2743 2804
2744#if ENABLE_FRILLS 2805#if !ENABLE_MINIMAL
2745 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it 2806 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it
2746 // so recode it manually 2807 // so recode it manually
2747 if (ct.encoding == xa[XA_UTF8_STRING]) 2808 if (ct.encoding == xa[XA_UTF8_STRING])
2748 { 2809 {
2749 wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems); 2810 wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems);
… …
2753 paste (s, strlen (s)); 2814 paste (s, strlen (s));
2754 free (s); 2815 free (s);
2755 } 2816 }
2756 else 2817 else
2757#endif 2818#endif
2758 if (XmbTextPropertyToTextList (display->display, &ct, &cl, &cr) >= 0 2819 if (XmbTextPropertyToTextList (dpy, &ct, &cl, &cr) >= 0
2759 && cl) 2820 && cl)
2760 { 2821 {
2761 for (int i = 0; i < cr; i++) 2822 for (int i = 0; i < cr; i++)
2762 paste (cl[i], strlen (cl[i])); 2823 paste (cl[i], strlen (cl[i]));
2763 2824
… …
2804 * EXT: button 2 release 2865 * EXT: button 2 release
2805 */ 2866 */
2806void 2867void
2807rxvt_term::selection_request (Time tm, int selnum) NOTHROW 2868rxvt_term::selection_request (Time tm, int selnum) NOTHROW
2808{ 2869{
2809/* After making a selection with selection_make this function will always 2870 if (selection.text && selnum == Sel_Primary)
2810 * return the internal selection, which is not correct IMO, now much more since
2811 * I added the selnum parameter.
2812 */
2813#if 0
2814 if (selection.text)
2815 { /* internal selection */ 2871 { /* internal selection */
2816 char *str = rxvt_wcstombs (selection.text, selection.len); 2872 char *str = rxvt_wcstombs (selection.text, selection.len);
2817 paste (str, strlen (str)); 2873 paste (str, strlen (str));
2818 free (str); 2874 free (str);
2819 return; 2875 return;
2820 } 2876 }
2821 else 2877 else
2822#endif
2823 { 2878 {
2824 selection_request_time = tm; 2879 selection_request_time = tm;
2825 selection_wait = Sel_normal; 2880 selection_wait = Sel_normal;
2826 2881
2827#if X_HAVE_UTF8_STRING 2882#if X_HAVE_UTF8_STRING
… …
2851 else if (selnum == Sel_Secondary) 2906 else if (selnum == Sel_Secondary)
2852 sel = XA_SECONDARY; 2907 sel = XA_SECONDARY;
2853 else 2908 else
2854 sel = xa[XA_CLIPBOARD]; 2909 sel = xa[XA_CLIPBOARD];
2855 2910
2856 if (XGetSelectionOwner (display->display, sel) != None) 2911 if (XGetSelectionOwner (dpy, sel) != None)
2857 { 2912 {
2858 XConvertSelection (display->display, sel, target, xa[XA_VT_SELECTION], 2913 XConvertSelection (dpy, sel, target, xa[XA_VT_SELECTION],
2859 vt, selection_request_time); 2914 vt, selection_request_time);
2860 return 1; 2915 return 1;
2861 } 2916 }
2862 2917
2863 return 0; 2918 return 0;
… …
2926 2981
2927 int end_col; 2982 int end_col;
2928 2983
2929 for (; row <= selection.end.row; row++, col = 0) 2984 for (; row <= selection.end.row; row++, col = 0)
2930 { 2985 {
2931#if ENABLE_FRILLS 2986#if !ENABLE_MINIMAL
2932 if (selection.rect) 2987 if (selection.rect)
2933 { 2988 {
2934 col = selection.beg.col; 2989 col = selection.beg.col;
2935 end_col = ncol + 1; 2990 end_col = ncol + 1;
2936 } 2991 }
… …
2939 end_col = ROW(row).l; 2994 end_col = ROW(row).l;
2940 2995
2941 col = max (col, 0); 2996 col = max (col, 0);
2942 2997
2943 if (row == selection.end.row 2998 if (row == selection.end.row
2944#if ENABLE_FRILLS 2999#if !ENABLE_MINIMAL
2945 || selection.rect 3000 || selection.rect
2946#endif 3001#endif
2947 ) 3002 )
2948 min_it (end_col, selection.end.col); 3003 min_it (end_col, selection.end.col);
2949 3004
… …
2972#endif 3027#endif
2973 else 3028 else
2974 new_selection_text[ofs++] = *t++; 3029 new_selection_text[ofs++] = *t++;
2975 } 3030 }
2976 3031
2977#if ENABLE_FRILLS 3032#if !ENABLE_MINIMAL
2978 if (selection.rect) 3033 if (selection.rect)
2979 { 3034 {
2980 while (ofs 3035 while (ofs
2981 && new_selection_text[ofs - 1] != C0_LF 3036 && new_selection_text[ofs - 1] != C0_LF
2982 && unicode::is_space (new_selection_text[ofs - 1])) 3037 && unicode::is_space (new_selection_text[ofs - 1]))
… …
3016bool 3071bool
3017rxvt_term::selection_grab (Time tm) NOTHROW 3072rxvt_term::selection_grab (Time tm) NOTHROW
3018{ 3073{
3019 selection_time = tm; 3074 selection_time = tm;
3020 3075
3021 XSetSelectionOwner (display->display, XA_PRIMARY, vt, tm); 3076 XSetSelectionOwner (dpy, XA_PRIMARY, vt, tm);
3022 if (XGetSelectionOwner (display->display, XA_PRIMARY) == vt) 3077 if (XGetSelectionOwner (dpy, XA_PRIMARY) == vt)
3023 { 3078 {
3024 display->set_selection_owner (this); 3079 display->set_selection_owner (this);
3025 return true; 3080 return true;
3026 } 3081 }
3027 else 3082 else
… …
3031 } 3086 }
3032 3087
3033#if 0 3088#if 0
3034 XTextProperty ct; 3089 XTextProperty ct;
3035 3090
3036 if (XwcTextListToTextProperty (display->display, &selection.text, 1, XStringStyle, &ct) >= 0) 3091 if (XwcTextListToTextProperty (dpy, &selection.text, 1, XStringStyle, &ct) >= 0)
3037 { 3092 {
3038 set_string_property (XA_CUT_BUFFER0, ct.value, ct.nitems); 3093 set_string_property (XA_CUT_BUFFER0, ct.value, ct.nitems);
3039 XFree (ct.value); 3094 XFree (ct.value);
3040 } 3095 }
3041#endif 3096#endif
… …
3343 3398
3344 if (selection.clicks == 1) 3399 if (selection.clicks == 1)
3345 { 3400 {
3346 if (selection.beg.col > ROW(selection.beg.row).l //TODO//FIXME//LEN 3401 if (selection.beg.col > ROW(selection.beg.row).l //TODO//FIXME//LEN
3347 && !ROW(selection.beg.row).is_longer () 3402 && !ROW(selection.beg.row).is_longer ()
3348#if ENABLE_FRILLS 3403#if !ENABLE_MINIMAL
3349 && !selection.rect 3404 && !selection.rect
3350#endif 3405#endif
3351 ) 3406 )
3352 selection.beg.col = ncol; 3407 selection.beg.col = ncol;
3353 3408
3354 if ( 3409 if (
3355 selection.end.col > ROW(selection.end.row).l //TODO//FIXME//LEN 3410 selection.end.col > ROW(selection.end.row).l //TODO//FIXME//LEN
3356 && !ROW(selection.end.row).is_longer () 3411 && !ROW(selection.end.row).is_longer ()
3357#if ENABLE_FRILLS 3412#if !ENABLE_MINIMAL
3358 && !selection.rect 3413 && !selection.rect
3359#endif 3414#endif
3360 ) 3415 )
3361 selection.end.col = ncol; 3416 selection.end.col = ncol;
3362 } 3417 }
… …
3369 selection_delimit_word (DN, &selection.end, &selection.end); 3424 selection_delimit_word (DN, &selection.end, &selection.end);
3370 } 3425 }
3371 else if (selection.clicks == 3) 3426 else if (selection.clicks == 3)
3372 { 3427 {
3373#if ENABLE_FRILLS 3428#if ENABLE_FRILLS
3374 if (OPTION (Opt_tripleclickwords)) 3429 if (option (Opt_tripleclickwords))
3375 { 3430 {
3376 selection_delimit_word (UP, &selection.beg, &selection.beg); 3431 selection_delimit_word (UP, &selection.beg, &selection.beg);
3377 3432
3378 for (int end_row = selection.mark.row; end_row < nrow; end_row++) 3433 for (int end_row = selection.mark.row; end_row < nrow; end_row++)
3379 { 3434 {
3380 if (!ROW(end_row).is_longer ()) 3435 if (!ROW(end_row).is_longer ())
3381 { 3436 {
3382 selection.end.row = end_row; 3437 selection.end.row = end_row;
3383 selection.end.col = ROW(end_row).l; 3438 selection.end.col = ROW(end_row).l;
3439# if !ENABLE_MINIMAL
3384 selection_remove_trailing_spaces (); 3440 selection_remove_trailing_spaces ();
3441# endif
3385 break; 3442 break;
3386 } 3443 }
3387 } 3444 }
3388 } 3445 }
3389 else 3446 else
… …
3418 selection.mark.row = selection.beg.row; 3475 selection.mark.row = selection.beg.row;
3419 selection.mark.col = selection.beg.col; 3476 selection.mark.col = selection.beg.col;
3420 } 3477 }
3421 } 3478 }
3422 3479
3423#if ENABLE_FRILLS 3480#if !ENABLE_MINIMAL
3424 if (selection.rect && selection.beg.col > selection.end.col) 3481 if (selection.rect && selection.beg.col > selection.end.col)
3425 ::swap (selection.beg.col, selection.end.col); 3482 ::swap (selection.beg.col, selection.end.col);
3426#endif 3483#endif
3427} 3484}
3428 3485
3429#if ENABLE_FRILLS 3486#if !ENABLE_MINIMAL
3430void 3487void
3431rxvt_term::selection_remove_trailing_spaces () NOTHROW 3488rxvt_term::selection_remove_trailing_spaces () NOTHROW
3432{ 3489{
3433 int32_t end_col, end_row; 3490 int32_t end_col, end_row;
3434 text_t *stp; 3491 text_t *stp;
… …
3489 */ 3546 */
3490void 3547void
3491rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW 3548rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW
3492{ 3549{
3493 XSelectionEvent ev; 3550 XSelectionEvent ev;
3494 dDisp;
3495 3551
3496 ev.type = SelectionNotify; 3552 ev.type = SelectionNotify;
3497 ev.property = None; 3553 ev.property = None;
3498 ev.display = rq.display; 3554 ev.display = rq.display;
3499 ev.requestor = rq.requestor; 3555 ev.requestor = rq.requestor;
… …
3513 *target++ = xa[XA_COMPOUND_TEXT]; 3569 *target++ = xa[XA_COMPOUND_TEXT];
3514#if X_HAVE_UTF8_STRING 3570#if X_HAVE_UTF8_STRING
3515 *target++ = xa[XA_UTF8_STRING]; 3571 *target++ = xa[XA_UTF8_STRING];
3516#endif 3572#endif
3517 3573
3518 XChangeProperty (disp, rq.requestor, rq.property, XA_ATOM, 3574 XChangeProperty (dpy, rq.requestor, rq.property, XA_ATOM,
3519 32, PropModeReplace, 3575 32, PropModeReplace,
3520 (unsigned char *)target_list, target - target_list); 3576 (unsigned char *)target_list, target - target_list);
3521 ev.property = rq.property; 3577 ev.property = rq.property;
3522 } 3578 }
3523#if TODO // TODO 3579#if TODO // TODO
… …
3526 /* TODO: Handle MULTIPLE */ 3582 /* TODO: Handle MULTIPLE */
3527 } 3583 }
3528#endif 3584#endif
3529 else if (rq.target == xa[XA_TIMESTAMP] && selection.text) 3585 else if (rq.target == xa[XA_TIMESTAMP] && selection.text)
3530 { 3586 {
3531 XChangeProperty (disp, rq.requestor, rq.property, rq.target, 3587 XChangeProperty (dpy, rq.requestor, rq.property, rq.target,
3532 32, PropModeReplace, (unsigned char *)&selection_time, 1); 3588 32, PropModeReplace, (unsigned char *)&selection_time, 1);
3533 ev.property = rq.property; 3589 ev.property = rq.property;
3534 } 3590 }
3535 else if (rq.target == XA_STRING 3591 else if (rq.target == XA_STRING
3536 || rq.target == xa[XA_TEXT] 3592 || rq.target == xa[XA_TEXT]
… …
3560 style = enc_string; 3616 style = enc_string;
3561 else if (target == xa[XA_TEXT]) 3617 else if (target == xa[XA_TEXT])
3562 style = enc_text; 3618 style = enc_text;
3563 else if (target == xa[XA_COMPOUND_TEXT]) 3619 else if (target == xa[XA_COMPOUND_TEXT])
3564 style = enc_compound_text; 3620 style = enc_compound_text;
3565#if ENABLE_FRILLS 3621#if !ENABLE_MINIMAL
3566 else if (target == xa[XA_UTF8_STRING]) 3622 else if (target == xa[XA_UTF8_STRING])
3567 style = enc_utf8; 3623 style = enc_utf8;
3568#endif 3624#endif
3569 else 3625 else
3570 { 3626 {
… …
3581 { 3637 {
3582 cl = L""; 3638 cl = L"";
3583 selectlen = 0; 3639 selectlen = 0;
3584 } 3640 }
3585 3641
3586#if ENABLE_FRILLS 3642#if !ENABLE_MINIMAL
3587 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it 3643 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it
3588 // so recode it manually 3644 // so recode it manually
3589 if (style == enc_utf8) 3645 if (style == enc_utf8)
3590 { 3646 {
3591 freect = 1; 3647 freect = 1;
… …
3594 ct.value = (unsigned char *)rxvt_wcstoutf8 (cl, selectlen); 3650 ct.value = (unsigned char *)rxvt_wcstoutf8 (cl, selectlen);
3595 ct.nitems = strlen ((char *)ct.value); 3651 ct.nitems = strlen ((char *)ct.value);
3596 } 3652 }
3597 else 3653 else
3598#endif 3654#endif
3599 if (XwcTextListToTextProperty (disp, &cl, 1, (XICCEncodingStyle) style, &ct) >= 0) 3655 if (XwcTextListToTextProperty (dpy, &cl, 1, (XICCEncodingStyle) style, &ct) >= 0)
3600 freect = 1; 3656 freect = 1;
3601 else 3657 else
3602 { 3658 {
3603 /* if we failed to convert then send it raw */ 3659 /* if we failed to convert then send it raw */
3604 ct.value = (unsigned char *)cl; 3660 ct.value = (unsigned char *)cl;
3605 ct.nitems = selectlen; 3661 ct.nitems = selectlen;
3606 ct.encoding = target; 3662 ct.encoding = target;
3607 } 3663 }
3608 3664
3609 XChangeProperty (disp, rq.requestor, rq.property, 3665 XChangeProperty (dpy, rq.requestor, rq.property,
3610 ct.encoding, 8, PropModeReplace, 3666 ct.encoding, 8, PropModeReplace,
3611 ct.value, (int)ct.nitems); 3667 ct.value, (int)ct.nitems);
3612 ev.property = rq.property; 3668 ev.property = rq.property;
3613 3669
3614 if (freect) 3670 if (freect)
3615 XFree (ct.value); 3671 XFree (ct.value);
3616 } 3672 }
3617 3673
3618 XSendEvent (disp, rq.requestor, False, 0L, (XEvent *)&ev); 3674 XSendEvent (dpy, rq.requestor, False, 0L, (XEvent *)&ev);
3619} 3675}
3620 3676
3621/* ------------------------------------------------------------------------- * 3677/* ------------------------------------------------------------------------- *
3622 * MOUSE ROUTINES * 3678 * MOUSE ROUTINES *
3623 * ------------------------------------------------------------------------- */ 3679 * ------------------------------------------------------------------------- */
… …
3639void 3695void
3640rxvt_term::im_set_position (XPoint &pos) NOTHROW 3696rxvt_term::im_set_position (XPoint &pos) NOTHROW
3641{ 3697{
3642 XWindowAttributes xwa; 3698 XWindowAttributes xwa;
3643 3699
3644 XGetWindowAttributes (display->display, vt, &xwa); 3700 XGetWindowAttributes (dpy, vt, &xwa);
3645 3701
3646 pos.x = xwa.x + Col2Pixel (screen.cur.col); 3702 pos.x = xwa.x + Col2Pixel (screen.cur.col);
3647 pos.y = xwa.y + Height2Pixel (screen.cur.row) + fbase; 3703 pos.y = xwa.y + Height2Pixel (screen.cur.row) + fbase;
3648} 3704}
3649#endif 3705#endif
… …
3745rxvt_term::scr_overlay_set (int x, int y, const wchar_t *s) NOTHROW 3801rxvt_term::scr_overlay_set (int x, int y, const wchar_t *s) NOTHROW
3746{ 3802{
3747 while (*s) 3803 while (*s)
3748 { 3804 {
3749 text_t t = *s++; 3805 text_t t = *s++;
3750 int width = wcwidth (t); 3806 int width = WCWIDTH (t);
3751 3807
3752 while (width--) 3808 while (width--)
3753 { 3809 {
3754 scr_overlay_set (x++, y, t); 3810 scr_overlay_set (x++, y, t);
3755 t = NOCHAR; 3811 t = NOCHAR;

Diff Legend

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