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.248 by root, Sun Jan 22 20:58:33 2006 UTC vs.
Revision 1.296 by root, Wed Jan 9 01:05:24 2008 UTC

1/*--------------------------------*-C-*--------------------------------------* 1/*---------------------------------------------------------------------------*
2 * File: screen.C 2 * File: screen.C
3 *---------------------------------------------------------------------------* 3 *---------------------------------------------------------------------------*
4 * 4 *
5 * Copyright (c) 1997-2001 Geoff Wing <gcw@pobox.com> 5 * Copyright (c) 1997-2001 Geoff Wing <gcw@pobox.com>
6 * Copyright (c) 2003-2006 Marc Lehmann <pcg@goof.com> 6 * Copyright (c) 2003-2007 Marc Lehmann <pcg@goof.com>
7 * 7 *
8 * This program is free software; you can redistribute it and/or modify 8 * This program is free software; you can redistribute it and/or modify
9 * it under the terms of the GNU General Public License as published by 9 * it under the terms of the GNU General Public License as published by
10 * the Free Software Foundation; either version 2 of the License, or 10 * the Free Software Foundation; either version 2 of the License, or
11 * (at your option) any later version. 11 * (at your option) any later version.
… …
26 26
27#include "../config.h" /* NECESSARY */ 27#include "../config.h" /* NECESSARY */
28#include "rxvt.h" /* NECESSARY */ 28#include "rxvt.h" /* NECESSARY */
29#include "rxvtperl.h" /* NECESSARY */ 29#include "rxvtperl.h" /* NECESSARY */
30 30
31#include <X11/Xmd.h> /* get the typedef for CARD32 */
32
33#include <inttypes.h> 31#include <inttypes.h>
34 32
35#include "salloc.C" // HACK, should be a seperate compile! 33#include "salloc.C" // HACK, should be a seperate compile!
36 34
37inline void fill_text (text_t *start, text_t value, int len) 35static inline void fill_text (text_t *start, text_t value, int len)
38{ 36{
39 while (len--) 37 while (len--)
40 *start++ = value; 38 *start++ = value;
41} 39}
42 40
… …
47 45
48/* ------------------------------------------------------------------------- * 46/* ------------------------------------------------------------------------- *
49 * GENERAL SCREEN AND SELECTION UPDATE ROUTINES * 47 * GENERAL SCREEN AND SELECTION UPDATE ROUTINES *
50 * ------------------------------------------------------------------------- */ 48 * ------------------------------------------------------------------------- */
51#define ZERO_SCROLLBACK() \ 49#define ZERO_SCROLLBACK() \
52 if (OPTION (Opt_scrollTtyOutput)) \ 50 if (option (Opt_scrollTtyOutput)) \
53 view_start = 0 51 view_start = 0
54#define CLEAR_SELECTION() \ 52#define CLEAR_SELECTION() \
55 selection.beg.row = selection.beg.col \ 53 selection.beg.row = selection.beg.col \
56 = selection.end.row = selection.end.col = 0 54 = selection.end.row = selection.end.col = 0
57#define CLEAR_ALL_SELECTION() \ 55#define CLEAR_ALL_SELECTION() \
… …
93 */ 91 */
94#define drawBuffer vt 92#define drawBuffer vt
95 93
96#define CLEAR_ROWS(row, num) \ 94#define CLEAR_ROWS(row, num) \
97 if (mapped) \ 95 if (mapped) \
98 XClearArea (display->display, drawBuffer, 0, \ 96 XClearArea (dpy, drawBuffer, 0, \
99 Row2Pixel (row), (unsigned int)width, \ 97 Row2Pixel (row), (unsigned int)width, \
100 (unsigned int)Height2Pixel (num), False) 98 (unsigned int)Height2Pixel (num), False)
101 99
102#define CLEAR_CHARS(x, y, num) \ 100#define CLEAR_CHARS(x, y, num) \
103 if (mapped) \ 101 if (mapped) \
104 XClearArea (display->display, drawBuffer, x, y, \ 102 XClearArea (dpy, drawBuffer, x, y, \
105 (unsigned int)Width2Pixel (num), \ 103 (unsigned int)Width2Pixel (num), \
106 (unsigned int)Height2Pixel (1), False) 104 (unsigned int)Height2Pixel (1), False)
107 105
108#define ERASE_ROWS(row, num) \ 106#define ERASE_ROWS(row, num) \
109 XFillRectangle (display->display, drawBuffer, gc, \ 107 XFillRectangle (dpy, drawBuffer, gc, \
110 0, Row2Pixel (row), \ 108 0, Row2Pixel (row), \
111 (unsigned int)width, \ 109 (unsigned int)width, \
112 (unsigned int)Height2Pixel (num)) 110 (unsigned int)Height2Pixel (num))
113 111
114/* ------------------------------------------------------------------------- * 112/* ------------------------------------------------------------------------- *
… …
126 width = ncol; 124 width = ncol;
127 } 125 }
128 126
129 l.touch (); 127 l.touch ();
130 128
131 efs &= ~RS_baseattrMask; 129 efs &= ~RS_baseattrMask; // remove italic etc. fontstyles
132 efs = SET_FONT (efs, FONTSET (efs)->find_font (' ')); 130 efs = SET_FONT (efs, FONTSET (efs)->find_font (' '));
133 131
134 text_t *et = l.t + col; 132 text_t *et = l.t + col;
135 rend_t *er = l.r + col; 133 rend_t *er = l.r + col;
136 134
… …
161{ 159{
162#if ENABLE_OVERLAY 160#if ENABLE_OVERLAY
163 scr_overlay_off (); 161 scr_overlay_off ();
164#endif 162#endif
165 163
164 rvideo_mode = false;
166 view_start = 0; 165 view_start = 0;
167 num_scr = 0; 166 num_scr = 0;
168 167
169 if (ncol == 0) 168 if (ncol == 0)
170 ncol = 80; 169 ncol = 80;
… …
237 selection.text = NULL; 236 selection.text = NULL;
238 selection.len = 0; 237 selection.len = 0;
239 selection.op = SELECTION_CLEAR; 238 selection.op = SELECTION_CLEAR;
240 selection.screen = PRIMARY; 239 selection.screen = PRIMARY;
241 selection.clicks = 0; 240 selection.clicks = 0;
242 rvideo_state = rvideo_mode = false;
243 } 241 }
244 else 242 else
245 { 243 {
246 /* 244 /*
247 * add or delete rows as appropriate 245 * add or delete rows as appropriate
… …
276 drawn_buf[row].clear (); scr_blank_screen_mem (drawn_buf[row], DEFAULT_RSTYLE); 274 drawn_buf[row].clear (); scr_blank_screen_mem (drawn_buf[row], DEFAULT_RSTYLE);
277 } 275 }
278 276
279 line_t *old_buf = row_buf; 277 line_t *old_buf = row_buf;
280 row_buf = (line_t *)rxvt_calloc (total_rows + nrow, sizeof (line_t)); 278 row_buf = (line_t *)rxvt_calloc (total_rows + nrow, sizeof (line_t));
281 279
282 int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row 280 int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row
283 int pend = MOD (term_start + top_row , prev_total_rows); 281 int pend = MOD (term_start + top_row , prev_total_rows);
284 int q = total_rows; // rewrapped row 282 int q = total_rows; // rewrapped row
285 283
286 if (top_row) 284 if (top_row)
… …
330 int qcol = 0; 328 int qcol = 0;
331 329
332 // see below for cursor adjustment rationale 330 // see below for cursor adjustment rationale
333 if (p == ocur.row) 331 if (p == ocur.row)
334 screen.cur.row = q - (total_rows - nrow); 332 screen.cur.row = q - (total_rows - nrow);
335 333
336 // fill a single destination line 334 // fill a single destination line
337 while (lofs < llen && qcol < ncol) 335 while (lofs < llen && qcol < ncol)
338 { 336 {
339 int prow = lofs / prev_ncol; 337 int prow = lofs / prev_ncol;
340 int pcol = lofs % prev_ncol; 338 int pcol = lofs % prev_ncol;
… …
366 } 364 }
367 while (p != pend && q > 0); 365 while (p != pend && q > 0);
368 366
369 term_start = total_rows - nrow; 367 term_start = total_rows - nrow;
370 top_row = q - term_start; 368 top_row = q - term_start;
371 369
372 // make sure all terminal lines exist 370 // make sure all terminal lines exist
373 while (top_row > 0) 371 while (top_row > 0)
374 scr_blank_screen_mem (ROW (--top_row), DEFAULT_RSTYLE); 372 scr_blank_screen_mem (ROW (--top_row), DEFAULT_RSTYLE);
375 } 373 }
376 else 374 else
377 { 375 {
378 // if no scrollback exists (yet), wing, instead of wrap 376 // if no scrollback exists (yet), wing, instead of wrap
379 377
380 for (int row = min (nrow, prev_nrow); row--; ) 378 for (int row = min (nrow, prev_nrow); row--; )
381 { 379 {
382 line_t &pline = old_buf [MOD (term_start + row, prev_total_rows)]; 380 line_t &pline = old_buf [MOD (term_start + row, prev_total_rows)];
383 line_t &qline = row_buf [row]; 381 line_t &qline = row_buf [row];
384 382
… …
407 CLEAR_ALL_SELECTION (); 405 CLEAR_ALL_SELECTION ();
408 406
409 prev_nrow = nrow; 407 prev_nrow = nrow;
410 prev_ncol = ncol; 408 prev_ncol = ncol;
411 409
412 tabs = (char *)rxvt_malloc (ncol * sizeof (char)); 410 tabs = (char *)rxvt_malloc (ncol);
413 411
414 for (int col = ncol; col--; ) 412 for (int col = ncol; --col; )
415 tabs [col] = col % TABSIZE == 0; 413 tabs [col] = col % TABSIZE == 0;
416 414
417 if (current_screen != PRIMARY) 415 if (current_screen != PRIMARY)
418 scr_swap_screen (); 416 scr_swap_screen ();
419 417
… …
510} 508}
511 509
512void 510void
513rxvt_term::scr_swap_screen () 511rxvt_term::scr_swap_screen ()
514{ 512{
515 if (!OPTION (Opt_secondaryScreen)) 513 if (!option (Opt_secondaryScreen))
516 return; 514 return;
517 515
518 for (int i = prev_nrow; i--; ) 516 for (int i = prev_nrow; i--; )
519 ::swap (ROW(i), swap_buf [i]); 517 ::swap (ROW(i), swap_buf [i]);
520 518
… …
542 selection_check (2); /* check for boundary cross */ 540 selection_check (2); /* check for boundary cross */
543 541
544 int i = current_screen; current_screen = scrn; scrn = i; 542 int i = current_screen; current_screen = scrn; scrn = i;
545 543
546#if NSCREENS 544#if NSCREENS
547 if (OPTION (Opt_secondaryScreen)) 545 if (option (Opt_secondaryScreen))
548 { 546 {
549 num_scr = 0; 547 num_scr = 0;
550 548
551 scr_swap_screen (); 549 scr_swap_screen ();
552 550
… …
555 screen.flags |= Screen_VisibleCursor; 553 screen.flags |= Screen_VisibleCursor;
556 swap.flags |= Screen_VisibleCursor; 554 swap.flags |= Screen_VisibleCursor;
557 } 555 }
558 else 556 else
559#endif 557#endif
560 if (OPTION (Opt_secondaryScroll)) 558 if (option (Opt_secondaryScroll))
561 scr_scroll_text (0, prev_nrow - 1, prev_nrow); 559 scr_scroll_text (0, prev_nrow - 1, prev_nrow);
562} 560}
563 561
564// clear WrapNext indicator, solidifying position on next line 562// clear WrapNext indicator, solidifying position on next line
565void 563void
… …
598/* 596/*
599 * Change the rendition style for following text 597 * Change the rendition style for following text
600 */ 598 */
601void 599void
602rxvt_term::scr_rendition (int set, int style) NOTHROW 600rxvt_term::scr_rendition (int set, int style) NOTHROW
603 { 601{
604 if (set) 602 if (set)
605 rstyle |= style; 603 rstyle |= style;
606 else if (style == ~RS_None) 604 else if (style == ~RS_None)
607 rstyle = DEFAULT_RSTYLE; 605 rstyle = DEFAULT_RSTYLE;
608 else 606 else
609 rstyle &= ~style; 607 rstyle &= ~style;
610 } 608}
611 609
612/* ------------------------------------------------------------------------- */ 610/* ------------------------------------------------------------------------- */
613/* 611/*
614 * Scroll text between <row1> and <row2> inclusive, by <count> lines 612 * Scroll text between <row1> and <row2> inclusive, by <count> lines
615 * count positive ==> scroll up 613 * count positive ==> scroll up
… …
624 want_refresh = 1; 622 want_refresh = 1;
625 num_scr += count; 623 num_scr += count;
626 624
627 if (count > 0 625 if (count > 0
628 && row1 == 0 626 && row1 == 0
629 && (current_screen == PRIMARY || OPTION (Opt_secondaryScroll))) 627 && (current_screen == PRIMARY || option (Opt_secondaryScroll)))
630 { 628 {
631 top_row = max (top_row - count, -saveLines); 629 top_row = max (top_row - count, -saveLines);
632 630
633 // scroll everything up 'count' lines 631 // scroll everything up 'count' lines
634 term_start = (term_start + count) % total_rows; 632 term_start = (term_start + count) % total_rows;
… …
641 } 639 }
642 640
643 // erase newly scrolled-in lines 641 // erase newly scrolled-in lines
644 for (int i = count; i--; ) 642 for (int i = count; i--; )
645 { 643 {
646 // basically this is a slightly optimized scr_blank_screen_mem
647 // it is worth the effort on slower machines
648 line_t &l = ROW(nrow - 1 - i); 644 line_t &l = ROW(nrow - 1 - i);
649 645
646 // optimize if already cleared, can be significant on slow machines
647 // could be rolled into scr_blank_screen_mem
648 if (l.r && l.l < ncol - 1 && !((l.r[l.l + 1] ^ rstyle) & (RS_fgMask | RS_bgMask)))
649 {
650 scr_blank_line (l, 0, l.l, rstyle); 650 scr_blank_line (l, 0, l.l, rstyle);
651
652 l.l = 0; 651 l.l = 0;
653 l.f = 0; 652 l.f = 0;
653 }
654 else
655 scr_blank_screen_mem (l, rstyle);
654 } 656 }
655 657
656 // now copy lines below the scroll region bottom to the 658 // now copy lines below the scroll region bottom to the
657 // bottom of the screen again, so they look as if they 659 // bottom of the screen again, so they look as if they
658 // hadn't moved. 660 // hadn't moved.
… …
662 line_t &l2 = ROW(i); 664 line_t &l2 = ROW(i);
663 665
664 ::swap (l1, l2); 666 ::swap (l1, l2);
665 l2.touch (); 667 l2.touch ();
666 } 668 }
667 669
668 // move and/or clear selection, if any 670 // move and/or clear selection, if any
669 if (selection.op && current_screen == selection.screen) 671 if (selection.op && current_screen == selection.screen)
670 { 672 {
671 selection.beg.row -= count; 673 selection.beg.row -= count;
672 selection.end.row -= count; 674 selection.end.row -= count;
… …
680 selection.op = SELECTION_CLEAR; 682 selection.op = SELECTION_CLEAR;
681 } 683 }
682 } 684 }
683 685
684 // finally move the view window, if desired 686 // finally move the view window, if desired
685 if (OPTION (Opt_scrollWithBuffer) 687 if (option (Opt_scrollWithBuffer)
686 && view_start != 0 688 && view_start != 0
687 && view_start != -saveLines) 689 && view_start != -saveLines)
688 scr_page (UP, count); 690 scr_page (UP, count);
689 691
690 if (SHOULD_INVOKE (HOOK_SCROLL_BACK)) 692 if (SHOULD_INVOKE (HOOK_SCROLL_BACK))
… …
708 { 710 {
709 /* move selected region too */ 711 /* move selected region too */
710 selection.beg.row -= count; 712 selection.beg.row -= count;
711 selection.end.row -= count; 713 selection.end.row -= count;
712 selection.mark.row -= count; 714 selection.mark.row -= count;
713 715
714 selection_check (0); 716 selection_check (0);
715 } 717 }
716 } 718 }
717 719
718 // use a simple and robust scrolling algorithm, this 720 // use a simple and robust scrolling algorithm, this
… …
830 } 832 }
831 833
832 if (screen.flags & Screen_WrapNext) 834 if (screen.flags & Screen_WrapNext)
833 { 835 {
834 scr_do_wrap (); 836 scr_do_wrap ();
835 837
836 line->l = ncol; 838 line->l = ncol;
837 line->is_longer (1); 839 line->is_longer (1);
838 840
839 row = screen.cur.row; 841 row = screen.cur.row;
840 line = &ROW(row); /* _must_ refresh */ 842 line = &ROW(row); /* _must_ refresh */
… …
842 844
843 // some utf-8 decoders "decode" surrogate characters: let's fix this. 845 // some utf-8 decoders "decode" surrogate characters: let's fix this.
844 if (IN_RANGE_INC (c, 0xd800, 0xdfff)) 846 if (IN_RANGE_INC (c, 0xd800, 0xdfff))
845 c = 0xfffd; 847 c = 0xfffd;
846 848
847 // rely on wcwidth to tell us the character width, at least for non-latin1 849 // rely on wcwidth to tell us the character width, do wcwidth before
848 // do wcwidth before further replacements, as wcwidth might return -1 850 // further replacements, as wcwidth might return -1 for the line
849 // for the line drawing characters below as they might be invalid in the current 851 // drawing characters below as they might be invalid in the current
850 // locale. 852 // locale.
851 int width = c < 0x100 ? 1 : wcwidth (c); 853 int width = WCWIDTH (c);
852 854
853 if (charsets [screen.charset] == '0') // DEC SPECIAL 855 if (charsets [screen.charset] == '0') // DEC SPECIAL
854 { 856 {
855 // vt100 special graphics and line drawing 857 // vt100 special graphics and line drawing
856 // 5f-7e standard vt100 858 // 5f-7e standard vt100
… …
1009 * XTERM_SEQ: CTRL-H 1011 * XTERM_SEQ: CTRL-H
1010 */ 1012 */
1011void 1013void
1012rxvt_term::scr_backspace () NOTHROW 1014rxvt_term::scr_backspace () NOTHROW
1013{ 1015{
1014 want_refresh = 1;
1015
1016 if (screen.cur.col == 0) 1016 if (screen.cur.col == 0)
1017 { 1017 {
1018 if (screen.cur.row > 0) 1018 if (screen.cur.row > 0)
1019 { 1019 {
1020#ifdef TERMCAP_HAS_BW 1020#ifdef TERMCAP_HAS_BW
1021 screen.cur.col = ncol - 1; 1021 screen.cur.col = ncol - 1;
1022 screen.cur.row--; 1022 screen.cur.row--;
1023 return; 1023 want_refresh = 1;
1024#endif 1024#endif
1025 } 1025 }
1026 } 1026 }
1027 else if (!(screen.flags & Screen_WrapNext)) 1027 else
1028 scr_gotorc (0, -1, RELATIVE); 1028 scr_gotorc (0, -1, RELATIVE);
1029
1030 screen.flags &= ~Screen_WrapNext;
1031} 1029}
1032 1030
1033/* ------------------------------------------------------------------------- */ 1031/* ------------------------------------------------------------------------- */
1034/* 1032/*
1035 * Process Horizontal Tab 1033 * Process Horizontal Tab
… …
1058 x = i; 1056 x = i;
1059 1057
1060 if (!--count) 1058 if (!--count)
1061 break; 1059 break;
1062 } 1060 }
1063 else 1061 else
1064 ht &= l.t[i] == ' ' 1062 ht &= l.t[i] == ' '
1065 && RS_SAME (l.r[i], base_rend); 1063 && RS_SAME (l.r[i], base_rend);
1066 1064
1067 if (count) 1065 if (count)
1068 x = ncol - 1; 1066 x = ncol - 1;
1069 1067
1070 // store horizontal tab commands as characters inside the text 1068 // store horizontal tab commands as characters inside the text
1071 // buffer so they can be selected and pasted. 1069 // buffer so they can be selected and pasted.
1072 if (ht && OPTION (Opt_pastableTabs)) 1070 if (ht && option (Opt_pastableTabs))
1073 { 1071 {
1074 base_rend = SET_FONT (base_rend, 0); 1072 base_rend = SET_FONT (base_rend, 0);
1075 1073
1076 l.touch (x); 1074 l.touch (x);
1077 1075
… …
1110 * Process DEC Back Index 1108 * Process DEC Back Index
1111 * XTERM_SEQ: ESC 6 1109 * XTERM_SEQ: ESC 6
1112 * Move cursor left in row. If we're at the left boundary, shift everything 1110 * Move cursor left in row. If we're at the left boundary, shift everything
1113 * in that row right. Clear left column. 1111 * in that row right. Clear left column.
1114 */ 1112 */
1115#if ENABLE_FRILLS 1113#if !ENABLE_MINIMAL
1116void 1114void
1117rxvt_term::scr_backindex () NOTHROW 1115rxvt_term::scr_backindex () NOTHROW
1118{ 1116{
1119 if (screen.cur.col > 0) 1117 if (screen.cur.col > 0)
1120 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE); 1118 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE);
… …
1127 * Process DEC Forward Index 1125 * Process DEC Forward Index
1128 * XTERM_SEQ: ESC 9 1126 * XTERM_SEQ: ESC 9
1129 * Move cursor right in row. If we're at the right boundary, shift everything 1127 * Move cursor right in row. If we're at the right boundary, shift everything
1130 * in that row left. Clear right column. 1128 * in that row left. Clear right column.
1131 */ 1129 */
1132#if ENABLE_FRILLS 1130#if !ENABLE_MINIMAL
1133void 1131void
1134rxvt_term::scr_forwardindex () NOTHROW 1132rxvt_term::scr_forwardindex () NOTHROW
1135{ 1133{
1136 if (screen.cur.col < ncol - 1) 1134 if (screen.cur.col < ncol - 1)
1137 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE); 1135 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE);
… …
1184 } 1182 }
1185 } 1183 }
1186 else 1184 else
1187 { 1185 {
1188 if (screen.flags & Screen_Relative) 1186 if (screen.flags & Screen_Relative)
1187 {
1189 { /* relative origin mode */ 1188 /* relative origin mode */
1190 screen.cur.row = row + screen.tscroll; 1189 screen.cur.row = row + screen.tscroll;
1191 min_it (screen.cur.row, screen.bscroll); 1190 min_it (screen.cur.row, screen.bscroll);
1192 } 1191 }
1193 else 1192 else
1194 screen.cur.row = row; 1193 screen.cur.row = row;
… …
1338 } 1337 }
1339 else 1338 else
1340 { 1339 {
1341 ren = rstyle & (RS_fgMask | RS_bgMask); 1340 ren = rstyle & (RS_fgMask | RS_bgMask);
1342 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)]; 1341 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)];
1343 XChangeGC (display->display, gc, GCForeground, &gcvalue); 1342 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1344 ERASE_ROWS (row, num); 1343 ERASE_ROWS (row, num);
1345 gcvalue.foreground = pix_colors[Color_fg]; 1344 gcvalue.foreground = pix_colors[Color_fg];
1346 XChangeGC (display->display, gc, GCForeground, &gcvalue); 1345 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1347 } 1346 }
1348 1347
1349 for (; num--; row++) 1348 for (; num--; row++)
1350 { 1349 {
1351 scr_blank_screen_mem (ROW(row), rstyle); 1350 scr_blank_screen_mem (ROW(row), rstyle);
1352 scr_blank_line (drawn_buf [row], 0, ncol, ren); 1351 scr_blank_line (drawn_buf [row], 0, ncol, ren);
1353 } 1352 }
1354} 1353}
1355 1354
1356#if ENABLE_FRILLS 1355#if !ENABLE_MINIMAL
1357void 1356void
1358rxvt_term::scr_erase_savelines () NOTHROW 1357rxvt_term::scr_erase_savelines () NOTHROW
1359{ 1358{
1360 want_refresh = 1; 1359 want_refresh = 1;
1361 ZERO_SCROLLBACK (); 1360 ZERO_SCROLLBACK ();
… …
1470 { 1469 {
1471 if (selection.end.row != screen.cur.row 1470 if (selection.end.row != screen.cur.row
1472 || (selection.end.col + count >= ncol)) 1471 || (selection.end.col + count >= ncol))
1473 CLEAR_SELECTION (); 1472 CLEAR_SELECTION ();
1474 else 1473 else
1474 {
1475 { /* shift selection */ 1475 /* shift selection */
1476 selection.beg.col += count; 1476 selection.beg.col += count;
1477 selection.mark.col += count; /* XXX: yes? */ 1477 selection.mark.col += count; /* XXX: yes? */
1478 selection.end.col += count; 1478 selection.end.col += count;
1479 } 1479 }
1480 } 1480 }
… …
1619 */ 1619 */
1620void 1620void
1621rxvt_term::scr_set_tab (int mode) NOTHROW 1621rxvt_term::scr_set_tab (int mode) NOTHROW
1622{ 1622{
1623 if (mode < 0) 1623 if (mode < 0)
1624 memset (tabs, 0, ncol * sizeof (char)); 1624 memset (tabs, 0, ncol);
1625 else if (screen.cur.col < ncol) 1625 else if (screen.cur.col < ncol)
1626 tabs [screen.cur.col] = !!mode; 1626 tabs [screen.cur.col] = !!mode;
1627} 1627}
1628 1628
1629/* ------------------------------------------------------------------------- */ 1629/* ------------------------------------------------------------------------- */
… …
1644 if (rvideo_state != on) 1644 if (rvideo_state != on)
1645 { 1645 {
1646 rvideo_state = on; 1646 rvideo_state = on;
1647 1647
1648 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]); 1648 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]);
1649#if XPM_BACKGROUND 1649#ifdef HAVE_BG_PIXMAP
1650 if (bgPixmap.pixmap == None) 1650 if (bgPixmap.pixmap == None)
1651#endif 1651#endif
1652#if TRANSPARENT
1653 if (!OPTION (Opt_transparent) || am_transparent == 0)
1654#endif
1655 XSetWindowBackground (display->display, vt, pix_colors[Color_bg]); 1652 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
1656 1653
1657 XGCValues gcvalue; 1654 XGCValues gcvalue;
1658 gcvalue.foreground = pix_colors[Color_fg]; 1655 gcvalue.foreground = pix_colors[Color_fg];
1659 gcvalue.background = pix_colors[Color_bg]; 1656 gcvalue.background = pix_colors[Color_bg];
1660 XChangeGC (display->display, gc, GCBackground | GCForeground, &gcvalue); 1657 XChangeGC (dpy, gc, GCBackground | GCForeground, &gcvalue);
1661 1658
1662 scr_clear (); 1659 scr_clear ();
1663 scr_touch (true); 1660 scr_touch (true);
1664 } 1661 }
1665} 1662}
… …
1750{ 1747{
1751 bool found = false; 1748 bool found = false;
1752 1749
1753 for (int i = 0; i < nrow; i++) 1750 for (int i = 0; i < nrow; i++)
1754 { 1751 {
1755 int col = 0;
1756 rend_t *drp = drawn_buf[i].r; 1752 rend_t *drp = drawn_buf[i].r;
1757 1753
1758 for (; col < ncol; col++, drp++) 1754 for (int col = 0; col < ncol; col++, drp++)
1759 if ((*drp & mask) == value) 1755 if ((*drp & mask) == value)
1760 { 1756 {
1761 found = true; 1757 found = true;
1762 *drp = ~value; 1758 *drp = ~value;
1763 } 1759 }
… …
1803 for (i = PART_BEG; i < RC_COUNT; i++) 1799 for (i = PART_BEG; i < RC_COUNT; i++)
1804 { 1800 {
1805 min_it (rc[i].col, ncol - 1); 1801 min_it (rc[i].col, ncol - 1);
1806 min_it (rc[i].row, nrow - 1); 1802 min_it (rc[i].row, nrow - 1);
1807 } 1803 }
1808 1804// TODO: this line somehow causes segfault if scr_expose() is called just after resize
1809 for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++) 1805 for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++)
1810 fill_text (&drawn_buf[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1); 1806 fill_text (&drawn_buf[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1);
1811 1807
1812 num_scr_allow = 0; 1808 num_scr_allow = 0;
1813 1809
… …
1868 return true; 1864 return true;
1869} 1865}
1870 1866
1871#ifndef NO_BELL 1867#ifndef NO_BELL
1872void 1868void
1873rxvt_term::bell_cb (time_watcher &w) 1869rxvt_term::bell_cb (ev::timer &w, int revents)
1874{ 1870{
1875 rvideo_bell = false; 1871 rvideo_bell = false;
1876 scr_rvideo_mode (rvideo_mode); 1872 scr_rvideo_mode (rvideo_mode);
1873 refresh_check ();
1877} 1874}
1878#endif 1875#endif
1879 1876
1880/* ------------------------------------------------------------------------- */ 1877/* ------------------------------------------------------------------------- */
1881void 1878void
… …
1883{ 1880{
1884#ifndef NO_BELL 1881#ifndef NO_BELL
1885 1882
1886# ifndef NO_MAPALERT 1883# ifndef NO_MAPALERT
1887# ifdef MAPALERT_OPTION 1884# ifdef MAPALERT_OPTION
1888 if (OPTION (Opt_mapAlert)) 1885 if (option (Opt_mapAlert))
1889# endif 1886# endif
1890 XMapWindow (display->display, parent[0]); 1887 XMapWindow (dpy, parent[0]);
1891# endif 1888# endif
1892 1889
1890# if ENABLE_FRILLS
1891 if (option (Opt_urgentOnBell))
1892 {
1893 if (XWMHints *h = XGetWMHints(dpy, parent[0]))
1894 {
1895 h->flags |= XUrgencyHint;
1896 XSetWMHints (dpy, parent[0], h);
1897 }
1898 }
1899# endif
1900
1893 if (OPTION (Opt_visualBell)) 1901 if (option (Opt_visualBell))
1894 { 1902 {
1895 rvideo_bell = true; 1903 rvideo_bell = true;
1896 scr_rvideo_mode (rvideo_mode); 1904 scr_rvideo_mode (rvideo_mode);
1897 display->flush (); 1905 flush ();
1898 1906
1899 bell_ev.start (NOW + VISUAL_BELL_DURATION); 1907 bell_ev.start (VISUAL_BELL_DURATION);
1900 } 1908 }
1901 else 1909 else
1902 XBell (display->display, 0); 1910 XBell (dpy, 0);
1903
1904#endif 1911#endif
1905} 1912}
1906 1913
1907/* ------------------------------------------------------------------------- */ 1914/* ------------------------------------------------------------------------- */
1908/* ARGSUSED */ 1915/* ARGSUSED */
… …
1966 * screen.text/screen.rend contain what the screen will change to. 1973 * screen.text/screen.rend contain what the screen will change to.
1967 */ 1974 */
1968void 1975void
1969rxvt_term::scr_refresh () NOTHROW 1976rxvt_term::scr_refresh () NOTHROW
1970{ 1977{
1971 unsigned char must_clear, /* use draw_string not draw_image_string */ 1978 unsigned char have_bg,
1972 showcursor; /* show the cursor */ 1979 showcursor; /* show the cursor */
1973 int16_t col, row, /* column/row we're processing */ 1980 int16_t col, row, /* column/row we're processing */
1974 ocrow; /* old cursor row */ 1981 ocrow; /* old cursor row */
1975 int i; /* tmp */ 1982 int i; /* tmp */
1976#ifndef NO_CURSORCOLOR 1983#ifndef NO_CURSORCOLOR
1977 rend_t cc1; /* store colours at cursor position (s) */ 1984 rend_t cc1; /* store colours at cursor position (s) */
1978#endif 1985#endif
1979 rend_t *crp; // cursor rendition pointer 1986 rend_t *crp; // cursor rendition pointer
1987 rend_t ccol1, /* Cursor colour */
1988 ccol2; /* Cursor colour2 */
1980 1989
1981 want_refresh = 0; /* screen is current */ 1990 want_refresh = 0; /* screen is current */
1982 1991
1983 if (refresh_type == NO_REFRESH || !mapped) 1992 if (refresh_type == NO_REFRESH || !mapped)
1984 return; 1993 return;
1985 1994
1986 /* 1995 /*
1987 * A: set up vars 1996 * A: set up vars
1988 */ 1997 */
1989 must_clear = 0; 1998 have_bg = 0;
1990 refresh_count = 0; 1999 refresh_count = 0;
1991 2000
1992#if XPM_BACKGROUND 2001#ifdef HAVE_BG_PIXMAP
1993 must_clear |= bgPixmap.pixmap != None; 2002 have_bg |= bgPixmap.pixmap != None;
1994#endif
1995#if TRANSPARENT
1996 must_clear |= OPTION (Opt_transparent) && am_transparent;
1997#endif 2003#endif
1998 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ 2004 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
1999 2005
2000 /* 2006 /*
2001 * B: reverse any characters which are selected 2007 * B: reverse any characters which are selected
… …
2005 /* 2011 /*
2006 * C: set the cursor character (s) 2012 * C: set the cursor character (s)
2007 */ 2013 */
2008 { 2014 {
2009 unsigned char setoldcursor; 2015 unsigned char setoldcursor;
2010 rend_t ccol1, /* Cursor colour */
2011 ccol2; /* Cursor colour2 */
2012 2016
2013 showcursor = (screen.flags & Screen_VisibleCursor); 2017 showcursor = (screen.flags & Screen_VisibleCursor);
2014#ifdef CURSOR_BLINK 2018#ifdef CURSOR_BLINK
2015 if (hidden_cursor) 2019 if (hidden_cursor)
2016 showcursor = 0; 2020 showcursor = 0;
… …
2023 while (col && ROW(screen.cur.row).t[col] == NOCHAR) 2027 while (col && ROW(screen.cur.row).t[col] == NOCHAR)
2024 col--; 2028 col--;
2025 2029
2026 crp = &ROW(screen.cur.row).r[col]; 2030 crp = &ROW(screen.cur.row).r[col];
2027 2031
2032#ifndef NO_CURSORCOLOR
2033 cc1 = *crp & (RS_fgMask | RS_bgMask);
2034 if (ISSET_PIXCOLOR (Color_cursor))
2035 ccol1 = Color_cursor;
2036 else
2037#endif
2038#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
2039 ccol1 = fgcolor_of (rstyle);
2040#else
2041 ccol1 = Color_fg;
2042#endif
2043
2044#ifndef NO_CURSORCOLOR
2045 if (ISSET_PIXCOLOR (Color_cursor2))
2046 ccol2 = Color_cursor2;
2047 else
2048#endif
2049#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
2050 ccol2 = bgcolor_of (rstyle);
2051#else
2052 ccol2 = Color_bg;
2053#endif
2054
2028 if (showcursor && focus) 2055 if (showcursor && focus)
2029 { 2056 {
2030 if (OPTION (Opt_cursorUnderline)) 2057 if (option (Opt_cursorUnderline))
2031 *crp ^= RS_Uline; 2058 *crp ^= RS_Uline;
2032 else 2059 else
2033 { 2060 {
2034 *crp ^= RS_RVid; 2061 *crp ^= RS_RVid;
2035
2036#ifndef NO_CURSORCOLOR
2037 cc1 = *crp & (RS_fgMask | RS_bgMask);
2038 if (ISSET_PIXCOLOR (Color_cursor))
2039 ccol1 = Color_cursor;
2040 else
2041#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
2042 ccol1 = fgcolor_of (rstyle);
2043#else
2044 ccol1 = Color_fg;
2045#endif
2046 if (ISSET_PIXCOLOR (Color_cursor2))
2047 ccol2 = Color_cursor2;
2048 else
2049#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
2050 ccol2 = bgcolor_of (rstyle);
2051#else
2052 ccol2 = Color_bg;
2053#endif
2054 *crp = SET_FGCOLOR (*crp, ccol1); 2062 *crp = SET_FGCOLOR (*crp, ccol1);
2055 *crp = SET_BGCOLOR (*crp, ccol2); 2063 *crp = SET_BGCOLOR (*crp, ccol2);
2056#endif
2057 } 2064 }
2058 } 2065 }
2059 } 2066 }
2060 2067
2061 /* make sure no outline cursor is left around */ 2068 /* make sure no outline cursor is left around */
… …
2100 * D: CopyArea pass - very useful for slower links 2107 * D: CopyArea pass - very useful for slower links
2101 * This has been deliberately kept simple. 2108 * This has been deliberately kept simple.
2102 */ 2109 */
2103 if (!display->is_local 2110 if (!display->is_local
2104 && refresh_type == FAST_REFRESH && num_scr_allow && num_scr 2111 && refresh_type == FAST_REFRESH && num_scr_allow && num_scr
2105 && abs (num_scr) < nrow && !must_clear) 2112 && abs (num_scr) < nrow && !have_bg)
2106 { 2113 {
2107 int16_t nits; 2114 int16_t nits;
2115 int i = num_scr;
2108 int j; 2116 int j;
2109 int len, wlen; 2117 int len, wlen;
2110 dLocal (int, num_scr); 2118 dLocal (int, num_scr);
2111 2119
2112 j = nrow; 2120 j = nrow;
2113 wlen = len = -1; 2121 wlen = len = -1;
2114 row = i > 0 ? 0 : j - 1; 2122 row = i > 0 ? 0 : j - 1;
2123
2115 for (; j-- >= 0; row += (i > 0 ? 1 : -1)) 2124 for (; j-- >= 0; row += (i > 0 ? 1 : -1))
2116 { 2125 {
2117 if (row + i >= 0 && row + i < nrow && row + i != ocrow) 2126 if (row + i >= 0 && row + i < nrow && row + i != ocrow)
2118 { 2127 {
2119 line_t s = ROW(view_start + row); 2128 line_t s = ROW(view_start + row);
… …
2140 wlen = row; 2149 wlen = row;
2141 continue; 2150 continue;
2142 } 2151 }
2143 } 2152 }
2144 2153
2145 if (len != -1) 2154 if (len >= 0)
2146 { 2155 {
2147 /* also comes here at end if needed because of >= above */ 2156 /* also comes here at end if needed because of >= above */
2148 if (wlen < len) 2157 if (wlen < len)
2149 ::swap (wlen, len); 2158 ::swap (wlen, len);
2150 2159
2160 XGCValues gcv;
2161
2162 gcv.graphics_exposures = 1; XChangeGC (dpy, gc, GCGraphicsExposures, &gcv);
2151 XCopyArea (display->display, vt, vt, 2163 XCopyArea (dpy, vt, vt,
2152 gc, 0, Row2Pixel (len + i), 2164 gc, 0, Row2Pixel (len + i),
2153 (unsigned int)this->width, 2165 (unsigned int)this->width,
2154 (unsigned int)Height2Pixel (wlen - len + 1), 2166 (unsigned int)Height2Pixel (wlen - len + 1),
2155 0, Row2Pixel (len)); 2167 0, Row2Pixel (len));
2168 gcv.graphics_exposures = 0; XChangeGC (dpy, gc, GCGraphicsExposures, &gcv);
2169
2156 len = -1; 2170 len = -1;
2157 } 2171 }
2158 } 2172 }
2159 } 2173 }
2160#endif 2174#endif
… …
2216 count++; 2230 count++;
2217 2231
2218 if (stp[col] != dtp[col] 2232 if (stp[col] != dtp[col]
2219 || !RS_SAME (srp[col], drp[col])) 2233 || !RS_SAME (srp[col], drp[col]))
2220 { 2234 {
2221 if (must_clear && (i++ > count / 2)) 2235 if (have_bg && (i++ > count / 2))
2222 break; 2236 break;
2223 2237
2224 dtp[col] = stp[col]; 2238 dtp[col] = stp[col];
2225 drp[col] = rend; 2239 drp[col] = rend;
2226 i = 0; 2240 i = 0;
2227 } 2241 }
2228 else if (must_clear || (stp[col] != ' ' && ++i >= 16)) 2242 else if (have_bg || (stp[col] != ' ' && ++i >= 16))
2229 break; 2243 break;
2230 } 2244 }
2231 2245
2232 col--; /* went one too far. move back */ 2246 col--; /* went one too far. move back */
2233 count -= i; /* dump any matching trailing chars */ 2247 count -= i; /* dump any matching trailing chars */
… …
2243 int back = bgcolor_of (rend); // desired background 2257 int back = bgcolor_of (rend); // desired background
2244 2258
2245 // only do special processing if any attributes are set, which is unlikely 2259 // only do special processing if any attributes are set, which is unlikely
2246 if (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful)) 2260 if (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful))
2247 { 2261 {
2248#if ENABLE_STYLES
2249 // force redraw after "careful" characters to avoid pixel droppings
2250 if (srp[col] & RS_Careful && col < ncol - 1 && 0)
2251 drp[col + 1] = ~srp[col + 1];
2252
2253 // include previous careful character(s) if possible, looks nicer (best effort...)
2254 while (text > stp
2255 && srp[text - stp - 1] & RS_Careful
2256 && RS_SAME (rend, srp[text - stp - 1]))
2257 text--, count++, xpixel -= fwidth;
2258#endif
2259
2260 bool invert = rend & RS_RVid; 2262 bool invert = rend & RS_RVid;
2261 2263
2262#ifndef NO_BOLD_UNDERLINE_REVERSE 2264#ifndef NO_BOLD_UNDERLINE_REVERSE
2263 if (rend & RS_Bold
2264 && fore == Color_fg) 2265 if (rend & RS_Bold && fore == Color_fg)
2265 { 2266 {
2266 if (ISSET_PIXCOLOR (Color_BD)) 2267 if (ISSET_PIXCOLOR (Color_BD))
2267 fore = Color_BD; 2268 fore = Color_BD;
2268# if !ENABLE_STYLES 2269# if !ENABLE_STYLES
2269 else 2270 else
2270 invert = !invert; 2271 invert = !invert;
2271# endif 2272# endif
2272 } 2273 }
2273 2274
2274 if (rend & RS_Italic 2275 if (rend & RS_Italic && fore == Color_fg)
2275 && fore == Color_fg)
2276 { 2276 {
2277 if (ISSET_PIXCOLOR (Color_IT)) 2277 if (ISSET_PIXCOLOR (Color_IT))
2278 fore = Color_IT; 2278 fore = Color_IT;
2279# if !ENABLE_STYLES 2279# if !ENABLE_STYLES
2280 else 2280 else
2281 invert = !invert; 2281 invert = !invert;
2282# endif 2282# endif
2283 } 2283 }
2284 2284
2285 if (rend & RS_Uline && ISSET_PIXCOLOR (Color_UL)) 2285 if (rend & RS_Uline && fore == Color_fg && ISSET_PIXCOLOR (Color_UL))
2286 fore = Color_UL; 2286 fore = Color_UL;
2287#endif 2287#endif
2288 2288
2289 if (invert) 2289 if (invert)
2290 { 2290 {
2291#ifdef OPTION_HC
2292 if ((showcursor && row == screen.cur.row && text - stp == screen.cur.col)
2293 || !ISSET_PIXCOLOR (Color_HC))
2294#endif
2295 /* invert the column if no highlightColor is set or it is the
2296 * current cursor column */
2291 ::swap (fore, back); 2297 ::swap (fore, back);
2298#ifdef OPTION_HC
2299 else if (ISSET_PIXCOLOR (Color_HC))
2300 back = Color_HC;
2301#endif
2292 2302
2293#ifndef NO_BOLD_UNDERLINE_REVERSE 2303#ifndef NO_BOLD_UNDERLINE_REVERSE
2304# ifndef OPTION_HC
2294 if (ISSET_PIXCOLOR (Color_RV)) 2305 if (ISSET_PIXCOLOR (Color_RV))
2295 back = Color_RV; 2306 back = Color_RV;
2296 2307# endif
2297 if (fore == back) 2308 if (fore == back)
2298 { 2309 {
2299 fore = Color_bg; 2310 fore = Color_bg;
2300 back = Color_fg; 2311 back = Color_fg;
2301 } 2312 }
… …
2303 } 2314 }
2304 2315
2305#ifdef TEXT_BLINK 2316#ifdef TEXT_BLINK
2306 if (rend & RS_Blink && (back == Color_bg || fore == Color_bg)) 2317 if (rend & RS_Blink && (back == Color_bg || fore == Color_bg))
2307 { 2318 {
2308 if (!text_blink_ev.active) 2319 if (!text_blink_ev.is_active ())
2309 { 2320 {
2310 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); 2321 text_blink_ev.again ();
2311 hidden_text = 0; 2322 hidden_text = 0;
2312 } 2323 }
2313 else if (hidden_text) 2324 else if (hidden_text)
2314 fore = back; 2325 fore = back;
2315 } 2326 }
2316#endif 2327#endif
2328
2329#if ENABLE_STYLES
2330 // "careful" (too wide) character handling
2331
2332 // include previous careful character(s) if possible, looks nicer (best effort...)
2333 while (text > stp
2334 && srp[text - stp - 1] & RS_Careful
2335 && RS_SAME (rend, srp[text - stp - 1]))
2336 text--, count++, xpixel -= fwidth;
2337
2338 // force redraw after "careful" characters to avoid pixel droppings
2339 for (int i = 0; srp[col + i] & RS_Careful && col + i < ncol - 1; i++)
2340 drp[col + i + 1] = srp[col + i + 1] ^ RS_redraw;
2341
2342 // force redraw before "careful" characters to avoid pixel droppings
2343 for (int i = 0; srp[text - stp - i] & RS_Careful && text - i > stp; i++)
2344 drp[text - stp - i - 1] = srp[text - stp - i - 1] ^ RS_redraw;
2345#endif
2317 } 2346 }
2318 2347
2319 /* 2348 /*
2320 * Actually do the drawing of the string here 2349 * Actually do the drawing of the string here
2321 */ 2350 */
2322 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)]; 2351 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)];
2323 2352
2324 if (back == fore)
2325 font->clear_rect (*drawable, xpixel, ypixel,
2326 fwidth * count, fheight,
2327 back);
2328 else if (back == Color_bg) 2353 if (have_bg && back == Color_bg)
2329 { 2354 {
2330 if (must_clear) 2355 // this is very ugly, maybe push it into ->draw?
2331 {
2332 CLEAR_CHARS (xpixel, ypixel, count);
2333 2356
2334 for (i = 0; i < count; i++) /* don't draw empty strings */ 2357 for (i = 0; i < count; i++) /* don't draw empty strings */
2335 if (text[i] != ' ') 2358 if (text[i] != ' ')
2336 { 2359 {
2337 font->draw (*drawable, xpixel, ypixel, text, count, fore, -1); 2360 font->draw (*drawable, xpixel, ypixel, text, count, fore, Color_transparent);
2338 break; 2361 goto did_clear;
2339 }
2340 } 2362 }
2341 else 2363
2342 font->draw (*drawable, xpixel, ypixel, text, count, fore, Color_bg); 2364 CLEAR_CHARS (xpixel, ypixel, count);
2365 did_clear: ;
2343 } 2366 }
2344 else 2367 else
2345 font->draw (*drawable, xpixel, ypixel, text, count, fore, back); 2368 font->draw (*drawable, xpixel, ypixel, text, count, fore, back);
2346 2369
2347 if (rend & RS_Uline && font->descent > 1 && fore != back) 2370 if (rend & RS_Uline && font->descent > 1 && fore != back)
2348 { 2371 {
2349#if ENABLE_FRILLS 2372#if ENABLE_FRILLS
2350 if (ISSET_PIXCOLOR (Color_underline)) 2373 if (ISSET_PIXCOLOR (Color_underline))
2351 XSetForeground (display->display, gc, pix_colors[Color_underline]); 2374 XSetForeground (dpy, gc, pix_colors[Color_underline]);
2352 else 2375 else
2353#endif 2376#endif
2354 XSetForeground (display->display, gc, pix_colors[fore]); 2377 XSetForeground (dpy, gc, pix_colors[fore]);
2355 2378
2356 XDrawLine (display->display, drawBuffer, gc, 2379 XDrawLine (dpy, drawBuffer, gc,
2357 xpixel, ypixel + font->ascent + 1, 2380 xpixel, ypixel + font->ascent + 1,
2358 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1); 2381 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1);
2359 } 2382 }
2360 } /* for (col....) */ 2383 } /* for (col....) */
2361 } /* for (row....) */ 2384 } /* for (row....) */
… …
2370 */ 2393 */
2371 if (showcursor) 2394 if (showcursor)
2372 { 2395 {
2373 if (focus) 2396 if (focus)
2374 { 2397 {
2375 if (OPTION (Opt_cursorUnderline)) 2398 if (option (Opt_cursorUnderline))
2376 *crp ^= RS_Uline; 2399 *crp ^= RS_Uline;
2377 else 2400 else
2378 { 2401 {
2379 *crp ^= RS_RVid; 2402 *crp ^= RS_RVid;
2380#ifndef NO_CURSORCOLOR 2403#ifndef NO_CURSORCOLOR
… …
2394 && drawn_buf[oldcursor.row].t[col + cursorwidth] == NOCHAR) 2417 && drawn_buf[oldcursor.row].t[col + cursorwidth] == NOCHAR)
2395 cursorwidth++; 2418 cursorwidth++;
2396 2419
2397#ifndef NO_CURSORCOLOR 2420#ifndef NO_CURSORCOLOR
2398 if (ISSET_PIXCOLOR (Color_cursor)) 2421 if (ISSET_PIXCOLOR (Color_cursor))
2399 XSetForeground (display->display, gc, pix_colors[Color_cursor]); 2422 XSetForeground (dpy, gc, pix_colors[Color_cursor]);
2423 else
2400#endif 2424#endif
2425 XSetForeground (dpy, gc, pix_colors[ccol1]);
2401 2426
2402 XDrawRectangle (display->display, drawBuffer, gc, 2427 XDrawRectangle (dpy, drawBuffer, gc,
2403 Col2Pixel (col), 2428 Col2Pixel (col),
2404 Row2Pixel (oldcursor.row), 2429 Row2Pixel (oldcursor.row),
2405 (unsigned int) (Width2Pixel (cursorwidth) - 1), 2430 (unsigned int) (Width2Pixel (cursorwidth) - 1),
2406 (unsigned int) (Height2Pixel (1) - lineSpace - 1)); 2431 (unsigned int) (Height2Pixel (1) - lineSpace - 1));
2407 } 2432 }
… …
2442} 2467}
2443 2468
2444void 2469void
2445rxvt_term::scr_recolour () NOTHROW 2470rxvt_term::scr_recolour () NOTHROW
2446{ 2471{
2447 if (1 2472#ifdef HAVE_BG_PIXMAP
2448#if TRANSPARENT 2473 bgPixmap.apply ();
2449 && !am_transparent 2474#else
2450#endif 2475
2451#if XPM_BACKGROUND
2452 && !bgPixmap.pixmap
2453#endif
2454 )
2455 {
2456 XSetWindowBackground (display->display, parent[0], pix_colors[Color_border]); 2476 XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]);
2457 XClearWindow (display->display, parent[0]); 2477 XClearWindow (dpy, parent[0]);
2458 XSetWindowBackground (display->display, vt, pix_colors[Color_bg]); 2478 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
2479
2459#if HAVE_SCROLLBARS 2480# if HAVE_SCROLLBARS
2460 if (scrollBar.win) 2481 if (scrollBar.win)
2461 { 2482 {
2462 XSetWindowBackground (display->display, scrollBar.win, pix_colors[Color_border]); 2483 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]);
2463 scrollBar.setIdle (); 2484 scrollBar.setIdle ();
2464 scrollbar_show (0); 2485 scrollbar_show (0);
2465 } 2486 }
2466#endif 2487# endif
2467 }
2468 2488
2469 scr_clear (); 2489 scr_clear ();
2470 scr_touch (true); 2490 scr_touch (true);
2471 want_refresh = 1; 2491 want_refresh = 1;
2492
2493#endif
2472} 2494}
2473 2495
2474/* ------------------------------------------------------------------------- */ 2496/* ------------------------------------------------------------------------- */
2475void 2497void
2476rxvt_term::scr_clear (bool really) NOTHROW 2498rxvt_term::scr_clear (bool really) NOTHROW
… …
2480 2502
2481 num_scr_allow = 0; 2503 num_scr_allow = 0;
2482 want_refresh = 1; 2504 want_refresh = 1;
2483 2505
2484 if (really) 2506 if (really)
2485 XClearWindow (display->display, vt); 2507 XClearWindow (dpy, vt);
2486} 2508}
2487 2509
2488void 2510void
2489rxvt_term::scr_xor_rect (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle1, rend_t rstyle2) NOTHROW 2511rxvt_term::scr_xor_rect (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle1, rend_t rstyle2) NOTHROW
2490{ 2512{
… …
2539{ 2561{
2540 if (selection.op 2562 if (selection.op
2541 && current_screen == selection.screen 2563 && current_screen == selection.screen
2542 && selection.end.row >= view_start) 2564 && selection.end.row >= view_start)
2543 { 2565 {
2544#if ENABLE_FRILLS 2566#if !ENABLE_MINIMAL
2545 if (selection.rect) 2567 if (selection.rect)
2546 scr_xor_rect (selection.beg.row, selection.beg.col, 2568 scr_xor_rect (selection.beg.row, selection.beg.col,
2547 selection.end.row, selection.end.col, 2569 selection.end.row, selection.end.col,
2548 RS_RVid, RS_RVid | RS_Uline); 2570 RS_RVid, RS_RVid | RS_Uline);
2549 else 2571 else
… …
2665 } 2687 }
2666 2688
2667 unsigned long bytes_after; 2689 unsigned long bytes_after;
2668 XTextProperty ct; 2690 XTextProperty ct;
2669 2691
2670 if (XGetWindowProperty (display->display, win, prop, 2692 if (XGetWindowProperty (dpy, win, prop,
2671 0, PROP_SIZE / 4, 2693 0, PROP_SIZE / 4,
2672 delete_prop, AnyPropertyType, 2694 delete_prop, AnyPropertyType,
2673 &ct.encoding, &ct.format, 2695 &ct.encoding, &ct.format,
2674 &ct.nitems, &bytes_after, 2696 &ct.nitems, &bytes_after,
2675 &ct.value) != Success) 2697 &ct.value) != Success)
… …
2684 if (bytes_after) 2706 if (bytes_after)
2685 { 2707 {
2686 // fetch and append remaining data 2708 // fetch and append remaining data
2687 XTextProperty ct2; 2709 XTextProperty ct2;
2688 2710
2689 if (XGetWindowProperty (display->display, win, prop, 2711 if (XGetWindowProperty (dpy, win, prop,
2690 ct.nitems / 4, (bytes_after + 3) / 4, 2712 ct.nitems / 4, (bytes_after + 3) / 4,
2691 delete_prop, AnyPropertyType, 2713 delete_prop, AnyPropertyType,
2692 &ct2.encoding, &ct2.format, 2714 &ct2.encoding, &ct2.format,
2693 &ct2.nitems, &bytes_after, 2715 &ct2.nitems, &bytes_after,
2694 &ct2.value) != Success) 2716 &ct2.value) != Success)
… …
2707 2729
2708 if (ct.encoding == xa[XA_INCR]) 2730 if (ct.encoding == xa[XA_INCR])
2709 { 2731 {
2710 // INCR selection, start handshake 2732 // INCR selection, start handshake
2711 if (!delete_prop) 2733 if (!delete_prop)
2712 XDeleteProperty (display->display, win, prop); 2734 XDeleteProperty (dpy, win, prop);
2713 2735
2714 selection_wait = Sel_incr; 2736 selection_wait = Sel_incr;
2715 incr_buf_fill = 0; 2737 incr_buf_fill = 0;
2716 incr_ev.start (NOW + 10); 2738 incr_ev.start (10);
2717 2739
2718 goto bailout; 2740 goto bailout;
2719 } 2741 }
2720 2742
2721 if (ct.nitems == 0) 2743 if (ct.nitems == 0)
… …
2730 ct.nitems = incr_buf_fill; 2752 ct.nitems = incr_buf_fill;
2731 incr_buf = 0; 2753 incr_buf = 0;
2732 incr_buf_size = 0; 2754 incr_buf_size = 0;
2733 incr_ev.stop (); 2755 incr_ev.stop ();
2734 } 2756 }
2735 else 2757 else
2736 { 2758 {
2737 if (selection_wait == Sel_normal 2759 if (selection_wait == Sel_normal
2738 && (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion 2760 && (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion
2739 { 2761 {
2740 /* 2762 /*
… …
2747 goto bailout; 2769 goto bailout;
2748 } 2770 }
2749 } 2771 }
2750 else if (selection_wait == Sel_incr) 2772 else if (selection_wait == Sel_incr)
2751 { 2773 {
2752 incr_ev.start (NOW + 10); 2774 incr_ev.start (10);
2753 2775
2754 while (incr_buf_fill + ct.nitems > incr_buf_size) 2776 while (incr_buf_fill + ct.nitems > incr_buf_size)
2755 { 2777 {
2756 incr_buf_size = incr_buf_size ? incr_buf_size * 2 : 128*1024; 2778 incr_buf_size = incr_buf_size ? incr_buf_size * 2 : 128*1024;
2757 incr_buf = (char *)realloc (incr_buf, incr_buf_size); 2779 incr_buf = (char *)realloc (incr_buf, incr_buf_size);
… …
2764 } 2786 }
2765 2787
2766 char **cl; 2788 char **cl;
2767 int cr; 2789 int cr;
2768 2790
2769#if ENABLE_FRILLS 2791#if !ENABLE_MINIMAL
2770 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it 2792 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it
2771 // so recode it manually 2793 // so recode it manually
2772 if (ct.encoding == xa[XA_UTF8_STRING]) 2794 if (ct.encoding == xa[XA_UTF8_STRING])
2773 { 2795 {
2774 wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems); 2796 wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems);
… …
2778 paste (s, strlen (s)); 2800 paste (s, strlen (s));
2779 free (s); 2801 free (s);
2780 } 2802 }
2781 else 2803 else
2782#endif 2804#endif
2783 if (XmbTextPropertyToTextList (display->display, &ct, &cl, &cr) >= 0 2805 if (XmbTextPropertyToTextList (dpy, &ct, &cl, &cr) >= 0
2784 && cl) 2806 && cl)
2785 { 2807 {
2786 for (int i = 0; i < cr; i++) 2808 for (int i = 0; i < cr; i++)
2787 paste (cl[i], strlen (cl[i])); 2809 paste (cl[i], strlen (cl[i]));
2788 2810
… …
2797 if (selection_wait == Sel_normal) 2819 if (selection_wait == Sel_normal)
2798 selection_wait = Sel_none; 2820 selection_wait = Sel_none;
2799} 2821}
2800 2822
2801void 2823void
2802rxvt_term::incr_cb (time_watcher &w) NOTHROW 2824rxvt_term::incr_cb (ev::timer &w, int revents) NOTHROW
2803{ 2825{
2804 selection_wait = Sel_none; 2826 selection_wait = Sel_none;
2805 2827
2806 incr_buf_size = 0; 2828 incr_buf_size = 0;
2807 free (incr_buf); 2829 free (incr_buf);
… …
2818 selection_paste (win, prop, true); 2840 selection_paste (win, prop, true);
2819} 2841}
2820 2842
2821/* ------------------------------------------------------------------------- */ 2843/* ------------------------------------------------------------------------- */
2822/* 2844/*
2823 * Request the current selection: 2845 * Request the current selection:
2824 * Order: > internal selection if available 2846 * Order: > internal selection if available
2825 * > PRIMARY, SECONDARY, CLIPBOARD if ownership is claimed (+) 2847 * > PRIMARY, SECONDARY, CLIPBOARD if ownership is claimed (+)
2826 * > CUT_BUFFER0 2848 * > CUT_BUFFER0
2827 * (+) if ownership is claimed but property is empty, rxvt_selection_paste () 2849 * (+) if ownership is claimed but property is empty, rxvt_selection_paste ()
2828 * will auto fallback to CUT_BUFFER0 2850 * will auto fallback to CUT_BUFFER0
… …
2830 */ 2852 */
2831void 2853void
2832rxvt_term::selection_request (Time tm, int selnum) NOTHROW 2854rxvt_term::selection_request (Time tm, int selnum) NOTHROW
2833{ 2855{
2834 if (selection.text && selnum == Sel_Primary) 2856 if (selection.text && selnum == Sel_Primary)
2857 {
2835 { /* internal selection */ 2858 /* internal selection */
2836 char *str = rxvt_wcstombs (selection.text, selection.len); 2859 char *str = rxvt_wcstombs (selection.text, selection.len);
2837 paste (str, strlen (str)); 2860 paste (str, strlen (str));
2838 free (str); 2861 free (str);
2839 return; 2862 return;
2840 } 2863 }
… …
2870 else if (selnum == Sel_Secondary) 2893 else if (selnum == Sel_Secondary)
2871 sel = XA_SECONDARY; 2894 sel = XA_SECONDARY;
2872 else 2895 else
2873 sel = xa[XA_CLIPBOARD]; 2896 sel = xa[XA_CLIPBOARD];
2874 2897
2875 if (XGetSelectionOwner (display->display, sel) != None) 2898 if (XGetSelectionOwner (dpy, sel) != None)
2876 { 2899 {
2877 XConvertSelection (display->display, sel, target, xa[XA_VT_SELECTION], 2900 XConvertSelection (dpy, sel, target, xa[XA_VT_SELECTION],
2878 vt, selection_request_time); 2901 vt, selection_request_time);
2879 return 1; 2902 return 1;
2880 } 2903 }
2881 2904
2882 return 0; 2905 return 0;
… …
2945 2968
2946 int end_col; 2969 int end_col;
2947 2970
2948 for (; row <= selection.end.row; row++, col = 0) 2971 for (; row <= selection.end.row; row++, col = 0)
2949 { 2972 {
2950#if ENABLE_FRILLS 2973#if !ENABLE_MINIMAL
2951 if (selection.rect) 2974 if (selection.rect)
2952 { 2975 {
2953 col = selection.beg.col; 2976 col = selection.beg.col;
2954 end_col = ncol + 1; 2977 end_col = ncol + 1;
2955 } 2978 }
… …
2958 end_col = ROW(row).l; 2981 end_col = ROW(row).l;
2959 2982
2960 col = max (col, 0); 2983 col = max (col, 0);
2961 2984
2962 if (row == selection.end.row 2985 if (row == selection.end.row
2963#if ENABLE_FRILLS 2986#if !ENABLE_MINIMAL
2964 || selection.rect 2987 || selection.rect
2965#endif 2988#endif
2966 ) 2989 )
2967 min_it (end_col, selection.end.col); 2990 min_it (end_col, selection.end.col);
2968 2991
… …
2991#endif 3014#endif
2992 else 3015 else
2993 new_selection_text[ofs++] = *t++; 3016 new_selection_text[ofs++] = *t++;
2994 } 3017 }
2995 3018
2996#if ENABLE_FRILLS 3019#if !ENABLE_MINIMAL
2997 if (selection.rect) 3020 if (selection.rect)
2998 { 3021 {
2999 while (ofs 3022 while (ofs
3000 && new_selection_text[ofs - 1] != C0_LF 3023 && new_selection_text[ofs - 1] != C0_LF
3001 && unicode::is_space (new_selection_text[ofs - 1])) 3024 && unicode::is_space (new_selection_text[ofs - 1]))
… …
3035bool 3058bool
3036rxvt_term::selection_grab (Time tm) NOTHROW 3059rxvt_term::selection_grab (Time tm) NOTHROW
3037{ 3060{
3038 selection_time = tm; 3061 selection_time = tm;
3039 3062
3040 XSetSelectionOwner (display->display, XA_PRIMARY, vt, tm); 3063 XSetSelectionOwner (dpy, XA_PRIMARY, vt, tm);
3041 if (XGetSelectionOwner (display->display, XA_PRIMARY) == vt) 3064 if (XGetSelectionOwner (dpy, XA_PRIMARY) == vt)
3042 { 3065 {
3043 display->set_selection_owner (this); 3066 display->set_selection_owner (this);
3044 return true; 3067 return true;
3045 } 3068 }
3046 else 3069 else
… …
3050 } 3073 }
3051 3074
3052#if 0 3075#if 0
3053 XTextProperty ct; 3076 XTextProperty ct;
3054 3077
3055 if (XwcTextListToTextProperty (display->display, &selection.text, 1, XStringStyle, &ct) >= 0) 3078 if (XwcTextListToTextProperty (dpy, &selection.text, 1, XStringStyle, &ct) >= 0)
3056 { 3079 {
3057 set_string_property (XA_CUT_BUFFER0, ct.value, ct.nitems); 3080 set_string_property (XA_CUT_BUFFER0, ct.value, ct.nitems);
3058 XFree (ct.value); 3081 XFree (ct.value);
3059 } 3082 }
3060#endif 3083#endif
… …
3106 selection.mark.col = clamp (selection.mark.col, 0, ncol - 1); 3129 selection.mark.col = clamp (selection.mark.col, 0, ncol - 1);
3107 3130
3108 while (selection.mark.col > 0 3131 while (selection.mark.col > 0
3109 && ROW(selection.mark.row).t[selection.mark.col] == NOCHAR) 3132 && ROW(selection.mark.row).t[selection.mark.col] == NOCHAR)
3110 --selection.mark.col; 3133 --selection.mark.col;
3111 3134
3112 if (selection.op) 3135 if (selection.op)
3136 {
3113 { /* clear the old selection */ 3137 /* clear the old selection */
3114 selection.beg.row = selection.end.row = selection.mark.row; 3138 selection.beg.row = selection.end.row = selection.mark.row;
3115 selection.beg.col = selection.end.col = selection.mark.col; 3139 selection.beg.col = selection.end.col = selection.mark.col;
3116 } 3140 }
3117 3141
3118 selection.op = SELECTION_INIT; 3142 selection.op = SELECTION_INIT;
… …
3307 * a point/word/line which is either the start or end of the selection 3331 * a point/word/line which is either the start or end of the selection
3308 * and it was decided by whichever point/word/line was `fixed' at the 3332 * and it was decided by whichever point/word/line was `fixed' at the
3309 * time of the most recent button3 press 3333 * time of the most recent button3 press
3310 */ 3334 */
3311 if (button3 && buttonpress) 3335 if (button3 && buttonpress)
3336 {
3312 { /* button3 press */ 3337 /* button3 press */
3313 /* 3338 /*
3314 * first determine which edge of the selection we are closest to 3339 * first determine which edge of the selection we are closest to
3315 */ 3340 */
3316 if (ROWCOL_IS_BEFORE (pos, selection.beg) 3341 if (ROWCOL_IS_BEFORE (pos, selection.beg)
3317 || (!ROWCOL_IS_AFTER (pos, selection.end) 3342 || (!ROWCOL_IS_AFTER (pos, selection.end)
… …
3335 selection.mark.row = selection.beg.row; 3360 selection.mark.row = selection.beg.row;
3336 selection.mark.col = selection.beg.col; 3361 selection.mark.col = selection.beg.col;
3337 } 3362 }
3338 } 3363 }
3339 else 3364 else
3365 {
3340 { /* button1 drag or button3 drag */ 3366 /* button1 drag or button3 drag */
3341 if (ROWCOL_IS_AFTER (selection.mark, pos)) 3367 if (ROWCOL_IS_AFTER (selection.mark, pos))
3342 { 3368 {
3343 if (selection.mark.row == selection.end.row 3369 if (selection.mark.row == selection.end.row
3344 && selection.mark.col == selection.end.col 3370 && selection.mark.col == selection.end.col
3345 && clickchange 3371 && clickchange
… …
3362 3388
3363 if (selection.clicks == 1) 3389 if (selection.clicks == 1)
3364 { 3390 {
3365 if (selection.beg.col > ROW(selection.beg.row).l //TODO//FIXME//LEN 3391 if (selection.beg.col > ROW(selection.beg.row).l //TODO//FIXME//LEN
3366 && !ROW(selection.beg.row).is_longer () 3392 && !ROW(selection.beg.row).is_longer ()
3367#if ENABLE_FRILLS 3393#if !ENABLE_MINIMAL
3368 && !selection.rect 3394 && !selection.rect
3369#endif 3395#endif
3370 ) 3396 )
3371 selection.beg.col = ncol; 3397 selection.beg.col = ncol;
3372 3398
3373 if ( 3399 if (
3374 selection.end.col > ROW(selection.end.row).l //TODO//FIXME//LEN 3400 selection.end.col > ROW(selection.end.row).l //TODO//FIXME//LEN
3375 && !ROW(selection.end.row).is_longer () 3401 && !ROW(selection.end.row).is_longer ()
3376#if ENABLE_FRILLS 3402#if !ENABLE_MINIMAL
3377 && !selection.rect 3403 && !selection.rect
3378#endif 3404#endif
3379 ) 3405 )
3380 selection.end.col = ncol; 3406 selection.end.col = ncol;
3381 } 3407 }
… …
3388 selection_delimit_word (DN, &selection.end, &selection.end); 3414 selection_delimit_word (DN, &selection.end, &selection.end);
3389 } 3415 }
3390 else if (selection.clicks == 3) 3416 else if (selection.clicks == 3)
3391 { 3417 {
3392#if ENABLE_FRILLS 3418#if ENABLE_FRILLS
3393 if (OPTION (Opt_tripleclickwords)) 3419 if (option (Opt_tripleclickwords))
3394 { 3420 {
3395 selection_delimit_word (UP, &selection.beg, &selection.beg); 3421 selection_delimit_word (UP, &selection.beg, &selection.beg);
3396 3422
3397 for (int end_row = selection.mark.row; end_row < nrow; end_row++) 3423 for (int end_row = selection.mark.row; end_row < nrow; end_row++)
3398 { 3424 {
3399 if (!ROW(end_row).is_longer ()) 3425 if (!ROW(end_row).is_longer ())
3400 { 3426 {
3401 selection.end.row = end_row; 3427 selection.end.row = end_row;
3402 selection.end.col = ROW(end_row).l; 3428 selection.end.col = ROW(end_row).l;
3429# if !ENABLE_MINIMAL
3403 selection_remove_trailing_spaces (); 3430 selection_remove_trailing_spaces ();
3431# endif
3404 break; 3432 break;
3405 } 3433 }
3406 } 3434 }
3407 } 3435 }
3408 else 3436 else
… …
3424 selection.end.row++; 3452 selection.end.row++;
3425 } 3453 }
3426 } 3454 }
3427 3455
3428 if (button3 && buttonpress) 3456 if (button3 && buttonpress)
3457 {
3429 { /* mark may need to be changed */ 3458 /* mark may need to be changed */
3430 if (closeto == LEFT) 3459 if (closeto == LEFT)
3431 { 3460 {
3432 selection.mark.row = selection.end.row; 3461 selection.mark.row = selection.end.row;
3433 selection.mark.col = selection.end.col - (selection.clicks == 2); 3462 selection.mark.col = selection.end.col - (selection.clicks == 2);
3434 } 3463 }
… …
3437 selection.mark.row = selection.beg.row; 3466 selection.mark.row = selection.beg.row;
3438 selection.mark.col = selection.beg.col; 3467 selection.mark.col = selection.beg.col;
3439 } 3468 }
3440 } 3469 }
3441 3470
3442#if ENABLE_FRILLS 3471#if !ENABLE_MINIMAL
3443 if (selection.rect && selection.beg.col > selection.end.col) 3472 if (selection.rect && selection.beg.col > selection.end.col)
3444 ::swap (selection.beg.col, selection.end.col); 3473 ::swap (selection.beg.col, selection.end.col);
3445#endif 3474#endif
3446} 3475}
3447 3476
3448#if ENABLE_FRILLS 3477#if !ENABLE_MINIMAL
3449void 3478void
3450rxvt_term::selection_remove_trailing_spaces () NOTHROW 3479rxvt_term::selection_remove_trailing_spaces () NOTHROW
3451{ 3480{
3452 int32_t end_col, end_row; 3481 int32_t end_col, end_row;
3453 text_t *stp; 3482 text_t *stp;
… …
3508 */ 3537 */
3509void 3538void
3510rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW 3539rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW
3511{ 3540{
3512 XSelectionEvent ev; 3541 XSelectionEvent ev;
3513 dDisp;
3514 3542
3515 ev.type = SelectionNotify; 3543 ev.type = SelectionNotify;
3516 ev.property = None; 3544 ev.property = None;
3517 ev.display = rq.display; 3545 ev.display = rq.display;
3518 ev.requestor = rq.requestor; 3546 ev.requestor = rq.requestor;
… …
3532 *target++ = xa[XA_COMPOUND_TEXT]; 3560 *target++ = xa[XA_COMPOUND_TEXT];
3533#if X_HAVE_UTF8_STRING 3561#if X_HAVE_UTF8_STRING
3534 *target++ = xa[XA_UTF8_STRING]; 3562 *target++ = xa[XA_UTF8_STRING];
3535#endif 3563#endif
3536 3564
3537 XChangeProperty (disp, rq.requestor, rq.property, XA_ATOM, 3565 XChangeProperty (dpy, rq.requestor, rq.property, XA_ATOM,
3538 32, PropModeReplace, 3566 32, PropModeReplace,
3539 (unsigned char *)target_list, target - target_list); 3567 (unsigned char *)target_list, target - target_list);
3540 ev.property = rq.property; 3568 ev.property = rq.property;
3541 } 3569 }
3542#if TODO // TODO 3570#if TODO // TODO
… …
3545 /* TODO: Handle MULTIPLE */ 3573 /* TODO: Handle MULTIPLE */
3546 } 3574 }
3547#endif 3575#endif
3548 else if (rq.target == xa[XA_TIMESTAMP] && selection.text) 3576 else if (rq.target == xa[XA_TIMESTAMP] && selection.text)
3549 { 3577 {
3550 XChangeProperty (disp, rq.requestor, rq.property, rq.target, 3578 XChangeProperty (dpy, rq.requestor, rq.property, rq.target,
3551 32, PropModeReplace, (unsigned char *)&selection_time, 1); 3579 32, PropModeReplace, (unsigned char *)&selection_time, 1);
3552 ev.property = rq.property; 3580 ev.property = rq.property;
3553 } 3581 }
3554 else if (rq.target == XA_STRING 3582 else if (rq.target == XA_STRING
3555 || rq.target == xa[XA_TEXT] 3583 || rq.target == xa[XA_TEXT]
… …
3579 style = enc_string; 3607 style = enc_string;
3580 else if (target == xa[XA_TEXT]) 3608 else if (target == xa[XA_TEXT])
3581 style = enc_text; 3609 style = enc_text;
3582 else if (target == xa[XA_COMPOUND_TEXT]) 3610 else if (target == xa[XA_COMPOUND_TEXT])
3583 style = enc_compound_text; 3611 style = enc_compound_text;
3584#if ENABLE_FRILLS 3612#if !ENABLE_MINIMAL
3585 else if (target == xa[XA_UTF8_STRING]) 3613 else if (target == xa[XA_UTF8_STRING])
3586 style = enc_utf8; 3614 style = enc_utf8;
3587#endif 3615#endif
3588 else 3616 else
3589 { 3617 {
… …
3600 { 3628 {
3601 cl = L""; 3629 cl = L"";
3602 selectlen = 0; 3630 selectlen = 0;
3603 } 3631 }
3604 3632
3605#if ENABLE_FRILLS 3633#if !ENABLE_MINIMAL
3606 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it 3634 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it
3607 // so recode it manually 3635 // so recode it manually
3608 if (style == enc_utf8) 3636 if (style == enc_utf8)
3609 { 3637 {
3610 freect = 1; 3638 freect = 1;
… …
3613 ct.value = (unsigned char *)rxvt_wcstoutf8 (cl, selectlen); 3641 ct.value = (unsigned char *)rxvt_wcstoutf8 (cl, selectlen);
3614 ct.nitems = strlen ((char *)ct.value); 3642 ct.nitems = strlen ((char *)ct.value);
3615 } 3643 }
3616 else 3644 else
3617#endif 3645#endif
3618 if (XwcTextListToTextProperty (disp, &cl, 1, (XICCEncodingStyle) style, &ct) >= 0) 3646 if (XwcTextListToTextProperty (dpy, &cl, 1, (XICCEncodingStyle) style, &ct) >= 0)
3619 freect = 1; 3647 freect = 1;
3620 else 3648 else
3621 { 3649 {
3622 /* if we failed to convert then send it raw */ 3650 /* if we failed to convert then send it raw */
3623 ct.value = (unsigned char *)cl; 3651 ct.value = (unsigned char *)cl;
3624 ct.nitems = selectlen; 3652 ct.nitems = selectlen;
3625 ct.encoding = target; 3653 ct.encoding = target;
3626 } 3654 }
3627 3655
3628 XChangeProperty (disp, rq.requestor, rq.property, 3656 XChangeProperty (dpy, rq.requestor, rq.property,
3629 ct.encoding, 8, PropModeReplace, 3657 ct.encoding, 8, PropModeReplace,
3630 ct.value, (int)ct.nitems); 3658 ct.value, (int)ct.nitems);
3631 ev.property = rq.property; 3659 ev.property = rq.property;
3632 3660
3633 if (freect) 3661 if (freect)
3634 XFree (ct.value); 3662 XFree (ct.value);
3635 } 3663 }
3636 3664
3637 XSendEvent (disp, rq.requestor, False, 0L, (XEvent *)&ev); 3665 XSendEvent (dpy, rq.requestor, False, 0L, (XEvent *)&ev);
3638}
3639
3640/* ------------------------------------------------------------------------- *
3641 * MOUSE ROUTINES *
3642 * ------------------------------------------------------------------------- */
3643
3644/*
3645 * return col/row values corresponding to x/y pixel values
3646 */
3647void
3648rxvt_term::pixel_position (int *x, int *y) NOTHROW
3649{
3650 *x = Pixel2Col (*x);
3651 /* max_it (*x, 0); min_it (*x, (int)ncol - 1); */
3652 *y = Pixel2Row (*y);
3653 /* max_it (*y, 0); min_it (*y, (int)nrow - 1); */
3654} 3666}
3655 3667
3656/* ------------------------------------------------------------------------- */ 3668/* ------------------------------------------------------------------------- */
3657#ifdef USE_XIM 3669#ifdef USE_XIM
3658void 3670void
3659rxvt_term::im_set_position (XPoint &pos) NOTHROW 3671rxvt_term::im_set_position (XPoint &pos) NOTHROW
3660{ 3672{
3661 XWindowAttributes xwa; 3673 XWindowAttributes xwa;
3662 3674
3663 XGetWindowAttributes (display->display, vt, &xwa); 3675 XGetWindowAttributes (dpy, vt, &xwa);
3664 3676
3665 pos.x = xwa.x + Col2Pixel (screen.cur.col); 3677 pos.x = xwa.x + Col2Pixel (screen.cur.col);
3666 pos.y = xwa.y + Height2Pixel (screen.cur.row) + fbase; 3678 pos.y = xwa.y + Height2Pixel (screen.cur.row) + fbase;
3667} 3679}
3668#endif 3680#endif
… …
3764rxvt_term::scr_overlay_set (int x, int y, const wchar_t *s) NOTHROW 3776rxvt_term::scr_overlay_set (int x, int y, const wchar_t *s) NOTHROW
3765{ 3777{
3766 while (*s) 3778 while (*s)
3767 { 3779 {
3768 text_t t = *s++; 3780 text_t t = *s++;
3769 int width = wcwidth (t); 3781 int width = WCWIDTH (t);
3770 3782
3771 while (width--) 3783 while (width--)
3772 { 3784 {
3773 scr_overlay_set (x++, y, t); 3785 scr_overlay_set (x++, y, t);
3774 t = NOCHAR; 3786 t = NOCHAR;

Diff Legend

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