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.239 by root, Thu Jan 19 17:14:46 2006 UTC vs.
Revision 1.254 by root, Sat Jan 28 14:23:16 2006 UTC

… …
93 */ 93 */
94#define drawBuffer vt 94#define drawBuffer vt
95 95
96#define CLEAR_ROWS(row, num) \ 96#define CLEAR_ROWS(row, num) \
97 if (mapped) \ 97 if (mapped) \
98 XClearArea (display->display, drawBuffer, 0, \ 98 XClearArea (xdisp, drawBuffer, 0, \
99 Row2Pixel (row), (unsigned int)width, \ 99 Row2Pixel (row), (unsigned int)width, \
100 (unsigned int)Height2Pixel (num), False) 100 (unsigned int)Height2Pixel (num), False)
101 101
102#define CLEAR_CHARS(x, y, num) \ 102#define CLEAR_CHARS(x, y, num) \
103 if (mapped) \ 103 if (mapped) \
104 XClearArea (display->display, drawBuffer, x, y, \ 104 XClearArea (xdisp, drawBuffer, x, y, \
105 (unsigned int)Width2Pixel (num), \ 105 (unsigned int)Width2Pixel (num), \
106 (unsigned int)Height2Pixel (1), False) 106 (unsigned int)Height2Pixel (1), False)
107 107
108#define ERASE_ROWS(row, num) \ 108#define ERASE_ROWS(row, num) \
109 XFillRectangle (display->display, drawBuffer, gc, \ 109 XFillRectangle (xdisp, drawBuffer, gc, \
110 0, Row2Pixel (row), \ 110 0, Row2Pixel (row), \
111 (unsigned int)width, \ 111 (unsigned int)width, \
112 (unsigned int)Height2Pixel (num)) 112 (unsigned int)Height2Pixel (num))
113 113
114/* ------------------------------------------------------------------------- * 114/* ------------------------------------------------------------------------- *
115 * SCREEN `COMMON' ROUTINES * 115 * SCREEN `COMMON' ROUTINES *
116 * ------------------------------------------------------------------------- */ 116 * ------------------------------------------------------------------------- */
117 117
118/* Fill part/all of a line with blanks. */ 118/* Fill part/all of a line with blanks. */
119void 119void
120rxvt_term::scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs) 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 CLEAR_ALL_SELECTION (); 242 rvideo_state = rvideo_mode = false;
240 rvideo = 0;
241 } 243 }
242 else 244 else
243 { 245 {
244 /* 246 /*
245 * add or delete rows as appropriate 247 * add or delete rows as appropriate
… …
281 int pend = MOD (term_start + top_row , prev_total_rows); 283 int pend = MOD (term_start + top_row , prev_total_rows);
282 int q = total_rows; // rewrapped row 284 int q = total_rows; // rewrapped row
283 285
284 if (top_row) 286 if (top_row)
285 { 287 {
286 // re-wrap lines, this is rather ugly, possibly because I am too dumb 288 // Re-wrap lines. This is rather ugly, possibly because I am too dumb
287 // to come up with a lean and mean algorithm. 289 // to come up with a lean and mean algorithm.
288 290
289 row_col_t ocur = screen.cur; 291 row_col_t ocur = screen.cur;
290 ocur.row = MOD (term_start + ocur.row, prev_total_rows); 292 ocur.row = MOD (term_start + ocur.row, prev_total_rows);
291 293
… …
348 350
349 line_t &pline = old_buf [prow]; 351 line_t &pline = old_buf [prow];
350 352
351 int len = min (min (prev_ncol - pcol, ncol - qcol), llen - lofs); 353 int len = min (min (prev_ncol - pcol, ncol - qcol), llen - lofs);
352 354
353 assert (len);
354 assert (pline.t);
355
356 memcpy (qline->t + qcol, pline.t + pcol, len * sizeof (text_t)); 355 memcpy (qline->t + qcol, pline.t + pcol, len * sizeof (text_t));
357 memcpy (qline->r + qcol, pline.r + pcol, len * sizeof (rend_t)); 356 memcpy (qline->r + qcol, pline.r + pcol, len * sizeof (rend_t));
358 357
359 lofs += len; 358 lofs += len;
360 qcol += len; 359 qcol += len;
… …
400 delete old_ra; 399 delete old_ra;
401 400
402 clamp_it (screen.cur.row, 0, nrow - 1); 401 clamp_it (screen.cur.row, 0, nrow - 1);
403 clamp_it (screen.cur.col, 0, ncol - 1); 402 clamp_it (screen.cur.col, 0, ncol - 1);
404 403
405 if (tabs)
406 free (tabs); 404 free (tabs);
407 } 405 }
406
407 CLEAR_ALL_SELECTION ();
408 408
409 prev_nrow = nrow; 409 prev_nrow = nrow;
410 prev_ncol = ncol; 410 prev_ncol = ncol;
411 411
412 tabs = (char *)rxvt_malloc (ncol * sizeof (char)); 412 tabs = (char *)rxvt_malloc (ncol * sizeof (char));
413 413
414 for (int col = ncol; col--; ) 414 for (int col = ncol; col--; )
415 tabs [col] = col % TABSIZE == 0; 415 tabs [col] = col % TABSIZE == 0;
416 416
417 if (current_screen != PRIMARY)
418 scr_swap_screen ();
419
417 tt_winch (); 420 tt_winch ();
418 421
419 HOOK_INVOKE ((this, HOOK_RESET, DT_END)); 422 HOOK_INVOKE ((this, HOOK_RESET, DT_END));
420} 423}
421 424
422/* ------------------------------------------------------------------------- */ 425/* ------------------------------------------------------------------------- */
423/* 426/*
424 * Free everything. That way malloc debugging can find leakage. 427 * Free everything. That way malloc debugging can find leakage.
425 */ 428 */
426void 429void
427rxvt_term::scr_release () 430rxvt_term::scr_release () NOTHROW
428{ 431{
432 if (row_buf)
433 {
429 delete talloc; talloc = 0; 434 delete talloc; talloc = 0;
430 delete ralloc; ralloc = 0; 435 delete ralloc; ralloc = 0;
431 436
432 free (row_buf); 437 free (row_buf);
433 free (swap_buf); 438 free (swap_buf);
434 free (drawn_buf); 439 free (drawn_buf);
435 free (tabs); 440 free (tabs);
436 441
437 row_buf = 0; // signal that we freed all the arrays 442 row_buf = 0; // signal that we freed all the arrays
443 }
438} 444}
439 445
440/* ------------------------------------------------------------------------- */ 446/* ------------------------------------------------------------------------- */
441/* 447/*
442 * Hard reset 448 * Hard reset
… …
459 * Save and Restore cursor 465 * Save and Restore cursor
460 * XTERM_SEQ: Save cursor : ESC 7 466 * XTERM_SEQ: Save cursor : ESC 7
461 * XTERM_SEQ: Restore cursor: ESC 8 467 * XTERM_SEQ: Restore cursor: ESC 8
462 */ 468 */
463void 469void
464rxvt_term::scr_cursor (int mode) 470rxvt_term::scr_cursor (cursor_mode mode) NOTHROW
465{ 471{
466 screen_t *s; 472 screen_t *s;
467 473
468#if NSCREENS && !defined(NO_SECONDARY_SCREEN_CURSOR) 474#if NSCREENS && !defined(NO_SECONDARY_SCREEN_CURSOR)
469 if (current_screen == SECONDARY) 475 if (current_screen == SECONDARY)
… …
501 assert (s->cur.row >= 0); 507 assert (s->cur.row >= 0);
502 assert (s->cur.col >= 0); 508 assert (s->cur.col >= 0);
503#endif 509#endif
504} 510}
505 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
506/* ------------------------------------------------------------------------- */ 527/* ------------------------------------------------------------------------- */
507/* 528/*
508 * Swap between primary and secondary screens 529 * Swap between primary and secondary screens
509 * XTERM_SEQ: Primary screen : ESC [ ? 4 7 h 530 * XTERM_SEQ: Primary screen : ESC [ ? 4 7 h
510 * XTERM_SEQ: Secondary screen: ESC [ ? 4 7 l 531 * XTERM_SEQ: Secondary screen: ESC [ ? 4 7 l
511 */ 532 */
512int 533void
513rxvt_term::scr_change_screen (int scrn) 534rxvt_term::scr_change_screen (int scrn)
514{ 535{
536 if (scrn == current_screen)
537 return;
538
515 want_refresh = 1; 539 want_refresh = 1;
516 view_start = 0; 540 view_start = 0;
517 541
518 if (current_screen == scrn)
519 return scrn;
520
521 selection_check (2); /* check for boundary cross */ 542 selection_check (2); /* check for boundary cross */
522 543
523 int i = current_screen; current_screen = scrn; scrn = i; 544 int i = current_screen; current_screen = scrn; scrn = i;
524
525 ::swap (screen.cur.row, swap.cur.row);
526 ::swap (screen.cur.col, swap.cur.col);
527
528 screen.cur.row = clamp (screen.cur.row, 0, prev_nrow - 1);
529 screen.cur.col = clamp (screen.cur.col, 0, prev_ncol - 1);
530 545
531#if NSCREENS 546#if NSCREENS
532 if (OPTION (Opt_secondaryScreen)) 547 if (OPTION (Opt_secondaryScreen))
533 { 548 {
534 num_scr = 0; 549 num_scr = 0;
535 550
536 for (int i = prev_nrow; i--; ) 551 scr_swap_screen ();
537 ::swap (ROW(i), swap_buf [i]);
538 552
539 ::swap (screen.charset, swap.charset); 553 ::swap (screen.charset, swap.charset);
540 ::swap (screen.flags, swap.flags); 554 ::swap (screen.flags, swap.flags);
541 screen.flags |= Screen_VisibleCursor; 555 screen.flags |= Screen_VisibleCursor;
542 swap.flags |= Screen_VisibleCursor; 556 swap.flags |= Screen_VisibleCursor;
543 } 557 }
544 else 558 else
545#endif 559#endif
546 if (OPTION (Opt_secondaryScroll)) 560 if (OPTION (Opt_secondaryScroll))
547 scr_scroll_text (0, prev_nrow - 1, prev_nrow); 561 scr_scroll_text (0, prev_nrow - 1, prev_nrow);
548
549 return scrn;
550} 562}
551 563
552// clear WrapNext indicator, solidifying position on next line 564// clear WrapNext indicator, solidifying position on next line
553void 565void
554rxvt_term::scr_do_wrap () 566rxvt_term::scr_do_wrap () NOTHROW
555{ 567{
556 if (!(screen.flags & Screen_WrapNext)) 568 if (!(screen.flags & Screen_WrapNext))
557 return; 569 return;
558 570
559 screen.flags &= ~Screen_WrapNext; 571 screen.flags &= ~Screen_WrapNext;
… …
569/* ------------------------------------------------------------------------- */ 581/* ------------------------------------------------------------------------- */
570/* 582/*
571 * Change the colour for following text 583 * Change the colour for following text
572 */ 584 */
573void 585void
574rxvt_term::scr_color (unsigned int color, int fgbg) 586rxvt_term::scr_color (unsigned int color, int fgbg) NOTHROW
575{ 587{
576 if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR)) 588 if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR))
577 color = fgbg; 589 color = fgbg;
578 590
579 if (fgbg == Color_fg) 591 if (fgbg == Color_fg)
… …
585/* ------------------------------------------------------------------------- */ 597/* ------------------------------------------------------------------------- */
586/* 598/*
587 * Change the rendition style for following text 599 * Change the rendition style for following text
588 */ 600 */
589void 601void
590rxvt_term::scr_rendition (int set, int style) 602rxvt_term::scr_rendition (int set, int style) NOTHROW
591 { 603 {
592 if (set) 604 if (set)
593 rstyle |= style; 605 rstyle |= style;
594 else if (style == ~RS_None) 606 else if (style == ~RS_None)
595 rstyle = DEFAULT_RSTYLE; 607 rstyle = DEFAULT_RSTYLE;
… …
602 * Scroll text between <row1> and <row2> inclusive, by <count> lines 614 * Scroll text between <row1> and <row2> inclusive, by <count> lines
603 * count positive ==> scroll up 615 * count positive ==> scroll up
604 * count negative ==> scroll down 616 * count negative ==> scroll down
605 */ 617 */
606int 618int
607rxvt_term::scr_scroll_text (int row1, int row2, int count) 619rxvt_term::scr_scroll_text (int row1, int row2, int count) NOTHROW
608{ 620{
609 if (count == 0 || (row1 > row2)) 621 if (count == 0 || (row1 > row2))
610 return 0; 622 return 0;
611 623
612 want_refresh = 1; 624 want_refresh = 1;
… …
629 } 641 }
630 642
631 // erase newly scrolled-in lines 643 // erase newly scrolled-in lines
632 for (int i = count; i--; ) 644 for (int i = count; i--; )
633 { 645 {
634 // basically this is a slightly optimized scr_blank_screen_mem
635 // it is worth the effort on slower machines
636 line_t &l = ROW(nrow - 1 - i); 646 line_t &l = ROW(nrow - 1 - i);
637 647
648 // optimize if already cleared, can be significant on slow machines
649 // could be rolled into scr_blank_screen_mem
650 if (l.r && l.l < ncol - 1 && !((l.r[l.l + 1] ^ rstyle) & RS_bgMask))
651 {
638 scr_blank_line (l, 0, l.l, rstyle); 652 scr_blank_line (l, 0, l.l, rstyle);
639
640 l.l = 0; 653 l.l = 0;
641 l.f = 0; 654 l.f = 0;
655 }
656 else
657 scr_blank_screen_mem (l, rstyle);
642 } 658 }
643 659
644 // now copy lines below the scroll region bottom to the 660 // now copy lines below the scroll region bottom to the
645 // bottom of the screen again, so they look as if they 661 // bottom of the screen again, so they look as if they
646 // hadn't moved. 662 // hadn't moved.
… …
730/* ------------------------------------------------------------------------- */ 746/* ------------------------------------------------------------------------- */
731/* 747/*
732 * Add text given in <str> of length <len> to screen struct 748 * Add text given in <str> of length <len> to screen struct
733 */ 749 */
734void 750void
735rxvt_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
736{ 752{
737 if (len <= 0) /* sanity */ 753 if (len <= 0) /* sanity */
738 return; 754 return;
739 755
740 unsigned char checksel; 756 unsigned char checksel;
… …
746 ZERO_SCROLLBACK (); 762 ZERO_SCROLLBACK ();
747 763
748 if (minlines > 0) 764 if (minlines > 0)
749 { 765 {
750 minlines += screen.cur.row - screen.bscroll; 766 minlines += screen.cur.row - screen.bscroll;
767 min_it (minlines, screen.cur.row - top_row);
751 768
752 if (minlines > 0 769 if (minlines > 0
753 && screen.tscroll == 0 770 && screen.tscroll == 0
754 && screen.bscroll == nrow - 1) 771 && screen.bscroll == nrow - 1)
755 { 772 {
… …
829 846
830 // some utf-8 decoders "decode" surrogate characters: let's fix this. 847 // some utf-8 decoders "decode" surrogate characters: let's fix this.
831 if (IN_RANGE_INC (c, 0xd800, 0xdfff)) 848 if (IN_RANGE_INC (c, 0xd800, 0xdfff))
832 c = 0xfffd; 849 c = 0xfffd;
833 850
834 // 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
835 // do wcwidth before further replacements, as wcwidth might return -1 852 // further replacements, as wcwidth might return -1 for the line
836 // 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
837 // locale. 854 // locale.
838 int width = c < 0x100 ? 1 : wcwidth (c); 855 int width = WCWIDTH (c);
839 856
840 if (charsets [screen.charset] == '0') // DEC SPECIAL 857 if (charsets [screen.charset] == '0') // DEC SPECIAL
841 { 858 {
842 // vt100 special graphics and line drawing 859 // vt100 special graphics and line drawing
843 // 5f-7e standard vt100 860 // 5f-7e standard vt100
… …
994/* 1011/*
995 * 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
996 * XTERM_SEQ: CTRL-H 1013 * XTERM_SEQ: CTRL-H
997 */ 1014 */
998void 1015void
999rxvt_term::scr_backspace () 1016rxvt_term::scr_backspace () NOTHROW
1000{ 1017{
1001 want_refresh = 1; 1018 want_refresh = 1;
1002 1019
1003 if (screen.cur.col == 0) 1020 if (screen.cur.col == 0)
1004 { 1021 {
… …
1022 * Process Horizontal Tab 1039 * Process Horizontal Tab
1023 * count: +ve = forward; -ve = backwards 1040 * count: +ve = forward; -ve = backwards
1024 * XTERM_SEQ: CTRL-I 1041 * XTERM_SEQ: CTRL-I
1025 */ 1042 */
1026void 1043void
1027rxvt_term::scr_tab (int count, bool ht) 1044rxvt_term::scr_tab (int count, bool ht) NOTHROW
1028{ 1045{
1029 int i, x; 1046 int i, x;
1030 1047
1031 want_refresh = 1; 1048 want_refresh = 1;
1032 i = x = screen.cur.col; 1049 i = x = screen.cur.col;
… …
1099 * 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
1100 * in that row right. Clear left column. 1117 * in that row right. Clear left column.
1101 */ 1118 */
1102#if ENABLE_FRILLS 1119#if ENABLE_FRILLS
1103void 1120void
1104rxvt_term::scr_backindex () 1121rxvt_term::scr_backindex () NOTHROW
1105{ 1122{
1106 if (screen.cur.col > 0) 1123 if (screen.cur.col > 0)
1107 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE); 1124 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE);
1108 else 1125 else
1109 scr_insdel_chars (1, INSERT); 1126 scr_insdel_chars (1, INSERT);
… …
1116 * 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
1117 * in that row left. Clear right column. 1134 * in that row left. Clear right column.
1118 */ 1135 */
1119#if ENABLE_FRILLS 1136#if ENABLE_FRILLS
1120void 1137void
1121rxvt_term::scr_forwardindex () 1138rxvt_term::scr_forwardindex () NOTHROW
1122{ 1139{
1123 if (screen.cur.col < ncol - 1) 1140 if (screen.cur.col < ncol - 1)
1124 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE); 1141 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE);
1125 else 1142 else
1126 { 1143 {
… …
1139/* ------------------------------------------------------------------------- */ 1156/* ------------------------------------------------------------------------- */
1140/* 1157/*
1141 * Goto Row/Column 1158 * Goto Row/Column
1142 */ 1159 */
1143void 1160void
1144rxvt_term::scr_gotorc (int row, int col, int relative) 1161rxvt_term::scr_gotorc (int row, int col, int relative) NOTHROW
1145{ 1162{
1146 want_refresh = 1; 1163 want_refresh = 1;
1147 ZERO_SCROLLBACK (); 1164 ZERO_SCROLLBACK ();
1148 1165
1149 screen.cur.col = relative & C_RELATIVE ? screen.cur.col + col : col; 1166 screen.cur.col = relative & C_RELATIVE ? screen.cur.col + col : col;
… …
1187/* ------------------------------------------------------------------------- */ 1204/* ------------------------------------------------------------------------- */
1188/* 1205/*
1189 * direction should be UP or DN 1206 * direction should be UP or DN
1190 */ 1207 */
1191void 1208void
1192rxvt_term::scr_index (enum page_dirn direction) 1209rxvt_term::scr_index (enum page_dirn direction) NOTHROW
1193{ 1210{
1194 int dirn; 1211 int dirn;
1195 1212
1196 want_refresh = 1; 1213 want_refresh = 1;
1197 ZERO_SCROLLBACK (); 1214 ZERO_SCROLLBACK ();
… …
1216 * XTERM_SEQ: Clear line to right: ESC [ 0 K 1233 * XTERM_SEQ: Clear line to right: ESC [ 0 K
1217 * XTERM_SEQ: Clear line to left : ESC [ 1 K 1234 * XTERM_SEQ: Clear line to left : ESC [ 1 K
1218 * XTERM_SEQ: Clear whole line : ESC [ 2 K 1235 * XTERM_SEQ: Clear whole line : ESC [ 2 K
1219 */ 1236 */
1220void 1237void
1221rxvt_term::scr_erase_line (int mode) 1238rxvt_term::scr_erase_line (int mode) NOTHROW
1222{ 1239{
1223 unsigned int col, num; 1240 unsigned int col, num;
1224 1241
1225 want_refresh = 1; 1242 want_refresh = 1;
1226 ZERO_SCROLLBACK (); 1243 ZERO_SCROLLBACK ();
… …
1270 * XTERM_SEQ: Clear screen after cursor : ESC [ 0 J 1287 * XTERM_SEQ: Clear screen after cursor : ESC [ 0 J
1271 * XTERM_SEQ: Clear screen before cursor: ESC [ 1 J 1288 * XTERM_SEQ: Clear screen before cursor: ESC [ 1 J
1272 * XTERM_SEQ: Clear whole screen : ESC [ 2 J 1289 * XTERM_SEQ: Clear whole screen : ESC [ 2 J
1273 */ 1290 */
1274void 1291void
1275rxvt_term::scr_erase_screen (int mode) 1292rxvt_term::scr_erase_screen (int mode) NOTHROW
1276{ 1293{
1277 int num; 1294 int num;
1278 int32_t row; 1295 int32_t row;
1279 rend_t ren; 1296 rend_t ren;
1280 XGCValues gcvalue; 1297 XGCValues gcvalue;
… …
1325 } 1342 }
1326 else 1343 else
1327 { 1344 {
1328 ren = rstyle & (RS_fgMask | RS_bgMask); 1345 ren = rstyle & (RS_fgMask | RS_bgMask);
1329 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)]; 1346 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)];
1330 XChangeGC (display->display, gc, GCForeground, &gcvalue); 1347 XChangeGC (xdisp, gc, GCForeground, &gcvalue);
1331 ERASE_ROWS (row, num); 1348 ERASE_ROWS (row, num);
1332 gcvalue.foreground = pix_colors[Color_fg]; 1349 gcvalue.foreground = pix_colors[Color_fg];
1333 XChangeGC (display->display, gc, GCForeground, &gcvalue); 1350 XChangeGC (xdisp, gc, GCForeground, &gcvalue);
1334 } 1351 }
1335 1352
1336 for (; num--; row++) 1353 for (; num--; row++)
1337 { 1354 {
1338 scr_blank_screen_mem (ROW(row), rstyle); 1355 scr_blank_screen_mem (ROW(row), rstyle);
… …
1340 } 1357 }
1341} 1358}
1342 1359
1343#if ENABLE_FRILLS 1360#if ENABLE_FRILLS
1344void 1361void
1345rxvt_term::scr_erase_savelines () 1362rxvt_term::scr_erase_savelines () NOTHROW
1346{ 1363{
1347 want_refresh = 1; 1364 want_refresh = 1;
1348 ZERO_SCROLLBACK (); 1365 ZERO_SCROLLBACK ();
1349 1366
1350 top_row = 0; 1367 top_row = 0;
… …
1355/* 1372/*
1356 * Fill the screen with `E's 1373 * Fill the screen with `E's
1357 * XTERM_SEQ: Screen Alignment Test: ESC # 8 1374 * XTERM_SEQ: Screen Alignment Test: ESC # 8
1358 */ 1375 */
1359void 1376void
1360rxvt_term::scr_E () 1377rxvt_term::scr_E () NOTHROW
1361{ 1378{
1362 rend_t fs; 1379 rend_t fs;
1363 1380
1364 want_refresh = 1; 1381 want_refresh = 1;
1365 ZERO_SCROLLBACK (); 1382 ZERO_SCROLLBACK ();
… …
1386/* ------------------------------------------------------------------------- */ 1403/* ------------------------------------------------------------------------- */
1387/* 1404/*
1388 * Insert/Delete <count> lines 1405 * Insert/Delete <count> lines
1389 */ 1406 */
1390void 1407void
1391rxvt_term::scr_insdel_lines (int count, int insdel) 1408rxvt_term::scr_insdel_lines (int count, int insdel) NOTHROW
1392{ 1409{
1393 int end; 1410 int end;
1394 1411
1395 ZERO_SCROLLBACK (); 1412 ZERO_SCROLLBACK ();
1396 1413
… …
1416/* ------------------------------------------------------------------------- */ 1433/* ------------------------------------------------------------------------- */
1417/* 1434/*
1418 * Insert/Delete <count> characters from the current position 1435 * Insert/Delete <count> characters from the current position
1419 */ 1436 */
1420void 1437void
1421rxvt_term::scr_insdel_chars (int count, int insdel) 1438rxvt_term::scr_insdel_chars (int count, int insdel) NOTHROW
1422{ 1439{
1423 int col, row; 1440 int col, row;
1424 rend_t tr; 1441 rend_t tr;
1425 1442
1426 want_refresh = 1; 1443 want_refresh = 1;
… …
1514/* 1531/*
1515 * Set the scrolling region 1532 * Set the scrolling region
1516 * XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r 1533 * XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r
1517 */ 1534 */
1518void 1535void
1519rxvt_term::scr_scroll_region (int top, int bot) 1536rxvt_term::scr_scroll_region (int top, int bot) NOTHROW
1520{ 1537{
1521 max_it (top, 0); 1538 max_it (top, 0);
1522 min_it (bot, nrow - 1); 1539 min_it (bot, nrow - 1);
1523 1540
1524 if (top > bot) 1541 if (top > bot)
… …
1534 * Make the cursor visible/invisible 1551 * Make the cursor visible/invisible
1535 * XTERM_SEQ: Make cursor visible : ESC [ ? 25 h 1552 * XTERM_SEQ: Make cursor visible : ESC [ ? 25 h
1536 * XTERM_SEQ: Make cursor invisible: ESC [ ? 25 l 1553 * XTERM_SEQ: Make cursor invisible: ESC [ ? 25 l
1537 */ 1554 */
1538void 1555void
1539rxvt_term::scr_cursor_visible (int mode) 1556rxvt_term::scr_cursor_visible (int mode) NOTHROW
1540{ 1557{
1541 want_refresh = 1; 1558 want_refresh = 1;
1542 1559
1543 if (mode) 1560 if (mode)
1544 screen.flags |= Screen_VisibleCursor; 1561 screen.flags |= Screen_VisibleCursor;
… …
1551 * Set/unset automatic wrapping 1568 * Set/unset automatic wrapping
1552 * XTERM_SEQ: Set Wraparound : ESC [ ? 7 h 1569 * XTERM_SEQ: Set Wraparound : ESC [ ? 7 h
1553 * XTERM_SEQ: Unset Wraparound: ESC [ ? 7 l 1570 * XTERM_SEQ: Unset Wraparound: ESC [ ? 7 l
1554 */ 1571 */
1555void 1572void
1556rxvt_term::scr_autowrap (int mode) 1573rxvt_term::scr_autowrap (int mode) NOTHROW
1557{ 1574{
1558 if (mode) 1575 if (mode)
1559 screen.flags |= Screen_Autowrap; 1576 screen.flags |= Screen_Autowrap;
1560 else 1577 else
1561 screen.flags &= ~(Screen_Autowrap | Screen_WrapNext); 1578 screen.flags &= ~(Screen_Autowrap | Screen_WrapNext);
… …
1570 * and the cursor cannot be moved outside. 1587 * and the cursor cannot be moved outside.
1571 * XTERM_SEQ: Set Absolute: ESC [ ? 6 h 1588 * XTERM_SEQ: Set Absolute: ESC [ ? 6 h
1572 * XTERM_SEQ: Set Relative: ESC [ ? 6 l 1589 * XTERM_SEQ: Set Relative: ESC [ ? 6 l
1573 */ 1590 */
1574void 1591void
1575rxvt_term::scr_relative_origin (int mode) 1592rxvt_term::scr_relative_origin (int mode) NOTHROW
1576{ 1593{
1577 if (mode) 1594 if (mode)
1578 screen.flags |= Screen_Relative; 1595 screen.flags |= Screen_Relative;
1579 else 1596 else
1580 screen.flags &= ~Screen_Relative; 1597 screen.flags &= ~Screen_Relative;
… …
1587 * Set insert/replace mode 1604 * Set insert/replace mode
1588 * XTERM_SEQ: Set Insert mode : ESC [ ? 4 h 1605 * XTERM_SEQ: Set Insert mode : ESC [ ? 4 h
1589 * XTERM_SEQ: Set Replace mode: ESC [ ? 4 l 1606 * XTERM_SEQ: Set Replace mode: ESC [ ? 4 l
1590 */ 1607 */
1591void 1608void
1592rxvt_term::scr_insert_mode (int mode) 1609rxvt_term::scr_insert_mode (int mode) NOTHROW
1593{ 1610{
1594 if (mode) 1611 if (mode)
1595 screen.flags |= Screen_Insert; 1612 screen.flags |= Screen_Insert;
1596 else 1613 else
1597 screen.flags &= ~Screen_Insert; 1614 screen.flags &= ~Screen_Insert;
… …
1603 * XTERM_SEQ: Set tab at current column : ESC H 1620 * XTERM_SEQ: Set tab at current column : ESC H
1604 * XTERM_SEQ: Clear tab at current column: ESC [ 0 g 1621 * XTERM_SEQ: Clear tab at current column: ESC [ 0 g
1605 * XTERM_SEQ: Clear all tabs : ESC [ 3 g 1622 * XTERM_SEQ: Clear all tabs : ESC [ 3 g
1606 */ 1623 */
1607void 1624void
1608rxvt_term::scr_set_tab (int mode) 1625rxvt_term::scr_set_tab (int mode) NOTHROW
1609{ 1626{
1610 if (mode < 0) 1627 if (mode < 0)
1611 memset (tabs, 0, ncol * sizeof (char)); 1628 memset (tabs, 0, ncol * sizeof (char));
1612 else if (screen.cur.col < ncol) 1629 else if (screen.cur.col < ncol)
1613 tabs [screen.cur.col] = !!mode; 1630 tabs [screen.cur.col] = !!mode;
… …
1618 * Set reverse/normal video 1635 * Set reverse/normal video
1619 * XTERM_SEQ: Reverse video: ESC [ ? 5 h 1636 * XTERM_SEQ: Reverse video: ESC [ ? 5 h
1620 * XTERM_SEQ: Normal video : ESC [ ? 5 l 1637 * XTERM_SEQ: Normal video : ESC [ ? 5 l
1621 */ 1638 */
1622void 1639void
1623rxvt_term::scr_rvideo_mode (int mode) 1640rxvt_term::scr_rvideo_mode (bool on) NOTHROW
1624{ 1641{
1625 XGCValues gcvalue; 1642 rvideo_mode = on;
1626 1643
1644#ifndef NO_BELL
1645 on ^= rvideo_bell;
1646#endif
1647
1627 if (rvideo != mode) 1648 if (rvideo_state != on)
1628 { 1649 {
1629 rvideo = mode; 1650 rvideo_state = on;
1651
1630 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]); 1652 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]);
1631#if XPM_BACKGROUND 1653#if XPM_BACKGROUND
1632 if (bgPixmap.pixmap == None) 1654 if (bgPixmap.pixmap == None)
1633#endif 1655#endif
1634#if TRANSPARENT 1656#if TRANSPARENT
1635 if (! OPTION (Opt_transparent) || am_transparent == 0) 1657 if (!OPTION (Opt_transparent) || am_transparent == 0)
1636#endif 1658#endif
1637 XSetWindowBackground (display->display, vt, 1659 XSetWindowBackground (xdisp, vt, pix_colors[Color_bg]);
1638 pix_colors[Color_bg]);
1639 1660
1661 XGCValues gcvalue;
1640 gcvalue.foreground = pix_colors[Color_fg]; 1662 gcvalue.foreground = pix_colors[Color_fg];
1641 gcvalue.background = pix_colors[Color_bg]; 1663 gcvalue.background = pix_colors[Color_bg];
1642 XChangeGC (display->display, gc, GCBackground | GCForeground, 1664 XChangeGC (xdisp, gc, GCBackground | GCForeground, &gcvalue);
1643 &gcvalue); 1665
1644 scr_clear (); 1666 scr_clear ();
1645 scr_touch (true); 1667 scr_touch (true);
1646 } 1668 }
1647} 1669}
1648 1670
… …
1650/* 1672/*
1651 * Report current cursor position 1673 * Report current cursor position
1652 * XTERM_SEQ: Report position: ESC [ 6 n 1674 * XTERM_SEQ: Report position: ESC [ 6 n
1653 */ 1675 */
1654void 1676void
1655rxvt_term::scr_report_position () 1677rxvt_term::scr_report_position () NOTHROW
1656{ 1678{
1657 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);
1658} 1680}
1659 1681
1660/* ------------------------------------------------------------------------- * 1682/* ------------------------------------------------------------------------- *
… …
1663 1685
1664/* 1686/*
1665 * Set font style 1687 * Set font style
1666 */ 1688 */
1667void 1689void
1668rxvt_term::set_font_style () 1690rxvt_term::set_font_style () NOTHROW
1669{ 1691{
1670#if 0 1692#if 0
1671 switch (charsets [screen.charset]) 1693 switch (charsets [screen.charset])
1672 { 1694 {
1673 case '0': /* DEC Special Character & Line Drawing Set */ 1695 case '0': /* DEC Special Character & Line Drawing Set */
… …
1695 * XTERM_SEQ: Invoke G1 character set: CTRL-N 1717 * XTERM_SEQ: Invoke G1 character set: CTRL-N
1696 * XTERM_SEQ: Invoke G2 character set: ESC N 1718 * XTERM_SEQ: Invoke G2 character set: ESC N
1697 * XTERM_SEQ: Invoke G3 character set: ESC O 1719 * XTERM_SEQ: Invoke G3 character set: ESC O
1698 */ 1720 */
1699void 1721void
1700rxvt_term::scr_charset_choose (int set) 1722rxvt_term::scr_charset_choose (int set) NOTHROW
1701{ 1723{
1702 screen.charset = set; 1724 screen.charset = set;
1703 set_font_style (); 1725 set_font_style ();
1704} 1726}
1705 1727
… …
1711 * XTERM_SEQ: Set G2 character set: ESC * <C> 1733 * XTERM_SEQ: Set G2 character set: ESC * <C>
1712 * XTERM_SEQ: Set G3 character set: ESC + <C> 1734 * XTERM_SEQ: Set G3 character set: ESC + <C>
1713 * See set_font_style for possible values for <C> 1735 * See set_font_style for possible values for <C>
1714 */ 1736 */
1715void 1737void
1716rxvt_term::scr_charset_set (int set, unsigned int ch) 1738rxvt_term::scr_charset_set (int set, unsigned int ch) NOTHROW
1717{ 1739{
1718 charsets[set] = (unsigned char)ch; 1740 charsets[set] = (unsigned char)ch;
1719 set_font_style (); 1741 set_font_style ();
1720} 1742}
1721 1743
… …
1726 1748
1727/* 1749/*
1728 * refresh matching text. 1750 * refresh matching text.
1729 */ 1751 */
1730bool 1752bool
1731rxvt_term::scr_refresh_rend (rend_t mask, rend_t value) 1753rxvt_term::scr_refresh_rend (rend_t mask, rend_t value) NOTHROW
1732{ 1754{
1733 bool found = false; 1755 bool found = false;
1734 1756
1735 for (int i = 0; i < nrow; i++) 1757 for (int i = 0; i < nrow; i++)
1736 { 1758 {
… …
1756 PART_END, 1778 PART_END,
1757 RC_COUNT 1779 RC_COUNT
1758}; 1780};
1759 1781
1760void 1782void
1761rxvt_term::scr_expose (int x, int y, int ewidth, int eheight, bool refresh) 1783rxvt_term::scr_expose (int x, int y, int ewidth, int eheight, bool refresh) NOTHROW
1762{ 1784{
1763 int i; 1785 int i;
1764 row_col_t rc[RC_COUNT]; 1786 row_col_t rc[RC_COUNT];
1765 1787
1766 if (!drawn_buf) /* sanity check */ 1788 if (!drawn_buf) /* sanity check */
… …
1800/* ------------------------------------------------------------------------- */ 1822/* ------------------------------------------------------------------------- */
1801/* 1823/*
1802 * Refresh the entire screen 1824 * Refresh the entire screen
1803 */ 1825 */
1804void 1826void
1805rxvt_term::scr_touch (bool refresh) 1827rxvt_term::scr_touch (bool refresh) NOTHROW
1806{ 1828{
1807 scr_expose (0, 0, width, height, refresh); 1829 scr_expose (0, 0, width, height, refresh);
1808} 1830}
1809 1831
1810/* ------------------------------------------------------------------------- */ 1832/* ------------------------------------------------------------------------- */
1811/* 1833/*
1812 * Move the display so that the line represented by scrollbar value Y is at 1834 * Move the display so that the line represented by scrollbar value Y is at
1813 * the top of the screen 1835 * the top of the screen
1814 */ 1836 */
1815void 1837void
1816rxvt_term::scr_move_to (int y, int len) 1838rxvt_term::scr_move_to (int y, int len) NOTHROW
1817{ 1839{
1818 scr_changeview ((top_row - nrow) * (len - y) / len + (nrow - 1)); 1840 scr_changeview ((top_row - nrow) * (len - y) / len + (nrow - 1));
1819} 1841}
1820 1842
1821/* ------------------------------------------------------------------------- */ 1843/* ------------------------------------------------------------------------- */
1822/* 1844/*
1823 * Page the screen up/down nlines 1845 * Page the screen up/down nlines
1824 * direction should be UP or DN 1846 * direction should be UP or DN
1825 */ 1847 */
1826bool 1848bool
1827rxvt_term::scr_page (enum page_dirn direction, int nlines) 1849rxvt_term::scr_page (enum page_dirn direction, int nlines) NOTHROW
1828{ 1850{
1829 int new_view_start = 1851 int new_view_start =
1830 direction == UP ? view_start - nlines 1852 direction == UP ? view_start - nlines
1831 : view_start + nlines; 1853 : view_start + nlines;
1832 1854
1833 return scr_changeview (new_view_start); 1855 return scr_changeview (new_view_start);
1834} 1856}
1835 1857
1836bool 1858bool
1837rxvt_term::scr_changeview (int new_view_start) 1859rxvt_term::scr_changeview (int new_view_start) NOTHROW
1838{ 1860{
1839 clamp_it (new_view_start, top_row, 0); 1861 clamp_it (new_view_start, top_row, 0);
1840 1862
1841 if (new_view_start == view_start) 1863 if (new_view_start == view_start)
1842 return false; 1864 return false;
… …
1848 HOOK_INVOKE ((this, HOOK_VIEW_CHANGE, DT_INT, view_start, DT_END)); 1870 HOOK_INVOKE ((this, HOOK_VIEW_CHANGE, DT_INT, view_start, DT_END));
1849 1871
1850 return true; 1872 return true;
1851} 1873}
1852 1874
1853/* ------------------------------------------------------------------------- */ 1875#ifndef NO_BELL
1854void 1876void
1877rxvt_term::bell_cb (time_watcher &w)
1878{
1879 rvideo_bell = false;
1880 scr_rvideo_mode (rvideo_mode);
1881}
1882#endif
1883
1884/* ------------------------------------------------------------------------- */
1885void
1855rxvt_term::scr_bell () 1886rxvt_term::scr_bell () NOTHROW
1856{ 1887{
1857#ifndef NO_BELL 1888#ifndef NO_BELL
1858 1889
1859# ifndef NO_MAPALERT 1890# ifndef NO_MAPALERT
1860# ifdef MAPALERT_OPTION 1891# ifdef MAPALERT_OPTION
1861 if (OPTION (Opt_mapAlert)) 1892 if (OPTION (Opt_mapAlert))
1862# endif 1893# endif
1863 XMapWindow (display->display, parent[0]); 1894 XMapWindow (xdisp, parent[0]);
1864# endif 1895# endif
1865 1896
1866 if (OPTION (Opt_visualBell)) 1897 if (OPTION (Opt_visualBell))
1867 { 1898 {
1868 scr_rvideo_mode (!rvideo); /* refresh also done */ 1899 rvideo_bell = true;
1900 scr_rvideo_mode (rvideo_mode);
1869 display->flush (); 1901 display->flush ();
1870 rxvt_usleep (VISUAL_BELL_DURATION); 1902
1871 scr_rvideo_mode (!rvideo); /* refresh also done */ 1903 bell_ev.start (NOW + VISUAL_BELL_DURATION);
1872 } 1904 }
1873 else 1905 else
1874 XBell (display->display, 0); 1906 XBell (xdisp, 0);
1875 1907
1876#endif 1908#endif
1877} 1909}
1878 1910
1879/* ------------------------------------------------------------------------- */ 1911/* ------------------------------------------------------------------------- */
1880/* ARGSUSED */ 1912/* ARGSUSED */
1881void 1913void
1882rxvt_term::scr_printscreen (int fullhist) 1914rxvt_term::scr_printscreen (int fullhist) NOTHROW
1883{ 1915{
1884#ifdef PRINTPIPE 1916#ifdef PRINTPIPE
1885 int nrows, row_start; 1917 int nrows, row_start;
1886 FILE *fd; 1918 FILE *fd;
1887 1919
… …
1936 * Refresh the screen 1968 * Refresh the screen
1937 * drawn_text/drawn_rend contain the screen information before the update. 1969 * drawn_text/drawn_rend contain the screen information before the update.
1938 * screen.text/screen.rend contain what the screen will change to. 1970 * screen.text/screen.rend contain what the screen will change to.
1939 */ 1971 */
1940void 1972void
1941rxvt_term::scr_refresh () 1973rxvt_term::scr_refresh () NOTHROW
1942{ 1974{
1943 unsigned char must_clear, /* use draw_string not draw_image_string */ 1975 unsigned char must_clear, /* use draw_string not draw_image_string */
1944 showcursor; /* show the cursor */ 1976 showcursor; /* show the cursor */
1945 int16_t col, row, /* column/row we're processing */ 1977 int16_t col, row, /* column/row we're processing */
1946 ocrow; /* old cursor row */ 1978 ocrow; /* old cursor row */
… …
2118 { 2150 {
2119 /* also comes here at end if needed because of >= above */ 2151 /* also comes here at end if needed because of >= above */
2120 if (wlen < len) 2152 if (wlen < len)
2121 ::swap (wlen, len); 2153 ::swap (wlen, len);
2122 2154
2123 XCopyArea (display->display, vt, vt, 2155 XCopyArea (xdisp, vt, vt,
2124 gc, 0, Row2Pixel (len + i), 2156 gc, 0, Row2Pixel (len + i),
2125 (unsigned int)this->width, 2157 (unsigned int)this->width,
2126 (unsigned int)Height2Pixel (wlen - len + 1), 2158 (unsigned int)Height2Pixel (wlen - len + 1),
2127 0, Row2Pixel (len)); 2159 0, Row2Pixel (len));
2128 len = -1; 2160 len = -1;
… …
2216 2248
2217 // only do special processing if any attributes are set, which is unlikely 2249 // only do special processing if any attributes are set, which is unlikely
2218 if (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful)) 2250 if (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful))
2219 { 2251 {
2220#if ENABLE_STYLES 2252#if ENABLE_STYLES
2221 // force redraw after "careful" characters to avoid pixel droppings 2253 // "careful" (too wide) character handling
2222 if (srp[col] & RS_Careful && col < ncol - 1 && 0)
2223 drp[col + 1] = ~srp[col + 1];
2224 2254
2225 // include previous careful character(s) if possible, looks nicer (best effort...) 2255 // include previous careful character(s) if possible, looks nicer (best effort...)
2226 while (text > stp 2256 while (text > stp
2227 && srp[text - stp - 1] & RS_Careful 2257 && srp[text - stp - 1] & RS_Careful
2228 && RS_SAME (rend, srp[text - stp - 1])) 2258 && RS_SAME (rend, srp[text - stp - 1]))
2229 text--, count++, xpixel -= fwidth; 2259 text--, count++, xpixel -= fwidth;
2260
2261 // force redraw after "careful" characters to avoid pixel droppings
2262 for (int i = 0; srp[col + i] & RS_Careful && col + i < ncol - 1; i++)
2263 drp[col + i + 1] = ~srp[col + i + 1];
2264
2265 // force redraw before "careful" characters to avoid pixel droppings
2266 for (int i = 0; srp[text - stp - i] & RS_Careful && text - i > stp; i++)
2267 drp[text - stp - i - 1] = ~srp[text - stp - i - 1];
2230#endif 2268#endif
2231 2269
2232 bool invert = rend & RS_RVid; 2270 bool invert = rend & RS_RVid;
2233 2271
2234#ifndef NO_BOLD_UNDERLINE_REVERSE 2272#ifndef NO_BOLD_UNDERLINE_REVERSE
… …
2318 2356
2319 if (rend & RS_Uline && font->descent > 1 && fore != back) 2357 if (rend & RS_Uline && font->descent > 1 && fore != back)
2320 { 2358 {
2321#if ENABLE_FRILLS 2359#if ENABLE_FRILLS
2322 if (ISSET_PIXCOLOR (Color_underline)) 2360 if (ISSET_PIXCOLOR (Color_underline))
2323 XSetForeground (display->display, gc, pix_colors[Color_underline]); 2361 XSetForeground (xdisp, gc, pix_colors[Color_underline]);
2324 else 2362 else
2325#endif 2363#endif
2326 XSetForeground (display->display, gc, pix_colors[fore]); 2364 XSetForeground (xdisp, gc, pix_colors[fore]);
2327 2365
2328 XDrawLine (display->display, drawBuffer, gc, 2366 XDrawLine (xdisp, drawBuffer, gc,
2329 xpixel, ypixel + font->ascent + 1, 2367 xpixel, ypixel + font->ascent + 1,
2330 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1); 2368 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1);
2331 } 2369 }
2332 } /* for (col....) */ 2370 } /* for (col....) */
2333 } /* for (row....) */ 2371 } /* for (row....) */
… …
2366 && drawn_buf[oldcursor.row].t[col + cursorwidth] == NOCHAR) 2404 && drawn_buf[oldcursor.row].t[col + cursorwidth] == NOCHAR)
2367 cursorwidth++; 2405 cursorwidth++;
2368 2406
2369#ifndef NO_CURSORCOLOR 2407#ifndef NO_CURSORCOLOR
2370 if (ISSET_PIXCOLOR (Color_cursor)) 2408 if (ISSET_PIXCOLOR (Color_cursor))
2371 XSetForeground (display->display, gc, pix_colors[Color_cursor]); 2409 XSetForeground (xdisp, gc, pix_colors[Color_cursor]);
2372#endif 2410#endif
2373 2411
2374 XDrawRectangle (display->display, drawBuffer, gc, 2412 XDrawRectangle (xdisp, drawBuffer, gc,
2375 Col2Pixel (col), 2413 Col2Pixel (col),
2376 Row2Pixel (oldcursor.row), 2414 Row2Pixel (oldcursor.row),
2377 (unsigned int) (Width2Pixel (cursorwidth) - 1), 2415 (unsigned int) (Width2Pixel (cursorwidth) - 1),
2378 (unsigned int) (Height2Pixel (1) - lineSpace - 1)); 2416 (unsigned int) (Height2Pixel (1) - lineSpace - 1));
2379 } 2417 }
… …
2387 num_scr = 0; 2425 num_scr = 0;
2388 num_scr_allow = 1; 2426 num_scr_allow = 1;
2389} 2427}
2390 2428
2391void 2429void
2392rxvt_term::scr_remap_chars (line_t &l) 2430rxvt_term::scr_remap_chars (line_t &l) NOTHROW
2393{ 2431{
2394 if (!l.t) 2432 if (!l.t)
2395 return; 2433 return;
2396 2434
2397 l.touch (); // maybe a bit of an overkill, but it's not performance-relevant 2435 l.touch (); // maybe a bit of an overkill, but it's not performance-relevant
… …
2399 for (int i = ncol; i--; ) 2437 for (int i = ncol; i--; )
2400 l.r[i] = SET_FONT (l.r[i], FONTSET (l.r[i])->find_font (l.t[i])); 2438 l.r[i] = SET_FONT (l.r[i], FONTSET (l.r[i])->find_font (l.t[i]));
2401} 2439}
2402 2440
2403void 2441void
2404rxvt_term::scr_remap_chars () 2442rxvt_term::scr_remap_chars () NOTHROW
2405{ 2443{
2406 for (int i = total_rows; i--; ) 2444 for (int i = total_rows; i--; )
2407 scr_remap_chars (row_buf [i]); 2445 scr_remap_chars (row_buf [i]);
2408 2446
2409 for (int i = nrow; i--; ) 2447 for (int i = nrow; i--; )
… …
2412 scr_remap_chars (swap_buf [i]); 2450 scr_remap_chars (swap_buf [i]);
2413 } 2451 }
2414} 2452}
2415 2453
2416void 2454void
2417rxvt_term::scr_recolour () 2455rxvt_term::scr_recolour () NOTHROW
2418{ 2456{
2419 if (1 2457 if (1
2420#if TRANSPARENT 2458#if TRANSPARENT
2421 && !am_transparent 2459 && !am_transparent
2422#endif 2460#endif
2423#if XPM_BACKGROUND 2461#if XPM_BACKGROUND
2424 && !bgPixmap.pixmap 2462 && !bgPixmap.pixmap
2425#endif 2463#endif
2426 ) 2464 )
2427 { 2465 {
2428 XSetWindowBackground (display->display, parent[0], pix_colors[Color_border]); 2466 XSetWindowBackground (xdisp, parent[0], pix_colors[Color_border]);
2429 XClearWindow (display->display, parent[0]); 2467 XClearWindow (xdisp, parent[0]);
2430 XSetWindowBackground (display->display, vt, pix_colors[Color_bg]); 2468 XSetWindowBackground (xdisp, vt, pix_colors[Color_bg]);
2431#if HAVE_SCROLLBARS 2469#if HAVE_SCROLLBARS
2432 if (scrollBar.win) 2470 if (scrollBar.win)
2433 { 2471 {
2434 XSetWindowBackground (display->display, scrollBar.win, pix_colors[Color_border]); 2472 XSetWindowBackground (xdisp, scrollBar.win, pix_colors[Color_border]);
2435 scrollBar.setIdle (); 2473 scrollBar.setIdle ();
2436 scrollbar_show (0); 2474 scrollbar_show (0);
2437 } 2475 }
2438#endif 2476#endif
2439 } 2477 }
… …
2443 want_refresh = 1; 2481 want_refresh = 1;
2444} 2482}
2445 2483
2446/* ------------------------------------------------------------------------- */ 2484/* ------------------------------------------------------------------------- */
2447void 2485void
2448rxvt_term::scr_clear (bool really) 2486rxvt_term::scr_clear (bool really) NOTHROW
2449{ 2487{
2450 if (!mapped) 2488 if (!mapped)
2451 return; 2489 return;
2452 2490
2453 num_scr_allow = 0; 2491 num_scr_allow = 0;
2454 want_refresh = 1; 2492 want_refresh = 1;
2455 2493
2456 if (really) 2494 if (really)
2457 XClearWindow (display->display, vt); 2495 XClearWindow (xdisp, vt);
2458} 2496}
2459 2497
2460void 2498void
2461rxvt_term::scr_xor_rect (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle1, rend_t rstyle2) 2499rxvt_term::scr_xor_rect (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle1, rend_t rstyle2) NOTHROW
2462{ 2500{
2463 int view_end = view_start + nrow; 2501 int view_end = view_start + nrow;
2464 int row, col; 2502 int row, col;
2465 2503
2466 for (row = max (beg_row, view_start); row <= min (end_row, view_end); row++) 2504 for (row = max (beg_row, view_start); row <= min (end_row, view_end); row++)
… …
2478 srp[col] ^= rstyle2; 2516 srp[col] ^= rstyle2;
2479 } 2517 }
2480} 2518}
2481 2519
2482void 2520void
2483rxvt_term::scr_xor_span (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle) 2521rxvt_term::scr_xor_span (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle) NOTHROW
2484{ 2522{
2485 int view_end = view_start + nrow; 2523 int view_end = view_start + nrow;
2486 int row, col; 2524 int row, col;
2487 2525
2488 if (beg_row >= view_start) 2526 if (beg_row >= view_start)
… …
2505 srp[col] ^= rstyle; 2543 srp[col] ^= rstyle;
2506} 2544}
2507 2545
2508/* ------------------------------------------------------------------------- */ 2546/* ------------------------------------------------------------------------- */
2509void 2547void
2510rxvt_term::scr_reverse_selection () 2548rxvt_term::scr_reverse_selection () NOTHROW
2511{ 2549{
2512 if (selection.op 2550 if (selection.op
2513 && current_screen == selection.screen 2551 && current_screen == selection.screen
2514 && selection.end.row >= view_start) 2552 && selection.end.row >= view_start)
2515 { 2553 {
… …
2531 * Dump the whole scrollback and screen to the passed filedescriptor. The 2569 * Dump the whole scrollback and screen to the passed filedescriptor. The
2532 * invoking routine must close the fd. 2570 * invoking routine must close the fd.
2533 */ 2571 */
2534#if 0 2572#if 0
2535void 2573void
2536rxvt_term::scr_dump (int fd) 2574rxvt_term::scr_dump (int fd) NOTHROW
2537{ 2575{
2538 int row, wrote; 2576 int row, wrote;
2539 unsigned int width, towrite; 2577 unsigned int width, towrite;
2540 char r1[] = "\n"; 2578 char r1[] = "\n";
2541 2579
… …
2560 2598
2561/* ------------------------------------------------------------------------- * 2599/* ------------------------------------------------------------------------- *
2562 * CHARACTER SELECTION * 2600 * CHARACTER SELECTION *
2563 * ------------------------------------------------------------------------- */ 2601 * ------------------------------------------------------------------------- */
2564void 2602void
2565rxvt_term::selection_check (int check_more) 2603rxvt_term::selection_check (int check_more) NOTHROW
2566{ 2604{
2567 row_col_t pos; 2605 row_col_t pos;
2568 2606
2569 if (!selection.op) 2607 if (!selection.op)
2570 return; 2608 return;
… …
2591/* ------------------------------------------------------------------------- */ 2629/* ------------------------------------------------------------------------- */
2592/* 2630/*
2593 * Paste a selection direct to the command fd 2631 * Paste a selection direct to the command fd
2594 */ 2632 */
2595void 2633void
2596rxvt_term::paste (char *data, unsigned int len) 2634rxvt_term::paste (char *data, unsigned int len) NOTHROW
2597{ 2635{
2598 /* convert normal newline chars into common keyboard Return key sequence */ 2636 /* convert normal newline chars into common keyboard Return key sequence */
2599 for (unsigned int i = 0; i < len; i++) 2637 for (unsigned int i = 0; i < len; i++)
2600 if (data[i] == C0_LF) 2638 if (data[i] == C0_LF)
2601 data[i] = C0_CR; 2639 data[i] = C0_CR;
… …
2607/* 2645/*
2608 * Respond to a notification that a primary selection has been sent 2646 * Respond to a notification that a primary selection has been sent
2609 * EXT: SelectionNotify 2647 * EXT: SelectionNotify
2610 */ 2648 */
2611void 2649void
2612rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop) 2650rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop) NOTHROW
2613{ 2651{
2614 if (prop == None) /* check for failed XConvertSelection */ 2652 if (prop == None) /* check for failed XConvertSelection */
2615 { 2653 {
2616 if ((selection_type & Sel_CompoundText)) 2654 if ((selection_type & Sel_CompoundText))
2617 { 2655 {
… …
2637 } 2675 }
2638 2676
2639 unsigned long bytes_after; 2677 unsigned long bytes_after;
2640 XTextProperty ct; 2678 XTextProperty ct;
2641 2679
2642 if (XGetWindowProperty (display->display, win, prop, 2680 if (XGetWindowProperty (xdisp, win, prop,
2643 0, PROP_SIZE / 4, 2681 0, PROP_SIZE / 4,
2644 delete_prop, AnyPropertyType, 2682 delete_prop, AnyPropertyType,
2645 &ct.encoding, &ct.format, 2683 &ct.encoding, &ct.format,
2646 &ct.nitems, &bytes_after, 2684 &ct.nitems, &bytes_after,
2647 &ct.value) != Success) 2685 &ct.value) != Success)
… …
2656 if (bytes_after) 2694 if (bytes_after)
2657 { 2695 {
2658 // fetch and append remaining data 2696 // fetch and append remaining data
2659 XTextProperty ct2; 2697 XTextProperty ct2;
2660 2698
2661 if (XGetWindowProperty (display->display, win, prop, 2699 if (XGetWindowProperty (xdisp, win, prop,
2662 ct.nitems / 4, (bytes_after + 3) / 4, 2700 ct.nitems / 4, (bytes_after + 3) / 4,
2663 delete_prop, AnyPropertyType, 2701 delete_prop, AnyPropertyType,
2664 &ct2.encoding, &ct2.format, 2702 &ct2.encoding, &ct2.format,
2665 &ct2.nitems, &bytes_after, 2703 &ct2.nitems, &bytes_after,
2666 &ct2.value) != Success) 2704 &ct2.value) != Success)
… …
2679 2717
2680 if (ct.encoding == xa[XA_INCR]) 2718 if (ct.encoding == xa[XA_INCR])
2681 { 2719 {
2682 // INCR selection, start handshake 2720 // INCR selection, start handshake
2683 if (!delete_prop) 2721 if (!delete_prop)
2684 XDeleteProperty (display->display, win, prop); 2722 XDeleteProperty (xdisp, win, prop);
2685 2723
2686 selection_wait = Sel_incr; 2724 selection_wait = Sel_incr;
2687 incr_buf_fill = 0; 2725 incr_buf_fill = 0;
2688 incr_ev.start (NOW + 10); 2726 incr_ev.start (NOW + 10);
2689 2727
… …
2750 paste (s, strlen (s)); 2788 paste (s, strlen (s));
2751 free (s); 2789 free (s);
2752 } 2790 }
2753 else 2791 else
2754#endif 2792#endif
2755 if (XmbTextPropertyToTextList (display->display, &ct, &cl, &cr) >= 0 2793 if (XmbTextPropertyToTextList (xdisp, &ct, &cl, &cr) >= 0
2756 && cl) 2794 && cl)
2757 { 2795 {
2758 for (int i = 0; i < cr; i++) 2796 for (int i = 0; i < cr; i++)
2759 paste (cl[i], strlen (cl[i])); 2797 paste (cl[i], strlen (cl[i]));
2760 2798
… …
2769 if (selection_wait == Sel_normal) 2807 if (selection_wait == Sel_normal)
2770 selection_wait = Sel_none; 2808 selection_wait = Sel_none;
2771} 2809}
2772 2810
2773void 2811void
2774rxvt_term::incr_cb (time_watcher &w) 2812rxvt_term::incr_cb (time_watcher &w) NOTHROW
2775{ 2813{
2776 selection_wait = Sel_none; 2814 selection_wait = Sel_none;
2777 2815
2778 incr_buf_size = 0; 2816 incr_buf_size = 0;
2779 free (incr_buf); 2817 free (incr_buf);
2780 2818
2781 rxvt_warn ("data loss: timeout on INCR selection paste, ignoring.\n"); 2819 rxvt_warn ("data loss: timeout on INCR selection paste, ignoring.\n");
2782} 2820}
2783 2821
2784void 2822void
2785rxvt_term::selection_property (Window win, Atom prop) 2823rxvt_term::selection_property (Window win, Atom prop) NOTHROW
2786{ 2824{
2787 if (prop == None || selection_wait != Sel_incr) 2825 if (prop == None || selection_wait != Sel_incr)
2788 return; 2826 return;
2789 2827
2790 selection_paste (win, prop, true); 2828 selection_paste (win, prop, true);
… …
2799 * (+) if ownership is claimed but property is empty, rxvt_selection_paste () 2837 * (+) if ownership is claimed but property is empty, rxvt_selection_paste ()
2800 * will auto fallback to CUT_BUFFER0 2838 * will auto fallback to CUT_BUFFER0
2801 * EXT: button 2 release 2839 * EXT: button 2 release
2802 */ 2840 */
2803void 2841void
2804rxvt_term::selection_request (Time tm) 2842rxvt_term::selection_request (Time tm, int selnum) NOTHROW
2805{ 2843{
2806 if (selection.text) 2844 if (selection.text && selnum == Sel_Primary)
2807 { /* internal selection */ 2845 { /* internal selection */
2808 char *str = rxvt_wcstombs (selection.text, selection.len); 2846 char *str = rxvt_wcstombs (selection.text, selection.len);
2809 paste (str, strlen (str)); 2847 paste (str, strlen (str));
2810 free (str); 2848 free (str);
2811 return; 2849 return;
2812 } 2850 }
2813 else 2851 else
2814 { 2852 {
2815 int i;
2816
2817 selection_request_time = tm; 2853 selection_request_time = tm;
2818 selection_wait = Sel_normal; 2854 selection_wait = Sel_normal;
2819 2855
2820 for (i = Sel_Primary; i <= Sel_Clipboard; i++)
2821 {
2822#if X_HAVE_UTF8_STRING 2856#if X_HAVE_UTF8_STRING
2823 selection_type = Sel_UTF8String; 2857 selection_type = Sel_UTF8String;
2824 if (selection_request_other (xa[XA_UTF8_STRING], i)) 2858 if (selection_request_other (xa[XA_UTF8_STRING], selnum))
2825 return; 2859 return;
2826#else 2860#else
2827 selection_type = Sel_CompoundText; 2861 selection_type = Sel_CompoundText;
2828 if (selection_request_other (xa[XA_COMPOUND_TEXT], i)) 2862 if (selection_request_other (xa[XA_COMPOUND_TEXT], selnum))
2829 return; 2863 return;
2830#endif 2864#endif
2831 }
2832 } 2865 }
2833 2866
2834 selection_wait = Sel_none; /* don't loop in selection_paste () */ 2867 selection_wait = Sel_none; /* don't loop in selection_paste () */
2835 selection_paste (display->root, XA_CUT_BUFFER0, false); 2868 selection_paste (display->root, XA_CUT_BUFFER0, false);
2836} 2869}
2837 2870
2838int 2871int
2839rxvt_term::selection_request_other (Atom target, int selnum) 2872rxvt_term::selection_request_other (Atom target, int selnum) NOTHROW
2840{ 2873{
2841 Atom sel; 2874 Atom sel;
2842 2875
2843 selection_type |= selnum; 2876 selection_type |= selnum;
2844 2877
… …
2847 else if (selnum == Sel_Secondary) 2880 else if (selnum == Sel_Secondary)
2848 sel = XA_SECONDARY; 2881 sel = XA_SECONDARY;
2849 else 2882 else
2850 sel = xa[XA_CLIPBOARD]; 2883 sel = xa[XA_CLIPBOARD];
2851 2884
2852 if (XGetSelectionOwner (display->display, sel) != None) 2885 if (XGetSelectionOwner (xdisp, sel) != None)
2853 { 2886 {
2854 XConvertSelection (display->display, sel, target, xa[XA_VT_SELECTION], 2887 XConvertSelection (xdisp, sel, target, xa[XA_VT_SELECTION],
2855 vt, selection_request_time); 2888 vt, selection_request_time);
2856 return 1; 2889 return 1;
2857 } 2890 }
2858 2891
2859 return 0; 2892 return 0;
… …
2863/* 2896/*
2864 * Clear all selected text 2897 * Clear all selected text
2865 * EXT: SelectionClear 2898 * EXT: SelectionClear
2866 */ 2899 */
2867void 2900void
2868rxvt_term::selection_clear () 2901rxvt_term::selection_clear () NOTHROW
2869{ 2902{
2870 want_refresh = 1; 2903 want_refresh = 1;
2871 free (selection.text); 2904 free (selection.text);
2872 selection.text = NULL; 2905 selection.text = NULL;
2873 selection.len = 0; 2906 selection.len = 0;
… …
3008 3041
3009 selection_grab (tm); 3042 selection_grab (tm);
3010} 3043}
3011 3044
3012bool 3045bool
3013rxvt_term::selection_grab (Time tm) 3046rxvt_term::selection_grab (Time tm) NOTHROW
3014{ 3047{
3015 selection_time = tm; 3048 selection_time = tm;
3016 3049
3017 XSetSelectionOwner (display->display, XA_PRIMARY, vt, tm); 3050 XSetSelectionOwner (xdisp, XA_PRIMARY, vt, tm);
3018 if (XGetSelectionOwner (display->display, XA_PRIMARY) == vt) 3051 if (XGetSelectionOwner (xdisp, XA_PRIMARY) == vt)
3019 { 3052 {
3020 display->set_selection_owner (this); 3053 display->set_selection_owner (this);
3021 return true; 3054 return true;
3022 } 3055 }
3023 else 3056 else
… …
3027 } 3060 }
3028 3061
3029#if 0 3062#if 0
3030 XTextProperty ct; 3063 XTextProperty ct;
3031 3064
3032 if (XwcTextListToTextProperty (display->display, &selection.text, 1, XStringStyle, &ct) >= 0) 3065 if (XwcTextListToTextProperty (xdisp, &selection.text, 1, XStringStyle, &ct) >= 0)
3033 { 3066 {
3034 set_string_property (XA_CUT_BUFFER0, ct.value, ct.nitems); 3067 set_string_property (XA_CUT_BUFFER0, ct.value, ct.nitems);
3035 XFree (ct.value); 3068 XFree (ct.value);
3036 } 3069 }
3037#endif 3070#endif
… …
3041/* 3074/*
3042 * Mark or select text based upon number of clicks: 1, 2, or 3 3075 * Mark or select text based upon number of clicks: 1, 2, or 3
3043 * EXT: button 1 press 3076 * EXT: button 1 press
3044 */ 3077 */
3045void 3078void
3046rxvt_term::selection_click (int clicks, int x, int y) 3079rxvt_term::selection_click (int clicks, int x, int y) NOTHROW
3047{ 3080{
3048 clicks = ((clicks - 1) % 3) + 1; 3081 clicks = ((clicks - 1) % 3) + 1;
3049 selection.clicks = clicks; /* save clicks so extend will work */ 3082 selection.clicks = clicks; /* save clicks so extend will work */
3050 3083
3051 if (clicks == 2 && !selection.rect 3084 if (clicks == 2 && !selection.rect
… …
3070/* ------------------------------------------------------------------------- */ 3103/* ------------------------------------------------------------------------- */
3071/* 3104/*
3072 * Mark a selection at the specified col/row 3105 * Mark a selection at the specified col/row
3073 */ 3106 */
3074void 3107void
3075rxvt_term::selection_start_colrow (int col, int row) 3108rxvt_term::selection_start_colrow (int col, int row) NOTHROW
3076{ 3109{
3077 want_refresh = 1; 3110 want_refresh = 1;
3078 3111
3079 selection.mark.row = row + view_start; 3112 selection.mark.row = row + view_start;
3080 selection.mark.col = col; 3113 selection.mark.col = col;
… …
3106#define DELIMIT_TEXT(x) \ 3139#define DELIMIT_TEXT(x) \
3107 (unicode::is_space (x) ? 2 : (x) <= 0xff && !!strchr (rs[Rs_cutchars], (x))) 3140 (unicode::is_space (x) ? 2 : (x) <= 0xff && !!strchr (rs[Rs_cutchars], (x)))
3108#define DELIMIT_REND(x) 1 3141#define DELIMIT_REND(x) 1
3109 3142
3110void 3143void
3111rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) 3144rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) NOTHROW
3112{ 3145{
3113 int col, row, dirnadd, tcol, trow, w1, w2; 3146 int col, row, dirnadd, tcol, trow, w1, w2;
3114 row_col_t bound; 3147 row_col_t bound;
3115 text_t *stp; 3148 text_t *stp;
3116 rend_t *srp; 3149 rend_t *srp;
… …
3190 * flag == 0 ==> button 1 3223 * flag == 0 ==> button 1
3191 * flag == 1 ==> button 3 press 3224 * flag == 1 ==> button 3 press
3192 * flag == 2 ==> button 3 motion 3225 * flag == 2 ==> button 3 motion
3193 */ 3226 */
3194void 3227void
3195rxvt_term::selection_extend (int x, int y, int flag) 3228rxvt_term::selection_extend (int x, int y, int flag) NOTHROW
3196{ 3229{
3197 int col = clamp (Pixel2Col (x), 0, ncol); 3230 int col = clamp (Pixel2Col (x), 0, ncol);
3198 int row = clamp (Pixel2Row (y), 0, nrow - 1); 3231 int row = clamp (Pixel2Row (y), 0, nrow - 1);
3199 3232
3200 /* 3233 /*
… …
3226/* ------------------------------------------------------------------------- */ 3259/* ------------------------------------------------------------------------- */
3227/* 3260/*
3228 * Extend the selection to the specified col/row 3261 * Extend the selection to the specified col/row
3229 */ 3262 */
3230void 3263void
3231rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) 3264rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) NOTHROW
3232{ 3265{
3233 row_col_t pos; 3266 row_col_t pos;
3234 enum { 3267 enum {
3235 LEFT, RIGHT 3268 LEFT, RIGHT
3236 } closeto = RIGHT; 3269 } closeto = RIGHT;
… …
3422#endif 3455#endif
3423} 3456}
3424 3457
3425#if ENABLE_FRILLS 3458#if ENABLE_FRILLS
3426void 3459void
3427rxvt_term::selection_remove_trailing_spaces () 3460rxvt_term::selection_remove_trailing_spaces () NOTHROW
3428{ 3461{
3429 int32_t end_col, end_row; 3462 int32_t end_col, end_row;
3430 text_t *stp; 3463 text_t *stp;
3431 3464
3432 end_col = selection.end.col; 3465 end_col = selection.end.col;
… …
3470/* 3503/*
3471 * Double click on button 3 when already selected 3504 * Double click on button 3 when already selected
3472 * EXT: button 3 double click 3505 * EXT: button 3 double click
3473 */ 3506 */
3474void 3507void
3475rxvt_term::selection_rotate (int x, int y) 3508rxvt_term::selection_rotate (int x, int y) NOTHROW
3476{ 3509{
3477 selection.clicks = selection.clicks % 3 + 1; 3510 selection.clicks = selection.clicks % 3 + 1;
3478 selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1); 3511 selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1);
3479} 3512}
3480 3513
… …
3482/* 3515/*
3483 * Respond to a request for our current selection 3516 * Respond to a request for our current selection
3484 * EXT: SelectionRequest 3517 * EXT: SelectionRequest
3485 */ 3518 */
3486void 3519void
3487rxvt_term::selection_send (const XSelectionRequestEvent &rq) 3520rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW
3488{ 3521{
3489 XSelectionEvent ev; 3522 XSelectionEvent ev;
3490 dDisp;
3491 3523
3492 ev.type = SelectionNotify; 3524 ev.type = SelectionNotify;
3493 ev.property = None; 3525 ev.property = None;
3494 ev.display = rq.display; 3526 ev.display = rq.display;
3495 ev.requestor = rq.requestor; 3527 ev.requestor = rq.requestor;
… …
3509 *target++ = xa[XA_COMPOUND_TEXT]; 3541 *target++ = xa[XA_COMPOUND_TEXT];
3510#if X_HAVE_UTF8_STRING 3542#if X_HAVE_UTF8_STRING
3511 *target++ = xa[XA_UTF8_STRING]; 3543 *target++ = xa[XA_UTF8_STRING];
3512#endif 3544#endif
3513 3545
3514 XChangeProperty (disp, rq.requestor, rq.property, XA_ATOM, 3546 XChangeProperty (xdisp, rq.requestor, rq.property, XA_ATOM,
3515 32, PropModeReplace, 3547 32, PropModeReplace,
3516 (unsigned char *)target_list, target - target_list); 3548 (unsigned char *)target_list, target - target_list);
3517 ev.property = rq.property; 3549 ev.property = rq.property;
3518 } 3550 }
3519#if TODO // TODO 3551#if TODO // TODO
… …
3522 /* TODO: Handle MULTIPLE */ 3554 /* TODO: Handle MULTIPLE */
3523 } 3555 }
3524#endif 3556#endif
3525 else if (rq.target == xa[XA_TIMESTAMP] && selection.text) 3557 else if (rq.target == xa[XA_TIMESTAMP] && selection.text)
3526 { 3558 {
3527 XChangeProperty (disp, rq.requestor, rq.property, rq.target, 3559 XChangeProperty (xdisp, rq.requestor, rq.property, rq.target,
3528 32, PropModeReplace, (unsigned char *)&selection_time, 1); 3560 32, PropModeReplace, (unsigned char *)&selection_time, 1);
3529 ev.property = rq.property; 3561 ev.property = rq.property;
3530 } 3562 }
3531 else if (rq.target == XA_STRING 3563 else if (rq.target == XA_STRING
3532 || rq.target == xa[XA_TEXT] 3564 || rq.target == xa[XA_TEXT]
… …
3590 ct.value = (unsigned char *)rxvt_wcstoutf8 (cl, selectlen); 3622 ct.value = (unsigned char *)rxvt_wcstoutf8 (cl, selectlen);
3591 ct.nitems = strlen ((char *)ct.value); 3623 ct.nitems = strlen ((char *)ct.value);
3592 } 3624 }
3593 else 3625 else
3594#endif 3626#endif
3595 if (XwcTextListToTextProperty (disp, &cl, 1, (XICCEncodingStyle) style, &ct) >= 0) 3627 if (XwcTextListToTextProperty (xdisp, &cl, 1, (XICCEncodingStyle) style, &ct) >= 0)
3596 freect = 1; 3628 freect = 1;
3597 else 3629 else
3598 { 3630 {
3599 /* if we failed to convert then send it raw */ 3631 /* if we failed to convert then send it raw */
3600 ct.value = (unsigned char *)cl; 3632 ct.value = (unsigned char *)cl;
3601 ct.nitems = selectlen; 3633 ct.nitems = selectlen;
3602 ct.encoding = target; 3634 ct.encoding = target;
3603 } 3635 }
3604 3636
3605 XChangeProperty (disp, rq.requestor, rq.property, 3637 XChangeProperty (xdisp, rq.requestor, rq.property,
3606 ct.encoding, 8, PropModeReplace, 3638 ct.encoding, 8, PropModeReplace,
3607 ct.value, (int)ct.nitems); 3639 ct.value, (int)ct.nitems);
3608 ev.property = rq.property; 3640 ev.property = rq.property;
3609 3641
3610 if (freect) 3642 if (freect)
3611 XFree (ct.value); 3643 XFree (ct.value);
3612 } 3644 }
3613 3645
3614 XSendEvent (disp, rq.requestor, False, 0L, (XEvent *)&ev); 3646 XSendEvent (xdisp, rq.requestor, False, 0L, (XEvent *)&ev);
3615} 3647}
3616 3648
3617/* ------------------------------------------------------------------------- * 3649/* ------------------------------------------------------------------------- *
3618 * MOUSE ROUTINES * 3650 * MOUSE ROUTINES *
3619 * ------------------------------------------------------------------------- */ 3651 * ------------------------------------------------------------------------- */
3620 3652
3621/* 3653/*
3622 * return col/row values corresponding to x/y pixel values 3654 * return col/row values corresponding to x/y pixel values
3623 */ 3655 */
3624void 3656void
3625rxvt_term::pixel_position (int *x, int *y) 3657rxvt_term::pixel_position (int *x, int *y) NOTHROW
3626{ 3658{
3627 *x = Pixel2Col (*x); 3659 *x = Pixel2Col (*x);
3628 /* max_it (*x, 0); min_it (*x, (int)ncol - 1); */ 3660 /* max_it (*x, 0); min_it (*x, (int)ncol - 1); */
3629 *y = Pixel2Row (*y); 3661 *y = Pixel2Row (*y);
3630 /* max_it (*y, 0); min_it (*y, (int)nrow - 1); */ 3662 /* max_it (*y, 0); min_it (*y, (int)nrow - 1); */
3631} 3663}
3632 3664
3633/* ------------------------------------------------------------------------- */ 3665/* ------------------------------------------------------------------------- */
3634#ifdef USE_XIM 3666#ifdef USE_XIM
3635void 3667void
3636rxvt_term::im_set_position (XPoint &pos) 3668rxvt_term::im_set_position (XPoint &pos) NOTHROW
3637{ 3669{
3638 XWindowAttributes xwa; 3670 XWindowAttributes xwa;
3639 3671
3640 XGetWindowAttributes (display->display, vt, &xwa); 3672 XGetWindowAttributes (xdisp, vt, &xwa);
3641 3673
3642 pos.x = xwa.x + Col2Pixel (screen.cur.col); 3674 pos.x = xwa.x + Col2Pixel (screen.cur.col);
3643 pos.y = xwa.y + Height2Pixel (screen.cur.row) + fbase; 3675 pos.y = xwa.y + Height2Pixel (screen.cur.row) + fbase;
3644} 3676}
3645#endif 3677#endif
3646 3678
3647#if ENABLE_OVERLAY 3679#if ENABLE_OVERLAY
3648void 3680void
3649rxvt_term::scr_overlay_new (int x, int y, int w, int h) 3681rxvt_term::scr_overlay_new (int x, int y, int w, int h) NOTHROW
3650{ 3682{
3651 if (nrow < 1 || ncol < 1) 3683 if (nrow < 1 || ncol < 1)
3652 return; 3684 return;
3653 3685
3654 want_refresh = 1; 3686 want_refresh = 1;
… …
3699 *rp = r; 3731 *rp = r;
3700 } 3732 }
3701} 3733}
3702 3734
3703void 3735void
3704rxvt_term::scr_overlay_off () 3736rxvt_term::scr_overlay_off () NOTHROW
3705{ 3737{
3706 if (!ov_text) 3738 if (!ov_text)
3707 return; 3739 return;
3708 3740
3709 want_refresh = 1; 3741 want_refresh = 1;
… …
3717 delete [] ov_text; ov_text = 0; 3749 delete [] ov_text; ov_text = 0;
3718 delete [] ov_rend; ov_rend = 0; 3750 delete [] ov_rend; ov_rend = 0;
3719} 3751}
3720 3752
3721void 3753void
3722rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) 3754rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) NOTHROW
3723{ 3755{
3724 if (!ov_text || x >= ov_w - 2 || y >= ov_h - 2) 3756 if (!ov_text || x >= ov_w - 2 || y >= ov_h - 2)
3725 return; 3757 return;
3726 3758
3727 x++, y++; 3759 x++, y++;
… …
3729 ov_text[y][x] = text; 3761 ov_text[y][x] = text;
3730 ov_rend[y][x] = rend; 3762 ov_rend[y][x] = rend;
3731} 3763}
3732 3764
3733void 3765void
3734rxvt_term::scr_overlay_set (int x, int y, const char *s) 3766rxvt_term::scr_overlay_set (int x, int y, const char *s) NOTHROW
3735{ 3767{
3736 while (*s) 3768 while (*s)
3737 scr_overlay_set (x++, y, *s++); 3769 scr_overlay_set (x++, y, *s++);
3738} 3770}
3739 3771
3740void 3772void
3741rxvt_term::scr_overlay_set (int x, int y, const wchar_t *s) 3773rxvt_term::scr_overlay_set (int x, int y, const wchar_t *s) NOTHROW
3742{ 3774{
3743 while (*s) 3775 while (*s)
3744 { 3776 {
3745 text_t t = *s++; 3777 text_t t = *s++;
3746 int width = wcwidth (t); 3778 int width = WCWIDTH (t);
3747 3779
3748 while (width--) 3780 while (width--)
3749 { 3781 {
3750 scr_overlay_set (x++, y, t); 3782 scr_overlay_set (x++, y, t);
3751 t = NOCHAR; 3783 t = NOCHAR;
3752 } 3784 }
3753 } 3785 }
3754} 3786}
3755 3787
3756void 3788void
3757rxvt_term::scr_swap_overlay () 3789rxvt_term::scr_swap_overlay () NOTHROW
3758{ 3790{
3759 if (!ov_text) 3791 if (!ov_text)
3760 return; 3792 return;
3761 3793
3762 // swap screen mem with overlay 3794 // swap screen mem with overlay

Diff Legend

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