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.254 by root, Sat Jan 28 14:23:16 2006 UTC vs.
Revision 1.306 by root, Sun Jun 15 10:15:39 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() \
… …
89/* 87/*
90 * CLEAR_ROWS : clear <num> rows starting from row <row> 88 * CLEAR_ROWS : clear <num> rows starting from row <row>
91 * CLEAR_CHARS: clear <num> chars starting from pixel position <x,y> 89 * CLEAR_CHARS: clear <num> chars starting from pixel position <x,y>
92 * ERASE_ROWS : set <num> rows starting from row <row> to the foreground colour 90 * ERASE_ROWS : set <num> rows starting from row <row> to the foreground colour
93 */ 91 */
94#define drawBuffer vt
95
96#define CLEAR_ROWS(row, num) \ 92#define CLEAR_ROWS(row, num) \
97 if (mapped) \ 93 if (mapped) \
98 XClearArea (xdisp, drawBuffer, 0, \ 94 XClearArea (dpy, vt, 0, \
99 Row2Pixel (row), (unsigned int)width, \ 95 Row2Pixel (row), (unsigned int)width, \
100 (unsigned int)Height2Pixel (num), False) 96 (unsigned int)Height2Pixel (num), False)
101 97
102#define CLEAR_CHARS(x, y, num) \ 98#define CLEAR_CHARS(x, y, num) \
103 if (mapped) \ 99 if (mapped) \
104 XClearArea (xdisp, drawBuffer, x, y, \ 100 XClearArea (dpy, vt, x, y, \
105 (unsigned int)Width2Pixel (num), \ 101 (unsigned int)Width2Pixel (num), \
106 (unsigned int)Height2Pixel (1), False) 102 (unsigned int)Height2Pixel (1), False)
107 103
108#define ERASE_ROWS(row, num) \ 104#define ERASE_ROWS(row, num) \
109 XFillRectangle (xdisp, drawBuffer, gc, \ 105 XFillRectangle (dpy, vt, gc, \
110 0, Row2Pixel (row), \ 106 0, Row2Pixel (row), \
111 (unsigned int)width, \ 107 (unsigned int)width, \
112 (unsigned int)Height2Pixel (num)) 108 (unsigned int)Height2Pixel (num))
113 109
114/* ------------------------------------------------------------------------- * 110/* ------------------------------------------------------------------------- *
115 * SCREEN `COMMON' ROUTINES * 111 * SCREEN `COMMON' ROUTINES *
116 * ------------------------------------------------------------------------- */ 112 * ------------------------------------------------------------------------- */
… …
161{ 157{
162#if ENABLE_OVERLAY 158#if ENABLE_OVERLAY
163 scr_overlay_off (); 159 scr_overlay_off ();
164#endif 160#endif
165 161
162 rvideo_mode = false;
166 view_start = 0; 163 view_start = 0;
167 num_scr = 0; 164 num_scr = 0;
168 165
169 if (ncol == 0) 166 if (ncol == 0)
170 ncol = 80; 167 ncol = 80;
… …
237 selection.text = NULL; 234 selection.text = NULL;
238 selection.len = 0; 235 selection.len = 0;
239 selection.op = SELECTION_CLEAR; 236 selection.op = SELECTION_CLEAR;
240 selection.screen = PRIMARY; 237 selection.screen = PRIMARY;
241 selection.clicks = 0; 238 selection.clicks = 0;
242 rvideo_state = rvideo_mode = false;
243 } 239 }
244 else 240 else
245 { 241 {
246 /* 242 /*
247 * add or delete rows as appropriate 243 * add or delete rows as appropriate
… …
276 drawn_buf[row].clear (); scr_blank_screen_mem (drawn_buf[row], DEFAULT_RSTYLE); 272 drawn_buf[row].clear (); scr_blank_screen_mem (drawn_buf[row], DEFAULT_RSTYLE);
277 } 273 }
278 274
279 line_t *old_buf = row_buf; 275 line_t *old_buf = row_buf;
280 row_buf = (line_t *)rxvt_calloc (total_rows + nrow, sizeof (line_t)); 276 row_buf = (line_t *)rxvt_calloc (total_rows + nrow, sizeof (line_t));
281 277
282 int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row 278 int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row
283 int pend = MOD (term_start + top_row , prev_total_rows); 279 int pend = MOD (term_start + top_row , prev_total_rows);
284 int q = total_rows; // rewrapped row 280 int q = total_rows; // rewrapped row
285 281
286 if (top_row) 282 if (top_row)
… …
330 int qcol = 0; 326 int qcol = 0;
331 327
332 // see below for cursor adjustment rationale 328 // see below for cursor adjustment rationale
333 if (p == ocur.row) 329 if (p == ocur.row)
334 screen.cur.row = q - (total_rows - nrow); 330 screen.cur.row = q - (total_rows - nrow);
335 331
336 // fill a single destination line 332 // fill a single destination line
337 while (lofs < llen && qcol < ncol) 333 while (lofs < llen && qcol < ncol)
338 { 334 {
339 int prow = lofs / prev_ncol; 335 int prow = lofs / prev_ncol;
340 int pcol = lofs % prev_ncol; 336 int pcol = lofs % prev_ncol;
… …
366 } 362 }
367 while (p != pend && q > 0); 363 while (p != pend && q > 0);
368 364
369 term_start = total_rows - nrow; 365 term_start = total_rows - nrow;
370 top_row = q - term_start; 366 top_row = q - term_start;
371 367
372 // make sure all terminal lines exist 368 // make sure all terminal lines exist
373 while (top_row > 0) 369 while (top_row > 0)
374 scr_blank_screen_mem (ROW (--top_row), DEFAULT_RSTYLE); 370 scr_blank_screen_mem (ROW (--top_row), DEFAULT_RSTYLE);
375 } 371 }
376 else 372 else
377 { 373 {
378 // if no scrollback exists (yet), wing, instead of wrap 374 // if no scrollback exists (yet), wing, instead of wrap
379 375
380 for (int row = min (nrow, prev_nrow); row--; ) 376 for (int row = min (nrow, prev_nrow); row--; )
381 { 377 {
382 line_t &pline = old_buf [MOD (term_start + row, prev_total_rows)]; 378 line_t &pline = old_buf [MOD (term_start + row, prev_total_rows)];
383 line_t &qline = row_buf [row]; 379 line_t &qline = row_buf [row];
384 380
… …
407 CLEAR_ALL_SELECTION (); 403 CLEAR_ALL_SELECTION ();
408 404
409 prev_nrow = nrow; 405 prev_nrow = nrow;
410 prev_ncol = ncol; 406 prev_ncol = ncol;
411 407
412 tabs = (char *)rxvt_malloc (ncol * sizeof (char)); 408 tabs = (char *)rxvt_malloc (ncol);
413 409
414 for (int col = ncol; col--; ) 410 for (int col = ncol; --col; )
415 tabs [col] = col % TABSIZE == 0; 411 tabs [col] = col % TABSIZE == 0;
416 412
417 if (current_screen != PRIMARY) 413 if (current_screen != PRIMARY)
418 scr_swap_screen (); 414 scr_swap_screen ();
419 415
… …
510} 506}
511 507
512void 508void
513rxvt_term::scr_swap_screen () 509rxvt_term::scr_swap_screen ()
514{ 510{
515 if (!OPTION (Opt_secondaryScreen)) 511 if (!option (Opt_secondaryScreen))
516 return; 512 return;
517 513
518 for (int i = prev_nrow; i--; ) 514 for (int i = prev_nrow; i--; )
519 ::swap (ROW(i), swap_buf [i]); 515 ::swap (ROW(i), swap_buf [i]);
520 516
… …
542 selection_check (2); /* check for boundary cross */ 538 selection_check (2); /* check for boundary cross */
543 539
544 int i = current_screen; current_screen = scrn; scrn = i; 540 int i = current_screen; current_screen = scrn; scrn = i;
545 541
546#if NSCREENS 542#if NSCREENS
547 if (OPTION (Opt_secondaryScreen)) 543 if (option (Opt_secondaryScreen))
548 { 544 {
549 num_scr = 0; 545 num_scr = 0;
550 546
551 scr_swap_screen (); 547 scr_swap_screen ();
552 548
… …
555 screen.flags |= Screen_VisibleCursor; 551 screen.flags |= Screen_VisibleCursor;
556 swap.flags |= Screen_VisibleCursor; 552 swap.flags |= Screen_VisibleCursor;
557 } 553 }
558 else 554 else
559#endif 555#endif
560 if (OPTION (Opt_secondaryScroll)) 556 if (option (Opt_secondaryScroll))
561 scr_scroll_text (0, prev_nrow - 1, prev_nrow); 557 scr_scroll_text (0, prev_nrow - 1, prev_nrow);
562} 558}
563 559
564// clear WrapNext indicator, solidifying position on next line 560// clear WrapNext indicator, solidifying position on next line
565void 561void
… …
598/* 594/*
599 * Change the rendition style for following text 595 * Change the rendition style for following text
600 */ 596 */
601void 597void
602rxvt_term::scr_rendition (int set, int style) NOTHROW 598rxvt_term::scr_rendition (int set, int style) NOTHROW
603 { 599{
604 if (set) 600 if (set)
605 rstyle |= style; 601 rstyle |= style;
606 else if (style == ~RS_None) 602 else if (style == ~RS_None)
607 rstyle = DEFAULT_RSTYLE; 603 rstyle = DEFAULT_RSTYLE;
608 else 604 else
609 rstyle &= ~style; 605 rstyle &= ~style;
610 } 606}
611 607
612/* ------------------------------------------------------------------------- */ 608/* ------------------------------------------------------------------------- */
613/* 609/*
614 * Scroll text between <row1> and <row2> inclusive, by <count> lines 610 * Scroll text between <row1> and <row2> inclusive, by <count> lines
615 * count positive ==> scroll up 611 * count positive ==> scroll up
… …
624 want_refresh = 1; 620 want_refresh = 1;
625 num_scr += count; 621 num_scr += count;
626 622
627 if (count > 0 623 if (count > 0
628 && row1 == 0 624 && row1 == 0
629 && (current_screen == PRIMARY || OPTION (Opt_secondaryScroll))) 625 && (current_screen == PRIMARY || option (Opt_secondaryScroll)))
630 { 626 {
631 top_row = max (top_row - count, -saveLines); 627 top_row = max (top_row - count, -saveLines);
632 628
633 // scroll everything up 'count' lines 629 // scroll everything up 'count' lines
634 term_start = (term_start + count) % total_rows; 630 term_start = (term_start + count) % total_rows;
… …
645 { 641 {
646 line_t &l = ROW(nrow - 1 - i); 642 line_t &l = ROW(nrow - 1 - i);
647 643
648 // optimize if already cleared, can be significant on slow machines 644 // optimize if already cleared, can be significant on slow machines
649 // could be rolled into scr_blank_screen_mem 645 // could be rolled into scr_blank_screen_mem
650 if (l.r && l.l < ncol - 1 && !((l.r[l.l + 1] ^ rstyle) & RS_bgMask)) 646 if (l.r && l.l < ncol - 1 && !((l.r[l.l + 1] ^ rstyle) & (RS_fgMask | RS_bgMask)))
651 { 647 {
652 scr_blank_line (l, 0, l.l, rstyle); 648 scr_blank_line (l, 0, l.l, rstyle);
653 l.l = 0; 649 l.l = 0;
654 l.f = 0; 650 l.f = 0;
655 } 651 }
… …
666 line_t &l2 = ROW(i); 662 line_t &l2 = ROW(i);
667 663
668 ::swap (l1, l2); 664 ::swap (l1, l2);
669 l2.touch (); 665 l2.touch ();
670 } 666 }
671 667
672 // move and/or clear selection, if any 668 // move and/or clear selection, if any
673 if (selection.op && current_screen == selection.screen) 669 if (selection.op && current_screen == selection.screen)
674 { 670 {
675 selection.beg.row -= count; 671 selection.beg.row -= count;
676 selection.end.row -= count; 672 selection.end.row -= count;
… …
684 selection.op = SELECTION_CLEAR; 680 selection.op = SELECTION_CLEAR;
685 } 681 }
686 } 682 }
687 683
688 // finally move the view window, if desired 684 // finally move the view window, if desired
689 if (OPTION (Opt_scrollWithBuffer) 685 if (option (Opt_scrollWithBuffer)
690 && view_start != 0 686 && view_start != 0
691 && view_start != -saveLines) 687 && view_start != -saveLines)
692 scr_page (UP, count); 688 scr_page (UP, count);
693 689
694 if (SHOULD_INVOKE (HOOK_SCROLL_BACK)) 690 if (SHOULD_INVOKE (HOOK_SCROLL_BACK))
… …
712 { 708 {
713 /* move selected region too */ 709 /* move selected region too */
714 selection.beg.row -= count; 710 selection.beg.row -= count;
715 selection.end.row -= count; 711 selection.end.row -= count;
716 selection.mark.row -= count; 712 selection.mark.row -= count;
717 713
718 selection_check (0); 714 selection_check (0);
719 } 715 }
720 } 716 }
721 717
722 // use a simple and robust scrolling algorithm, this 718 // use a simple and robust scrolling algorithm, this
… …
834 } 830 }
835 831
836 if (screen.flags & Screen_WrapNext) 832 if (screen.flags & Screen_WrapNext)
837 { 833 {
838 scr_do_wrap (); 834 scr_do_wrap ();
839 835
840 line->l = ncol; 836 line->l = ncol;
841 line->is_longer (1); 837 line->is_longer (1);
842 838
843 row = screen.cur.row; 839 row = screen.cur.row;
844 line = &ROW(row); /* _must_ refresh */ 840 line = &ROW(row); /* _must_ refresh */
… …
1013 * XTERM_SEQ: CTRL-H 1009 * XTERM_SEQ: CTRL-H
1014 */ 1010 */
1015void 1011void
1016rxvt_term::scr_backspace () NOTHROW 1012rxvt_term::scr_backspace () NOTHROW
1017{ 1013{
1018 want_refresh = 1;
1019
1020 if (screen.cur.col == 0) 1014 if (screen.cur.col == 0)
1021 { 1015 {
1022 if (screen.cur.row > 0) 1016 if (screen.cur.row > 0)
1023 { 1017 {
1024#ifdef TERMCAP_HAS_BW 1018#ifdef TERMCAP_HAS_BW
1025 screen.cur.col = ncol - 1; 1019 screen.cur.col = ncol - 1;
1026 screen.cur.row--; 1020 --screen.cur.row;
1027 return; 1021
1022 want_refresh = 1;
1028#endif 1023#endif
1029 } 1024 }
1030 } 1025 }
1031 else if (!(screen.flags & Screen_WrapNext)) 1026 else
1032 scr_gotorc (0, -1, RELATIVE); 1027 scr_gotorc (0, -1, RELATIVE);
1033
1034 screen.flags &= ~Screen_WrapNext;
1035} 1028}
1036 1029
1037/* ------------------------------------------------------------------------- */ 1030/* ------------------------------------------------------------------------- */
1038/* 1031/*
1039 * Process Horizontal Tab 1032 * Process Horizontal Tab
… …
1062 x = i; 1055 x = i;
1063 1056
1064 if (!--count) 1057 if (!--count)
1065 break; 1058 break;
1066 } 1059 }
1067 else 1060 else
1068 ht &= l.t[i] == ' ' 1061 ht &= l.t[i] == ' '
1069 && RS_SAME (l.r[i], base_rend); 1062 && RS_SAME (l.r[i], base_rend);
1070 1063
1071 if (count) 1064 if (count)
1072 x = ncol - 1; 1065 x = ncol - 1;
1073 1066
1074 // store horizontal tab commands as characters inside the text 1067 // store horizontal tab commands as characters inside the text
1075 // buffer so they can be selected and pasted. 1068 // buffer so they can be selected and pasted.
1076 if (ht && OPTION (Opt_pastableTabs)) 1069 if (ht && option (Opt_pastableTabs))
1077 { 1070 {
1078 base_rend = SET_FONT (base_rend, 0); 1071 base_rend = SET_FONT (base_rend, 0);
1079 1072
1080 l.touch (x); 1073 l.touch (x);
1081 1074
… …
1114 * Process DEC Back Index 1107 * Process DEC Back Index
1115 * XTERM_SEQ: ESC 6 1108 * XTERM_SEQ: ESC 6
1116 * Move cursor left in row. If we're at the left boundary, shift everything 1109 * Move cursor left in row. If we're at the left boundary, shift everything
1117 * in that row right. Clear left column. 1110 * in that row right. Clear left column.
1118 */ 1111 */
1119#if ENABLE_FRILLS 1112#if !ENABLE_MINIMAL
1120void 1113void
1121rxvt_term::scr_backindex () NOTHROW 1114rxvt_term::scr_backindex () NOTHROW
1122{ 1115{
1123 if (screen.cur.col > 0) 1116 if (screen.cur.col > 0)
1124 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE); 1117 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE);
… …
1131 * Process DEC Forward Index 1124 * Process DEC Forward Index
1132 * XTERM_SEQ: ESC 9 1125 * XTERM_SEQ: ESC 9
1133 * Move cursor right in row. If we're at the right boundary, shift everything 1126 * Move cursor right in row. If we're at the right boundary, shift everything
1134 * in that row left. Clear right column. 1127 * in that row left. Clear right column.
1135 */ 1128 */
1136#if ENABLE_FRILLS 1129#if !ENABLE_MINIMAL
1137void 1130void
1138rxvt_term::scr_forwardindex () NOTHROW 1131rxvt_term::scr_forwardindex () NOTHROW
1139{ 1132{
1140 if (screen.cur.col < ncol - 1) 1133 if (screen.cur.col < ncol - 1)
1141 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE); 1134 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE);
… …
1188 } 1181 }
1189 } 1182 }
1190 else 1183 else
1191 { 1184 {
1192 if (screen.flags & Screen_Relative) 1185 if (screen.flags & Screen_Relative)
1186 {
1193 { /* relative origin mode */ 1187 /* relative origin mode */
1194 screen.cur.row = row + screen.tscroll; 1188 screen.cur.row = row + screen.tscroll;
1195 min_it (screen.cur.row, screen.bscroll); 1189 min_it (screen.cur.row, screen.bscroll);
1196 } 1190 }
1197 else 1191 else
1198 screen.cur.row = row; 1192 screen.cur.row = row;
… …
1231/* 1225/*
1232 * Erase part or whole of a line 1226 * Erase part or whole of a line
1233 * XTERM_SEQ: Clear line to right: ESC [ 0 K 1227 * XTERM_SEQ: Clear line to right: ESC [ 0 K
1234 * XTERM_SEQ: Clear line to left : ESC [ 1 K 1228 * XTERM_SEQ: Clear line to left : ESC [ 1 K
1235 * XTERM_SEQ: Clear whole line : ESC [ 2 K 1229 * XTERM_SEQ: Clear whole line : ESC [ 2 K
1230 * extension: clear to right unless wrapped: ESC [ 3 K
1236 */ 1231 */
1237void 1232void
1238rxvt_term::scr_erase_line (int mode) NOTHROW 1233rxvt_term::scr_erase_line (int mode) NOTHROW
1239{ 1234{
1240 unsigned int col, num; 1235 unsigned int col, num;
… …
1249 line.touch (); 1244 line.touch ();
1250 line.is_longer (0); 1245 line.is_longer (0);
1251 1246
1252 switch (mode) 1247 switch (mode)
1253 { 1248 {
1249 case 3:
1250 if (screen.flags & Screen_WrapNext)
1251 return;
1252
1253 /* fall through */
1254
1254 case 0: /* erase to end of line */ 1255 case 0: /* erase to end of line */
1255 col = screen.cur.col; 1256 col = screen.cur.col;
1256 num = ncol - col; 1257 num = ncol - col;
1257 min_it (line.l, col); 1258 min_it (line.l, col);
1259
1258 if (ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur) 1260 if (ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)
1259 || ROWCOL_IN_ROW_AT_OR_AFTER (selection.end, screen.cur)) 1261 || ROWCOL_IN_ROW_AT_OR_AFTER (selection.end, screen.cur))
1260 CLEAR_SELECTION (); 1262 CLEAR_SELECTION ();
1261 break; 1263 break;
1264
1262 case 1: /* erase to beginning of line */ 1265 case 1: /* erase to beginning of line */
1263 col = 0; 1266 col = 0;
1264 num = screen.cur.col + 1; 1267 num = screen.cur.col + 1;
1268
1265 if (ROWCOL_IN_ROW_AT_OR_BEFORE (selection.beg, screen.cur) 1269 if (ROWCOL_IN_ROW_AT_OR_BEFORE (selection.beg, screen.cur)
1266 || ROWCOL_IN_ROW_AT_OR_BEFORE (selection.end, screen.cur)) 1270 || ROWCOL_IN_ROW_AT_OR_BEFORE (selection.end, screen.cur))
1267 CLEAR_SELECTION (); 1271 CLEAR_SELECTION ();
1268 break; 1272 break;
1273
1269 case 2: /* erase whole line */ 1274 case 2: /* erase whole line */
1270 col = 0; 1275 col = 0;
1271 num = ncol; 1276 num = ncol;
1272 line.l = 0; 1277 line.l = 0;
1273 if (selection.beg.row <= screen.cur.row 1278 if (selection.beg.row <= screen.cur.row
… …
1342 } 1347 }
1343 else 1348 else
1344 { 1349 {
1345 ren = rstyle & (RS_fgMask | RS_bgMask); 1350 ren = rstyle & (RS_fgMask | RS_bgMask);
1346 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)]; 1351 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)];
1347 XChangeGC (xdisp, gc, GCForeground, &gcvalue); 1352 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1348 ERASE_ROWS (row, num); 1353 ERASE_ROWS (row, num);
1349 gcvalue.foreground = pix_colors[Color_fg]; 1354 gcvalue.foreground = pix_colors[Color_fg];
1350 XChangeGC (xdisp, gc, GCForeground, &gcvalue); 1355 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1351 } 1356 }
1352 1357
1353 for (; num--; row++) 1358 for (; num--; row++)
1354 { 1359 {
1355 scr_blank_screen_mem (ROW(row), rstyle); 1360 scr_blank_screen_mem (ROW(row), rstyle);
1356 scr_blank_line (drawn_buf [row], 0, ncol, ren); 1361 scr_blank_line (drawn_buf [row], 0, ncol, ren);
1357 } 1362 }
1358} 1363}
1359 1364
1360#if ENABLE_FRILLS 1365#if !ENABLE_MINIMAL
1361void 1366void
1362rxvt_term::scr_erase_savelines () NOTHROW 1367rxvt_term::scr_erase_savelines () NOTHROW
1363{ 1368{
1364 want_refresh = 1; 1369 want_refresh = 1;
1365 ZERO_SCROLLBACK (); 1370 ZERO_SCROLLBACK ();
… …
1474 { 1479 {
1475 if (selection.end.row != screen.cur.row 1480 if (selection.end.row != screen.cur.row
1476 || (selection.end.col + count >= ncol)) 1481 || (selection.end.col + count >= ncol))
1477 CLEAR_SELECTION (); 1482 CLEAR_SELECTION ();
1478 else 1483 else
1484 {
1479 { /* shift selection */ 1485 /* shift selection */
1480 selection.beg.col += count; 1486 selection.beg.col += count;
1481 selection.mark.col += count; /* XXX: yes? */ 1487 selection.mark.col += count; /* XXX: yes? */
1482 selection.end.col += count; 1488 selection.end.col += count;
1483 } 1489 }
1484 } 1490 }
… …
1623 */ 1629 */
1624void 1630void
1625rxvt_term::scr_set_tab (int mode) NOTHROW 1631rxvt_term::scr_set_tab (int mode) NOTHROW
1626{ 1632{
1627 if (mode < 0) 1633 if (mode < 0)
1628 memset (tabs, 0, ncol * sizeof (char)); 1634 memset (tabs, 0, ncol);
1629 else if (screen.cur.col < ncol) 1635 else if (screen.cur.col < ncol)
1630 tabs [screen.cur.col] = !!mode; 1636 tabs [screen.cur.col] = !!mode;
1631} 1637}
1632 1638
1633/* ------------------------------------------------------------------------- */ 1639/* ------------------------------------------------------------------------- */
… …
1648 if (rvideo_state != on) 1654 if (rvideo_state != on)
1649 { 1655 {
1650 rvideo_state = on; 1656 rvideo_state = on;
1651 1657
1652 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]); 1658 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]);
1653#if XPM_BACKGROUND 1659#ifdef HAVE_BG_PIXMAP
1654 if (bgPixmap.pixmap == None) 1660 if (bgPixmap.pixmap == None)
1655#endif 1661#endif
1656#if TRANSPARENT
1657 if (!OPTION (Opt_transparent) || am_transparent == 0)
1658#endif
1659 XSetWindowBackground (xdisp, vt, pix_colors[Color_bg]); 1662 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
1660 1663
1661 XGCValues gcvalue; 1664 XGCValues gcvalue;
1662 gcvalue.foreground = pix_colors[Color_fg]; 1665 gcvalue.foreground = pix_colors[Color_fg];
1663 gcvalue.background = pix_colors[Color_bg]; 1666 gcvalue.background = pix_colors[Color_bg];
1664 XChangeGC (xdisp, gc, GCBackground | GCForeground, &gcvalue); 1667 XChangeGC (dpy, gc, GCBackground | GCForeground, &gcvalue);
1665 1668
1666 scr_clear (); 1669 scr_clear ();
1667 scr_touch (true); 1670 scr_touch (true);
1668 } 1671 }
1669} 1672}
… …
1754{ 1757{
1755 bool found = false; 1758 bool found = false;
1756 1759
1757 for (int i = 0; i < nrow; i++) 1760 for (int i = 0; i < nrow; i++)
1758 { 1761 {
1759 int col = 0;
1760 rend_t *drp = drawn_buf[i].r; 1762 rend_t *drp = drawn_buf[i].r;
1761 1763
1762 for (; col < ncol; col++, drp++) 1764 for (int col = 0; col < ncol; col++, drp++)
1763 if ((*drp & mask) == value) 1765 if ((*drp & mask) == value)
1764 { 1766 {
1765 found = true; 1767 found = true;
1766 *drp = ~value; 1768 *drp = ~value;
1767 } 1769 }
… …
1807 for (i = PART_BEG; i < RC_COUNT; i++) 1809 for (i = PART_BEG; i < RC_COUNT; i++)
1808 { 1810 {
1809 min_it (rc[i].col, ncol - 1); 1811 min_it (rc[i].col, ncol - 1);
1810 min_it (rc[i].row, nrow - 1); 1812 min_it (rc[i].row, nrow - 1);
1811 } 1813 }
1812 1814// TODO: this line somehow causes segfault if scr_expose() is called just after resize
1813 for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++) 1815 for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++)
1814 fill_text (&drawn_buf[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1); 1816 fill_text (&drawn_buf[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1);
1815 1817
1816 num_scr_allow = 0; 1818 num_scr_allow = 0;
1817 1819
… …
1872 return true; 1874 return true;
1873} 1875}
1874 1876
1875#ifndef NO_BELL 1877#ifndef NO_BELL
1876void 1878void
1877rxvt_term::bell_cb (time_watcher &w) 1879rxvt_term::bell_cb (ev::timer &w, int revents)
1878{ 1880{
1879 rvideo_bell = false; 1881 rvideo_bell = false;
1880 scr_rvideo_mode (rvideo_mode); 1882 scr_rvideo_mode (rvideo_mode);
1883 refresh_check ();
1881} 1884}
1882#endif 1885#endif
1883 1886
1884/* ------------------------------------------------------------------------- */ 1887/* ------------------------------------------------------------------------- */
1885void 1888void
… …
1887{ 1890{
1888#ifndef NO_BELL 1891#ifndef NO_BELL
1889 1892
1890# ifndef NO_MAPALERT 1893# ifndef NO_MAPALERT
1891# ifdef MAPALERT_OPTION 1894# ifdef MAPALERT_OPTION
1892 if (OPTION (Opt_mapAlert)) 1895 if (option (Opt_mapAlert))
1893# endif 1896# endif
1894 XMapWindow (xdisp, parent[0]); 1897 XMapWindow (dpy, parent[0]);
1895# endif 1898# endif
1896 1899
1900# if ENABLE_FRILLS
1901 if (option (Opt_urgentOnBell))
1902 {
1903 if (XWMHints *h = XGetWMHints(dpy, parent[0]))
1904 {
1905 h->flags |= XUrgencyHint;
1906 XSetWMHints (dpy, parent[0], h);
1907 }
1908 }
1909# endif
1910
1897 if (OPTION (Opt_visualBell)) 1911 if (option (Opt_visualBell))
1898 { 1912 {
1899 rvideo_bell = true; 1913 rvideo_bell = true;
1900 scr_rvideo_mode (rvideo_mode); 1914 scr_rvideo_mode (rvideo_mode);
1901 display->flush (); 1915 flush ();
1902 1916
1903 bell_ev.start (NOW + VISUAL_BELL_DURATION); 1917 bell_ev.start (VISUAL_BELL_DURATION);
1904 } 1918 }
1905 else 1919 else
1906 XBell (xdisp, 0); 1920 XBell (dpy, 0);
1907
1908#endif 1921#endif
1909} 1922}
1910 1923
1911/* ------------------------------------------------------------------------- */ 1924/* ------------------------------------------------------------------------- */
1912/* ARGSUSED */ 1925/* ARGSUSED */
… …
1970 * screen.text/screen.rend contain what the screen will change to. 1983 * screen.text/screen.rend contain what the screen will change to.
1971 */ 1984 */
1972void 1985void
1973rxvt_term::scr_refresh () NOTHROW 1986rxvt_term::scr_refresh () NOTHROW
1974{ 1987{
1975 unsigned char must_clear, /* use draw_string not draw_image_string */ 1988 unsigned char have_bg,
1976 showcursor; /* show the cursor */ 1989 showcursor; /* show the cursor */
1977 int16_t col, row, /* column/row we're processing */ 1990 int16_t col, row, /* column/row we're processing */
1978 ocrow; /* old cursor row */ 1991 ocrow; /* old cursor row */
1979 int i; /* tmp */ 1992 int i; /* tmp */
1980#ifndef NO_CURSORCOLOR 1993#ifndef NO_CURSORCOLOR
1981 rend_t cc1; /* store colours at cursor position (s) */ 1994 rend_t cc1; /* store colours at cursor position (s) */
1982#endif 1995#endif
1983 rend_t *crp; // cursor rendition pointer 1996 rend_t *crp; // cursor rendition pointer
1997 rend_t ccol1, /* Cursor colour */
1998 ccol2; /* Cursor colour2 */
1984 1999
1985 want_refresh = 0; /* screen is current */ 2000 want_refresh = 0; /* screen is current */
1986 2001
1987 if (refresh_type == NO_REFRESH || !mapped) 2002 if (refresh_type == NO_REFRESH || !mapped)
1988 return; 2003 return;
1989 2004
1990 /* 2005 /*
1991 * A: set up vars 2006 * A: set up vars
1992 */ 2007 */
1993 must_clear = 0;
1994 refresh_count = 0; 2008 refresh_count = 0;
1995 2009
1996#if XPM_BACKGROUND 2010 have_bg = 0;
2011#ifdef HAVE_BG_PIXMAP
1997 must_clear |= bgPixmap.pixmap != None; 2012 have_bg = bgPixmap.pixmap != None;
1998#endif
1999#if TRANSPARENT
2000 must_clear |= OPTION (Opt_transparent) && am_transparent;
2001#endif 2013#endif
2002 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ 2014 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
2003 2015
2004 /* 2016 /*
2005 * B: reverse any characters which are selected 2017 * B: reverse any characters which are selected
… …
2009 /* 2021 /*
2010 * C: set the cursor character (s) 2022 * C: set the cursor character (s)
2011 */ 2023 */
2012 { 2024 {
2013 unsigned char setoldcursor; 2025 unsigned char setoldcursor;
2014 rend_t ccol1, /* Cursor colour */
2015 ccol2; /* Cursor colour2 */
2016 2026
2017 showcursor = (screen.flags & Screen_VisibleCursor); 2027 showcursor = (screen.flags & Screen_VisibleCursor);
2018#ifdef CURSOR_BLINK 2028#ifdef CURSOR_BLINK
2019 if (hidden_cursor) 2029 if (hidden_cursor)
2020 showcursor = 0; 2030 showcursor = 0;
… …
2027 while (col && ROW(screen.cur.row).t[col] == NOCHAR) 2037 while (col && ROW(screen.cur.row).t[col] == NOCHAR)
2028 col--; 2038 col--;
2029 2039
2030 crp = &ROW(screen.cur.row).r[col]; 2040 crp = &ROW(screen.cur.row).r[col];
2031 2041
2042#ifndef NO_CURSORCOLOR
2043 cc1 = *crp & (RS_fgMask | RS_bgMask);
2044 if (ISSET_PIXCOLOR (Color_cursor))
2045 ccol1 = Color_cursor;
2046 else
2047#endif
2048#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
2049 ccol1 = fgcolor_of (rstyle);
2050#else
2051 ccol1 = Color_fg;
2052#endif
2053
2054#ifndef NO_CURSORCOLOR
2055 if (ISSET_PIXCOLOR (Color_cursor2))
2056 ccol2 = Color_cursor2;
2057 else
2058#endif
2059#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
2060 ccol2 = bgcolor_of (rstyle);
2061#else
2062 ccol2 = Color_bg;
2063#endif
2064
2032 if (showcursor && focus) 2065 if (showcursor && focus)
2033 { 2066 {
2034 if (OPTION (Opt_cursorUnderline)) 2067 if (option (Opt_cursorUnderline))
2035 *crp ^= RS_Uline; 2068 *crp ^= RS_Uline;
2036 else 2069 else
2037 { 2070 {
2038 *crp ^= RS_RVid; 2071 *crp ^= RS_RVid;
2039
2040#ifndef NO_CURSORCOLOR
2041 cc1 = *crp & (RS_fgMask | RS_bgMask);
2042 if (ISSET_PIXCOLOR (Color_cursor))
2043 ccol1 = Color_cursor;
2044 else
2045#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
2046 ccol1 = fgcolor_of (rstyle);
2047#else
2048 ccol1 = Color_fg;
2049#endif
2050 if (ISSET_PIXCOLOR (Color_cursor2))
2051 ccol2 = Color_cursor2;
2052 else
2053#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
2054 ccol2 = bgcolor_of (rstyle);
2055#else
2056 ccol2 = Color_bg;
2057#endif
2058 *crp = SET_FGCOLOR (*crp, ccol1); 2072 *crp = SET_FGCOLOR (*crp, ccol1);
2059 *crp = SET_BGCOLOR (*crp, ccol2); 2073 *crp = SET_BGCOLOR (*crp, ccol2);
2060#endif
2061 } 2074 }
2062 } 2075 }
2063 } 2076 }
2064 2077
2065 /* make sure no outline cursor is left around */ 2078 /* make sure no outline cursor is left around */
… …
2104 * D: CopyArea pass - very useful for slower links 2117 * D: CopyArea pass - very useful for slower links
2105 * This has been deliberately kept simple. 2118 * This has been deliberately kept simple.
2106 */ 2119 */
2107 if (!display->is_local 2120 if (!display->is_local
2108 && refresh_type == FAST_REFRESH && num_scr_allow && num_scr 2121 && refresh_type == FAST_REFRESH && num_scr_allow && num_scr
2109 && abs (num_scr) < nrow && !must_clear) 2122 && abs (num_scr) < nrow && !have_bg)
2110 { 2123 {
2111 int16_t nits; 2124 int16_t nits;
2125 int i = num_scr;
2112 int j; 2126 int j;
2113 int len, wlen; 2127 int len, wlen;
2114 dLocal (int, num_scr); 2128 dLocal (int, num_scr);
2115 2129
2116 j = nrow; 2130 j = nrow;
2117 wlen = len = -1; 2131 wlen = len = -1;
2118 row = i > 0 ? 0 : j - 1; 2132 row = i > 0 ? 0 : j - 1;
2133
2119 for (; j-- >= 0; row += (i > 0 ? 1 : -1)) 2134 for (; j-- >= 0; row += (i > 0 ? 1 : -1))
2120 { 2135 {
2121 if (row + i >= 0 && row + i < nrow && row + i != ocrow) 2136 if (row + i >= 0 && row + i < nrow && row + i != ocrow)
2122 { 2137 {
2123 line_t s = ROW(view_start + row); 2138 line_t s = ROW(view_start + row);
… …
2144 wlen = row; 2159 wlen = row;
2145 continue; 2160 continue;
2146 } 2161 }
2147 } 2162 }
2148 2163
2149 if (len != -1) 2164 if (len >= 0)
2150 { 2165 {
2151 /* also comes here at end if needed because of >= above */ 2166 /* also comes here at end if needed because of >= above */
2152 if (wlen < len) 2167 if (wlen < len)
2153 ::swap (wlen, len); 2168 ::swap (wlen, len);
2154 2169
2170 XGCValues gcv;
2171
2172 gcv.graphics_exposures = 1; XChangeGC (dpy, gc, GCGraphicsExposures, &gcv);
2155 XCopyArea (xdisp, vt, vt, 2173 XCopyArea (dpy, vt, vt,
2156 gc, 0, Row2Pixel (len + i), 2174 gc, 0, Row2Pixel (len + i),
2157 (unsigned int)this->width, 2175 (unsigned int)this->width,
2158 (unsigned int)Height2Pixel (wlen - len + 1), 2176 (unsigned int)Height2Pixel (wlen - len + 1),
2159 0, Row2Pixel (len)); 2177 0, Row2Pixel (len));
2178 gcv.graphics_exposures = 0; XChangeGC (dpy, gc, GCGraphicsExposures, &gcv);
2179
2160 len = -1; 2180 len = -1;
2161 } 2181 }
2162 } 2182 }
2163 } 2183 }
2164#endif 2184#endif
… …
2220 count++; 2240 count++;
2221 2241
2222 if (stp[col] != dtp[col] 2242 if (stp[col] != dtp[col]
2223 || !RS_SAME (srp[col], drp[col])) 2243 || !RS_SAME (srp[col], drp[col]))
2224 { 2244 {
2225 if (must_clear && (i++ > count / 2)) 2245 if (have_bg && (i++ > count / 2))
2226 break; 2246 break;
2227 2247
2228 dtp[col] = stp[col]; 2248 dtp[col] = stp[col];
2229 drp[col] = rend; 2249 drp[col] = rend;
2230 i = 0; 2250 i = 0;
2231 } 2251 }
2232 else if (must_clear || (stp[col] != ' ' && ++i >= 16)) 2252 else if (have_bg || (stp[col] != ' ' && ++i >= 16))
2233 break; 2253 break;
2234 } 2254 }
2235 2255
2236 col--; /* went one too far. move back */ 2256 col--; /* went one too far. move back */
2237 count -= i; /* dump any matching trailing chars */ 2257 count -= i; /* dump any matching trailing chars */
… …
2247 int back = bgcolor_of (rend); // desired background 2267 int back = bgcolor_of (rend); // desired background
2248 2268
2249 // only do special processing if any attributes are set, which is unlikely 2269 // only do special processing if any attributes are set, which is unlikely
2250 if (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful)) 2270 if (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful))
2251 { 2271 {
2252#if ENABLE_STYLES
2253 // "careful" (too wide) character handling
2254
2255 // include previous careful character(s) if possible, looks nicer (best effort...)
2256 while (text > stp
2257 && srp[text - stp - 1] & RS_Careful
2258 && RS_SAME (rend, srp[text - stp - 1]))
2259 text--, count++, xpixel -= fwidth;
2260
2261 // force redraw after "careful" characters to avoid pixel droppings
2262 for (int i = 0; srp[col + i] & RS_Careful && col + i < ncol - 1; i++)
2263 drp[col + i + 1] = ~srp[col + i + 1];
2264
2265 // force redraw before "careful" characters to avoid pixel droppings
2266 for (int i = 0; srp[text - stp - i] & RS_Careful && text - i > stp; i++)
2267 drp[text - stp - i - 1] = ~srp[text - stp - i - 1];
2268#endif
2269
2270 bool invert = rend & RS_RVid; 2272 bool invert = rend & RS_RVid;
2271 2273
2272#ifndef NO_BOLD_UNDERLINE_REVERSE 2274#ifndef NO_BOLD_UNDERLINE_REVERSE
2273 if (rend & RS_Bold
2274 && fore == Color_fg) 2275 if (rend & RS_Bold && fore == Color_fg)
2275 { 2276 {
2276 if (ISSET_PIXCOLOR (Color_BD)) 2277 if (ISSET_PIXCOLOR (Color_BD))
2277 fore = Color_BD; 2278 fore = Color_BD;
2278# if !ENABLE_STYLES 2279# if !ENABLE_STYLES
2279 else 2280 else
2280 invert = !invert; 2281 invert = !invert;
2281# endif 2282# endif
2282 } 2283 }
2283 2284
2284 if (rend & RS_Italic 2285 if (rend & RS_Italic && fore == Color_fg)
2285 && fore == Color_fg)
2286 { 2286 {
2287 if (ISSET_PIXCOLOR (Color_IT)) 2287 if (ISSET_PIXCOLOR (Color_IT))
2288 fore = Color_IT; 2288 fore = Color_IT;
2289# if !ENABLE_STYLES 2289# if !ENABLE_STYLES
2290 else 2290 else
2291 invert = !invert; 2291 invert = !invert;
2292# endif 2292# endif
2293 } 2293 }
2294 2294
2295 if (rend & RS_Uline && ISSET_PIXCOLOR (Color_UL)) 2295 if (rend & RS_Uline && fore == Color_fg && ISSET_PIXCOLOR (Color_UL))
2296 fore = Color_UL; 2296 fore = Color_UL;
2297#endif 2297#endif
2298 2298
2299 if (invert) 2299 if (invert)
2300 { 2300 {
2301#ifdef OPTION_HC
2302 if ((showcursor && row == screen.cur.row && text - stp == screen.cur.col)
2303 || !ISSET_PIXCOLOR (Color_HC))
2304#endif
2305 /* invert the column if no highlightColor is set or it is the
2306 * current cursor column */
2301 ::swap (fore, back); 2307 ::swap (fore, back);
2308#ifdef OPTION_HC
2309 else if (ISSET_PIXCOLOR (Color_HC))
2310 back = Color_HC;
2311#endif
2302 2312
2303#ifndef NO_BOLD_UNDERLINE_REVERSE 2313#ifndef NO_BOLD_UNDERLINE_REVERSE
2314# ifndef OPTION_HC
2304 if (ISSET_PIXCOLOR (Color_RV)) 2315 if (ISSET_PIXCOLOR (Color_RV))
2305 back = Color_RV; 2316 back = Color_RV;
2306 2317# endif
2307 if (fore == back) 2318 if (fore == back)
2308 { 2319 {
2309 fore = Color_bg; 2320 fore = Color_bg;
2310 back = Color_fg; 2321 back = Color_fg;
2311 } 2322 }
… …
2313 } 2324 }
2314 2325
2315#ifdef TEXT_BLINK 2326#ifdef TEXT_BLINK
2316 if (rend & RS_Blink && (back == Color_bg || fore == Color_bg)) 2327 if (rend & RS_Blink && (back == Color_bg || fore == Color_bg))
2317 { 2328 {
2318 if (!text_blink_ev.active) 2329 if (!text_blink_ev.is_active ())
2319 { 2330 {
2320 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); 2331 text_blink_ev.again ();
2321 hidden_text = 0; 2332 hidden_text = 0;
2322 } 2333 }
2323 else if (hidden_text) 2334 else if (hidden_text)
2324 fore = back; 2335 fore = back;
2325 } 2336 }
2326#endif 2337#endif
2338
2339#if ENABLE_STYLES
2340 // "careful" (too wide) character handling
2341
2342 // include previous careful character(s) if possible, looks nicer (best effort...)
2343 while (text > stp
2344 && srp[text - stp - 1] & RS_Careful
2345 && RS_SAME (rend, srp[text - stp - 1]))
2346 text--, count++, xpixel -= fwidth;
2347
2348 // force redraw after "careful" characters to avoid pixel droppings
2349 for (int i = 0; srp[col + i] & RS_Careful && col + i < ncol - 1; i++)
2350 drp[col + i + 1] = srp[col + i + 1] ^ RS_redraw;
2351
2352 // force redraw before "careful" characters to avoid pixel droppings
2353 for (int i = 0; srp[text - stp - i] & RS_Careful && text - i > stp; i++)
2354 drp[text - stp - i - 1] = srp[text - stp - i - 1] ^ RS_redraw;
2355#endif
2327 } 2356 }
2328 2357
2329 /* 2358 /*
2330 * Actually do the drawing of the string here 2359 * Actually do the drawing of the string here
2331 */ 2360 */
2332 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)]; 2361 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)];
2333 2362
2334 if (back == fore)
2335 font->clear_rect (*drawable, xpixel, ypixel,
2336 fwidth * count, fheight,
2337 back);
2338 else if (back == Color_bg) 2363 if (have_bg && back == Color_bg)
2339 { 2364 {
2340 if (must_clear) 2365 // this is very ugly, maybe push it into ->draw?
2341 {
2342 CLEAR_CHARS (xpixel, ypixel, count);
2343 2366
2344 for (i = 0; i < count; i++) /* don't draw empty strings */ 2367 for (i = 0; i < count; i++) /* don't draw empty strings */
2345 if (text[i] != ' ') 2368 if (text[i] != ' ')
2346 { 2369 {
2347 font->draw (*drawable, xpixel, ypixel, text, count, fore, -1); 2370 font->draw (*drawable, xpixel, ypixel, text, count, fore, Color_transparent);
2348 break; 2371 goto did_clear;
2349 }
2350 } 2372 }
2351 else 2373
2352 font->draw (*drawable, xpixel, ypixel, text, count, fore, Color_bg); 2374 CLEAR_CHARS (xpixel, ypixel, count);
2375 did_clear: ;
2353 } 2376 }
2354 else 2377 else
2355 font->draw (*drawable, xpixel, ypixel, text, count, fore, back); 2378 font->draw (*drawable, xpixel, ypixel, text, count, fore, back);
2356 2379
2357 if (rend & RS_Uline && font->descent > 1 && fore != back) 2380 if (rend & RS_Uline && font->descent > 1 && fore != back)
2358 { 2381 {
2359#if ENABLE_FRILLS 2382#if ENABLE_FRILLS
2360 if (ISSET_PIXCOLOR (Color_underline)) 2383 if (ISSET_PIXCOLOR (Color_underline))
2361 XSetForeground (xdisp, gc, pix_colors[Color_underline]); 2384 XSetForeground (dpy, gc, pix_colors[Color_underline]);
2362 else 2385 else
2363#endif 2386#endif
2364 XSetForeground (xdisp, gc, pix_colors[fore]); 2387 XSetForeground (dpy, gc, pix_colors[fore]);
2365 2388
2366 XDrawLine (xdisp, drawBuffer, gc, 2389 XDrawLine (dpy, vt, gc,
2367 xpixel, ypixel + font->ascent + 1, 2390 xpixel, ypixel + font->ascent + 1,
2368 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1); 2391 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1);
2369 } 2392 }
2370 } /* for (col....) */ 2393 } /* for (col....) */
2371 } /* for (row....) */ 2394 } /* for (row....) */
… …
2380 */ 2403 */
2381 if (showcursor) 2404 if (showcursor)
2382 { 2405 {
2383 if (focus) 2406 if (focus)
2384 { 2407 {
2385 if (OPTION (Opt_cursorUnderline)) 2408 if (option (Opt_cursorUnderline))
2386 *crp ^= RS_Uline; 2409 *crp ^= RS_Uline;
2387 else 2410 else
2388 { 2411 {
2389 *crp ^= RS_RVid; 2412 *crp ^= RS_RVid;
2390#ifndef NO_CURSORCOLOR 2413#ifndef NO_CURSORCOLOR
… …
2404 && drawn_buf[oldcursor.row].t[col + cursorwidth] == NOCHAR) 2427 && drawn_buf[oldcursor.row].t[col + cursorwidth] == NOCHAR)
2405 cursorwidth++; 2428 cursorwidth++;
2406 2429
2407#ifndef NO_CURSORCOLOR 2430#ifndef NO_CURSORCOLOR
2408 if (ISSET_PIXCOLOR (Color_cursor)) 2431 if (ISSET_PIXCOLOR (Color_cursor))
2409 XSetForeground (xdisp, gc, pix_colors[Color_cursor]); 2432 XSetForeground (dpy, gc, pix_colors[Color_cursor]);
2433 else
2410#endif 2434#endif
2435 XSetForeground (dpy, gc, pix_colors[ccol1]);
2411 2436
2412 XDrawRectangle (xdisp, drawBuffer, gc, 2437 XDrawRectangle (dpy, vt, gc,
2413 Col2Pixel (col), 2438 Col2Pixel (col),
2414 Row2Pixel (oldcursor.row), 2439 Row2Pixel (oldcursor.row),
2415 (unsigned int) (Width2Pixel (cursorwidth) - 1), 2440 (unsigned int) (Width2Pixel (cursorwidth) - 1),
2416 (unsigned int) (Height2Pixel (1) - lineSpace - 1)); 2441 (unsigned int) (Height2Pixel (1) - lineSpace - 1));
2417 } 2442 }
… …
2452} 2477}
2453 2478
2454void 2479void
2455rxvt_term::scr_recolour () NOTHROW 2480rxvt_term::scr_recolour () NOTHROW
2456{ 2481{
2457 if (1 2482#ifdef HAVE_BG_PIXMAP
2458#if TRANSPARENT 2483 bgPixmap.apply ();
2459 && !am_transparent 2484#else
2460#endif 2485
2461#if XPM_BACKGROUND
2462 && !bgPixmap.pixmap
2463#endif
2464 )
2465 {
2466 XSetWindowBackground (xdisp, parent[0], pix_colors[Color_border]); 2486 XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]);
2467 XClearWindow (xdisp, parent[0]); 2487 XClearWindow (dpy, parent[0]);
2468 XSetWindowBackground (xdisp, vt, pix_colors[Color_bg]); 2488 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
2469#if HAVE_SCROLLBARS 2489
2470 if (scrollBar.win) 2490 if (scrollBar.win)
2471 { 2491 {
2472 XSetWindowBackground (xdisp, scrollBar.win, pix_colors[Color_border]); 2492 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]);
2473 scrollBar.setIdle (); 2493 scrollBar.state = STATE_IDLE;
2474 scrollbar_show (0); 2494 scrollBar.show (0);
2475 }
2476#endif
2477 } 2495 }
2478 2496
2497#endif
2498
2499 /* bgPixmap.apply () does not do the following : */
2479 scr_clear (); 2500 scr_clear ();
2480 scr_touch (true); 2501 scr_touch (true);
2481 want_refresh = 1; 2502 want_refresh = 1;
2482} 2503}
2483 2504
… …
2490 2511
2491 num_scr_allow = 0; 2512 num_scr_allow = 0;
2492 want_refresh = 1; 2513 want_refresh = 1;
2493 2514
2494 if (really) 2515 if (really)
2495 XClearWindow (xdisp, vt); 2516 XClearWindow (dpy, vt);
2496} 2517}
2497 2518
2498void 2519void
2499rxvt_term::scr_xor_rect (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle1, rend_t rstyle2) NOTHROW 2520rxvt_term::scr_xor_rect (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle1, rend_t rstyle2) NOTHROW
2500{ 2521{
… …
2549{ 2570{
2550 if (selection.op 2571 if (selection.op
2551 && current_screen == selection.screen 2572 && current_screen == selection.screen
2552 && selection.end.row >= view_start) 2573 && selection.end.row >= view_start)
2553 { 2574 {
2554#if ENABLE_FRILLS 2575#if !ENABLE_MINIMAL
2555 if (selection.rect) 2576 if (selection.rect)
2556 scr_xor_rect (selection.beg.row, selection.beg.col, 2577 scr_xor_rect (selection.beg.row, selection.beg.col,
2557 selection.end.row, selection.end.col, 2578 selection.end.row, selection.end.col,
2558 RS_RVid, RS_RVid | RS_Uline); 2579 RS_RVid, RS_RVid | RS_Uline);
2559 else 2580 else
… …
2575{ 2596{
2576 int row, wrote; 2597 int row, wrote;
2577 unsigned int width, towrite; 2598 unsigned int width, towrite;
2578 char r1[] = "\n"; 2599 char r1[] = "\n";
2579 2600
2580 for (row = saveLines - nsaved; 2601 for (row = saveLines + top_row;
2581 row < saveLines + nrow - 1; row++) 2602 row < saveLines + nrow - 1; row++)
2582 { 2603 {
2583 width = row_buf[row].l >= 0 ? row_buf[row].l 2604 width = row_buf[row].l >= 0 ? row_buf[row].l
2584 : ncol; 2605 : ncol;
2585 for (towrite = width; towrite; towrite -= wrote) 2606 for (towrite = width; towrite; towrite -= wrote)
… …
2636 /* convert normal newline chars into common keyboard Return key sequence */ 2657 /* convert normal newline chars into common keyboard Return key sequence */
2637 for (unsigned int i = 0; i < len; i++) 2658 for (unsigned int i = 0; i < len; i++)
2638 if (data[i] == C0_LF) 2659 if (data[i] == C0_LF)
2639 data[i] = C0_CR; 2660 data[i] = C0_CR;
2640 2661
2662 if (priv_modes & PrivMode_BracketPaste)
2663 tt_printf ("\e[200~");
2664
2641 tt_write (data, len); 2665 tt_write (data, len);
2666
2667 if (priv_modes & PrivMode_BracketPaste)
2668 tt_printf ("\e[201~");
2642} 2669}
2643 2670
2644/* ------------------------------------------------------------------------- */ 2671/* ------------------------------------------------------------------------- */
2645/* 2672/*
2646 * Respond to a notification that a primary selection has been sent 2673 * Respond to a notification that a primary selection has been sent
… …
2675 } 2702 }
2676 2703
2677 unsigned long bytes_after; 2704 unsigned long bytes_after;
2678 XTextProperty ct; 2705 XTextProperty ct;
2679 2706
2680 if (XGetWindowProperty (xdisp, win, prop, 2707 if (XGetWindowProperty (dpy, win, prop,
2681 0, PROP_SIZE / 4, 2708 0, PROP_SIZE / 4,
2682 delete_prop, AnyPropertyType, 2709 delete_prop, AnyPropertyType,
2683 &ct.encoding, &ct.format, 2710 &ct.encoding, &ct.format,
2684 &ct.nitems, &bytes_after, 2711 &ct.nitems, &bytes_after,
2685 &ct.value) != Success) 2712 &ct.value) != Success)
… …
2694 if (bytes_after) 2721 if (bytes_after)
2695 { 2722 {
2696 // fetch and append remaining data 2723 // fetch and append remaining data
2697 XTextProperty ct2; 2724 XTextProperty ct2;
2698 2725
2699 if (XGetWindowProperty (xdisp, win, prop, 2726 if (XGetWindowProperty (dpy, win, prop,
2700 ct.nitems / 4, (bytes_after + 3) / 4, 2727 ct.nitems / 4, (bytes_after + 3) / 4,
2701 delete_prop, AnyPropertyType, 2728 delete_prop, AnyPropertyType,
2702 &ct2.encoding, &ct2.format, 2729 &ct2.encoding, &ct2.format,
2703 &ct2.nitems, &bytes_after, 2730 &ct2.nitems, &bytes_after,
2704 &ct2.value) != Success) 2731 &ct2.value) != Success)
… …
2717 2744
2718 if (ct.encoding == xa[XA_INCR]) 2745 if (ct.encoding == xa[XA_INCR])
2719 { 2746 {
2720 // INCR selection, start handshake 2747 // INCR selection, start handshake
2721 if (!delete_prop) 2748 if (!delete_prop)
2722 XDeleteProperty (xdisp, win, prop); 2749 XDeleteProperty (dpy, win, prop);
2723 2750
2724 selection_wait = Sel_incr; 2751 selection_wait = Sel_incr;
2725 incr_buf_fill = 0; 2752 incr_buf_fill = 0;
2726 incr_ev.start (NOW + 10); 2753 incr_ev.start (10);
2727 2754
2728 goto bailout; 2755 goto bailout;
2729 } 2756 }
2730 2757
2731 if (ct.nitems == 0) 2758 if (ct.nitems == 0)
… …
2740 ct.nitems = incr_buf_fill; 2767 ct.nitems = incr_buf_fill;
2741 incr_buf = 0; 2768 incr_buf = 0;
2742 incr_buf_size = 0; 2769 incr_buf_size = 0;
2743 incr_ev.stop (); 2770 incr_ev.stop ();
2744 } 2771 }
2745 else 2772 else
2746 { 2773 {
2747 if (selection_wait == Sel_normal 2774 if (selection_wait == Sel_normal
2748 && (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion 2775 && (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion
2749 { 2776 {
2750 /* 2777 /*
… …
2757 goto bailout; 2784 goto bailout;
2758 } 2785 }
2759 } 2786 }
2760 else if (selection_wait == Sel_incr) 2787 else if (selection_wait == Sel_incr)
2761 { 2788 {
2762 incr_ev.start (NOW + 10); 2789 incr_ev.start (10);
2763 2790
2764 while (incr_buf_fill + ct.nitems > incr_buf_size) 2791 while (incr_buf_fill + ct.nitems > incr_buf_size)
2765 { 2792 {
2766 incr_buf_size = incr_buf_size ? incr_buf_size * 2 : 128*1024; 2793 incr_buf_size = incr_buf_size ? incr_buf_size * 2 : 128*1024;
2767 incr_buf = (char *)realloc (incr_buf, incr_buf_size); 2794 incr_buf = (char *)realloc (incr_buf, incr_buf_size);
… …
2774 } 2801 }
2775 2802
2776 char **cl; 2803 char **cl;
2777 int cr; 2804 int cr;
2778 2805
2779#if ENABLE_FRILLS 2806#if !ENABLE_MINIMAL
2780 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it 2807 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it
2781 // so recode it manually 2808 // so recode it manually
2782 if (ct.encoding == xa[XA_UTF8_STRING]) 2809 if (ct.encoding == xa[XA_UTF8_STRING])
2783 { 2810 {
2784 wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems); 2811 wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems);
… …
2788 paste (s, strlen (s)); 2815 paste (s, strlen (s));
2789 free (s); 2816 free (s);
2790 } 2817 }
2791 else 2818 else
2792#endif 2819#endif
2793 if (XmbTextPropertyToTextList (xdisp, &ct, &cl, &cr) >= 0 2820 if (XmbTextPropertyToTextList (dpy, &ct, &cl, &cr) >= 0
2794 && cl) 2821 && cl)
2795 { 2822 {
2796 for (int i = 0; i < cr; i++) 2823 for (int i = 0; i < cr; i++)
2797 paste (cl[i], strlen (cl[i])); 2824 paste (cl[i], strlen (cl[i]));
2798 2825
… …
2807 if (selection_wait == Sel_normal) 2834 if (selection_wait == Sel_normal)
2808 selection_wait = Sel_none; 2835 selection_wait = Sel_none;
2809} 2836}
2810 2837
2811void 2838void
2812rxvt_term::incr_cb (time_watcher &w) NOTHROW 2839rxvt_term::incr_cb (ev::timer &w, int revents) NOTHROW
2813{ 2840{
2814 selection_wait = Sel_none; 2841 selection_wait = Sel_none;
2815 2842
2816 incr_buf_size = 0; 2843 incr_buf_size = 0;
2817 free (incr_buf); 2844 free (incr_buf);
… …
2828 selection_paste (win, prop, true); 2855 selection_paste (win, prop, true);
2829} 2856}
2830 2857
2831/* ------------------------------------------------------------------------- */ 2858/* ------------------------------------------------------------------------- */
2832/* 2859/*
2833 * Request the current selection: 2860 * Request the current selection:
2834 * Order: > internal selection if available 2861 * Order: > internal selection if available
2835 * > PRIMARY, SECONDARY, CLIPBOARD if ownership is claimed (+) 2862 * > PRIMARY, SECONDARY, CLIPBOARD if ownership is claimed (+)
2836 * > CUT_BUFFER0 2863 * > CUT_BUFFER0
2837 * (+) if ownership is claimed but property is empty, rxvt_selection_paste () 2864 * (+) if ownership is claimed but property is empty, rxvt_selection_paste ()
2838 * will auto fallback to CUT_BUFFER0 2865 * will auto fallback to CUT_BUFFER0
… …
2840 */ 2867 */
2841void 2868void
2842rxvt_term::selection_request (Time tm, int selnum) NOTHROW 2869rxvt_term::selection_request (Time tm, int selnum) NOTHROW
2843{ 2870{
2844 if (selection.text && selnum == Sel_Primary) 2871 if (selection.text && selnum == Sel_Primary)
2872 {
2845 { /* internal selection */ 2873 /* internal selection */
2846 char *str = rxvt_wcstombs (selection.text, selection.len); 2874 char *str = rxvt_wcstombs (selection.text, selection.len);
2847 paste (str, strlen (str)); 2875 paste (str, strlen (str));
2848 free (str); 2876 free (str);
2849 return; 2877 return;
2850 } 2878 }
… …
2880 else if (selnum == Sel_Secondary) 2908 else if (selnum == Sel_Secondary)
2881 sel = XA_SECONDARY; 2909 sel = XA_SECONDARY;
2882 else 2910 else
2883 sel = xa[XA_CLIPBOARD]; 2911 sel = xa[XA_CLIPBOARD];
2884 2912
2885 if (XGetSelectionOwner (xdisp, sel) != None) 2913 if (XGetSelectionOwner (dpy, sel) != None)
2886 { 2914 {
2887 XConvertSelection (xdisp, sel, target, xa[XA_VT_SELECTION], 2915 XConvertSelection (dpy, sel, target, xa[XA_VT_SELECTION],
2888 vt, selection_request_time); 2916 vt, selection_request_time);
2889 return 1; 2917 return 1;
2890 } 2918 }
2891 2919
2892 return 0; 2920 return 0;
… …
2955 2983
2956 int end_col; 2984 int end_col;
2957 2985
2958 for (; row <= selection.end.row; row++, col = 0) 2986 for (; row <= selection.end.row; row++, col = 0)
2959 { 2987 {
2960#if ENABLE_FRILLS 2988#if !ENABLE_MINIMAL
2961 if (selection.rect) 2989 if (selection.rect)
2962 { 2990 {
2963 col = selection.beg.col; 2991 col = selection.beg.col;
2964 end_col = ncol + 1; 2992 end_col = ncol + 1;
2965 } 2993 }
… …
2968 end_col = ROW(row).l; 2996 end_col = ROW(row).l;
2969 2997
2970 col = max (col, 0); 2998 col = max (col, 0);
2971 2999
2972 if (row == selection.end.row 3000 if (row == selection.end.row
2973#if ENABLE_FRILLS 3001#if !ENABLE_MINIMAL
2974 || selection.rect 3002 || selection.rect
2975#endif 3003#endif
2976 ) 3004 )
2977 min_it (end_col, selection.end.col); 3005 min_it (end_col, selection.end.col);
2978 3006
… …
3001#endif 3029#endif
3002 else 3030 else
3003 new_selection_text[ofs++] = *t++; 3031 new_selection_text[ofs++] = *t++;
3004 } 3032 }
3005 3033
3006#if ENABLE_FRILLS 3034#if !ENABLE_MINIMAL
3007 if (selection.rect) 3035 if (selection.rect)
3008 { 3036 {
3009 while (ofs 3037 while (ofs
3010 && new_selection_text[ofs - 1] != C0_LF 3038 && new_selection_text[ofs - 1] != C0_LF
3011 && unicode::is_space (new_selection_text[ofs - 1])) 3039 && unicode::is_space (new_selection_text[ofs - 1]))
… …
3045bool 3073bool
3046rxvt_term::selection_grab (Time tm) NOTHROW 3074rxvt_term::selection_grab (Time tm) NOTHROW
3047{ 3075{
3048 selection_time = tm; 3076 selection_time = tm;
3049 3077
3050 XSetSelectionOwner (xdisp, XA_PRIMARY, vt, tm); 3078 XSetSelectionOwner (dpy, XA_PRIMARY, vt, tm);
3051 if (XGetSelectionOwner (xdisp, XA_PRIMARY) == vt) 3079 if (XGetSelectionOwner (dpy, XA_PRIMARY) == vt)
3052 { 3080 {
3053 display->set_selection_owner (this); 3081 display->set_selection_owner (this);
3054 return true; 3082 return true;
3055 } 3083 }
3056 else 3084 else
… …
3060 } 3088 }
3061 3089
3062#if 0 3090#if 0
3063 XTextProperty ct; 3091 XTextProperty ct;
3064 3092
3065 if (XwcTextListToTextProperty (xdisp, &selection.text, 1, XStringStyle, &ct) >= 0) 3093 if (XwcTextListToTextProperty (dpy, &selection.text, 1, XStringStyle, &ct) >= 0)
3066 { 3094 {
3067 set_string_property (XA_CUT_BUFFER0, ct.value, ct.nitems); 3095 set_string_property (XA_CUT_BUFFER0, ct.value, ct.nitems);
3068 XFree (ct.value); 3096 XFree (ct.value);
3069 } 3097 }
3070#endif 3098#endif
… …
3116 selection.mark.col = clamp (selection.mark.col, 0, ncol - 1); 3144 selection.mark.col = clamp (selection.mark.col, 0, ncol - 1);
3117 3145
3118 while (selection.mark.col > 0 3146 while (selection.mark.col > 0
3119 && ROW(selection.mark.row).t[selection.mark.col] == NOCHAR) 3147 && ROW(selection.mark.row).t[selection.mark.col] == NOCHAR)
3120 --selection.mark.col; 3148 --selection.mark.col;
3121 3149
3122 if (selection.op) 3150 if (selection.op)
3151 {
3123 { /* clear the old selection */ 3152 /* clear the old selection */
3124 selection.beg.row = selection.end.row = selection.mark.row; 3153 selection.beg.row = selection.end.row = selection.mark.row;
3125 selection.beg.col = selection.end.col = selection.mark.col; 3154 selection.beg.col = selection.end.col = selection.mark.col;
3126 } 3155 }
3127 3156
3128 selection.op = SELECTION_INIT; 3157 selection.op = SELECTION_INIT;
… …
3317 * a point/word/line which is either the start or end of the selection 3346 * a point/word/line which is either the start or end of the selection
3318 * and it was decided by whichever point/word/line was `fixed' at the 3347 * and it was decided by whichever point/word/line was `fixed' at the
3319 * time of the most recent button3 press 3348 * time of the most recent button3 press
3320 */ 3349 */
3321 if (button3 && buttonpress) 3350 if (button3 && buttonpress)
3351 {
3322 { /* button3 press */ 3352 /* button3 press */
3323 /* 3353 /*
3324 * first determine which edge of the selection we are closest to 3354 * first determine which edge of the selection we are closest to
3325 */ 3355 */
3326 if (ROWCOL_IS_BEFORE (pos, selection.beg) 3356 if (ROWCOL_IS_BEFORE (pos, selection.beg)
3327 || (!ROWCOL_IS_AFTER (pos, selection.end) 3357 || (!ROWCOL_IS_AFTER (pos, selection.end)
… …
3345 selection.mark.row = selection.beg.row; 3375 selection.mark.row = selection.beg.row;
3346 selection.mark.col = selection.beg.col; 3376 selection.mark.col = selection.beg.col;
3347 } 3377 }
3348 } 3378 }
3349 else 3379 else
3380 {
3350 { /* button1 drag or button3 drag */ 3381 /* button1 drag or button3 drag */
3351 if (ROWCOL_IS_AFTER (selection.mark, pos)) 3382 if (ROWCOL_IS_AFTER (selection.mark, pos))
3352 { 3383 {
3353 if (selection.mark.row == selection.end.row 3384 if (selection.mark.row == selection.end.row
3354 && selection.mark.col == selection.end.col 3385 && selection.mark.col == selection.end.col
3355 && clickchange 3386 && clickchange
… …
3372 3403
3373 if (selection.clicks == 1) 3404 if (selection.clicks == 1)
3374 { 3405 {
3375 if (selection.beg.col > ROW(selection.beg.row).l //TODO//FIXME//LEN 3406 if (selection.beg.col > ROW(selection.beg.row).l //TODO//FIXME//LEN
3376 && !ROW(selection.beg.row).is_longer () 3407 && !ROW(selection.beg.row).is_longer ()
3377#if ENABLE_FRILLS 3408#if !ENABLE_MINIMAL
3378 && !selection.rect 3409 && !selection.rect
3379#endif 3410#endif
3380 ) 3411 )
3381 selection.beg.col = ncol; 3412 selection.beg.col = ncol;
3382 3413
3383 if ( 3414 if (
3384 selection.end.col > ROW(selection.end.row).l //TODO//FIXME//LEN 3415 selection.end.col > ROW(selection.end.row).l //TODO//FIXME//LEN
3385 && !ROW(selection.end.row).is_longer () 3416 && !ROW(selection.end.row).is_longer ()
3386#if ENABLE_FRILLS 3417#if !ENABLE_MINIMAL
3387 && !selection.rect 3418 && !selection.rect
3388#endif 3419#endif
3389 ) 3420 )
3390 selection.end.col = ncol; 3421 selection.end.col = ncol;
3391 } 3422 }
… …
3398 selection_delimit_word (DN, &selection.end, &selection.end); 3429 selection_delimit_word (DN, &selection.end, &selection.end);
3399 } 3430 }
3400 else if (selection.clicks == 3) 3431 else if (selection.clicks == 3)
3401 { 3432 {
3402#if ENABLE_FRILLS 3433#if ENABLE_FRILLS
3403 if (OPTION (Opt_tripleclickwords)) 3434 if (option (Opt_tripleclickwords))
3404 { 3435 {
3405 selection_delimit_word (UP, &selection.beg, &selection.beg); 3436 selection_delimit_word (UP, &selection.beg, &selection.beg);
3406 3437
3407 for (int end_row = selection.mark.row; end_row < nrow; end_row++) 3438 for (int end_row = selection.mark.row; end_row < nrow; end_row++)
3408 { 3439 {
3409 if (!ROW(end_row).is_longer ()) 3440 if (!ROW(end_row).is_longer ())
3410 { 3441 {
3411 selection.end.row = end_row; 3442 selection.end.row = end_row;
3412 selection.end.col = ROW(end_row).l; 3443 selection.end.col = ROW(end_row).l;
3444# if !ENABLE_MINIMAL
3413 selection_remove_trailing_spaces (); 3445 selection_remove_trailing_spaces ();
3446# endif
3414 break; 3447 break;
3415 } 3448 }
3416 } 3449 }
3417 } 3450 }
3418 else 3451 else
… …
3434 selection.end.row++; 3467 selection.end.row++;
3435 } 3468 }
3436 } 3469 }
3437 3470
3438 if (button3 && buttonpress) 3471 if (button3 && buttonpress)
3472 {
3439 { /* mark may need to be changed */ 3473 /* mark may need to be changed */
3440 if (closeto == LEFT) 3474 if (closeto == LEFT)
3441 { 3475 {
3442 selection.mark.row = selection.end.row; 3476 selection.mark.row = selection.end.row;
3443 selection.mark.col = selection.end.col - (selection.clicks == 2); 3477 selection.mark.col = selection.end.col - (selection.clicks == 2);
3444 } 3478 }
… …
3447 selection.mark.row = selection.beg.row; 3481 selection.mark.row = selection.beg.row;
3448 selection.mark.col = selection.beg.col; 3482 selection.mark.col = selection.beg.col;
3449 } 3483 }
3450 } 3484 }
3451 3485
3452#if ENABLE_FRILLS 3486#if !ENABLE_MINIMAL
3453 if (selection.rect && selection.beg.col > selection.end.col) 3487 if (selection.rect && selection.beg.col > selection.end.col)
3454 ::swap (selection.beg.col, selection.end.col); 3488 ::swap (selection.beg.col, selection.end.col);
3455#endif 3489#endif
3456} 3490}
3457 3491
3458#if ENABLE_FRILLS 3492#if !ENABLE_MINIMAL
3459void 3493void
3460rxvt_term::selection_remove_trailing_spaces () NOTHROW 3494rxvt_term::selection_remove_trailing_spaces () NOTHROW
3461{ 3495{
3462 int32_t end_col, end_row; 3496 int32_t end_col, end_row;
3463 text_t *stp; 3497 text_t *stp;
… …
3541 *target++ = xa[XA_COMPOUND_TEXT]; 3575 *target++ = xa[XA_COMPOUND_TEXT];
3542#if X_HAVE_UTF8_STRING 3576#if X_HAVE_UTF8_STRING
3543 *target++ = xa[XA_UTF8_STRING]; 3577 *target++ = xa[XA_UTF8_STRING];
3544#endif 3578#endif
3545 3579
3546 XChangeProperty (xdisp, rq.requestor, rq.property, XA_ATOM, 3580 XChangeProperty (dpy, rq.requestor, rq.property, XA_ATOM,
3547 32, PropModeReplace, 3581 32, PropModeReplace,
3548 (unsigned char *)target_list, target - target_list); 3582 (unsigned char *)target_list, target - target_list);
3549 ev.property = rq.property; 3583 ev.property = rq.property;
3550 } 3584 }
3551#if TODO // TODO 3585#if TODO // TODO
… …
3554 /* TODO: Handle MULTIPLE */ 3588 /* TODO: Handle MULTIPLE */
3555 } 3589 }
3556#endif 3590#endif
3557 else if (rq.target == xa[XA_TIMESTAMP] && selection.text) 3591 else if (rq.target == xa[XA_TIMESTAMP] && selection.text)
3558 { 3592 {
3559 XChangeProperty (xdisp, rq.requestor, rq.property, rq.target, 3593 XChangeProperty (dpy, rq.requestor, rq.property, rq.target,
3560 32, PropModeReplace, (unsigned char *)&selection_time, 1); 3594 32, PropModeReplace, (unsigned char *)&selection_time, 1);
3561 ev.property = rq.property; 3595 ev.property = rq.property;
3562 } 3596 }
3563 else if (rq.target == XA_STRING 3597 else if (rq.target == XA_STRING
3564 || rq.target == xa[XA_TEXT] 3598 || rq.target == xa[XA_TEXT]
… …
3588 style = enc_string; 3622 style = enc_string;
3589 else if (target == xa[XA_TEXT]) 3623 else if (target == xa[XA_TEXT])
3590 style = enc_text; 3624 style = enc_text;
3591 else if (target == xa[XA_COMPOUND_TEXT]) 3625 else if (target == xa[XA_COMPOUND_TEXT])
3592 style = enc_compound_text; 3626 style = enc_compound_text;
3593#if ENABLE_FRILLS 3627#if !ENABLE_MINIMAL
3594 else if (target == xa[XA_UTF8_STRING]) 3628 else if (target == xa[XA_UTF8_STRING])
3595 style = enc_utf8; 3629 style = enc_utf8;
3596#endif 3630#endif
3597 else 3631 else
3598 { 3632 {
… …
3609 { 3643 {
3610 cl = L""; 3644 cl = L"";
3611 selectlen = 0; 3645 selectlen = 0;
3612 } 3646 }
3613 3647
3614#if ENABLE_FRILLS 3648#if !ENABLE_MINIMAL
3615 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it 3649 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it
3616 // so recode it manually 3650 // so recode it manually
3617 if (style == enc_utf8) 3651 if (style == enc_utf8)
3618 { 3652 {
3619 freect = 1; 3653 freect = 1;
… …
3622 ct.value = (unsigned char *)rxvt_wcstoutf8 (cl, selectlen); 3656 ct.value = (unsigned char *)rxvt_wcstoutf8 (cl, selectlen);
3623 ct.nitems = strlen ((char *)ct.value); 3657 ct.nitems = strlen ((char *)ct.value);
3624 } 3658 }
3625 else 3659 else
3626#endif 3660#endif
3627 if (XwcTextListToTextProperty (xdisp, &cl, 1, (XICCEncodingStyle) style, &ct) >= 0) 3661 if (XwcTextListToTextProperty (dpy, &cl, 1, (XICCEncodingStyle) style, &ct) >= 0)
3628 freect = 1; 3662 freect = 1;
3629 else 3663 else
3630 { 3664 {
3631 /* if we failed to convert then send it raw */ 3665 /* if we failed to convert then send it raw */
3632 ct.value = (unsigned char *)cl; 3666 ct.value = (unsigned char *)cl;
3633 ct.nitems = selectlen; 3667 ct.nitems = selectlen;
3634 ct.encoding = target; 3668 ct.encoding = target;
3635 } 3669 }
3636 3670
3637 XChangeProperty (xdisp, rq.requestor, rq.property, 3671 XChangeProperty (dpy, rq.requestor, rq.property,
3638 ct.encoding, 8, PropModeReplace, 3672 ct.encoding, 8, PropModeReplace,
3639 ct.value, (int)ct.nitems); 3673 ct.value, (int)ct.nitems);
3640 ev.property = rq.property; 3674 ev.property = rq.property;
3641 3675
3642 if (freect) 3676 if (freect)
3643 XFree (ct.value); 3677 XFree (ct.value);
3644 } 3678 }
3645 3679
3646 XSendEvent (xdisp, rq.requestor, False, 0L, (XEvent *)&ev); 3680 XSendEvent (dpy, rq.requestor, False, 0L, (XEvent *)&ev);
3647}
3648
3649/* ------------------------------------------------------------------------- *
3650 * MOUSE ROUTINES *
3651 * ------------------------------------------------------------------------- */
3652
3653/*
3654 * return col/row values corresponding to x/y pixel values
3655 */
3656void
3657rxvt_term::pixel_position (int *x, int *y) NOTHROW
3658{
3659 *x = Pixel2Col (*x);
3660 /* max_it (*x, 0); min_it (*x, (int)ncol - 1); */
3661 *y = Pixel2Row (*y);
3662 /* max_it (*y, 0); min_it (*y, (int)nrow - 1); */
3663} 3681}
3664 3682
3665/* ------------------------------------------------------------------------- */ 3683/* ------------------------------------------------------------------------- */
3666#ifdef USE_XIM 3684#ifdef USE_XIM
3667void 3685void
3668rxvt_term::im_set_position (XPoint &pos) NOTHROW 3686rxvt_term::im_set_position (XPoint &pos) NOTHROW
3669{ 3687{
3670 XWindowAttributes xwa; 3688 XWindowAttributes xwa;
3671 3689
3672 XGetWindowAttributes (xdisp, vt, &xwa); 3690 XGetWindowAttributes (dpy, vt, &xwa);
3673 3691
3674 pos.x = xwa.x + Col2Pixel (screen.cur.col); 3692 pos.x = xwa.x + Col2Pixel (screen.cur.col);
3675 pos.y = xwa.y + Height2Pixel (screen.cur.row) + fbase; 3693 pos.y = xwa.y + Height2Pixel (screen.cur.row) + fbase;
3676} 3694}
3677#endif 3695#endif

Diff Legend

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