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.34 by pcg, Tue Feb 24 00:44:23 2004 UTC vs.
Revision 1.41 by pcg, Sun Feb 29 15:31:56 2004 UTC

1/*--------------------------------*-C-*--------------------------------------* 1/*--------------------------------*-C-*--------------------------------------*
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-2004 Marc Lehmann <pcg@goof.com>
6 * 7 *
7 * 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
8 * 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
9 * the Free Software Foundation; either version 2 of the License, or 10 * the Free Software Foundation; either version 2 of the License, or
10 * (at your option) any later version. 11 * (at your option) any later version.
… …
16 * 17 *
17 * You should have received a copy of the GNU General Public License 18 * You should have received a copy of the GNU General Public License
18 * along with this program; if not, write to the Free Software 19 * along with this program; if not, write to the Free Software
19 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 20 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
20 *--------------------------------------------------------------------------*/ 21 *--------------------------------------------------------------------------*/
22
21/* 23/*
22 * We handle _all_ screen updates and selections 24 * This file handles _all_ screen updates and selections
23 */ 25 */
24 26
25#include "../config.h" /* NECESSARY */ 27#include "../config.h" /* NECESSARY */
26#define INTERN_SCREEN 28#define INTERN_SCREEN
27#include "rxvt.h" /* NECESSARY */ 29#include "rxvt.h" /* NECESSARY */
… …
30#include <X11/Xmd.h> /* get the typedef for CARD32 */ 32#include <X11/Xmd.h> /* get the typedef for CARD32 */
31 33
32#include <stdint.h> 34#include <stdint.h>
33#include <wchar.h> 35#include <wchar.h>
34 36
35#include "salloc.C" // HACK!! 37#include "salloc.C" // HACK, should be a seperate compile!
36 38
37inline void fill_text (text_t *start, text_t value, int len) 39inline void fill_text (text_t *start, text_t value, int len)
38{ 40{
39 while (len--) 41 while (len--)
40 *start++ = value; 42 *start++ = value;
… …
862 scr_insdel_chars (1, INSERT); 864 scr_insdel_chars (1, INSERT);
863 865
864 if (charsets[screen.charset] == '0') // DEC SPECIAL 866 if (charsets[screen.charset] == '0') // DEC SPECIAL
865 switch (c) 867 switch (c)
866 { 868 {
869 // dunno where these come from
870#if 0
867 case '+': c = 0x2192; break; case ',': c = 0x2190; break; case '-': c = 0x2191; break; 871 case '+': c = 0x2192; break; case ',': c = 0x2190; break; case '-': c = 0x2191; break;
868 case '.': c = 0x2193; break; case '0': c = 0x25ae; break; case '`': c = 0x25c6; break; 872 case '.': c = 0x2193; break; case '0': c = 0x25ae; break;
873#endif
874 // vt100 special graphics and line drawing
875 case '`': c = 0x25c6; break; case '_': c = 0x0020; break;
869 case 'a': c = 0x2592; break; case 'f': c = 0x00b0; break; case 'g': c = 0x00b1; break; 876 case 'a': c = 0x2592; break; case 'b': c = 0x2409; break; case 'c': c = 0x240c; break;
870 case 'h': c = 0x2592; break; case 'i': c = 0x2603; break; case 'j': c = 0x2518; break;
871 case 'k': c = 0x2510; break; case 'l': c = 0x250c; break; case 'm': c = 0x2514; break; 877 case 'd': c = 0x240d; break; case 'e': c = 0x240a; break; case 'f': c = 0x00b0; break;
878 case 'g': c = 0x00b1; break; case 'h': c = 0x2424; break; case 'i': c = 0x240b; break;
872 case 'n': c = 0x253c; break; case 'o': c = 0x23ba; break; case 'p': c = 0x23bb; break; 879 case 'j': c = 0x2518; break; case 'k': c = 0x2510; break; case 'l': c = 0x250c; break;
873 case 'q': c = 0x2500; break; case 'r': c = 0x23bc; break; case 's': c = 0x23bd; break; 880 case 'm': c = 0x2514; break; case 'n': c = 0x253c; break; case 'o': c = 0x23ba; break;
874 case 't': c = 0x251c; break; case 'u': c = 0x2524; break; case 'v': c = 0x2534; break; 881 case 'p': c = 0x23bb; break; case 'q': c = 0x2500; break; case 'r': c = 0x23bc; break;
875 case 'w': c = 0x252c; break; case 'x': c = 0x2502; break; case 'y': c = 0x2264; break; 882 case 's': c = 0x23bd; break; case 't': c = 0x251c; break; case 'u': c = 0x2524; break;
876 case 'z': c = 0x2265; break; case '{': c = 0x03c0; break; case '|': c = 0x2260; break; 883 case 'v': c = 0x2534; break; case 'w': c = 0x252c; break; case 'x': c = 0x2502; break;
884 case 'y': c = 0x2264; break; case 'z': c = 0x2265; break; case '{': c = 0x03c0; break;
877 case '}': c = 0x00a3; break; case '~': c = 0x00b7; break; 885 case '|': c = 0x2260; break; case '}': c = 0x00a3; break; case '~': c = 0x00b7; break;
878 } 886 }
879 887
880 rend_t rend = SET_FONT (rstyle, TermWin.fontset->find_font (c)); 888 rend_t rend = SET_FONT (rstyle, TermWin.fontset->find_font (c));
881 // rely on wcwidth to tell us the character width, at least for non-ascii 889 // rely on wcwidth to tell us the character width, at least for non-ascii
882 int width = c <= 128 ? 1 : wcwidth (c); 890 int width = c <= 128 ? 1 : wcwidth (c);
… …
1835 ((Y) >= (X)->min_char_or_byte2 && (Y) <= (X)->max_char_or_byte2) 1843 ((Y) >= (X)->min_char_or_byte2 && (Y) <= (X)->max_char_or_byte2)
1836 1844
1837void 1845void
1838rxvt_term::scr_refresh (unsigned char refresh_type) 1846rxvt_term::scr_refresh (unsigned char refresh_type)
1839{ 1847{
1840 unsigned char clearfirst, /* first character writes before cell */ 1848 unsigned char clearfirst, /* first character writes before cell */
1841 clearlast, /* last character writes beyond cell */ 1849 clearlast, /* last character writes beyond cell */
1842 must_clear, /* use draw_string not draw_image_string */ 1850 must_clear, /* use draw_string not draw_image_string */
1843 rvid, /* reverse video this position */ 1851 rvid, /* reverse video this position */
1844 showcursor; /* show the cursor */ 1852 showcursor; /* show the cursor */
1845 int16_t col, row, /* column/row we're processing */ 1853 int16_t col, row, /* column/row we're processing */
1846 ocrow; /* old cursor row */ 1854 ocrow; /* old cursor row */
1847 int cursorwidth;
1848 int i, /* tmp */ 1855 int i, /* tmp */
1849 row_offset; /* basic offset in screen structure */ 1856 row_offset; /* basic offset in screen structure */
1850#ifndef NO_CURSORCOLOR 1857#ifndef NO_CURSORCOLOR
1851 rend_t cc1; /* store colours at cursor position (s) */ 1858 rend_t cc1; /* store colours at cursor position (s) */
1852#endif 1859#endif
1853 rend_t *drp, *srp; /* drawn-rend-pointer, screen-rend-pointer */ 1860 rend_t *drp, *srp; /* drawn-rend-pointer, screen-rend-pointer */
1854 text_t *dtp, *stp; /* drawn-text-pointer, screen-text-pointer */ 1861 text_t *dtp, *stp; /* drawn-text-pointer, screen-text-pointer */
1855 1862
1856 if (refresh_type == NO_REFRESH || !TermWin.mapped) 1863 if (refresh_type == NO_REFRESH || !TermWin.mapped)
1857 return; 1864 return;
1858 1865
1859 /* 1866 /*
… …
1891 unsigned char setoldcursor; 1898 unsigned char setoldcursor;
1892 rend_t ccol1, /* Cursor colour */ 1899 rend_t ccol1, /* Cursor colour */
1893 ccol2; /* Cursor colour2 */ 1900 ccol2; /* Cursor colour2 */
1894 1901
1895 showcursor = (screen.flags & Screen_VisibleCursor); 1902 showcursor = (screen.flags & Screen_VisibleCursor);
1896 cursorwidth = 0;
1897#ifdef CURSOR_BLINK 1903#ifdef CURSOR_BLINK
1898 if (hidden_cursor) 1904 if (hidden_cursor)
1899 showcursor = 0; 1905 showcursor = 0;
1900#endif 1906#endif
1901 1907
1902 cursorwidth = 0;
1903
1904 if (showcursor) 1908 if (showcursor)
1905 { 1909 {
1906 cursorwidth++;
1907
1908 srp = & (screen.rend[screen.cur.row + TermWin.saveLines] 1910 srp = & (screen.rend[screen.cur.row + TermWin.saveLines]
1909 [screen.cur.col]); 1911 [screen.cur.col]);
1910 1912
1911 if (showcursor && TermWin.focus) 1913 if (showcursor && TermWin.focus)
1912 { 1914 {
… …
1930 ccol2 = Color_bg; 1932 ccol2 = Color_bg;
1931#endif 1933#endif
1932 *srp = SET_FGCOLOR (*srp, ccol1); 1934 *srp = SET_FGCOLOR (*srp, ccol1);
1933 *srp = SET_BGCOLOR (*srp, ccol2); 1935 *srp = SET_BGCOLOR (*srp, ccol2);
1934#endif 1936#endif
1935
1936 } 1937 }
1937 } 1938 }
1938 1939
1939 /* make sure no outline cursor is left around */ 1940 /* make sure no outline cursor is left around */
1940 setoldcursor = 0; 1941 setoldcursor = 0;
… …
2121 int fore = GET_FGCOLOR (rend); // desired foreground 2122 int fore = GET_FGCOLOR (rend); // desired foreground
2122 int back = GET_BGCOLOR (rend); // desired background 2123 int back = GET_BGCOLOR (rend); // desired background
2123 2124
2124 rend = GET_ATTR (rend); 2125 rend = GET_ATTR (rend);
2125 2126
2126 rvid = !! (rend & RS_RVid); 2127 rvid = !!(rend & RS_RVid);
2128
2129#ifndef NO_BOLD_UNDERLINE_REVERSE
2130 if (rend & RS_Bold && fore == Color_fg)
2131 {
2132 if (ISSET_PIXCOLOR (Color_BD))
2133 fore = Color_BD;
2134 else
2135 rvid = !rvid;
2136 }
2137
2138 if (rend & RS_Uline)
2139 {
2140 if (ISSET_PIXCOLOR (Color_UL))
2141 fore = Color_UL;
2142 }
2143#endif
2144
2127 if (rvid) 2145 if (rvid)
2128 { 2146 {
2129 SWAP_IT (fore, back, int); 2147 SWAP_IT (fore, back, int);
2130 2148
2131#ifndef NO_BOLD_UNDERLINE_REVERSE 2149#ifndef NO_BOLD_UNDERLINE_REVERSE
… …
2134 && !ISSET_PIXCOLOR (Color_cursor) 2152 && !ISSET_PIXCOLOR (Color_cursor)
2135# endif 2153# endif
2136 ) 2154 )
2137 back = Color_RV; 2155 back = Color_RV;
2138#endif 2156#endif
2139
2140 } 2157 }
2158
2141#ifdef TEXT_BLINK 2159#ifdef TEXT_BLINK
2142 if (rend & RS_Blink) 2160 if (rend & RS_Blink && back == Color_bg)
2143 { 2161 {
2144 if (!text_blink_ev.active) 2162 if (!text_blink_ev.active)
2145 { 2163 {
2146 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); 2164 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
2147 hidden_text = 0; 2165 hidden_text = 0;
2148 } 2166 }
2149 else if (hidden_text) 2167 else if (hidden_text)
2150 fore = back; 2168 fore = back;
2151 }
2152#endif
2153#ifndef NO_BOLD_UNDERLINE_REVERSE
2154 else if (rend & RS_Bold)
2155 {
2156 if (ISSET_PIXCOLOR (Color_BD))
2157 fore = Color_BD;
2158 else if (fore == Color_fg)
2159 fore = Color_White;
2160 }
2161 else if (rend & RS_Uline)
2162 {
2163 if (ISSET_PIXCOLOR (Color_UL))
2164 fore = Color_UL;
2165 } 2169 }
2166#endif 2170#endif
2167 2171
2168 /* 2172 /*
2169 * Actually do the drawing of the string here 2173 * Actually do the drawing of the string here
… …
2211 [screen.cur.col]); 2215 [screen.cur.col]);
2212 *srp ^= RS_RVid; 2216 *srp ^= RS_RVid;
2213#ifndef NO_CURSORCOLOR 2217#ifndef NO_CURSORCOLOR
2214 *srp = (*srp & ~ (RS_fgMask | RS_bgMask)) | cc1; 2218 *srp = (*srp & ~ (RS_fgMask | RS_bgMask)) | cc1;
2215#endif 2219#endif
2216
2217 } 2220 }
2218 else if (oldcursor.row >= 0) 2221 else if (oldcursor.row >= 0)
2219 { 2222 {
2220#ifndef NO_CURSORCOLOR 2223#ifndef NO_CURSORCOLOR
2221 if (ISSET_PIXCOLOR (Color_cursor)) 2224 if (ISSET_PIXCOLOR (Color_cursor))
2222 XSetForeground (display->display, TermWin.gc, PixColors[Color_cursor]); 2225 XSetForeground (display->display, TermWin.gc, PixColors[Color_cursor]);
2223#endif 2226#endif
2227 int cursorwidth = 1;
2228 while (oldcursor.col + cursorwidth < TermWin.ncol
2229 && drawn_text[oldcursor.row][oldcursor.col + cursorwidth] == NOCHAR)
2230 cursorwidth++;
2231
2224 XDrawRectangle (display->display, drawBuffer, TermWin.gc, 2232 XDrawRectangle (display->display, drawBuffer, TermWin.gc,
2225 Col2Pixel (oldcursor.col), 2233 Col2Pixel (oldcursor.col),
2226 Row2Pixel (oldcursor.row), 2234 Row2Pixel (oldcursor.row),
2227 (unsigned int) (Width2Pixel (cursorwidth) - 1), 2235 (unsigned int) (Width2Pixel (cursorwidth) - 1),
2228 (unsigned int) (Height2Pixel (1) - TermWin.lineSpace - 1)); 2236 (unsigned int) (Height2Pixel (1) - TermWin.lineSpace - 1));
… …
2482 } 2490 }
2483 2491
2484 for (;;) 2492 for (;;)
2485 { 2493 {
2486 if (XGetWindowProperty (display->display, win, prop, (long) (nread / 4), 2494 if (XGetWindowProperty (display->display, win, prop, (long) (nread / 4),
2487 (long) (PROP_SIZE / 4), delete_prop, 2495 (long) (PROP_SIZE / 4), delete_prop,
2488 AnyPropertyType, &ct.encoding, &ct.format, 2496 AnyPropertyType, &ct.encoding, &ct.format,
2489 &ct.nitems, &bytes_after, 2497 &ct.nitems, &bytes_after,
2490 &ct.value) != Success) 2498 &ct.value) != Success)
2491 break; 2499 break;
2492 2500
2493 if (ct.encoding == 0) 2501 if (ct.encoding == 0)
2494 { 2502 {
2495 D_SELECT ((stderr, "rxvt_selection_paste: property didn't exist!")); 2503 D_SELECT ((stderr, "rxvt_selection_paste: property didn't exist!"));
… …
2503 } 2511 }
2504 2512
2505 if (ct.nitems == 0) 2513 if (ct.nitems == 0)
2506 { 2514 {
2507 D_SELECT ((stderr, "rxvt_selection_paste: property empty - also INCR end")); 2515 D_SELECT ((stderr, "rxvt_selection_paste: property empty - also INCR end"));
2508 if (selection_wait == Sel_normal && nread == 0) 2516 if (selection_wait == Sel_normal && nread == 0
2517 && (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion
2509 { 2518 {
2510 /* 2519 /*
2511 * pass through again trying CUT_BUFFER0 if we've come from 2520 * pass through again trying CUT_BUFFER0 if we've come from
2512 * XConvertSelection () but nothing was presented 2521 * XConvertSelection () but nothing was presented
2513 */ 2522 */
… …
2726 selection.op = SELECTION_DONE; 2735 selection.op = SELECTION_DONE;
2727 /* FALLTHROUGH */ 2736 /* FALLTHROUGH */
2728 default: 2737 default:
2729 return; 2738 return;
2730 } 2739 }
2740
2731 selection.op = SELECTION_DONE; 2741 selection.op = SELECTION_DONE;
2732 2742
2733 if (selection.clicks == 4) 2743 if (selection.clicks == 4)
2734 return; /* nothing selected, go away */ 2744 return; /* nothing selected, go away */
2735 2745
… …
2786 { 2796 {
2787 free (new_selection_text); 2797 free (new_selection_text);
2788 return; 2798 return;
2789 } 2799 }
2790 2800
2791 // due to MB_MAX_CUR, selection wastage is usually high, so realloc 2801 // due to MB_CUR_MAX, selection wastage is usually high, so realloc
2792 if (str - (char *)new_selection_text > 1024) 2802 if (str - (char *)new_selection_text > 1024)
2793 new_selection_text = (unsigned char *)rxvt_realloc (new_selection_text, i + 1); 2803 new_selection_text = (unsigned char *)rxvt_realloc (new_selection_text, i + 1);
2794 2804
2795 selection.len = i; 2805 selection.len = i;
2796 2806
… …
2810 char *cl = (char *)selection.text; 2820 char *cl = (char *)selection.text;
2811 2821
2812 if (XmbTextListToTextProperty (display->display, &cl, 1, XStringStyle, &ct) >= 0) 2822 if (XmbTextListToTextProperty (display->display, &cl, 1, XStringStyle, &ct) >= 0)
2813 { 2823 {
2814 XChangeProperty (display->display, display->root, XA_CUT_BUFFER0, XA_STRING, 8, 2824 XChangeProperty (display->display, display->root, XA_CUT_BUFFER0, XA_STRING, 8,
2815 PropModeReplace, ct.value, ct.nitems); 2825 PropModeReplace, ct.value, ct.nitems);
2816 XFree (ct.value); 2826 XFree (ct.value);
2817 } 2827 }
2818 else 2828 else
2819 XChangeProperty (display->display, display->root, XA_CUT_BUFFER0, XA_STRING, 8, 2829 XChangeProperty (display->display, display->root, XA_CUT_BUFFER0, XA_STRING, 8,
2820 PropModeReplace, selection.text, (int)selection.len); 2830 PropModeReplace, selection.text, (int)selection.len);
2821 } 2831 }
2822 2832
2823 selection_time = tm; 2833 selection_time = tm;
2824 D_SELECT ((stderr, "rxvt_selection_make (): selection.len=%d", selection.len)); 2834 D_SELECT ((stderr, "rxvt_selection_make (): selection.len=%d", selection.len));
2825} 2835}

Diff Legend

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