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.257 by root, Tue Jan 31 00:25:16 2006 UTC vs.
Revision 1.292 by root, Sun Dec 23 02:43:55 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 (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 */
… …
1062 x = i; 1060 x = i;
1063 1061
1064 if (!--count) 1062 if (!--count)
1065 break; 1063 break;
1066 } 1064 }
1067 else 1065 else
1068 ht &= l.t[i] == ' ' 1066 ht &= l.t[i] == ' '
1069 && RS_SAME (l.r[i], base_rend); 1067 && RS_SAME (l.r[i], base_rend);
1070 1068
1071 if (count) 1069 if (count)
1072 x = ncol - 1; 1070 x = ncol - 1;
1073 1071
1074 // store horizontal tab commands as characters inside the text 1072 // store horizontal tab commands as characters inside the text
1075 // buffer so they can be selected and pasted. 1073 // buffer so they can be selected and pasted.
1076 if (ht && OPTION (Opt_pastableTabs)) 1074 if (ht && option (Opt_pastableTabs))
1077 { 1075 {
1078 base_rend = SET_FONT (base_rend, 0); 1076 base_rend = SET_FONT (base_rend, 0);
1079 1077
1080 l.touch (x); 1078 l.touch (x);
1081 1079
… …
1188 } 1186 }
1189 } 1187 }
1190 else 1188 else
1191 { 1189 {
1192 if (screen.flags & Screen_Relative) 1190 if (screen.flags & Screen_Relative)
1191 {
1193 { /* relative origin mode */ 1192 /* relative origin mode */
1194 screen.cur.row = row + screen.tscroll; 1193 screen.cur.row = row + screen.tscroll;
1195 min_it (screen.cur.row, screen.bscroll); 1194 min_it (screen.cur.row, screen.bscroll);
1196 } 1195 }
1197 else 1196 else
1198 screen.cur.row = row; 1197 screen.cur.row = row;
… …
1342 } 1341 }
1343 else 1342 else
1344 { 1343 {
1345 ren = rstyle & (RS_fgMask | RS_bgMask); 1344 ren = rstyle & (RS_fgMask | RS_bgMask);
1346 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)]; 1345 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)];
1347 XChangeGC (xdisp, gc, GCForeground, &gcvalue); 1346 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1348 ERASE_ROWS (row, num); 1347 ERASE_ROWS (row, num);
1349 gcvalue.foreground = pix_colors[Color_fg]; 1348 gcvalue.foreground = pix_colors[Color_fg];
1350 XChangeGC (xdisp, gc, GCForeground, &gcvalue); 1349 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1351 } 1350 }
1352 1351
1353 for (; num--; row++) 1352 for (; num--; row++)
1354 { 1353 {
1355 scr_blank_screen_mem (ROW(row), rstyle); 1354 scr_blank_screen_mem (ROW(row), rstyle);
… …
1474 { 1473 {
1475 if (selection.end.row != screen.cur.row 1474 if (selection.end.row != screen.cur.row
1476 || (selection.end.col + count >= ncol)) 1475 || (selection.end.col + count >= ncol))
1477 CLEAR_SELECTION (); 1476 CLEAR_SELECTION ();
1478 else 1477 else
1478 {
1479 { /* shift selection */ 1479 /* shift selection */
1480 selection.beg.col += count; 1480 selection.beg.col += count;
1481 selection.mark.col += count; /* XXX: yes? */ 1481 selection.mark.col += count; /* XXX: yes? */
1482 selection.end.col += count; 1482 selection.end.col += count;
1483 } 1483 }
1484 } 1484 }
… …
1623 */ 1623 */
1624void 1624void
1625rxvt_term::scr_set_tab (int mode) NOTHROW 1625rxvt_term::scr_set_tab (int mode) NOTHROW
1626{ 1626{
1627 if (mode < 0) 1627 if (mode < 0)
1628 memset (tabs, 0, ncol * sizeof (char)); 1628 memset (tabs, 0, ncol);
1629 else if (screen.cur.col < ncol) 1629 else if (screen.cur.col < ncol)
1630 tabs [screen.cur.col] = !!mode; 1630 tabs [screen.cur.col] = !!mode;
1631} 1631}
1632 1632
1633/* ------------------------------------------------------------------------- */ 1633/* ------------------------------------------------------------------------- */
… …
1648 if (rvideo_state != on) 1648 if (rvideo_state != on)
1649 { 1649 {
1650 rvideo_state = on; 1650 rvideo_state = on;
1651 1651
1652 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]); 1652 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]);
1653#if XPM_BACKGROUND 1653#ifdef HAVE_BG_PIXMAP
1654 if (bgPixmap.pixmap == None) 1654 if (bgPixmap.pixmap == None)
1655#endif 1655#endif
1656#if TRANSPARENT
1657 if (!OPTION (Opt_transparent) || am_transparent == 0)
1658#endif
1659 XSetWindowBackground (xdisp, vt, pix_colors[Color_bg]); 1656 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
1660 1657
1661 XGCValues gcvalue; 1658 XGCValues gcvalue;
1662 gcvalue.foreground = pix_colors[Color_fg]; 1659 gcvalue.foreground = pix_colors[Color_fg];
1663 gcvalue.background = pix_colors[Color_bg]; 1660 gcvalue.background = pix_colors[Color_bg];
1664 XChangeGC (xdisp, gc, GCBackground | GCForeground, &gcvalue); 1661 XChangeGC (dpy, gc, GCBackground | GCForeground, &gcvalue);
1665 1662
1666 scr_clear (); 1663 scr_clear ();
1667 scr_touch (true); 1664 scr_touch (true);
1668 } 1665 }
1669} 1666}
… …
1806 for (i = PART_BEG; i < RC_COUNT; i++) 1803 for (i = PART_BEG; i < RC_COUNT; i++)
1807 { 1804 {
1808 min_it (rc[i].col, ncol - 1); 1805 min_it (rc[i].col, ncol - 1);
1809 min_it (rc[i].row, nrow - 1); 1806 min_it (rc[i].row, nrow - 1);
1810 } 1807 }
1811 1808// 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++) 1809 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); 1810 fill_text (&drawn_buf[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1);
1814 1811
1815 num_scr_allow = 0; 1812 num_scr_allow = 0;
1816 1813
… …
1871 return true; 1868 return true;
1872} 1869}
1873 1870
1874#ifndef NO_BELL 1871#ifndef NO_BELL
1875void 1872void
1876rxvt_term::bell_cb (time_watcher &w) 1873rxvt_term::bell_cb (ev::timer &w, int revents)
1877{ 1874{
1878 rvideo_bell = false; 1875 rvideo_bell = false;
1879 scr_rvideo_mode (rvideo_mode); 1876 scr_rvideo_mode (rvideo_mode);
1877 refresh_check ();
1880} 1878}
1881#endif 1879#endif
1882 1880
1883/* ------------------------------------------------------------------------- */ 1881/* ------------------------------------------------------------------------- */
1884void 1882void
… …
1886{ 1884{
1887#ifndef NO_BELL 1885#ifndef NO_BELL
1888 1886
1889# ifndef NO_MAPALERT 1887# ifndef NO_MAPALERT
1890# ifdef MAPALERT_OPTION 1888# ifdef MAPALERT_OPTION
1891 if (OPTION (Opt_mapAlert)) 1889 if (option (Opt_mapAlert))
1892# endif 1890# endif
1893 XMapWindow (xdisp, parent[0]); 1891 XMapWindow (dpy, parent[0]);
1894# endif 1892# endif
1895 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
1896 if (OPTION (Opt_visualBell)) 1905 if (option (Opt_visualBell))
1897 { 1906 {
1898 rvideo_bell = true; 1907 rvideo_bell = true;
1899 scr_rvideo_mode (rvideo_mode); 1908 scr_rvideo_mode (rvideo_mode);
1900 display->flush (); 1909 flush ();
1901 1910
1902 bell_ev.start (NOW + VISUAL_BELL_DURATION); 1911 bell_ev.start (VISUAL_BELL_DURATION);
1903 } 1912 }
1904 else 1913 else
1905 XBell (xdisp, 0); 1914 XBell (dpy, 0);
1906
1907#endif 1915#endif
1908} 1916}
1909 1917
1910/* ------------------------------------------------------------------------- */ 1918/* ------------------------------------------------------------------------- */
1911/* ARGSUSED */ 1919/* ARGSUSED */
… …
1969 * screen.text/screen.rend contain what the screen will change to. 1977 * screen.text/screen.rend contain what the screen will change to.
1970 */ 1978 */
1971void 1979void
1972rxvt_term::scr_refresh () NOTHROW 1980rxvt_term::scr_refresh () NOTHROW
1973{ 1981{
1974 unsigned char must_clear, /* use draw_string not draw_image_string */ 1982 unsigned char have_bg,
1975 showcursor; /* show the cursor */ 1983 showcursor; /* show the cursor */
1976 int16_t col, row, /* column/row we're processing */ 1984 int16_t col, row, /* column/row we're processing */
1977 ocrow; /* old cursor row */ 1985 ocrow; /* old cursor row */
1978 int i; /* tmp */ 1986 int i; /* tmp */
1979#ifndef NO_CURSORCOLOR 1987#ifndef NO_CURSORCOLOR
1980 rend_t cc1; /* store colours at cursor position (s) */ 1988 rend_t cc1; /* store colours at cursor position (s) */
1981#endif 1989#endif
1982 rend_t *crp; // cursor rendition pointer 1990 rend_t *crp; // cursor rendition pointer
1991 rend_t ccol1, /* Cursor colour */
1992 ccol2; /* Cursor colour2 */
1983 1993
1984 want_refresh = 0; /* screen is current */ 1994 want_refresh = 0; /* screen is current */
1985 1995
1986 if (refresh_type == NO_REFRESH || !mapped) 1996 if (refresh_type == NO_REFRESH || !mapped)
1987 return; 1997 return;
1988 1998
1989 /* 1999 /*
1990 * A: set up vars 2000 * A: set up vars
1991 */ 2001 */
1992 must_clear = 0; 2002 have_bg = 0;
1993 refresh_count = 0; 2003 refresh_count = 0;
1994 2004
1995#if XPM_BACKGROUND 2005#ifdef HAVE_BG_PIXMAP
1996 must_clear |= bgPixmap.pixmap != None; 2006 have_bg |= bgPixmap.pixmap != None;
1997#endif
1998#if TRANSPARENT
1999 must_clear |= OPTION (Opt_transparent) && am_transparent;
2000#endif 2007#endif
2001 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ 2008 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
2002 2009
2003 /* 2010 /*
2004 * B: reverse any characters which are selected 2011 * B: reverse any characters which are selected
… …
2008 /* 2015 /*
2009 * C: set the cursor character (s) 2016 * C: set the cursor character (s)
2010 */ 2017 */
2011 { 2018 {
2012 unsigned char setoldcursor; 2019 unsigned char setoldcursor;
2013 rend_t ccol1, /* Cursor colour */
2014 ccol2; /* Cursor colour2 */
2015 2020
2016 showcursor = (screen.flags & Screen_VisibleCursor); 2021 showcursor = (screen.flags & Screen_VisibleCursor);
2017#ifdef CURSOR_BLINK 2022#ifdef CURSOR_BLINK
2018 if (hidden_cursor) 2023 if (hidden_cursor)
2019 showcursor = 0; 2024 showcursor = 0;
… …
2026 while (col && ROW(screen.cur.row).t[col] == NOCHAR) 2031 while (col && ROW(screen.cur.row).t[col] == NOCHAR)
2027 col--; 2032 col--;
2028 2033
2029 crp = &ROW(screen.cur.row).r[col]; 2034 crp = &ROW(screen.cur.row).r[col];
2030 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
2031 if (showcursor && focus) 2059 if (showcursor && focus)
2032 { 2060 {
2033 if (OPTION (Opt_cursorUnderline)) 2061 if (option (Opt_cursorUnderline))
2034 *crp ^= RS_Uline; 2062 *crp ^= RS_Uline;
2035 else 2063 else
2036 { 2064 {
2037 *crp ^= RS_RVid; 2065 *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); 2066 *crp = SET_FGCOLOR (*crp, ccol1);
2058 *crp = SET_BGCOLOR (*crp, ccol2); 2067 *crp = SET_BGCOLOR (*crp, ccol2);
2059#endif
2060 } 2068 }
2061 } 2069 }
2062 } 2070 }
2063 2071
2064 /* make sure no outline cursor is left around */ 2072 /* make sure no outline cursor is left around */
… …
2103 * D: CopyArea pass - very useful for slower links 2111 * D: CopyArea pass - very useful for slower links
2104 * This has been deliberately kept simple. 2112 * This has been deliberately kept simple.
2105 */ 2113 */
2106 if (!display->is_local 2114 if (!display->is_local
2107 && refresh_type == FAST_REFRESH && num_scr_allow && num_scr 2115 && refresh_type == FAST_REFRESH && num_scr_allow && num_scr
2108 && abs (num_scr) < nrow && !must_clear) 2116 && abs (num_scr) < nrow && !have_bg)
2109 { 2117 {
2110 int16_t nits; 2118 int16_t nits;
2119 int i = num_scr;
2111 int j; 2120 int j;
2112 int len, wlen; 2121 int len, wlen;
2113 dLocal (int, num_scr); 2122 dLocal (int, num_scr);
2114 2123
2115 j = nrow; 2124 j = nrow;
2116 wlen = len = -1; 2125 wlen = len = -1;
2117 row = i > 0 ? 0 : j - 1; 2126 row = i > 0 ? 0 : j - 1;
2127
2118 for (; j-- >= 0; row += (i > 0 ? 1 : -1)) 2128 for (; j-- >= 0; row += (i > 0 ? 1 : -1))
2119 { 2129 {
2120 if (row + i >= 0 && row + i < nrow && row + i != ocrow) 2130 if (row + i >= 0 && row + i < nrow && row + i != ocrow)
2121 { 2131 {
2122 line_t s = ROW(view_start + row); 2132 line_t s = ROW(view_start + row);
… …
2143 wlen = row; 2153 wlen = row;
2144 continue; 2154 continue;
2145 } 2155 }
2146 } 2156 }
2147 2157
2148 if (len != -1) 2158 if (len >= 0)
2149 { 2159 {
2150 /* also comes here at end if needed because of >= above */ 2160 /* also comes here at end if needed because of >= above */
2151 if (wlen < len) 2161 if (wlen < len)
2152 ::swap (wlen, len); 2162 ::swap (wlen, len);
2153 2163
2164 XGCValues gcv;
2165
2166 gcv.graphics_exposures = 1; XChangeGC (dpy, gc, GCGraphicsExposures, &gcv);
2154 XCopyArea (xdisp, vt, vt, 2167 XCopyArea (dpy, vt, vt,
2155 gc, 0, Row2Pixel (len + i), 2168 gc, 0, Row2Pixel (len + i),
2156 (unsigned int)this->width, 2169 (unsigned int)this->width,
2157 (unsigned int)Height2Pixel (wlen - len + 1), 2170 (unsigned int)Height2Pixel (wlen - len + 1),
2158 0, Row2Pixel (len)); 2171 0, Row2Pixel (len));
2172 gcv.graphics_exposures = 0; XChangeGC (dpy, gc, GCGraphicsExposures, &gcv);
2173
2159 len = -1; 2174 len = -1;
2160 } 2175 }
2161 } 2176 }
2162 } 2177 }
2163#endif 2178#endif
… …
2219 count++; 2234 count++;
2220 2235
2221 if (stp[col] != dtp[col] 2236 if (stp[col] != dtp[col]
2222 || !RS_SAME (srp[col], drp[col])) 2237 || !RS_SAME (srp[col], drp[col]))
2223 { 2238 {
2224 if (must_clear && (i++ > count / 2)) 2239 if (have_bg && (i++ > count / 2))
2225 break; 2240 break;
2226 2241
2227 dtp[col] = stp[col]; 2242 dtp[col] = stp[col];
2228 drp[col] = rend; 2243 drp[col] = rend;
2229 i = 0; 2244 i = 0;
2230 } 2245 }
2231 else if (must_clear || (stp[col] != ' ' && ++i >= 16)) 2246 else if (have_bg || (stp[col] != ' ' && ++i >= 16))
2232 break; 2247 break;
2233 } 2248 }
2234 2249
2235 col--; /* went one too far. move back */ 2250 col--; /* went one too far. move back */
2236 count -= i; /* dump any matching trailing chars */ 2251 count -= i; /* dump any matching trailing chars */
… …
2246 int back = bgcolor_of (rend); // desired background 2261 int back = bgcolor_of (rend); // desired background
2247 2262
2248 // 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
2249 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))
2250 { 2265 {
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; 2266 bool invert = rend & RS_RVid;
2270 2267
2271#ifndef NO_BOLD_UNDERLINE_REVERSE 2268#ifndef NO_BOLD_UNDERLINE_REVERSE
2272 if (rend & RS_Bold
2273 && fore == Color_fg) 2269 if (rend & RS_Bold && fore == Color_fg)
2274 { 2270 {
2275 if (ISSET_PIXCOLOR (Color_BD)) 2271 if (ISSET_PIXCOLOR (Color_BD))
2276 fore = Color_BD; 2272 fore = Color_BD;
2277# if !ENABLE_STYLES 2273# if !ENABLE_STYLES
2278 else 2274 else
2279 invert = !invert; 2275 invert = !invert;
2280# endif 2276# endif
2281 } 2277 }
2282 2278
2283 if (rend & RS_Italic 2279 if (rend & RS_Italic && fore == Color_fg)
2284 && fore == Color_fg)
2285 { 2280 {
2286 if (ISSET_PIXCOLOR (Color_IT)) 2281 if (ISSET_PIXCOLOR (Color_IT))
2287 fore = Color_IT; 2282 fore = Color_IT;
2288# if !ENABLE_STYLES 2283# if !ENABLE_STYLES
2289 else 2284 else
2290 invert = !invert; 2285 invert = !invert;
2291# endif 2286# endif
2292 } 2287 }
2293 2288
2294 if (rend & RS_Uline && ISSET_PIXCOLOR (Color_UL)) 2289 if (rend & RS_Uline && fore == Color_fg && ISSET_PIXCOLOR (Color_UL))
2295 fore = Color_UL; 2290 fore = Color_UL;
2296#endif 2291#endif
2297 2292
2298 if (invert) 2293 if (invert)
2299 { 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 */
2300 ::swap (fore, back); 2301 ::swap (fore, back);
2302#ifdef OPTION_HC
2303 else if (ISSET_PIXCOLOR (Color_HC))
2304 back = Color_HC;
2305#endif
2301 2306
2302#ifndef NO_BOLD_UNDERLINE_REVERSE 2307#ifndef NO_BOLD_UNDERLINE_REVERSE
2308# ifndef OPTION_HC
2303 if (ISSET_PIXCOLOR (Color_RV)) 2309 if (ISSET_PIXCOLOR (Color_RV))
2304 back = Color_RV; 2310 back = Color_RV;
2305 2311# endif
2306 if (fore == back) 2312 if (fore == back)
2307 { 2313 {
2308 fore = Color_bg; 2314 fore = Color_bg;
2309 back = Color_fg; 2315 back = Color_fg;
2310 } 2316 }
… …
2312 } 2318 }
2313 2319
2314#ifdef TEXT_BLINK 2320#ifdef TEXT_BLINK
2315 if (rend & RS_Blink && (back == Color_bg || fore == Color_bg)) 2321 if (rend & RS_Blink && (back == Color_bg || fore == Color_bg))
2316 { 2322 {
2317 if (!text_blink_ev.active) 2323 if (!text_blink_ev.is_active ())
2318 { 2324 {
2319 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); 2325 text_blink_ev.again ();
2320 hidden_text = 0; 2326 hidden_text = 0;
2321 } 2327 }
2322 else if (hidden_text) 2328 else if (hidden_text)
2323 fore = back; 2329 fore = back;
2324 } 2330 }
2325#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
2326 } 2350 }
2327 2351
2328 /* 2352 /*
2329 * Actually do the drawing of the string here 2353 * Actually do the drawing of the string here
2330 */ 2354 */
2331 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)]; 2355 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)];
2332 2356
2333 if (back == fore)
2334 font->clear_rect (*drawable, xpixel, ypixel, fwidth * count, fheight, back);
2335 else if (back == Color_bg) 2357 if (have_bg && back == Color_bg)
2336 { 2358 {
2337 if (must_clear) 2359 // this is very ugly, maybe push it into ->draw?
2338 {
2339 CLEAR_CHARS (xpixel, ypixel, count);
2340 2360
2341 for (i = 0; i < count; i++) /* don't draw empty strings */ 2361 for (i = 0; i < count; i++) /* don't draw empty strings */
2342 if (text[i] != ' ') 2362 if (text[i] != ' ')
2343 { 2363 {
2344 font->draw (*drawable, xpixel, ypixel, text, count, fore, -1); 2364 font->draw (*drawable, xpixel, ypixel, text, count, fore, Color_transparent);
2345 break; 2365 goto did_clear;
2346 }
2347 } 2366 }
2348 else 2367
2349 font->draw (*drawable, xpixel, ypixel, text, count, fore, Color_bg); 2368 CLEAR_CHARS (xpixel, ypixel, count);
2369 did_clear: ;
2350 } 2370 }
2351 else 2371 else
2352 font->draw (*drawable, xpixel, ypixel, text, count, fore, back); 2372 font->draw (*drawable, xpixel, ypixel, text, count, fore, back);
2353 2373
2354 if (rend & RS_Uline && font->descent > 1 && fore != back) 2374 if (rend & RS_Uline && font->descent > 1 && fore != back)
2355 { 2375 {
2356#if ENABLE_FRILLS 2376#if ENABLE_FRILLS
2357 if (ISSET_PIXCOLOR (Color_underline)) 2377 if (ISSET_PIXCOLOR (Color_underline))
2358 XSetForeground (xdisp, gc, pix_colors[Color_underline]); 2378 XSetForeground (dpy, gc, pix_colors[Color_underline]);
2359 else 2379 else
2360#endif 2380#endif
2361 XSetForeground (xdisp, gc, pix_colors[fore]); 2381 XSetForeground (dpy, gc, pix_colors[fore]);
2362 2382
2363 XDrawLine (xdisp, drawBuffer, gc, 2383 XDrawLine (dpy, drawBuffer, gc,
2364 xpixel, ypixel + font->ascent + 1, 2384 xpixel, ypixel + font->ascent + 1,
2365 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1); 2385 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1);
2366 } 2386 }
2367 } /* for (col....) */ 2387 } /* for (col....) */
2368 } /* for (row....) */ 2388 } /* for (row....) */
… …
2377 */ 2397 */
2378 if (showcursor) 2398 if (showcursor)
2379 { 2399 {
2380 if (focus) 2400 if (focus)
2381 { 2401 {
2382 if (OPTION (Opt_cursorUnderline)) 2402 if (option (Opt_cursorUnderline))
2383 *crp ^= RS_Uline; 2403 *crp ^= RS_Uline;
2384 else 2404 else
2385 { 2405 {
2386 *crp ^= RS_RVid; 2406 *crp ^= RS_RVid;
2387#ifndef NO_CURSORCOLOR 2407#ifndef NO_CURSORCOLOR
… …
2401 && drawn_buf[oldcursor.row].t[col + cursorwidth] == NOCHAR) 2421 && drawn_buf[oldcursor.row].t[col + cursorwidth] == NOCHAR)
2402 cursorwidth++; 2422 cursorwidth++;
2403 2423
2404#ifndef NO_CURSORCOLOR 2424#ifndef NO_CURSORCOLOR
2405 if (ISSET_PIXCOLOR (Color_cursor)) 2425 if (ISSET_PIXCOLOR (Color_cursor))
2406 XSetForeground (xdisp, gc, pix_colors[Color_cursor]); 2426 XSetForeground (dpy, gc, pix_colors[Color_cursor]);
2427 else
2407#endif 2428#endif
2429 XSetForeground (dpy, gc, pix_colors[ccol1]);
2408 2430
2409 XDrawRectangle (xdisp, drawBuffer, gc, 2431 XDrawRectangle (dpy, drawBuffer, gc,
2410 Col2Pixel (col), 2432 Col2Pixel (col),
2411 Row2Pixel (oldcursor.row), 2433 Row2Pixel (oldcursor.row),
2412 (unsigned int) (Width2Pixel (cursorwidth) - 1), 2434 (unsigned int) (Width2Pixel (cursorwidth) - 1),
2413 (unsigned int) (Height2Pixel (1) - lineSpace - 1)); 2435 (unsigned int) (Height2Pixel (1) - lineSpace - 1));
2414 } 2436 }
… …
2449} 2471}
2450 2472
2451void 2473void
2452rxvt_term::scr_recolour () NOTHROW 2474rxvt_term::scr_recolour () NOTHROW
2453{ 2475{
2454 if (1 2476#ifdef HAVE_BG_PIXMAP
2455#if TRANSPARENT 2477 bgPixmap.apply ();
2456 && !am_transparent 2478#else
2457#endif 2479
2458#if XPM_BACKGROUND
2459 && !bgPixmap.pixmap
2460#endif
2461 )
2462 {
2463 XSetWindowBackground (xdisp, parent[0], pix_colors[Color_border]); 2480 XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]);
2464 XClearWindow (xdisp, parent[0]); 2481 XClearWindow (dpy, parent[0]);
2465 XSetWindowBackground (xdisp, vt, pix_colors[Color_bg]); 2482 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
2483
2466#if HAVE_SCROLLBARS 2484# if HAVE_SCROLLBARS
2467 if (scrollBar.win) 2485 if (scrollBar.win)
2468 { 2486 {
2469 XSetWindowBackground (xdisp, scrollBar.win, pix_colors[Color_border]); 2487 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]);
2470 scrollBar.setIdle (); 2488 scrollBar.setIdle ();
2471 scrollbar_show (0); 2489 scrollbar_show (0);
2472 } 2490 }
2473#endif 2491# endif
2474 }
2475 2492
2476 scr_clear (); 2493 scr_clear ();
2477 scr_touch (true); 2494 scr_touch (true);
2478 want_refresh = 1; 2495 want_refresh = 1;
2496
2497#endif
2479} 2498}
2480 2499
2481/* ------------------------------------------------------------------------- */ 2500/* ------------------------------------------------------------------------- */
2482void 2501void
2483rxvt_term::scr_clear (bool really) NOTHROW 2502rxvt_term::scr_clear (bool really) NOTHROW
… …
2487 2506
2488 num_scr_allow = 0; 2507 num_scr_allow = 0;
2489 want_refresh = 1; 2508 want_refresh = 1;
2490 2509
2491 if (really) 2510 if (really)
2492 XClearWindow (xdisp, vt); 2511 XClearWindow (dpy, vt);
2493} 2512}
2494 2513
2495void 2514void
2496rxvt_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
2497{ 2516{
… …
2672 } 2691 }
2673 2692
2674 unsigned long bytes_after; 2693 unsigned long bytes_after;
2675 XTextProperty ct; 2694 XTextProperty ct;
2676 2695
2677 if (XGetWindowProperty (xdisp, win, prop, 2696 if (XGetWindowProperty (dpy, win, prop,
2678 0, PROP_SIZE / 4, 2697 0, PROP_SIZE / 4,
2679 delete_prop, AnyPropertyType, 2698 delete_prop, AnyPropertyType,
2680 &ct.encoding, &ct.format, 2699 &ct.encoding, &ct.format,
2681 &ct.nitems, &bytes_after, 2700 &ct.nitems, &bytes_after,
2682 &ct.value) != Success) 2701 &ct.value) != Success)
… …
2691 if (bytes_after) 2710 if (bytes_after)
2692 { 2711 {
2693 // fetch and append remaining data 2712 // fetch and append remaining data
2694 XTextProperty ct2; 2713 XTextProperty ct2;
2695 2714
2696 if (XGetWindowProperty (xdisp, win, prop, 2715 if (XGetWindowProperty (dpy, win, prop,
2697 ct.nitems / 4, (bytes_after + 3) / 4, 2716 ct.nitems / 4, (bytes_after + 3) / 4,
2698 delete_prop, AnyPropertyType, 2717 delete_prop, AnyPropertyType,
2699 &ct2.encoding, &ct2.format, 2718 &ct2.encoding, &ct2.format,
2700 &ct2.nitems, &bytes_after, 2719 &ct2.nitems, &bytes_after,
2701 &ct2.value) != Success) 2720 &ct2.value) != Success)
… …
2714 2733
2715 if (ct.encoding == xa[XA_INCR]) 2734 if (ct.encoding == xa[XA_INCR])
2716 { 2735 {
2717 // INCR selection, start handshake 2736 // INCR selection, start handshake
2718 if (!delete_prop) 2737 if (!delete_prop)
2719 XDeleteProperty (xdisp, win, prop); 2738 XDeleteProperty (dpy, win, prop);
2720 2739
2721 selection_wait = Sel_incr; 2740 selection_wait = Sel_incr;
2722 incr_buf_fill = 0; 2741 incr_buf_fill = 0;
2723 incr_ev.start (NOW + 10); 2742 incr_ev.start (10);
2724 2743
2725 goto bailout; 2744 goto bailout;
2726 } 2745 }
2727 2746
2728 if (ct.nitems == 0) 2747 if (ct.nitems == 0)
… …
2737 ct.nitems = incr_buf_fill; 2756 ct.nitems = incr_buf_fill;
2738 incr_buf = 0; 2757 incr_buf = 0;
2739 incr_buf_size = 0; 2758 incr_buf_size = 0;
2740 incr_ev.stop (); 2759 incr_ev.stop ();
2741 } 2760 }
2742 else 2761 else
2743 { 2762 {
2744 if (selection_wait == Sel_normal 2763 if (selection_wait == Sel_normal
2745 && (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion 2764 && (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion
2746 { 2765 {
2747 /* 2766 /*
… …
2754 goto bailout; 2773 goto bailout;
2755 } 2774 }
2756 } 2775 }
2757 else if (selection_wait == Sel_incr) 2776 else if (selection_wait == Sel_incr)
2758 { 2777 {
2759 incr_ev.start (NOW + 10); 2778 incr_ev.start (10);
2760 2779
2761 while (incr_buf_fill + ct.nitems > incr_buf_size) 2780 while (incr_buf_fill + ct.nitems > incr_buf_size)
2762 { 2781 {
2763 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;
2764 incr_buf = (char *)realloc (incr_buf, incr_buf_size); 2783 incr_buf = (char *)realloc (incr_buf, incr_buf_size);
… …
2785 paste (s, strlen (s)); 2804 paste (s, strlen (s));
2786 free (s); 2805 free (s);
2787 } 2806 }
2788 else 2807 else
2789#endif 2808#endif
2790 if (XmbTextPropertyToTextList (xdisp, &ct, &cl, &cr) >= 0 2809 if (XmbTextPropertyToTextList (dpy, &ct, &cl, &cr) >= 0
2791 && cl) 2810 && cl)
2792 { 2811 {
2793 for (int i = 0; i < cr; i++) 2812 for (int i = 0; i < cr; i++)
2794 paste (cl[i], strlen (cl[i])); 2813 paste (cl[i], strlen (cl[i]));
2795 2814
… …
2804 if (selection_wait == Sel_normal) 2823 if (selection_wait == Sel_normal)
2805 selection_wait = Sel_none; 2824 selection_wait = Sel_none;
2806} 2825}
2807 2826
2808void 2827void
2809rxvt_term::incr_cb (time_watcher &w) NOTHROW 2828rxvt_term::incr_cb (ev::timer &w, int revents) NOTHROW
2810{ 2829{
2811 selection_wait = Sel_none; 2830 selection_wait = Sel_none;
2812 2831
2813 incr_buf_size = 0; 2832 incr_buf_size = 0;
2814 free (incr_buf); 2833 free (incr_buf);
… …
2825 selection_paste (win, prop, true); 2844 selection_paste (win, prop, true);
2826} 2845}
2827 2846
2828/* ------------------------------------------------------------------------- */ 2847/* ------------------------------------------------------------------------- */
2829/* 2848/*
2830 * Request the current selection: 2849 * Request the current selection:
2831 * Order: > internal selection if available 2850 * Order: > internal selection if available
2832 * > PRIMARY, SECONDARY, CLIPBOARD if ownership is claimed (+) 2851 * > PRIMARY, SECONDARY, CLIPBOARD if ownership is claimed (+)
2833 * > CUT_BUFFER0 2852 * > CUT_BUFFER0
2834 * (+) if ownership is claimed but property is empty, rxvt_selection_paste () 2853 * (+) if ownership is claimed but property is empty, rxvt_selection_paste ()
2835 * will auto fallback to CUT_BUFFER0 2854 * will auto fallback to CUT_BUFFER0
… …
2837 */ 2856 */
2838void 2857void
2839rxvt_term::selection_request (Time tm, int selnum) NOTHROW 2858rxvt_term::selection_request (Time tm, int selnum) NOTHROW
2840{ 2859{
2841 if (selection.text && selnum == Sel_Primary) 2860 if (selection.text && selnum == Sel_Primary)
2861 {
2842 { /* internal selection */ 2862 /* internal selection */
2843 char *str = rxvt_wcstombs (selection.text, selection.len); 2863 char *str = rxvt_wcstombs (selection.text, selection.len);
2844 paste (str, strlen (str)); 2864 paste (str, strlen (str));
2845 free (str); 2865 free (str);
2846 return; 2866 return;
2847 } 2867 }
… …
2877 else if (selnum == Sel_Secondary) 2897 else if (selnum == Sel_Secondary)
2878 sel = XA_SECONDARY; 2898 sel = XA_SECONDARY;
2879 else 2899 else
2880 sel = xa[XA_CLIPBOARD]; 2900 sel = xa[XA_CLIPBOARD];
2881 2901
2882 if (XGetSelectionOwner (xdisp, sel) != None) 2902 if (XGetSelectionOwner (dpy, sel) != None)
2883 { 2903 {
2884 XConvertSelection (xdisp, sel, target, xa[XA_VT_SELECTION], 2904 XConvertSelection (dpy, sel, target, xa[XA_VT_SELECTION],
2885 vt, selection_request_time); 2905 vt, selection_request_time);
2886 return 1; 2906 return 1;
2887 } 2907 }
2888 2908
2889 return 0; 2909 return 0;
… …
2903 selection.len = 0; 2923 selection.len = 0;
2904 CLEAR_SELECTION (); 2924 CLEAR_SELECTION ();
2905 2925
2906 if (display->selection_owner == this) 2926 if (display->selection_owner == this)
2907 display->selection_owner = 0; 2927 display->selection_owner = 0;
2928
2929 flush ();
2908} 2930}
2909 2931
2910/* ------------------------------------------------------------------------- */ 2932/* ------------------------------------------------------------------------- */
2911/* 2933/*
2912 * Copy a selection into the cut buffer 2934 * Copy a selection into the cut buffer
… …
3042bool 3064bool
3043rxvt_term::selection_grab (Time tm) NOTHROW 3065rxvt_term::selection_grab (Time tm) NOTHROW
3044{ 3066{
3045 selection_time = tm; 3067 selection_time = tm;
3046 3068
3047 XSetSelectionOwner (xdisp, XA_PRIMARY, vt, tm); 3069 XSetSelectionOwner (dpy, XA_PRIMARY, vt, tm);
3048 if (XGetSelectionOwner (xdisp, XA_PRIMARY) == vt) 3070 if (XGetSelectionOwner (dpy, XA_PRIMARY) == vt)
3049 { 3071 {
3050 display->set_selection_owner (this); 3072 display->set_selection_owner (this);
3051 return true; 3073 return true;
3052 } 3074 }
3053 else 3075 else
… …
3057 } 3079 }
3058 3080
3059#if 0 3081#if 0
3060 XTextProperty ct; 3082 XTextProperty ct;
3061 3083
3062 if (XwcTextListToTextProperty (xdisp, &selection.text, 1, XStringStyle, &ct) >= 0) 3084 if (XwcTextListToTextProperty (dpy, &selection.text, 1, XStringStyle, &ct) >= 0)
3063 { 3085 {
3064 set_string_property (XA_CUT_BUFFER0, ct.value, ct.nitems); 3086 set_string_property (XA_CUT_BUFFER0, ct.value, ct.nitems);
3065 XFree (ct.value); 3087 XFree (ct.value);
3066 } 3088 }
3067#endif 3089#endif
… …
3113 selection.mark.col = clamp (selection.mark.col, 0, ncol - 1); 3135 selection.mark.col = clamp (selection.mark.col, 0, ncol - 1);
3114 3136
3115 while (selection.mark.col > 0 3137 while (selection.mark.col > 0
3116 && ROW(selection.mark.row).t[selection.mark.col] == NOCHAR) 3138 && ROW(selection.mark.row).t[selection.mark.col] == NOCHAR)
3117 --selection.mark.col; 3139 --selection.mark.col;
3118 3140
3119 if (selection.op) 3141 if (selection.op)
3142 {
3120 { /* clear the old selection */ 3143 /* clear the old selection */
3121 selection.beg.row = selection.end.row = selection.mark.row; 3144 selection.beg.row = selection.end.row = selection.mark.row;
3122 selection.beg.col = selection.end.col = selection.mark.col; 3145 selection.beg.col = selection.end.col = selection.mark.col;
3123 } 3146 }
3124 3147
3125 selection.op = SELECTION_INIT; 3148 selection.op = SELECTION_INIT;
… …
3314 * a point/word/line which is either the start or end of the selection 3337 * a point/word/line which is either the start or end of the selection
3315 * and it was decided by whichever point/word/line was `fixed' at the 3338 * and it was decided by whichever point/word/line was `fixed' at the
3316 * time of the most recent button3 press 3339 * time of the most recent button3 press
3317 */ 3340 */
3318 if (button3 && buttonpress) 3341 if (button3 && buttonpress)
3342 {
3319 { /* button3 press */ 3343 /* button3 press */
3320 /* 3344 /*
3321 * first determine which edge of the selection we are closest to 3345 * first determine which edge of the selection we are closest to
3322 */ 3346 */
3323 if (ROWCOL_IS_BEFORE (pos, selection.beg) 3347 if (ROWCOL_IS_BEFORE (pos, selection.beg)
3324 || (!ROWCOL_IS_AFTER (pos, selection.end) 3348 || (!ROWCOL_IS_AFTER (pos, selection.end)
… …
3342 selection.mark.row = selection.beg.row; 3366 selection.mark.row = selection.beg.row;
3343 selection.mark.col = selection.beg.col; 3367 selection.mark.col = selection.beg.col;
3344 } 3368 }
3345 } 3369 }
3346 else 3370 else
3371 {
3347 { /* button1 drag or button3 drag */ 3372 /* button1 drag or button3 drag */
3348 if (ROWCOL_IS_AFTER (selection.mark, pos)) 3373 if (ROWCOL_IS_AFTER (selection.mark, pos))
3349 { 3374 {
3350 if (selection.mark.row == selection.end.row 3375 if (selection.mark.row == selection.end.row
3351 && selection.mark.col == selection.end.col 3376 && selection.mark.col == selection.end.col
3352 && clickchange 3377 && clickchange
… …
3395 selection_delimit_word (DN, &selection.end, &selection.end); 3420 selection_delimit_word (DN, &selection.end, &selection.end);
3396 } 3421 }
3397 else if (selection.clicks == 3) 3422 else if (selection.clicks == 3)
3398 { 3423 {
3399#if ENABLE_FRILLS 3424#if ENABLE_FRILLS
3400 if (OPTION (Opt_tripleclickwords)) 3425 if (option (Opt_tripleclickwords))
3401 { 3426 {
3402 selection_delimit_word (UP, &selection.beg, &selection.beg); 3427 selection_delimit_word (UP, &selection.beg, &selection.beg);
3403 3428
3404 for (int end_row = selection.mark.row; end_row < nrow; end_row++) 3429 for (int end_row = selection.mark.row; end_row < nrow; end_row++)
3405 { 3430 {
… …
3433 selection.end.row++; 3458 selection.end.row++;
3434 } 3459 }
3435 } 3460 }
3436 3461
3437 if (button3 && buttonpress) 3462 if (button3 && buttonpress)
3463 {
3438 { /* mark may need to be changed */ 3464 /* mark may need to be changed */
3439 if (closeto == LEFT) 3465 if (closeto == LEFT)
3440 { 3466 {
3441 selection.mark.row = selection.end.row; 3467 selection.mark.row = selection.end.row;
3442 selection.mark.col = selection.end.col - (selection.clicks == 2); 3468 selection.mark.col = selection.end.col - (selection.clicks == 2);
3443 } 3469 }
… …
3540 *target++ = xa[XA_COMPOUND_TEXT]; 3566 *target++ = xa[XA_COMPOUND_TEXT];
3541#if X_HAVE_UTF8_STRING 3567#if X_HAVE_UTF8_STRING
3542 *target++ = xa[XA_UTF8_STRING]; 3568 *target++ = xa[XA_UTF8_STRING];
3543#endif 3569#endif
3544 3570
3545 XChangeProperty (xdisp, rq.requestor, rq.property, XA_ATOM, 3571 XChangeProperty (dpy, rq.requestor, rq.property, XA_ATOM,
3546 32, PropModeReplace, 3572 32, PropModeReplace,
3547 (unsigned char *)target_list, target - target_list); 3573 (unsigned char *)target_list, target - target_list);
3548 ev.property = rq.property; 3574 ev.property = rq.property;
3549 } 3575 }
3550#if TODO // TODO 3576#if TODO // TODO
… …
3553 /* TODO: Handle MULTIPLE */ 3579 /* TODO: Handle MULTIPLE */
3554 } 3580 }
3555#endif 3581#endif
3556 else if (rq.target == xa[XA_TIMESTAMP] && selection.text) 3582 else if (rq.target == xa[XA_TIMESTAMP] && selection.text)
3557 { 3583 {
3558 XChangeProperty (xdisp, rq.requestor, rq.property, rq.target, 3584 XChangeProperty (dpy, rq.requestor, rq.property, rq.target,
3559 32, PropModeReplace, (unsigned char *)&selection_time, 1); 3585 32, PropModeReplace, (unsigned char *)&selection_time, 1);
3560 ev.property = rq.property; 3586 ev.property = rq.property;
3561 } 3587 }
3562 else if (rq.target == XA_STRING 3588 else if (rq.target == XA_STRING
3563 || rq.target == xa[XA_TEXT] 3589 || rq.target == xa[XA_TEXT]
… …
3621 ct.value = (unsigned char *)rxvt_wcstoutf8 (cl, selectlen); 3647 ct.value = (unsigned char *)rxvt_wcstoutf8 (cl, selectlen);
3622 ct.nitems = strlen ((char *)ct.value); 3648 ct.nitems = strlen ((char *)ct.value);
3623 } 3649 }
3624 else 3650 else
3625#endif 3651#endif
3626 if (XwcTextListToTextProperty (xdisp, &cl, 1, (XICCEncodingStyle) style, &ct) >= 0) 3652 if (XwcTextListToTextProperty (dpy, &cl, 1, (XICCEncodingStyle) style, &ct) >= 0)
3627 freect = 1; 3653 freect = 1;
3628 else 3654 else
3629 { 3655 {
3630 /* if we failed to convert then send it raw */ 3656 /* if we failed to convert then send it raw */
3631 ct.value = (unsigned char *)cl; 3657 ct.value = (unsigned char *)cl;
3632 ct.nitems = selectlen; 3658 ct.nitems = selectlen;
3633 ct.encoding = target; 3659 ct.encoding = target;
3634 } 3660 }
3635 3661
3636 XChangeProperty (xdisp, rq.requestor, rq.property, 3662 XChangeProperty (dpy, rq.requestor, rq.property,
3637 ct.encoding, 8, PropModeReplace, 3663 ct.encoding, 8, PropModeReplace,
3638 ct.value, (int)ct.nitems); 3664 ct.value, (int)ct.nitems);
3639 ev.property = rq.property; 3665 ev.property = rq.property;
3640 3666
3641 if (freect) 3667 if (freect)
3642 XFree (ct.value); 3668 XFree (ct.value);
3643 } 3669 }
3644 3670
3645 XSendEvent (xdisp, rq.requestor, False, 0L, (XEvent *)&ev); 3671 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} 3672}
3663 3673
3664/* ------------------------------------------------------------------------- */ 3674/* ------------------------------------------------------------------------- */
3665#ifdef USE_XIM 3675#ifdef USE_XIM
3666void 3676void
3667rxvt_term::im_set_position (XPoint &pos) NOTHROW 3677rxvt_term::im_set_position (XPoint &pos) NOTHROW
3668{ 3678{
3669 XWindowAttributes xwa; 3679 XWindowAttributes xwa;
3670 3680
3671 XGetWindowAttributes (xdisp, vt, &xwa); 3681 XGetWindowAttributes (dpy, vt, &xwa);
3672 3682
3673 pos.x = xwa.x + Col2Pixel (screen.cur.col); 3683 pos.x = xwa.x + Col2Pixel (screen.cur.col);
3674 pos.y = xwa.y + Height2Pixel (screen.cur.row) + fbase; 3684 pos.y = xwa.y + Height2Pixel (screen.cur.row) + fbase;
3675} 3685}
3676#endif 3686#endif

Diff Legend

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