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.301 by ayin, Tue Jan 29 13:57:23 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;
… …
1342 } 1336 }
1343 else 1337 else
1344 { 1338 {
1345 ren = rstyle & (RS_fgMask | RS_bgMask); 1339 ren = rstyle & (RS_fgMask | RS_bgMask);
1346 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)]; 1340 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)];
1347 XChangeGC (xdisp, gc, GCForeground, &gcvalue); 1341 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1348 ERASE_ROWS (row, num); 1342 ERASE_ROWS (row, num);
1349 gcvalue.foreground = pix_colors[Color_fg]; 1343 gcvalue.foreground = pix_colors[Color_fg];
1350 XChangeGC (xdisp, gc, GCForeground, &gcvalue); 1344 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1351 } 1345 }
1352 1346
1353 for (; num--; row++) 1347 for (; num--; row++)
1354 { 1348 {
1355 scr_blank_screen_mem (ROW(row), rstyle); 1349 scr_blank_screen_mem (ROW(row), rstyle);
1356 scr_blank_line (drawn_buf [row], 0, ncol, ren); 1350 scr_blank_line (drawn_buf [row], 0, ncol, ren);
1357 } 1351 }
1358} 1352}
1359 1353
1360#if ENABLE_FRILLS 1354#if !ENABLE_MINIMAL
1361void 1355void
1362rxvt_term::scr_erase_savelines () NOTHROW 1356rxvt_term::scr_erase_savelines () NOTHROW
1363{ 1357{
1364 want_refresh = 1; 1358 want_refresh = 1;
1365 ZERO_SCROLLBACK (); 1359 ZERO_SCROLLBACK ();
… …
1474 { 1468 {
1475 if (selection.end.row != screen.cur.row 1469 if (selection.end.row != screen.cur.row
1476 || (selection.end.col + count >= ncol)) 1470 || (selection.end.col + count >= ncol))
1477 CLEAR_SELECTION (); 1471 CLEAR_SELECTION ();
1478 else 1472 else
1473 {
1479 { /* shift selection */ 1474 /* shift selection */
1480 selection.beg.col += count; 1475 selection.beg.col += count;
1481 selection.mark.col += count; /* XXX: yes? */ 1476 selection.mark.col += count; /* XXX: yes? */
1482 selection.end.col += count; 1477 selection.end.col += count;
1483 } 1478 }
1484 } 1479 }
… …
1623 */ 1618 */
1624void 1619void
1625rxvt_term::scr_set_tab (int mode) NOTHROW 1620rxvt_term::scr_set_tab (int mode) NOTHROW
1626{ 1621{
1627 if (mode < 0) 1622 if (mode < 0)
1628 memset (tabs, 0, ncol * sizeof (char)); 1623 memset (tabs, 0, ncol);
1629 else if (screen.cur.col < ncol) 1624 else if (screen.cur.col < ncol)
1630 tabs [screen.cur.col] = !!mode; 1625 tabs [screen.cur.col] = !!mode;
1631} 1626}
1632 1627
1633/* ------------------------------------------------------------------------- */ 1628/* ------------------------------------------------------------------------- */
… …
1648 if (rvideo_state != on) 1643 if (rvideo_state != on)
1649 { 1644 {
1650 rvideo_state = on; 1645 rvideo_state = on;
1651 1646
1652 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]); 1647 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]);
1653#if XPM_BACKGROUND 1648#ifdef HAVE_BG_PIXMAP
1654 if (bgPixmap.pixmap == None) 1649 if (bgPixmap.pixmap == None)
1655#endif 1650#endif
1656#if TRANSPARENT
1657 if (!OPTION (Opt_transparent) || am_transparent == 0)
1658#endif
1659 XSetWindowBackground (xdisp, vt, pix_colors[Color_bg]); 1651 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
1660 1652
1661 XGCValues gcvalue; 1653 XGCValues gcvalue;
1662 gcvalue.foreground = pix_colors[Color_fg]; 1654 gcvalue.foreground = pix_colors[Color_fg];
1663 gcvalue.background = pix_colors[Color_bg]; 1655 gcvalue.background = pix_colors[Color_bg];
1664 XChangeGC (xdisp, gc, GCBackground | GCForeground, &gcvalue); 1656 XChangeGC (dpy, gc, GCBackground | GCForeground, &gcvalue);
1665 1657
1666 scr_clear (); 1658 scr_clear ();
1667 scr_touch (true); 1659 scr_touch (true);
1668 } 1660 }
1669} 1661}
… …
1754{ 1746{
1755 bool found = false; 1747 bool found = false;
1756 1748
1757 for (int i = 0; i < nrow; i++) 1749 for (int i = 0; i < nrow; i++)
1758 { 1750 {
1759 int col = 0;
1760 rend_t *drp = drawn_buf[i].r; 1751 rend_t *drp = drawn_buf[i].r;
1761 1752
1762 for (; col < ncol; col++, drp++) 1753 for (int col = 0; col < ncol; col++, drp++)
1763 if ((*drp & mask) == value) 1754 if ((*drp & mask) == value)
1764 { 1755 {
1765 found = true; 1756 found = true;
1766 *drp = ~value; 1757 *drp = ~value;
1767 } 1758 }
… …
1807 for (i = PART_BEG; i < RC_COUNT; i++) 1798 for (i = PART_BEG; i < RC_COUNT; i++)
1808 { 1799 {
1809 min_it (rc[i].col, ncol - 1); 1800 min_it (rc[i].col, ncol - 1);
1810 min_it (rc[i].row, nrow - 1); 1801 min_it (rc[i].row, nrow - 1);
1811 } 1802 }
1812 1803// 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++) 1804 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); 1805 fill_text (&drawn_buf[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1);
1815 1806
1816 num_scr_allow = 0; 1807 num_scr_allow = 0;
1817 1808
… …
1872 return true; 1863 return true;
1873} 1864}
1874 1865
1875#ifndef NO_BELL 1866#ifndef NO_BELL
1876void 1867void
1877rxvt_term::bell_cb (time_watcher &w) 1868rxvt_term::bell_cb (ev::timer &w, int revents)
1878{ 1869{
1879 rvideo_bell = false; 1870 rvideo_bell = false;
1880 scr_rvideo_mode (rvideo_mode); 1871 scr_rvideo_mode (rvideo_mode);
1872 refresh_check ();
1881} 1873}
1882#endif 1874#endif
1883 1875
1884/* ------------------------------------------------------------------------- */ 1876/* ------------------------------------------------------------------------- */
1885void 1877void
… …
1887{ 1879{
1888#ifndef NO_BELL 1880#ifndef NO_BELL
1889 1881
1890# ifndef NO_MAPALERT 1882# ifndef NO_MAPALERT
1891# ifdef MAPALERT_OPTION 1883# ifdef MAPALERT_OPTION
1892 if (OPTION (Opt_mapAlert)) 1884 if (option (Opt_mapAlert))
1893# endif 1885# endif
1894 XMapWindow (xdisp, parent[0]); 1886 XMapWindow (dpy, parent[0]);
1895# endif 1887# endif
1896 1888
1889# if ENABLE_FRILLS
1890 if (option (Opt_urgentOnBell))
1891 {
1892 if (XWMHints *h = XGetWMHints(dpy, parent[0]))
1893 {
1894 h->flags |= XUrgencyHint;
1895 XSetWMHints (dpy, parent[0], h);
1896 }
1897 }
1898# endif
1899
1897 if (OPTION (Opt_visualBell)) 1900 if (option (Opt_visualBell))
1898 { 1901 {
1899 rvideo_bell = true; 1902 rvideo_bell = true;
1900 scr_rvideo_mode (rvideo_mode); 1903 scr_rvideo_mode (rvideo_mode);
1901 display->flush (); 1904 flush ();
1902 1905
1903 bell_ev.start (NOW + VISUAL_BELL_DURATION); 1906 bell_ev.start (VISUAL_BELL_DURATION);
1904 } 1907 }
1905 else 1908 else
1906 XBell (xdisp, 0); 1909 XBell (dpy, 0);
1907
1908#endif 1910#endif
1909} 1911}
1910 1912
1911/* ------------------------------------------------------------------------- */ 1913/* ------------------------------------------------------------------------- */
1912/* ARGSUSED */ 1914/* ARGSUSED */
… …
1970 * screen.text/screen.rend contain what the screen will change to. 1972 * screen.text/screen.rend contain what the screen will change to.
1971 */ 1973 */
1972void 1974void
1973rxvt_term::scr_refresh () NOTHROW 1975rxvt_term::scr_refresh () NOTHROW
1974{ 1976{
1975 unsigned char must_clear, /* use draw_string not draw_image_string */ 1977 unsigned char have_bg,
1976 showcursor; /* show the cursor */ 1978 showcursor; /* show the cursor */
1977 int16_t col, row, /* column/row we're processing */ 1979 int16_t col, row, /* column/row we're processing */
1978 ocrow; /* old cursor row */ 1980 ocrow; /* old cursor row */
1979 int i; /* tmp */ 1981 int i; /* tmp */
1980#ifndef NO_CURSORCOLOR 1982#ifndef NO_CURSORCOLOR
1981 rend_t cc1; /* store colours at cursor position (s) */ 1983 rend_t cc1; /* store colours at cursor position (s) */
1982#endif 1984#endif
1983 rend_t *crp; // cursor rendition pointer 1985 rend_t *crp; // cursor rendition pointer
1986 rend_t ccol1, /* Cursor colour */
1987 ccol2; /* Cursor colour2 */
1984 1988
1985 want_refresh = 0; /* screen is current */ 1989 want_refresh = 0; /* screen is current */
1986 1990
1987 if (refresh_type == NO_REFRESH || !mapped) 1991 if (refresh_type == NO_REFRESH || !mapped)
1988 return; 1992 return;
1989 1993
1990 /* 1994 /*
1991 * A: set up vars 1995 * A: set up vars
1992 */ 1996 */
1993 must_clear = 0; 1997 have_bg = 0;
1994 refresh_count = 0; 1998 refresh_count = 0;
1995 1999
1996#if XPM_BACKGROUND 2000#ifdef HAVE_BG_PIXMAP
1997 must_clear |= bgPixmap.pixmap != None; 2001 have_bg |= bgPixmap.pixmap != None;
1998#endif
1999#if TRANSPARENT
2000 must_clear |= OPTION (Opt_transparent) && am_transparent;
2001#endif 2002#endif
2002 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ 2003 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
2003 2004
2004 /* 2005 /*
2005 * B: reverse any characters which are selected 2006 * B: reverse any characters which are selected
… …
2009 /* 2010 /*
2010 * C: set the cursor character (s) 2011 * C: set the cursor character (s)
2011 */ 2012 */
2012 { 2013 {
2013 unsigned char setoldcursor; 2014 unsigned char setoldcursor;
2014 rend_t ccol1, /* Cursor colour */
2015 ccol2; /* Cursor colour2 */
2016 2015
2017 showcursor = (screen.flags & Screen_VisibleCursor); 2016 showcursor = (screen.flags & Screen_VisibleCursor);
2018#ifdef CURSOR_BLINK 2017#ifdef CURSOR_BLINK
2019 if (hidden_cursor) 2018 if (hidden_cursor)
2020 showcursor = 0; 2019 showcursor = 0;
… …
2027 while (col && ROW(screen.cur.row).t[col] == NOCHAR) 2026 while (col && ROW(screen.cur.row).t[col] == NOCHAR)
2028 col--; 2027 col--;
2029 2028
2030 crp = &ROW(screen.cur.row).r[col]; 2029 crp = &ROW(screen.cur.row).r[col];
2031 2030
2031#ifndef NO_CURSORCOLOR
2032 cc1 = *crp & (RS_fgMask | RS_bgMask);
2033 if (ISSET_PIXCOLOR (Color_cursor))
2034 ccol1 = Color_cursor;
2035 else
2036#endif
2037#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
2038 ccol1 = fgcolor_of (rstyle);
2039#else
2040 ccol1 = Color_fg;
2041#endif
2042
2043#ifndef NO_CURSORCOLOR
2044 if (ISSET_PIXCOLOR (Color_cursor2))
2045 ccol2 = Color_cursor2;
2046 else
2047#endif
2048#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
2049 ccol2 = bgcolor_of (rstyle);
2050#else
2051 ccol2 = Color_bg;
2052#endif
2053
2032 if (showcursor && focus) 2054 if (showcursor && focus)
2033 { 2055 {
2034 if (OPTION (Opt_cursorUnderline)) 2056 if (option (Opt_cursorUnderline))
2035 *crp ^= RS_Uline; 2057 *crp ^= RS_Uline;
2036 else 2058 else
2037 { 2059 {
2038 *crp ^= RS_RVid; 2060 *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); 2061 *crp = SET_FGCOLOR (*crp, ccol1);
2059 *crp = SET_BGCOLOR (*crp, ccol2); 2062 *crp = SET_BGCOLOR (*crp, ccol2);
2060#endif
2061 } 2063 }
2062 } 2064 }
2063 } 2065 }
2064 2066
2065 /* make sure no outline cursor is left around */ 2067 /* make sure no outline cursor is left around */
… …
2104 * D: CopyArea pass - very useful for slower links 2106 * D: CopyArea pass - very useful for slower links
2105 * This has been deliberately kept simple. 2107 * This has been deliberately kept simple.
2106 */ 2108 */
2107 if (!display->is_local 2109 if (!display->is_local
2108 && refresh_type == FAST_REFRESH && num_scr_allow && num_scr 2110 && refresh_type == FAST_REFRESH && num_scr_allow && num_scr
2109 && abs (num_scr) < nrow && !must_clear) 2111 && abs (num_scr) < nrow && !have_bg)
2110 { 2112 {
2111 int16_t nits; 2113 int16_t nits;
2114 int i = num_scr;
2112 int j; 2115 int j;
2113 int len, wlen; 2116 int len, wlen;
2114 dLocal (int, num_scr); 2117 dLocal (int, num_scr);
2115 2118
2116 j = nrow; 2119 j = nrow;
2117 wlen = len = -1; 2120 wlen = len = -1;
2118 row = i > 0 ? 0 : j - 1; 2121 row = i > 0 ? 0 : j - 1;
2122
2119 for (; j-- >= 0; row += (i > 0 ? 1 : -1)) 2123 for (; j-- >= 0; row += (i > 0 ? 1 : -1))
2120 { 2124 {
2121 if (row + i >= 0 && row + i < nrow && row + i != ocrow) 2125 if (row + i >= 0 && row + i < nrow && row + i != ocrow)
2122 { 2126 {
2123 line_t s = ROW(view_start + row); 2127 line_t s = ROW(view_start + row);
… …
2144 wlen = row; 2148 wlen = row;
2145 continue; 2149 continue;
2146 } 2150 }
2147 } 2151 }
2148 2152
2149 if (len != -1) 2153 if (len >= 0)
2150 { 2154 {
2151 /* also comes here at end if needed because of >= above */ 2155 /* also comes here at end if needed because of >= above */
2152 if (wlen < len) 2156 if (wlen < len)
2153 ::swap (wlen, len); 2157 ::swap (wlen, len);
2154 2158
2159 XGCValues gcv;
2160
2161 gcv.graphics_exposures = 1; XChangeGC (dpy, gc, GCGraphicsExposures, &gcv);
2155 XCopyArea (xdisp, vt, vt, 2162 XCopyArea (dpy, vt, vt,
2156 gc, 0, Row2Pixel (len + i), 2163 gc, 0, Row2Pixel (len + i),
2157 (unsigned int)this->width, 2164 (unsigned int)this->width,
2158 (unsigned int)Height2Pixel (wlen - len + 1), 2165 (unsigned int)Height2Pixel (wlen - len + 1),
2159 0, Row2Pixel (len)); 2166 0, Row2Pixel (len));
2167 gcv.graphics_exposures = 0; XChangeGC (dpy, gc, GCGraphicsExposures, &gcv);
2168
2160 len = -1; 2169 len = -1;
2161 } 2170 }
2162 } 2171 }
2163 } 2172 }
2164#endif 2173#endif
… …
2220 count++; 2229 count++;
2221 2230
2222 if (stp[col] != dtp[col] 2231 if (stp[col] != dtp[col]
2223 || !RS_SAME (srp[col], drp[col])) 2232 || !RS_SAME (srp[col], drp[col]))
2224 { 2233 {
2225 if (must_clear && (i++ > count / 2)) 2234 if (have_bg && (i++ > count / 2))
2226 break; 2235 break;
2227 2236
2228 dtp[col] = stp[col]; 2237 dtp[col] = stp[col];
2229 drp[col] = rend; 2238 drp[col] = rend;
2230 i = 0; 2239 i = 0;
2231 } 2240 }
2232 else if (must_clear || (stp[col] != ' ' && ++i >= 16)) 2241 else if (have_bg || (stp[col] != ' ' && ++i >= 16))
2233 break; 2242 break;
2234 } 2243 }
2235 2244
2236 col--; /* went one too far. move back */ 2245 col--; /* went one too far. move back */
2237 count -= i; /* dump any matching trailing chars */ 2246 count -= i; /* dump any matching trailing chars */
… …
2247 int back = bgcolor_of (rend); // desired background 2256 int back = bgcolor_of (rend); // desired background
2248 2257
2249 // only do special processing if any attributes are set, which is unlikely 2258 // only do special processing if any attributes are set, which is unlikely
2250 if (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful)) 2259 if (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful))
2251 { 2260 {
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; 2261 bool invert = rend & RS_RVid;
2271 2262
2272#ifndef NO_BOLD_UNDERLINE_REVERSE 2263#ifndef NO_BOLD_UNDERLINE_REVERSE
2273 if (rend & RS_Bold
2274 && fore == Color_fg) 2264 if (rend & RS_Bold && fore == Color_fg)
2275 { 2265 {
2276 if (ISSET_PIXCOLOR (Color_BD)) 2266 if (ISSET_PIXCOLOR (Color_BD))
2277 fore = Color_BD; 2267 fore = Color_BD;
2278# if !ENABLE_STYLES 2268# if !ENABLE_STYLES
2279 else 2269 else
2280 invert = !invert; 2270 invert = !invert;
2281# endif 2271# endif
2282 } 2272 }
2283 2273
2284 if (rend & RS_Italic 2274 if (rend & RS_Italic && fore == Color_fg)
2285 && fore == Color_fg)
2286 { 2275 {
2287 if (ISSET_PIXCOLOR (Color_IT)) 2276 if (ISSET_PIXCOLOR (Color_IT))
2288 fore = Color_IT; 2277 fore = Color_IT;
2289# if !ENABLE_STYLES 2278# if !ENABLE_STYLES
2290 else 2279 else
2291 invert = !invert; 2280 invert = !invert;
2292# endif 2281# endif
2293 } 2282 }
2294 2283
2295 if (rend & RS_Uline && ISSET_PIXCOLOR (Color_UL)) 2284 if (rend & RS_Uline && fore == Color_fg && ISSET_PIXCOLOR (Color_UL))
2296 fore = Color_UL; 2285 fore = Color_UL;
2297#endif 2286#endif
2298 2287
2299 if (invert) 2288 if (invert)
2300 { 2289 {
2290#ifdef OPTION_HC
2291 if ((showcursor && row == screen.cur.row && text - stp == screen.cur.col)
2292 || !ISSET_PIXCOLOR (Color_HC))
2293#endif
2294 /* invert the column if no highlightColor is set or it is the
2295 * current cursor column */
2301 ::swap (fore, back); 2296 ::swap (fore, back);
2297#ifdef OPTION_HC
2298 else if (ISSET_PIXCOLOR (Color_HC))
2299 back = Color_HC;
2300#endif
2302 2301
2303#ifndef NO_BOLD_UNDERLINE_REVERSE 2302#ifndef NO_BOLD_UNDERLINE_REVERSE
2303# ifndef OPTION_HC
2304 if (ISSET_PIXCOLOR (Color_RV)) 2304 if (ISSET_PIXCOLOR (Color_RV))
2305 back = Color_RV; 2305 back = Color_RV;
2306 2306# endif
2307 if (fore == back) 2307 if (fore == back)
2308 { 2308 {
2309 fore = Color_bg; 2309 fore = Color_bg;
2310 back = Color_fg; 2310 back = Color_fg;
2311 } 2311 }
… …
2313 } 2313 }
2314 2314
2315#ifdef TEXT_BLINK 2315#ifdef TEXT_BLINK
2316 if (rend & RS_Blink && (back == Color_bg || fore == Color_bg)) 2316 if (rend & RS_Blink && (back == Color_bg || fore == Color_bg))
2317 { 2317 {
2318 if (!text_blink_ev.active) 2318 if (!text_blink_ev.is_active ())
2319 { 2319 {
2320 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); 2320 text_blink_ev.again ();
2321 hidden_text = 0; 2321 hidden_text = 0;
2322 } 2322 }
2323 else if (hidden_text) 2323 else if (hidden_text)
2324 fore = back; 2324 fore = back;
2325 } 2325 }
2326#endif 2326#endif
2327
2328#if ENABLE_STYLES
2329 // "careful" (too wide) character handling
2330
2331 // include previous careful character(s) if possible, looks nicer (best effort...)
2332 while (text > stp
2333 && srp[text - stp - 1] & RS_Careful
2334 && RS_SAME (rend, srp[text - stp - 1]))
2335 text--, count++, xpixel -= fwidth;
2336
2337 // force redraw after "careful" characters to avoid pixel droppings
2338 for (int i = 0; srp[col + i] & RS_Careful && col + i < ncol - 1; i++)
2339 drp[col + i + 1] = srp[col + i + 1] ^ RS_redraw;
2340
2341 // force redraw before "careful" characters to avoid pixel droppings
2342 for (int i = 0; srp[text - stp - i] & RS_Careful && text - i > stp; i++)
2343 drp[text - stp - i - 1] = srp[text - stp - i - 1] ^ RS_redraw;
2344#endif
2327 } 2345 }
2328 2346
2329 /* 2347 /*
2330 * Actually do the drawing of the string here 2348 * Actually do the drawing of the string here
2331 */ 2349 */
2332 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)]; 2350 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)];
2333 2351
2334 if (back == fore)
2335 font->clear_rect (*drawable, xpixel, ypixel,
2336 fwidth * count, fheight,
2337 back);
2338 else if (back == Color_bg) 2352 if (have_bg && back == Color_bg)
2339 { 2353 {
2340 if (must_clear) 2354 // this is very ugly, maybe push it into ->draw?
2341 {
2342 CLEAR_CHARS (xpixel, ypixel, count);
2343 2355
2344 for (i = 0; i < count; i++) /* don't draw empty strings */ 2356 for (i = 0; i < count; i++) /* don't draw empty strings */
2345 if (text[i] != ' ') 2357 if (text[i] != ' ')
2346 { 2358 {
2347 font->draw (*drawable, xpixel, ypixel, text, count, fore, -1); 2359 font->draw (*drawable, xpixel, ypixel, text, count, fore, Color_transparent);
2348 break; 2360 goto did_clear;
2349 }
2350 } 2361 }
2351 else 2362
2352 font->draw (*drawable, xpixel, ypixel, text, count, fore, Color_bg); 2363 CLEAR_CHARS (xpixel, ypixel, count);
2364 did_clear: ;
2353 } 2365 }
2354 else 2366 else
2355 font->draw (*drawable, xpixel, ypixel, text, count, fore, back); 2367 font->draw (*drawable, xpixel, ypixel, text, count, fore, back);
2356 2368
2357 if (rend & RS_Uline && font->descent > 1 && fore != back) 2369 if (rend & RS_Uline && font->descent > 1 && fore != back)
2358 { 2370 {
2359#if ENABLE_FRILLS 2371#if ENABLE_FRILLS
2360 if (ISSET_PIXCOLOR (Color_underline)) 2372 if (ISSET_PIXCOLOR (Color_underline))
2361 XSetForeground (xdisp, gc, pix_colors[Color_underline]); 2373 XSetForeground (dpy, gc, pix_colors[Color_underline]);
2362 else 2374 else
2363#endif 2375#endif
2364 XSetForeground (xdisp, gc, pix_colors[fore]); 2376 XSetForeground (dpy, gc, pix_colors[fore]);
2365 2377
2366 XDrawLine (xdisp, drawBuffer, gc, 2378 XDrawLine (dpy, vt, gc,
2367 xpixel, ypixel + font->ascent + 1, 2379 xpixel, ypixel + font->ascent + 1,
2368 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1); 2380 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1);
2369 } 2381 }
2370 } /* for (col....) */ 2382 } /* for (col....) */
2371 } /* for (row....) */ 2383 } /* for (row....) */
… …
2380 */ 2392 */
2381 if (showcursor) 2393 if (showcursor)
2382 { 2394 {
2383 if (focus) 2395 if (focus)
2384 { 2396 {
2385 if (OPTION (Opt_cursorUnderline)) 2397 if (option (Opt_cursorUnderline))
2386 *crp ^= RS_Uline; 2398 *crp ^= RS_Uline;
2387 else 2399 else
2388 { 2400 {
2389 *crp ^= RS_RVid; 2401 *crp ^= RS_RVid;
2390#ifndef NO_CURSORCOLOR 2402#ifndef NO_CURSORCOLOR
… …
2404 && drawn_buf[oldcursor.row].t[col + cursorwidth] == NOCHAR) 2416 && drawn_buf[oldcursor.row].t[col + cursorwidth] == NOCHAR)
2405 cursorwidth++; 2417 cursorwidth++;
2406 2418
2407#ifndef NO_CURSORCOLOR 2419#ifndef NO_CURSORCOLOR
2408 if (ISSET_PIXCOLOR (Color_cursor)) 2420 if (ISSET_PIXCOLOR (Color_cursor))
2409 XSetForeground (xdisp, gc, pix_colors[Color_cursor]); 2421 XSetForeground (dpy, gc, pix_colors[Color_cursor]);
2422 else
2410#endif 2423#endif
2424 XSetForeground (dpy, gc, pix_colors[ccol1]);
2411 2425
2412 XDrawRectangle (xdisp, drawBuffer, gc, 2426 XDrawRectangle (dpy, vt, gc,
2413 Col2Pixel (col), 2427 Col2Pixel (col),
2414 Row2Pixel (oldcursor.row), 2428 Row2Pixel (oldcursor.row),
2415 (unsigned int) (Width2Pixel (cursorwidth) - 1), 2429 (unsigned int) (Width2Pixel (cursorwidth) - 1),
2416 (unsigned int) (Height2Pixel (1) - lineSpace - 1)); 2430 (unsigned int) (Height2Pixel (1) - lineSpace - 1));
2417 } 2431 }
… …
2452} 2466}
2453 2467
2454void 2468void
2455rxvt_term::scr_recolour () NOTHROW 2469rxvt_term::scr_recolour () NOTHROW
2456{ 2470{
2457 if (1 2471#ifdef HAVE_BG_PIXMAP
2458#if TRANSPARENT 2472 bgPixmap.apply ();
2459 && !am_transparent 2473#else
2460#endif 2474
2461#if XPM_BACKGROUND
2462 && !bgPixmap.pixmap
2463#endif
2464 )
2465 {
2466 XSetWindowBackground (xdisp, parent[0], pix_colors[Color_border]); 2475 XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]);
2467 XClearWindow (xdisp, parent[0]); 2476 XClearWindow (dpy, parent[0]);
2468 XSetWindowBackground (xdisp, vt, pix_colors[Color_bg]); 2477 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
2469#if HAVE_SCROLLBARS 2478
2470 if (scrollBar.win) 2479 if (scrollBar.win)
2471 { 2480 {
2472 XSetWindowBackground (xdisp, scrollBar.win, pix_colors[Color_border]); 2481 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]);
2473 scrollBar.setIdle (); 2482 scrollBar.state = STATE_IDLE;
2474 scrollbar_show (0); 2483 scrollbar_show (0);
2475 }
2476#endif
2477 } 2484 }
2478 2485
2479 scr_clear (); 2486 scr_clear ();
2480 scr_touch (true); 2487 scr_touch (true);
2481 want_refresh = 1; 2488 want_refresh = 1;
2489
2490#endif
2482} 2491}
2483 2492
2484/* ------------------------------------------------------------------------- */ 2493/* ------------------------------------------------------------------------- */
2485void 2494void
2486rxvt_term::scr_clear (bool really) NOTHROW 2495rxvt_term::scr_clear (bool really) NOTHROW
… …
2490 2499
2491 num_scr_allow = 0; 2500 num_scr_allow = 0;
2492 want_refresh = 1; 2501 want_refresh = 1;
2493 2502
2494 if (really) 2503 if (really)
2495 XClearWindow (xdisp, vt); 2504 XClearWindow (dpy, vt);
2496} 2505}
2497 2506
2498void 2507void
2499rxvt_term::scr_xor_rect (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle1, rend_t rstyle2) NOTHROW 2508rxvt_term::scr_xor_rect (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle1, rend_t rstyle2) NOTHROW
2500{ 2509{
… …
2549{ 2558{
2550 if (selection.op 2559 if (selection.op
2551 && current_screen == selection.screen 2560 && current_screen == selection.screen
2552 && selection.end.row >= view_start) 2561 && selection.end.row >= view_start)
2553 { 2562 {
2554#if ENABLE_FRILLS 2563#if !ENABLE_MINIMAL
2555 if (selection.rect) 2564 if (selection.rect)
2556 scr_xor_rect (selection.beg.row, selection.beg.col, 2565 scr_xor_rect (selection.beg.row, selection.beg.col,
2557 selection.end.row, selection.end.col, 2566 selection.end.row, selection.end.col,
2558 RS_RVid, RS_RVid | RS_Uline); 2567 RS_RVid, RS_RVid | RS_Uline);
2559 else 2568 else
… …
2636 /* convert normal newline chars into common keyboard Return key sequence */ 2645 /* convert normal newline chars into common keyboard Return key sequence */
2637 for (unsigned int i = 0; i < len; i++) 2646 for (unsigned int i = 0; i < len; i++)
2638 if (data[i] == C0_LF) 2647 if (data[i] == C0_LF)
2639 data[i] = C0_CR; 2648 data[i] = C0_CR;
2640 2649
2650 if (priv_modes & PrivMode_BracketPaste)
2651 tt_printf ("\e[200~");
2652
2641 tt_write (data, len); 2653 tt_write (data, len);
2654
2655 if (priv_modes & PrivMode_BracketPaste)
2656 tt_printf ("\e[201~");
2642} 2657}
2643 2658
2644/* ------------------------------------------------------------------------- */ 2659/* ------------------------------------------------------------------------- */
2645/* 2660/*
2646 * Respond to a notification that a primary selection has been sent 2661 * Respond to a notification that a primary selection has been sent
… …
2675 } 2690 }
2676 2691
2677 unsigned long bytes_after; 2692 unsigned long bytes_after;
2678 XTextProperty ct; 2693 XTextProperty ct;
2679 2694
2680 if (XGetWindowProperty (xdisp, win, prop, 2695 if (XGetWindowProperty (dpy, win, prop,
2681 0, PROP_SIZE / 4, 2696 0, PROP_SIZE / 4,
2682 delete_prop, AnyPropertyType, 2697 delete_prop, AnyPropertyType,
2683 &ct.encoding, &ct.format, 2698 &ct.encoding, &ct.format,
2684 &ct.nitems, &bytes_after, 2699 &ct.nitems, &bytes_after,
2685 &ct.value) != Success) 2700 &ct.value) != Success)
… …
2694 if (bytes_after) 2709 if (bytes_after)
2695 { 2710 {
2696 // fetch and append remaining data 2711 // fetch and append remaining data
2697 XTextProperty ct2; 2712 XTextProperty ct2;
2698 2713
2699 if (XGetWindowProperty (xdisp, win, prop, 2714 if (XGetWindowProperty (dpy, win, prop,
2700 ct.nitems / 4, (bytes_after + 3) / 4, 2715 ct.nitems / 4, (bytes_after + 3) / 4,
2701 delete_prop, AnyPropertyType, 2716 delete_prop, AnyPropertyType,
2702 &ct2.encoding, &ct2.format, 2717 &ct2.encoding, &ct2.format,
2703 &ct2.nitems, &bytes_after, 2718 &ct2.nitems, &bytes_after,
2704 &ct2.value) != Success) 2719 &ct2.value) != Success)
… …
2717 2732
2718 if (ct.encoding == xa[XA_INCR]) 2733 if (ct.encoding == xa[XA_INCR])
2719 { 2734 {
2720 // INCR selection, start handshake 2735 // INCR selection, start handshake
2721 if (!delete_prop) 2736 if (!delete_prop)
2722 XDeleteProperty (xdisp, win, prop); 2737 XDeleteProperty (dpy, win, prop);
2723 2738
2724 selection_wait = Sel_incr; 2739 selection_wait = Sel_incr;
2725 incr_buf_fill = 0; 2740 incr_buf_fill = 0;
2726 incr_ev.start (NOW + 10); 2741 incr_ev.start (10);
2727 2742
2728 goto bailout; 2743 goto bailout;
2729 } 2744 }
2730 2745
2731 if (ct.nitems == 0) 2746 if (ct.nitems == 0)
… …
2740 ct.nitems = incr_buf_fill; 2755 ct.nitems = incr_buf_fill;
2741 incr_buf = 0; 2756 incr_buf = 0;
2742 incr_buf_size = 0; 2757 incr_buf_size = 0;
2743 incr_ev.stop (); 2758 incr_ev.stop ();
2744 } 2759 }
2745 else 2760 else
2746 { 2761 {
2747 if (selection_wait == Sel_normal 2762 if (selection_wait == Sel_normal
2748 && (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion 2763 && (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion
2749 { 2764 {
2750 /* 2765 /*
… …
2757 goto bailout; 2772 goto bailout;
2758 } 2773 }
2759 } 2774 }
2760 else if (selection_wait == Sel_incr) 2775 else if (selection_wait == Sel_incr)
2761 { 2776 {
2762 incr_ev.start (NOW + 10); 2777 incr_ev.start (10);
2763 2778
2764 while (incr_buf_fill + ct.nitems > incr_buf_size) 2779 while (incr_buf_fill + ct.nitems > incr_buf_size)
2765 { 2780 {
2766 incr_buf_size = incr_buf_size ? incr_buf_size * 2 : 128*1024; 2781 incr_buf_size = incr_buf_size ? incr_buf_size * 2 : 128*1024;
2767 incr_buf = (char *)realloc (incr_buf, incr_buf_size); 2782 incr_buf = (char *)realloc (incr_buf, incr_buf_size);
… …
2774 } 2789 }
2775 2790
2776 char **cl; 2791 char **cl;
2777 int cr; 2792 int cr;
2778 2793
2779#if ENABLE_FRILLS 2794#if !ENABLE_MINIMAL
2780 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it 2795 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it
2781 // so recode it manually 2796 // so recode it manually
2782 if (ct.encoding == xa[XA_UTF8_STRING]) 2797 if (ct.encoding == xa[XA_UTF8_STRING])
2783 { 2798 {
2784 wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems); 2799 wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems);
… …
2788 paste (s, strlen (s)); 2803 paste (s, strlen (s));
2789 free (s); 2804 free (s);
2790 } 2805 }
2791 else 2806 else
2792#endif 2807#endif
2793 if (XmbTextPropertyToTextList (xdisp, &ct, &cl, &cr) >= 0 2808 if (XmbTextPropertyToTextList (dpy, &ct, &cl, &cr) >= 0
2794 && cl) 2809 && cl)
2795 { 2810 {
2796 for (int i = 0; i < cr; i++) 2811 for (int i = 0; i < cr; i++)
2797 paste (cl[i], strlen (cl[i])); 2812 paste (cl[i], strlen (cl[i]));
2798 2813
… …
2807 if (selection_wait == Sel_normal) 2822 if (selection_wait == Sel_normal)
2808 selection_wait = Sel_none; 2823 selection_wait = Sel_none;
2809} 2824}
2810 2825
2811void 2826void
2812rxvt_term::incr_cb (time_watcher &w) NOTHROW 2827rxvt_term::incr_cb (ev::timer &w, int revents) NOTHROW
2813{ 2828{
2814 selection_wait = Sel_none; 2829 selection_wait = Sel_none;
2815 2830
2816 incr_buf_size = 0; 2831 incr_buf_size = 0;
2817 free (incr_buf); 2832 free (incr_buf);
… …
2828 selection_paste (win, prop, true); 2843 selection_paste (win, prop, true);
2829} 2844}
2830 2845
2831/* ------------------------------------------------------------------------- */ 2846/* ------------------------------------------------------------------------- */
2832/* 2847/*
2833 * Request the current selection: 2848 * Request the current selection:
2834 * Order: > internal selection if available 2849 * Order: > internal selection if available
2835 * > PRIMARY, SECONDARY, CLIPBOARD if ownership is claimed (+) 2850 * > PRIMARY, SECONDARY, CLIPBOARD if ownership is claimed (+)
2836 * > CUT_BUFFER0 2851 * > CUT_BUFFER0
2837 * (+) if ownership is claimed but property is empty, rxvt_selection_paste () 2852 * (+) if ownership is claimed but property is empty, rxvt_selection_paste ()
2838 * will auto fallback to CUT_BUFFER0 2853 * will auto fallback to CUT_BUFFER0
… …
2840 */ 2855 */
2841void 2856void
2842rxvt_term::selection_request (Time tm, int selnum) NOTHROW 2857rxvt_term::selection_request (Time tm, int selnum) NOTHROW
2843{ 2858{
2844 if (selection.text && selnum == Sel_Primary) 2859 if (selection.text && selnum == Sel_Primary)
2860 {
2845 { /* internal selection */ 2861 /* internal selection */
2846 char *str = rxvt_wcstombs (selection.text, selection.len); 2862 char *str = rxvt_wcstombs (selection.text, selection.len);
2847 paste (str, strlen (str)); 2863 paste (str, strlen (str));
2848 free (str); 2864 free (str);
2849 return; 2865 return;
2850 } 2866 }
… …
2880 else if (selnum == Sel_Secondary) 2896 else if (selnum == Sel_Secondary)
2881 sel = XA_SECONDARY; 2897 sel = XA_SECONDARY;
2882 else 2898 else
2883 sel = xa[XA_CLIPBOARD]; 2899 sel = xa[XA_CLIPBOARD];
2884 2900
2885 if (XGetSelectionOwner (xdisp, sel) != None) 2901 if (XGetSelectionOwner (dpy, sel) != None)
2886 { 2902 {
2887 XConvertSelection (xdisp, sel, target, xa[XA_VT_SELECTION], 2903 XConvertSelection (dpy, sel, target, xa[XA_VT_SELECTION],
2888 vt, selection_request_time); 2904 vt, selection_request_time);
2889 return 1; 2905 return 1;
2890 } 2906 }
2891 2907
2892 return 0; 2908 return 0;
… …
2955 2971
2956 int end_col; 2972 int end_col;
2957 2973
2958 for (; row <= selection.end.row; row++, col = 0) 2974 for (; row <= selection.end.row; row++, col = 0)
2959 { 2975 {
2960#if ENABLE_FRILLS 2976#if !ENABLE_MINIMAL
2961 if (selection.rect) 2977 if (selection.rect)
2962 { 2978 {
2963 col = selection.beg.col; 2979 col = selection.beg.col;
2964 end_col = ncol + 1; 2980 end_col = ncol + 1;
2965 } 2981 }
… …
2968 end_col = ROW(row).l; 2984 end_col = ROW(row).l;
2969 2985
2970 col = max (col, 0); 2986 col = max (col, 0);
2971 2987
2972 if (row == selection.end.row 2988 if (row == selection.end.row
2973#if ENABLE_FRILLS 2989#if !ENABLE_MINIMAL
2974 || selection.rect 2990 || selection.rect
2975#endif 2991#endif
2976 ) 2992 )
2977 min_it (end_col, selection.end.col); 2993 min_it (end_col, selection.end.col);
2978 2994
… …
3001#endif 3017#endif
3002 else 3018 else
3003 new_selection_text[ofs++] = *t++; 3019 new_selection_text[ofs++] = *t++;
3004 } 3020 }
3005 3021
3006#if ENABLE_FRILLS 3022#if !ENABLE_MINIMAL
3007 if (selection.rect) 3023 if (selection.rect)
3008 { 3024 {
3009 while (ofs 3025 while (ofs
3010 && new_selection_text[ofs - 1] != C0_LF 3026 && new_selection_text[ofs - 1] != C0_LF
3011 && unicode::is_space (new_selection_text[ofs - 1])) 3027 && unicode::is_space (new_selection_text[ofs - 1]))
… …
3045bool 3061bool
3046rxvt_term::selection_grab (Time tm) NOTHROW 3062rxvt_term::selection_grab (Time tm) NOTHROW
3047{ 3063{
3048 selection_time = tm; 3064 selection_time = tm;
3049 3065
3050 XSetSelectionOwner (xdisp, XA_PRIMARY, vt, tm); 3066 XSetSelectionOwner (dpy, XA_PRIMARY, vt, tm);
3051 if (XGetSelectionOwner (xdisp, XA_PRIMARY) == vt) 3067 if (XGetSelectionOwner (dpy, XA_PRIMARY) == vt)
3052 { 3068 {
3053 display->set_selection_owner (this); 3069 display->set_selection_owner (this);
3054 return true; 3070 return true;
3055 } 3071 }
3056 else 3072 else
… …
3060 } 3076 }
3061 3077
3062#if 0 3078#if 0
3063 XTextProperty ct; 3079 XTextProperty ct;
3064 3080
3065 if (XwcTextListToTextProperty (xdisp, &selection.text, 1, XStringStyle, &ct) >= 0) 3081 if (XwcTextListToTextProperty (dpy, &selection.text, 1, XStringStyle, &ct) >= 0)
3066 { 3082 {
3067 set_string_property (XA_CUT_BUFFER0, ct.value, ct.nitems); 3083 set_string_property (XA_CUT_BUFFER0, ct.value, ct.nitems);
3068 XFree (ct.value); 3084 XFree (ct.value);
3069 } 3085 }
3070#endif 3086#endif
… …
3116 selection.mark.col = clamp (selection.mark.col, 0, ncol - 1); 3132 selection.mark.col = clamp (selection.mark.col, 0, ncol - 1);
3117 3133
3118 while (selection.mark.col > 0 3134 while (selection.mark.col > 0
3119 && ROW(selection.mark.row).t[selection.mark.col] == NOCHAR) 3135 && ROW(selection.mark.row).t[selection.mark.col] == NOCHAR)
3120 --selection.mark.col; 3136 --selection.mark.col;
3121 3137
3122 if (selection.op) 3138 if (selection.op)
3139 {
3123 { /* clear the old selection */ 3140 /* clear the old selection */
3124 selection.beg.row = selection.end.row = selection.mark.row; 3141 selection.beg.row = selection.end.row = selection.mark.row;
3125 selection.beg.col = selection.end.col = selection.mark.col; 3142 selection.beg.col = selection.end.col = selection.mark.col;
3126 } 3143 }
3127 3144
3128 selection.op = SELECTION_INIT; 3145 selection.op = SELECTION_INIT;
… …
3317 * a point/word/line which is either the start or end of the selection 3334 * 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 3335 * and it was decided by whichever point/word/line was `fixed' at the
3319 * time of the most recent button3 press 3336 * time of the most recent button3 press
3320 */ 3337 */
3321 if (button3 && buttonpress) 3338 if (button3 && buttonpress)
3339 {
3322 { /* button3 press */ 3340 /* button3 press */
3323 /* 3341 /*
3324 * first determine which edge of the selection we are closest to 3342 * first determine which edge of the selection we are closest to
3325 */ 3343 */
3326 if (ROWCOL_IS_BEFORE (pos, selection.beg) 3344 if (ROWCOL_IS_BEFORE (pos, selection.beg)
3327 || (!ROWCOL_IS_AFTER (pos, selection.end) 3345 || (!ROWCOL_IS_AFTER (pos, selection.end)
… …
3345 selection.mark.row = selection.beg.row; 3363 selection.mark.row = selection.beg.row;
3346 selection.mark.col = selection.beg.col; 3364 selection.mark.col = selection.beg.col;
3347 } 3365 }
3348 } 3366 }
3349 else 3367 else
3368 {
3350 { /* button1 drag or button3 drag */ 3369 /* button1 drag or button3 drag */
3351 if (ROWCOL_IS_AFTER (selection.mark, pos)) 3370 if (ROWCOL_IS_AFTER (selection.mark, pos))
3352 { 3371 {
3353 if (selection.mark.row == selection.end.row 3372 if (selection.mark.row == selection.end.row
3354 && selection.mark.col == selection.end.col 3373 && selection.mark.col == selection.end.col
3355 && clickchange 3374 && clickchange
… …
3372 3391
3373 if (selection.clicks == 1) 3392 if (selection.clicks == 1)
3374 { 3393 {
3375 if (selection.beg.col > ROW(selection.beg.row).l //TODO//FIXME//LEN 3394 if (selection.beg.col > ROW(selection.beg.row).l //TODO//FIXME//LEN
3376 && !ROW(selection.beg.row).is_longer () 3395 && !ROW(selection.beg.row).is_longer ()
3377#if ENABLE_FRILLS 3396#if !ENABLE_MINIMAL
3378 && !selection.rect 3397 && !selection.rect
3379#endif 3398#endif
3380 ) 3399 )
3381 selection.beg.col = ncol; 3400 selection.beg.col = ncol;
3382 3401
3383 if ( 3402 if (
3384 selection.end.col > ROW(selection.end.row).l //TODO//FIXME//LEN 3403 selection.end.col > ROW(selection.end.row).l //TODO//FIXME//LEN
3385 && !ROW(selection.end.row).is_longer () 3404 && !ROW(selection.end.row).is_longer ()
3386#if ENABLE_FRILLS 3405#if !ENABLE_MINIMAL
3387 && !selection.rect 3406 && !selection.rect
3388#endif 3407#endif
3389 ) 3408 )
3390 selection.end.col = ncol; 3409 selection.end.col = ncol;
3391 } 3410 }
… …
3398 selection_delimit_word (DN, &selection.end, &selection.end); 3417 selection_delimit_word (DN, &selection.end, &selection.end);
3399 } 3418 }
3400 else if (selection.clicks == 3) 3419 else if (selection.clicks == 3)
3401 { 3420 {
3402#if ENABLE_FRILLS 3421#if ENABLE_FRILLS
3403 if (OPTION (Opt_tripleclickwords)) 3422 if (option (Opt_tripleclickwords))
3404 { 3423 {
3405 selection_delimit_word (UP, &selection.beg, &selection.beg); 3424 selection_delimit_word (UP, &selection.beg, &selection.beg);
3406 3425
3407 for (int end_row = selection.mark.row; end_row < nrow; end_row++) 3426 for (int end_row = selection.mark.row; end_row < nrow; end_row++)
3408 { 3427 {
3409 if (!ROW(end_row).is_longer ()) 3428 if (!ROW(end_row).is_longer ())
3410 { 3429 {
3411 selection.end.row = end_row; 3430 selection.end.row = end_row;
3412 selection.end.col = ROW(end_row).l; 3431 selection.end.col = ROW(end_row).l;
3432# if !ENABLE_MINIMAL
3413 selection_remove_trailing_spaces (); 3433 selection_remove_trailing_spaces ();
3434# endif
3414 break; 3435 break;
3415 } 3436 }
3416 } 3437 }
3417 } 3438 }
3418 else 3439 else
… …
3434 selection.end.row++; 3455 selection.end.row++;
3435 } 3456 }
3436 } 3457 }
3437 3458
3438 if (button3 && buttonpress) 3459 if (button3 && buttonpress)
3460 {
3439 { /* mark may need to be changed */ 3461 /* mark may need to be changed */
3440 if (closeto == LEFT) 3462 if (closeto == LEFT)
3441 { 3463 {
3442 selection.mark.row = selection.end.row; 3464 selection.mark.row = selection.end.row;
3443 selection.mark.col = selection.end.col - (selection.clicks == 2); 3465 selection.mark.col = selection.end.col - (selection.clicks == 2);
3444 } 3466 }
… …
3447 selection.mark.row = selection.beg.row; 3469 selection.mark.row = selection.beg.row;
3448 selection.mark.col = selection.beg.col; 3470 selection.mark.col = selection.beg.col;
3449 } 3471 }
3450 } 3472 }
3451 3473
3452#if ENABLE_FRILLS 3474#if !ENABLE_MINIMAL
3453 if (selection.rect && selection.beg.col > selection.end.col) 3475 if (selection.rect && selection.beg.col > selection.end.col)
3454 ::swap (selection.beg.col, selection.end.col); 3476 ::swap (selection.beg.col, selection.end.col);
3455#endif 3477#endif
3456} 3478}
3457 3479
3458#if ENABLE_FRILLS 3480#if !ENABLE_MINIMAL
3459void 3481void
3460rxvt_term::selection_remove_trailing_spaces () NOTHROW 3482rxvt_term::selection_remove_trailing_spaces () NOTHROW
3461{ 3483{
3462 int32_t end_col, end_row; 3484 int32_t end_col, end_row;
3463 text_t *stp; 3485 text_t *stp;
… …
3541 *target++ = xa[XA_COMPOUND_TEXT]; 3563 *target++ = xa[XA_COMPOUND_TEXT];
3542#if X_HAVE_UTF8_STRING 3564#if X_HAVE_UTF8_STRING
3543 *target++ = xa[XA_UTF8_STRING]; 3565 *target++ = xa[XA_UTF8_STRING];
3544#endif 3566#endif
3545 3567
3546 XChangeProperty (xdisp, rq.requestor, rq.property, XA_ATOM, 3568 XChangeProperty (dpy, rq.requestor, rq.property, XA_ATOM,
3547 32, PropModeReplace, 3569 32, PropModeReplace,
3548 (unsigned char *)target_list, target - target_list); 3570 (unsigned char *)target_list, target - target_list);
3549 ev.property = rq.property; 3571 ev.property = rq.property;
3550 } 3572 }
3551#if TODO // TODO 3573#if TODO // TODO
… …
3554 /* TODO: Handle MULTIPLE */ 3576 /* TODO: Handle MULTIPLE */
3555 } 3577 }
3556#endif 3578#endif
3557 else if (rq.target == xa[XA_TIMESTAMP] && selection.text) 3579 else if (rq.target == xa[XA_TIMESTAMP] && selection.text)
3558 { 3580 {
3559 XChangeProperty (xdisp, rq.requestor, rq.property, rq.target, 3581 XChangeProperty (dpy, rq.requestor, rq.property, rq.target,
3560 32, PropModeReplace, (unsigned char *)&selection_time, 1); 3582 32, PropModeReplace, (unsigned char *)&selection_time, 1);
3561 ev.property = rq.property; 3583 ev.property = rq.property;
3562 } 3584 }
3563 else if (rq.target == XA_STRING 3585 else if (rq.target == XA_STRING
3564 || rq.target == xa[XA_TEXT] 3586 || rq.target == xa[XA_TEXT]
… …
3588 style = enc_string; 3610 style = enc_string;
3589 else if (target == xa[XA_TEXT]) 3611 else if (target == xa[XA_TEXT])
3590 style = enc_text; 3612 style = enc_text;
3591 else if (target == xa[XA_COMPOUND_TEXT]) 3613 else if (target == xa[XA_COMPOUND_TEXT])
3592 style = enc_compound_text; 3614 style = enc_compound_text;
3593#if ENABLE_FRILLS 3615#if !ENABLE_MINIMAL
3594 else if (target == xa[XA_UTF8_STRING]) 3616 else if (target == xa[XA_UTF8_STRING])
3595 style = enc_utf8; 3617 style = enc_utf8;
3596#endif 3618#endif
3597 else 3619 else
3598 { 3620 {
… …
3609 { 3631 {
3610 cl = L""; 3632 cl = L"";
3611 selectlen = 0; 3633 selectlen = 0;
3612 } 3634 }
3613 3635
3614#if ENABLE_FRILLS 3636#if !ENABLE_MINIMAL
3615 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it 3637 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it
3616 // so recode it manually 3638 // so recode it manually
3617 if (style == enc_utf8) 3639 if (style == enc_utf8)
3618 { 3640 {
3619 freect = 1; 3641 freect = 1;
… …
3622 ct.value = (unsigned char *)rxvt_wcstoutf8 (cl, selectlen); 3644 ct.value = (unsigned char *)rxvt_wcstoutf8 (cl, selectlen);
3623 ct.nitems = strlen ((char *)ct.value); 3645 ct.nitems = strlen ((char *)ct.value);
3624 } 3646 }
3625 else 3647 else
3626#endif 3648#endif
3627 if (XwcTextListToTextProperty (xdisp, &cl, 1, (XICCEncodingStyle) style, &ct) >= 0) 3649 if (XwcTextListToTextProperty (dpy, &cl, 1, (XICCEncodingStyle) style, &ct) >= 0)
3628 freect = 1; 3650 freect = 1;
3629 else 3651 else
3630 { 3652 {
3631 /* if we failed to convert then send it raw */ 3653 /* if we failed to convert then send it raw */
3632 ct.value = (unsigned char *)cl; 3654 ct.value = (unsigned char *)cl;
3633 ct.nitems = selectlen; 3655 ct.nitems = selectlen;
3634 ct.encoding = target; 3656 ct.encoding = target;
3635 } 3657 }
3636 3658
3637 XChangeProperty (xdisp, rq.requestor, rq.property, 3659 XChangeProperty (dpy, rq.requestor, rq.property,
3638 ct.encoding, 8, PropModeReplace, 3660 ct.encoding, 8, PropModeReplace,
3639 ct.value, (int)ct.nitems); 3661 ct.value, (int)ct.nitems);
3640 ev.property = rq.property; 3662 ev.property = rq.property;
3641 3663
3642 if (freect) 3664 if (freect)
3643 XFree (ct.value); 3665 XFree (ct.value);
3644 } 3666 }
3645 3667
3646 XSendEvent (xdisp, rq.requestor, False, 0L, (XEvent *)&ev); 3668 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} 3669}
3664 3670
3665/* ------------------------------------------------------------------------- */ 3671/* ------------------------------------------------------------------------- */
3666#ifdef USE_XIM 3672#ifdef USE_XIM
3667void 3673void
3668rxvt_term::im_set_position (XPoint &pos) NOTHROW 3674rxvt_term::im_set_position (XPoint &pos) NOTHROW
3669{ 3675{
3670 XWindowAttributes xwa; 3676 XWindowAttributes xwa;
3671 3677
3672 XGetWindowAttributes (xdisp, vt, &xwa); 3678 XGetWindowAttributes (dpy, vt, &xwa);
3673 3679
3674 pos.x = xwa.x + Col2Pixel (screen.cur.col); 3680 pos.x = xwa.x + Col2Pixel (screen.cur.col);
3675 pos.y = xwa.y + Height2Pixel (screen.cur.row) + fbase; 3681 pos.y = xwa.y + Height2Pixel (screen.cur.row) + fbase;
3676} 3682}
3677#endif 3683#endif

Diff Legend

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