ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/rxvt-unicode/src/command.C
(Generate patch)

Comparing rxvt-unicode/src/command.C (file contents):
Revision 1.216 by root, Tue Dec 27 01:25:42 2005 UTC vs.
Revision 1.235 by root, Wed Jan 4 20:43:37 2006 UTC

… …
43 * along with this program; if not, write to the Free Software 43 * along with this program; if not, write to the Free Software
44 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 44 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
45 *----------------------------------------------------------------------*/ 45 *----------------------------------------------------------------------*/
46 46
47/*{{{ includes: */ 47/*{{{ includes: */
48#include "../config.h" /* NECESSARY */ 48#include "../config.h"
49#include "rxvt.h" /* NECESSARY */ 49#include "rxvt.h"
50#include "rxvtperl.h"
50#include "version.h" 51#include "version.h"
51#include "command.h" 52#include "command.h"
53
54#if HAVE_SCHED_YIELD
55#undef HAVE_SCHED_YIELD // disabled for the time being
56//# include <sched.h>
57#endif
52 58
53#ifdef KEYSYM_RESOURCE 59#ifdef KEYSYM_RESOURCE
54# include "keyboard.h" 60# include "keyboard.h"
55#endif 61#endif
56 62
… …
147 153
148 text_t t = l.t[x]; 154 text_t t = l.t[x];
149 155
150 if (t != NOCHAR || !x) 156 if (t != NOCHAR || !x)
151 { 157 {
152 iso14755_51 (l.t[x], l.r[x]); 158 iso14755_51 (l.t[x], l.r[x], x, y);
153 iso14755buf = ISO_14755_54; 159 iso14755buf = ISO_14755_54;
154 break; 160 break;
155 } 161 }
156 162
157 x--; 163 x--;
158 } 164 }
159} 165}
160#endif
161 166
162#if ENABLE_OVERLAY
163void 167void
164rxvt_term::iso14755_51 (unicode_t ch, rend_t r) 168rxvt_term::iso14755_51 (unicode_t ch, rend_t r, int x, int y)
165{ 169{
166 rxvt_fontset *fs = FONTSET (r); 170 rxvt_fontset *fs = FONTSET (r);
167 rxvt_font *f = (*fs)[fs->find_font (ch)]; 171 rxvt_font *f = (*fs)[fs->find_font (ch)];
168 wchar_t *chr, *alloc, ch2, *fname; 172 wchar_t *chr, *alloc, ch2, *fname;
169 int len; 173 int len;
170 174
171 fname = rxvt_utf8towcs (f->name); 175 fname = rxvt_utf8towcs (f->name);
172 176
173#if ENABLE_COMBINING 177# if ENABLE_COMBINING
174 if (IS_COMPOSE (ch)) 178 if (IS_COMPOSE (ch))
175 { 179 {
176 len = rxvt_composite.expand (ch, 0); 180 len = rxvt_composite.expand (ch, 0);
177 alloc = chr = new wchar_t[len]; 181 alloc = chr = new wchar_t[len];
178 rxvt_composite.expand (ch, chr); 182 rxvt_composite.expand (ch, chr);
179 } 183 }
180 else 184 else
181#endif 185# endif
182 { 186 {
183 ch2 = ch; 187 ch2 = ch;
184 188
185 alloc = 0; 189 alloc = 0;
186 chr = &ch2; 190 chr = &ch2;
… …
189 193
190 char attr[80]; // plenty 194 char attr[80]; // plenty
191 195
192 sprintf (attr, "%08x = fg %d bg %d%s%s%s%s%s%s", 196 sprintf (attr, "%08x = fg %d bg %d%s%s%s%s%s%s",
193 (int)r, 197 (int)r,
194 GET_FGCOLOR (r), GET_BGCOLOR (r), 198 fgcolor_of (r), bgcolor_of (r),
195 r & RS_Bold ? " bold" : "", 199 r & RS_Bold ? " bold" : "",
196 r & RS_Italic ? " italic" : "", 200 r & RS_Italic ? " italic" : "",
197 r & RS_Blink ? " blink" : "", 201 r & RS_Blink ? " blink" : "",
198 r & RS_RVid ? " rvid" : "", 202 r & RS_RVid ? " rvid" : "",
199 r & RS_Uline ? " uline" : "", 203 r & RS_Uline ? " uline" : "",
… …
202 int width = wcswidth (fname, wcslen (fname)); 206 int width = wcswidth (fname, wcslen (fname));
203 207
204 max_it (width, 8+5); // for char + hey 208 max_it (width, 8+5); // for char + hey
205 max_it (width, strlen (attr)); 209 max_it (width, strlen (attr));
206 210
211 if (y >= 0)
212 {
213 y = (y >= nrow - len - 4 && x < width + 2) ? 0 : -1;
214 x = 0;
215 }
216
207 scr_overlay_new (0, -1, width, len + 2); 217 scr_overlay_new (x, y, width, len + 2);
208 218
209 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r)); 219 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r));
210 220
211 for (int y = 0; y < len; y++) 221 for (int y = 0; y < len; y++)
212 { 222 {
… …
215 ch = *chr++; 225 ch = *chr++;
216 226
217 sprintf (buf, "%8x", ch); 227 sprintf (buf, "%8x", ch);
218 scr_overlay_set (0, y, buf); 228 scr_overlay_set (0, y, buf);
219 scr_overlay_set (9, y, '='); 229 scr_overlay_set (9, y, '=');
220#if !UNICODE3 230# if !UNICODE3
221 if (ch >= 0x10000) 231 if (ch >= 0x10000)
222 ch = 0xfffd; 232 ch = 0xfffd;
223#endif 233# endif
224 scr_overlay_set (11, y, ch, r); 234 scr_overlay_set (11, y, ch, r);
225 scr_overlay_set (12, y, NOCHAR, r); 235 scr_overlay_set (12, y, NOCHAR, r);
226 } 236 }
227 237
228 scr_overlay_set (0, len , attr); 238 scr_overlay_set (0, len , attr);
229 scr_overlay_set (0, len + 1, fname); 239 scr_overlay_set (0, len + 1, fname);
230 240
231 free (fname); 241 free (fname);
232 242
233#if ENABLE_COMBINING 243# if ENABLE_COMBINING
234 if (alloc) 244 if (alloc)
235 delete [] alloc; 245 delete [] alloc;
236#endif 246# endif
237} 247}
238#endif 248#endif
239 249
240void 250void
241rxvt_term::commit_iso14755 () 251rxvt_term::commit_iso14755 ()
… …
258 mb[0] = ch[0]; 268 mb[0] = ch[0];
259 len = 1; 269 len = 1;
260 } 270 }
261 271
262 if (len > 0) 272 if (len > 0)
263 tt_write ((unsigned char *)mb, len); 273 tt_write (mb, len);
264 else 274 else
265 scr_bell (); 275 scr_bell ();
266 } 276 }
267 277
268 iso14755buf = 0; 278 iso14755buf = 0;
… …
296 KeySym keysym; 306 KeySym keysym;
297#ifdef DEBUG_CMD 307#ifdef DEBUG_CMD
298 static int debug_key = 1; /* accessible by a debugger only */ 308 static int debug_key = 1; /* accessible by a debugger only */
299#endif 309#endif
300 int valid_keysym; 310 int valid_keysym;
301 unsigned char kbuf[KBUFSZ]; 311 char kbuf[KBUFSZ];
302 312
303 /* 313 /*
304 * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an 314 * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an
305 * escape sequence to toggle the Keypad. 315 * escape sequence to toggle the Keypad.
306 * 316 *
… …
324 Status status_return; 334 Status status_return;
325 335
326#if 0 336#if 0
327#ifdef X_HAVE_UTF8_STRING 337#ifdef X_HAVE_UTF8_STRING
328 if (enc_utf8 && 0) // currently disabled, doesn't seem to work, nor is useful 338 if (enc_utf8 && 0) // currently disabled, doesn't seem to work, nor is useful
329 len = Xutf8LookupString (Input_Context, &ev, (char *)kbuf, 339 len = Xutf8LookupString (Input_Context, &ev, kbuf,
330 KBUFSZ, &keysym, &status_return); 340 KBUFSZ, &keysym, &status_return);
331 else 341 else
332#endif 342#endif
333#endif 343#endif
334 { 344 {
… …
371 || status_return == XLookupBoth; 381 || status_return == XLookupBoth;
372 } 382 }
373 else 383 else
374#endif 384#endif
375 { 385 {
376 len = XLookupString (&ev, (char *)kbuf, KBUFSZ, &keysym, &compose); 386 len = XLookupString (&ev, kbuf, KBUFSZ, &keysym, &compose);
377 valid_keysym = keysym != NoSymbol; 387 valid_keysym = keysym != NoSymbol;
378 } 388 }
379 389
380 if (valid_keysym) 390 if (valid_keysym)
381 { 391 {
… …
845 { 855 {
846#ifdef META8_OPTION 856#ifdef META8_OPTION
847 /* set 8-bit on */ 857 /* set 8-bit on */
848 if (meta && (meta_char == 0x80)) 858 if (meta && (meta_char == 0x80))
849 { 859 {
850 unsigned char *ch; 860 char *ch;
851 861
852 for (ch = kbuf; ch < kbuf + len; ch++) 862 for (ch = kbuf; ch < kbuf + len; ch++)
853 *ch |= 0x80; 863 *ch |= 0x80;
854 864
855 meta = 0; 865 meta = 0;
… …
860 } 870 }
861 871
862 if (len <= 0) 872 if (len <= 0)
863 return; /* not mapped */ 873 return; /* not mapped */
864 874
865 if (options & Opt_scrollTtyKeypress) 875 if (OPTION (Opt_scrollTtyKeypress))
866 if (view_start) 876 if (view_start)
867 { 877 {
868 view_start = 0; 878 view_start = 0;
869 want_refresh = 1; 879 want_refresh = 1;
870 } 880 }
… …
888#ifdef META8_OPTION 898#ifdef META8_OPTION
889 && meta_char == C0_ESC 899 && meta_char == C0_ESC
890#endif 900#endif
891 ) 901 )
892 { 902 {
893 const unsigned char ch = C0_ESC; 903 const char ch = C0_ESC;
894 tt_write (&ch, 1); 904 tt_write (&ch, 1);
895 } 905 }
896 906
897#if defined(DEBUG_CMD) 907#if defined(DEBUG_CMD)
898 /* Display keyboard buffer contents */ 908 /* Display keyboard buffer contents */
… …
910 920
911#if MENUBAR_MAX || defined (KEYSYM_RESOURCE) 921#if MENUBAR_MAX || defined (KEYSYM_RESOURCE)
912/*{{{ rxvt_cmd_write (), rxvt_cmd_getc () */ 922/*{{{ rxvt_cmd_write (), rxvt_cmd_getc () */
913/* attempt to `write' count to the input buffer */ 923/* attempt to `write' count to the input buffer */
914unsigned int 924unsigned int
915rxvt_term::cmd_write (const unsigned char *str, unsigned int count) 925rxvt_term::cmd_write (const char *str, unsigned int count)
916{ 926{
917 unsigned int n, s; 927 unsigned int n, s;
918 928
919 n = cmdbuf_ptr - cmdbuf_base; 929 n = cmdbuf_ptr - cmdbuf_base;
920 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp; 930 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp;
… …
976 SET_LOCALE (locale); 986 SET_LOCALE (locale);
977 987
978 display->flush (); 988 display->flush ();
979 989
980 if (want_refresh && !flush_ev.active) 990 if (want_refresh && !flush_ev.active)
981 flush_ev.start (NOW + 0.01); 991 flush_ev.start (NOW + 1. / 60.); // refresh at max. 60 hz normally
982} 992}
983 993
984void 994void
985rxvt_term::flush_cb (time_watcher &w) 995rxvt_term::flush_cb (time_watcher &w)
986{ 996{
… …
1061 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1071 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1062 } 1072 }
1063} 1073}
1064#endif 1074#endif
1065 1075
1076#if HAVE_SCHED_YIELD
1077static struct event_handler
1078{
1079 check_watcher cw_yield;
1080
1081 void yield (check_watcher &w)
1082 {
1083 sched_yield ();
1084 w.stop ();
1085 }
1086
1087 event_handler ()
1088 : cw_yield (this, &event_handler::yield)
1089 {
1090 }
1091} event_handler;
1092#endif
1093
1066bool 1094bool
1067rxvt_term::pty_fill () 1095rxvt_term::pty_fill ()
1068{ 1096{
1069 ssize_t n = cmdbuf_endp - cmdbuf_ptr; 1097 ssize_t n = cmdbuf_endp - cmdbuf_ptr;
1070 1098
1071 if (CBUFSIZ == n) 1099 if (CBUFSIZ == n)
1072 { 1100 {
1073 rxvt_warn ("pty_fill on full buffer, draining input, continuing.\n"); 1101 rxvt_warn ("PLEASE REPORT: pty_fill on full buffer, draining input, continuing.\n");
1074 n = 0; 1102 n = 0;
1075 } 1103 }
1076 1104
1077 memmove (cmdbuf_base, cmdbuf_ptr, n); 1105 memmove (cmdbuf_base, cmdbuf_ptr, n);
1078 cmdbuf_ptr = cmdbuf_base; 1106 cmdbuf_ptr = cmdbuf_base;
1079 cmdbuf_endp = cmdbuf_ptr + n; 1107 cmdbuf_endp = cmdbuf_ptr + n;
1080 1108
1081 n = read (pty.pty, cmdbuf_endp, CBUFSIZ - n); 1109 ssize_t r = read (pty.pty, cmdbuf_endp, CBUFSIZ - n);
1082 1110
1083 if (n > 0) 1111 if (r > 0)
1084 { 1112 {
1085 cmdbuf_endp += n; 1113 cmdbuf_endp += r;
1086 return true; 1114 return true;
1087 } 1115 }
1088 else if ((n < 0 && errno != EAGAIN && errno != EINTR) || n == 0) 1116 else if (r < 0 && (errno == EAGAIN || errno == EINTR))
1117 {
1118#if HAVE_SCHED_YIELD
1119 if (display->is_local)
1120 event_handler.cw_yield.start ();
1121#endif
1122 }
1123 else
1089 { 1124 {
1090 pty_ev.stop (); 1125 pty_ev.stop ();
1091 1126
1092 if (!(options & Opt_hold)) 1127 if (!OPTION (Opt_hold))
1093 destroy (); 1128 destroy ();
1094 } 1129 }
1095 1130
1096 return false; 1131 return false;
1097} 1132}
… …
1119 recolour_cursor (); 1154 recolour_cursor ();
1120 1155
1121#ifdef POINTER_BLANK 1156#ifdef POINTER_BLANK
1122 hidden_pointer = 0; 1157 hidden_pointer = 0;
1123 1158
1124 if (options & Opt_pointerBlank) 1159 if (OPTION (Opt_pointerBlank))
1125 pointer_ev.start (NOW + pointerBlankDelay); 1160 pointer_ev.start (NOW + pointerBlankDelay);
1126#endif 1161#endif
1127} 1162}
1128 1163
1129#ifdef POINTER_BLANK 1164#ifdef POINTER_BLANK
1130void 1165void
1131rxvt_term::pointer_blank () 1166rxvt_term::pointer_blank ()
1132{ 1167{
1133 if (! (options & Opt_pointerBlank)) 1168 if (! OPTION (Opt_pointerBlank))
1134 return; 1169 return;
1135 1170
1136 XDefineCursor (display->display, vt, display->blank_cursor); 1171 XDefineCursor (display->display, vt, display->blank_cursor);
1137 XFlush (display->display); 1172 XFlush (display->display);
1138 1173
… …
1236 1271
1237 SET_R (this); 1272 SET_R (this);
1238 SET_LOCALE (locale); 1273 SET_LOCALE (locale);
1239 1274
1240#if defined(CURSOR_BLINK) 1275#if defined(CURSOR_BLINK)
1241 if ((options & Opt_cursorBlink) && ev.type == KeyPress) 1276 if (OPTION (Opt_cursorBlink) && ev.type == KeyPress)
1242 { 1277 {
1243 if (hidden_cursor) 1278 if (hidden_cursor)
1244 { 1279 {
1245 hidden_cursor = 0; 1280 hidden_cursor = 0;
1246 want_refresh = 1; 1281 want_refresh = 1;
… …
1249 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1284 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1250 } 1285 }
1251#endif 1286#endif
1252 1287
1253#if defined(POINTER_BLANK) 1288#if defined(POINTER_BLANK)
1254 if ((options & Opt_pointerBlank) && pointerBlankDelay > 0) 1289 if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0)
1255 { 1290 {
1256 if (ev.type == MotionNotify 1291 if (ev.type == MotionNotify
1257 || ev.type == ButtonPress 1292 || ev.type == ButtonPress
1258 || ev.type == ButtonRelease) 1293 || ev.type == ButtonRelease)
1259 if (hidden_pointer) 1294 if (hidden_pointer)
… …
1455 seen_resize = 1; 1490 seen_resize = 1;
1456 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1491 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1457 } 1492 }
1458 1493
1459#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */ 1494#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1460 if (options & Opt_transparent) 1495 if (OPTION (Opt_transparent))
1461 check_our_parents (); 1496 check_our_parents ();
1462#endif 1497#endif
1463 } 1498 }
1464 break; 1499 break;
1465 1500
… …
1666{ 1701{
1667 if (!focus) 1702 if (!focus)
1668 { 1703 {
1669 focus = 1; 1704 focus = 1;
1670 want_refresh = 1; 1705 want_refresh = 1;
1706
1707 PERL_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1708
1671#if USE_XIM 1709#if USE_XIM
1672 if (Input_Context != NULL) 1710 if (Input_Context != NULL)
1673 { 1711 {
1674 IMSetStatusPosition (); 1712 IMSetStatusPosition ();
1675 XSetICFocus (Input_Context); 1713 XSetICFocus (Input_Context);
1676 } 1714 }
1677#endif 1715#endif
1678#if CURSOR_BLINK 1716#if CURSOR_BLINK
1679 if (options & Opt_cursorBlink) 1717 if (OPTION (Opt_cursorBlink))
1680 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1718 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1681#endif 1719#endif
1682#if OFF_FOCUS_FADING 1720#if OFF_FOCUS_FADING
1683 if (rs[Rs_fade]) 1721 if (rs[Rs_fade])
1684 { 1722 {
… …
1695 if (focus) 1733 if (focus)
1696 { 1734 {
1697 focus = 0; 1735 focus = 0;
1698 want_refresh = 1; 1736 want_refresh = 1;
1699 1737
1738 PERL_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1739
1700#if ENABLE_FRILLS || ISO_14755 1740#if ENABLE_FRILLS || ISO_14755
1741 if (iso14755buf)
1742 {
1701 iso14755buf = 0; 1743 iso14755buf = 0;
1702#endif
1703#if ENABLE_OVERLAY 1744# if ENABLE_OVERLAY
1704 scr_overlay_off (); 1745 scr_overlay_off ();
1746# endif
1747 }
1705#endif 1748#endif
1706#if USE_XIM 1749#if USE_XIM
1707 if (Input_Context != NULL) 1750 if (Input_Context != NULL)
1708 XUnsetICFocus (Input_Context); 1751 XUnsetICFocus (Input_Context);
1709#endif 1752#endif
1710#if CURSOR_BLINK 1753#if CURSOR_BLINK
1711 if (options & Opt_cursorBlink) 1754 if (OPTION (Opt_cursorBlink))
1712 cursor_blink_ev.stop (); 1755 cursor_blink_ev.stop ();
1713 hidden_cursor = 0; 1756 hidden_cursor = 0;
1714#endif 1757#endif
1715#if OFF_FOCUS_FADING 1758#if OFF_FOCUS_FADING
1716 if (rs[Rs_fade]) 1759 if (rs[Rs_fade])
… …
1740 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID]) 1783 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID])
1741 return; 1784 return;
1742 1785
1743 /* FALLTHROUGH */ 1786 /* FALLTHROUGH */
1744 case ReparentNotify: 1787 case ReparentNotify:
1745 if ((options & Opt_transparent) && check_our_parents () && am_transparent) 1788 if (OPTION (Opt_transparent) && check_our_parents () && am_transparent)
1746 want_refresh = want_full_refresh = 1; 1789 want_refresh = want_full_refresh = 1;
1747 break; 1790 break;
1748 } 1791 }
1749} 1792}
1750#endif 1793#endif
… …
1753rxvt_term::button_press (XButtonEvent &ev) 1796rxvt_term::button_press (XButtonEvent &ev)
1754{ 1797{
1755 int reportmode = 0, clickintime; 1798 int reportmode = 0, clickintime;
1756 1799
1757 bypass_keystate = ev.state & (ModMetaMask | ShiftMask); 1800 bypass_keystate = ev.state & (ModMetaMask | ShiftMask);
1801
1758 if (!bypass_keystate) 1802 if (!bypass_keystate)
1759 reportmode = !! (priv_modes & PrivMode_mouse_report); 1803 reportmode = !! (priv_modes & PrivMode_mouse_report);
1760 1804
1761 /* 1805 /*
1762 * VT window processing of button press 1806 * VT window processing of button press
… …
1811 else 1855 else
1812 { 1856 {
1813 if (ev.button != MEvent.button) 1857 if (ev.button != MEvent.button)
1814 MEvent.clicks = 0; 1858 MEvent.clicks = 0;
1815 1859
1860 if (!PERL_INVOKE ((this, HOOK_MOUSE_CLICK, DT_XEVENT, &ev, DT_END)))
1816 switch (ev.button) 1861 switch (ev.button)
1817 { 1862 {
1818 case Button1: 1863 case Button1:
1819 /* allow meta + click to select rectangular areas */ 1864 /* allow meta + click to select rectangular areas */
1820 /* should be done in screen.C */ 1865 /* should be done in screen.C */
1821#if ENABLE_FRILLS 1866#if ENABLE_FRILLS
1822 selection.rect = !!(ev.state & ModMetaMask); 1867 selection.rect = !!(ev.state & ModMetaMask);
1823#else 1868#else
1824 selection.rect = false; 1869 selection.rect = false;
1825#endif 1870#endif
1826 1871
1827 /* allow shift+left click to extend selection */ 1872 /* allow shift+left click to extend selection */
1828 if (ev.state & ShiftMask && ! (priv_modes & PrivMode_mouse_report)) 1873 if (ev.state & ShiftMask && ! (priv_modes & PrivMode_mouse_report))
1829 { 1874 {
1830 if (MEvent.button == Button1 && clickintime) 1875 if (MEvent.button == Button1 && clickintime)
1831 selection_rotate (ev.x, ev.y); 1876 selection_rotate (ev.x, ev.y);
1832 else 1877 else
1833 selection_extend (ev.x, ev.y, 1); 1878 selection_extend (ev.x, ev.y, 1);
1834 } 1879 }
1835 else 1880 else
1836 { 1881 {
1837 if (MEvent.button == Button1 && clickintime) 1882 if (MEvent.button == Button1 && clickintime)
1838 MEvent.clicks++; 1883 MEvent.clicks++;
1839 else 1884 else
1840 MEvent.clicks = 1; 1885 MEvent.clicks = 1;
1841 1886
1842 selection_click (MEvent.clicks, ev.x, ev.y); 1887 selection_click (MEvent.clicks, ev.x, ev.y);
1843 } 1888 }
1844 1889
1845 MEvent.button = Button1; 1890 MEvent.button = Button1;
1846 break; 1891 break;
1847 1892
1848 case Button3: 1893 case Button3:
1849 if (MEvent.button == Button3 && clickintime) 1894 if (MEvent.button == Button3 && clickintime)
1850 selection_rotate (ev.x, ev.y); 1895 selection_rotate (ev.x, ev.y);
1851 else 1896 else
1852 selection_extend (ev.x, ev.y, 1); 1897 selection_extend (ev.x, ev.y, 1);
1853 1898
1854 MEvent.button = Button3; 1899 MEvent.button = Button3;
1855 break; 1900 break;
1856 } 1901 }
1857 } 1902 }
1858 1903
1859 MEvent.time = ev.time; 1904 MEvent.time = ev.time;
1860 return; 1905 return;
1861 } 1906 }
1862 1907
… …
2092 2137
2093 v = ev.button == Button4 ? UP : DN; 2138 v = ev.button == Button4 ? UP : DN;
2094 2139
2095 if (ev.state & ShiftMask) 2140 if (ev.state & ShiftMask)
2096 i = 1; 2141 i = 1;
2097 else if (options & Opt_mouseWheelScrollPage) 2142 else if (OPTION (Opt_mouseWheelScrollPage))
2098 i = nrow - 1; 2143 i = nrow - 1;
2099 else 2144 else
2100 i = 5; 2145 i = 5;
2101 2146
2102# ifdef MOUSE_SLIP_WHEELING 2147# ifdef MOUSE_SLIP_WHEELING
… …
2388 XWindowAttributes wattr, wrootattr; 2433 XWindowAttributes wattr, wrootattr;
2389 dDisp; 2434 dDisp;
2390 2435
2391 pchanged = 0; 2436 pchanged = 0;
2392 2437
2393 if (!(options & Opt_transparent)) 2438 if (!OPTION (Opt_transparent))
2394 return pchanged; /* Don't try any more */ 2439 return pchanged; /* Don't try any more */
2395 2440
2396 XGetWindowAttributes (disp, display->root, &wrootattr); 2441 XGetWindowAttributes (disp, display->root, &wrootattr);
2397 rootdepth = wrootattr.depth; 2442 rootdepth = wrootattr.depth;
2398 2443
… …
2626bool 2671bool
2627rxvt_term::cmd_parse () 2672rxvt_term::cmd_parse ()
2628{ 2673{
2629 bool flag = false; 2674 bool flag = false;
2630 unicode_t ch = NOCHAR; 2675 unicode_t ch = NOCHAR;
2631 unsigned char *seq_begin; // remember start of esc-sequence here 2676 char *seq_begin; // remember start of esc-sequence here
2632 2677
2633 for (;;) 2678 for (;;)
2634 { 2679 {
2635 if (ch == NOCHAR) 2680 if (ch == NOCHAR)
2636 { 2681 {
… …
2676 if (ch == C0_LF) 2721 if (ch == C0_LF)
2677 nlines++; 2722 nlines++;
2678 2723
2679 refresh_count++; 2724 refresh_count++;
2680 2725
2681 if (!(options & Opt_jumpScroll) 2726 if (!OPTION (Opt_jumpScroll)
2682 || (refresh_count >= refresh_limit * (nrow - 1))) 2727 || (refresh_count >= refresh_limit * (nrow - 1)))
2683 { 2728 {
2684 refreshnow = true; 2729 refreshnow = true;
2730 refresh_count = 0;
2685 ch = NOCHAR; 2731 ch = NOCHAR;
2686 break; 2732 break;
2687 } 2733 }
2688 2734
2689 // scr_add_lines only works for nlines <= nrow - 1. 2735 // scr_add_lines only works for nlines <= nrow - 1.
… …
2720 * the number of pages between refreshes is refresh_limit, which 2766 * the number of pages between refreshes is refresh_limit, which
2721 * is incremented here because we must be doing flat-out scrolling. 2767 * is incremented here because we must be doing flat-out scrolling.
2722 */ 2768 */
2723 if (refreshnow) 2769 if (refreshnow)
2724 { 2770 {
2725 if ((options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD) 2771 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2726 refresh_limit++; 2772 refresh_limit++;
2727 else 2773 else
2728 { 2774 {
2729 flag = true; 2775 flag = true;
2730 scr_refresh (refresh_type); 2776 scr_refresh (refresh_type);
2777 flush_ev.stop ();
2731 } 2778 }
2732 } 2779 }
2733 2780
2734 } 2781 }
2735 else 2782 else
… …
2766rxvt_term::next_char () 2813rxvt_term::next_char ()
2767{ 2814{
2768 while (cmdbuf_ptr < cmdbuf_endp) 2815 while (cmdbuf_ptr < cmdbuf_endp)
2769 { 2816 {
2770 // assume 7-bit to be ascii ALWAYS 2817 // assume 7-bit to be ascii ALWAYS
2771 if (*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2818 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)
2772 return *cmdbuf_ptr++; 2819 return *cmdbuf_ptr++;
2773 2820
2774 wchar_t wc; 2821 wchar_t wc;
2775 size_t len = mbrtowc (&wc, (char *)cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate); 2822 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2776 2823
2777 if (len == (size_t)-2) 2824 if (len == (size_t)-2)
2778 { 2825 {
2779 // the mbstate stores incomplete sequences. didn't know this :/ 2826 // the mbstate stores incomplete sequences. didn't know this :/
2780 cmdbuf_ptr = cmdbuf_endp; 2827 cmdbuf_ptr = cmdbuf_endp;
… …
2919 case C0_ESC: 2966 case C0_ESC:
2920 process_escape_seq (); 2967 process_escape_seq ();
2921 break; 2968 break;
2922 case C0_ENQ: /* terminal Status */ 2969 case C0_ENQ: /* terminal Status */
2923 if (rs[Rs_answerbackstring]) 2970 if (rs[Rs_answerbackstring])
2924 tt_write ((const unsigned char *)rs[Rs_answerbackstring], 2971 tt_write (rs [Rs_answerbackstring], strlen (rs [Rs_answerbackstring]));
2925 (unsigned int)strlen (rs[Rs_answerbackstring]));
2926 else 2972 else
2927 tt_write ((unsigned char *)VT100_ANS, 2973 tt_write (VT100_ANS, strlen (VT100_ANS));
2928 (unsigned int)strlen (VT100_ANS));
2929 break; 2974 break;
2930 case C0_BEL: /* bell */ 2975 case C0_BEL: /* bell */
2931 scr_bell (); 2976 scr_bell ();
2932 break; 2977 break;
2933 case C0_BS: /* backspace */ 2978 case C0_BS: /* backspace */
… …
3121 process_dcs_seq (); 3166 process_dcs_seq ();
3122 break; 3167 break;
3123 3168
3124 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 3169 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
3125 case C1_SCI: /* ESC Z */ 3170 case C1_SCI: /* ESC Z */
3126 tt_write ((const unsigned char *)ESCZ_ANSWER, 3171 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
3127 (unsigned int) (sizeof (ESCZ_ANSWER) - 1));
3128 break; /* steal obsolete ESC [ c */ 3172 break; /* steal obsolete ESC [ c */
3129 3173
3130 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 3174 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */
3131 case C1_CSI: /* ESC [ */ 3175 case C1_CSI: /* ESC [ */
3132 process_csi_seq (); 3176 process_csi_seq ();
… …
3376 case CSI_SU: /* 8.3.148: (1) SCROLL UP */ 3420 case CSI_SU: /* 8.3.148: (1) SCROLL UP */
3377 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0]); 3421 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0]);
3378 break; 3422 break;
3379 3423
3380 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ 3424 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
3381 tt_write ((const unsigned char *)VT100_ANS, 3425 tt_write (VT100_ANS, sizeof (VT100_ANS) - 1);
3382 (unsigned int) (sizeof (VT100_ANS) - 1));
3383 break; 3426 break;
3384 3427
3385 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */ 3428 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */
3386 process_sgr_mode (nargs, arg); 3429 process_sgr_mode (nargs, arg);
3387 break; 3430 break;
… …
3394 break; 3437 break;
3395 case 6: /* CPR requested */ 3438 case 6: /* CPR requested */
3396 scr_report_position (); 3439 scr_report_position ();
3397 break; 3440 break;
3398 case 7: /* unofficial extension */ 3441 case 7: /* unofficial extension */
3399 if (options & Opt_insecure) 3442 if (OPTION (Opt_insecure))
3400 tt_printf ("%-.250s\012", rs[Rs_display_name]); 3443 tt_printf ("%-.250s\012", rs[Rs_display_name]);
3401 break; 3444 break;
3402 case 8: /* unofficial extension */ 3445 case 8: /* unofficial extension */
3403 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 3446 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
3404 break; 3447 break;
… …
3568 break; 3611 break;
3569 case 20: /* report icon label */ 3612 case 20: /* report icon label */
3570 { 3613 {
3571 char *s; 3614 char *s;
3572 XGetIconName (disp, parent[0], &s); 3615 XGetIconName (disp, parent[0], &s);
3573 tt_printf ("\033]L%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */ 3616 tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */
3574 XFree (s); 3617 XFree (s);
3575 } 3618 }
3576 break; 3619 break;
3577 case 21: /* report window title */ 3620 case 21: /* report window title */
3578 { 3621 {
3579 char *s; 3622 char *s;
3580 XFetchName (disp, parent[0], &s); 3623 XFetchName (disp, parent[0], &s);
3581 tt_printf ("\033]l%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */ 3624 tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */
3582 XFree (s); 3625 XFree (s);
3583 } 3626 }
3584 break; 3627 break;
3585 } 3628 }
3586} 3629}
… …
3589/*----------------------------------------------------------------------*/ 3632/*----------------------------------------------------------------------*/
3590/* 3633/*
3591 * get input up until STRING TERMINATOR (or BEL) 3634 * get input up until STRING TERMINATOR (or BEL)
3592 * ends_how is terminator used. returned input must be free()'d 3635 * ends_how is terminator used. returned input must be free()'d
3593 */ 3636 */
3594unsigned char * 3637char *
3595rxvt_term::get_to_st (unicode_t &ends_how) 3638rxvt_term::get_to_st (unicode_t &ends_how)
3596{ 3639{
3597 unicode_t ch; 3640 unicode_t ch;
3598 bool seen_esc = false; 3641 bool seen_esc = false;
3599 unsigned int n = 0; 3642 unsigned int n = 0;
… …
3632 3675
3633 string[n++] = '\0'; 3676 string[n++] = '\0';
3634 3677
3635 ends_how = (ch == 0x5c ? C0_ESC : ch); 3678 ends_how = (ch == 0x5c ? C0_ESC : ch);
3636 3679
3637 return (unsigned char *)rxvt_wcstombs (string); 3680 return rxvt_wcstombs (string);
3638} 3681}
3639 3682
3640/*----------------------------------------------------------------------*/ 3683/*----------------------------------------------------------------------*/
3641/* 3684/*
3642 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 3685 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
3643 */ 3686 */
3644void 3687void
3645rxvt_term::process_dcs_seq () 3688rxvt_term::process_dcs_seq ()
3646{ 3689{
3647 unsigned char *s; 3690 char *s;
3648 unicode_t eh; 3691 unicode_t eh;
3649 3692
3650 /* 3693 /*
3651 * Not handled yet 3694 * Not handled yet
3652 */ 3695 */
… …
3671 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3714 for (arg = 0; isdigit (ch); ch = cmd_getc ())
3672 arg = arg * 10 + (ch - '0'); 3715 arg = arg * 10 + (ch - '0');
3673 3716
3674 if (ch == ';') 3717 if (ch == ';')
3675 { 3718 {
3676 unsigned char *s = get_to_st (eh); 3719 char *s = get_to_st (eh);
3677 3720
3678 if (s) 3721 if (s)
3679 { 3722 {
3680 process_xterm_seq (arg, (char *)s, eh); 3723 process_xterm_seq (arg, s, eh);
3681 free (s); 3724 free (s);
3682 } 3725 }
3683 } 3726 }
3684} 3727}
3685 3728
3686void 3729void
3687rxvt_term::process_color_seq (int report, int color, const char *str, unsigned char resp) 3730rxvt_term::process_color_seq (int report, int color, const char *str, char resp)
3688{ 3731{
3689 if (str[0] == '?' && !str[1]) 3732 if (str[0] == '?' && !str[1])
3690 { 3733 {
3691 unsigned short r, g, b; 3734 unsigned short r, g, b;
3692 pix_colors_focused[color].get (display, r, g, b); 3735 pix_colors_focused[color].get (display, r, g, b);
… …
3698 3741
3699/* 3742/*
3700 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3743 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3701 */ 3744 */
3702void 3745void
3703rxvt_term::process_xterm_seq (int op, const char *str, unsigned char resp) 3746rxvt_term::process_xterm_seq (int op, const char *str, char resp)
3704{ 3747{
3705 int changed = 0; 3748 int changed = 0;
3706 int color; 3749 int color;
3707 char *buf, *name; 3750 char *buf, *name;
3708 bool query = str[0] == '?' && !str[1]; 3751 bool query = str[0] == '?' && !str[1];
… …
3862 // TODO, when secure mode? 3905 // TODO, when secure mode?
3863 break; 3906 break;
3864 3907
3865#ifdef MENUBAR 3908#ifdef MENUBAR
3866 case URxvt_Menu: 3909 case URxvt_Menu:
3867 if (options & Opt_insecure) 3910 if (OPTION (Opt_insecure))
3868 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked 3911 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked
3869 break; 3912 break;
3870#endif 3913#endif
3871#if 0 3914#if 0
3872 case XTerm_dumpscreen: /* no error notices */ 3915 case XTerm_dumpscreen: /* no error notices */
… …
3888 case URxvt_italicFont: 3931 case URxvt_italicFont:
3889 case URxvt_boldItalicFont: 3932 case URxvt_boldItalicFont:
3890#endif 3933#endif
3891 if (query) 3934 if (query)
3892 tt_printf ("\33]%d;%-.250s%c", saveop, 3935 tt_printf ("\33]%d;%-.250s%c", saveop,
3893 (options & Opt_insecure) && fontset[op - URxvt_font]->fontdesc 3936 OPTION (Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3894 ? fontset[op - URxvt_font]->fontdesc : "", 3937 ? fontset[op - URxvt_font]->fontdesc : "",
3895 resp); 3938 resp);
3896 else 3939 else
3897 { 3940 {
3898 const char *&res = rs[Rs_font + (op - URxvt_font)]; 3941 const char *&res = rs[Rs_font + (op - URxvt_font)];
… …
3904 break; 3947 break;
3905 3948
3906#if ENABLE_FRILLS 3949#if ENABLE_FRILLS
3907 case URxvt_locale: 3950 case URxvt_locale:
3908 if (query) 3951 if (query)
3909 tt_printf ("\33]%d;%-.250s%c", URxvt_locale, (options & Opt_insecure) ? locale : "", resp); 3952 tt_printf ("\33]%d;%-.250s%c", URxvt_locale, OPTION (Opt_insecure) ? locale : "", resp);
3910 else 3953 else
3911 { 3954 {
3912 set_locale (str); 3955 set_locale (str);
3913 pty.set_utf8_mode (enc_utf8); 3956 pty.set_utf8_mode (enc_utf8);
3914 init_xlocale (); 3957 init_xlocale ();
3915 } 3958 }
3916 break; 3959 break;
3917 3960
3918 case URxvt_view_up: 3961 case URxvt_view_up:
3919 case URxvt_view_down: 3962 case URxvt_view_down:
3963 {
3920 int lines = atoi (str); 3964 int lines = atoi (str);
3921 3965
3922 if (lines) 3966 if (lines)
3923 scr_page (op == URxvt_view_up ? UP : DN, lines); 3967 scr_page (op == URxvt_view_up ? UP : DN, lines);
3924 else 3968 else
3925 {
3926 scr_erase_savelines (); 3969 scr_erase_savelines ();
3927 } 3970 }
3928 3971
3972 break;
3973#endif
3974
3975#if ENABLE_PERL
3976 case URxvt_perl:
3977 if (PERL_INVOKE ((this, HOOK_OSC_SEQ, DT_STRING, str, DT_END)))
3978 ; // no responses yet
3929 break; 3979 break;
3930#endif 3980#endif
3931 } 3981 }
3932} 3982}
3933/*----------------------------------------------------------------------*/ 3983/*----------------------------------------------------------------------*/
… …
4042 } 4092 }
4043 4093
4044 /* extra handling for values with state unkept */ 4094 /* extra handling for values with state unkept */
4045 switch (arg[i]) 4095 switch (arg[i])
4046 { 4096 {
4097#if ENABLE_STYLES
4098 case 1021:
4099 if (mode)
4100 SET_OPTION (Opt_intensityStyles);
4101 else
4102 CLR_OPTION (Opt_intensityStyles);
4103
4104 scr_touch (true);
4105 break;
4106#endif
4047 case 1048: /* alternative cursor save */ 4107 case 1048: /* alternative cursor save */
4048 case 1049: 4108 case 1049:
4049 if (options & Opt_secondaryScreen) 4109 if (OPTION (Opt_secondaryScreen))
4050 if (mode == 0) 4110 if (mode == 0)
4051 scr_cursor (RESTORE); 4111 scr_cursor (RESTORE);
4052 else if (mode == 1) 4112 else if (mode == 1)
4053 scr_cursor (SAVE); 4113 scr_cursor (SAVE);
4054 break; 4114 break;
… …
4069 case 3: /* 80/132 */ 4129 case 3: /* 80/132 */
4070 if (priv_modes & PrivMode_132OK) 4130 if (priv_modes & PrivMode_132OK)
4071 set_widthheight (((state ? 132 : 80) * fwidth), height); 4131 set_widthheight (((state ? 132 : 80) * fwidth), height);
4072 break; 4132 break;
4073 case 4: /* smooth scrolling */ 4133 case 4: /* smooth scrolling */
4074 if (state) 4134 if (!state)
4075 options &= ~Opt_jumpScroll; 4135 SET_OPTION (Opt_jumpScroll);
4076 else 4136 else
4077 options |= Opt_jumpScroll; 4137 CLR_OPTION (Opt_jumpScroll);
4078 break; 4138 break;
4079 case 5: /* reverse video */ 4139 case 5: /* reverse video */
4080 scr_rvideo_mode (state); 4140 scr_rvideo_mode (state);
4081 break; 4141 break;
4082 case 6: /* relative/absolute origins */ 4142 case 6: /* relative/absolute origins */
… …
4123#if 0 4183#if 0
4124 case 1001: 4184 case 1001:
4125 break; /* X11 mouse highlighting */ 4185 break; /* X11 mouse highlighting */
4126#endif 4186#endif
4127 case 1010: /* scroll to bottom on TTY output inhibit */ 4187 case 1010: /* scroll to bottom on TTY output inhibit */
4128 if (state) 4188 if (!state)
4129 options &= ~Opt_scrollTtyOutput; 4189 SET_OPTION (Opt_scrollTtyOutput);
4130 else 4190 else
4131 options |= Opt_scrollTtyOutput; 4191 CLR_OPTION (Opt_scrollTtyOutput);
4132 break; 4192 break;
4133 case 1011: /* scroll to bottom on key press */ 4193 case 1011: /* scroll to bottom on key press */
4134 if (state) 4194 if (state)
4135 options |= Opt_scrollTtyKeypress; 4195 SET_OPTION (Opt_scrollTtyKeypress);
4136 else 4196 else
4137 options &= ~Opt_scrollTtyKeypress; 4197 CLR_OPTION (Opt_scrollTtyKeypress);
4138 break; 4198 break;
4139 case 1047: /* secondary screen w/ clearing last */ 4199 case 1047: /* secondary screen w/ clearing last */
4140 if (options & Opt_secondaryScreen) 4200 if (OPTION (Opt_secondaryScreen))
4141 if (current_screen != PRIMARY) 4201 if (current_screen != PRIMARY)
4142 scr_erase_screen (2); 4202 scr_erase_screen (2);
4143 scr_change_screen (state); 4203 scr_change_screen (state);
4144 break; 4204 break;
4145 case 1049: /* secondary screen w/ clearing first */ 4205 case 1049: /* secondary screen w/ clearing first */
4146 scr_change_screen (state); 4206 scr_change_screen (state);
4147 if (options & Opt_secondaryScreen) 4207 if (OPTION (Opt_secondaryScreen))
4148 if (current_screen != PRIMARY) 4208 if (current_screen != PRIMARY)
4149 scr_erase_screen (2); 4209 scr_erase_screen (2);
4150 break; 4210 break;
4151 default: 4211 default:
4152 break; 4212 break;
… …
4280 scr_color (Color_bg, Color_bg); 4340 scr_color (Color_bg, Color_bg);
4281 break; 4341 break;
4282 4342
4283 //case 50: // not variable spacing 4343 //case 50: // not variable spacing
4284 4344
4285#ifndef NO_BRIGHTCOLOR 4345#if ENABLE_FRILLS
4286 case 90: 4346 case 90:
4287 case 91: /* set bright fg color */ 4347 case 91: /* set bright fg color */
4288 case 92: 4348 case 92:
4289 case 93: 4349 case 93:
4290 case 94: 4350 case 94:
… …
4302 case 106: 4362 case 106:
4303 case 107: 4363 case 107:
4304 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg); 4364 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg);
4305 break; 4365 break;
4306#endif 4366#endif
4307
4308 } 4367 }
4309 } 4368 }
4310} 4369}
4311/*}}} */ 4370/*}}} */
4312 4371
… …
4336 */ 4395 */
4337void 4396void
4338rxvt_term::tt_printf (const char *fmt,...) 4397rxvt_term::tt_printf (const char *fmt,...)
4339{ 4398{
4340 va_list arg_ptr; 4399 va_list arg_ptr;
4341 unsigned char buf[256]; 4400 char buf[256];
4342 4401
4343 va_start (arg_ptr, fmt); 4402 va_start (arg_ptr, fmt);
4344 vsnprintf ((char *)buf, 256, fmt, arg_ptr); 4403 vsnprintf ((char *)buf, 256, fmt, arg_ptr);
4345 va_end (arg_ptr); 4404 va_end (arg_ptr);
4346 tt_write (buf, strlen (buf)); 4405 tt_write (buf, strlen (buf));
… …
4351 * or generated by us in response to a query ESC sequence. 4410 * or generated by us in response to a query ESC sequence.
4352 */ 4411 */
4353const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT 4412const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4354 4413
4355void 4414void
4356rxvt_term::tt_write (const unsigned char *data, unsigned int len) 4415rxvt_term::tt_write (const char *data, unsigned int len)
4357{ 4416{
4358 if (v_buflen == 0) 4417 if (v_buflen == 0)
4359 { 4418 {
4360 ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE)); 4419 ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE));
4361 4420
… …
4364 4423
4365 data += written; 4424 data += written;
4366 len -= written; 4425 len -= written;
4367 } 4426 }
4368 4427
4369 v_buffer = (unsigned char *)realloc (v_buffer, v_buflen + len); 4428 v_buffer = (char *)realloc (v_buffer, v_buflen + len);
4370 4429
4371 memcpy (v_buffer + v_buflen, data, len); 4430 memcpy (v_buffer + v_buflen, data, len);
4372 v_buflen += len; 4431 v_buflen += len;
4373 4432
4374 pty_ev.set (EVENT_READ | EVENT_WRITE); 4433 pty_ev.set (EVENT_READ | EVENT_WRITE);

Diff Legend

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