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.30 by pcg, Fri Feb 13 12:16:21 2004 UTC vs.
Revision 1.54 by pcg, Thu Mar 11 00:53:19 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;
… …
485 prev_nrow = prev_ncol = 0; 487 prev_nrow = prev_ncol = 0;
486 scr_reset (); 488 scr_reset ();
487 489
488 scr_clear (); 490 scr_clear ();
489 scr_refresh (SLOW_REFRESH); 491 scr_refresh (SLOW_REFRESH);
490#ifdef RXVT_GRAPHICS
491 Gr_reset ();
492#endif
493} 492}
494 493
495/* ------------------------------------------------------------------------- * 494/* ------------------------------------------------------------------------- *
496 * PROCESS SCREEN COMMANDS * 495 * PROCESS SCREEN COMMANDS *
497 * ------------------------------------------------------------------------- */ 496 * ------------------------------------------------------------------------- */
… …
593# endif 592# endif
594 SWAP_IT (screen.charset, swap.charset, int16_t); 593 SWAP_IT (screen.charset, swap.charset, int16_t);
595 SWAP_IT (screen.flags, swap.flags, int); 594 SWAP_IT (screen.flags, swap.flags, int);
596 screen.flags |= Screen_VisibleCursor; 595 screen.flags |= Screen_VisibleCursor;
597 swap.flags |= Screen_VisibleCursor; 596 swap.flags |= Screen_VisibleCursor;
598
599# ifdef RXVT_GRAPHICS
600
601 if (Gr_Displayed ())
602 {
603 Gr_scroll (0);
604 Gr_ChangeScreen ();
605 }
606# endif
607#else 597#else
608# ifdef SCROLL_ON_NO_SECONDARY 598# ifdef SCROLL_ON_NO_SECONDARY
609# ifdef RXVT_GRAPHICS
610 if (Gr_Displayed ())
611 Gr_ClearScreen ();
612# endif
613 if (current_screen == PRIMARY 599 if (current_screen == PRIMARY)
614# ifdef RXVT_GRAPHICS
615 && !Gr_Displayed ()
616# endif
617 )
618 scr_scroll_text (0, (prev_nrow - 1), prev_nrow, 0); 600 scr_scroll_text (0, (prev_nrow - 1), prev_nrow, 0);
619# endif 601# endif
620#endif 602#endif
621 return scrn; 603 return scrn;
622} 604}
… …
772 if (!spec) /* line length may not equal TermWin.ncol */ 754 if (!spec) /* line length may not equal TermWin.ncol */
773 scr_blank_screen_mem (screen.text, screen.rend, 755 scr_blank_screen_mem (screen.text, screen.rend,
774 (unsigned int)j, rstyle); 756 (unsigned int)j, rstyle);
775 } 757 }
776 758
777#ifdef RXVT_GRAPHICS
778 if (Gr_Displayed ())
779 Gr_scroll (count);
780#endif
781
782 return count; 759 return count;
783} 760}
784 761
785/* ------------------------------------------------------------------------- */ 762/* ------------------------------------------------------------------------- */
786/* 763/*
787 * Add text given in <str> of length <len> to screen struct 764 * Add text given in <str> of length <len> to screen struct
788 */ 765 */
789void 766void
790rxvt_term::scr_add_lines (const uint32_t *str, int nlines, int len) 767rxvt_term::scr_add_lines (const uint32_t *str, int nlines, int len)
791{ 768{
792 unsigned char checksel, clearsel; 769 unsigned char checksel, clearsel;
793 uint32_t c; 770 uint32_t c;
794 int i, row, last_col; 771 int i, row, last_col;
795 text_t *stp; 772 text_t *stp;
796 rend_t *srp; 773 rend_t *srp;
797 774
798 if (len <= 0) /* sanity */ 775 if (len <= 0) /* sanity */
799 return; 776 return;
800 777
801 want_refresh = 1; 778 want_refresh = 1;
… …
869 && ROWCOL_IS_BEFORE (screen.cur, selection.end)) 846 && ROWCOL_IS_BEFORE (screen.cur, selection.end))
870 { 847 {
871 checksel = 0; 848 checksel = 0;
872 clearsel = 1; 849 clearsel = 1;
873 } 850 }
851
874 if (screen.flags & Screen_WrapNext) 852 if (screen.flags & Screen_WrapNext)
875 { 853 {
876 screen.tlen[row] = -1; 854 screen.tlen[row] = -1;
877 if (screen.cur.row == screen.bscroll) 855 if (screen.cur.row == screen.bscroll)
878 scr_scroll_text (screen.tscroll, screen.bscroll, 1, 0); 856 scr_scroll_text (screen.tscroll, screen.bscroll, 1, 0);
879 else if (screen.cur.row < (TermWin.nrow - 1)) 857 else if (screen.cur.row < (TermWin.nrow - 1))
880 row = (++screen.cur.row) + TermWin.saveLines; 858 row = (++screen.cur.row) + TermWin.saveLines;
859
881 stp = screen.text[row]; /* _must_ refresh */ 860 stp = screen.text[row]; /* _must_ refresh */
882 srp = screen.rend[row]; /* _must_ refresh */ 861 srp = screen.rend[row]; /* _must_ refresh */
883 screen.cur.col = 0; 862 screen.cur.col = 0;
884 screen.flags &= ~Screen_WrapNext; 863 screen.flags &= ~Screen_WrapNext;
885 } 864 }
865
886 if (screen.flags & Screen_Insert) 866 if (screen.flags & Screen_Insert)
887 scr_insdel_chars (1, INSERT); 867 scr_insdel_chars (1, INSERT);
868
869 if (IS_COMPOSE (c))
870 c = REPLACEMENT_CHAR;
871
872 // rely on wcwidth to tell us the character width, at least for non-latin1
873 // do wcwidth before further replacements, as wcwidth says that line-drawing
874 // characters have width -1 (DOH!) on gnu/linux sometimes.
875 int width = c < 256 ? 1 : wcwidth (c);
888 876
889 if (charsets[screen.charset] == '0') // DEC SPECIAL 877 if (charsets[screen.charset] == '0') // DEC SPECIAL
890 switch (c) 878 switch (c)
891 { 879 {
892 case '+': c = 0x2192; break; case ',': c = 0x2190; break; case '-': c = 0x2191; break; 880 // vt100 special graphics and line drawing
893 case '.': c = 0x2193; break; case '0': c = 0x25ae; break; case '`': c = 0x25c6; break; 881 case '`': c = 0x25c6; break; case '_': c = 0x0020; break;
894 case 'a': c = 0x2592; break; case 'f': c = 0x00b0; break; case 'g': c = 0x00b1; break; 882 case 'a': c = 0x2592; break; case 'b': c = 0x2409; break; case 'c': c = 0x240c; break;
895 case 'h': c = 0x2592; break; case 'i': c = 0x2603; break; case 'j': c = 0x2518; break;
896 case 'k': c = 0x2510; break; case 'l': c = 0x250c; break; case 'm': c = 0x2514; break; 883 case 'd': c = 0x240d; break; case 'e': c = 0x240a; break; case 'f': c = 0x00b0; break;
884 case 'g': c = 0x00b1; break; case 'h': c = 0x2424; break; case 'i': c = 0x240b; break;
897 case 'n': c = 0x253c; break; case 'o': c = 0x23ba; break; case 'p': c = 0x23bb; break; 885 case 'j': c = 0x2518; break; case 'k': c = 0x2510; break; case 'l': c = 0x250c; break;
898 case 'q': c = 0x2500; break; case 'r': c = 0x23bc; break; case 's': c = 0x23bd; break; 886 case 'm': c = 0x2514; break; case 'n': c = 0x253c; break; case 'o': c = 0x23ba; break;
899 case 't': c = 0x251c; break; case 'u': c = 0x2524; break; case 'v': c = 0x2534; break; 887 case 'p': c = 0x23bb; break; case 'q': c = 0x2500; break; case 'r': c = 0x23bc; break;
900 case 'w': c = 0x252c; break; case 'x': c = 0x2502; break; case 'y': c = 0x2264; break; 888 case 's': c = 0x23bd; break; case 't': c = 0x251c; break; case 'u': c = 0x2524; break;
901 case 'z': c = 0x2265; break; case '{': c = 0x03c0; break; case '|': c = 0x2260; break; 889 case 'v': c = 0x2534; break; case 'w': c = 0x252c; break; case 'x': c = 0x2502; break;
890 case 'y': c = 0x2264; break; case 'z': c = 0x2265; break; case '{': c = 0x03c0; break;
902 case '}': c = 0x00a3; break; case '~': c = 0x00b7; break; 891 case '|': c = 0x2260; break; case '}': c = 0x00a3; break; case '~': c = 0x00b7; break;
903 } 892 }
893
904 894
905 rend_t rend = SET_FONT (rstyle, TermWin.fontset->find_font (c));
906 // rely on wcwidth to tell us the character width, at least for non-ascii
907 int width = c <= 128 ? 1 : wcwidth (c);
908
909 // width -1 characters (e.g. combining chars) are ignored currently.
910 if (width > 0) 895 if (width > 0)
896 {
897#if !UNICODE_3
898 // trim characters we can't store directly :(
899 if (c >= 0x10000)
900 c = rxvt_composite.compose (c); // map to lower 16 bits
901#endif
902 rend_t rend = SET_FONT (rstyle, TermWin.fontset->find_font (c));
903
911 do 904 do
912 { 905 {
913 stp[screen.cur.col] = c; 906 stp[screen.cur.col] = c;
914 srp[screen.cur.col] = rend; 907 srp[screen.cur.col] = rend;
915 908
916 if (screen.cur.col < last_col - 1) 909 if (screen.cur.col < last_col - 1)
917 screen.cur.col++; 910 screen.cur.col++;
918 else 911 else
919 { 912 {
920 screen.tlen[row] = last_col; 913 screen.tlen[row] = last_col;
921 if (screen.flags & Screen_Autowrap) 914 if (screen.flags & Screen_Autowrap)
922 screen.flags |= Screen_WrapNext; 915 screen.flags |= Screen_WrapNext;
923 break; 916 break;
924 } 917 }
925 918
926 c = NOCHAR; 919 c = NOCHAR;
927 } 920 }
928 while (--width > 0); 921 while (--width > 0);
922
923 // pad with spaces when overwriting wide character with smaller one
924 for (int c = screen.cur.col; c < last_col && stp[c] == NOCHAR; c++)
925 {
926 stp[c] = ' ';
927 srp[c] = rend;
928 }
929 }
930 else if (width == 0)
931 {
932#if ENCODING_COMPOSE
933 // handle combining characters
934 // we just tag the accent on the previous on-screen character.
935 // this is arguably not correct, but also arguably not wrong.
936 // we don't handle double-width characters nicely yet.
937
938 text_t *tp;
939 rend_t *rp;
940
941 if (screen.cur.col > 0)
942 {
943 tp = stp + screen.cur.col - 1;
944 rp = srp + screen.cur.col - 1;
945 }
946 else if (screen.cur.row > 0
947 && screen.tlen [screen.cur.row - 1 + TermWin.saveLines] == -1)
948 {
949 tp = screen.text[screen.cur.row - 1 + TermWin.saveLines] + last_col - 1;
950 rp = screen.rend[screen.cur.row - 1 + TermWin.saveLines] + last_col - 1;
951 }
929 else 952 else
930 (void)0; /* handle combining character etc. here. */ 953 continue;
954
955 // handle double-width-chars by making them look extremely ugly
956 if (*tp == NOCHAR)
957 *tp = ' '; // hack //D //TODO //--tp, --rp;
958
959 // first try to find a precomposed character
960 uint32_t n = rxvt_compose (*tp, c);
961 if (n == NOCHAR)
962 n = rxvt_composite.compose (*tp, c);
963
964 *tp = n;
965 *rp = SET_FONT (*rp, TermWin.fontset->find_font (*tp));
966#endif
967 }
931 } 968 }
932 969
933 if (screen.tlen[row] != -1) /* XXX: think about this */ 970 if (screen.tlen[row] != -1) /* XXX: think about this */
934 MAX_IT (screen.tlen[row], screen.cur.col); 971 MAX_IT (screen.tlen[row], screen.cur.col);
935 972
… …
1075void 1112void
1076rxvt_term::scr_gotorc (int row, int col, int relative) 1113rxvt_term::scr_gotorc (int row, int col, int relative)
1077{ 1114{
1078 want_refresh = 1; 1115 want_refresh = 1;
1079 ZERO_SCROLLBACK (); 1116 ZERO_SCROLLBACK ();
1080#ifdef RXVT_GRAPHICS
1081 if (Gr_Displayed ())
1082 Gr_scroll (0);
1083#endif
1084 1117
1085 D_SCREEN ((stderr, "rxvt_scr_gotorc (r:%s%d,c:%s%d): from (r:%d,c:%d)", (relative & R_RELATIVE ? "+" : ""), row, (relative & C_RELATIVE ? "+" : ""), col, screen.cur.row, screen.cur.col)); 1118 D_SCREEN ((stderr, "rxvt_scr_gotorc (r:%s%d,c:%s%d): from (r:%d,c:%d)", (relative & R_RELATIVE ? "+" : ""), row, (relative & C_RELATIVE ? "+" : ""), col, screen.cur.row, screen.cur.col));
1086 1119
1087 screen.cur.col = ((relative & C_RELATIVE) ? (screen.cur.col + col) 1120 screen.cur.col = ((relative & C_RELATIVE) ? (screen.cur.col + col)
1088 : col); 1121 : col);
… …
1119 else 1152 else
1120 screen.cur.row = row; 1153 screen.cur.row = row;
1121 } 1154 }
1122 MAX_IT (screen.cur.row, 0); 1155 MAX_IT (screen.cur.row, 0);
1123 MIN_IT (screen.cur.row, (int32_t)TermWin.nrow - 1); 1156 MIN_IT (screen.cur.row, (int32_t)TermWin.nrow - 1);
1157
1158 while (screen.cur.col > 0
1159 && screen.text[screen.cur.row + TermWin.saveLines][screen.cur.col] == NOCHAR)
1160 screen.cur.col--;
1124} 1161}
1125 1162
1126/* ------------------------------------------------------------------------- */ 1163/* ------------------------------------------------------------------------- */
1127/* 1164/*
1128 * direction should be UP or DN 1165 * direction should be UP or DN
… …
1135 want_refresh = 1; 1172 want_refresh = 1;
1136 dirn = ((direction == UP) ? 1 : -1); 1173 dirn = ((direction == UP) ? 1 : -1);
1137 D_SCREEN ((stderr, "rxvt_scr_index (%d)", dirn)); 1174 D_SCREEN ((stderr, "rxvt_scr_index (%d)", dirn));
1138 1175
1139 ZERO_SCROLLBACK (); 1176 ZERO_SCROLLBACK ();
1140
1141#ifdef RXVT_GRAPHICS
1142 if (Gr_Displayed ())
1143 Gr_scroll (0);
1144#endif
1145 1177
1146 screen.flags &= ~Screen_WrapNext; 1178 screen.flags &= ~Screen_WrapNext;
1147 if ((screen.cur.row == screen.bscroll && direction == UP) 1179 if ((screen.cur.row == screen.bscroll && direction == UP)
1148 || (screen.cur.row == screen.tscroll && direction == DN)) 1180 || (screen.cur.row == screen.tscroll && direction == DN))
1149 scr_scroll_text (screen.tscroll, screen.bscroll, dirn, 0); 1181 scr_scroll_text (screen.tscroll, screen.bscroll, dirn, 0);
… …
1167 unsigned int row, col, num; 1199 unsigned int row, col, num;
1168 1200
1169 want_refresh = 1; 1201 want_refresh = 1;
1170 D_SCREEN ((stderr, "rxvt_scr_erase_line (%d) at screen row: %d", mode, screen.cur.row)); 1202 D_SCREEN ((stderr, "rxvt_scr_erase_line (%d) at screen row: %d", mode, screen.cur.row));
1171 ZERO_SCROLLBACK (); 1203 ZERO_SCROLLBACK ();
1172
1173#ifdef RXVT_GRAPHICS
1174 if (Gr_Displayed ())
1175 Gr_scroll (0);
1176#endif
1177 1204
1178 selection_check (1); 1205 selection_check (1);
1179 1206
1180 screen.flags &= ~Screen_WrapNext; 1207 screen.flags &= ~Screen_WrapNext;
1181 1208
… …
1250 row = 0; 1277 row = 0;
1251 num = screen.cur.row; 1278 num = screen.cur.row;
1252 break; 1279 break;
1253 case 2: /* erase whole screen */ 1280 case 2: /* erase whole screen */
1254 selection_check (3); 1281 selection_check (3);
1255#ifdef RXVT_GRAPHICS
1256 Gr_ClearScreen ();
1257#endif
1258 row = 0; 1282 row = 0;
1259 num = TermWin.nrow; 1283 num = TermWin.nrow;
1260 break; 1284 break;
1261 default: 1285 default:
1262 return; 1286 return;
… …
1331{ 1355{
1332 int end; 1356 int end;
1333 1357
1334 ZERO_SCROLLBACK (); 1358 ZERO_SCROLLBACK ();
1335 1359
1336#ifdef RXVT_GRAPHICS
1337 if (Gr_Displayed ())
1338 Gr_scroll (0);
1339#endif
1340
1341 selection_check (1); 1360 selection_check (1);
1342 1361
1343 if (screen.cur.row > screen.bscroll) 1362 if (screen.cur.row > screen.bscroll)
1344 return; 1363 return;
1345 1364
… …
1369 rend_t *srp; 1388 rend_t *srp;
1370 int16_t *slp; 1389 int16_t *slp;
1371 1390
1372 want_refresh = 1; 1391 want_refresh = 1;
1373 ZERO_SCROLLBACK (); 1392 ZERO_SCROLLBACK ();
1374
1375#ifdef RXVT_GRAPHICS
1376 if (Gr_Displayed ())
1377 Gr_scroll (0);
1378#endif
1379 1393
1380 if (count <= 0) 1394 if (count <= 0)
1381 return; 1395 return;
1382 1396
1383 selection_check (1); 1397 selection_check (1);
… …
1808rxvt_term::scr_changeview (uint16_t oldviewstart) 1822rxvt_term::scr_changeview (uint16_t oldviewstart)
1809{ 1823{
1810 if (TermWin.view_start != oldviewstart) 1824 if (TermWin.view_start != oldviewstart)
1811 { 1825 {
1812 want_refresh = 1; 1826 want_refresh = 1;
1813#ifdef RXVT_GRAPHICS
1814 if (Gr_Displayed ())
1815 Gr_scroll (0);
1816#endif
1817 num_scr -= (TermWin.view_start - oldviewstart); 1827 num_scr -= (TermWin.view_start - oldviewstart);
1818 } 1828 }
1819 return (int) (TermWin.view_start - oldviewstart); 1829 return (int) (TermWin.view_start - oldviewstart);
1820} 1830}
1821 1831
… …
1891 ((Y) >= (X)->min_char_or_byte2 && (Y) <= (X)->max_char_or_byte2) 1901 ((Y) >= (X)->min_char_or_byte2 && (Y) <= (X)->max_char_or_byte2)
1892 1902
1893void 1903void
1894rxvt_term::scr_refresh (unsigned char refresh_type) 1904rxvt_term::scr_refresh (unsigned char refresh_type)
1895{ 1905{
1896 unsigned char clearfirst, /* first character writes before cell */ 1906 unsigned char clearfirst, /* first character writes before cell */
1897 clearlast, /* last character writes beyond cell */ 1907 clearlast, /* last character writes beyond cell */
1898 must_clear, /* use draw_string not draw_image_string */ 1908 must_clear, /* use draw_string not draw_image_string */
1899 rvid, /* reverse video this position */ 1909 rvid, /* reverse video this position */
1900 showcursor; /* show the cursor */ 1910 showcursor; /* show the cursor */
1901 int16_t col, row, /* column/row we're processing */ 1911 int16_t col, row, /* column/row we're processing */
1902 ocrow; /* old cursor row */ 1912 ocrow; /* old cursor row */
1903 int cursorwidth;
1904 int i, /* tmp */ 1913 int i, /* tmp */
1905 row_offset; /* basic offset in screen structure */ 1914 row_offset; /* basic offset in screen structure */
1906#ifndef NO_CURSORCOLOR 1915#ifndef NO_CURSORCOLOR
1907 rend_t cc1; /* store colours at cursor position (s) */ 1916 rend_t cc1; /* store colours at cursor position (s) */
1908#endif 1917#endif
1909 rend_t *drp, *srp; /* drawn-rend-pointer, screen-rend-pointer */ 1918 rend_t *drp, *srp; /* drawn-rend-pointer, screen-rend-pointer */
1910 text_t *dtp, *stp; /* drawn-text-pointer, screen-text-pointer */ 1919 text_t *dtp, *stp; /* drawn-text-pointer, screen-text-pointer */
1911 1920
1912 if (refresh_type == NO_REFRESH || !TermWin.mapped) 1921 if (refresh_type == NO_REFRESH || !TermWin.mapped)
1913 return; 1922 return;
1914 1923
1915 /* 1924 /*
… …
1947 unsigned char setoldcursor; 1956 unsigned char setoldcursor;
1948 rend_t ccol1, /* Cursor colour */ 1957 rend_t ccol1, /* Cursor colour */
1949 ccol2; /* Cursor colour2 */ 1958 ccol2; /* Cursor colour2 */
1950 1959
1951 showcursor = (screen.flags & Screen_VisibleCursor); 1960 showcursor = (screen.flags & Screen_VisibleCursor);
1952 cursorwidth = 0;
1953#ifdef CURSOR_BLINK 1961#ifdef CURSOR_BLINK
1954 if (hidden_cursor) 1962 if (hidden_cursor)
1955 showcursor = 0; 1963 showcursor = 0;
1956#endif 1964#endif
1957 1965
1958 cursorwidth = 0;
1959
1960 if (showcursor) 1966 if (showcursor)
1961 { 1967 {
1962 cursorwidth++;
1963
1964 srp = & (screen.rend[screen.cur.row + TermWin.saveLines] 1968 srp = & (screen.rend[screen.cur.row + TermWin.saveLines]
1965 [screen.cur.col]); 1969 [screen.cur.col]);
1966 1970
1967 if (showcursor && TermWin.focus) 1971 if (showcursor && TermWin.focus)
1968 { 1972 {
… …
1986 ccol2 = Color_bg; 1990 ccol2 = Color_bg;
1987#endif 1991#endif
1988 *srp = SET_FGCOLOR (*srp, ccol1); 1992 *srp = SET_FGCOLOR (*srp, ccol1);
1989 *srp = SET_BGCOLOR (*srp, ccol2); 1993 *srp = SET_BGCOLOR (*srp, ccol2);
1990#endif 1994#endif
1991
1992 } 1995 }
1993 } 1996 }
1994 1997
1995 /* make sure no outline cursor is left around */ 1998 /* make sure no outline cursor is left around */
1996 setoldcursor = 0; 1999 setoldcursor = 0;
… …
2109 int ypixel = (int)Row2Pixel (row); 2112 int ypixel = (int)Row2Pixel (row);
2110 2113
2111 for (col = 0; col < TermWin.ncol; col++) 2114 for (col = 0; col < TermWin.ncol; col++)
2112 { 2115 {
2113 /* compare new text with old - if exactly the same then continue */ 2116 /* compare new text with old - if exactly the same then continue */
2117 if (stp[col] == dtp[col] /* Must match characters to skip. */
2118 && (srp[col] == drp[col] /* Either rendition the same or */
2119 || (stp[col] == ' ' /* space w/ no background change */
2120 && GET_BGATTR (srp[col]) == GET_BGATTR (drp[col]))))
2121 continue;
2122
2123 // redraw one or more characters
2124
2125 // seek to the beginning if wide characters
2126 while (stp[col] == NOCHAR && col > 0)
2127 --col;
2128
2114 rend_t rend = srp[col]; /* screen rendition (target rendtion) */ 2129 rend_t rend = srp[col]; /* screen rendition (target rendtion) */
2115
2116 if (stp[col] == dtp[col] /* Must match characters to skip. */
2117 && (rend == drp[col] /* Either rendition the same or */
2118 || (stp[col] == ' ' /* space w/ no background change */
2119 && GET_BGATTR (rend) == GET_BGATTR (drp[col]))))
2120 continue;
2121
2122 text_t *text = stp + col; 2130 text_t *text = stp + col;
2123 int count = 1; 2131 int count = 1;
2124 2132
2125 /* redraw one or more characters */
2126
2127 dtp[col] = stp[col]; 2133 dtp[col] = stp[col];
2128 drp[col] = rend; 2134 drp[col] = rend;
2129
2130 if (*text == NOCHAR) // never start redrawing at invisible characters. */
2131 continue;
2132 2135
2133 int xpixel = Col2Pixel (col); 2136 int xpixel = Col2Pixel (col);
2134 2137
2135 // this loop looks very messy, it can probably be optimized 2138 // this loop looks very messy, it can probably be optimized
2136 // and cleaned a bit by you? 2139 // and cleaned a bit by you?
… …
2177 int fore = GET_FGCOLOR (rend); // desired foreground 2180 int fore = GET_FGCOLOR (rend); // desired foreground
2178 int back = GET_BGCOLOR (rend); // desired background 2181 int back = GET_BGCOLOR (rend); // desired background
2179 2182
2180 rend = GET_ATTR (rend); 2183 rend = GET_ATTR (rend);
2181 2184
2182 rvid = !! (rend & RS_RVid); 2185 rvid = !!(rend & RS_RVid);
2186
2187#ifndef NO_BOLD_UNDERLINE_REVERSE
2188 if (rend & RS_Bold && fore == Color_fg)
2189 {
2190 if (ISSET_PIXCOLOR (Color_BD))
2191 fore = Color_BD;
2192 else
2193 rvid = !rvid;
2194 }
2195
2196 if (rend & RS_Uline)
2197 {
2198 if (ISSET_PIXCOLOR (Color_UL))
2199 fore = Color_UL;
2200 }
2201#endif
2202
2183 if (rvid) 2203 if (rvid)
2184 { 2204 {
2185 SWAP_IT (fore, back, int); 2205 SWAP_IT (fore, back, int);
2186 2206
2187#ifndef NO_BOLD_UNDERLINE_REVERSE 2207#ifndef NO_BOLD_UNDERLINE_REVERSE
… …
2190 && !ISSET_PIXCOLOR (Color_cursor) 2210 && !ISSET_PIXCOLOR (Color_cursor)
2191# endif 2211# endif
2192 ) 2212 )
2193 back = Color_RV; 2213 back = Color_RV;
2194#endif 2214#endif
2195
2196 } 2215 }
2216
2197#ifdef TEXT_BLINK 2217#ifdef TEXT_BLINK
2198 if (rend & RS_Blink) 2218 if (rend & RS_Blink && back == Color_bg)
2199 { 2219 {
2200 if (!text_blink_ev.active) 2220 if (!text_blink_ev.active)
2201 { 2221 {
2202 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); 2222 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
2203 hidden_text = 0; 2223 hidden_text = 0;
2204 } 2224 }
2205 else if (hidden_text) 2225 else if (hidden_text)
2206 fore = back; 2226 fore = back;
2207 } 2227 }
2208#endif 2228#endif
2209#ifndef NO_BOLD_UNDERLINE_REVERSE
2210 else if (rend & RS_Bold)
2211 {
2212 if (ISSET_PIXCOLOR (Color_BD))
2213 fore = Color_BD;
2214 else if (fore == Color_fg)
2215 fore = Color_White;
2216 }
2217 else if (rend & RS_Uline)
2218 {
2219 if (ISSET_PIXCOLOR (Color_UL))
2220 fore = Color_UL;
2221 }
2222#endif
2223 2229
2224 /* 2230 /*
2225 * Actually do the drawing of the string here 2231 * Actually do the drawing of the string here
2226 */ 2232 */
2227 rxvt_font *font = (*TermWin.fontset)[fid]; 2233 rxvt_font *font = (*TermWin.fontset)[fid];
2228 2234
2229 if (back == fore) 2235 if (back == fore)
2230 font->clear_rect (xpixel, ypixel, 2236 font->clear_rect (*TermWin.drawable, xpixel, ypixel,
2231 TermWin.fwidth * count, TermWin.fheight, 2237 TermWin.fwidth * count, TermWin.fheight,
2232 back); 2238 back);
2233 else if (back == Color_bg) 2239 else if (back == Color_bg)
2234 { 2240 {
2235 if (must_clear) 2241 if (must_clear)
… …
2237 CLEAR_CHARS (xpixel, ypixel, count); 2243 CLEAR_CHARS (xpixel, ypixel, count);
2238 2244
2239 for (i = 0; i < count; i++) /* don't draw empty strings */ 2245 for (i = 0; i < count; i++) /* don't draw empty strings */
2240 if (text[i] != ' ') 2246 if (text[i] != ' ')
2241 { 2247 {
2242 font->draw (xpixel, ypixel, text, count, fore, -1); 2248 font->draw (*TermWin.drawable, xpixel, ypixel, text, count, fore, -1);
2243 break; 2249 break;
2244 } 2250 }
2245 } 2251 }
2246 else 2252 else
2247 font->draw (xpixel, ypixel, text, count, fore, Color_bg); 2253 font->draw (*TermWin.drawable, xpixel, ypixel, text, count, fore, Color_bg);
2248 } 2254 }
2249 else 2255 else
2250 font->draw (xpixel, ypixel, text, count, fore, back); 2256 font->draw (*TermWin.drawable, xpixel, ypixel, text, count, fore, back);
2251 2257
2252 if ((rend & RS_Uline) && (font->descent > 1)) 2258 if ((rend & RS_Uline) && (font->descent > 1))
2253 XDrawLine (display->display, drawBuffer, TermWin.gc, 2259 XDrawLine (display->display, drawBuffer, TermWin.gc,
2254 xpixel, ypixel + font->ascent + 1, 2260 xpixel, ypixel + font->ascent + 1,
2255 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1); 2261 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1);
2256 } /* for (col....) */ 2262 } /* for (col....) */
2257 } /* for (row....) */ 2263 } /* for (row....) */
2258 2264
2259 /* 2265 /*
2260 * G: cleanup cursor and display outline cursor if necessary 2266 * G: cleanup cursor and display outline cursor if necessary
… …
2267 [screen.cur.col]); 2273 [screen.cur.col]);
2268 *srp ^= RS_RVid; 2274 *srp ^= RS_RVid;
2269#ifndef NO_CURSORCOLOR 2275#ifndef NO_CURSORCOLOR
2270 *srp = (*srp & ~ (RS_fgMask | RS_bgMask)) | cc1; 2276 *srp = (*srp & ~ (RS_fgMask | RS_bgMask)) | cc1;
2271#endif 2277#endif
2272
2273 } 2278 }
2274 else if (oldcursor.row >= 0) 2279 else if (oldcursor.row >= 0)
2275 { 2280 {
2276#ifndef NO_CURSORCOLOR 2281#ifndef NO_CURSORCOLOR
2277 if (ISSET_PIXCOLOR (Color_cursor)) 2282 if (ISSET_PIXCOLOR (Color_cursor))
2278 XSetForeground (display->display, TermWin.gc, PixColors[Color_cursor]); 2283 XSetForeground (display->display, TermWin.gc, PixColors[Color_cursor]);
2279#endif 2284#endif
2285 int cursorwidth = 1;
2286 while (oldcursor.col + cursorwidth < TermWin.ncol
2287 && drawn_text[oldcursor.row][oldcursor.col + cursorwidth] == NOCHAR)
2288 cursorwidth++;
2289
2280 XDrawRectangle (display->display, drawBuffer, TermWin.gc, 2290 XDrawRectangle (display->display, drawBuffer, TermWin.gc,
2281 Col2Pixel (oldcursor.col), 2291 Col2Pixel (oldcursor.col),
2282 Row2Pixel (oldcursor.row), 2292 Row2Pixel (oldcursor.row),
2283 (unsigned int) (Width2Pixel (cursorwidth) - 1), 2293 (unsigned int) (Width2Pixel (cursorwidth) - 1),
2284 (unsigned int) (Height2Pixel (1) - TermWin.lineSpace - 1)); 2294 (unsigned int) (Height2Pixel (1) - TermWin.lineSpace - 1));
2285 } 2295 }
2286 } 2296 }
2287 2297
2288 /* 2298 /*
2289 * H: cleanup selection 2299 * H: cleanup selection
… …
2297 /* 2307 /*
2298 * clear the whole screen height, note that width == 0 is treated 2308 * clear the whole screen height, note that width == 0 is treated
2299 * specially by XClearArea 2309 * specially by XClearArea
2300 */ 2310 */
2301 XClearArea (display->display, TermWin.vt, 0, 0, 2311 XClearArea (display->display, TermWin.vt, 0, 0,
2302 (unsigned int)TermWin.int_bwidth, 2312 (unsigned int)TermWin.int_bwidth,
2303 (unsigned int)TermWin_TotalHeight (), False); 2313 (unsigned int)TermWin_TotalHeight (), False);
2314
2304 if (clearlast && TermWin.int_bwidth) 2315 if (clearlast && TermWin.int_bwidth)
2305 /* 2316 /*
2306 * clear the whole screen height, note that width == 0 is treated 2317 * clear the whole screen height, note that width == 0 is treated
2307 * specially by XClearArea 2318 * specially by XClearArea
2308 */ 2319 */
2309 XClearArea (display->display, TermWin.vt, 2320 XClearArea (display->display, TermWin.vt,
2310 TermWin.width + TermWin.int_bwidth, 0, 2321 TermWin.width + TermWin.int_bwidth, 0,
2311 (unsigned int)TermWin.int_bwidth, 2322 (unsigned int)TermWin.int_bwidth,
2312 (unsigned int)TermWin_TotalHeight (), False); 2323 (unsigned int)TermWin_TotalHeight (), False);
2324
2313 if (refresh_type & SMOOTH_REFRESH) 2325 if (refresh_type & SMOOTH_REFRESH)
2314 XSync (display->display, False); 2326 XSync (display->display, False);
2315 2327
2316 num_scr = 0; 2328 num_scr = 0;
2317 num_scr_allow = 1; 2329 num_scr_allow = 1;
2318 want_refresh = 0; /* screen is current */ 2330 want_refresh = 0; /* screen is current */
2319} 2331}
2320 2332
2321/* ------------------------------------------------------------------------- */
2322void 2333void
2334rxvt_term::scr_remap_chars (text_t *tp, rend_t *rp)
2335{
2336 if (!rp || !tp)
2337 return;
2338
2339 for (int i = TermWin.ncol; i; i--, rp++, tp++)
2340 *rp = SET_FONT (*rp, TermWin.fontset->find_font (*tp));
2341}
2342
2343void
2323rxvt_term::scr_clear () 2344rxvt_term::scr_remap_chars ()
2345{
2346 for (int i = TermWin.nrow + TermWin.saveLines; i--; )
2347 scr_remap_chars (screen.text[i], screen.rend[i]);
2348
2349 for (int i = TermWin.nrow; i--; )
2350 {
2351 scr_remap_chars (drawn_text[i], drawn_rend[i]);
2352 scr_remap_chars (swap.text[i], swap.rend[i]);
2353 }
2354}
2355
2356/* ------------------------------------------------------------------------- */
2357void
2358rxvt_term::scr_clear (bool really)
2324{ 2359{
2325 if (!TermWin.mapped) 2360 if (!TermWin.mapped)
2326 return; 2361 return;
2327 2362
2328 num_scr_allow = 0; 2363 num_scr_allow = 0;
2329 want_refresh = 1; 2364 want_refresh = 1;
2365
2330#ifdef TRANSPARENT 2366#ifdef TRANSPARENT
2331 if ((Options & Opt_transparent) && (am_pixmap_trans == 0)) 2367 if ((Options & Opt_transparent) && (am_pixmap_trans == 0))
2332 { 2368 {
2333 int i; 2369 int i;
2334 2370
… …
2341 if (TermWin.parent[i] != None) 2377 if (TermWin.parent[i] != None)
2342 XClearWindow (display->display, TermWin.parent[i]); 2378 XClearWindow (display->display, TermWin.parent[i]);
2343 } 2379 }
2344#endif 2380#endif
2345 2381
2382 if (really)
2346 XClearWindow (display->display, TermWin.vt); 2383 XClearWindow (display->display, TermWin.vt);
2347} 2384}
2348 2385
2349/* ------------------------------------------------------------------------- */ 2386/* ------------------------------------------------------------------------- */
2350void 2387void
2351rxvt_term::scr_reverse_selection () 2388rxvt_term::scr_reverse_selection ()
2352{ 2389{
2353 int i, col, row, end_row;
2354 rend_t *srp;
2355
2356 if (selection.op && current_screen == selection.screen) 2390 if (selection.op && current_screen == selection.screen)
2357 { 2391 {
2358 end_row = TermWin.saveLines - TermWin.view_start; 2392 int end_row = TermWin.saveLines - TermWin.view_start;
2359 i = selection.beg.row + TermWin.saveLines; 2393 int i = selection.beg.row + TermWin.saveLines;
2360 row = selection.end.row + TermWin.saveLines; 2394 int col, row = selection.end.row + TermWin.saveLines;
2395 rend_t *srp;
2396
2361 if (i >= end_row) 2397 if (i >= end_row)
2362 col = selection.beg.col; 2398 col = selection.beg.col;
2363 else 2399 else
2364 { 2400 {
2365 col = 0; 2401 col = 0;
2366 i = end_row; 2402 i = end_row;
2367 } 2403 }
2404
2368 end_row += TermWin.nrow; 2405 end_row += TermWin.nrow;
2369 for (; i < row && i < end_row; i++, col = 0) 2406 for (; i < row && i < end_row; i++, col = 0)
2370 for (srp = screen.rend[i]; col < TermWin.ncol; col++) 2407 for (srp = screen.rend[i]; col < TermWin.ncol; col++)
2371 srp[col] ^= RS_RVid; 2408 srp[col] ^= RS_RVid;
2409
2372 if (i == row && i < end_row) 2410 if (i == row && i < end_row)
2373 for (srp = screen.rend[i]; col < selection.end.col; col++) 2411 for (srp = screen.rend[i]; col < selection.end.col; col++)
2374 srp[col] ^= RS_RVid; 2412 srp[col] ^= RS_RVid;
2375 } 2413 }
2376} 2414}
… …
2515 } 2553 }
2516 2554
2517 for (;;) 2555 for (;;)
2518 { 2556 {
2519 if (XGetWindowProperty (display->display, win, prop, (long) (nread / 4), 2557 if (XGetWindowProperty (display->display, win, prop, (long) (nread / 4),
2520 (long) (PROP_SIZE / 4), delete_prop, 2558 (long) (PROP_SIZE / 4), delete_prop,
2521 AnyPropertyType, &ct.encoding, &ct.format, 2559 AnyPropertyType, &ct.encoding, &ct.format,
2522 &ct.nitems, &bytes_after, 2560 &ct.nitems, &bytes_after,
2523 &ct.value) != Success) 2561 &ct.value) != Success)
2524 break; 2562 break;
2525 2563
2526 if (ct.encoding == 0) 2564 if (ct.encoding == 0)
2527 { 2565 {
2528 D_SELECT ((stderr, "rxvt_selection_paste: property didn't exist!")); 2566 D_SELECT ((stderr, "rxvt_selection_paste: property didn't exist!"));
… …
2536 } 2574 }
2537 2575
2538 if (ct.nitems == 0) 2576 if (ct.nitems == 0)
2539 { 2577 {
2540 D_SELECT ((stderr, "rxvt_selection_paste: property empty - also INCR end")); 2578 D_SELECT ((stderr, "rxvt_selection_paste: property empty - also INCR end"));
2579
2541 if (selection_wait == Sel_normal && nread == 0) 2580 if (selection_wait == Sel_normal && nread == 0
2581 && (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion
2542 { 2582 {
2543 /* 2583 /*
2544 * pass through again trying CUT_BUFFER0 if we've come from 2584 * pass through again trying CUT_BUFFER0 if we've come from
2545 * XConvertSelection () but nothing was presented 2585 * XConvertSelection () but nothing was presented
2546 */ 2586 */
… …
2599{ 2639{
2600 int reget_time = 0; 2640 int reget_time = 0;
2601 2641
2602 if (prop == None) 2642 if (prop == None)
2603 return; 2643 return;
2644
2604 D_SELECT ((stderr, "rxvt_selection_property (%08lx, %lu)", win, (unsigned long)prop)); 2645 D_SELECT ((stderr, "rxvt_selection_property (%08lx, %lu)", win, (unsigned long)prop));
2605 if (selection_wait == Sel_normal) 2646 if (selection_wait == Sel_normal)
2606 { 2647 {
2607 int a, afmt; 2648 int a, afmt;
2608 Atom atype; 2649 Atom atype;
2609 unsigned long bytes_after, nitems; 2650 unsigned long bytes_after, nitems;
2610 unsigned char *s = NULL; 2651 unsigned char *s = NULL;
2611 2652
2612 a = XGetWindowProperty (display->display, win, prop, 0L, 1L, False, 2653 a = XGetWindowProperty (display->display, win, prop, 0L, 1L, False,
2613 xa[XA_INCR], &atype, &afmt, &nitems, 2654 xa[XA_INCR], &atype, &afmt, &nitems,
2614 &bytes_after, &s); 2655 &bytes_after, &s);
2615 if (s) 2656 if (s)
2616 XFree (s); 2657 XFree (s);
2617 if (a != Success) 2658 if (a != Success)
2618 return; 2659 return;
2660
2619#ifndef __CYGWIN32__ 2661#ifndef __CYGWIN32__
2620 if (atype == xa[XA_INCR]) 2662 if (atype == xa[XA_INCR])
2621 { /* start an INCR transfer */ 2663 { /* start an INCR transfer */
2622 D_SELECT ((stderr, "rxvt_selection_property: INCR: starting transfer")); 2664 D_SELECT ((stderr, "rxvt_selection_property: INCR: starting transfer"));
2623 XDeleteProperty (display->display, win, prop); 2665 XDeleteProperty (display->display, win, prop);
… …
2629 2671
2630 } 2672 }
2631 else if (selection_wait == Sel_incr) 2673 else if (selection_wait == Sel_incr)
2632 { 2674 {
2633 reget_time = 1; 2675 reget_time = 1;
2676
2634 if (selection_paste (win, prop, True) == -1) 2677 if (selection_paste (win, prop, True) == -1)
2635 { 2678 {
2636 D_SELECT ((stderr, "rxvt_selection_property: INCR: clean end")); 2679 D_SELECT ((stderr, "rxvt_selection_property: INCR: clean end"));
2637 selection_wait = Sel_none; 2680 selection_wait = Sel_none;
2638 incr_ev.stop (); 2681 incr_ev.stop ();
2639 } 2682 }
2640 } 2683 }
2641 if (reget_time) /* received more data so reget time */ 2684 if (reget_time) /* received more data so reget time */
2642 incr_ev.start (NOW + 10); 2685 incr_ev.start (NOW + 10);
2643} 2686}
2687
2644/* ------------------------------------------------------------------------- */ 2688/* ------------------------------------------------------------------------- */
2645/* 2689/*
2646 * Request the current selection: 2690 * Request the current selection:
2647 * Order: > internal selection if available 2691 * Order: > internal selection if available
2648 * > PRIMARY, SECONDARY, CLIPBOARD if ownership is claimed (+) 2692 * > PRIMARY, SECONDARY, CLIPBOARD if ownership is claimed (+)
… …
2653 */ 2697 */
2654void 2698void
2655rxvt_term::selection_request (Time tm, int x, int y) 2699rxvt_term::selection_request (Time tm, int x, int y)
2656{ 2700{
2657 D_SELECT ((stderr, "rxvt_selection_request (%lu, %d, %d)", tm, x, y)); 2701 D_SELECT ((stderr, "rxvt_selection_request (%lu, %d, %d)", tm, x, y));
2702
2658 if (x < 0 || x >= TermWin.width || y < 0 || y >= TermWin.height) 2703 if (x < 0 || x >= TermWin.width || y < 0 || y >= TermWin.height)
2659 return; /* outside window */ 2704 return; /* outside window */
2660 2705
2661 if (selection.text != NULL) 2706 if (selection.text)
2662 { /* internal selection */ 2707 { /* internal selection */
2663 D_SELECT ((stderr, "rxvt_selection_request: pasting internal")); 2708 D_SELECT ((stderr, "rxvt_selection_request: pasting internal"));
2664 paste (selection.text, selection.len); 2709 char *str = rxvt_wcstombs (selection.text, selection.len);
2710 paste ((unsigned char *)str, strlen (str));
2711 free (str);
2665 return; 2712 return;
2666 } 2713 }
2667 else 2714 else
2668 { 2715 {
2669 int i; 2716 int i;
2670 2717
2671 selection_request_time = tm; 2718 selection_request_time = tm;
2672 selection_wait = Sel_normal; 2719 selection_wait = Sel_normal;
2673 for (i = Sel_Primary; i <= Sel_Clipboard; i++) 2720 for (i = Sel_Primary; i <= Sel_Clipboard; i++)
2674 { 2721 {
… …
2682 return; 2729 return;
2683#endif 2730#endif
2684 2731
2685 } 2732 }
2686 } 2733 }
2734
2687 selection_wait = Sel_none; /* don't loop in rxvt_selection_paste () */ 2735 selection_wait = Sel_none; /* don't loop in rxvt_selection_paste () */
2688 D_SELECT ((stderr, "rxvt_selection_request: pasting CUT_BUFFER0")); 2736 D_SELECT ((stderr, "rxvt_selection_request: pasting CUT_BUFFER0"));
2689 selection_paste (display->root, XA_CUT_BUFFER0, False); 2737 selection_paste (display->root, XA_CUT_BUFFER0, False);
2690} 2738}
2691 2739
2692int 2740int
2693rxvt_term::selection_request_other (Atom target, int selnum) 2741rxvt_term::selection_request_other (Atom target, int selnum)
2694{ 2742{
2695 Atom sel; 2743 Atom sel;
2696#ifdef DEBUG_SELECT 2744#ifdef DEBUG_SELECT
2697 char *debug_xa_names[] = { "PRIMARY", "SECONDARY", "CLIPBOARD" }; 2745 char *debug_xa_names[] = { "PRIMARY", "SECONDARY", "CLIPBOARD" };
2698#endif 2746#endif
2699 2747
2700 selection_type |= selnum; 2748 selection_type |= selnum;
2749
2701 if (selnum == Sel_Primary) 2750 if (selnum == Sel_Primary)
2702 sel = XA_PRIMARY; 2751 sel = XA_PRIMARY;
2703 else if (selnum == Sel_Secondary) 2752 else if (selnum == Sel_Secondary)
2704 sel = XA_SECONDARY; 2753 sel = XA_SECONDARY;
2705 else 2754 else
2706 sel = xa[XA_CLIPBOARD]; 2755 sel = xa[XA_CLIPBOARD];
2756
2707 if (XGetSelectionOwner (display->display, sel) != None) 2757 if (XGetSelectionOwner (display->display, sel) != None)
2708 { 2758 {
2709 D_SELECT ((stderr, "rxvt_selection_request_other: pasting %s", debug_xa_names[selnum])); 2759 D_SELECT ((stderr, "rxvt_selection_request_other: pasting %s", debug_xa_names[selnum]));
2710 XConvertSelection (display->display, sel, target, xa[XA_VT_SELECTION], 2760 XConvertSelection (display->display, sel, target, xa[XA_VT_SELECTION],
2711 TermWin.vt, selection_request_time); 2761 TermWin.vt, selection_request_time);
2712 return 1; 2762 return 1;
2713 } 2763 }
2764
2714 return 0; 2765 return 0;
2715} 2766}
2716 2767
2717/* ------------------------------------------------------------------------- */ 2768/* ------------------------------------------------------------------------- */
2718/* 2769/*
… …
2723rxvt_term::selection_clear () 2774rxvt_term::selection_clear ()
2724{ 2775{
2725 D_SELECT ((stderr, "rxvt_selection_clear ()")); 2776 D_SELECT ((stderr, "rxvt_selection_clear ()"));
2726 2777
2727 want_refresh = 1; 2778 want_refresh = 1;
2728 if (selection.text)
2729 free (selection.text); 2779 free (selection.text);
2730 selection.text = NULL; 2780 selection.text = NULL;
2731 selection.len = 0; 2781 selection.len = 0;
2732 CLEAR_SELECTION (); 2782 CLEAR_SELECTION ();
2733} 2783}
2734 2784
… …
2738 * EXT: button 1 or 3 release 2788 * EXT: button 1 or 3 release
2739 */ 2789 */
2740void 2790void
2741rxvt_term::selection_make (Time tm) 2791rxvt_term::selection_make (Time tm)
2742{ 2792{
2743 int i, col, end_col, row, end_row; 2793 int i, col, end_col, row, end_row;
2744 unsigned char *new_selection_text; 2794 wchar_t *new_selection_text;
2745 char *str;
2746 text_t *t; 2795 text_t *t;
2747#ifdef ACS_ASCII
2748 rend_t *re;
2749#endif
2750 2796
2751 D_SELECT ((stderr, "rxvt_selection_make (): selection.op=%d, selection.clicks=%d", selection.op, selection.clicks)); 2797 D_SELECT ((stderr, "rxvt_selection_make (): selection.op=%d, selection.clicks=%d", selection.op, selection.clicks));
2752 switch (selection.op) 2798 switch (selection.op)
2753 { 2799 {
2754 case SELECTION_CONT: 2800 case SELECTION_CONT:
… …
2760 selection.op = SELECTION_DONE; 2806 selection.op = SELECTION_DONE;
2761 /* FALLTHROUGH */ 2807 /* FALLTHROUGH */
2762 default: 2808 default:
2763 return; 2809 return;
2764 } 2810 }
2811
2765 selection.op = SELECTION_DONE; 2812 selection.op = SELECTION_DONE;
2766 2813
2767 if (selection.clicks == 4) 2814 if (selection.clicks == 4)
2768 return; /* nothing selected, go away */ 2815 return; /* nothing selected, go away */
2769 2816
2770 i = (selection.end.row - selection.beg.row + 1) * (TermWin.ncol + 1) + 1; 2817 i = (selection.end.row - selection.beg.row + 1) * (TermWin.ncol + 1);
2771 str = (char *)rxvt_malloc (i * MB_CUR_MAX + 1); 2818 new_selection_text = (wchar_t *)rxvt_malloc ((i + 4) * sizeof (wchar_t));
2772
2773 new_selection_text = (unsigned char *)str;
2774 2819
2775 col = selection.beg.col; 2820 col = selection.beg.col;
2776 MAX_IT (col, 0); 2821 MAX_IT (col, 0);
2777 row = selection.beg.row + TermWin.saveLines; 2822 row = selection.beg.row + TermWin.saveLines;
2778 end_row = selection.end.row + TermWin.saveLines; 2823 end_row = selection.end.row + TermWin.saveLines;
2824 int ofs = 0;
2825 int extra = 0;
2779 2826
2780 for (; row <= end_row; row++, col = 0) 2827 for (; row <= end_row; row++, col = 0)
2781 { 2828 {
2782 t = & (screen.text[row][col]); 2829 t = &(screen.text[row][col]);
2783 2830
2784 end_col = screen.tlen[row]; 2831 end_col = screen.tlen[row];
2785 2832
2786 if (end_col == -1) 2833 if (end_col == -1)
2787 end_col = TermWin.ncol; 2834 end_col = TermWin.ncol;
2788 2835
2789 if (row == end_row) 2836 if (row == end_row)
2790 MIN_IT (end_col, selection.end.col); 2837 MIN_IT (end_col, selection.end.col);
2791 2838
2792 for (; col < end_col; col++) 2839 for (; col < end_col; col++)
2840 {
2793 if (*t == NOCHAR) 2841 if (*t == NOCHAR)
2794 t++; 2842 t++;
2843 else if (IS_COMPOSE (*t))
2844 {
2845 int len = rxvt_composite.expand (*t, 0);
2846
2847 extra -= (len - 1);
2848
2849 if (extra < 0)
2850 {
2851 extra += i;
2852 i += i;
2853 new_selection_text = (wchar_t *)rxvt_realloc (new_selection_text, (i + 4) * sizeof (wchar_t));
2854 }
2855
2856 ofs += rxvt_composite.expand (*t++, new_selection_text + ofs);
2857 }
2795 else 2858 else
2796 { 2859 new_selection_text[ofs++] = *t++;
2797 int len = wctomb (str, *t++);
2798 if (len > 0)
2799 str += len;
2800 } 2860 }
2801 2861
2802 if (screen.tlen[row] != -1 && row != end_row) 2862 if (screen.tlen[row] != -1 && row != end_row)
2803 *str++ = '\n'; 2863 new_selection_text[ofs++] = L'\n';
2804 } 2864 }
2805 2865
2806#ifndef NO_OLD_SELECTION 2866#ifndef NO_OLD_SELECTION
2807 if (selection_style == OLD_SELECT) 2867 if (selection_style == OLD_SELECT)
2808 if (end_col == TermWin.ncol) 2868 if (end_col == TermWin.ncol)
2809 *str++ = '\n'; 2869 new_selection_text[ofs++] = L'\n';
2810#endif 2870#endif
2811#ifndef NO_NEW_SELECTION 2871#ifndef NO_NEW_SELECTION
2812 if (selection_style != OLD_SELECT) 2872 if (selection_style != OLD_SELECT)
2813 if (end_col != selection.end.col) 2873 if (end_col != selection.end.col)
2814 *str++ = '\n'; 2874 new_selection_text[ofs++] = L'\n';
2815#endif 2875#endif
2816 *str = '\0'; 2876 new_selection_text[ofs] = 0;
2817 2877
2818 i = str - (char *)new_selection_text;
2819 if (i == 0) 2878 if (ofs == 0)
2820 { 2879 {
2821 free (new_selection_text); 2880 free (new_selection_text);
2822 return; 2881 return;
2823 } 2882 }
2824 2883
2825 // due to MB_MAX_CUR, selection wastage is usually high, so realloc
2826 if (str - (char *)new_selection_text > 1024)
2827 new_selection_text = (unsigned char *)rxvt_realloc (new_selection_text, i + 1);
2828
2829 selection.len = i;
2830
2831 if (selection.text)
2832 free (selection.text); 2884 free (selection.text);
2833 2885
2834 selection.text = new_selection_text; 2886 // we usually allocate much more than necessary, so realloc it smaller again
2887 selection.len = ofs;
2888 selection.text = (wchar_t *)rxvt_realloc (new_selection_text, (ofs + 1) * sizeof (wchar_t));
2835 2889
2836 XSetSelectionOwner (display->display, XA_PRIMARY, TermWin.vt, tm); 2890 XSetSelectionOwner (display->display, XA_PRIMARY, TermWin.vt, tm);
2837 if (XGetSelectionOwner (display->display, XA_PRIMARY) == TermWin.vt) 2891 if (XGetSelectionOwner (display->display, XA_PRIMARY) == TermWin.vt)
2838 display->set_selection_owner (this); 2892 display->set_selection_owner (this);
2839 else 2893 else
2840 rxvt_print_error ("can't get primary selection"); 2894 rxvt_print_error ("can't get primary selection");
2841 2895
2842 { 2896#if 0
2843 XTextProperty ct; 2897 XTextProperty ct;
2844 char *cl = (char *)selection.text;
2845 2898
2846 if (XmbTextListToTextProperty (display->display, &cl, 1, XStringStyle, &ct) >= 0) 2899 if (XwcTextListToTextProperty (display->display, &selection.text, 1, XStringStyle, &ct) >= 0)
2847 { 2900 {
2848 XChangeProperty (display->display, display->root, XA_CUT_BUFFER0, XA_STRING, 8,
2849 PropModeReplace, ct.value, ct.nitems);
2850 XFree (ct.value);
2851 }
2852 else
2853 XChangeProperty (display->display, display->root, XA_CUT_BUFFER0, XA_STRING, 8, 2901 XChangeProperty (display->display, display->root, XA_CUT_BUFFER0, XA_STRING, 8,
2854 PropModeReplace, selection.text, (int)selection.len); 2902 PropModeReplace, ct.value, ct.nitems);
2903 XFree (ct.value);
2855 } 2904 }
2905#endif
2856 2906
2857 selection_time = tm; 2907 selection_time = tm;
2858 D_SELECT ((stderr, "rxvt_selection_make (): selection.len=%d", selection.len)); 2908 D_SELECT ((stderr, "rxvt_selection_make (): selection.len=%d", selection.len));
2859} 2909}
2860 2910
… …
3389 ev.target = rq.target; 3439 ev.target = rq.target;
3390 ev.time = rq.time; 3440 ev.time = rq.time;
3391 3441
3392 if (rq.target == xa[XA_TARGETS]) 3442 if (rq.target == xa[XA_TARGETS])
3393 { 3443 {
3394 Atom32 target_list[5]; 3444 Atom32 target_list[6];
3395 Atom32 *target = target_list; 3445 Atom32 *target = target_list;
3396 3446
3397 *target++ = (Atom32) xa[XA_TARGETS]; 3447 *target++ = (Atom32) xa[XA_TARGETS];
3448 *target++ = (Atom32) xa[XA_TIMESTAMP];
3398 *target++ = (Atom32) XA_STRING; 3449 *target++ = (Atom32) XA_STRING;
3399 *target++ = (Atom32) xa[XA_TEXT]; 3450 *target++ = (Atom32) xa[XA_TEXT];
3400 *target++ = (Atom32) xa[XA_COMPOUND_TEXT]; 3451 *target++ = (Atom32) xa[XA_COMPOUND_TEXT];
3401#if X_HAVE_UTF8_STRING 3452#if X_HAVE_UTF8_STRING
3402 *target++ = (Atom32) xa[XA_UTF8_STRING]; 3453 *target++ = (Atom32) xa[XA_UTF8_STRING];
3403#endif 3454#endif
3455
3404 XChangeProperty (display->display, rq.requestor, rq.property, XA_ATOM, 3456 XChangeProperty (display->display, rq.requestor, rq.property, XA_ATOM,
3405 (8 * sizeof (target_list[0])), PropModeReplace, 3457 (8 * sizeof (target_list[0])), PropModeReplace,
3406 (unsigned char *)target_list, 3458 (unsigned char *)target_list,
3407 target - target_list); 3459 target - target_list);
3408 ev.property = rq.property; 3460 ev.property = rq.property;
3409 } 3461 }
3410 else if (rq.target == xa[XA_MULTIPLE]) 3462 else if (rq.target == xa[XA_MULTIPLE])
3411 { 3463 {
3412 /* TODO: Handle MULTIPLE */ 3464 /* TODO: Handle MULTIPLE */
… …
3424 || rq.target == xa[XA_UTF8_STRING] 3476 || rq.target == xa[XA_UTF8_STRING]
3425 ) 3477 )
3426 { 3478 {
3427 short freect = 0; 3479 short freect = 0;
3428 int selectlen; 3480 int selectlen;
3429 char *cl; 3481 wchar_t *cl;
3430 3482
3431 target = rq.target; 3483 target = rq.target;
3432 3484
3433 if (target == XA_STRING) 3485 if (target == XA_STRING)
3434 // we actually don't do XA_STRING, but who cares, as i18n clients 3486 // we actually don't do XA_STRING, but who cares, as i18n clients
3435 // will ask for another format anyways. 3487 // will ask for another format anyways.
3436 style = XStringStyle; 3488 style = XStringStyle;
3437 else if (target == xa[XA_TEXT]) 3489 else if (target == xa[XA_TEXT])
3438 style = XTextStyle; 3490 style = XStdICCTextStyle;
3439 else if (target == xa[XA_COMPOUND_TEXT]) 3491 else if (target == xa[XA_COMPOUND_TEXT])
3440 style = XCompoundTextStyle; 3492 style = XCompoundTextStyle;
3441#if X_HAVE_UTF8_STRING 3493#if X_HAVE_UTF8_STRING
3442 else if (target == xa[XA_UTF8_STRING]) 3494 else if (target == xa[XA_UTF8_STRING])
3443 style = XUTF8StringStyle; 3495 style = XUTF8StringStyle;
… …
3448 style = XCompoundTextStyle; 3500 style = XCompoundTextStyle;
3449 } 3501 }
3450 3502
3451 if (selection.text) 3503 if (selection.text)
3452 { 3504 {
3453 cl = (char *)selection.text; 3505 cl = selection.text;
3454 selectlen = selection.len; 3506 selectlen = selection.len;
3455 } 3507 }
3456 else 3508 else
3457 { 3509 {
3458 cl = ""; 3510 cl = L"";
3459 selectlen = 0; 3511 selectlen = 0;
3460 } 3512 }
3461 3513
3514 // Xwc doesn't handle iso-10646 in wchar_t gracefully, so maybe recode it
3515 // manually for XUTF8StringStyle.
3462 if (XmbTextListToTextProperty (display->display, &cl, 1, style, &ct) >= 0) 3516 if (XwcTextListToTextProperty (display->display, &cl, 1, style, &ct) >= 0)
3463 freect = 1; 3517 freect = 1;
3464 else 3518 else
3465 { 3519 {
3466 /* if we failed to convert then send it raw */ 3520 /* if we failed to convert then send it raw */
3467 ct.value = (unsigned char *)cl; 3521 ct.value = (unsigned char *)cl;
… …
3474 ev.property = rq.property; 3528 ev.property = rq.property;
3475 3529
3476 if (freect) 3530 if (freect)
3477 XFree (ct.value); 3531 XFree (ct.value);
3478 } 3532 }
3533
3479 XSendEvent (display->display, rq.requestor, False, 0L, (XEvent *)&ev); 3534 XSendEvent (display->display, rq.requestor, False, 0L, (XEvent *)&ev);
3480} 3535}
3481 3536
3482/* ------------------------------------------------------------------------- * 3537/* ------------------------------------------------------------------------- *
3483 * MOUSE ROUTINES * 3538 * MOUSE ROUTINES *

Diff Legend

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