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.235 by root, Tue Jan 17 05:47:42 2006 UTC vs.
Revision 1.253 by root, Fri Jan 27 18:36:43 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;
… …
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
… …
325 qline->l = ncol; 327 qline->l = ncol;
326 qline->is_longer (1); 328 qline->is_longer (1);
327 329
328 int qcol = 0; 330 int qcol = 0;
329 331
332 // see below for cursor adjustment rationale
333 if (p == ocur.row)
334 screen.cur.row = q - (total_rows - nrow);
335
330 // fill a single destination line 336 // fill a single destination line
331 while (lofs < llen && qcol < ncol) 337 while (lofs < llen && qcol < ncol)
332 { 338 {
333 int prow = lofs / prev_ncol; 339 int prow = lofs / prev_ncol;
334 int pcol = lofs % prev_ncol; 340 int pcol = lofs % prev_ncol;
… …
344 350
345 line_t &pline = old_buf [prow]; 351 line_t &pline = old_buf [prow];
346 352
347 int len = min (min (prev_ncol - pcol, ncol - qcol), llen - lofs); 353 int len = min (min (prev_ncol - pcol, ncol - qcol), llen - lofs);
348 354
349 assert (len);
350 assert (pline.t);
351
352 memcpy (qline->t + qcol, pline.t + pcol, len * sizeof (text_t)); 355 memcpy (qline->t + qcol, pline.t + pcol, len * sizeof (text_t));
353 memcpy (qline->r + qcol, pline.r + pcol, len * sizeof (rend_t)); 356 memcpy (qline->r + qcol, pline.r + pcol, len * sizeof (rend_t));
354 357
355 lofs += len; 358 lofs += len;
356 qcol += len; 359 qcol += len;
… …
389 } 392 }
390 393
391 term_start = 0; 394 term_start = 0;
392 } 395 }
393 396
394#ifdef DEBUG_STRICT //TODO: remove
395 for (int i = top_row; i < nrow; i++)
396 assert (ROW (i).t);
397#endif
398
399 free (old_buf); 397 free (old_buf);
400 delete old_ta; 398 delete old_ta;
401 delete old_ra; 399 delete old_ra;
402 400
403 clamp_it (screen.cur.row, 0, nrow - 1); 401 clamp_it (screen.cur.row, 0, nrow - 1);
404 clamp_it (screen.cur.col, 0, ncol - 1); 402 clamp_it (screen.cur.col, 0, ncol - 1);
405 403
406 if (tabs)
407 free (tabs); 404 free (tabs);
408 } 405 }
406
407 CLEAR_ALL_SELECTION ();
409 408
410 prev_nrow = nrow; 409 prev_nrow = nrow;
411 prev_ncol = ncol; 410 prev_ncol = ncol;
412 411
413 tabs = (char *)rxvt_malloc (ncol * sizeof (char)); 412 tabs = (char *)rxvt_malloc (ncol * sizeof (char));
414 413
415 for (int col = ncol; col--; ) 414 for (int col = ncol; col--; )
416 tabs [col] = col % TABSIZE == 0; 415 tabs [col] = col % TABSIZE == 0;
417 416
417 if (current_screen != PRIMARY)
418 scr_swap_screen ();
419
418 tt_winch (); 420 tt_winch ();
419 421
420 HOOK_INVOKE ((this, HOOK_RESET, DT_END)); 422 HOOK_INVOKE ((this, HOOK_RESET, DT_END));
421} 423}
422 424
423/* ------------------------------------------------------------------------- */ 425/* ------------------------------------------------------------------------- */
424/* 426/*
425 * Free everything. That way malloc debugging can find leakage. 427 * Free everything. That way malloc debugging can find leakage.
426 */ 428 */
427void 429void
428rxvt_term::scr_release () 430rxvt_term::scr_release () NOTHROW
429{ 431{
432 if (row_buf)
433 {
430 delete talloc; talloc = 0; 434 delete talloc; talloc = 0;
431 delete ralloc; ralloc = 0; 435 delete ralloc; ralloc = 0;
432 436
433 free (row_buf); 437 free (row_buf);
434 free (swap_buf); 438 free (swap_buf);
435 free (drawn_buf); 439 free (drawn_buf);
436 free (tabs); 440 free (tabs);
437 441
438 row_buf = 0; // signal that we freed all the arrays 442 row_buf = 0; // signal that we freed all the arrays
443 }
439} 444}
440 445
441/* ------------------------------------------------------------------------- */ 446/* ------------------------------------------------------------------------- */
442/* 447/*
443 * Hard reset 448 * Hard reset
… …
460 * Save and Restore cursor 465 * Save and Restore cursor
461 * XTERM_SEQ: Save cursor : ESC 7 466 * XTERM_SEQ: Save cursor : ESC 7
462 * XTERM_SEQ: Restore cursor: ESC 8 467 * XTERM_SEQ: Restore cursor: ESC 8
463 */ 468 */
464void 469void
465rxvt_term::scr_cursor (int mode) 470rxvt_term::scr_cursor (cursor_mode mode) NOTHROW
466{ 471{
467 screen_t *s; 472 screen_t *s;
468 473
469#if NSCREENS && !defined(NO_SECONDARY_SCREEN_CURSOR) 474#if NSCREENS && !defined(NO_SECONDARY_SCREEN_CURSOR)
470 if (current_screen == SECONDARY) 475 if (current_screen == SECONDARY)
… …
502 assert (s->cur.row >= 0); 507 assert (s->cur.row >= 0);
503 assert (s->cur.col >= 0); 508 assert (s->cur.col >= 0);
504#endif 509#endif
505} 510}
506 511
512void
513rxvt_term::scr_swap_screen ()
514{
515 if (!OPTION (Opt_secondaryScreen))
516 return;
517
518 for (int i = prev_nrow; i--; )
519 ::swap (ROW(i), swap_buf [i]);
520
521 ::swap (screen.cur, swap.cur);
522
523 screen.cur.row = clamp (screen.cur.row, 0, prev_nrow - 1);
524 screen.cur.col = clamp (screen.cur.col, 0, prev_ncol - 1);
525}
526
507/* ------------------------------------------------------------------------- */ 527/* ------------------------------------------------------------------------- */
508/* 528/*
509 * Swap between primary and secondary screens 529 * Swap between primary and secondary screens
510 * XTERM_SEQ: Primary screen : ESC [ ? 4 7 h 530 * XTERM_SEQ: Primary screen : ESC [ ? 4 7 h
511 * XTERM_SEQ: Secondary screen: ESC [ ? 4 7 l 531 * XTERM_SEQ: Secondary screen: ESC [ ? 4 7 l
512 */ 532 */
513int 533void
514rxvt_term::scr_change_screen (int scrn) 534rxvt_term::scr_change_screen (int scrn)
515{ 535{
536 if (scrn == current_screen)
537 return;
538
516 want_refresh = 1; 539 want_refresh = 1;
517 view_start = 0; 540 view_start = 0;
518 541
519 if (current_screen == scrn)
520 return scrn;
521
522 selection_check (2); /* check for boundary cross */ 542 selection_check (2); /* check for boundary cross */
523 543
524 int i = current_screen; current_screen = scrn; scrn = i; 544 int i = current_screen; current_screen = scrn; scrn = i;
525
526 ::swap (screen.cur.row, swap.cur.row);
527 ::swap (screen.cur.col, swap.cur.col);
528
529 screen.cur.row = clamp (screen.cur.row, 0, prev_nrow - 1);
530 screen.cur.col = clamp (screen.cur.col, 0, prev_ncol - 1);
531 545
532#if NSCREENS 546#if NSCREENS
533 if (OPTION (Opt_secondaryScreen)) 547 if (OPTION (Opt_secondaryScreen))
534 { 548 {
535 num_scr = 0; 549 num_scr = 0;
536 550
537 for (int i = prev_nrow; i--; ) 551 scr_swap_screen ();
538 ::swap (ROW(i), swap_buf [i]);
539 552
540 ::swap (screen.charset, swap.charset); 553 ::swap (screen.charset, swap.charset);
541 ::swap (screen.flags, swap.flags); 554 ::swap (screen.flags, swap.flags);
542 screen.flags |= Screen_VisibleCursor; 555 screen.flags |= Screen_VisibleCursor;
543 swap.flags |= Screen_VisibleCursor; 556 swap.flags |= Screen_VisibleCursor;
544 } 557 }
545 else 558 else
546#endif 559#endif
547 if (OPTION (Opt_secondaryScroll)) 560 if (OPTION (Opt_secondaryScroll))
548 scr_scroll_text (0, prev_nrow - 1, prev_nrow); 561 scr_scroll_text (0, prev_nrow - 1, prev_nrow);
549
550 return scrn;
551} 562}
552 563
553// clear WrapNext indicator, solidifying position on next line 564// clear WrapNext indicator, solidifying position on next line
554void 565void
555rxvt_term::scr_do_wrap () 566rxvt_term::scr_do_wrap () NOTHROW
556{ 567{
557 if (!(screen.flags & Screen_WrapNext)) 568 if (!(screen.flags & Screen_WrapNext))
558 return; 569 return;
559 570
560 screen.flags &= ~Screen_WrapNext; 571 screen.flags &= ~Screen_WrapNext;
… …
570/* ------------------------------------------------------------------------- */ 581/* ------------------------------------------------------------------------- */
571/* 582/*
572 * Change the colour for following text 583 * Change the colour for following text
573 */ 584 */
574void 585void
575rxvt_term::scr_color (unsigned int color, int fgbg) 586rxvt_term::scr_color (unsigned int color, int fgbg) NOTHROW
576{ 587{
577 if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR)) 588 if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR))
578 color = fgbg; 589 color = fgbg;
579 590
580 if (fgbg == Color_fg) 591 if (fgbg == Color_fg)
… …
586/* ------------------------------------------------------------------------- */ 597/* ------------------------------------------------------------------------- */
587/* 598/*
588 * Change the rendition style for following text 599 * Change the rendition style for following text
589 */ 600 */
590void 601void
591rxvt_term::scr_rendition (int set, int style) 602rxvt_term::scr_rendition (int set, int style) NOTHROW
592 { 603 {
593 if (set) 604 if (set)
594 rstyle |= style; 605 rstyle |= style;
595 else if (style == ~RS_None) 606 else if (style == ~RS_None)
596 rstyle = DEFAULT_RSTYLE; 607 rstyle = DEFAULT_RSTYLE;
… …
603 * Scroll text between <row1> and <row2> inclusive, by <count> lines 614 * Scroll text between <row1> and <row2> inclusive, by <count> lines
604 * count positive ==> scroll up 615 * count positive ==> scroll up
605 * count negative ==> scroll down 616 * count negative ==> scroll down
606 */ 617 */
607int 618int
608rxvt_term::scr_scroll_text (int row1, int row2, int count) 619rxvt_term::scr_scroll_text (int row1, int row2, int count) NOTHROW
609{ 620{
610 if (count == 0 || (row1 > row2)) 621 if (count == 0 || (row1 > row2))
611 return 0; 622 return 0;
612 623
613 want_refresh = 1; 624 want_refresh = 1;
… …
620 top_row = max (top_row - count, -saveLines); 631 top_row = max (top_row - count, -saveLines);
621 632
622 // scroll everything up 'count' lines 633 // scroll everything up 'count' lines
623 term_start = (term_start + count) % total_rows; 634 term_start = (term_start + count) % total_rows;
624 635
636 // sever bottommost line
625 { 637 {
626 // severe bottommost scrolled line
627 line_t &l = ROW(row2 - count); 638 line_t &l = ROW(row2 - count);
639 l.is_longer (0);
628 l.touch (); 640 l.touch ();
629 l.is_longer (0);
630 } 641 }
631 642
632 // erase newly scorlled-in lines 643 // erase newly scrolled-in lines
633 for (int i = count; i; --i ) 644 for (int i = count; i--; )
634 { 645 scr_blank_screen_mem (ROW(nrow - 1 - i), rstyle);
635 // basically this is a slightly optimized scr_blank_screen_mem
636 // it is worth the effort on slower machines
637 line_t &l = ROW(nrow - i);
638
639 scr_blank_line (l, 0, l.l, rstyle);
640
641 l.l = 0;
642 l.f = 0;
643 }
644 646
645 // now copy lines below the scroll region bottom to the 647 // now copy lines below the scroll region bottom to the
646 // bottom of the screen again, so they look as if they 648 // bottom of the screen again, so they look as if they
647 // hadn't moved. 649 // hadn't moved.
648 for (int i = nrow; --i > row2; ) 650 for (int i = nrow; --i > row2; )
… …
731/* ------------------------------------------------------------------------- */ 733/* ------------------------------------------------------------------------- */
732/* 734/*
733 * Add text given in <str> of length <len> to screen struct 735 * Add text given in <str> of length <len> to screen struct
734 */ 736 */
735void 737void
736rxvt_term::scr_add_lines (const wchar_t *str, int len, int minlines) 738rxvt_term::scr_add_lines (const wchar_t *str, int len, int minlines) NOTHROW
737{ 739{
738 if (len <= 0) /* sanity */ 740 if (len <= 0) /* sanity */
739 return; 741 return;
740 742
741 unsigned char checksel; 743 unsigned char checksel;
… …
747 ZERO_SCROLLBACK (); 749 ZERO_SCROLLBACK ();
748 750
749 if (minlines > 0) 751 if (minlines > 0)
750 { 752 {
751 minlines += screen.cur.row - screen.bscroll; 753 minlines += screen.cur.row - screen.bscroll;
754 min_it (minlines, screen.cur.row - top_row);
752 755
753 if (minlines > 0 756 if (minlines > 0
754 && screen.tscroll == 0 757 && screen.tscroll == 0
755 && screen.bscroll == nrow - 1) 758 && screen.bscroll == nrow - 1)
756 { 759 {
… …
817 CLEAR_SELECTION (); 820 CLEAR_SELECTION ();
818 } 821 }
819 822
820 if (screen.flags & Screen_WrapNext) 823 if (screen.flags & Screen_WrapNext)
821 { 824 {
822 max_it (line->l, ncol);
823 line->is_longer (1);
824
825 scr_do_wrap (); 825 scr_do_wrap ();
826 826
827 line->l = ncol;
828 line->is_longer (1);
829
827 row = screen.cur.row; 830 row = screen.cur.row;
828 line = &ROW(row); /* _must_ refresh */ 831 line = &ROW(row); /* _must_ refresh */
829 } 832 }
830 833
831 // some utf-8 decoders "decode" surrogate characters: let's fix this. 834 // some utf-8 decoders "decode" surrogate characters: let's fix this.
832 if (IN_RANGE_INC (c, 0xd800, 0xdfff)) 835 if (IN_RANGE_INC (c, 0xd800, 0xdfff))
833 c = 0xfffd; 836 c = 0xfffd;
834 837
835 // rely on wcwidth to tell us the character width, at least for non-latin1 838 // rely on wcwidth to tell us the character width, do wcwidth before
836 // do wcwidth before further replacements, as wcwidth might return -1 839 // further replacements, as wcwidth might return -1 for the line
837 // for the line drawing characters below as they might be invalid in the current 840 // drawing characters below as they might be invalid in the current
838 // locale. 841 // locale.
839 int width = c < 0x100 ? 1 : wcwidth (c); 842 int width = WCWIDTH (c);
840 843
841 if (charsets [screen.charset] == '0') // DEC SPECIAL 844 if (charsets [screen.charset] == '0') // DEC SPECIAL
842 { 845 {
843 // vt100 special graphics and line drawing 846 // vt100 special graphics and line drawing
844 // 5f-7e standard vt100 847 // 5f-7e standard vt100
… …
995/* 998/*
996 * Process Backspace. Move back the cursor back a position, wrap if have to 999 * Process Backspace. Move back the cursor back a position, wrap if have to
997 * XTERM_SEQ: CTRL-H 1000 * XTERM_SEQ: CTRL-H
998 */ 1001 */
999void 1002void
1000rxvt_term::scr_backspace () 1003rxvt_term::scr_backspace () NOTHROW
1001{ 1004{
1002 want_refresh = 1; 1005 want_refresh = 1;
1003 1006
1004 if (screen.cur.col == 0) 1007 if (screen.cur.col == 0)
1005 { 1008 {
… …
1023 * Process Horizontal Tab 1026 * Process Horizontal Tab
1024 * count: +ve = forward; -ve = backwards 1027 * count: +ve = forward; -ve = backwards
1025 * XTERM_SEQ: CTRL-I 1028 * XTERM_SEQ: CTRL-I
1026 */ 1029 */
1027void 1030void
1028rxvt_term::scr_tab (int count, bool ht) 1031rxvt_term::scr_tab (int count, bool ht) NOTHROW
1029{ 1032{
1030 int i, x; 1033 int i, x;
1031 1034
1032 want_refresh = 1; 1035 want_refresh = 1;
1033 i = x = screen.cur.col; 1036 i = x = screen.cur.col;
… …
1100 * Move cursor left in row. If we're at the left boundary, shift everything 1103 * Move cursor left in row. If we're at the left boundary, shift everything
1101 * in that row right. Clear left column. 1104 * in that row right. Clear left column.
1102 */ 1105 */
1103#if ENABLE_FRILLS 1106#if ENABLE_FRILLS
1104void 1107void
1105rxvt_term::scr_backindex () 1108rxvt_term::scr_backindex () NOTHROW
1106{ 1109{
1107 if (screen.cur.col > 0) 1110 if (screen.cur.col > 0)
1108 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE); 1111 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE);
1109 else 1112 else
1110 scr_insdel_chars (1, INSERT); 1113 scr_insdel_chars (1, INSERT);
… …
1117 * Move cursor right in row. If we're at the right boundary, shift everything 1120 * Move cursor right in row. If we're at the right boundary, shift everything
1118 * in that row left. Clear right column. 1121 * in that row left. Clear right column.
1119 */ 1122 */
1120#if ENABLE_FRILLS 1123#if ENABLE_FRILLS
1121void 1124void
1122rxvt_term::scr_forwardindex () 1125rxvt_term::scr_forwardindex () NOTHROW
1123{ 1126{
1124 if (screen.cur.col < ncol - 1) 1127 if (screen.cur.col < ncol - 1)
1125 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE); 1128 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE);
1126 else 1129 else
1127 { 1130 {
… …
1140/* ------------------------------------------------------------------------- */ 1143/* ------------------------------------------------------------------------- */
1141/* 1144/*
1142 * Goto Row/Column 1145 * Goto Row/Column
1143 */ 1146 */
1144void 1147void
1145rxvt_term::scr_gotorc (int row, int col, int relative) 1148rxvt_term::scr_gotorc (int row, int col, int relative) NOTHROW
1146{ 1149{
1147 want_refresh = 1; 1150 want_refresh = 1;
1148 ZERO_SCROLLBACK (); 1151 ZERO_SCROLLBACK ();
1149 1152
1150 screen.cur.col = relative & C_RELATIVE ? screen.cur.col + col : col; 1153 screen.cur.col = relative & C_RELATIVE ? screen.cur.col + col : col;
… …
1188/* ------------------------------------------------------------------------- */ 1191/* ------------------------------------------------------------------------- */
1189/* 1192/*
1190 * direction should be UP or DN 1193 * direction should be UP or DN
1191 */ 1194 */
1192void 1195void
1193rxvt_term::scr_index (enum page_dirn direction) 1196rxvt_term::scr_index (enum page_dirn direction) NOTHROW
1194{ 1197{
1195 int dirn; 1198 int dirn;
1196 1199
1197 want_refresh = 1; 1200 want_refresh = 1;
1198 ZERO_SCROLLBACK (); 1201 ZERO_SCROLLBACK ();
… …
1217 * XTERM_SEQ: Clear line to right: ESC [ 0 K 1220 * XTERM_SEQ: Clear line to right: ESC [ 0 K
1218 * XTERM_SEQ: Clear line to left : ESC [ 1 K 1221 * XTERM_SEQ: Clear line to left : ESC [ 1 K
1219 * XTERM_SEQ: Clear whole line : ESC [ 2 K 1222 * XTERM_SEQ: Clear whole line : ESC [ 2 K
1220 */ 1223 */
1221void 1224void
1222rxvt_term::scr_erase_line (int mode) 1225rxvt_term::scr_erase_line (int mode) NOTHROW
1223{ 1226{
1224 unsigned int col, num; 1227 unsigned int col, num;
1225 1228
1226 want_refresh = 1; 1229 want_refresh = 1;
1227 ZERO_SCROLLBACK (); 1230 ZERO_SCROLLBACK ();
… …
1271 * XTERM_SEQ: Clear screen after cursor : ESC [ 0 J 1274 * XTERM_SEQ: Clear screen after cursor : ESC [ 0 J
1272 * XTERM_SEQ: Clear screen before cursor: ESC [ 1 J 1275 * XTERM_SEQ: Clear screen before cursor: ESC [ 1 J
1273 * XTERM_SEQ: Clear whole screen : ESC [ 2 J 1276 * XTERM_SEQ: Clear whole screen : ESC [ 2 J
1274 */ 1277 */
1275void 1278void
1276rxvt_term::scr_erase_screen (int mode) 1279rxvt_term::scr_erase_screen (int mode) NOTHROW
1277{ 1280{
1278 int num; 1281 int num;
1279 int32_t row; 1282 int32_t row;
1280 rend_t ren; 1283 rend_t ren;
1281 XGCValues gcvalue; 1284 XGCValues gcvalue;
… …
1326 } 1329 }
1327 else 1330 else
1328 { 1331 {
1329 ren = rstyle & (RS_fgMask | RS_bgMask); 1332 ren = rstyle & (RS_fgMask | RS_bgMask);
1330 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)]; 1333 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)];
1331 XChangeGC (display->display, gc, GCForeground, &gcvalue); 1334 XChangeGC (xdisp, gc, GCForeground, &gcvalue);
1332 ERASE_ROWS (row, num); 1335 ERASE_ROWS (row, num);
1333 gcvalue.foreground = pix_colors[Color_fg]; 1336 gcvalue.foreground = pix_colors[Color_fg];
1334 XChangeGC (display->display, gc, GCForeground, &gcvalue); 1337 XChangeGC (xdisp, gc, GCForeground, &gcvalue);
1335 } 1338 }
1336 1339
1337 for (; num--; row++) 1340 for (; num--; row++)
1338 { 1341 {
1339 scr_blank_screen_mem (ROW(row), rstyle); 1342 scr_blank_screen_mem (ROW(row), rstyle);
… …
1341 } 1344 }
1342} 1345}
1343 1346
1344#if ENABLE_FRILLS 1347#if ENABLE_FRILLS
1345void 1348void
1346rxvt_term::scr_erase_savelines () 1349rxvt_term::scr_erase_savelines () NOTHROW
1347{ 1350{
1348 want_refresh = 1; 1351 want_refresh = 1;
1349 ZERO_SCROLLBACK (); 1352 ZERO_SCROLLBACK ();
1350 1353
1351 top_row = 0; 1354 top_row = 0;
… …
1356/* 1359/*
1357 * Fill the screen with `E's 1360 * Fill the screen with `E's
1358 * XTERM_SEQ: Screen Alignment Test: ESC # 8 1361 * XTERM_SEQ: Screen Alignment Test: ESC # 8
1359 */ 1362 */
1360void 1363void
1361rxvt_term::scr_E () 1364rxvt_term::scr_E () NOTHROW
1362{ 1365{
1363 rend_t fs; 1366 rend_t fs;
1364 1367
1365 want_refresh = 1; 1368 want_refresh = 1;
1366 ZERO_SCROLLBACK (); 1369 ZERO_SCROLLBACK ();
… …
1387/* ------------------------------------------------------------------------- */ 1390/* ------------------------------------------------------------------------- */
1388/* 1391/*
1389 * Insert/Delete <count> lines 1392 * Insert/Delete <count> lines
1390 */ 1393 */
1391void 1394void
1392rxvt_term::scr_insdel_lines (int count, int insdel) 1395rxvt_term::scr_insdel_lines (int count, int insdel) NOTHROW
1393{ 1396{
1394 int end; 1397 int end;
1395 1398
1396 ZERO_SCROLLBACK (); 1399 ZERO_SCROLLBACK ();
1397 1400
… …
1417/* ------------------------------------------------------------------------- */ 1420/* ------------------------------------------------------------------------- */
1418/* 1421/*
1419 * Insert/Delete <count> characters from the current position 1422 * Insert/Delete <count> characters from the current position
1420 */ 1423 */
1421void 1424void
1422rxvt_term::scr_insdel_chars (int count, int insdel) 1425rxvt_term::scr_insdel_chars (int count, int insdel) NOTHROW
1423{ 1426{
1424 int col, row; 1427 int col, row;
1425 rend_t tr; 1428 rend_t tr;
1426 1429
1427 want_refresh = 1; 1430 want_refresh = 1;
… …
1515/* 1518/*
1516 * Set the scrolling region 1519 * Set the scrolling region
1517 * XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r 1520 * XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r
1518 */ 1521 */
1519void 1522void
1520rxvt_term::scr_scroll_region (int top, int bot) 1523rxvt_term::scr_scroll_region (int top, int bot) NOTHROW
1521{ 1524{
1522 max_it (top, 0); 1525 max_it (top, 0);
1523 min_it (bot, nrow - 1); 1526 min_it (bot, nrow - 1);
1524 1527
1525 if (top > bot) 1528 if (top > bot)
… …
1535 * Make the cursor visible/invisible 1538 * Make the cursor visible/invisible
1536 * XTERM_SEQ: Make cursor visible : ESC [ ? 25 h 1539 * XTERM_SEQ: Make cursor visible : ESC [ ? 25 h
1537 * XTERM_SEQ: Make cursor invisible: ESC [ ? 25 l 1540 * XTERM_SEQ: Make cursor invisible: ESC [ ? 25 l
1538 */ 1541 */
1539void 1542void
1540rxvt_term::scr_cursor_visible (int mode) 1543rxvt_term::scr_cursor_visible (int mode) NOTHROW
1541{ 1544{
1542 want_refresh = 1; 1545 want_refresh = 1;
1543 1546
1544 if (mode) 1547 if (mode)
1545 screen.flags |= Screen_VisibleCursor; 1548 screen.flags |= Screen_VisibleCursor;
… …
1552 * Set/unset automatic wrapping 1555 * Set/unset automatic wrapping
1553 * XTERM_SEQ: Set Wraparound : ESC [ ? 7 h 1556 * XTERM_SEQ: Set Wraparound : ESC [ ? 7 h
1554 * XTERM_SEQ: Unset Wraparound: ESC [ ? 7 l 1557 * XTERM_SEQ: Unset Wraparound: ESC [ ? 7 l
1555 */ 1558 */
1556void 1559void
1557rxvt_term::scr_autowrap (int mode) 1560rxvt_term::scr_autowrap (int mode) NOTHROW
1558{ 1561{
1559 if (mode) 1562 if (mode)
1560 screen.flags |= Screen_Autowrap; 1563 screen.flags |= Screen_Autowrap;
1561 else 1564 else
1562 screen.flags &= ~(Screen_Autowrap | Screen_WrapNext); 1565 screen.flags &= ~(Screen_Autowrap | Screen_WrapNext);
… …
1571 * and the cursor cannot be moved outside. 1574 * and the cursor cannot be moved outside.
1572 * XTERM_SEQ: Set Absolute: ESC [ ? 6 h 1575 * XTERM_SEQ: Set Absolute: ESC [ ? 6 h
1573 * XTERM_SEQ: Set Relative: ESC [ ? 6 l 1576 * XTERM_SEQ: Set Relative: ESC [ ? 6 l
1574 */ 1577 */
1575void 1578void
1576rxvt_term::scr_relative_origin (int mode) 1579rxvt_term::scr_relative_origin (int mode) NOTHROW
1577{ 1580{
1578 if (mode) 1581 if (mode)
1579 screen.flags |= Screen_Relative; 1582 screen.flags |= Screen_Relative;
1580 else 1583 else
1581 screen.flags &= ~Screen_Relative; 1584 screen.flags &= ~Screen_Relative;
… …
1588 * Set insert/replace mode 1591 * Set insert/replace mode
1589 * XTERM_SEQ: Set Insert mode : ESC [ ? 4 h 1592 * XTERM_SEQ: Set Insert mode : ESC [ ? 4 h
1590 * XTERM_SEQ: Set Replace mode: ESC [ ? 4 l 1593 * XTERM_SEQ: Set Replace mode: ESC [ ? 4 l
1591 */ 1594 */
1592void 1595void
1593rxvt_term::scr_insert_mode (int mode) 1596rxvt_term::scr_insert_mode (int mode) NOTHROW
1594{ 1597{
1595 if (mode) 1598 if (mode)
1596 screen.flags |= Screen_Insert; 1599 screen.flags |= Screen_Insert;
1597 else 1600 else
1598 screen.flags &= ~Screen_Insert; 1601 screen.flags &= ~Screen_Insert;
… …
1604 * XTERM_SEQ: Set tab at current column : ESC H 1607 * XTERM_SEQ: Set tab at current column : ESC H
1605 * XTERM_SEQ: Clear tab at current column: ESC [ 0 g 1608 * XTERM_SEQ: Clear tab at current column: ESC [ 0 g
1606 * XTERM_SEQ: Clear all tabs : ESC [ 3 g 1609 * XTERM_SEQ: Clear all tabs : ESC [ 3 g
1607 */ 1610 */
1608void 1611void
1609rxvt_term::scr_set_tab (int mode) 1612rxvt_term::scr_set_tab (int mode) NOTHROW
1610{ 1613{
1611 if (mode < 0) 1614 if (mode < 0)
1612 memset (tabs, 0, ncol * sizeof (char)); 1615 memset (tabs, 0, ncol * sizeof (char));
1613 else if (screen.cur.col < ncol) 1616 else if (screen.cur.col < ncol)
1614 tabs [screen.cur.col] = !!mode; 1617 tabs [screen.cur.col] = !!mode;
… …
1619 * Set reverse/normal video 1622 * Set reverse/normal video
1620 * XTERM_SEQ: Reverse video: ESC [ ? 5 h 1623 * XTERM_SEQ: Reverse video: ESC [ ? 5 h
1621 * XTERM_SEQ: Normal video : ESC [ ? 5 l 1624 * XTERM_SEQ: Normal video : ESC [ ? 5 l
1622 */ 1625 */
1623void 1626void
1624rxvt_term::scr_rvideo_mode (int mode) 1627rxvt_term::scr_rvideo_mode (bool on) NOTHROW
1625{ 1628{
1626 XGCValues gcvalue; 1629 rvideo_mode = on;
1627 1630
1631#ifndef NO_BELL
1632 on ^= rvideo_bell;
1633#endif
1634
1628 if (rvideo != mode) 1635 if (rvideo_state != on)
1629 { 1636 {
1630 rvideo = mode; 1637 rvideo_state = on;
1638
1631 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]); 1639 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]);
1632#if XPM_BACKGROUND 1640#if XPM_BACKGROUND
1633 if (bgPixmap.pixmap == None) 1641 if (bgPixmap.pixmap == None)
1634#endif 1642#endif
1635#if TRANSPARENT 1643#if TRANSPARENT
1636 if (! OPTION (Opt_transparent) || am_transparent == 0) 1644 if (!OPTION (Opt_transparent) || am_transparent == 0)
1637#endif 1645#endif
1638 XSetWindowBackground (display->display, vt, 1646 XSetWindowBackground (xdisp, vt, pix_colors[Color_bg]);
1639 pix_colors[Color_bg]);
1640 1647
1648 XGCValues gcvalue;
1641 gcvalue.foreground = pix_colors[Color_fg]; 1649 gcvalue.foreground = pix_colors[Color_fg];
1642 gcvalue.background = pix_colors[Color_bg]; 1650 gcvalue.background = pix_colors[Color_bg];
1643 XChangeGC (display->display, gc, GCBackground | GCForeground, 1651 XChangeGC (xdisp, gc, GCBackground | GCForeground, &gcvalue);
1644 &gcvalue); 1652
1645 scr_clear (); 1653 scr_clear ();
1646 scr_touch (true); 1654 scr_touch (true);
1647 } 1655 }
1648} 1656}
1649 1657
… …
1651/* 1659/*
1652 * Report current cursor position 1660 * Report current cursor position
1653 * XTERM_SEQ: Report position: ESC [ 6 n 1661 * XTERM_SEQ: Report position: ESC [ 6 n
1654 */ 1662 */
1655void 1663void
1656rxvt_term::scr_report_position () 1664rxvt_term::scr_report_position () NOTHROW
1657{ 1665{
1658 tt_printf ("\033[%d;%dR", screen.cur.row + 1, screen.cur.col + 1); 1666 tt_printf ("\033[%d;%dR", screen.cur.row + 1, screen.cur.col + 1);
1659} 1667}
1660 1668
1661/* ------------------------------------------------------------------------- * 1669/* ------------------------------------------------------------------------- *
… …
1664 1672
1665/* 1673/*
1666 * Set font style 1674 * Set font style
1667 */ 1675 */
1668void 1676void
1669rxvt_term::set_font_style () 1677rxvt_term::set_font_style () NOTHROW
1670{ 1678{
1671#if 0 1679#if 0
1672 switch (charsets [screen.charset]) 1680 switch (charsets [screen.charset])
1673 { 1681 {
1674 case '0': /* DEC Special Character & Line Drawing Set */ 1682 case '0': /* DEC Special Character & Line Drawing Set */
… …
1696 * XTERM_SEQ: Invoke G1 character set: CTRL-N 1704 * XTERM_SEQ: Invoke G1 character set: CTRL-N
1697 * XTERM_SEQ: Invoke G2 character set: ESC N 1705 * XTERM_SEQ: Invoke G2 character set: ESC N
1698 * XTERM_SEQ: Invoke G3 character set: ESC O 1706 * XTERM_SEQ: Invoke G3 character set: ESC O
1699 */ 1707 */
1700void 1708void
1701rxvt_term::scr_charset_choose (int set) 1709rxvt_term::scr_charset_choose (int set) NOTHROW
1702{ 1710{
1703 screen.charset = set; 1711 screen.charset = set;
1704 set_font_style (); 1712 set_font_style ();
1705} 1713}
1706 1714
… …
1712 * XTERM_SEQ: Set G2 character set: ESC * <C> 1720 * XTERM_SEQ: Set G2 character set: ESC * <C>
1713 * XTERM_SEQ: Set G3 character set: ESC + <C> 1721 * XTERM_SEQ: Set G3 character set: ESC + <C>
1714 * See set_font_style for possible values for <C> 1722 * See set_font_style for possible values for <C>
1715 */ 1723 */
1716void 1724void
1717rxvt_term::scr_charset_set (int set, unsigned int ch) 1725rxvt_term::scr_charset_set (int set, unsigned int ch) NOTHROW
1718{ 1726{
1719 charsets[set] = (unsigned char)ch; 1727 charsets[set] = (unsigned char)ch;
1720 set_font_style (); 1728 set_font_style ();
1721} 1729}
1722 1730
… …
1727 1735
1728/* 1736/*
1729 * refresh matching text. 1737 * refresh matching text.
1730 */ 1738 */
1731bool 1739bool
1732rxvt_term::scr_refresh_rend (rend_t mask, rend_t value) 1740rxvt_term::scr_refresh_rend (rend_t mask, rend_t value) NOTHROW
1733{ 1741{
1734 bool found = false; 1742 bool found = false;
1735 1743
1736 for (int i = 0; i < nrow; i++) 1744 for (int i = 0; i < nrow; i++)
1737 { 1745 {
… …
1757 PART_END, 1765 PART_END,
1758 RC_COUNT 1766 RC_COUNT
1759}; 1767};
1760 1768
1761void 1769void
1762rxvt_term::scr_expose (int x, int y, int ewidth, int eheight, bool refresh) 1770rxvt_term::scr_expose (int x, int y, int ewidth, int eheight, bool refresh) NOTHROW
1763{ 1771{
1764 int i; 1772 int i;
1765 row_col_t rc[RC_COUNT]; 1773 row_col_t rc[RC_COUNT];
1766 1774
1767 if (!drawn_buf) /* sanity check */ 1775 if (!drawn_buf) /* sanity check */
… …
1801/* ------------------------------------------------------------------------- */ 1809/* ------------------------------------------------------------------------- */
1802/* 1810/*
1803 * Refresh the entire screen 1811 * Refresh the entire screen
1804 */ 1812 */
1805void 1813void
1806rxvt_term::scr_touch (bool refresh) 1814rxvt_term::scr_touch (bool refresh) NOTHROW
1807{ 1815{
1808 scr_expose (0, 0, width, height, refresh); 1816 scr_expose (0, 0, width, height, refresh);
1809} 1817}
1810 1818
1811/* ------------------------------------------------------------------------- */ 1819/* ------------------------------------------------------------------------- */
1812/* 1820/*
1813 * Move the display so that the line represented by scrollbar value Y is at 1821 * Move the display so that the line represented by scrollbar value Y is at
1814 * the top of the screen 1822 * the top of the screen
1815 */ 1823 */
1816void 1824void
1817rxvt_term::scr_move_to (int y, int len) 1825rxvt_term::scr_move_to (int y, int len) NOTHROW
1818{ 1826{
1819 scr_changeview ((top_row - nrow) * (len - y) / len + (nrow - 1)); 1827 scr_changeview ((top_row - nrow) * (len - y) / len + (nrow - 1));
1820} 1828}
1821 1829
1822/* ------------------------------------------------------------------------- */ 1830/* ------------------------------------------------------------------------- */
1823/* 1831/*
1824 * Page the screen up/down nlines 1832 * Page the screen up/down nlines
1825 * direction should be UP or DN 1833 * direction should be UP or DN
1826 */ 1834 */
1827bool 1835bool
1828rxvt_term::scr_page (enum page_dirn direction, int nlines) 1836rxvt_term::scr_page (enum page_dirn direction, int nlines) NOTHROW
1829{ 1837{
1830 int new_view_start = 1838 int new_view_start =
1831 direction == UP ? view_start - nlines 1839 direction == UP ? view_start - nlines
1832 : view_start + nlines; 1840 : view_start + nlines;
1833 1841
1834 return scr_changeview (new_view_start); 1842 return scr_changeview (new_view_start);
1835} 1843}
1836 1844
1837bool 1845bool
1838rxvt_term::scr_changeview (int new_view_start) 1846rxvt_term::scr_changeview (int new_view_start) NOTHROW
1839{ 1847{
1840 clamp_it (new_view_start, top_row, 0); 1848 clamp_it (new_view_start, top_row, 0);
1841 1849
1842 if (new_view_start == view_start) 1850 if (new_view_start == view_start)
1843 return false; 1851 return false;
… …
1849 HOOK_INVOKE ((this, HOOK_VIEW_CHANGE, DT_INT, view_start, DT_END)); 1857 HOOK_INVOKE ((this, HOOK_VIEW_CHANGE, DT_INT, view_start, DT_END));
1850 1858
1851 return true; 1859 return true;
1852} 1860}
1853 1861
1854/* ------------------------------------------------------------------------- */ 1862#ifndef NO_BELL
1855void 1863void
1864rxvt_term::bell_cb (time_watcher &w)
1865{
1866 rvideo_bell = false;
1867 scr_rvideo_mode (rvideo_mode);
1868}
1869#endif
1870
1871/* ------------------------------------------------------------------------- */
1872void
1856rxvt_term::scr_bell () 1873rxvt_term::scr_bell () NOTHROW
1857{ 1874{
1858#ifndef NO_BELL 1875#ifndef NO_BELL
1859 1876
1860# ifndef NO_MAPALERT 1877# ifndef NO_MAPALERT
1861# ifdef MAPALERT_OPTION 1878# ifdef MAPALERT_OPTION
1862 if (OPTION (Opt_mapAlert)) 1879 if (OPTION (Opt_mapAlert))
1863# endif 1880# endif
1864 XMapWindow (display->display, parent[0]); 1881 XMapWindow (xdisp, parent[0]);
1865# endif 1882# endif
1866 1883
1867 if (OPTION (Opt_visualBell)) 1884 if (OPTION (Opt_visualBell))
1868 { 1885 {
1869 scr_rvideo_mode (!rvideo); /* refresh also done */ 1886 rvideo_bell = true;
1887 scr_rvideo_mode (rvideo_mode);
1870 display->flush (); 1888 display->flush ();
1871 rxvt_usleep (VISUAL_BELL_DURATION); 1889
1872 scr_rvideo_mode (!rvideo); /* refresh also done */ 1890 bell_ev.start (NOW + VISUAL_BELL_DURATION);
1873 } 1891 }
1874 else 1892 else
1875 XBell (display->display, 0); 1893 XBell (xdisp, 0);
1876 1894
1877#endif 1895#endif
1878} 1896}
1879 1897
1880/* ------------------------------------------------------------------------- */ 1898/* ------------------------------------------------------------------------- */
1881/* ARGSUSED */ 1899/* ARGSUSED */
1882void 1900void
1883rxvt_term::scr_printscreen (int fullhist) 1901rxvt_term::scr_printscreen (int fullhist) NOTHROW
1884{ 1902{
1885#ifdef PRINTPIPE 1903#ifdef PRINTPIPE
1886 int nrows, row_start; 1904 int nrows, row_start;
1887 FILE *fd; 1905 FILE *fd;
1888 1906
… …
1937 * Refresh the screen 1955 * Refresh the screen
1938 * drawn_text/drawn_rend contain the screen information before the update. 1956 * drawn_text/drawn_rend contain the screen information before the update.
1939 * screen.text/screen.rend contain what the screen will change to. 1957 * screen.text/screen.rend contain what the screen will change to.
1940 */ 1958 */
1941void 1959void
1942rxvt_term::scr_refresh () 1960rxvt_term::scr_refresh () NOTHROW
1943{ 1961{
1944 unsigned char must_clear, /* use draw_string not draw_image_string */ 1962 unsigned char must_clear, /* use draw_string not draw_image_string */
1945 showcursor; /* show the cursor */ 1963 showcursor; /* show the cursor */
1946 int16_t col, row, /* column/row we're processing */ 1964 int16_t col, row, /* column/row we're processing */
1947 ocrow; /* old cursor row */ 1965 ocrow; /* old cursor row */
… …
2119 { 2137 {
2120 /* also comes here at end if needed because of >= above */ 2138 /* also comes here at end if needed because of >= above */
2121 if (wlen < len) 2139 if (wlen < len)
2122 ::swap (wlen, len); 2140 ::swap (wlen, len);
2123 2141
2124 XCopyArea (display->display, vt, vt, 2142 XCopyArea (xdisp, vt, vt,
2125 gc, 0, Row2Pixel (len + i), 2143 gc, 0, Row2Pixel (len + i),
2126 (unsigned int)this->width, 2144 (unsigned int)this->width,
2127 (unsigned int)Height2Pixel (wlen - len + 1), 2145 (unsigned int)Height2Pixel (wlen - len + 1),
2128 0, Row2Pixel (len)); 2146 0, Row2Pixel (len));
2129 len = -1; 2147 len = -1;
… …
2217 2235
2218 // only do special processing if any attributes are set, which is unlikely 2236 // only do special processing if any attributes are set, which is unlikely
2219 if (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful)) 2237 if (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful))
2220 { 2238 {
2221#if ENABLE_STYLES 2239#if ENABLE_STYLES
2222 // force redraw after "careful" characters to avoid pixel droppings 2240 // "careful" (too wide) character handling
2223 if (srp[col] & RS_Careful && col < ncol - 1 && 0)
2224 drp[col + 1] = ~srp[col + 1];
2225 2241
2226 // include previous careful character(s) if possible, looks nicer (best effort...) 2242 // include previous careful character(s) if possible, looks nicer (best effort...)
2227 while (text > stp 2243 while (text > stp
2228 && srp[text - stp - 1] & RS_Careful 2244 && srp[text - stp - 1] & RS_Careful
2229 && RS_SAME (rend, srp[text - stp - 1])) 2245 && RS_SAME (rend, srp[text - stp - 1]))
2230 text--, count++, xpixel -= fwidth; 2246 text--, count++, xpixel -= fwidth;
2247
2248 // force redraw after "careful" characters to avoid pixel droppings
2249 for (int i = 0; srp[col + i] & RS_Careful && col + i < ncol - 1; i++)
2250 drp[col + i + 1] = ~srp[col + i + 1];
2251
2252 // force redraw before "careful" characters to avoid pixel droppings
2253 for (int i = 0; srp[text - stp - i] & RS_Careful && text - i > stp; i++)
2254 drp[text - stp - i - 1] = ~srp[text - stp - i - 1];
2231#endif 2255#endif
2232 2256
2233 bool invert = rend & RS_RVid; 2257 bool invert = rend & RS_RVid;
2234 2258
2235#ifndef NO_BOLD_UNDERLINE_REVERSE 2259#ifndef NO_BOLD_UNDERLINE_REVERSE
… …
2319 2343
2320 if (rend & RS_Uline && font->descent > 1 && fore != back) 2344 if (rend & RS_Uline && font->descent > 1 && fore != back)
2321 { 2345 {
2322#if ENABLE_FRILLS 2346#if ENABLE_FRILLS
2323 if (ISSET_PIXCOLOR (Color_underline)) 2347 if (ISSET_PIXCOLOR (Color_underline))
2324 XSetForeground (display->display, gc, pix_colors[Color_underline]); 2348 XSetForeground (xdisp, gc, pix_colors[Color_underline]);
2325 else 2349 else
2326#endif 2350#endif
2327 XSetForeground (display->display, gc, pix_colors[fore]); 2351 XSetForeground (xdisp, gc, pix_colors[fore]);
2328 2352
2329 XDrawLine (display->display, drawBuffer, gc, 2353 XDrawLine (xdisp, drawBuffer, gc,
2330 xpixel, ypixel + font->ascent + 1, 2354 xpixel, ypixel + font->ascent + 1,
2331 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1); 2355 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1);
2332 } 2356 }
2333 } /* for (col....) */ 2357 } /* for (col....) */
2334 } /* for (row....) */ 2358 } /* for (row....) */
… …
2367 && drawn_buf[oldcursor.row].t[col + cursorwidth] == NOCHAR) 2391 && drawn_buf[oldcursor.row].t[col + cursorwidth] == NOCHAR)
2368 cursorwidth++; 2392 cursorwidth++;
2369 2393
2370#ifndef NO_CURSORCOLOR 2394#ifndef NO_CURSORCOLOR
2371 if (ISSET_PIXCOLOR (Color_cursor)) 2395 if (ISSET_PIXCOLOR (Color_cursor))
2372 XSetForeground (display->display, gc, pix_colors[Color_cursor]); 2396 XSetForeground (xdisp, gc, pix_colors[Color_cursor]);
2373#endif 2397#endif
2374 2398
2375 XDrawRectangle (display->display, drawBuffer, gc, 2399 XDrawRectangle (xdisp, drawBuffer, gc,
2376 Col2Pixel (col), 2400 Col2Pixel (col),
2377 Row2Pixel (oldcursor.row), 2401 Row2Pixel (oldcursor.row),
2378 (unsigned int) (Width2Pixel (cursorwidth) - 1), 2402 (unsigned int) (Width2Pixel (cursorwidth) - 1),
2379 (unsigned int) (Height2Pixel (1) - lineSpace - 1)); 2403 (unsigned int) (Height2Pixel (1) - lineSpace - 1));
2380 } 2404 }
… …
2388 num_scr = 0; 2412 num_scr = 0;
2389 num_scr_allow = 1; 2413 num_scr_allow = 1;
2390} 2414}
2391 2415
2392void 2416void
2393rxvt_term::scr_remap_chars (line_t &l) 2417rxvt_term::scr_remap_chars (line_t &l) NOTHROW
2394{ 2418{
2395 if (!l.t) 2419 if (!l.t)
2396 return; 2420 return;
2397 2421
2398 l.touch (); // maybe a bit of an overkill, but it's not performance-relevant 2422 l.touch (); // maybe a bit of an overkill, but it's not performance-relevant
… …
2400 for (int i = ncol; i--; ) 2424 for (int i = ncol; i--; )
2401 l.r[i] = SET_FONT (l.r[i], FONTSET (l.r[i])->find_font (l.t[i])); 2425 l.r[i] = SET_FONT (l.r[i], FONTSET (l.r[i])->find_font (l.t[i]));
2402} 2426}
2403 2427
2404void 2428void
2405rxvt_term::scr_remap_chars () 2429rxvt_term::scr_remap_chars () NOTHROW
2406{ 2430{
2407 for (int i = total_rows; i--; ) 2431 for (int i = total_rows; i--; )
2408 scr_remap_chars (row_buf [i]); 2432 scr_remap_chars (row_buf [i]);
2409 2433
2410 for (int i = nrow; i--; ) 2434 for (int i = nrow; i--; )
… …
2413 scr_remap_chars (swap_buf [i]); 2437 scr_remap_chars (swap_buf [i]);
2414 } 2438 }
2415} 2439}
2416 2440
2417void 2441void
2418rxvt_term::scr_recolour () 2442rxvt_term::scr_recolour () NOTHROW
2419{ 2443{
2420 if (1 2444 if (1
2421#if TRANSPARENT 2445#if TRANSPARENT
2422 && !am_transparent 2446 && !am_transparent
2423#endif 2447#endif
2424#if XPM_BACKGROUND 2448#if XPM_BACKGROUND
2425 && !bgPixmap.pixmap 2449 && !bgPixmap.pixmap
2426#endif 2450#endif
2427 ) 2451 )
2428 { 2452 {
2429 XSetWindowBackground (display->display, parent[0], pix_colors[Color_border]); 2453 XSetWindowBackground (xdisp, parent[0], pix_colors[Color_border]);
2430 XClearWindow (display->display, parent[0]); 2454 XClearWindow (xdisp, parent[0]);
2431 XSetWindowBackground (display->display, vt, pix_colors[Color_bg]); 2455 XSetWindowBackground (xdisp, vt, pix_colors[Color_bg]);
2432#if HAVE_SCROLLBARS 2456#if HAVE_SCROLLBARS
2433 if (scrollBar.win) 2457 if (scrollBar.win)
2434 { 2458 {
2435 XSetWindowBackground (display->display, scrollBar.win, pix_colors[Color_border]); 2459 XSetWindowBackground (xdisp, scrollBar.win, pix_colors[Color_border]);
2436 scrollBar.setIdle (); 2460 scrollBar.setIdle ();
2437 scrollbar_show (0); 2461 scrollbar_show (0);
2438 } 2462 }
2439#endif 2463#endif
2440 } 2464 }
… …
2444 want_refresh = 1; 2468 want_refresh = 1;
2445} 2469}
2446 2470
2447/* ------------------------------------------------------------------------- */ 2471/* ------------------------------------------------------------------------- */
2448void 2472void
2449rxvt_term::scr_clear (bool really) 2473rxvt_term::scr_clear (bool really) NOTHROW
2450{ 2474{
2451 if (!mapped) 2475 if (!mapped)
2452 return; 2476 return;
2453 2477
2454 num_scr_allow = 0; 2478 num_scr_allow = 0;
2455 want_refresh = 1; 2479 want_refresh = 1;
2456 2480
2457 if (really) 2481 if (really)
2458 XClearWindow (display->display, vt); 2482 XClearWindow (xdisp, vt);
2459} 2483}
2460 2484
2461void 2485void
2462rxvt_term::scr_xor_rect (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle1, rend_t rstyle2) 2486rxvt_term::scr_xor_rect (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle1, rend_t rstyle2) NOTHROW
2463{ 2487{
2464 int view_end = view_start + nrow; 2488 int view_end = view_start + nrow;
2465 int row, col; 2489 int row, col;
2466 2490
2467 for (row = max (beg_row, view_start); row <= min (end_row, view_end); row++) 2491 for (row = max (beg_row, view_start); row <= min (end_row, view_end); row++)
… …
2479 srp[col] ^= rstyle2; 2503 srp[col] ^= rstyle2;
2480 } 2504 }
2481} 2505}
2482 2506
2483void 2507void
2484rxvt_term::scr_xor_span (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle) 2508rxvt_term::scr_xor_span (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle) NOTHROW
2485{ 2509{
2486 int view_end = view_start + nrow; 2510 int view_end = view_start + nrow;
2487 int row, col; 2511 int row, col;
2488 2512
2489 if (beg_row >= view_start) 2513 if (beg_row >= view_start)
… …
2506 srp[col] ^= rstyle; 2530 srp[col] ^= rstyle;
2507} 2531}
2508 2532
2509/* ------------------------------------------------------------------------- */ 2533/* ------------------------------------------------------------------------- */
2510void 2534void
2511rxvt_term::scr_reverse_selection () 2535rxvt_term::scr_reverse_selection () NOTHROW
2512{ 2536{
2513 if (selection.op 2537 if (selection.op
2514 && current_screen == selection.screen 2538 && current_screen == selection.screen
2515 && selection.end.row >= view_start) 2539 && selection.end.row >= view_start)
2516 { 2540 {
… …
2532 * Dump the whole scrollback and screen to the passed filedescriptor. The 2556 * Dump the whole scrollback and screen to the passed filedescriptor. The
2533 * invoking routine must close the fd. 2557 * invoking routine must close the fd.
2534 */ 2558 */
2535#if 0 2559#if 0
2536void 2560void
2537rxvt_term::scr_dump (int fd) 2561rxvt_term::scr_dump (int fd) NOTHROW
2538{ 2562{
2539 int row, wrote; 2563 int row, wrote;
2540 unsigned int width, towrite; 2564 unsigned int width, towrite;
2541 char r1[] = "\n"; 2565 char r1[] = "\n";
2542 2566
… …
2561 2585
2562/* ------------------------------------------------------------------------- * 2586/* ------------------------------------------------------------------------- *
2563 * CHARACTER SELECTION * 2587 * CHARACTER SELECTION *
2564 * ------------------------------------------------------------------------- */ 2588 * ------------------------------------------------------------------------- */
2565void 2589void
2566rxvt_term::selection_check (int check_more) 2590rxvt_term::selection_check (int check_more) NOTHROW
2567{ 2591{
2568 row_col_t pos; 2592 row_col_t pos;
2569 2593
2570 if (!selection.op) 2594 if (!selection.op)
2571 return; 2595 return;
… …
2592/* ------------------------------------------------------------------------- */ 2616/* ------------------------------------------------------------------------- */
2593/* 2617/*
2594 * Paste a selection direct to the command fd 2618 * Paste a selection direct to the command fd
2595 */ 2619 */
2596void 2620void
2597rxvt_term::paste (char *data, unsigned int len) 2621rxvt_term::paste (char *data, unsigned int len) NOTHROW
2598{ 2622{
2599 /* convert normal newline chars into common keyboard Return key sequence */ 2623 /* convert normal newline chars into common keyboard Return key sequence */
2600 for (unsigned int i = 0; i < len; i++) 2624 for (unsigned int i = 0; i < len; i++)
2601 if (data[i] == C0_LF) 2625 if (data[i] == C0_LF)
2602 data[i] = C0_CR; 2626 data[i] = C0_CR;
… …
2608/* 2632/*
2609 * Respond to a notification that a primary selection has been sent 2633 * Respond to a notification that a primary selection has been sent
2610 * EXT: SelectionNotify 2634 * EXT: SelectionNotify
2611 */ 2635 */
2612void 2636void
2613rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop) 2637rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop) NOTHROW
2614{ 2638{
2615 if (prop == None) /* check for failed XConvertSelection */ 2639 if (prop == None) /* check for failed XConvertSelection */
2616 { 2640 {
2617 if ((selection_type & Sel_CompoundText)) 2641 if ((selection_type & Sel_CompoundText))
2618 { 2642 {
… …
2638 } 2662 }
2639 2663
2640 unsigned long bytes_after; 2664 unsigned long bytes_after;
2641 XTextProperty ct; 2665 XTextProperty ct;
2642 2666
2643 if (XGetWindowProperty (display->display, win, prop, 2667 if (XGetWindowProperty (xdisp, win, prop,
2644 0, PROP_SIZE / 4, 2668 0, PROP_SIZE / 4,
2645 delete_prop, AnyPropertyType, 2669 delete_prop, AnyPropertyType,
2646 &ct.encoding, &ct.format, 2670 &ct.encoding, &ct.format,
2647 &ct.nitems, &bytes_after, 2671 &ct.nitems, &bytes_after,
2648 &ct.value) != Success) 2672 &ct.value) != Success)
… …
2657 if (bytes_after) 2681 if (bytes_after)
2658 { 2682 {
2659 // fetch and append remaining data 2683 // fetch and append remaining data
2660 XTextProperty ct2; 2684 XTextProperty ct2;
2661 2685
2662 if (XGetWindowProperty (display->display, win, prop, 2686 if (XGetWindowProperty (xdisp, win, prop,
2663 ct.nitems / 4, (bytes_after + 3) / 4, 2687 ct.nitems / 4, (bytes_after + 3) / 4,
2664 delete_prop, AnyPropertyType, 2688 delete_prop, AnyPropertyType,
2665 &ct2.encoding, &ct2.format, 2689 &ct2.encoding, &ct2.format,
2666 &ct2.nitems, &bytes_after, 2690 &ct2.nitems, &bytes_after,
2667 &ct2.value) != Success) 2691 &ct2.value) != Success)
… …
2680 2704
2681 if (ct.encoding == xa[XA_INCR]) 2705 if (ct.encoding == xa[XA_INCR])
2682 { 2706 {
2683 // INCR selection, start handshake 2707 // INCR selection, start handshake
2684 if (!delete_prop) 2708 if (!delete_prop)
2685 XDeleteProperty (display->display, win, prop); 2709 XDeleteProperty (xdisp, win, prop);
2686 2710
2687 selection_wait = Sel_incr; 2711 selection_wait = Sel_incr;
2688 incr_buf_fill = 0; 2712 incr_buf_fill = 0;
2689 incr_ev.start (NOW + 10); 2713 incr_ev.start (NOW + 10);
2690 2714
… …
2751 paste (s, strlen (s)); 2775 paste (s, strlen (s));
2752 free (s); 2776 free (s);
2753 } 2777 }
2754 else 2778 else
2755#endif 2779#endif
2756 if (XmbTextPropertyToTextList (display->display, &ct, &cl, &cr) >= 0 2780 if (XmbTextPropertyToTextList (xdisp, &ct, &cl, &cr) >= 0
2757 && cl) 2781 && cl)
2758 { 2782 {
2759 for (int i = 0; i < cr; i++) 2783 for (int i = 0; i < cr; i++)
2760 paste (cl[i], strlen (cl[i])); 2784 paste (cl[i], strlen (cl[i]));
2761 2785
… …
2770 if (selection_wait == Sel_normal) 2794 if (selection_wait == Sel_normal)
2771 selection_wait = Sel_none; 2795 selection_wait = Sel_none;
2772} 2796}
2773 2797
2774void 2798void
2775rxvt_term::incr_cb (time_watcher &w) 2799rxvt_term::incr_cb (time_watcher &w) NOTHROW
2776{ 2800{
2777 selection_wait = Sel_none; 2801 selection_wait = Sel_none;
2778 2802
2779 incr_buf_size = 0; 2803 incr_buf_size = 0;
2780 free (incr_buf); 2804 free (incr_buf);
2781 2805
2782 rxvt_warn ("data loss: timeout on INCR selection paste, ignoring.\n"); 2806 rxvt_warn ("data loss: timeout on INCR selection paste, ignoring.\n");
2783} 2807}
2784 2808
2785void 2809void
2786rxvt_term::selection_property (Window win, Atom prop) 2810rxvt_term::selection_property (Window win, Atom prop) NOTHROW
2787{ 2811{
2788 if (prop == None || selection_wait != Sel_incr) 2812 if (prop == None || selection_wait != Sel_incr)
2789 return; 2813 return;
2790 2814
2791 selection_paste (win, prop, true); 2815 selection_paste (win, prop, true);
… …
2800 * (+) if ownership is claimed but property is empty, rxvt_selection_paste () 2824 * (+) if ownership is claimed but property is empty, rxvt_selection_paste ()
2801 * will auto fallback to CUT_BUFFER0 2825 * will auto fallback to CUT_BUFFER0
2802 * EXT: button 2 release 2826 * EXT: button 2 release
2803 */ 2827 */
2804void 2828void
2805rxvt_term::selection_request (Time tm, int x, int y) 2829rxvt_term::selection_request (Time tm, int selnum) NOTHROW
2806{ 2830{
2807 if (x < 0 || x >= width || y < 0 || y >= height) 2831 if (selection.text && selnum == Sel_Primary)
2808 return; /* outside window */
2809
2810 if (selection.text)
2811 { /* internal selection */ 2832 { /* internal selection */
2812 char *str = rxvt_wcstombs (selection.text, selection.len); 2833 char *str = rxvt_wcstombs (selection.text, selection.len);
2813 paste (str, strlen (str)); 2834 paste (str, strlen (str));
2814 free (str); 2835 free (str);
2815 return; 2836 return;
2816 } 2837 }
2817 else 2838 else
2818 { 2839 {
2819 int i;
2820
2821 selection_request_time = tm; 2840 selection_request_time = tm;
2822 selection_wait = Sel_normal; 2841 selection_wait = Sel_normal;
2823 2842
2824 for (i = Sel_Primary; i <= Sel_Clipboard; i++)
2825 {
2826#if X_HAVE_UTF8_STRING 2843#if X_HAVE_UTF8_STRING
2827 selection_type = Sel_UTF8String; 2844 selection_type = Sel_UTF8String;
2828 if (selection_request_other (xa[XA_UTF8_STRING], i)) 2845 if (selection_request_other (xa[XA_UTF8_STRING], selnum))
2829 return; 2846 return;
2830#else 2847#else
2831 selection_type = Sel_CompoundText; 2848 selection_type = Sel_CompoundText;
2832 if (selection_request_other (xa[XA_COMPOUND_TEXT], i)) 2849 if (selection_request_other (xa[XA_COMPOUND_TEXT], selnum))
2833 return; 2850 return;
2834#endif 2851#endif
2835 }
2836 } 2852 }
2837 2853
2838 selection_wait = Sel_none; /* don't loop in selection_paste () */ 2854 selection_wait = Sel_none; /* don't loop in selection_paste () */
2839 selection_paste (display->root, XA_CUT_BUFFER0, false); 2855 selection_paste (display->root, XA_CUT_BUFFER0, false);
2840} 2856}
2841 2857
2842int 2858int
2843rxvt_term::selection_request_other (Atom target, int selnum) 2859rxvt_term::selection_request_other (Atom target, int selnum) NOTHROW
2844{ 2860{
2845 Atom sel; 2861 Atom sel;
2846 2862
2847 selection_type |= selnum; 2863 selection_type |= selnum;
2848 2864
… …
2851 else if (selnum == Sel_Secondary) 2867 else if (selnum == Sel_Secondary)
2852 sel = XA_SECONDARY; 2868 sel = XA_SECONDARY;
2853 else 2869 else
2854 sel = xa[XA_CLIPBOARD]; 2870 sel = xa[XA_CLIPBOARD];
2855 2871
2856 if (XGetSelectionOwner (display->display, sel) != None) 2872 if (XGetSelectionOwner (xdisp, sel) != None)
2857 { 2873 {
2858 XConvertSelection (display->display, sel, target, xa[XA_VT_SELECTION], 2874 XConvertSelection (xdisp, sel, target, xa[XA_VT_SELECTION],
2859 vt, selection_request_time); 2875 vt, selection_request_time);
2860 return 1; 2876 return 1;
2861 } 2877 }
2862 2878
2863 return 0; 2879 return 0;
… …
2867/* 2883/*
2868 * Clear all selected text 2884 * Clear all selected text
2869 * EXT: SelectionClear 2885 * EXT: SelectionClear
2870 */ 2886 */
2871void 2887void
2872rxvt_term::selection_clear () 2888rxvt_term::selection_clear () NOTHROW
2873{ 2889{
2874 want_refresh = 1; 2890 want_refresh = 1;
2875 free (selection.text); 2891 free (selection.text);
2876 selection.text = NULL; 2892 selection.text = NULL;
2877 selection.len = 0; 2893 selection.len = 0;
… …
3012 3028
3013 selection_grab (tm); 3029 selection_grab (tm);
3014} 3030}
3015 3031
3016bool 3032bool
3017rxvt_term::selection_grab (Time tm) 3033rxvt_term::selection_grab (Time tm) NOTHROW
3018{ 3034{
3019 selection_time = tm; 3035 selection_time = tm;
3020 3036
3021 XSetSelectionOwner (display->display, XA_PRIMARY, vt, tm); 3037 XSetSelectionOwner (xdisp, XA_PRIMARY, vt, tm);
3022 if (XGetSelectionOwner (display->display, XA_PRIMARY) == vt) 3038 if (XGetSelectionOwner (xdisp, XA_PRIMARY) == vt)
3023 { 3039 {
3024 display->set_selection_owner (this); 3040 display->set_selection_owner (this);
3025 return true; 3041 return true;
3026 } 3042 }
3027 else 3043 else
… …
3031 } 3047 }
3032 3048
3033#if 0 3049#if 0
3034 XTextProperty ct; 3050 XTextProperty ct;
3035 3051
3036 if (XwcTextListToTextProperty (display->display, &selection.text, 1, XStringStyle, &ct) >= 0) 3052 if (XwcTextListToTextProperty (xdisp, &selection.text, 1, XStringStyle, &ct) >= 0)
3037 { 3053 {
3038 set_string_property (XA_CUT_BUFFER0, ct.value, ct.nitems); 3054 set_string_property (XA_CUT_BUFFER0, ct.value, ct.nitems);
3039 XFree (ct.value); 3055 XFree (ct.value);
3040 } 3056 }
3041#endif 3057#endif
… …
3045/* 3061/*
3046 * Mark or select text based upon number of clicks: 1, 2, or 3 3062 * Mark or select text based upon number of clicks: 1, 2, or 3
3047 * EXT: button 1 press 3063 * EXT: button 1 press
3048 */ 3064 */
3049void 3065void
3050rxvt_term::selection_click (int clicks, int x, int y) 3066rxvt_term::selection_click (int clicks, int x, int y) NOTHROW
3051{ 3067{
3052 clicks = ((clicks - 1) % 3) + 1; 3068 clicks = ((clicks - 1) % 3) + 1;
3053 selection.clicks = clicks; /* save clicks so extend will work */ 3069 selection.clicks = clicks; /* save clicks so extend will work */
3054 3070
3055 if (clicks == 2 && !selection.rect 3071 if (clicks == 2 && !selection.rect
… …
3074/* ------------------------------------------------------------------------- */ 3090/* ------------------------------------------------------------------------- */
3075/* 3091/*
3076 * Mark a selection at the specified col/row 3092 * Mark a selection at the specified col/row
3077 */ 3093 */
3078void 3094void
3079rxvt_term::selection_start_colrow (int col, int row) 3095rxvt_term::selection_start_colrow (int col, int row) NOTHROW
3080{ 3096{
3081 want_refresh = 1; 3097 want_refresh = 1;
3082 3098
3083 selection.mark.row = row + view_start; 3099 selection.mark.row = row + view_start;
3084 selection.mark.col = col; 3100 selection.mark.col = col;
… …
3110#define DELIMIT_TEXT(x) \ 3126#define DELIMIT_TEXT(x) \
3111 (unicode::is_space (x) ? 2 : (x) <= 0xff && !!strchr (rs[Rs_cutchars], (x))) 3127 (unicode::is_space (x) ? 2 : (x) <= 0xff && !!strchr (rs[Rs_cutchars], (x)))
3112#define DELIMIT_REND(x) 1 3128#define DELIMIT_REND(x) 1
3113 3129
3114void 3130void
3115rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) 3131rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) NOTHROW
3116{ 3132{
3117 int col, row, dirnadd, tcol, trow, w1, w2; 3133 int col, row, dirnadd, tcol, trow, w1, w2;
3118 row_col_t bound; 3134 row_col_t bound;
3119 text_t *stp; 3135 text_t *stp;
3120 rend_t *srp; 3136 rend_t *srp;
… …
3194 * flag == 0 ==> button 1 3210 * flag == 0 ==> button 1
3195 * flag == 1 ==> button 3 press 3211 * flag == 1 ==> button 3 press
3196 * flag == 2 ==> button 3 motion 3212 * flag == 2 ==> button 3 motion
3197 */ 3213 */
3198void 3214void
3199rxvt_term::selection_extend (int x, int y, int flag) 3215rxvt_term::selection_extend (int x, int y, int flag) NOTHROW
3200{ 3216{
3201 int col = clamp (Pixel2Col (x), 0, ncol); 3217 int col = clamp (Pixel2Col (x), 0, ncol);
3202 int row = clamp (Pixel2Row (y), 0, nrow - 1); 3218 int row = clamp (Pixel2Row (y), 0, nrow - 1);
3203 3219
3204 /* 3220 /*
… …
3230/* ------------------------------------------------------------------------- */ 3246/* ------------------------------------------------------------------------- */
3231/* 3247/*
3232 * Extend the selection to the specified col/row 3248 * Extend the selection to the specified col/row
3233 */ 3249 */
3234void 3250void
3235rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) 3251rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) NOTHROW
3236{ 3252{
3237 row_col_t pos; 3253 row_col_t pos;
3238 enum { 3254 enum {
3239 LEFT, RIGHT 3255 LEFT, RIGHT
3240 } closeto = RIGHT; 3256 } closeto = RIGHT;
… …
3426#endif 3442#endif
3427} 3443}
3428 3444
3429#if ENABLE_FRILLS 3445#if ENABLE_FRILLS
3430void 3446void
3431rxvt_term::selection_remove_trailing_spaces () 3447rxvt_term::selection_remove_trailing_spaces () NOTHROW
3432{ 3448{
3433 int32_t end_col, end_row; 3449 int32_t end_col, end_row;
3434 text_t *stp; 3450 text_t *stp;
3435 3451
3436 end_col = selection.end.col; 3452 end_col = selection.end.col;
… …
3474/* 3490/*
3475 * Double click on button 3 when already selected 3491 * Double click on button 3 when already selected
3476 * EXT: button 3 double click 3492 * EXT: button 3 double click
3477 */ 3493 */
3478void 3494void
3479rxvt_term::selection_rotate (int x, int y) 3495rxvt_term::selection_rotate (int x, int y) NOTHROW
3480{ 3496{
3481 selection.clicks = selection.clicks % 3 + 1; 3497 selection.clicks = selection.clicks % 3 + 1;
3482 selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1); 3498 selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1);
3483} 3499}
3484 3500
… …
3486/* 3502/*
3487 * Respond to a request for our current selection 3503 * Respond to a request for our current selection
3488 * EXT: SelectionRequest 3504 * EXT: SelectionRequest
3489 */ 3505 */
3490void 3506void
3491rxvt_term::selection_send (const XSelectionRequestEvent &rq) 3507rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW
3492{ 3508{
3493 XSelectionEvent ev; 3509 XSelectionEvent ev;
3494 dDisp;
3495 3510
3496 ev.type = SelectionNotify; 3511 ev.type = SelectionNotify;
3497 ev.property = None; 3512 ev.property = None;
3498 ev.display = rq.display; 3513 ev.display = rq.display;
3499 ev.requestor = rq.requestor; 3514 ev.requestor = rq.requestor;
… …
3513 *target++ = xa[XA_COMPOUND_TEXT]; 3528 *target++ = xa[XA_COMPOUND_TEXT];
3514#if X_HAVE_UTF8_STRING 3529#if X_HAVE_UTF8_STRING
3515 *target++ = xa[XA_UTF8_STRING]; 3530 *target++ = xa[XA_UTF8_STRING];
3516#endif 3531#endif
3517 3532
3518 XChangeProperty (disp, rq.requestor, rq.property, XA_ATOM, 3533 XChangeProperty (xdisp, rq.requestor, rq.property, XA_ATOM,
3519 32, PropModeReplace, 3534 32, PropModeReplace,
3520 (unsigned char *)target_list, target - target_list); 3535 (unsigned char *)target_list, target - target_list);
3521 ev.property = rq.property; 3536 ev.property = rq.property;
3522 } 3537 }
3523#if TODO // TODO 3538#if TODO // TODO
… …
3526 /* TODO: Handle MULTIPLE */ 3541 /* TODO: Handle MULTIPLE */
3527 } 3542 }
3528#endif 3543#endif
3529 else if (rq.target == xa[XA_TIMESTAMP] && selection.text) 3544 else if (rq.target == xa[XA_TIMESTAMP] && selection.text)
3530 { 3545 {
3531 XChangeProperty (disp, rq.requestor, rq.property, rq.target, 3546 XChangeProperty (xdisp, rq.requestor, rq.property, rq.target,
3532 32, PropModeReplace, (unsigned char *)&selection_time, 1); 3547 32, PropModeReplace, (unsigned char *)&selection_time, 1);
3533 ev.property = rq.property; 3548 ev.property = rq.property;
3534 } 3549 }
3535 else if (rq.target == XA_STRING 3550 else if (rq.target == XA_STRING
3536 || rq.target == xa[XA_TEXT] 3551 || rq.target == xa[XA_TEXT]
… …
3594 ct.value = (unsigned char *)rxvt_wcstoutf8 (cl, selectlen); 3609 ct.value = (unsigned char *)rxvt_wcstoutf8 (cl, selectlen);
3595 ct.nitems = strlen ((char *)ct.value); 3610 ct.nitems = strlen ((char *)ct.value);
3596 } 3611 }
3597 else 3612 else
3598#endif 3613#endif
3599 if (XwcTextListToTextProperty (disp, &cl, 1, (XICCEncodingStyle) style, &ct) >= 0) 3614 if (XwcTextListToTextProperty (xdisp, &cl, 1, (XICCEncodingStyle) style, &ct) >= 0)
3600 freect = 1; 3615 freect = 1;
3601 else 3616 else
3602 { 3617 {
3603 /* if we failed to convert then send it raw */ 3618 /* if we failed to convert then send it raw */
3604 ct.value = (unsigned char *)cl; 3619 ct.value = (unsigned char *)cl;
3605 ct.nitems = selectlen; 3620 ct.nitems = selectlen;
3606 ct.encoding = target; 3621 ct.encoding = target;
3607 } 3622 }
3608 3623
3609 XChangeProperty (disp, rq.requestor, rq.property, 3624 XChangeProperty (xdisp, rq.requestor, rq.property,
3610 ct.encoding, 8, PropModeReplace, 3625 ct.encoding, 8, PropModeReplace,
3611 ct.value, (int)ct.nitems); 3626 ct.value, (int)ct.nitems);
3612 ev.property = rq.property; 3627 ev.property = rq.property;
3613 3628
3614 if (freect) 3629 if (freect)
3615 XFree (ct.value); 3630 XFree (ct.value);
3616 } 3631 }
3617 3632
3618 XSendEvent (disp, rq.requestor, False, 0L, (XEvent *)&ev); 3633 XSendEvent (xdisp, rq.requestor, False, 0L, (XEvent *)&ev);
3619} 3634}
3620 3635
3621/* ------------------------------------------------------------------------- * 3636/* ------------------------------------------------------------------------- *
3622 * MOUSE ROUTINES * 3637 * MOUSE ROUTINES *
3623 * ------------------------------------------------------------------------- */ 3638 * ------------------------------------------------------------------------- */
3624 3639
3625/* 3640/*
3626 * return col/row values corresponding to x/y pixel values 3641 * return col/row values corresponding to x/y pixel values
3627 */ 3642 */
3628void 3643void
3629rxvt_term::pixel_position (int *x, int *y) 3644rxvt_term::pixel_position (int *x, int *y) NOTHROW
3630{ 3645{
3631 *x = Pixel2Col (*x); 3646 *x = Pixel2Col (*x);
3632 /* max_it (*x, 0); min_it (*x, (int)ncol - 1); */ 3647 /* max_it (*x, 0); min_it (*x, (int)ncol - 1); */
3633 *y = Pixel2Row (*y); 3648 *y = Pixel2Row (*y);
3634 /* max_it (*y, 0); min_it (*y, (int)nrow - 1); */ 3649 /* max_it (*y, 0); min_it (*y, (int)nrow - 1); */
3635} 3650}
3636 3651
3637/* ------------------------------------------------------------------------- */ 3652/* ------------------------------------------------------------------------- */
3638#ifdef USE_XIM 3653#ifdef USE_XIM
3639void 3654void
3640rxvt_term::im_set_position (XPoint &pos) 3655rxvt_term::im_set_position (XPoint &pos) NOTHROW
3641{ 3656{
3642 XWindowAttributes xwa; 3657 XWindowAttributes xwa;
3643 3658
3644 XGetWindowAttributes (display->display, vt, &xwa); 3659 XGetWindowAttributes (xdisp, vt, &xwa);
3645 3660
3646 pos.x = xwa.x + Col2Pixel (screen.cur.col); 3661 pos.x = xwa.x + Col2Pixel (screen.cur.col);
3647 pos.y = xwa.y + Height2Pixel (screen.cur.row) + fbase; 3662 pos.y = xwa.y + Height2Pixel (screen.cur.row) + fbase;
3648} 3663}
3649#endif 3664#endif
3650 3665
3651#if ENABLE_OVERLAY 3666#if ENABLE_OVERLAY
3652void 3667void
3653rxvt_term::scr_overlay_new (int x, int y, int w, int h) 3668rxvt_term::scr_overlay_new (int x, int y, int w, int h) NOTHROW
3654{ 3669{
3655 if (nrow < 1 || ncol < 1) 3670 if (nrow < 1 || ncol < 1)
3656 return; 3671 return;
3657 3672
3658 want_refresh = 1; 3673 want_refresh = 1;
… …
3703 *rp = r; 3718 *rp = r;
3704 } 3719 }
3705} 3720}
3706 3721
3707void 3722void
3708rxvt_term::scr_overlay_off () 3723rxvt_term::scr_overlay_off () NOTHROW
3709{ 3724{
3710 if (!ov_text) 3725 if (!ov_text)
3711 return; 3726 return;
3712 3727
3713 want_refresh = 1; 3728 want_refresh = 1;
… …
3721 delete [] ov_text; ov_text = 0; 3736 delete [] ov_text; ov_text = 0;
3722 delete [] ov_rend; ov_rend = 0; 3737 delete [] ov_rend; ov_rend = 0;
3723} 3738}
3724 3739
3725void 3740void
3726rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) 3741rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) NOTHROW
3727{ 3742{
3728 if (!ov_text || x >= ov_w - 2 || y >= ov_h - 2) 3743 if (!ov_text || x >= ov_w - 2 || y >= ov_h - 2)
3729 return; 3744 return;
3730 3745
3731 x++, y++; 3746 x++, y++;
… …
3733 ov_text[y][x] = text; 3748 ov_text[y][x] = text;
3734 ov_rend[y][x] = rend; 3749 ov_rend[y][x] = rend;
3735} 3750}
3736 3751
3737void 3752void
3738rxvt_term::scr_overlay_set (int x, int y, const char *s) 3753rxvt_term::scr_overlay_set (int x, int y, const char *s) NOTHROW
3739{ 3754{
3740 while (*s) 3755 while (*s)
3741 scr_overlay_set (x++, y, *s++); 3756 scr_overlay_set (x++, y, *s++);
3742} 3757}
3743 3758
3744void 3759void
3745rxvt_term::scr_overlay_set (int x, int y, const wchar_t *s) 3760rxvt_term::scr_overlay_set (int x, int y, const wchar_t *s) NOTHROW
3746{ 3761{
3747 while (*s) 3762 while (*s)
3748 { 3763 {
3749 text_t t = *s++; 3764 text_t t = *s++;
3750 int width = wcwidth (t); 3765 int width = WCWIDTH (t);
3751 3766
3752 while (width--) 3767 while (width--)
3753 { 3768 {
3754 scr_overlay_set (x++, y, t); 3769 scr_overlay_set (x++, y, t);
3755 t = NOCHAR; 3770 t = NOCHAR;
3756 } 3771 }
3757 } 3772 }
3758} 3773}
3759 3774
3760void 3775void
3761rxvt_term::scr_swap_overlay () 3776rxvt_term::scr_swap_overlay () NOTHROW
3762{ 3777{
3763 if (!ov_text) 3778 if (!ov_text)
3764 return; 3779 return;
3765 3780
3766 // swap screen mem with overlay 3781 // swap screen mem with overlay

Diff Legend

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