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.249 by root, Wed Jan 25 00:42:21 2006 UTC vs.
Revision 1.291 by root, Fri Dec 14 06:30:50 2007 UTC

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

Diff Legend

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