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.241 by root, Thu Jan 19 17:37:01 2006 UTC vs.
Revision 1.267 by root, Thu Nov 2 17:23:50 2006 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>
… …
93 */ 93 */
94#define drawBuffer vt 94#define drawBuffer vt
95 95
96#define CLEAR_ROWS(row, num) \ 96#define CLEAR_ROWS(row, num) \
97 if (mapped) \ 97 if (mapped) \
98 XClearArea (display->display, drawBuffer, 0, \ 98 XClearArea (dpy, drawBuffer, 0, \
99 Row2Pixel (row), (unsigned int)width, \ 99 Row2Pixel (row), (unsigned int)width, \
100 (unsigned int)Height2Pixel (num), False) 100 (unsigned int)Height2Pixel (num), False)
101 101
102#define CLEAR_CHARS(x, y, num) \ 102#define CLEAR_CHARS(x, y, num) \
103 if (mapped) \ 103 if (mapped) \
104 XClearArea (display->display, drawBuffer, x, y, \ 104 XClearArea (dpy, drawBuffer, x, y, \
105 (unsigned int)Width2Pixel (num), \ 105 (unsigned int)Width2Pixel (num), \
106 (unsigned int)Height2Pixel (1), False) 106 (unsigned int)Height2Pixel (1), False)
107 107
108#define ERASE_ROWS(row, num) \ 108#define ERASE_ROWS(row, num) \
109 XFillRectangle (display->display, drawBuffer, gc, \ 109 XFillRectangle (dpy, drawBuffer, gc, \
110 0, Row2Pixel (row), \ 110 0, Row2Pixel (row), \
111 (unsigned int)width, \ 111 (unsigned int)width, \
112 (unsigned int)Height2Pixel (num)) 112 (unsigned int)Height2Pixel (num))
113 113
114/* ------------------------------------------------------------------------- * 114/* ------------------------------------------------------------------------- *
115 * SCREEN `COMMON' ROUTINES * 115 * SCREEN `COMMON' ROUTINES *
116 * ------------------------------------------------------------------------- */ 116 * ------------------------------------------------------------------------- */
117 117
118/* Fill part/all of a line with blanks. */ 118/* Fill part/all of a line with blanks. */
119void 119void
120rxvt_term::scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs) const 120rxvt_term::scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs) const NOTHROW
121{ 121{
122 if (!l.t) 122 if (!l.t)
123 { 123 {
124 lalloc (l); 124 lalloc (l);
125 col = 0; 125 col = 0;
126 width = ncol; 126 width = ncol;
127 } 127 }
128 128
129 l.touch (); 129 l.touch ();
130 130
131 efs &= ~RS_baseattrMask; 131 efs &= ~RS_baseattrMask; // remove italic etc. fontstyles
132 efs = SET_FONT (efs, FONTSET (efs)->find_font (' ')); 132 efs = SET_FONT (efs, FONTSET (efs)->find_font (' '));
133 133
134 text_t *et = l.t + col; 134 text_t *et = l.t + col;
135 rend_t *er = l.r + col; 135 rend_t *er = l.r + col;
136 136
… …
142} 142}
143 143
144/* ------------------------------------------------------------------------- */ 144/* ------------------------------------------------------------------------- */
145/* Fill a full line with blanks - make sure it is allocated first */ 145/* Fill a full line with blanks - make sure it is allocated first */
146void 146void
147rxvt_term::scr_blank_screen_mem (line_t &l, rend_t efs) const 147rxvt_term::scr_blank_screen_mem (line_t &l, rend_t efs) const NOTHROW
148{ 148{
149 scr_blank_line (l, 0, ncol, efs); 149 scr_blank_line (l, 0, ncol, efs);
150 150
151 l.l = 0; 151 l.l = 0;
152 l.f = 0; 152 l.f = 0;
… …
173 nrow = 24; 173 nrow = 24;
174 174
175 if (ncol == prev_ncol && nrow == prev_nrow) 175 if (ncol == prev_ncol && nrow == prev_nrow)
176 return; 176 return;
177 177
178 if (current_screen != PRIMARY)
179 scr_swap_screen ();
180
178 // we need at least two lines for wrapping to work correctly 181 // we need at least two lines for wrapping to work correctly
179 if (nrow + saveLines < 2) 182 while (nrow + saveLines < 2)
180 { 183 {
181 //TODO//FIXME 184 //TODO//FIXME
182 saveLines++; 185 saveLines++;
183 prev_nrow--; 186 prev_nrow--;
184 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
425/* ------------------------------------------------------------------------- */ 425/* ------------------------------------------------------------------------- */
426/* 426/*
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 () 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
… …
462 * Save and Restore cursor 465 * Save and Restore cursor
463 * XTERM_SEQ: Save cursor : ESC 7 466 * XTERM_SEQ: Save cursor : ESC 7
464 * XTERM_SEQ: Restore cursor: ESC 8 467 * XTERM_SEQ: Restore cursor: ESC 8
465 */ 468 */
466void 469void
467rxvt_term::scr_cursor (int mode) 470rxvt_term::scr_cursor (cursor_mode mode) NOTHROW
468{ 471{
469 screen_t *s; 472 screen_t *s;
470 473
471#if NSCREENS && !defined(NO_SECONDARY_SCREEN_CURSOR) 474#if NSCREENS && !defined(NO_SECONDARY_SCREEN_CURSOR)
472 if (current_screen == SECONDARY) 475 if (current_screen == SECONDARY)
… …
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) 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
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 545
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 () 566rxvt_term::scr_do_wrap () NOTHROW
558{ 567{
559 if (!(screen.flags & Screen_WrapNext)) 568 if (!(screen.flags & Screen_WrapNext))
560 return; 569 return;
561 570
562 screen.flags &= ~Screen_WrapNext; 571 screen.flags &= ~Screen_WrapNext;
… …
572/* ------------------------------------------------------------------------- */ 581/* ------------------------------------------------------------------------- */
573/* 582/*
574 * Change the colour for following text 583 * Change the colour for following text
575 */ 584 */
576void 585void
577rxvt_term::scr_color (unsigned int color, int fgbg) 586rxvt_term::scr_color (unsigned int color, int fgbg) NOTHROW
578{ 587{
579 if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR)) 588 if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR))
580 color = fgbg; 589 color = fgbg;
581 590
582 if (fgbg == Color_fg) 591 if (fgbg == Color_fg)
… …
588/* ------------------------------------------------------------------------- */ 597/* ------------------------------------------------------------------------- */
589/* 598/*
590 * Change the rendition style for following text 599 * Change the rendition style for following text
591 */ 600 */
592void 601void
593rxvt_term::scr_rendition (int set, int style) 602rxvt_term::scr_rendition (int set, int style) NOTHROW
594 { 603 {
595 if (set) 604 if (set)
596 rstyle |= style; 605 rstyle |= style;
597 else if (style == ~RS_None) 606 else if (style == ~RS_None)
598 rstyle = DEFAULT_RSTYLE; 607 rstyle = DEFAULT_RSTYLE;
… …
605 * Scroll text between <row1> and <row2> inclusive, by <count> lines 614 * Scroll text between <row1> and <row2> inclusive, by <count> lines
606 * count positive ==> scroll up 615 * count positive ==> scroll up
607 * count negative ==> scroll down 616 * count negative ==> scroll down
608 */ 617 */
609int 618int
610rxvt_term::scr_scroll_text (int row1, int row2, int count) 619rxvt_term::scr_scroll_text (int row1, int row2, int count) NOTHROW
611{ 620{
612 if (count == 0 || (row1 > row2)) 621 if (count == 0 || (row1 > row2))
613 return 0; 622 return 0;
614 623
615 want_refresh = 1; 624 want_refresh = 1;
… …
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.
… …
733/* ------------------------------------------------------------------------- */ 746/* ------------------------------------------------------------------------- */
734/* 747/*
735 * Add text given in <str> of length <len> to screen struct 748 * Add text given in <str> of length <len> to screen struct
736 */ 749 */
737void 750void
738rxvt_term::scr_add_lines (const wchar_t *str, int len, int minlines) 751rxvt_term::scr_add_lines (const wchar_t *str, int len, int minlines) NOTHROW
739{ 752{
740 if (len <= 0) /* sanity */ 753 if (len <= 0) /* sanity */
741 return; 754 return;
742 755
743 unsigned char checksel; 756 unsigned char checksel;
… …
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
… …
997/* 1011/*
998 * Process Backspace. Move back the cursor back a position, wrap if have to 1012 * Process Backspace. Move back the cursor back a position, wrap if have to
999 * XTERM_SEQ: CTRL-H 1013 * XTERM_SEQ: CTRL-H
1000 */ 1014 */
1001void 1015void
1002rxvt_term::scr_backspace () 1016rxvt_term::scr_backspace () NOTHROW
1003{ 1017{
1004 want_refresh = 1; 1018 want_refresh = 1;
1005 1019
1006 if (screen.cur.col == 0) 1020 if (screen.cur.col == 0)
1007 { 1021 {
… …
1025 * Process Horizontal Tab 1039 * Process Horizontal Tab
1026 * count: +ve = forward; -ve = backwards 1040 * count: +ve = forward; -ve = backwards
1027 * XTERM_SEQ: CTRL-I 1041 * XTERM_SEQ: CTRL-I
1028 */ 1042 */
1029void 1043void
1030rxvt_term::scr_tab (int count, bool ht) 1044rxvt_term::scr_tab (int count, bool ht) NOTHROW
1031{ 1045{
1032 int i, x; 1046 int i, x;
1033 1047
1034 want_refresh = 1; 1048 want_refresh = 1;
1035 i = x = screen.cur.col; 1049 i = x = screen.cur.col;
… …
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 () 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);
1111 else 1125 else
1112 scr_insdel_chars (1, INSERT); 1126 scr_insdel_chars (1, INSERT);
… …
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 () 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);
1128 else 1142 else
1129 { 1143 {
… …
1142/* ------------------------------------------------------------------------- */ 1156/* ------------------------------------------------------------------------- */
1143/* 1157/*
1144 * Goto Row/Column 1158 * Goto Row/Column
1145 */ 1159 */
1146void 1160void
1147rxvt_term::scr_gotorc (int row, int col, int relative) 1161rxvt_term::scr_gotorc (int row, int col, int relative) NOTHROW
1148{ 1162{
1149 want_refresh = 1; 1163 want_refresh = 1;
1150 ZERO_SCROLLBACK (); 1164 ZERO_SCROLLBACK ();
1151 1165
1152 screen.cur.col = relative & C_RELATIVE ? screen.cur.col + col : col; 1166 screen.cur.col = relative & C_RELATIVE ? screen.cur.col + col : col;
… …
1190/* ------------------------------------------------------------------------- */ 1204/* ------------------------------------------------------------------------- */
1191/* 1205/*
1192 * direction should be UP or DN 1206 * direction should be UP or DN
1193 */ 1207 */
1194void 1208void
1195rxvt_term::scr_index (enum page_dirn direction) 1209rxvt_term::scr_index (enum page_dirn direction) NOTHROW
1196{ 1210{
1197 int dirn; 1211 int dirn;
1198 1212
1199 want_refresh = 1; 1213 want_refresh = 1;
1200 ZERO_SCROLLBACK (); 1214 ZERO_SCROLLBACK ();
… …
1219 * XTERM_SEQ: Clear line to right: ESC [ 0 K 1233 * XTERM_SEQ: Clear line to right: ESC [ 0 K
1220 * XTERM_SEQ: Clear line to left : ESC [ 1 K 1234 * XTERM_SEQ: Clear line to left : ESC [ 1 K
1221 * XTERM_SEQ: Clear whole line : ESC [ 2 K 1235 * XTERM_SEQ: Clear whole line : ESC [ 2 K
1222 */ 1236 */
1223void 1237void
1224rxvt_term::scr_erase_line (int mode) 1238rxvt_term::scr_erase_line (int mode) NOTHROW
1225{ 1239{
1226 unsigned int col, num; 1240 unsigned int col, num;
1227 1241
1228 want_refresh = 1; 1242 want_refresh = 1;
1229 ZERO_SCROLLBACK (); 1243 ZERO_SCROLLBACK ();
… …
1273 * XTERM_SEQ: Clear screen after cursor : ESC [ 0 J 1287 * XTERM_SEQ: Clear screen after cursor : ESC [ 0 J
1274 * XTERM_SEQ: Clear screen before cursor: ESC [ 1 J 1288 * XTERM_SEQ: Clear screen before cursor: ESC [ 1 J
1275 * XTERM_SEQ: Clear whole screen : ESC [ 2 J 1289 * XTERM_SEQ: Clear whole screen : ESC [ 2 J
1276 */ 1290 */
1277void 1291void
1278rxvt_term::scr_erase_screen (int mode) 1292rxvt_term::scr_erase_screen (int mode) NOTHROW
1279{ 1293{
1280 int num; 1294 int num;
1281 int32_t row; 1295 int32_t row;
1282 rend_t ren; 1296 rend_t ren;
1283 XGCValues gcvalue; 1297 XGCValues gcvalue;
… …
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 () 1362rxvt_term::scr_erase_savelines () NOTHROW
1349{ 1363{
1350 want_refresh = 1; 1364 want_refresh = 1;
1351 ZERO_SCROLLBACK (); 1365 ZERO_SCROLLBACK ();
1352 1366
1353 top_row = 0; 1367 top_row = 0;
… …
1358/* 1372/*
1359 * Fill the screen with `E's 1373 * Fill the screen with `E's
1360 * XTERM_SEQ: Screen Alignment Test: ESC # 8 1374 * XTERM_SEQ: Screen Alignment Test: ESC # 8
1361 */ 1375 */
1362void 1376void
1363rxvt_term::scr_E () 1377rxvt_term::scr_E () NOTHROW
1364{ 1378{
1365 rend_t fs; 1379 rend_t fs;
1366 1380
1367 want_refresh = 1; 1381 want_refresh = 1;
1368 ZERO_SCROLLBACK (); 1382 ZERO_SCROLLBACK ();
… …
1389/* ------------------------------------------------------------------------- */ 1403/* ------------------------------------------------------------------------- */
1390/* 1404/*
1391 * Insert/Delete <count> lines 1405 * Insert/Delete <count> lines
1392 */ 1406 */
1393void 1407void
1394rxvt_term::scr_insdel_lines (int count, int insdel) 1408rxvt_term::scr_insdel_lines (int count, int insdel) NOTHROW
1395{ 1409{
1396 int end; 1410 int end;
1397 1411
1398 ZERO_SCROLLBACK (); 1412 ZERO_SCROLLBACK ();
1399 1413
… …
1419/* ------------------------------------------------------------------------- */ 1433/* ------------------------------------------------------------------------- */
1420/* 1434/*
1421 * Insert/Delete <count> characters from the current position 1435 * Insert/Delete <count> characters from the current position
1422 */ 1436 */
1423void 1437void
1424rxvt_term::scr_insdel_chars (int count, int insdel) 1438rxvt_term::scr_insdel_chars (int count, int insdel) NOTHROW
1425{ 1439{
1426 int col, row; 1440 int col, row;
1427 rend_t tr; 1441 rend_t tr;
1428 1442
1429 want_refresh = 1; 1443 want_refresh = 1;
… …
1517/* 1531/*
1518 * Set the scrolling region 1532 * Set the scrolling region
1519 * XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r 1533 * XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r
1520 */ 1534 */
1521void 1535void
1522rxvt_term::scr_scroll_region (int top, int bot) 1536rxvt_term::scr_scroll_region (int top, int bot) NOTHROW
1523{ 1537{
1524 max_it (top, 0); 1538 max_it (top, 0);
1525 min_it (bot, nrow - 1); 1539 min_it (bot, nrow - 1);
1526 1540
1527 if (top > bot) 1541 if (top > bot)
… …
1537 * Make the cursor visible/invisible 1551 * Make the cursor visible/invisible
1538 * XTERM_SEQ: Make cursor visible : ESC [ ? 25 h 1552 * XTERM_SEQ: Make cursor visible : ESC [ ? 25 h
1539 * XTERM_SEQ: Make cursor invisible: ESC [ ? 25 l 1553 * XTERM_SEQ: Make cursor invisible: ESC [ ? 25 l
1540 */ 1554 */
1541void 1555void
1542rxvt_term::scr_cursor_visible (int mode) 1556rxvt_term::scr_cursor_visible (int mode) NOTHROW
1543{ 1557{
1544 want_refresh = 1; 1558 want_refresh = 1;
1545 1559
1546 if (mode) 1560 if (mode)
1547 screen.flags |= Screen_VisibleCursor; 1561 screen.flags |= Screen_VisibleCursor;
… …
1554 * Set/unset automatic wrapping 1568 * Set/unset automatic wrapping
1555 * XTERM_SEQ: Set Wraparound : ESC [ ? 7 h 1569 * XTERM_SEQ: Set Wraparound : ESC [ ? 7 h
1556 * XTERM_SEQ: Unset Wraparound: ESC [ ? 7 l 1570 * XTERM_SEQ: Unset Wraparound: ESC [ ? 7 l
1557 */ 1571 */
1558void 1572void
1559rxvt_term::scr_autowrap (int mode) 1573rxvt_term::scr_autowrap (int mode) NOTHROW
1560{ 1574{
1561 if (mode) 1575 if (mode)
1562 screen.flags |= Screen_Autowrap; 1576 screen.flags |= Screen_Autowrap;
1563 else 1577 else
1564 screen.flags &= ~(Screen_Autowrap | Screen_WrapNext); 1578 screen.flags &= ~(Screen_Autowrap | Screen_WrapNext);
… …
1573 * and the cursor cannot be moved outside. 1587 * and the cursor cannot be moved outside.
1574 * XTERM_SEQ: Set Absolute: ESC [ ? 6 h 1588 * XTERM_SEQ: Set Absolute: ESC [ ? 6 h
1575 * XTERM_SEQ: Set Relative: ESC [ ? 6 l 1589 * XTERM_SEQ: Set Relative: ESC [ ? 6 l
1576 */ 1590 */
1577void 1591void
1578rxvt_term::scr_relative_origin (int mode) 1592rxvt_term::scr_relative_origin (int mode) NOTHROW
1579{ 1593{
1580 if (mode) 1594 if (mode)
1581 screen.flags |= Screen_Relative; 1595 screen.flags |= Screen_Relative;
1582 else 1596 else
1583 screen.flags &= ~Screen_Relative; 1597 screen.flags &= ~Screen_Relative;
… …
1590 * Set insert/replace mode 1604 * Set insert/replace mode
1591 * XTERM_SEQ: Set Insert mode : ESC [ ? 4 h 1605 * XTERM_SEQ: Set Insert mode : ESC [ ? 4 h
1592 * XTERM_SEQ: Set Replace mode: ESC [ ? 4 l 1606 * XTERM_SEQ: Set Replace mode: ESC [ ? 4 l
1593 */ 1607 */
1594void 1608void
1595rxvt_term::scr_insert_mode (int mode) 1609rxvt_term::scr_insert_mode (int mode) NOTHROW
1596{ 1610{
1597 if (mode) 1611 if (mode)
1598 screen.flags |= Screen_Insert; 1612 screen.flags |= Screen_Insert;
1599 else 1613 else
1600 screen.flags &= ~Screen_Insert; 1614 screen.flags &= ~Screen_Insert;
… …
1606 * XTERM_SEQ: Set tab at current column : ESC H 1620 * XTERM_SEQ: Set tab at current column : ESC H
1607 * XTERM_SEQ: Clear tab at current column: ESC [ 0 g 1621 * XTERM_SEQ: Clear tab at current column: ESC [ 0 g
1608 * XTERM_SEQ: Clear all tabs : ESC [ 3 g 1622 * XTERM_SEQ: Clear all tabs : ESC [ 3 g
1609 */ 1623 */
1610void 1624void
1611rxvt_term::scr_set_tab (int mode) 1625rxvt_term::scr_set_tab (int mode) NOTHROW
1612{ 1626{
1613 if (mode < 0) 1627 if (mode < 0)
1614 memset (tabs, 0, ncol * sizeof (char)); 1628 memset (tabs, 0, ncol * sizeof (char));
1615 else if (screen.cur.col < ncol) 1629 else if (screen.cur.col < ncol)
1616 tabs [screen.cur.col] = !!mode; 1630 tabs [screen.cur.col] = !!mode;
… …
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) 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
… …
1653/* 1672/*
1654 * Report current cursor position 1673 * Report current cursor position
1655 * XTERM_SEQ: Report position: ESC [ 6 n 1674 * XTERM_SEQ: Report position: ESC [ 6 n
1656 */ 1675 */
1657void 1676void
1658rxvt_term::scr_report_position () 1677rxvt_term::scr_report_position () NOTHROW
1659{ 1678{
1660 tt_printf ("\033[%d;%dR", screen.cur.row + 1, screen.cur.col + 1); 1679 tt_printf ("\033[%d;%dR", screen.cur.row + 1, screen.cur.col + 1);
1661} 1680}
1662 1681
1663/* ------------------------------------------------------------------------- * 1682/* ------------------------------------------------------------------------- *
… …
1666 1685
1667/* 1686/*
1668 * Set font style 1687 * Set font style
1669 */ 1688 */
1670void 1689void
1671rxvt_term::set_font_style () 1690rxvt_term::set_font_style () NOTHROW
1672{ 1691{
1673#if 0 1692#if 0
1674 switch (charsets [screen.charset]) 1693 switch (charsets [screen.charset])
1675 { 1694 {
1676 case '0': /* DEC Special Character & Line Drawing Set */ 1695 case '0': /* DEC Special Character & Line Drawing Set */
… …
1698 * XTERM_SEQ: Invoke G1 character set: CTRL-N 1717 * XTERM_SEQ: Invoke G1 character set: CTRL-N
1699 * XTERM_SEQ: Invoke G2 character set: ESC N 1718 * XTERM_SEQ: Invoke G2 character set: ESC N
1700 * XTERM_SEQ: Invoke G3 character set: ESC O 1719 * XTERM_SEQ: Invoke G3 character set: ESC O
1701 */ 1720 */
1702void 1721void
1703rxvt_term::scr_charset_choose (int set) 1722rxvt_term::scr_charset_choose (int set) NOTHROW
1704{ 1723{
1705 screen.charset = set; 1724 screen.charset = set;
1706 set_font_style (); 1725 set_font_style ();
1707} 1726}
1708 1727
… …
1714 * XTERM_SEQ: Set G2 character set: ESC * <C> 1733 * XTERM_SEQ: Set G2 character set: ESC * <C>
1715 * XTERM_SEQ: Set G3 character set: ESC + <C> 1734 * XTERM_SEQ: Set G3 character set: ESC + <C>
1716 * See set_font_style for possible values for <C> 1735 * See set_font_style for possible values for <C>
1717 */ 1736 */
1718void 1737void
1719rxvt_term::scr_charset_set (int set, unsigned int ch) 1738rxvt_term::scr_charset_set (int set, unsigned int ch) NOTHROW
1720{ 1739{
1721 charsets[set] = (unsigned char)ch; 1740 charsets[set] = (unsigned char)ch;
1722 set_font_style (); 1741 set_font_style ();
1723} 1742}
1724 1743
… …
1729 1748
1730/* 1749/*
1731 * refresh matching text. 1750 * refresh matching text.
1732 */ 1751 */
1733bool 1752bool
1734rxvt_term::scr_refresh_rend (rend_t mask, rend_t value) 1753rxvt_term::scr_refresh_rend (rend_t mask, rend_t value) NOTHROW
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 }
… …
1759 PART_END, 1777 PART_END,
1760 RC_COUNT 1778 RC_COUNT
1761}; 1779};
1762 1780
1763void 1781void
1764rxvt_term::scr_expose (int x, int y, int ewidth, int eheight, bool refresh) 1782rxvt_term::scr_expose (int x, int y, int ewidth, int eheight, bool refresh) NOTHROW
1765{ 1783{
1766 int i; 1784 int i;
1767 row_col_t rc[RC_COUNT]; 1785 row_col_t rc[RC_COUNT];
1768 1786
1769 if (!drawn_buf) /* sanity check */ 1787 if (!drawn_buf) /* sanity check */
… …
1803/* ------------------------------------------------------------------------- */ 1821/* ------------------------------------------------------------------------- */
1804/* 1822/*
1805 * Refresh the entire screen 1823 * Refresh the entire screen
1806 */ 1824 */
1807void 1825void
1808rxvt_term::scr_touch (bool refresh) 1826rxvt_term::scr_touch (bool refresh) NOTHROW
1809{ 1827{
1810 scr_expose (0, 0, width, height, refresh); 1828 scr_expose (0, 0, width, height, refresh);
1811} 1829}
1812 1830
1813/* ------------------------------------------------------------------------- */ 1831/* ------------------------------------------------------------------------- */
1814/* 1832/*
1815 * Move the display so that the line represented by scrollbar value Y is at 1833 * Move the display so that the line represented by scrollbar value Y is at
1816 * the top of the screen 1834 * the top of the screen
1817 */ 1835 */
1818void 1836void
1819rxvt_term::scr_move_to (int y, int len) 1837rxvt_term::scr_move_to (int y, int len) NOTHROW
1820{ 1838{
1821 scr_changeview ((top_row - nrow) * (len - y) / len + (nrow - 1)); 1839 scr_changeview ((top_row - nrow) * (len - y) / len + (nrow - 1));
1822} 1840}
1823 1841
1824/* ------------------------------------------------------------------------- */ 1842/* ------------------------------------------------------------------------- */
1825/* 1843/*
1826 * Page the screen up/down nlines 1844 * Page the screen up/down nlines
1827 * direction should be UP or DN 1845 * direction should be UP or DN
1828 */ 1846 */
1829bool 1847bool
1830rxvt_term::scr_page (enum page_dirn direction, int nlines) 1848rxvt_term::scr_page (enum page_dirn direction, int nlines) NOTHROW
1831{ 1849{
1832 int new_view_start = 1850 int new_view_start =
1833 direction == UP ? view_start - nlines 1851 direction == UP ? view_start - nlines
1834 : view_start + nlines; 1852 : view_start + nlines;
1835 1853
1836 return scr_changeview (new_view_start); 1854 return scr_changeview (new_view_start);
1837} 1855}
1838 1856
1839bool 1857bool
1840rxvt_term::scr_changeview (int new_view_start) 1858rxvt_term::scr_changeview (int new_view_start) NOTHROW
1841{ 1859{
1842 clamp_it (new_view_start, top_row, 0); 1860 clamp_it (new_view_start, top_row, 0);
1843 1861
1844 if (new_view_start == view_start) 1862 if (new_view_start == view_start)
1845 return false; 1863 return false;
… …
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
1856/* ------------------------------------------------------------------------- */ 1874#ifndef NO_BELL
1857void 1875void
1876rxvt_term::bell_cb (time_watcher &w)
1877{
1878 rvideo_bell = false;
1879 scr_rvideo_mode (rvideo_mode);
1880}
1881#endif
1882
1883/* ------------------------------------------------------------------------- */
1884void
1858rxvt_term::scr_bell () 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/* ------------------------------------------------------------------------- */
1883/* ARGSUSED */ 1911/* ARGSUSED */
1884void 1912void
1885rxvt_term::scr_printscreen (int fullhist) 1913rxvt_term::scr_printscreen (int fullhist) NOTHROW
1886{ 1914{
1887#ifdef PRINTPIPE 1915#ifdef PRINTPIPE
1888 int nrows, row_start; 1916 int nrows, row_start;
1889 FILE *fd; 1917 FILE *fd;
1890 1918
… …
1939 * Refresh the screen 1967 * Refresh the screen
1940 * drawn_text/drawn_rend contain the screen information before the update. 1968 * drawn_text/drawn_rend contain the screen information before the update.
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 () 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;
… …
1997 2025
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];
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
2002 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....) */
… …
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 }
… …
2390 num_scr = 0; 2441 num_scr = 0;
2391 num_scr_allow = 1; 2442 num_scr_allow = 1;
2392} 2443}
2393 2444
2394void 2445void
2395rxvt_term::scr_remap_chars (line_t &l) 2446rxvt_term::scr_remap_chars (line_t &l) NOTHROW
2396{ 2447{
2397 if (!l.t) 2448 if (!l.t)
2398 return; 2449 return;
2399 2450
2400 l.touch (); // maybe a bit of an overkill, but it's not performance-relevant 2451 l.touch (); // maybe a bit of an overkill, but it's not performance-relevant
… …
2402 for (int i = ncol; i--; ) 2453 for (int i = ncol; i--; )
2403 l.r[i] = SET_FONT (l.r[i], FONTSET (l.r[i])->find_font (l.t[i])); 2454 l.r[i] = SET_FONT (l.r[i], FONTSET (l.r[i])->find_font (l.t[i]));
2404} 2455}
2405 2456
2406void 2457void
2407rxvt_term::scr_remap_chars () 2458rxvt_term::scr_remap_chars () NOTHROW
2408{ 2459{
2409 for (int i = total_rows; i--; ) 2460 for (int i = total_rows; i--; )
2410 scr_remap_chars (row_buf [i]); 2461 scr_remap_chars (row_buf [i]);
2411 2462
2412 for (int i = nrow; i--; ) 2463 for (int i = nrow; i--; )
… …
2415 scr_remap_chars (swap_buf [i]); 2466 scr_remap_chars (swap_buf [i]);
2416 } 2467 }
2417} 2468}
2418 2469
2419void 2470void
2420rxvt_term::scr_recolour () 2471rxvt_term::scr_recolour () NOTHROW
2421{ 2472{
2422 if (1 2473 if (1
2423#if TRANSPARENT 2474#if TRANSPARENT
2424 && !am_transparent 2475 && !am_transparent
2425#endif 2476#endif
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 }
… …
2446 want_refresh = 1; 2497 want_refresh = 1;
2447} 2498}
2448 2499
2449/* ------------------------------------------------------------------------- */ 2500/* ------------------------------------------------------------------------- */
2450void 2501void
2451rxvt_term::scr_clear (bool really) 2502rxvt_term::scr_clear (bool really) NOTHROW
2452{ 2503{
2453 if (!mapped) 2504 if (!mapped)
2454 return; 2505 return;
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) 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{
2466 int view_end = view_start + nrow; 2517 int view_end = view_start + nrow;
2467 int row, col; 2518 int row, col;
2468 2519
2469 for (row = max (beg_row, view_start); row <= min (end_row, view_end); row++) 2520 for (row = max (beg_row, view_start); row <= min (end_row, view_end); row++)
… …
2481 srp[col] ^= rstyle2; 2532 srp[col] ^= rstyle2;
2482 } 2533 }
2483} 2534}
2484 2535
2485void 2536void
2486rxvt_term::scr_xor_span (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle) 2537rxvt_term::scr_xor_span (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle) NOTHROW
2487{ 2538{
2488 int view_end = view_start + nrow; 2539 int view_end = view_start + nrow;
2489 int row, col; 2540 int row, col;
2490 2541
2491 if (beg_row >= view_start) 2542 if (beg_row >= view_start)
… …
2508 srp[col] ^= rstyle; 2559 srp[col] ^= rstyle;
2509} 2560}
2510 2561
2511/* ------------------------------------------------------------------------- */ 2562/* ------------------------------------------------------------------------- */
2512void 2563void
2513rxvt_term::scr_reverse_selection () 2564rxvt_term::scr_reverse_selection () NOTHROW
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
… …
2534 * Dump the whole scrollback and screen to the passed filedescriptor. The 2585 * Dump the whole scrollback and screen to the passed filedescriptor. The
2535 * invoking routine must close the fd. 2586 * invoking routine must close the fd.
2536 */ 2587 */
2537#if 0 2588#if 0
2538void 2589void
2539rxvt_term::scr_dump (int fd) 2590rxvt_term::scr_dump (int fd) NOTHROW
2540{ 2591{
2541 int row, wrote; 2592 int row, wrote;
2542 unsigned int width, towrite; 2593 unsigned int width, towrite;
2543 char r1[] = "\n"; 2594 char r1[] = "\n";
2544 2595
… …
2563 2614
2564/* ------------------------------------------------------------------------- * 2615/* ------------------------------------------------------------------------- *
2565 * CHARACTER SELECTION * 2616 * CHARACTER SELECTION *
2566 * ------------------------------------------------------------------------- */ 2617 * ------------------------------------------------------------------------- */
2567void 2618void
2568rxvt_term::selection_check (int check_more) 2619rxvt_term::selection_check (int check_more) NOTHROW
2569{ 2620{
2570 row_col_t pos; 2621 row_col_t pos;
2571 2622
2572 if (!selection.op) 2623 if (!selection.op)
2573 return; 2624 return;
… …
2594/* ------------------------------------------------------------------------- */ 2645/* ------------------------------------------------------------------------- */
2595/* 2646/*
2596 * Paste a selection direct to the command fd 2647 * Paste a selection direct to the command fd
2597 */ 2648 */
2598void 2649void
2599rxvt_term::paste (char *data, unsigned int len) 2650rxvt_term::paste (char *data, unsigned int len) NOTHROW
2600{ 2651{
2601 /* convert normal newline chars into common keyboard Return key sequence */ 2652 /* convert normal newline chars into common keyboard Return key sequence */
2602 for (unsigned int i = 0; i < len; i++) 2653 for (unsigned int i = 0; i < len; i++)
2603 if (data[i] == C0_LF) 2654 if (data[i] == C0_LF)
2604 data[i] = C0_CR; 2655 data[i] = C0_CR;
… …
2610/* 2661/*
2611 * Respond to a notification that a primary selection has been sent 2662 * Respond to a notification that a primary selection has been sent
2612 * EXT: SelectionNotify 2663 * EXT: SelectionNotify
2613 */ 2664 */
2614void 2665void
2615rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop) 2666rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop) NOTHROW
2616{ 2667{
2617 if (prop == None) /* check for failed XConvertSelection */ 2668 if (prop == None) /* check for failed XConvertSelection */
2618 { 2669 {
2619 if ((selection_type & Sel_CompoundText)) 2670 if ((selection_type & Sel_CompoundText))
2620 { 2671 {
… …
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
… …
2772 if (selection_wait == Sel_normal) 2823 if (selection_wait == Sel_normal)
2773 selection_wait = Sel_none; 2824 selection_wait = Sel_none;
2774} 2825}
2775 2826
2776void 2827void
2777rxvt_term::incr_cb (time_watcher &w) 2828rxvt_term::incr_cb (time_watcher &w) NOTHROW
2778{ 2829{
2779 selection_wait = Sel_none; 2830 selection_wait = Sel_none;
2780 2831
2781 incr_buf_size = 0; 2832 incr_buf_size = 0;
2782 free (incr_buf); 2833 free (incr_buf);
2783 2834
2784 rxvt_warn ("data loss: timeout on INCR selection paste, ignoring.\n"); 2835 rxvt_warn ("data loss: timeout on INCR selection paste, ignoring.\n");
2785} 2836}
2786 2837
2787void 2838void
2788rxvt_term::selection_property (Window win, Atom prop) 2839rxvt_term::selection_property (Window win, Atom prop) NOTHROW
2789{ 2840{
2790 if (prop == None || selection_wait != Sel_incr) 2841 if (prop == None || selection_wait != Sel_incr)
2791 return; 2842 return;
2792 2843
2793 selection_paste (win, prop, true); 2844 selection_paste (win, prop, true);
… …
2802 * (+) if ownership is claimed but property is empty, rxvt_selection_paste () 2853 * (+) if ownership is claimed but property is empty, rxvt_selection_paste ()
2803 * will auto fallback to CUT_BUFFER0 2854 * will auto fallback to CUT_BUFFER0
2804 * EXT: button 2 release 2855 * EXT: button 2 release
2805 */ 2856 */
2806void 2857void
2807rxvt_term::selection_request (Time tm) 2858rxvt_term::selection_request (Time tm, int selnum) NOTHROW
2808{ 2859{
2809 if (selection.text) 2860 if (selection.text && selnum == Sel_Primary)
2810 { /* internal selection */ 2861 { /* internal selection */
2811 char *str = rxvt_wcstombs (selection.text, selection.len); 2862 char *str = rxvt_wcstombs (selection.text, selection.len);
2812 paste (str, strlen (str)); 2863 paste (str, strlen (str));
2813 free (str); 2864 free (str);
2814 return; 2865 return;
2815 } 2866 }
2816 else 2867 else
2817 { 2868 {
2818 int i;
2819
2820 selection_request_time = tm; 2869 selection_request_time = tm;
2821 selection_wait = Sel_normal; 2870 selection_wait = Sel_normal;
2822 2871
2823 for (i = Sel_Primary; i <= Sel_Clipboard; i++)
2824 {
2825#if X_HAVE_UTF8_STRING 2872#if X_HAVE_UTF8_STRING
2826 selection_type = Sel_UTF8String; 2873 selection_type = Sel_UTF8String;
2827 if (selection_request_other (xa[XA_UTF8_STRING], i)) 2874 if (selection_request_other (xa[XA_UTF8_STRING], selnum))
2828 return; 2875 return;
2829#else 2876#else
2830 selection_type = Sel_CompoundText; 2877 selection_type = Sel_CompoundText;
2831 if (selection_request_other (xa[XA_COMPOUND_TEXT], i)) 2878 if (selection_request_other (xa[XA_COMPOUND_TEXT], selnum))
2832 return; 2879 return;
2833#endif 2880#endif
2834 }
2835 } 2881 }
2836 2882
2837 selection_wait = Sel_none; /* don't loop in selection_paste () */ 2883 selection_wait = Sel_none; /* don't loop in selection_paste () */
2838 selection_paste (display->root, XA_CUT_BUFFER0, false); 2884 selection_paste (display->root, XA_CUT_BUFFER0, false);
2839} 2885}
2840 2886
2841int 2887int
2842rxvt_term::selection_request_other (Atom target, int selnum) 2888rxvt_term::selection_request_other (Atom target, int selnum) NOTHROW
2843{ 2889{
2844 Atom sel; 2890 Atom sel;
2845 2891
2846 selection_type |= selnum; 2892 selection_type |= selnum;
2847 2893
… …
2850 else if (selnum == Sel_Secondary) 2896 else if (selnum == Sel_Secondary)
2851 sel = XA_SECONDARY; 2897 sel = XA_SECONDARY;
2852 else 2898 else
2853 sel = xa[XA_CLIPBOARD]; 2899 sel = xa[XA_CLIPBOARD];
2854 2900
2855 if (XGetSelectionOwner (display->display, sel) != None) 2901 if (XGetSelectionOwner (dpy, sel) != None)
2856 { 2902 {
2857 XConvertSelection (display->display, sel, target, xa[XA_VT_SELECTION], 2903 XConvertSelection (dpy, sel, target, xa[XA_VT_SELECTION],
2858 vt, selection_request_time); 2904 vt, selection_request_time);
2859 return 1; 2905 return 1;
2860 } 2906 }
2861 2907
2862 return 0; 2908 return 0;
… …
2866/* 2912/*
2867 * Clear all selected text 2913 * Clear all selected text
2868 * EXT: SelectionClear 2914 * EXT: SelectionClear
2869 */ 2915 */
2870void 2916void
2871rxvt_term::selection_clear () 2917rxvt_term::selection_clear () NOTHROW
2872{ 2918{
2873 want_refresh = 1; 2919 want_refresh = 1;
2874 free (selection.text); 2920 free (selection.text);
2875 selection.text = NULL; 2921 selection.text = NULL;
2876 selection.len = 0; 2922 selection.len = 0;
… …
2925 2971
2926 int end_col; 2972 int end_col;
2927 2973
2928 for (; row <= selection.end.row; row++, col = 0) 2974 for (; row <= selection.end.row; row++, col = 0)
2929 { 2975 {
2930#if ENABLE_FRILLS 2976#if !ENABLE_MINIMAL
2931 if (selection.rect) 2977 if (selection.rect)
2932 { 2978 {
2933 col = selection.beg.col; 2979 col = selection.beg.col;
2934 end_col = ncol + 1; 2980 end_col = ncol + 1;
2935 } 2981 }
… …
2938 end_col = ROW(row).l; 2984 end_col = ROW(row).l;
2939 2985
2940 col = max (col, 0); 2986 col = max (col, 0);
2941 2987
2942 if (row == selection.end.row 2988 if (row == selection.end.row
2943#if ENABLE_FRILLS 2989#if !ENABLE_MINIMAL
2944 || selection.rect 2990 || selection.rect
2945#endif 2991#endif
2946 ) 2992 )
2947 min_it (end_col, selection.end.col); 2993 min_it (end_col, selection.end.col);
2948 2994
… …
2971#endif 3017#endif
2972 else 3018 else
2973 new_selection_text[ofs++] = *t++; 3019 new_selection_text[ofs++] = *t++;
2974 } 3020 }
2975 3021
2976#if ENABLE_FRILLS 3022#if !ENABLE_MINIMAL
2977 if (selection.rect) 3023 if (selection.rect)
2978 { 3024 {
2979 while (ofs 3025 while (ofs
2980 && new_selection_text[ofs - 1] != C0_LF 3026 && new_selection_text[ofs - 1] != C0_LF
2981 && unicode::is_space (new_selection_text[ofs - 1])) 3027 && unicode::is_space (new_selection_text[ofs - 1]))
… …
3011 3057
3012 selection_grab (tm); 3058 selection_grab (tm);
3013} 3059}
3014 3060
3015bool 3061bool
3016rxvt_term::selection_grab (Time tm) 3062rxvt_term::selection_grab (Time tm) NOTHROW
3017{ 3063{
3018 selection_time = tm; 3064 selection_time = tm;
3019 3065
3020 XSetSelectionOwner (display->display, XA_PRIMARY, vt, tm); 3066 XSetSelectionOwner (dpy, XA_PRIMARY, vt, tm);
3021 if (XGetSelectionOwner (display->display, XA_PRIMARY) == vt) 3067 if (XGetSelectionOwner (dpy, XA_PRIMARY) == vt)
3022 { 3068 {
3023 display->set_selection_owner (this); 3069 display->set_selection_owner (this);
3024 return true; 3070 return true;
3025 } 3071 }
3026 else 3072 else
… …
3030 } 3076 }
3031 3077
3032#if 0 3078#if 0
3033 XTextProperty ct; 3079 XTextProperty ct;
3034 3080
3035 if (XwcTextListToTextProperty (display->display, &selection.text, 1, XStringStyle, &ct) >= 0) 3081 if (XwcTextListToTextProperty (dpy, &selection.text, 1, XStringStyle, &ct) >= 0)
3036 { 3082 {
3037 set_string_property (XA_CUT_BUFFER0, ct.value, ct.nitems); 3083 set_string_property (XA_CUT_BUFFER0, ct.value, ct.nitems);
3038 XFree (ct.value); 3084 XFree (ct.value);
3039 } 3085 }
3040#endif 3086#endif
… …
3044/* 3090/*
3045 * Mark or select text based upon number of clicks: 1, 2, or 3 3091 * Mark or select text based upon number of clicks: 1, 2, or 3
3046 * EXT: button 1 press 3092 * EXT: button 1 press
3047 */ 3093 */
3048void 3094void
3049rxvt_term::selection_click (int clicks, int x, int y) 3095rxvt_term::selection_click (int clicks, int x, int y) NOTHROW
3050{ 3096{
3051 clicks = ((clicks - 1) % 3) + 1; 3097 clicks = ((clicks - 1) % 3) + 1;
3052 selection.clicks = clicks; /* save clicks so extend will work */ 3098 selection.clicks = clicks; /* save clicks so extend will work */
3053 3099
3054 if (clicks == 2 && !selection.rect 3100 if (clicks == 2 && !selection.rect
… …
3073/* ------------------------------------------------------------------------- */ 3119/* ------------------------------------------------------------------------- */
3074/* 3120/*
3075 * Mark a selection at the specified col/row 3121 * Mark a selection at the specified col/row
3076 */ 3122 */
3077void 3123void
3078rxvt_term::selection_start_colrow (int col, int row) 3124rxvt_term::selection_start_colrow (int col, int row) NOTHROW
3079{ 3125{
3080 want_refresh = 1; 3126 want_refresh = 1;
3081 3127
3082 selection.mark.row = row + view_start; 3128 selection.mark.row = row + view_start;
3083 selection.mark.col = col; 3129 selection.mark.col = col;
… …
3109#define DELIMIT_TEXT(x) \ 3155#define DELIMIT_TEXT(x) \
3110 (unicode::is_space (x) ? 2 : (x) <= 0xff && !!strchr (rs[Rs_cutchars], (x))) 3156 (unicode::is_space (x) ? 2 : (x) <= 0xff && !!strchr (rs[Rs_cutchars], (x)))
3111#define DELIMIT_REND(x) 1 3157#define DELIMIT_REND(x) 1
3112 3158
3113void 3159void
3114rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) 3160rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) NOTHROW
3115{ 3161{
3116 int col, row, dirnadd, tcol, trow, w1, w2; 3162 int col, row, dirnadd, tcol, trow, w1, w2;
3117 row_col_t bound; 3163 row_col_t bound;
3118 text_t *stp; 3164 text_t *stp;
3119 rend_t *srp; 3165 rend_t *srp;
… …
3193 * flag == 0 ==> button 1 3239 * flag == 0 ==> button 1
3194 * flag == 1 ==> button 3 press 3240 * flag == 1 ==> button 3 press
3195 * flag == 2 ==> button 3 motion 3241 * flag == 2 ==> button 3 motion
3196 */ 3242 */
3197void 3243void
3198rxvt_term::selection_extend (int x, int y, int flag) 3244rxvt_term::selection_extend (int x, int y, int flag) NOTHROW
3199{ 3245{
3200 int col = clamp (Pixel2Col (x), 0, ncol); 3246 int col = clamp (Pixel2Col (x), 0, ncol);
3201 int row = clamp (Pixel2Row (y), 0, nrow - 1); 3247 int row = clamp (Pixel2Row (y), 0, nrow - 1);
3202 3248
3203 /* 3249 /*
… …
3229/* ------------------------------------------------------------------------- */ 3275/* ------------------------------------------------------------------------- */
3230/* 3276/*
3231 * Extend the selection to the specified col/row 3277 * Extend the selection to the specified col/row
3232 */ 3278 */
3233void 3279void
3234rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) 3280rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) NOTHROW
3235{ 3281{
3236 row_col_t pos; 3282 row_col_t pos;
3237 enum { 3283 enum {
3238 LEFT, RIGHT 3284 LEFT, RIGHT
3239 } closeto = RIGHT; 3285 } closeto = RIGHT;
… …
3342 3388
3343 if (selection.clicks == 1) 3389 if (selection.clicks == 1)
3344 { 3390 {
3345 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
3346 && !ROW(selection.beg.row).is_longer () 3392 && !ROW(selection.beg.row).is_longer ()
3347#if ENABLE_FRILLS 3393#if !ENABLE_MINIMAL
3348 && !selection.rect 3394 && !selection.rect
3349#endif 3395#endif
3350 ) 3396 )
3351 selection.beg.col = ncol; 3397 selection.beg.col = ncol;
3352 3398
3353 if ( 3399 if (
3354 selection.end.col > ROW(selection.end.row).l //TODO//FIXME//LEN 3400 selection.end.col > ROW(selection.end.row).l //TODO//FIXME//LEN
3355 && !ROW(selection.end.row).is_longer () 3401 && !ROW(selection.end.row).is_longer ()
3356#if ENABLE_FRILLS 3402#if !ENABLE_MINIMAL
3357 && !selection.rect 3403 && !selection.rect
3358#endif 3404#endif
3359 ) 3405 )
3360 selection.end.col = ncol; 3406 selection.end.col = ncol;
3361 } 3407 }
… …
3378 { 3424 {
3379 if (!ROW(end_row).is_longer ()) 3425 if (!ROW(end_row).is_longer ())
3380 { 3426 {
3381 selection.end.row = end_row; 3427 selection.end.row = end_row;
3382 selection.end.col = ROW(end_row).l; 3428 selection.end.col = ROW(end_row).l;
3429# if !ENABLE_MINIMAL
3383 selection_remove_trailing_spaces (); 3430 selection_remove_trailing_spaces ();
3431# endif
3384 break; 3432 break;
3385 } 3433 }
3386 } 3434 }
3387 } 3435 }
3388 else 3436 else
… …
3417 selection.mark.row = selection.beg.row; 3465 selection.mark.row = selection.beg.row;
3418 selection.mark.col = selection.beg.col; 3466 selection.mark.col = selection.beg.col;
3419 } 3467 }
3420 } 3468 }
3421 3469
3422#if ENABLE_FRILLS 3470#if !ENABLE_MINIMAL
3423 if (selection.rect && selection.beg.col > selection.end.col) 3471 if (selection.rect && selection.beg.col > selection.end.col)
3424 ::swap (selection.beg.col, selection.end.col); 3472 ::swap (selection.beg.col, selection.end.col);
3425#endif 3473#endif
3426} 3474}
3427 3475
3428#if ENABLE_FRILLS 3476#if !ENABLE_MINIMAL
3429void 3477void
3430rxvt_term::selection_remove_trailing_spaces () 3478rxvt_term::selection_remove_trailing_spaces () NOTHROW
3431{ 3479{
3432 int32_t end_col, end_row; 3480 int32_t end_col, end_row;
3433 text_t *stp; 3481 text_t *stp;
3434 3482
3435 end_col = selection.end.col; 3483 end_col = selection.end.col;
… …
3473/* 3521/*
3474 * Double click on button 3 when already selected 3522 * Double click on button 3 when already selected
3475 * EXT: button 3 double click 3523 * EXT: button 3 double click
3476 */ 3524 */
3477void 3525void
3478rxvt_term::selection_rotate (int x, int y) 3526rxvt_term::selection_rotate (int x, int y) NOTHROW
3479{ 3527{
3480 selection.clicks = selection.clicks % 3 + 1; 3528 selection.clicks = selection.clicks % 3 + 1;
3481 selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1); 3529 selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1);
3482} 3530}
3483 3531
… …
3485/* 3533/*
3486 * Respond to a request for our current selection 3534 * Respond to a request for our current selection
3487 * EXT: SelectionRequest 3535 * EXT: SelectionRequest
3488 */ 3536 */
3489void 3537void
3490rxvt_term::selection_send (const XSelectionRequestEvent &rq) 3538rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW
3491{ 3539{
3492 XSelectionEvent ev; 3540 XSelectionEvent ev;
3493 dDisp;
3494 3541
3495 ev.type = SelectionNotify; 3542 ev.type = SelectionNotify;
3496 ev.property = None; 3543 ev.property = None;
3497 ev.display = rq.display; 3544 ev.display = rq.display;
3498 ev.requestor = rq.requestor; 3545 ev.requestor = rq.requestor;
… …
3512 *target++ = xa[XA_COMPOUND_TEXT]; 3559 *target++ = xa[XA_COMPOUND_TEXT];
3513#if X_HAVE_UTF8_STRING 3560#if X_HAVE_UTF8_STRING
3514 *target++ = xa[XA_UTF8_STRING]; 3561 *target++ = xa[XA_UTF8_STRING];
3515#endif 3562#endif
3516 3563
3517 XChangeProperty (disp, rq.requestor, rq.property, XA_ATOM, 3564 XChangeProperty (dpy, rq.requestor, rq.property, XA_ATOM,
3518 32, PropModeReplace, 3565 32, PropModeReplace,
3519 (unsigned char *)target_list, target - target_list); 3566 (unsigned char *)target_list, target - target_list);
3520 ev.property = rq.property; 3567 ev.property = rq.property;
3521 } 3568 }
3522#if TODO // TODO 3569#if TODO // TODO
… …
3525 /* TODO: Handle MULTIPLE */ 3572 /* TODO: Handle MULTIPLE */
3526 } 3573 }
3527#endif 3574#endif
3528 else if (rq.target == xa[XA_TIMESTAMP] && selection.text) 3575 else if (rq.target == xa[XA_TIMESTAMP] && selection.text)
3529 { 3576 {
3530 XChangeProperty (disp, rq.requestor, rq.property, rq.target, 3577 XChangeProperty (dpy, rq.requestor, rq.property, rq.target,
3531 32, PropModeReplace, (unsigned char *)&selection_time, 1); 3578 32, PropModeReplace, (unsigned char *)&selection_time, 1);
3532 ev.property = rq.property; 3579 ev.property = rq.property;
3533 } 3580 }
3534 else if (rq.target == XA_STRING 3581 else if (rq.target == XA_STRING
3535 || rq.target == xa[XA_TEXT] 3582 || rq.target == xa[XA_TEXT]
… …
3559 style = enc_string; 3606 style = enc_string;
3560 else if (target == xa[XA_TEXT]) 3607 else if (target == xa[XA_TEXT])
3561 style = enc_text; 3608 style = enc_text;
3562 else if (target == xa[XA_COMPOUND_TEXT]) 3609 else if (target == xa[XA_COMPOUND_TEXT])
3563 style = enc_compound_text; 3610 style = enc_compound_text;
3564#if ENABLE_FRILLS 3611#if !ENABLE_MINIMAL
3565 else if (target == xa[XA_UTF8_STRING]) 3612 else if (target == xa[XA_UTF8_STRING])
3566 style = enc_utf8; 3613 style = enc_utf8;
3567#endif 3614#endif
3568 else 3615 else
3569 { 3616 {
… …
3580 { 3627 {
3581 cl = L""; 3628 cl = L"";
3582 selectlen = 0; 3629 selectlen = 0;
3583 } 3630 }
3584 3631
3585#if ENABLE_FRILLS 3632#if !ENABLE_MINIMAL
3586 // 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
3587 // so recode it manually 3634 // so recode it manually
3588 if (style == enc_utf8) 3635 if (style == enc_utf8)
3589 { 3636 {
3590 freect = 1; 3637 freect = 1;
… …
3593 ct.value = (unsigned char *)rxvt_wcstoutf8 (cl, selectlen); 3640 ct.value = (unsigned char *)rxvt_wcstoutf8 (cl, selectlen);
3594 ct.nitems = strlen ((char *)ct.value); 3641 ct.nitems = strlen ((char *)ct.value);
3595 } 3642 }
3596 else 3643 else
3597#endif 3644#endif
3598 if (XwcTextListToTextProperty (disp, &cl, 1, (XICCEncodingStyle) style, &ct) >= 0) 3645 if (XwcTextListToTextProperty (dpy, &cl, 1, (XICCEncodingStyle) style, &ct) >= 0)
3599 freect = 1; 3646 freect = 1;
3600 else 3647 else
3601 { 3648 {
3602 /* if we failed to convert then send it raw */ 3649 /* if we failed to convert then send it raw */
3603 ct.value = (unsigned char *)cl; 3650 ct.value = (unsigned char *)cl;
3604 ct.nitems = selectlen; 3651 ct.nitems = selectlen;
3605 ct.encoding = target; 3652 ct.encoding = target;
3606 } 3653 }
3607 3654
3608 XChangeProperty (disp, rq.requestor, rq.property, 3655 XChangeProperty (dpy, rq.requestor, rq.property,
3609 ct.encoding, 8, PropModeReplace, 3656 ct.encoding, 8, PropModeReplace,
3610 ct.value, (int)ct.nitems); 3657 ct.value, (int)ct.nitems);
3611 ev.property = rq.property; 3658 ev.property = rq.property;
3612 3659
3613 if (freect) 3660 if (freect)
3614 XFree (ct.value); 3661 XFree (ct.value);
3615 } 3662 }
3616 3663
3617 XSendEvent (disp, rq.requestor, False, 0L, (XEvent *)&ev); 3664 XSendEvent (dpy, rq.requestor, False, 0L, (XEvent *)&ev);
3618} 3665}
3619 3666
3620/* ------------------------------------------------------------------------- * 3667/* ------------------------------------------------------------------------- *
3621 * MOUSE ROUTINES * 3668 * MOUSE ROUTINES *
3622 * ------------------------------------------------------------------------- */ 3669 * ------------------------------------------------------------------------- */
3623 3670
3624/* 3671/*
3625 * return col/row values corresponding to x/y pixel values 3672 * return col/row values corresponding to x/y pixel values
3626 */ 3673 */
3627void 3674void
3628rxvt_term::pixel_position (int *x, int *y) 3675rxvt_term::pixel_position (int *x, int *y) NOTHROW
3629{ 3676{
3630 *x = Pixel2Col (*x); 3677 *x = Pixel2Col (*x);
3631 /* max_it (*x, 0); min_it (*x, (int)ncol - 1); */ 3678 /* max_it (*x, 0); min_it (*x, (int)ncol - 1); */
3632 *y = Pixel2Row (*y); 3679 *y = Pixel2Row (*y);
3633 /* max_it (*y, 0); min_it (*y, (int)nrow - 1); */ 3680 /* max_it (*y, 0); min_it (*y, (int)nrow - 1); */
3634} 3681}
3635 3682
3636/* ------------------------------------------------------------------------- */ 3683/* ------------------------------------------------------------------------- */
3637#ifdef USE_XIM 3684#ifdef USE_XIM
3638void 3685void
3639rxvt_term::im_set_position (XPoint &pos) 3686rxvt_term::im_set_position (XPoint &pos) NOTHROW
3640{ 3687{
3641 XWindowAttributes xwa; 3688 XWindowAttributes xwa;
3642 3689
3643 XGetWindowAttributes (display->display, vt, &xwa); 3690 XGetWindowAttributes (dpy, vt, &xwa);
3644 3691
3645 pos.x = xwa.x + Col2Pixel (screen.cur.col); 3692 pos.x = xwa.x + Col2Pixel (screen.cur.col);
3646 pos.y = xwa.y + Height2Pixel (screen.cur.row) + fbase; 3693 pos.y = xwa.y + Height2Pixel (screen.cur.row) + fbase;
3647} 3694}
3648#endif 3695#endif
3649 3696
3650#if ENABLE_OVERLAY 3697#if ENABLE_OVERLAY
3651void 3698void
3652rxvt_term::scr_overlay_new (int x, int y, int w, int h) 3699rxvt_term::scr_overlay_new (int x, int y, int w, int h) NOTHROW
3653{ 3700{
3654 if (nrow < 1 || ncol < 1) 3701 if (nrow < 1 || ncol < 1)
3655 return; 3702 return;
3656 3703
3657 want_refresh = 1; 3704 want_refresh = 1;
… …
3702 *rp = r; 3749 *rp = r;
3703 } 3750 }
3704} 3751}
3705 3752
3706void 3753void
3707rxvt_term::scr_overlay_off () 3754rxvt_term::scr_overlay_off () NOTHROW
3708{ 3755{
3709 if (!ov_text) 3756 if (!ov_text)
3710 return; 3757 return;
3711 3758
3712 want_refresh = 1; 3759 want_refresh = 1;
… …
3720 delete [] ov_text; ov_text = 0; 3767 delete [] ov_text; ov_text = 0;
3721 delete [] ov_rend; ov_rend = 0; 3768 delete [] ov_rend; ov_rend = 0;
3722} 3769}
3723 3770
3724void 3771void
3725rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) 3772rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) NOTHROW
3726{ 3773{
3727 if (!ov_text || x >= ov_w - 2 || y >= ov_h - 2) 3774 if (!ov_text || x >= ov_w - 2 || y >= ov_h - 2)
3728 return; 3775 return;
3729 3776
3730 x++, y++; 3777 x++, y++;
… …
3732 ov_text[y][x] = text; 3779 ov_text[y][x] = text;
3733 ov_rend[y][x] = rend; 3780 ov_rend[y][x] = rend;
3734} 3781}
3735 3782
3736void 3783void
3737rxvt_term::scr_overlay_set (int x, int y, const char *s) 3784rxvt_term::scr_overlay_set (int x, int y, const char *s) NOTHROW
3738{ 3785{
3739 while (*s) 3786 while (*s)
3740 scr_overlay_set (x++, y, *s++); 3787 scr_overlay_set (x++, y, *s++);
3741} 3788}
3742 3789
3743void 3790void
3744rxvt_term::scr_overlay_set (int x, int y, const wchar_t *s) 3791rxvt_term::scr_overlay_set (int x, int y, const wchar_t *s) NOTHROW
3745{ 3792{
3746 while (*s) 3793 while (*s)
3747 { 3794 {
3748 text_t t = *s++; 3795 text_t t = *s++;
3749 int width = wcwidth (t); 3796 int width = WCWIDTH (t);
3750 3797
3751 while (width--) 3798 while (width--)
3752 { 3799 {
3753 scr_overlay_set (x++, y, t); 3800 scr_overlay_set (x++, y, t);
3754 t = NOCHAR; 3801 t = NOCHAR;
3755 } 3802 }
3756 } 3803 }
3757} 3804}
3758 3805
3759void 3806void
3760rxvt_term::scr_swap_overlay () 3807rxvt_term::scr_swap_overlay () NOTHROW
3761{ 3808{
3762 if (!ov_text) 3809 if (!ov_text)
3763 return; 3810 return;
3764 3811
3765 // swap screen mem with overlay 3812 // swap screen mem with overlay

Diff Legend

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