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.261 by root, Sat Feb 18 15:44:26 2006 UTC vs.
Revision 1.297 by root, Wed Jan 9 01:14:29 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() \
… …
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;
… …
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
1024 want_refresh = 1;
1028#endif 1025#endif
1029 } 1026 }
1030 } 1027 }
1031 else if (!(screen.flags & Screen_WrapNext)) 1028 else
1032 scr_gotorc (0, -1, RELATIVE); 1029 scr_gotorc (0, -1, RELATIVE);
1033
1034 screen.flags &= ~Screen_WrapNext;
1035} 1030}
1036 1031
1037/* ------------------------------------------------------------------------- */ 1032/* ------------------------------------------------------------------------- */
1038/* 1033/*
1039 * Process Horizontal Tab 1034 * Process Horizontal Tab
… …
1062 x = i; 1057 x = i;
1063 1058
1064 if (!--count) 1059 if (!--count)
1065 break; 1060 break;
1066 } 1061 }
1067 else 1062 else
1068 ht &= l.t[i] == ' ' 1063 ht &= l.t[i] == ' '
1069 && RS_SAME (l.r[i], base_rend); 1064 && RS_SAME (l.r[i], base_rend);
1070 1065
1071 if (count) 1066 if (count)
1072 x = ncol - 1; 1067 x = ncol - 1;
1073 1068
1074 // store horizontal tab commands as characters inside the text 1069 // store horizontal tab commands as characters inside the text
1075 // buffer so they can be selected and pasted. 1070 // buffer so they can be selected and pasted.
1076 if (ht && OPTION (Opt_pastableTabs)) 1071 if (ht && option (Opt_pastableTabs))
1077 { 1072 {
1078 base_rend = SET_FONT (base_rend, 0); 1073 base_rend = SET_FONT (base_rend, 0);
1079 1074
1080 l.touch (x); 1075 l.touch (x);
1081 1076
… …
1188 } 1183 }
1189 } 1184 }
1190 else 1185 else
1191 { 1186 {
1192 if (screen.flags & Screen_Relative) 1187 if (screen.flags & Screen_Relative)
1188 {
1193 { /* relative origin mode */ 1189 /* relative origin mode */
1194 screen.cur.row = row + screen.tscroll; 1190 screen.cur.row = row + screen.tscroll;
1195 min_it (screen.cur.row, screen.bscroll); 1191 min_it (screen.cur.row, screen.bscroll);
1196 } 1192 }
1197 else 1193 else
1198 screen.cur.row = row; 1194 screen.cur.row = row;
… …
1474 { 1470 {
1475 if (selection.end.row != screen.cur.row 1471 if (selection.end.row != screen.cur.row
1476 || (selection.end.col + count >= ncol)) 1472 || (selection.end.col + count >= ncol))
1477 CLEAR_SELECTION (); 1473 CLEAR_SELECTION ();
1478 else 1474 else
1475 {
1479 { /* shift selection */ 1476 /* shift selection */
1480 selection.beg.col += count; 1477 selection.beg.col += count;
1481 selection.mark.col += count; /* XXX: yes? */ 1478 selection.mark.col += count; /* XXX: yes? */
1482 selection.end.col += count; 1479 selection.end.col += count;
1483 } 1480 }
1484 } 1481 }
… …
1623 */ 1620 */
1624void 1621void
1625rxvt_term::scr_set_tab (int mode) NOTHROW 1622rxvt_term::scr_set_tab (int mode) NOTHROW
1626{ 1623{
1627 if (mode < 0) 1624 if (mode < 0)
1628 memset (tabs, 0, ncol * sizeof (char)); 1625 memset (tabs, 0, ncol);
1629 else if (screen.cur.col < ncol) 1626 else if (screen.cur.col < ncol)
1630 tabs [screen.cur.col] = !!mode; 1627 tabs [screen.cur.col] = !!mode;
1631} 1628}
1632 1629
1633/* ------------------------------------------------------------------------- */ 1630/* ------------------------------------------------------------------------- */
… …
1648 if (rvideo_state != on) 1645 if (rvideo_state != on)
1649 { 1646 {
1650 rvideo_state = on; 1647 rvideo_state = on;
1651 1648
1652 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]); 1649 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]);
1653#if XPM_BACKGROUND 1650#ifdef HAVE_BG_PIXMAP
1654 if (bgPixmap.pixmap == None) 1651 if (bgPixmap.pixmap == None)
1655#endif
1656#if TRANSPARENT
1657 if (!OPTION (Opt_transparent) || am_transparent == 0)
1658#endif 1652#endif
1659 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); 1653 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
1660 1654
1661 XGCValues gcvalue; 1655 XGCValues gcvalue;
1662 gcvalue.foreground = pix_colors[Color_fg]; 1656 gcvalue.foreground = pix_colors[Color_fg];
… …
1806 for (i = PART_BEG; i < RC_COUNT; i++) 1800 for (i = PART_BEG; i < RC_COUNT; i++)
1807 { 1801 {
1808 min_it (rc[i].col, ncol - 1); 1802 min_it (rc[i].col, ncol - 1);
1809 min_it (rc[i].row, nrow - 1); 1803 min_it (rc[i].row, nrow - 1);
1810 } 1804 }
1811 1805// 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++) 1806 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); 1807 fill_text (&drawn_buf[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1);
1814 1808
1815 num_scr_allow = 0; 1809 num_scr_allow = 0;
1816 1810
… …
1871 return true; 1865 return true;
1872} 1866}
1873 1867
1874#ifndef NO_BELL 1868#ifndef NO_BELL
1875void 1869void
1876rxvt_term::bell_cb (time_watcher &w) 1870rxvt_term::bell_cb (ev::timer &w, int revents)
1877{ 1871{
1878 rvideo_bell = false; 1872 rvideo_bell = false;
1879 scr_rvideo_mode (rvideo_mode); 1873 scr_rvideo_mode (rvideo_mode);
1874 refresh_check ();
1880} 1875}
1881#endif 1876#endif
1882 1877
1883/* ------------------------------------------------------------------------- */ 1878/* ------------------------------------------------------------------------- */
1884void 1879void
… …
1886{ 1881{
1887#ifndef NO_BELL 1882#ifndef NO_BELL
1888 1883
1889# ifndef NO_MAPALERT 1884# ifndef NO_MAPALERT
1890# ifdef MAPALERT_OPTION 1885# ifdef MAPALERT_OPTION
1891 if (OPTION (Opt_mapAlert)) 1886 if (option (Opt_mapAlert))
1892# endif 1887# endif
1893 XMapWindow (dpy, parent[0]); 1888 XMapWindow (dpy, parent[0]);
1894# endif 1889# endif
1895 1890
1891# if ENABLE_FRILLS
1892 if (option (Opt_urgentOnBell))
1893 {
1894 if (XWMHints *h = XGetWMHints(dpy, parent[0]))
1895 {
1896 h->flags |= XUrgencyHint;
1897 XSetWMHints (dpy, parent[0], h);
1898 }
1899 }
1900# endif
1901
1896 if (OPTION (Opt_visualBell)) 1902 if (option (Opt_visualBell))
1897 { 1903 {
1898 rvideo_bell = true; 1904 rvideo_bell = true;
1899 scr_rvideo_mode (rvideo_mode); 1905 scr_rvideo_mode (rvideo_mode);
1900 display->flush (); 1906 flush ();
1901 1907
1902 bell_ev.start (NOW + VISUAL_BELL_DURATION); 1908 bell_ev.start (VISUAL_BELL_DURATION);
1903 } 1909 }
1904 else 1910 else
1905 XBell (dpy, 0); 1911 XBell (dpy, 0);
1906
1907#endif 1912#endif
1908} 1913}
1909 1914
1910/* ------------------------------------------------------------------------- */ 1915/* ------------------------------------------------------------------------- */
1911/* ARGSUSED */ 1916/* ARGSUSED */
… …
1978 int i; /* tmp */ 1983 int i; /* tmp */
1979#ifndef NO_CURSORCOLOR 1984#ifndef NO_CURSORCOLOR
1980 rend_t cc1; /* store colours at cursor position (s) */ 1985 rend_t cc1; /* store colours at cursor position (s) */
1981#endif 1986#endif
1982 rend_t *crp; // cursor rendition pointer 1987 rend_t *crp; // cursor rendition pointer
1988 rend_t ccol1, /* Cursor colour */
1989 ccol2; /* Cursor colour2 */
1983 1990
1984 want_refresh = 0; /* screen is current */ 1991 want_refresh = 0; /* screen is current */
1985 1992
1986 if (refresh_type == NO_REFRESH || !mapped) 1993 if (refresh_type == NO_REFRESH || !mapped)
1987 return; 1994 return;
… …
1990 * A: set up vars 1997 * A: set up vars
1991 */ 1998 */
1992 have_bg = 0; 1999 have_bg = 0;
1993 refresh_count = 0; 2000 refresh_count = 0;
1994 2001
1995#if XPM_BACKGROUND 2002#ifdef HAVE_BG_PIXMAP
1996 have_bg |= bgPixmap.pixmap != None; 2003 have_bg |= bgPixmap.pixmap != None;
1997#endif
1998#if TRANSPARENT
1999 have_bg |= OPTION (Opt_transparent) && am_transparent;
2000#endif 2004#endif
2001 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ 2005 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
2002 2006
2003 /* 2007 /*
2004 * B: reverse any characters which are selected 2008 * B: reverse any characters which are selected
… …
2008 /* 2012 /*
2009 * C: set the cursor character (s) 2013 * C: set the cursor character (s)
2010 */ 2014 */
2011 { 2015 {
2012 unsigned char setoldcursor; 2016 unsigned char setoldcursor;
2013 rend_t ccol1, /* Cursor colour */
2014 ccol2; /* Cursor colour2 */
2015 2017
2016 showcursor = (screen.flags & Screen_VisibleCursor); 2018 showcursor = (screen.flags & Screen_VisibleCursor);
2017#ifdef CURSOR_BLINK 2019#ifdef CURSOR_BLINK
2018 if (hidden_cursor) 2020 if (hidden_cursor)
2019 showcursor = 0; 2021 showcursor = 0;
… …
2026 while (col && ROW(screen.cur.row).t[col] == NOCHAR) 2028 while (col && ROW(screen.cur.row).t[col] == NOCHAR)
2027 col--; 2029 col--;
2028 2030
2029 crp = &ROW(screen.cur.row).r[col]; 2031 crp = &ROW(screen.cur.row).r[col];
2030 2032
2033#ifndef NO_CURSORCOLOR
2034 cc1 = *crp & (RS_fgMask | RS_bgMask);
2035 if (ISSET_PIXCOLOR (Color_cursor))
2036 ccol1 = Color_cursor;
2037 else
2038#endif
2039#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
2040 ccol1 = fgcolor_of (rstyle);
2041#else
2042 ccol1 = Color_fg;
2043#endif
2044
2045#ifndef NO_CURSORCOLOR
2046 if (ISSET_PIXCOLOR (Color_cursor2))
2047 ccol2 = Color_cursor2;
2048 else
2049#endif
2050#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
2051 ccol2 = bgcolor_of (rstyle);
2052#else
2053 ccol2 = Color_bg;
2054#endif
2055
2031 if (showcursor && focus) 2056 if (showcursor && focus)
2032 { 2057 {
2033 if (OPTION (Opt_cursorUnderline)) 2058 if (option (Opt_cursorUnderline))
2034 *crp ^= RS_Uline; 2059 *crp ^= RS_Uline;
2035 else 2060 else
2036 { 2061 {
2037 *crp ^= RS_RVid; 2062 *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); 2063 *crp = SET_FGCOLOR (*crp, ccol1);
2058 *crp = SET_BGCOLOR (*crp, ccol2); 2064 *crp = SET_BGCOLOR (*crp, ccol2);
2059#endif
2060 } 2065 }
2061 } 2066 }
2062 } 2067 }
2063 2068
2064 /* make sure no outline cursor is left around */ 2069 /* make sure no outline cursor is left around */
… …
2253 int back = bgcolor_of (rend); // desired background 2258 int back = bgcolor_of (rend); // desired background
2254 2259
2255 // only do special processing if any attributes are set, which is unlikely 2260 // only do special processing if any attributes are set, which is unlikely
2256 if (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful)) 2261 if (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful))
2257 { 2262 {
2258#if ENABLE_STYLES
2259 // "careful" (too wide) character handling
2260
2261 // include previous careful character(s) if possible, looks nicer (best effort...)
2262 while (text > stp
2263 && srp[text - stp - 1] & RS_Careful
2264 && RS_SAME (rend, srp[text - stp - 1]))
2265 text--, count++, xpixel -= fwidth;
2266
2267 // force redraw after "careful" characters to avoid pixel droppings
2268 for (int i = 0; srp[col + i] & RS_Careful && col + i < ncol - 1; i++)
2269 drp[col + i + 1] = srp[col + i + 1] ^ RS_redraw;
2270
2271 // force redraw before "careful" characters to avoid pixel droppings
2272 for (int i = 0; srp[text - stp - i] & RS_Careful && text - i > stp; i++)
2273 drp[text - stp - i - 1] = srp[text - stp - i - 1] ^ RS_redraw;
2274#endif
2275
2276 bool invert = rend & RS_RVid; 2263 bool invert = rend & RS_RVid;
2277 2264
2278#ifndef NO_BOLD_UNDERLINE_REVERSE 2265#ifndef NO_BOLD_UNDERLINE_REVERSE
2279 if (rend & RS_Bold
2280 && fore == Color_fg) 2266 if (rend & RS_Bold && fore == Color_fg)
2281 { 2267 {
2282 if (ISSET_PIXCOLOR (Color_BD)) 2268 if (ISSET_PIXCOLOR (Color_BD))
2283 fore = Color_BD; 2269 fore = Color_BD;
2284# if !ENABLE_STYLES 2270# if !ENABLE_STYLES
2285 else 2271 else
2286 invert = !invert; 2272 invert = !invert;
2287# endif 2273# endif
2288 } 2274 }
2289 2275
2290 if (rend & RS_Italic 2276 if (rend & RS_Italic && fore == Color_fg)
2291 && fore == Color_fg)
2292 { 2277 {
2293 if (ISSET_PIXCOLOR (Color_IT)) 2278 if (ISSET_PIXCOLOR (Color_IT))
2294 fore = Color_IT; 2279 fore = Color_IT;
2295# if !ENABLE_STYLES 2280# if !ENABLE_STYLES
2296 else 2281 else
2297 invert = !invert; 2282 invert = !invert;
2298# endif 2283# endif
2299 } 2284 }
2300 2285
2301 if (rend & RS_Uline && ISSET_PIXCOLOR (Color_UL)) 2286 if (rend & RS_Uline && fore == Color_fg && ISSET_PIXCOLOR (Color_UL))
2302 fore = Color_UL; 2287 fore = Color_UL;
2303#endif 2288#endif
2304 2289
2305 if (invert) 2290 if (invert)
2306 { 2291 {
2292#ifdef OPTION_HC
2293 if ((showcursor && row == screen.cur.row && text - stp == screen.cur.col)
2294 || !ISSET_PIXCOLOR (Color_HC))
2295#endif
2296 /* invert the column if no highlightColor is set or it is the
2297 * current cursor column */
2307 ::swap (fore, back); 2298 ::swap (fore, back);
2299#ifdef OPTION_HC
2300 else if (ISSET_PIXCOLOR (Color_HC))
2301 back = Color_HC;
2302#endif
2308 2303
2309#ifndef NO_BOLD_UNDERLINE_REVERSE 2304#ifndef NO_BOLD_UNDERLINE_REVERSE
2305# ifndef OPTION_HC
2310 if (ISSET_PIXCOLOR (Color_RV)) 2306 if (ISSET_PIXCOLOR (Color_RV))
2311 back = Color_RV; 2307 back = Color_RV;
2312 2308# endif
2313 if (fore == back) 2309 if (fore == back)
2314 { 2310 {
2315 fore = Color_bg; 2311 fore = Color_bg;
2316 back = Color_fg; 2312 back = Color_fg;
2317 } 2313 }
… …
2319 } 2315 }
2320 2316
2321#ifdef TEXT_BLINK 2317#ifdef TEXT_BLINK
2322 if (rend & RS_Blink && (back == Color_bg || fore == Color_bg)) 2318 if (rend & RS_Blink && (back == Color_bg || fore == Color_bg))
2323 { 2319 {
2324 if (!text_blink_ev.active) 2320 if (!text_blink_ev.is_active ())
2325 { 2321 {
2326 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); 2322 text_blink_ev.again ();
2327 hidden_text = 0; 2323 hidden_text = 0;
2328 } 2324 }
2329 else if (hidden_text) 2325 else if (hidden_text)
2330 fore = back; 2326 fore = back;
2331 } 2327 }
2332#endif 2328#endif
2329
2330#if ENABLE_STYLES
2331 // "careful" (too wide) character handling
2332
2333 // include previous careful character(s) if possible, looks nicer (best effort...)
2334 while (text > stp
2335 && srp[text - stp - 1] & RS_Careful
2336 && RS_SAME (rend, srp[text - stp - 1]))
2337 text--, count++, xpixel -= fwidth;
2338
2339 // force redraw after "careful" characters to avoid pixel droppings
2340 for (int i = 0; srp[col + i] & RS_Careful && col + i < ncol - 1; i++)
2341 drp[col + i + 1] = srp[col + i + 1] ^ RS_redraw;
2342
2343 // force redraw before "careful" characters to avoid pixel droppings
2344 for (int i = 0; srp[text - stp - i] & RS_Careful && text - i > stp; i++)
2345 drp[text - stp - i - 1] = srp[text - stp - i - 1] ^ RS_redraw;
2346#endif
2333 } 2347 }
2334 2348
2335 /* 2349 /*
2336 * Actually do the drawing of the string here 2350 * Actually do the drawing of the string here
2337 */ 2351 */
2338 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)]; 2352 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)];
2339 2353
2340 if (back == fore) 2354 if (have_bg && back == Color_bg)
2341 font->clear_rect (*drawable, xpixel, ypixel, fwidth * count, fheight, back);
2342 else if (back == Color_bg && have_bg)
2343 { 2355 {
2344 // this is very ugly, maybe push it into ->draw? 2356 // this is very ugly, maybe push it into ->draw?
2345 2357
2346 for (i = 0; i < count; i++) /* don't draw empty strings */ 2358 for (i = 0; i < count; i++) /* don't draw empty strings */
2347 if (text[i] != ' ') 2359 if (text[i] != ' ')
2348 { 2360 {
2349 font->draw (*drawable, xpixel, ypixel, text, count, fore, -1); 2361 font->draw (*drawable, xpixel, ypixel, text, count, fore, Color_transparent);
2350 goto did_clear; 2362 goto did_clear;
2351 } 2363 }
2352 2364
2353 CLEAR_CHARS (xpixel, ypixel, count); 2365 CLEAR_CHARS (xpixel, ypixel, count);
2354 did_clear: ; 2366 did_clear: ;
… …
2382 */ 2394 */
2383 if (showcursor) 2395 if (showcursor)
2384 { 2396 {
2385 if (focus) 2397 if (focus)
2386 { 2398 {
2387 if (OPTION (Opt_cursorUnderline)) 2399 if (option (Opt_cursorUnderline))
2388 *crp ^= RS_Uline; 2400 *crp ^= RS_Uline;
2389 else 2401 else
2390 { 2402 {
2391 *crp ^= RS_RVid; 2403 *crp ^= RS_RVid;
2392#ifndef NO_CURSORCOLOR 2404#ifndef NO_CURSORCOLOR
… …
2407 cursorwidth++; 2419 cursorwidth++;
2408 2420
2409#ifndef NO_CURSORCOLOR 2421#ifndef NO_CURSORCOLOR
2410 if (ISSET_PIXCOLOR (Color_cursor)) 2422 if (ISSET_PIXCOLOR (Color_cursor))
2411 XSetForeground (dpy, gc, pix_colors[Color_cursor]); 2423 XSetForeground (dpy, gc, pix_colors[Color_cursor]);
2424 else
2412#endif 2425#endif
2426 XSetForeground (dpy, gc, pix_colors[ccol1]);
2413 2427
2414 XDrawRectangle (dpy, drawBuffer, gc, 2428 XDrawRectangle (dpy, drawBuffer, gc,
2415 Col2Pixel (col), 2429 Col2Pixel (col),
2416 Row2Pixel (oldcursor.row), 2430 Row2Pixel (oldcursor.row),
2417 (unsigned int) (Width2Pixel (cursorwidth) - 1), 2431 (unsigned int) (Width2Pixel (cursorwidth) - 1),
… …
2454} 2468}
2455 2469
2456void 2470void
2457rxvt_term::scr_recolour () NOTHROW 2471rxvt_term::scr_recolour () NOTHROW
2458{ 2472{
2459 if (1 2473#ifdef HAVE_BG_PIXMAP
2460#if TRANSPARENT 2474 bgPixmap.apply ();
2461 && !am_transparent 2475#else
2462#endif 2476
2463#if XPM_BACKGROUND
2464 && !bgPixmap.pixmap
2465#endif
2466 )
2467 {
2468 XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]); 2477 XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]);
2469 XClearWindow (dpy, parent[0]); 2478 XClearWindow (dpy, parent[0]);
2470 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); 2479 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
2480
2471#if HAVE_SCROLLBARS 2481# if HAVE_SCROLLBARS
2472 if (scrollBar.win) 2482 if (scrollBar.win)
2473 { 2483 {
2474 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]); 2484 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]);
2475 scrollBar.setIdle (); 2485 scrollBar.setIdle ();
2476 scrollbar_show (0); 2486 scrollbar_show (0);
2477 } 2487 }
2478#endif 2488# endif
2479 }
2480 2489
2481 scr_clear (); 2490 scr_clear ();
2482 scr_touch (true); 2491 scr_touch (true);
2483 want_refresh = 1; 2492 want_refresh = 1;
2493
2494#endif
2484} 2495}
2485 2496
2486/* ------------------------------------------------------------------------- */ 2497/* ------------------------------------------------------------------------- */
2487void 2498void
2488rxvt_term::scr_clear (bool really) NOTHROW 2499rxvt_term::scr_clear (bool really) NOTHROW
… …
2723 if (!delete_prop) 2734 if (!delete_prop)
2724 XDeleteProperty (dpy, win, prop); 2735 XDeleteProperty (dpy, win, prop);
2725 2736
2726 selection_wait = Sel_incr; 2737 selection_wait = Sel_incr;
2727 incr_buf_fill = 0; 2738 incr_buf_fill = 0;
2728 incr_ev.start (NOW + 10); 2739 incr_ev.start (10);
2729 2740
2730 goto bailout; 2741 goto bailout;
2731 } 2742 }
2732 2743
2733 if (ct.nitems == 0) 2744 if (ct.nitems == 0)
… …
2742 ct.nitems = incr_buf_fill; 2753 ct.nitems = incr_buf_fill;
2743 incr_buf = 0; 2754 incr_buf = 0;
2744 incr_buf_size = 0; 2755 incr_buf_size = 0;
2745 incr_ev.stop (); 2756 incr_ev.stop ();
2746 } 2757 }
2747 else 2758 else
2748 { 2759 {
2749 if (selection_wait == Sel_normal 2760 if (selection_wait == Sel_normal
2750 && (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion 2761 && (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion
2751 { 2762 {
2752 /* 2763 /*
… …
2759 goto bailout; 2770 goto bailout;
2760 } 2771 }
2761 } 2772 }
2762 else if (selection_wait == Sel_incr) 2773 else if (selection_wait == Sel_incr)
2763 { 2774 {
2764 incr_ev.start (NOW + 10); 2775 incr_ev.start (10);
2765 2776
2766 while (incr_buf_fill + ct.nitems > incr_buf_size) 2777 while (incr_buf_fill + ct.nitems > incr_buf_size)
2767 { 2778 {
2768 incr_buf_size = incr_buf_size ? incr_buf_size * 2 : 128*1024; 2779 incr_buf_size = incr_buf_size ? incr_buf_size * 2 : 128*1024;
2769 incr_buf = (char *)realloc (incr_buf, incr_buf_size); 2780 incr_buf = (char *)realloc (incr_buf, incr_buf_size);
… …
2809 if (selection_wait == Sel_normal) 2820 if (selection_wait == Sel_normal)
2810 selection_wait = Sel_none; 2821 selection_wait = Sel_none;
2811} 2822}
2812 2823
2813void 2824void
2814rxvt_term::incr_cb (time_watcher &w) NOTHROW 2825rxvt_term::incr_cb (ev::timer &w, int revents) NOTHROW
2815{ 2826{
2816 selection_wait = Sel_none; 2827 selection_wait = Sel_none;
2817 2828
2818 incr_buf_size = 0; 2829 incr_buf_size = 0;
2819 free (incr_buf); 2830 free (incr_buf);
… …
2830 selection_paste (win, prop, true); 2841 selection_paste (win, prop, true);
2831} 2842}
2832 2843
2833/* ------------------------------------------------------------------------- */ 2844/* ------------------------------------------------------------------------- */
2834/* 2845/*
2835 * Request the current selection: 2846 * Request the current selection:
2836 * Order: > internal selection if available 2847 * Order: > internal selection if available
2837 * > PRIMARY, SECONDARY, CLIPBOARD if ownership is claimed (+) 2848 * > PRIMARY, SECONDARY, CLIPBOARD if ownership is claimed (+)
2838 * > CUT_BUFFER0 2849 * > CUT_BUFFER0
2839 * (+) if ownership is claimed but property is empty, rxvt_selection_paste () 2850 * (+) if ownership is claimed but property is empty, rxvt_selection_paste ()
2840 * will auto fallback to CUT_BUFFER0 2851 * will auto fallback to CUT_BUFFER0
… …
2842 */ 2853 */
2843void 2854void
2844rxvt_term::selection_request (Time tm, int selnum) NOTHROW 2855rxvt_term::selection_request (Time tm, int selnum) NOTHROW
2845{ 2856{
2846 if (selection.text && selnum == Sel_Primary) 2857 if (selection.text && selnum == Sel_Primary)
2858 {
2847 { /* internal selection */ 2859 /* internal selection */
2848 char *str = rxvt_wcstombs (selection.text, selection.len); 2860 char *str = rxvt_wcstombs (selection.text, selection.len);
2849 paste (str, strlen (str)); 2861 paste (str, strlen (str));
2850 free (str); 2862 free (str);
2851 return; 2863 return;
2852 } 2864 }
… …
3118 selection.mark.col = clamp (selection.mark.col, 0, ncol - 1); 3130 selection.mark.col = clamp (selection.mark.col, 0, ncol - 1);
3119 3131
3120 while (selection.mark.col > 0 3132 while (selection.mark.col > 0
3121 && ROW(selection.mark.row).t[selection.mark.col] == NOCHAR) 3133 && ROW(selection.mark.row).t[selection.mark.col] == NOCHAR)
3122 --selection.mark.col; 3134 --selection.mark.col;
3123 3135
3124 if (selection.op) 3136 if (selection.op)
3137 {
3125 { /* clear the old selection */ 3138 /* clear the old selection */
3126 selection.beg.row = selection.end.row = selection.mark.row; 3139 selection.beg.row = selection.end.row = selection.mark.row;
3127 selection.beg.col = selection.end.col = selection.mark.col; 3140 selection.beg.col = selection.end.col = selection.mark.col;
3128 } 3141 }
3129 3142
3130 selection.op = SELECTION_INIT; 3143 selection.op = SELECTION_INIT;
… …
3319 * a point/word/line which is either the start or end of the selection 3332 * a point/word/line which is either the start or end of the selection
3320 * and it was decided by whichever point/word/line was `fixed' at the 3333 * and it was decided by whichever point/word/line was `fixed' at the
3321 * time of the most recent button3 press 3334 * time of the most recent button3 press
3322 */ 3335 */
3323 if (button3 && buttonpress) 3336 if (button3 && buttonpress)
3337 {
3324 { /* button3 press */ 3338 /* button3 press */
3325 /* 3339 /*
3326 * first determine which edge of the selection we are closest to 3340 * first determine which edge of the selection we are closest to
3327 */ 3341 */
3328 if (ROWCOL_IS_BEFORE (pos, selection.beg) 3342 if (ROWCOL_IS_BEFORE (pos, selection.beg)
3329 || (!ROWCOL_IS_AFTER (pos, selection.end) 3343 || (!ROWCOL_IS_AFTER (pos, selection.end)
… …
3347 selection.mark.row = selection.beg.row; 3361 selection.mark.row = selection.beg.row;
3348 selection.mark.col = selection.beg.col; 3362 selection.mark.col = selection.beg.col;
3349 } 3363 }
3350 } 3364 }
3351 else 3365 else
3366 {
3352 { /* button1 drag or button3 drag */ 3367 /* button1 drag or button3 drag */
3353 if (ROWCOL_IS_AFTER (selection.mark, pos)) 3368 if (ROWCOL_IS_AFTER (selection.mark, pos))
3354 { 3369 {
3355 if (selection.mark.row == selection.end.row 3370 if (selection.mark.row == selection.end.row
3356 && selection.mark.col == selection.end.col 3371 && selection.mark.col == selection.end.col
3357 && clickchange 3372 && clickchange
… …
3400 selection_delimit_word (DN, &selection.end, &selection.end); 3415 selection_delimit_word (DN, &selection.end, &selection.end);
3401 } 3416 }
3402 else if (selection.clicks == 3) 3417 else if (selection.clicks == 3)
3403 { 3418 {
3404#if ENABLE_FRILLS 3419#if ENABLE_FRILLS
3405 if (OPTION (Opt_tripleclickwords)) 3420 if (option (Opt_tripleclickwords))
3406 { 3421 {
3407 selection_delimit_word (UP, &selection.beg, &selection.beg); 3422 selection_delimit_word (UP, &selection.beg, &selection.beg);
3408 3423
3409 for (int end_row = selection.mark.row; end_row < nrow; end_row++) 3424 for (int end_row = selection.mark.row; end_row < nrow; end_row++)
3410 { 3425 {
… …
3438 selection.end.row++; 3453 selection.end.row++;
3439 } 3454 }
3440 } 3455 }
3441 3456
3442 if (button3 && buttonpress) 3457 if (button3 && buttonpress)
3458 {
3443 { /* mark may need to be changed */ 3459 /* mark may need to be changed */
3444 if (closeto == LEFT) 3460 if (closeto == LEFT)
3445 { 3461 {
3446 selection.mark.row = selection.end.row; 3462 selection.mark.row = selection.end.row;
3447 selection.mark.col = selection.end.col - (selection.clicks == 2); 3463 selection.mark.col = selection.end.col - (selection.clicks == 2);
3448 } 3464 }
… …
3647 XFree (ct.value); 3663 XFree (ct.value);
3648 } 3664 }
3649 3665
3650 XSendEvent (dpy, rq.requestor, False, 0L, (XEvent *)&ev); 3666 XSendEvent (dpy, rq.requestor, False, 0L, (XEvent *)&ev);
3651} 3667}
3652
3653/* ------------------------------------------------------------------------- *
3654 * MOUSE ROUTINES *
3655 * ------------------------------------------------------------------------- */
3656
3657/*
3658 * return col/row values corresponding to x/y pixel values
3659 */
3660void
3661rxvt_term::pixel_position (int *x, int *y) NOTHROW
3662{
3663 *x = Pixel2Col (*x);
3664 /* max_it (*x, 0); min_it (*x, (int)ncol - 1); */
3665 *y = Pixel2Row (*y);
3666 /* max_it (*y, 0); min_it (*y, (int)nrow - 1); */
3667}
3668 3668
3669/* ------------------------------------------------------------------------- */ 3669/* ------------------------------------------------------------------------- */
3670#ifdef USE_XIM 3670#ifdef USE_XIM
3671void 3671void
3672rxvt_term::im_set_position (XPoint &pos) NOTHROW 3672rxvt_term::im_set_position (XPoint &pos) NOTHROW

Diff Legend

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