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.255 by root, Mon Jan 30 04:27:17 2006 UTC vs.
Revision 1.296 by root, Wed Jan 9 01:05:24 2008 UTC

1/*--------------------------------*-C-*--------------------------------------* 1/*---------------------------------------------------------------------------*
2 * File: screen.C 2 * File: screen.C
3 *---------------------------------------------------------------------------* 3 *---------------------------------------------------------------------------*
4 * 4 *
5 * Copyright (c) 1997-2001 Geoff Wing <gcw@pobox.com> 5 * Copyright (c) 1997-2001 Geoff Wing <gcw@pobox.com>
6 * Copyright (c) 2003-2006 Marc Lehmann <pcg@goof.com> 6 * Copyright (c) 2003-2007 Marc Lehmann <pcg@goof.com>
7 * 7 *
8 * This program is free software; you can redistribute it and/or modify 8 * This program is free software; you can redistribute it and/or modify
9 * it under the terms of the GNU General Public License as published by 9 * it under the terms of the GNU General Public License as published by
10 * the Free Software Foundation; either version 2 of the License, or 10 * the Free Software Foundation; either version 2 of the License, or
11 * (at your option) any later version. 11 * (at your option) any later version.
… …
26 26
27#include "../config.h" /* NECESSARY */ 27#include "../config.h" /* NECESSARY */
28#include "rxvt.h" /* NECESSARY */ 28#include "rxvt.h" /* NECESSARY */
29#include "rxvtperl.h" /* NECESSARY */ 29#include "rxvtperl.h" /* NECESSARY */
30 30
31#include <X11/Xmd.h> /* get the typedef for CARD32 */
32
33#include <inttypes.h> 31#include <inttypes.h>
34 32
35#include "salloc.C" // HACK, should be a seperate compile! 33#include "salloc.C" // HACK, should be a seperate compile!
36 34
37inline void fill_text (text_t *start, text_t value, int len) 35static inline void fill_text (text_t *start, text_t value, int len)
38{ 36{
39 while (len--) 37 while (len--)
40 *start++ = value; 38 *start++ = value;
41} 39}
42 40
… …
47 45
48/* ------------------------------------------------------------------------- * 46/* ------------------------------------------------------------------------- *
49 * GENERAL SCREEN AND SELECTION UPDATE ROUTINES * 47 * GENERAL SCREEN AND SELECTION UPDATE ROUTINES *
50 * ------------------------------------------------------------------------- */ 48 * ------------------------------------------------------------------------- */
51#define ZERO_SCROLLBACK() \ 49#define ZERO_SCROLLBACK() \
52 if (OPTION (Opt_scrollTtyOutput)) \ 50 if (option (Opt_scrollTtyOutput)) \
53 view_start = 0 51 view_start = 0
54#define CLEAR_SELECTION() \ 52#define CLEAR_SELECTION() \
55 selection.beg.row = selection.beg.col \ 53 selection.beg.row = selection.beg.col \
56 = selection.end.row = selection.end.col = 0 54 = selection.end.row = selection.end.col = 0
57#define CLEAR_ALL_SELECTION() \ 55#define CLEAR_ALL_SELECTION() \
… …
93 */ 91 */
94#define drawBuffer vt 92#define drawBuffer vt
95 93
96#define CLEAR_ROWS(row, num) \ 94#define CLEAR_ROWS(row, num) \
97 if (mapped) \ 95 if (mapped) \
98 XClearArea (xdisp, 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 (xdisp, 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 (xdisp, 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/* ------------------------------------------------------------------------- *
… …
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;
… …
645 { 643 {
646 line_t &l = ROW(nrow - 1 - i); 644 line_t &l = ROW(nrow - 1 - i);
647 645
648 // optimize if already cleared, can be significant on slow machines 646 // optimize if already cleared, can be significant on slow machines
649 // could be rolled into scr_blank_screen_mem 647 // could be rolled into scr_blank_screen_mem
650 if (l.r && l.l < ncol - 1 && !((l.r[l.l + 1] ^ rstyle) & RS_bgMask)) 648 if (l.r && l.l < ncol - 1 && !((l.r[l.l + 1] ^ rstyle) & (RS_fgMask | RS_bgMask)))
651 { 649 {
652 scr_blank_line (l, 0, l.l, rstyle); 650 scr_blank_line (l, 0, l.l, rstyle);
653 l.l = 0; 651 l.l = 0;
654 l.f = 0; 652 l.f = 0;
655 } 653 }
… …
666 line_t &l2 = ROW(i); 664 line_t &l2 = ROW(i);
667 665
668 ::swap (l1, l2); 666 ::swap (l1, l2);
669 l2.touch (); 667 l2.touch ();
670 } 668 }
671 669
672 // move and/or clear selection, if any 670 // move and/or clear selection, if any
673 if (selection.op && current_screen == selection.screen) 671 if (selection.op && current_screen == selection.screen)
674 { 672 {
675 selection.beg.row -= count; 673 selection.beg.row -= count;
676 selection.end.row -= count; 674 selection.end.row -= count;
… …
684 selection.op = SELECTION_CLEAR; 682 selection.op = SELECTION_CLEAR;
685 } 683 }
686 } 684 }
687 685
688 // finally move the view window, if desired 686 // finally move the view window, if desired
689 if (OPTION (Opt_scrollWithBuffer) 687 if (option (Opt_scrollWithBuffer)
690 && view_start != 0 688 && view_start != 0
691 && view_start != -saveLines) 689 && view_start != -saveLines)
692 scr_page (UP, count); 690 scr_page (UP, count);
693 691
694 if (SHOULD_INVOKE (HOOK_SCROLL_BACK)) 692 if (SHOULD_INVOKE (HOOK_SCROLL_BACK))
… …
712 { 710 {
713 /* move selected region too */ 711 /* move selected region too */
714 selection.beg.row -= count; 712 selection.beg.row -= count;
715 selection.end.row -= count; 713 selection.end.row -= count;
716 selection.mark.row -= count; 714 selection.mark.row -= count;
717 715
718 selection_check (0); 716 selection_check (0);
719 } 717 }
720 } 718 }
721 719
722 // use a simple and robust scrolling algorithm, this 720 // use a simple and robust scrolling algorithm, this
… …
834 } 832 }
835 833
836 if (screen.flags & Screen_WrapNext) 834 if (screen.flags & Screen_WrapNext)
837 { 835 {
838 scr_do_wrap (); 836 scr_do_wrap ();
839 837
840 line->l = ncol; 838 line->l = ncol;
841 line->is_longer (1); 839 line->is_longer (1);
842 840
843 row = screen.cur.row; 841 row = screen.cur.row;
844 line = &ROW(row); /* _must_ refresh */ 842 line = &ROW(row); /* _must_ refresh */
… …
1013 * XTERM_SEQ: CTRL-H 1011 * XTERM_SEQ: CTRL-H
1014 */ 1012 */
1015void 1013void
1016rxvt_term::scr_backspace () NOTHROW 1014rxvt_term::scr_backspace () NOTHROW
1017{ 1015{
1018 want_refresh = 1;
1019
1020 if (screen.cur.col == 0) 1016 if (screen.cur.col == 0)
1021 { 1017 {
1022 if (screen.cur.row > 0) 1018 if (screen.cur.row > 0)
1023 { 1019 {
1024#ifdef TERMCAP_HAS_BW 1020#ifdef TERMCAP_HAS_BW
1025 screen.cur.col = ncol - 1; 1021 screen.cur.col = ncol - 1;
1026 screen.cur.row--; 1022 screen.cur.row--;
1027 return; 1023 want_refresh = 1;
1028#endif 1024#endif
1029 } 1025 }
1030 } 1026 }
1031 else if (!(screen.flags & Screen_WrapNext)) 1027 else
1032 scr_gotorc (0, -1, RELATIVE); 1028 scr_gotorc (0, -1, RELATIVE);
1033
1034 screen.flags &= ~Screen_WrapNext;
1035} 1029}
1036 1030
1037/* ------------------------------------------------------------------------- */ 1031/* ------------------------------------------------------------------------- */
1038/* 1032/*
1039 * Process Horizontal Tab 1033 * Process Horizontal Tab
… …
1062 x = i; 1056 x = i;
1063 1057
1064 if (!--count) 1058 if (!--count)
1065 break; 1059 break;
1066 } 1060 }
1067 else 1061 else
1068 ht &= l.t[i] == ' ' 1062 ht &= l.t[i] == ' '
1069 && RS_SAME (l.r[i], base_rend); 1063 && RS_SAME (l.r[i], base_rend);
1070 1064
1071 if (count) 1065 if (count)
1072 x = ncol - 1; 1066 x = ncol - 1;
1073 1067
1074 // store horizontal tab commands as characters inside the text 1068 // store horizontal tab commands as characters inside the text
1075 // buffer so they can be selected and pasted. 1069 // buffer so they can be selected and pasted.
1076 if (ht && OPTION (Opt_pastableTabs)) 1070 if (ht && option (Opt_pastableTabs))
1077 { 1071 {
1078 base_rend = SET_FONT (base_rend, 0); 1072 base_rend = SET_FONT (base_rend, 0);
1079 1073
1080 l.touch (x); 1074 l.touch (x);
1081 1075
… …
1114 * Process DEC Back Index 1108 * Process DEC Back Index
1115 * XTERM_SEQ: ESC 6 1109 * XTERM_SEQ: ESC 6
1116 * Move cursor left in row. If we're at the left boundary, shift everything 1110 * Move cursor left in row. If we're at the left boundary, shift everything
1117 * in that row right. Clear left column. 1111 * in that row right. Clear left column.
1118 */ 1112 */
1119#if ENABLE_FRILLS 1113#if !ENABLE_MINIMAL
1120void 1114void
1121rxvt_term::scr_backindex () NOTHROW 1115rxvt_term::scr_backindex () NOTHROW
1122{ 1116{
1123 if (screen.cur.col > 0) 1117 if (screen.cur.col > 0)
1124 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE); 1118 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE);
… …
1131 * Process DEC Forward Index 1125 * Process DEC Forward Index
1132 * XTERM_SEQ: ESC 9 1126 * XTERM_SEQ: ESC 9
1133 * Move cursor right in row. If we're at the right boundary, shift everything 1127 * Move cursor right in row. If we're at the right boundary, shift everything
1134 * in that row left. Clear right column. 1128 * in that row left. Clear right column.
1135 */ 1129 */
1136#if ENABLE_FRILLS 1130#if !ENABLE_MINIMAL
1137void 1131void
1138rxvt_term::scr_forwardindex () NOTHROW 1132rxvt_term::scr_forwardindex () NOTHROW
1139{ 1133{
1140 if (screen.cur.col < ncol - 1) 1134 if (screen.cur.col < ncol - 1)
1141 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE); 1135 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE);
… …
1188 } 1182 }
1189 } 1183 }
1190 else 1184 else
1191 { 1185 {
1192 if (screen.flags & Screen_Relative) 1186 if (screen.flags & Screen_Relative)
1187 {
1193 { /* relative origin mode */ 1188 /* relative origin mode */
1194 screen.cur.row = row + screen.tscroll; 1189 screen.cur.row = row + screen.tscroll;
1195 min_it (screen.cur.row, screen.bscroll); 1190 min_it (screen.cur.row, screen.bscroll);
1196 } 1191 }
1197 else 1192 else
1198 screen.cur.row = row; 1193 screen.cur.row = row;
… …
1342 } 1337 }
1343 else 1338 else
1344 { 1339 {
1345 ren = rstyle & (RS_fgMask | RS_bgMask); 1340 ren = rstyle & (RS_fgMask | RS_bgMask);
1346 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)]; 1341 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)];
1347 XChangeGC (xdisp, gc, GCForeground, &gcvalue); 1342 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1348 ERASE_ROWS (row, num); 1343 ERASE_ROWS (row, num);
1349 gcvalue.foreground = pix_colors[Color_fg]; 1344 gcvalue.foreground = pix_colors[Color_fg];
1350 XChangeGC (xdisp, gc, GCForeground, &gcvalue); 1345 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1351 } 1346 }
1352 1347
1353 for (; num--; row++) 1348 for (; num--; row++)
1354 { 1349 {
1355 scr_blank_screen_mem (ROW(row), rstyle); 1350 scr_blank_screen_mem (ROW(row), rstyle);
1356 scr_blank_line (drawn_buf [row], 0, ncol, ren); 1351 scr_blank_line (drawn_buf [row], 0, ncol, ren);
1357 } 1352 }
1358} 1353}
1359 1354
1360#if ENABLE_FRILLS 1355#if !ENABLE_MINIMAL
1361void 1356void
1362rxvt_term::scr_erase_savelines () NOTHROW 1357rxvt_term::scr_erase_savelines () NOTHROW
1363{ 1358{
1364 want_refresh = 1; 1359 want_refresh = 1;
1365 ZERO_SCROLLBACK (); 1360 ZERO_SCROLLBACK ();
… …
1474 { 1469 {
1475 if (selection.end.row != screen.cur.row 1470 if (selection.end.row != screen.cur.row
1476 || (selection.end.col + count >= ncol)) 1471 || (selection.end.col + count >= ncol))
1477 CLEAR_SELECTION (); 1472 CLEAR_SELECTION ();
1478 else 1473 else
1474 {
1479 { /* shift selection */ 1475 /* shift selection */
1480 selection.beg.col += count; 1476 selection.beg.col += count;
1481 selection.mark.col += count; /* XXX: yes? */ 1477 selection.mark.col += count; /* XXX: yes? */
1482 selection.end.col += count; 1478 selection.end.col += count;
1483 } 1479 }
1484 } 1480 }
… …
1623 */ 1619 */
1624void 1620void
1625rxvt_term::scr_set_tab (int mode) NOTHROW 1621rxvt_term::scr_set_tab (int mode) NOTHROW
1626{ 1622{
1627 if (mode < 0) 1623 if (mode < 0)
1628 memset (tabs, 0, ncol * sizeof (char)); 1624 memset (tabs, 0, ncol);
1629 else if (screen.cur.col < ncol) 1625 else if (screen.cur.col < ncol)
1630 tabs [screen.cur.col] = !!mode; 1626 tabs [screen.cur.col] = !!mode;
1631} 1627}
1632 1628
1633/* ------------------------------------------------------------------------- */ 1629/* ------------------------------------------------------------------------- */
… …
1648 if (rvideo_state != on) 1644 if (rvideo_state != on)
1649 { 1645 {
1650 rvideo_state = on; 1646 rvideo_state = on;
1651 1647
1652 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]); 1648 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]);
1653#if XPM_BACKGROUND 1649#ifdef HAVE_BG_PIXMAP
1654 if (bgPixmap.pixmap == None) 1650 if (bgPixmap.pixmap == None)
1655#endif 1651#endif
1656#if TRANSPARENT
1657 if (!OPTION (Opt_transparent) || am_transparent == 0)
1658#endif
1659 XSetWindowBackground (xdisp, vt, pix_colors[Color_bg]); 1652 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
1660 1653
1661 XGCValues gcvalue; 1654 XGCValues gcvalue;
1662 gcvalue.foreground = pix_colors[Color_fg]; 1655 gcvalue.foreground = pix_colors[Color_fg];
1663 gcvalue.background = pix_colors[Color_bg]; 1656 gcvalue.background = pix_colors[Color_bg];
1664 XChangeGC (xdisp, gc, GCBackground | GCForeground, &gcvalue); 1657 XChangeGC (dpy, gc, GCBackground | GCForeground, &gcvalue);
1665 1658
1666 scr_clear (); 1659 scr_clear ();
1667 scr_touch (true); 1660 scr_touch (true);
1668 } 1661 }
1669} 1662}
… …
1806 for (i = PART_BEG; i < RC_COUNT; i++) 1799 for (i = PART_BEG; i < RC_COUNT; i++)
1807 { 1800 {
1808 min_it (rc[i].col, ncol - 1); 1801 min_it (rc[i].col, ncol - 1);
1809 min_it (rc[i].row, nrow - 1); 1802 min_it (rc[i].row, nrow - 1);
1810 } 1803 }
1811 1804// TODO: this line somehow causes segfault if scr_expose() is called just after resize
1812 for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++) 1805 for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++)
1813 fill_text (&drawn_buf[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1); 1806 fill_text (&drawn_buf[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1);
1814 1807
1815 num_scr_allow = 0; 1808 num_scr_allow = 0;
1816 1809
… …
1871 return true; 1864 return true;
1872} 1865}
1873 1866
1874#ifndef NO_BELL 1867#ifndef NO_BELL
1875void 1868void
1876rxvt_term::bell_cb (time_watcher &w) 1869rxvt_term::bell_cb (ev::timer &w, int revents)
1877{ 1870{
1878 rvideo_bell = false; 1871 rvideo_bell = false;
1879 scr_rvideo_mode (rvideo_mode); 1872 scr_rvideo_mode (rvideo_mode);
1873 refresh_check ();
1880} 1874}
1881#endif 1875#endif
1882 1876
1883/* ------------------------------------------------------------------------- */ 1877/* ------------------------------------------------------------------------- */
1884void 1878void
… …
1886{ 1880{
1887#ifndef NO_BELL 1881#ifndef NO_BELL
1888 1882
1889# ifndef NO_MAPALERT 1883# ifndef NO_MAPALERT
1890# ifdef MAPALERT_OPTION 1884# ifdef MAPALERT_OPTION
1891 if (OPTION (Opt_mapAlert)) 1885 if (option (Opt_mapAlert))
1892# endif 1886# endif
1893 XMapWindow (xdisp, parent[0]); 1887 XMapWindow (dpy, parent[0]);
1894# endif 1888# endif
1895 1889
1890# if ENABLE_FRILLS
1891 if (option (Opt_urgentOnBell))
1892 {
1893 if (XWMHints *h = XGetWMHints(dpy, parent[0]))
1894 {
1895 h->flags |= XUrgencyHint;
1896 XSetWMHints (dpy, parent[0], h);
1897 }
1898 }
1899# endif
1900
1896 if (OPTION (Opt_visualBell)) 1901 if (option (Opt_visualBell))
1897 { 1902 {
1898 rvideo_bell = true; 1903 rvideo_bell = true;
1899 scr_rvideo_mode (rvideo_mode); 1904 scr_rvideo_mode (rvideo_mode);
1900 display->flush (); 1905 flush ();
1901 1906
1902 bell_ev.start (NOW + VISUAL_BELL_DURATION); 1907 bell_ev.start (VISUAL_BELL_DURATION);
1903 } 1908 }
1904 else 1909 else
1905 XBell (xdisp, 0); 1910 XBell (dpy, 0);
1906
1907#endif 1911#endif
1908} 1912}
1909 1913
1910/* ------------------------------------------------------------------------- */ 1914/* ------------------------------------------------------------------------- */
1911/* ARGSUSED */ 1915/* ARGSUSED */
… …
1969 * screen.text/screen.rend contain what the screen will change to. 1973 * screen.text/screen.rend contain what the screen will change to.
1970 */ 1974 */
1971void 1975void
1972rxvt_term::scr_refresh () NOTHROW 1976rxvt_term::scr_refresh () NOTHROW
1973{ 1977{
1974 unsigned char must_clear, /* use draw_string not draw_image_string */ 1978 unsigned char have_bg,
1975 showcursor; /* show the cursor */ 1979 showcursor; /* show the cursor */
1976 int16_t col, row, /* column/row we're processing */ 1980 int16_t col, row, /* column/row we're processing */
1977 ocrow; /* old cursor row */ 1981 ocrow; /* old cursor row */
1978 int i; /* tmp */ 1982 int i; /* tmp */
1979#ifndef NO_CURSORCOLOR 1983#ifndef NO_CURSORCOLOR
1980 rend_t cc1; /* store colours at cursor position (s) */ 1984 rend_t cc1; /* store colours at cursor position (s) */
1981#endif 1985#endif
1982 rend_t *crp; // cursor rendition pointer 1986 rend_t *crp; // cursor rendition pointer
1987 rend_t ccol1, /* Cursor colour */
1988 ccol2; /* Cursor colour2 */
1983 1989
1984 want_refresh = 0; /* screen is current */ 1990 want_refresh = 0; /* screen is current */
1985 1991
1986 if (refresh_type == NO_REFRESH || !mapped) 1992 if (refresh_type == NO_REFRESH || !mapped)
1987 return; 1993 return;
1988 1994
1989 /* 1995 /*
1990 * A: set up vars 1996 * A: set up vars
1991 */ 1997 */
1992 must_clear = 0; 1998 have_bg = 0;
1993 refresh_count = 0; 1999 refresh_count = 0;
1994 2000
1995#if XPM_BACKGROUND 2001#ifdef HAVE_BG_PIXMAP
1996 must_clear |= bgPixmap.pixmap != None; 2002 have_bg |= bgPixmap.pixmap != None;
1997#endif
1998#if TRANSPARENT
1999 must_clear |= OPTION (Opt_transparent) && am_transparent;
2000#endif 2003#endif
2001 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ 2004 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
2002 2005
2003 /* 2006 /*
2004 * B: reverse any characters which are selected 2007 * B: reverse any characters which are selected
… …
2008 /* 2011 /*
2009 * C: set the cursor character (s) 2012 * C: set the cursor character (s)
2010 */ 2013 */
2011 { 2014 {
2012 unsigned char setoldcursor; 2015 unsigned char setoldcursor;
2013 rend_t ccol1, /* Cursor colour */
2014 ccol2; /* Cursor colour2 */
2015 2016
2016 showcursor = (screen.flags & Screen_VisibleCursor); 2017 showcursor = (screen.flags & Screen_VisibleCursor);
2017#ifdef CURSOR_BLINK 2018#ifdef CURSOR_BLINK
2018 if (hidden_cursor) 2019 if (hidden_cursor)
2019 showcursor = 0; 2020 showcursor = 0;
… …
2026 while (col && ROW(screen.cur.row).t[col] == NOCHAR) 2027 while (col && ROW(screen.cur.row).t[col] == NOCHAR)
2027 col--; 2028 col--;
2028 2029
2029 crp = &ROW(screen.cur.row).r[col]; 2030 crp = &ROW(screen.cur.row).r[col];
2030 2031
2032#ifndef NO_CURSORCOLOR
2033 cc1 = *crp & (RS_fgMask | RS_bgMask);
2034 if (ISSET_PIXCOLOR (Color_cursor))
2035 ccol1 = Color_cursor;
2036 else
2037#endif
2038#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
2039 ccol1 = fgcolor_of (rstyle);
2040#else
2041 ccol1 = Color_fg;
2042#endif
2043
2044#ifndef NO_CURSORCOLOR
2045 if (ISSET_PIXCOLOR (Color_cursor2))
2046 ccol2 = Color_cursor2;
2047 else
2048#endif
2049#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
2050 ccol2 = bgcolor_of (rstyle);
2051#else
2052 ccol2 = Color_bg;
2053#endif
2054
2031 if (showcursor && focus) 2055 if (showcursor && focus)
2032 { 2056 {
2033 if (OPTION (Opt_cursorUnderline)) 2057 if (option (Opt_cursorUnderline))
2034 *crp ^= RS_Uline; 2058 *crp ^= RS_Uline;
2035 else 2059 else
2036 { 2060 {
2037 *crp ^= RS_RVid; 2061 *crp ^= RS_RVid;
2038
2039#ifndef NO_CURSORCOLOR
2040 cc1 = *crp & (RS_fgMask | RS_bgMask);
2041 if (ISSET_PIXCOLOR (Color_cursor))
2042 ccol1 = Color_cursor;
2043 else
2044#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
2045 ccol1 = fgcolor_of (rstyle);
2046#else
2047 ccol1 = Color_fg;
2048#endif
2049 if (ISSET_PIXCOLOR (Color_cursor2))
2050 ccol2 = Color_cursor2;
2051 else
2052#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
2053 ccol2 = bgcolor_of (rstyle);
2054#else
2055 ccol2 = Color_bg;
2056#endif
2057 *crp = SET_FGCOLOR (*crp, ccol1); 2062 *crp = SET_FGCOLOR (*crp, ccol1);
2058 *crp = SET_BGCOLOR (*crp, ccol2); 2063 *crp = SET_BGCOLOR (*crp, ccol2);
2059#endif
2060 } 2064 }
2061 } 2065 }
2062 } 2066 }
2063 2067
2064 /* make sure no outline cursor is left around */ 2068 /* make sure no outline cursor is left around */
… …
2103 * D: CopyArea pass - very useful for slower links 2107 * D: CopyArea pass - very useful for slower links
2104 * This has been deliberately kept simple. 2108 * This has been deliberately kept simple.
2105 */ 2109 */
2106 if (!display->is_local 2110 if (!display->is_local
2107 && refresh_type == FAST_REFRESH && num_scr_allow && num_scr 2111 && refresh_type == FAST_REFRESH && num_scr_allow && num_scr
2108 && abs (num_scr) < nrow && !must_clear) 2112 && abs (num_scr) < nrow && !have_bg)
2109 { 2113 {
2110 int16_t nits; 2114 int16_t nits;
2115 int i = num_scr;
2111 int j; 2116 int j;
2112 int len, wlen; 2117 int len, wlen;
2113 dLocal (int, num_scr); 2118 dLocal (int, num_scr);
2114 2119
2115 j = nrow; 2120 j = nrow;
2116 wlen = len = -1; 2121 wlen = len = -1;
2117 row = i > 0 ? 0 : j - 1; 2122 row = i > 0 ? 0 : j - 1;
2123
2118 for (; j-- >= 0; row += (i > 0 ? 1 : -1)) 2124 for (; j-- >= 0; row += (i > 0 ? 1 : -1))
2119 { 2125 {
2120 if (row + i >= 0 && row + i < nrow && row + i != ocrow) 2126 if (row + i >= 0 && row + i < nrow && row + i != ocrow)
2121 { 2127 {
2122 line_t s = ROW(view_start + row); 2128 line_t s = ROW(view_start + row);
… …
2143 wlen = row; 2149 wlen = row;
2144 continue; 2150 continue;
2145 } 2151 }
2146 } 2152 }
2147 2153
2148 if (len != -1) 2154 if (len >= 0)
2149 { 2155 {
2150 /* also comes here at end if needed because of >= above */ 2156 /* also comes here at end if needed because of >= above */
2151 if (wlen < len) 2157 if (wlen < len)
2152 ::swap (wlen, len); 2158 ::swap (wlen, len);
2153 2159
2160 XGCValues gcv;
2161
2162 gcv.graphics_exposures = 1; XChangeGC (dpy, gc, GCGraphicsExposures, &gcv);
2154 XCopyArea (xdisp, vt, vt, 2163 XCopyArea (dpy, vt, vt,
2155 gc, 0, Row2Pixel (len + i), 2164 gc, 0, Row2Pixel (len + i),
2156 (unsigned int)this->width, 2165 (unsigned int)this->width,
2157 (unsigned int)Height2Pixel (wlen - len + 1), 2166 (unsigned int)Height2Pixel (wlen - len + 1),
2158 0, Row2Pixel (len)); 2167 0, Row2Pixel (len));
2168 gcv.graphics_exposures = 0; XChangeGC (dpy, gc, GCGraphicsExposures, &gcv);
2169
2159 len = -1; 2170 len = -1;
2160 } 2171 }
2161 } 2172 }
2162 } 2173 }
2163#endif 2174#endif
… …
2219 count++; 2230 count++;
2220 2231
2221 if (stp[col] != dtp[col] 2232 if (stp[col] != dtp[col]
2222 || !RS_SAME (srp[col], drp[col])) 2233 || !RS_SAME (srp[col], drp[col]))
2223 { 2234 {
2224 if (must_clear && (i++ > count / 2)) 2235 if (have_bg && (i++ > count / 2))
2225 break; 2236 break;
2226 2237
2227 dtp[col] = stp[col]; 2238 dtp[col] = stp[col];
2228 drp[col] = rend; 2239 drp[col] = rend;
2229 i = 0; 2240 i = 0;
2230 } 2241 }
2231 else if (must_clear || (stp[col] != ' ' && ++i >= 16)) 2242 else if (have_bg || (stp[col] != ' ' && ++i >= 16))
2232 break; 2243 break;
2233 } 2244 }
2234 2245
2235 col--; /* went one too far. move back */ 2246 col--; /* went one too far. move back */
2236 count -= i; /* dump any matching trailing chars */ 2247 count -= i; /* dump any matching trailing chars */
… …
2246 int back = bgcolor_of (rend); // desired background 2257 int back = bgcolor_of (rend); // desired background
2247 2258
2248 // only do special processing if any attributes are set, which is unlikely 2259 // only do special processing if any attributes are set, which is unlikely
2249 if (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful)) 2260 if (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful))
2250 { 2261 {
2251#if ENABLE_STYLES
2252 // "careful" (too wide) character handling
2253
2254 // include previous careful character(s) if possible, looks nicer (best effort...)
2255 while (text > stp
2256 && srp[text - stp - 1] & RS_Careful
2257 && RS_SAME (rend, srp[text - stp - 1]))
2258 text--, count++, xpixel -= fwidth;
2259
2260 // force redraw after "careful" characters to avoid pixel droppings
2261 for (int i = 0; srp[col + i] & RS_Careful && col + i < ncol - 1; i++)
2262 drp[col + i + 1] = srp[col + i + 1] ^ RS_redraw;
2263
2264 // force redraw before "careful" characters to avoid pixel droppings
2265 for (int i = 0; srp[text - stp - i] & RS_Careful && text - i > stp; i++)
2266 drp[text - stp - i - 1] = srp[text - stp - i - 1] ^ RS_redraw;
2267#endif
2268
2269 bool invert = rend & RS_RVid; 2262 bool invert = rend & RS_RVid;
2270 2263
2271#ifndef NO_BOLD_UNDERLINE_REVERSE 2264#ifndef NO_BOLD_UNDERLINE_REVERSE
2272 if (rend & RS_Bold
2273 && fore == Color_fg) 2265 if (rend & RS_Bold && fore == Color_fg)
2274 { 2266 {
2275 if (ISSET_PIXCOLOR (Color_BD)) 2267 if (ISSET_PIXCOLOR (Color_BD))
2276 fore = Color_BD; 2268 fore = Color_BD;
2277# if !ENABLE_STYLES 2269# if !ENABLE_STYLES
2278 else 2270 else
2279 invert = !invert; 2271 invert = !invert;
2280# endif 2272# endif
2281 } 2273 }
2282 2274
2283 if (rend & RS_Italic 2275 if (rend & RS_Italic && fore == Color_fg)
2284 && fore == Color_fg)
2285 { 2276 {
2286 if (ISSET_PIXCOLOR (Color_IT)) 2277 if (ISSET_PIXCOLOR (Color_IT))
2287 fore = Color_IT; 2278 fore = Color_IT;
2288# if !ENABLE_STYLES 2279# if !ENABLE_STYLES
2289 else 2280 else
2290 invert = !invert; 2281 invert = !invert;
2291# endif 2282# endif
2292 } 2283 }
2293 2284
2294 if (rend & RS_Uline && ISSET_PIXCOLOR (Color_UL)) 2285 if (rend & RS_Uline && fore == Color_fg && ISSET_PIXCOLOR (Color_UL))
2295 fore = Color_UL; 2286 fore = Color_UL;
2296#endif 2287#endif
2297 2288
2298 if (invert) 2289 if (invert)
2299 { 2290 {
2291#ifdef OPTION_HC
2292 if ((showcursor && row == screen.cur.row && text - stp == screen.cur.col)
2293 || !ISSET_PIXCOLOR (Color_HC))
2294#endif
2295 /* invert the column if no highlightColor is set or it is the
2296 * current cursor column */
2300 ::swap (fore, back); 2297 ::swap (fore, back);
2298#ifdef OPTION_HC
2299 else if (ISSET_PIXCOLOR (Color_HC))
2300 back = Color_HC;
2301#endif
2301 2302
2302#ifndef NO_BOLD_UNDERLINE_REVERSE 2303#ifndef NO_BOLD_UNDERLINE_REVERSE
2304# ifndef OPTION_HC
2303 if (ISSET_PIXCOLOR (Color_RV)) 2305 if (ISSET_PIXCOLOR (Color_RV))
2304 back = Color_RV; 2306 back = Color_RV;
2305 2307# endif
2306 if (fore == back) 2308 if (fore == back)
2307 { 2309 {
2308 fore = Color_bg; 2310 fore = Color_bg;
2309 back = Color_fg; 2311 back = Color_fg;
2310 } 2312 }
… …
2312 } 2314 }
2313 2315
2314#ifdef TEXT_BLINK 2316#ifdef TEXT_BLINK
2315 if (rend & RS_Blink && (back == Color_bg || fore == Color_bg)) 2317 if (rend & RS_Blink && (back == Color_bg || fore == Color_bg))
2316 { 2318 {
2317 if (!text_blink_ev.active) 2319 if (!text_blink_ev.is_active ())
2318 { 2320 {
2319 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); 2321 text_blink_ev.again ();
2320 hidden_text = 0; 2322 hidden_text = 0;
2321 } 2323 }
2322 else if (hidden_text) 2324 else if (hidden_text)
2323 fore = back; 2325 fore = back;
2324 } 2326 }
2325#endif 2327#endif
2328
2329#if ENABLE_STYLES
2330 // "careful" (too wide) character handling
2331
2332 // include previous careful character(s) if possible, looks nicer (best effort...)
2333 while (text > stp
2334 && srp[text - stp - 1] & RS_Careful
2335 && RS_SAME (rend, srp[text - stp - 1]))
2336 text--, count++, xpixel -= fwidth;
2337
2338 // force redraw after "careful" characters to avoid pixel droppings
2339 for (int i = 0; srp[col + i] & RS_Careful && col + i < ncol - 1; i++)
2340 drp[col + i + 1] = srp[col + i + 1] ^ RS_redraw;
2341
2342 // force redraw before "careful" characters to avoid pixel droppings
2343 for (int i = 0; srp[text - stp - i] & RS_Careful && text - i > stp; i++)
2344 drp[text - stp - i - 1] = srp[text - stp - i - 1] ^ RS_redraw;
2345#endif
2326 } 2346 }
2327 2347
2328 /* 2348 /*
2329 * Actually do the drawing of the string here 2349 * Actually do the drawing of the string here
2330 */ 2350 */
2331 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)]; 2351 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)];
2332 2352
2333 if (back == fore)
2334 font->clear_rect (*drawable, xpixel, ypixel,
2335 fwidth * count, fheight,
2336 back);
2337 else if (back == Color_bg) 2353 if (have_bg && back == Color_bg)
2338 { 2354 {
2339 if (must_clear) 2355 // this is very ugly, maybe push it into ->draw?
2340 {
2341 CLEAR_CHARS (xpixel, ypixel, count);
2342 2356
2343 for (i = 0; i < count; i++) /* don't draw empty strings */ 2357 for (i = 0; i < count; i++) /* don't draw empty strings */
2344 if (text[i] != ' ') 2358 if (text[i] != ' ')
2345 { 2359 {
2346 font->draw (*drawable, xpixel, ypixel, text, count, fore, -1); 2360 font->draw (*drawable, xpixel, ypixel, text, count, fore, Color_transparent);
2347 break; 2361 goto did_clear;
2348 }
2349 } 2362 }
2350 else 2363
2351 font->draw (*drawable, xpixel, ypixel, text, count, fore, Color_bg); 2364 CLEAR_CHARS (xpixel, ypixel, count);
2365 did_clear: ;
2352 } 2366 }
2353 else 2367 else
2354 font->draw (*drawable, xpixel, ypixel, text, count, fore, back); 2368 font->draw (*drawable, xpixel, ypixel, text, count, fore, back);
2355 2369
2356 if (rend & RS_Uline && font->descent > 1 && fore != back) 2370 if (rend & RS_Uline && font->descent > 1 && fore != back)
2357 { 2371 {
2358#if ENABLE_FRILLS 2372#if ENABLE_FRILLS
2359 if (ISSET_PIXCOLOR (Color_underline)) 2373 if (ISSET_PIXCOLOR (Color_underline))
2360 XSetForeground (xdisp, gc, pix_colors[Color_underline]); 2374 XSetForeground (dpy, gc, pix_colors[Color_underline]);
2361 else 2375 else
2362#endif 2376#endif
2363 XSetForeground (xdisp, gc, pix_colors[fore]); 2377 XSetForeground (dpy, gc, pix_colors[fore]);
2364 2378
2365 XDrawLine (xdisp, drawBuffer, gc, 2379 XDrawLine (dpy, drawBuffer, gc,
2366 xpixel, ypixel + font->ascent + 1, 2380 xpixel, ypixel + font->ascent + 1,
2367 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1); 2381 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1);
2368 } 2382 }
2369 } /* for (col....) */ 2383 } /* for (col....) */
2370 } /* for (row....) */ 2384 } /* for (row....) */
… …
2379 */ 2393 */
2380 if (showcursor) 2394 if (showcursor)
2381 { 2395 {
2382 if (focus) 2396 if (focus)
2383 { 2397 {
2384 if (OPTION (Opt_cursorUnderline)) 2398 if (option (Opt_cursorUnderline))
2385 *crp ^= RS_Uline; 2399 *crp ^= RS_Uline;
2386 else 2400 else
2387 { 2401 {
2388 *crp ^= RS_RVid; 2402 *crp ^= RS_RVid;
2389#ifndef NO_CURSORCOLOR 2403#ifndef NO_CURSORCOLOR
… …
2403 && drawn_buf[oldcursor.row].t[col + cursorwidth] == NOCHAR) 2417 && drawn_buf[oldcursor.row].t[col + cursorwidth] == NOCHAR)
2404 cursorwidth++; 2418 cursorwidth++;
2405 2419
2406#ifndef NO_CURSORCOLOR 2420#ifndef NO_CURSORCOLOR
2407 if (ISSET_PIXCOLOR (Color_cursor)) 2421 if (ISSET_PIXCOLOR (Color_cursor))
2408 XSetForeground (xdisp, gc, pix_colors[Color_cursor]); 2422 XSetForeground (dpy, gc, pix_colors[Color_cursor]);
2423 else
2409#endif 2424#endif
2425 XSetForeground (dpy, gc, pix_colors[ccol1]);
2410 2426
2411 XDrawRectangle (xdisp, drawBuffer, gc, 2427 XDrawRectangle (dpy, drawBuffer, gc,
2412 Col2Pixel (col), 2428 Col2Pixel (col),
2413 Row2Pixel (oldcursor.row), 2429 Row2Pixel (oldcursor.row),
2414 (unsigned int) (Width2Pixel (cursorwidth) - 1), 2430 (unsigned int) (Width2Pixel (cursorwidth) - 1),
2415 (unsigned int) (Height2Pixel (1) - lineSpace - 1)); 2431 (unsigned int) (Height2Pixel (1) - lineSpace - 1));
2416 } 2432 }
… …
2451} 2467}
2452 2468
2453void 2469void
2454rxvt_term::scr_recolour () NOTHROW 2470rxvt_term::scr_recolour () NOTHROW
2455{ 2471{
2456 if (1 2472#ifdef HAVE_BG_PIXMAP
2457#if TRANSPARENT 2473 bgPixmap.apply ();
2458 && !am_transparent 2474#else
2459#endif 2475
2460#if XPM_BACKGROUND
2461 && !bgPixmap.pixmap
2462#endif
2463 )
2464 {
2465 XSetWindowBackground (xdisp, parent[0], pix_colors[Color_border]); 2476 XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]);
2466 XClearWindow (xdisp, parent[0]); 2477 XClearWindow (dpy, parent[0]);
2467 XSetWindowBackground (xdisp, vt, pix_colors[Color_bg]); 2478 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
2479
2468#if HAVE_SCROLLBARS 2480# if HAVE_SCROLLBARS
2469 if (scrollBar.win) 2481 if (scrollBar.win)
2470 { 2482 {
2471 XSetWindowBackground (xdisp, scrollBar.win, pix_colors[Color_border]); 2483 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]);
2472 scrollBar.setIdle (); 2484 scrollBar.setIdle ();
2473 scrollbar_show (0); 2485 scrollbar_show (0);
2474 } 2486 }
2475#endif 2487# endif
2476 }
2477 2488
2478 scr_clear (); 2489 scr_clear ();
2479 scr_touch (true); 2490 scr_touch (true);
2480 want_refresh = 1; 2491 want_refresh = 1;
2492
2493#endif
2481} 2494}
2482 2495
2483/* ------------------------------------------------------------------------- */ 2496/* ------------------------------------------------------------------------- */
2484void 2497void
2485rxvt_term::scr_clear (bool really) NOTHROW 2498rxvt_term::scr_clear (bool really) NOTHROW
… …
2489 2502
2490 num_scr_allow = 0; 2503 num_scr_allow = 0;
2491 want_refresh = 1; 2504 want_refresh = 1;
2492 2505
2493 if (really) 2506 if (really)
2494 XClearWindow (xdisp, vt); 2507 XClearWindow (dpy, vt);
2495} 2508}
2496 2509
2497void 2510void
2498rxvt_term::scr_xor_rect (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle1, rend_t rstyle2) NOTHROW 2511rxvt_term::scr_xor_rect (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle1, rend_t rstyle2) NOTHROW
2499{ 2512{
… …
2548{ 2561{
2549 if (selection.op 2562 if (selection.op
2550 && current_screen == selection.screen 2563 && current_screen == selection.screen
2551 && selection.end.row >= view_start) 2564 && selection.end.row >= view_start)
2552 { 2565 {
2553#if ENABLE_FRILLS 2566#if !ENABLE_MINIMAL
2554 if (selection.rect) 2567 if (selection.rect)
2555 scr_xor_rect (selection.beg.row, selection.beg.col, 2568 scr_xor_rect (selection.beg.row, selection.beg.col,
2556 selection.end.row, selection.end.col, 2569 selection.end.row, selection.end.col,
2557 RS_RVid, RS_RVid | RS_Uline); 2570 RS_RVid, RS_RVid | RS_Uline);
2558 else 2571 else
… …
2674 } 2687 }
2675 2688
2676 unsigned long bytes_after; 2689 unsigned long bytes_after;
2677 XTextProperty ct; 2690 XTextProperty ct;
2678 2691
2679 if (XGetWindowProperty (xdisp, win, prop, 2692 if (XGetWindowProperty (dpy, win, prop,
2680 0, PROP_SIZE / 4, 2693 0, PROP_SIZE / 4,
2681 delete_prop, AnyPropertyType, 2694 delete_prop, AnyPropertyType,
2682 &ct.encoding, &ct.format, 2695 &ct.encoding, &ct.format,
2683 &ct.nitems, &bytes_after, 2696 &ct.nitems, &bytes_after,
2684 &ct.value) != Success) 2697 &ct.value) != Success)
… …
2693 if (bytes_after) 2706 if (bytes_after)
2694 { 2707 {
2695 // fetch and append remaining data 2708 // fetch and append remaining data
2696 XTextProperty ct2; 2709 XTextProperty ct2;
2697 2710
2698 if (XGetWindowProperty (xdisp, win, prop, 2711 if (XGetWindowProperty (dpy, win, prop,
2699 ct.nitems / 4, (bytes_after + 3) / 4, 2712 ct.nitems / 4, (bytes_after + 3) / 4,
2700 delete_prop, AnyPropertyType, 2713 delete_prop, AnyPropertyType,
2701 &ct2.encoding, &ct2.format, 2714 &ct2.encoding, &ct2.format,
2702 &ct2.nitems, &bytes_after, 2715 &ct2.nitems, &bytes_after,
2703 &ct2.value) != Success) 2716 &ct2.value) != Success)
… …
2716 2729
2717 if (ct.encoding == xa[XA_INCR]) 2730 if (ct.encoding == xa[XA_INCR])
2718 { 2731 {
2719 // INCR selection, start handshake 2732 // INCR selection, start handshake
2720 if (!delete_prop) 2733 if (!delete_prop)
2721 XDeleteProperty (xdisp, win, prop); 2734 XDeleteProperty (dpy, win, prop);
2722 2735
2723 selection_wait = Sel_incr; 2736 selection_wait = Sel_incr;
2724 incr_buf_fill = 0; 2737 incr_buf_fill = 0;
2725 incr_ev.start (NOW + 10); 2738 incr_ev.start (10);
2726 2739
2727 goto bailout; 2740 goto bailout;
2728 } 2741 }
2729 2742
2730 if (ct.nitems == 0) 2743 if (ct.nitems == 0)
… …
2739 ct.nitems = incr_buf_fill; 2752 ct.nitems = incr_buf_fill;
2740 incr_buf = 0; 2753 incr_buf = 0;
2741 incr_buf_size = 0; 2754 incr_buf_size = 0;
2742 incr_ev.stop (); 2755 incr_ev.stop ();
2743 } 2756 }
2744 else 2757 else
2745 { 2758 {
2746 if (selection_wait == Sel_normal 2759 if (selection_wait == Sel_normal
2747 && (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion 2760 && (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion
2748 { 2761 {
2749 /* 2762 /*
… …
2756 goto bailout; 2769 goto bailout;
2757 } 2770 }
2758 } 2771 }
2759 else if (selection_wait == Sel_incr) 2772 else if (selection_wait == Sel_incr)
2760 { 2773 {
2761 incr_ev.start (NOW + 10); 2774 incr_ev.start (10);
2762 2775
2763 while (incr_buf_fill + ct.nitems > incr_buf_size) 2776 while (incr_buf_fill + ct.nitems > incr_buf_size)
2764 { 2777 {
2765 incr_buf_size = incr_buf_size ? incr_buf_size * 2 : 128*1024; 2778 incr_buf_size = incr_buf_size ? incr_buf_size * 2 : 128*1024;
2766 incr_buf = (char *)realloc (incr_buf, incr_buf_size); 2779 incr_buf = (char *)realloc (incr_buf, incr_buf_size);
… …
2773 } 2786 }
2774 2787
2775 char **cl; 2788 char **cl;
2776 int cr; 2789 int cr;
2777 2790
2778#if ENABLE_FRILLS 2791#if !ENABLE_MINIMAL
2779 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it 2792 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it
2780 // so recode it manually 2793 // so recode it manually
2781 if (ct.encoding == xa[XA_UTF8_STRING]) 2794 if (ct.encoding == xa[XA_UTF8_STRING])
2782 { 2795 {
2783 wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems); 2796 wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems);
… …
2787 paste (s, strlen (s)); 2800 paste (s, strlen (s));
2788 free (s); 2801 free (s);
2789 } 2802 }
2790 else 2803 else
2791#endif 2804#endif
2792 if (XmbTextPropertyToTextList (xdisp, &ct, &cl, &cr) >= 0 2805 if (XmbTextPropertyToTextList (dpy, &ct, &cl, &cr) >= 0
2793 && cl) 2806 && cl)
2794 { 2807 {
2795 for (int i = 0; i < cr; i++) 2808 for (int i = 0; i < cr; i++)
2796 paste (cl[i], strlen (cl[i])); 2809 paste (cl[i], strlen (cl[i]));
2797 2810
… …
2806 if (selection_wait == Sel_normal) 2819 if (selection_wait == Sel_normal)
2807 selection_wait = Sel_none; 2820 selection_wait = Sel_none;
2808} 2821}
2809 2822
2810void 2823void
2811rxvt_term::incr_cb (time_watcher &w) NOTHROW 2824rxvt_term::incr_cb (ev::timer &w, int revents) NOTHROW
2812{ 2825{
2813 selection_wait = Sel_none; 2826 selection_wait = Sel_none;
2814 2827
2815 incr_buf_size = 0; 2828 incr_buf_size = 0;
2816 free (incr_buf); 2829 free (incr_buf);
… …
2827 selection_paste (win, prop, true); 2840 selection_paste (win, prop, true);
2828} 2841}
2829 2842
2830/* ------------------------------------------------------------------------- */ 2843/* ------------------------------------------------------------------------- */
2831/* 2844/*
2832 * Request the current selection: 2845 * Request the current selection:
2833 * Order: > internal selection if available 2846 * Order: > internal selection if available
2834 * > PRIMARY, SECONDARY, CLIPBOARD if ownership is claimed (+) 2847 * > PRIMARY, SECONDARY, CLIPBOARD if ownership is claimed (+)
2835 * > CUT_BUFFER0 2848 * > CUT_BUFFER0
2836 * (+) if ownership is claimed but property is empty, rxvt_selection_paste () 2849 * (+) if ownership is claimed but property is empty, rxvt_selection_paste ()
2837 * will auto fallback to CUT_BUFFER0 2850 * will auto fallback to CUT_BUFFER0
… …
2839 */ 2852 */
2840void 2853void
2841rxvt_term::selection_request (Time tm, int selnum) NOTHROW 2854rxvt_term::selection_request (Time tm, int selnum) NOTHROW
2842{ 2855{
2843 if (selection.text && selnum == Sel_Primary) 2856 if (selection.text && selnum == Sel_Primary)
2857 {
2844 { /* internal selection */ 2858 /* internal selection */
2845 char *str = rxvt_wcstombs (selection.text, selection.len); 2859 char *str = rxvt_wcstombs (selection.text, selection.len);
2846 paste (str, strlen (str)); 2860 paste (str, strlen (str));
2847 free (str); 2861 free (str);
2848 return; 2862 return;
2849 } 2863 }
… …
2879 else if (selnum == Sel_Secondary) 2893 else if (selnum == Sel_Secondary)
2880 sel = XA_SECONDARY; 2894 sel = XA_SECONDARY;
2881 else 2895 else
2882 sel = xa[XA_CLIPBOARD]; 2896 sel = xa[XA_CLIPBOARD];
2883 2897
2884 if (XGetSelectionOwner (xdisp, sel) != None) 2898 if (XGetSelectionOwner (dpy, sel) != None)
2885 { 2899 {
2886 XConvertSelection (xdisp, sel, target, xa[XA_VT_SELECTION], 2900 XConvertSelection (dpy, sel, target, xa[XA_VT_SELECTION],
2887 vt, selection_request_time); 2901 vt, selection_request_time);
2888 return 1; 2902 return 1;
2889 } 2903 }
2890 2904
2891 return 0; 2905 return 0;
… …
2954 2968
2955 int end_col; 2969 int end_col;
2956 2970
2957 for (; row <= selection.end.row; row++, col = 0) 2971 for (; row <= selection.end.row; row++, col = 0)
2958 { 2972 {
2959#if ENABLE_FRILLS 2973#if !ENABLE_MINIMAL
2960 if (selection.rect) 2974 if (selection.rect)
2961 { 2975 {
2962 col = selection.beg.col; 2976 col = selection.beg.col;
2963 end_col = ncol + 1; 2977 end_col = ncol + 1;
2964 } 2978 }
… …
2967 end_col = ROW(row).l; 2981 end_col = ROW(row).l;
2968 2982
2969 col = max (col, 0); 2983 col = max (col, 0);
2970 2984
2971 if (row == selection.end.row 2985 if (row == selection.end.row
2972#if ENABLE_FRILLS 2986#if !ENABLE_MINIMAL
2973 || selection.rect 2987 || selection.rect
2974#endif 2988#endif
2975 ) 2989 )
2976 min_it (end_col, selection.end.col); 2990 min_it (end_col, selection.end.col);
2977 2991
… …
3000#endif 3014#endif
3001 else 3015 else
3002 new_selection_text[ofs++] = *t++; 3016 new_selection_text[ofs++] = *t++;
3003 } 3017 }
3004 3018
3005#if ENABLE_FRILLS 3019#if !ENABLE_MINIMAL
3006 if (selection.rect) 3020 if (selection.rect)
3007 { 3021 {
3008 while (ofs 3022 while (ofs
3009 && new_selection_text[ofs - 1] != C0_LF 3023 && new_selection_text[ofs - 1] != C0_LF
3010 && unicode::is_space (new_selection_text[ofs - 1])) 3024 && unicode::is_space (new_selection_text[ofs - 1]))
… …
3044bool 3058bool
3045rxvt_term::selection_grab (Time tm) NOTHROW 3059rxvt_term::selection_grab (Time tm) NOTHROW
3046{ 3060{
3047 selection_time = tm; 3061 selection_time = tm;
3048 3062
3049 XSetSelectionOwner (xdisp, XA_PRIMARY, vt, tm); 3063 XSetSelectionOwner (dpy, XA_PRIMARY, vt, tm);
3050 if (XGetSelectionOwner (xdisp, XA_PRIMARY) == vt) 3064 if (XGetSelectionOwner (dpy, XA_PRIMARY) == vt)
3051 { 3065 {
3052 display->set_selection_owner (this); 3066 display->set_selection_owner (this);
3053 return true; 3067 return true;
3054 } 3068 }
3055 else 3069 else
… …
3059 } 3073 }
3060 3074
3061#if 0 3075#if 0
3062 XTextProperty ct; 3076 XTextProperty ct;
3063 3077
3064 if (XwcTextListToTextProperty (xdisp, &selection.text, 1, XStringStyle, &ct) >= 0) 3078 if (XwcTextListToTextProperty (dpy, &selection.text, 1, XStringStyle, &ct) >= 0)
3065 { 3079 {
3066 set_string_property (XA_CUT_BUFFER0, ct.value, ct.nitems); 3080 set_string_property (XA_CUT_BUFFER0, ct.value, ct.nitems);
3067 XFree (ct.value); 3081 XFree (ct.value);
3068 } 3082 }
3069#endif 3083#endif
… …
3115 selection.mark.col = clamp (selection.mark.col, 0, ncol - 1); 3129 selection.mark.col = clamp (selection.mark.col, 0, ncol - 1);
3116 3130
3117 while (selection.mark.col > 0 3131 while (selection.mark.col > 0
3118 && ROW(selection.mark.row).t[selection.mark.col] == NOCHAR) 3132 && ROW(selection.mark.row).t[selection.mark.col] == NOCHAR)
3119 --selection.mark.col; 3133 --selection.mark.col;
3120 3134
3121 if (selection.op) 3135 if (selection.op)
3136 {
3122 { /* clear the old selection */ 3137 /* clear the old selection */
3123 selection.beg.row = selection.end.row = selection.mark.row; 3138 selection.beg.row = selection.end.row = selection.mark.row;
3124 selection.beg.col = selection.end.col = selection.mark.col; 3139 selection.beg.col = selection.end.col = selection.mark.col;
3125 } 3140 }
3126 3141
3127 selection.op = SELECTION_INIT; 3142 selection.op = SELECTION_INIT;
… …
3316 * a point/word/line which is either the start or end of the selection 3331 * a point/word/line which is either the start or end of the selection
3317 * and it was decided by whichever point/word/line was `fixed' at the 3332 * and it was decided by whichever point/word/line was `fixed' at the
3318 * time of the most recent button3 press 3333 * time of the most recent button3 press
3319 */ 3334 */
3320 if (button3 && buttonpress) 3335 if (button3 && buttonpress)
3336 {
3321 { /* button3 press */ 3337 /* button3 press */
3322 /* 3338 /*
3323 * first determine which edge of the selection we are closest to 3339 * first determine which edge of the selection we are closest to
3324 */ 3340 */
3325 if (ROWCOL_IS_BEFORE (pos, selection.beg) 3341 if (ROWCOL_IS_BEFORE (pos, selection.beg)
3326 || (!ROWCOL_IS_AFTER (pos, selection.end) 3342 || (!ROWCOL_IS_AFTER (pos, selection.end)
… …
3344 selection.mark.row = selection.beg.row; 3360 selection.mark.row = selection.beg.row;
3345 selection.mark.col = selection.beg.col; 3361 selection.mark.col = selection.beg.col;
3346 } 3362 }
3347 } 3363 }
3348 else 3364 else
3365 {
3349 { /* button1 drag or button3 drag */ 3366 /* button1 drag or button3 drag */
3350 if (ROWCOL_IS_AFTER (selection.mark, pos)) 3367 if (ROWCOL_IS_AFTER (selection.mark, pos))
3351 { 3368 {
3352 if (selection.mark.row == selection.end.row 3369 if (selection.mark.row == selection.end.row
3353 && selection.mark.col == selection.end.col 3370 && selection.mark.col == selection.end.col
3354 && clickchange 3371 && clickchange
… …
3371 3388
3372 if (selection.clicks == 1) 3389 if (selection.clicks == 1)
3373 { 3390 {
3374 if (selection.beg.col > ROW(selection.beg.row).l //TODO//FIXME//LEN 3391 if (selection.beg.col > ROW(selection.beg.row).l //TODO//FIXME//LEN
3375 && !ROW(selection.beg.row).is_longer () 3392 && !ROW(selection.beg.row).is_longer ()
3376#if ENABLE_FRILLS 3393#if !ENABLE_MINIMAL
3377 && !selection.rect 3394 && !selection.rect
3378#endif 3395#endif
3379 ) 3396 )
3380 selection.beg.col = ncol; 3397 selection.beg.col = ncol;
3381 3398
3382 if ( 3399 if (
3383 selection.end.col > ROW(selection.end.row).l //TODO//FIXME//LEN 3400 selection.end.col > ROW(selection.end.row).l //TODO//FIXME//LEN
3384 && !ROW(selection.end.row).is_longer () 3401 && !ROW(selection.end.row).is_longer ()
3385#if ENABLE_FRILLS 3402#if !ENABLE_MINIMAL
3386 && !selection.rect 3403 && !selection.rect
3387#endif 3404#endif
3388 ) 3405 )
3389 selection.end.col = ncol; 3406 selection.end.col = ncol;
3390 } 3407 }
… …
3397 selection_delimit_word (DN, &selection.end, &selection.end); 3414 selection_delimit_word (DN, &selection.end, &selection.end);
3398 } 3415 }
3399 else if (selection.clicks == 3) 3416 else if (selection.clicks == 3)
3400 { 3417 {
3401#if ENABLE_FRILLS 3418#if ENABLE_FRILLS
3402 if (OPTION (Opt_tripleclickwords)) 3419 if (option (Opt_tripleclickwords))
3403 { 3420 {
3404 selection_delimit_word (UP, &selection.beg, &selection.beg); 3421 selection_delimit_word (UP, &selection.beg, &selection.beg);
3405 3422
3406 for (int end_row = selection.mark.row; end_row < nrow; end_row++) 3423 for (int end_row = selection.mark.row; end_row < nrow; end_row++)
3407 { 3424 {
3408 if (!ROW(end_row).is_longer ()) 3425 if (!ROW(end_row).is_longer ())
3409 { 3426 {
3410 selection.end.row = end_row; 3427 selection.end.row = end_row;
3411 selection.end.col = ROW(end_row).l; 3428 selection.end.col = ROW(end_row).l;
3429# if !ENABLE_MINIMAL
3412 selection_remove_trailing_spaces (); 3430 selection_remove_trailing_spaces ();
3431# endif
3413 break; 3432 break;
3414 } 3433 }
3415 } 3434 }
3416 } 3435 }
3417 else 3436 else
… …
3433 selection.end.row++; 3452 selection.end.row++;
3434 } 3453 }
3435 } 3454 }
3436 3455
3437 if (button3 && buttonpress) 3456 if (button3 && buttonpress)
3457 {
3438 { /* mark may need to be changed */ 3458 /* mark may need to be changed */
3439 if (closeto == LEFT) 3459 if (closeto == LEFT)
3440 { 3460 {
3441 selection.mark.row = selection.end.row; 3461 selection.mark.row = selection.end.row;
3442 selection.mark.col = selection.end.col - (selection.clicks == 2); 3462 selection.mark.col = selection.end.col - (selection.clicks == 2);
3443 } 3463 }
… …
3446 selection.mark.row = selection.beg.row; 3466 selection.mark.row = selection.beg.row;
3447 selection.mark.col = selection.beg.col; 3467 selection.mark.col = selection.beg.col;
3448 } 3468 }
3449 } 3469 }
3450 3470
3451#if ENABLE_FRILLS 3471#if !ENABLE_MINIMAL
3452 if (selection.rect && selection.beg.col > selection.end.col) 3472 if (selection.rect && selection.beg.col > selection.end.col)
3453 ::swap (selection.beg.col, selection.end.col); 3473 ::swap (selection.beg.col, selection.end.col);
3454#endif 3474#endif
3455} 3475}
3456 3476
3457#if ENABLE_FRILLS 3477#if !ENABLE_MINIMAL
3458void 3478void
3459rxvt_term::selection_remove_trailing_spaces () NOTHROW 3479rxvt_term::selection_remove_trailing_spaces () NOTHROW
3460{ 3480{
3461 int32_t end_col, end_row; 3481 int32_t end_col, end_row;
3462 text_t *stp; 3482 text_t *stp;
… …
3540 *target++ = xa[XA_COMPOUND_TEXT]; 3560 *target++ = xa[XA_COMPOUND_TEXT];
3541#if X_HAVE_UTF8_STRING 3561#if X_HAVE_UTF8_STRING
3542 *target++ = xa[XA_UTF8_STRING]; 3562 *target++ = xa[XA_UTF8_STRING];
3543#endif 3563#endif
3544 3564
3545 XChangeProperty (xdisp, rq.requestor, rq.property, XA_ATOM, 3565 XChangeProperty (dpy, rq.requestor, rq.property, XA_ATOM,
3546 32, PropModeReplace, 3566 32, PropModeReplace,
3547 (unsigned char *)target_list, target - target_list); 3567 (unsigned char *)target_list, target - target_list);
3548 ev.property = rq.property; 3568 ev.property = rq.property;
3549 } 3569 }
3550#if TODO // TODO 3570#if TODO // TODO
… …
3553 /* TODO: Handle MULTIPLE */ 3573 /* TODO: Handle MULTIPLE */
3554 } 3574 }
3555#endif 3575#endif
3556 else if (rq.target == xa[XA_TIMESTAMP] && selection.text) 3576 else if (rq.target == xa[XA_TIMESTAMP] && selection.text)
3557 { 3577 {
3558 XChangeProperty (xdisp, rq.requestor, rq.property, rq.target, 3578 XChangeProperty (dpy, rq.requestor, rq.property, rq.target,
3559 32, PropModeReplace, (unsigned char *)&selection_time, 1); 3579 32, PropModeReplace, (unsigned char *)&selection_time, 1);
3560 ev.property = rq.property; 3580 ev.property = rq.property;
3561 } 3581 }
3562 else if (rq.target == XA_STRING 3582 else if (rq.target == XA_STRING
3563 || rq.target == xa[XA_TEXT] 3583 || rq.target == xa[XA_TEXT]
… …
3587 style = enc_string; 3607 style = enc_string;
3588 else if (target == xa[XA_TEXT]) 3608 else if (target == xa[XA_TEXT])
3589 style = enc_text; 3609 style = enc_text;
3590 else if (target == xa[XA_COMPOUND_TEXT]) 3610 else if (target == xa[XA_COMPOUND_TEXT])
3591 style = enc_compound_text; 3611 style = enc_compound_text;
3592#if ENABLE_FRILLS 3612#if !ENABLE_MINIMAL
3593 else if (target == xa[XA_UTF8_STRING]) 3613 else if (target == xa[XA_UTF8_STRING])
3594 style = enc_utf8; 3614 style = enc_utf8;
3595#endif 3615#endif
3596 else 3616 else
3597 { 3617 {
… …
3608 { 3628 {
3609 cl = L""; 3629 cl = L"";
3610 selectlen = 0; 3630 selectlen = 0;
3611 } 3631 }
3612 3632
3613#if ENABLE_FRILLS 3633#if !ENABLE_MINIMAL
3614 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it 3634 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it
3615 // so recode it manually 3635 // so recode it manually
3616 if (style == enc_utf8) 3636 if (style == enc_utf8)
3617 { 3637 {
3618 freect = 1; 3638 freect = 1;
… …
3621 ct.value = (unsigned char *)rxvt_wcstoutf8 (cl, selectlen); 3641 ct.value = (unsigned char *)rxvt_wcstoutf8 (cl, selectlen);
3622 ct.nitems = strlen ((char *)ct.value); 3642 ct.nitems = strlen ((char *)ct.value);
3623 } 3643 }
3624 else 3644 else
3625#endif 3645#endif
3626 if (XwcTextListToTextProperty (xdisp, &cl, 1, (XICCEncodingStyle) style, &ct) >= 0) 3646 if (XwcTextListToTextProperty (dpy, &cl, 1, (XICCEncodingStyle) style, &ct) >= 0)
3627 freect = 1; 3647 freect = 1;
3628 else 3648 else
3629 { 3649 {
3630 /* if we failed to convert then send it raw */ 3650 /* if we failed to convert then send it raw */
3631 ct.value = (unsigned char *)cl; 3651 ct.value = (unsigned char *)cl;
3632 ct.nitems = selectlen; 3652 ct.nitems = selectlen;
3633 ct.encoding = target; 3653 ct.encoding = target;
3634 } 3654 }
3635 3655
3636 XChangeProperty (xdisp, rq.requestor, rq.property, 3656 XChangeProperty (dpy, rq.requestor, rq.property,
3637 ct.encoding, 8, PropModeReplace, 3657 ct.encoding, 8, PropModeReplace,
3638 ct.value, (int)ct.nitems); 3658 ct.value, (int)ct.nitems);
3639 ev.property = rq.property; 3659 ev.property = rq.property;
3640 3660
3641 if (freect) 3661 if (freect)
3642 XFree (ct.value); 3662 XFree (ct.value);
3643 } 3663 }
3644 3664
3645 XSendEvent (xdisp, rq.requestor, False, 0L, (XEvent *)&ev); 3665 XSendEvent (dpy, rq.requestor, False, 0L, (XEvent *)&ev);
3646}
3647
3648/* ------------------------------------------------------------------------- *
3649 * MOUSE ROUTINES *
3650 * ------------------------------------------------------------------------- */
3651
3652/*
3653 * return col/row values corresponding to x/y pixel values
3654 */
3655void
3656rxvt_term::pixel_position (int *x, int *y) NOTHROW
3657{
3658 *x = Pixel2Col (*x);
3659 /* max_it (*x, 0); min_it (*x, (int)ncol - 1); */
3660 *y = Pixel2Row (*y);
3661 /* max_it (*y, 0); min_it (*y, (int)nrow - 1); */
3662} 3666}
3663 3667
3664/* ------------------------------------------------------------------------- */ 3668/* ------------------------------------------------------------------------- */
3665#ifdef USE_XIM 3669#ifdef USE_XIM
3666void 3670void
3667rxvt_term::im_set_position (XPoint &pos) NOTHROW 3671rxvt_term::im_set_position (XPoint &pos) NOTHROW
3668{ 3672{
3669 XWindowAttributes xwa; 3673 XWindowAttributes xwa;
3670 3674
3671 XGetWindowAttributes (xdisp, vt, &xwa); 3675 XGetWindowAttributes (dpy, vt, &xwa);
3672 3676
3673 pos.x = xwa.x + Col2Pixel (screen.cur.col); 3677 pos.x = xwa.x + Col2Pixel (screen.cur.col);
3674 pos.y = xwa.y + Height2Pixel (screen.cur.row) + fbase; 3678 pos.y = xwa.y + Height2Pixel (screen.cur.row) + fbase;
3675} 3679}
3676#endif 3680#endif

Diff Legend

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