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.218 by root, Sat Dec 31 16:40:28 2005 UTC vs.
Revision 1.249 by root, Sun Jan 8 01:02:15 2006 UTC

… …
25 * - extensive modifications 25 * - extensive modifications
26 * Copyright (c) 1998 Alfredo K. Kojima <kojima@windowmaker.org> 26 * Copyright (c) 1998 Alfredo K. Kojima <kojima@windowmaker.org>
27 * Copyright (c) 2001 Marius Gedminas 27 * Copyright (c) 2001 Marius Gedminas
28 * - Ctrl/Mod4+Tab works like Meta+Tab (options) 28 * - Ctrl/Mod4+Tab works like Meta+Tab (options)
29 * Copyright (c) 2003 Rob McMullen <robm@flipturn.org> 29 * Copyright (c) 2003 Rob McMullen <robm@flipturn.org>
30 * Copyright (c) 2003-2005 Marc Lehmann <pcg@goof.com> 30 * Copyright (c) 2003-2006 Marc Lehmann <pcg@goof.com>
31 * 31 *
32 * This program is free software; you can redistribute it and/or modify 32 * This program is free software; you can redistribute it and/or modify
33 * it under the terms of the GNU General Public License as published by 33 * it under the terms of the GNU General Public License as published by
34 * the Free Software Foundation; either version 2 of the License, or 34 * the Free Software Foundation; either version 2 of the License, or
35 * (at your option) any later version. 35 * (at your option) any later version.
… …
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
… …
155 } 161 }
156 162
157 x--; 163 x--;
158 } 164 }
159} 165}
160#endif
161 166
162void 167void
163rxvt_term::iso14755_51 (unicode_t ch, rend_t r, int x, int y) 168rxvt_term::iso14755_51 (unicode_t ch, rend_t r, int x, int y)
164{ 169{
165#if ENABLE_OVERLAY
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
… …
238 242
239# if ENABLE_COMBINING 243# if ENABLE_COMBINING
240 if (alloc) 244 if (alloc)
241 delete [] alloc; 245 delete [] alloc;
242# endif 246# endif
243#endif
244} 247}
248#endif
245 249
246void 250void
247rxvt_term::commit_iso14755 () 251rxvt_term::commit_iso14755 ()
248{ 252{
249 wchar_t ch[2]; 253 wchar_t ch[2];
… …
264 mb[0] = ch[0]; 268 mb[0] = ch[0];
265 len = 1; 269 len = 1;
266 } 270 }
267 271
268 if (len > 0) 272 if (len > 0)
269 tt_write ((unsigned char *)mb, len); 273 tt_write (mb, len);
270 else 274 else
271 scr_bell (); 275 scr_bell ();
272 } 276 }
273 277
274 iso14755buf = 0; 278 iso14755buf = 0;
… …
302 KeySym keysym; 306 KeySym keysym;
303#ifdef DEBUG_CMD 307#ifdef DEBUG_CMD
304 static int debug_key = 1; /* accessible by a debugger only */ 308 static int debug_key = 1; /* accessible by a debugger only */
305#endif 309#endif
306 int valid_keysym; 310 int valid_keysym;
307 unsigned char kbuf[KBUFSZ]; 311 char kbuf[KBUFSZ];
308 312
309 /* 313 /*
310 * 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
311 * escape sequence to toggle the Keypad. 315 * escape sequence to toggle the Keypad.
312 * 316 *
… …
330 Status status_return; 334 Status status_return;
331 335
332#if 0 336#if 0
333#ifdef X_HAVE_UTF8_STRING 337#ifdef X_HAVE_UTF8_STRING
334 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
335 len = Xutf8LookupString (Input_Context, &ev, (char *)kbuf, 339 len = Xutf8LookupString (Input_Context, &ev, kbuf,
336 KBUFSZ, &keysym, &status_return); 340 KBUFSZ, &keysym, &status_return);
337 else 341 else
338#endif 342#endif
339#endif 343#endif
340 { 344 {
… …
377 || status_return == XLookupBoth; 381 || status_return == XLookupBoth;
378 } 382 }
379 else 383 else
380#endif 384#endif
381 { 385 {
382 len = XLookupString (&ev, (char *)kbuf, KBUFSZ, &keysym, &compose); 386 len = XLookupString (&ev, kbuf, KBUFSZ, &keysym, &compose);
383 valid_keysym = keysym != NoSymbol; 387 valid_keysym = keysym != NoSymbol;
384 } 388 }
385 389
386 if (valid_keysym) 390 if (valid_keysym)
387 { 391 {
… …
851 { 855 {
852#ifdef META8_OPTION 856#ifdef META8_OPTION
853 /* set 8-bit on */ 857 /* set 8-bit on */
854 if (meta && (meta_char == 0x80)) 858 if (meta && (meta_char == 0x80))
855 { 859 {
856 unsigned char *ch; 860 char *ch;
857 861
858 for (ch = kbuf; ch < kbuf + len; ch++) 862 for (ch = kbuf; ch < kbuf + len; ch++)
859 *ch |= 0x80; 863 *ch |= 0x80;
860 864
861 meta = 0; 865 meta = 0;
… …
863#endif 867#endif
864 /* nil */ ; 868 /* nil */ ;
865 } 869 }
866 } 870 }
867 871
872 if (HOOK_INVOKE ((this, HOOK_KEY_PRESS, DT_XEVENT, &ev, DT_STR_LEN, kbuf, len, DT_END)))
873 return;
874
868 if (len <= 0) 875 if (len <= 0)
869 return; /* not mapped */ 876 return; /* not mapped */
870 877
871 if (options & Opt_scrollTtyKeypress) 878 if (OPTION (Opt_scrollTtyKeypress))
872 if (view_start) 879 if (view_start)
873 { 880 {
874 view_start = 0; 881 view_start = 0;
875 want_refresh = 1; 882 want_refresh = 1;
876 } 883 }
… …
894#ifdef META8_OPTION 901#ifdef META8_OPTION
895 && meta_char == C0_ESC 902 && meta_char == C0_ESC
896#endif 903#endif
897 ) 904 )
898 { 905 {
899 const unsigned char ch = C0_ESC; 906 const char ch = C0_ESC;
900 tt_write (&ch, 1); 907 tt_write (&ch, 1);
901 } 908 }
902 909
903#if defined(DEBUG_CMD) 910#if defined(DEBUG_CMD)
904 /* Display keyboard buffer contents */ 911 /* Display keyboard buffer contents */
… …
916 923
917#if MENUBAR_MAX || defined (KEYSYM_RESOURCE) 924#if MENUBAR_MAX || defined (KEYSYM_RESOURCE)
918/*{{{ rxvt_cmd_write (), rxvt_cmd_getc () */ 925/*{{{ rxvt_cmd_write (), rxvt_cmd_getc () */
919/* attempt to `write' count to the input buffer */ 926/* attempt to `write' count to the input buffer */
920unsigned int 927unsigned int
921rxvt_term::cmd_write (const unsigned char *str, unsigned int count) 928rxvt_term::cmd_write (const char *str, unsigned int count)
922{ 929{
923 unsigned int n, s; 930 unsigned int n, s;
924 931
925 n = cmdbuf_ptr - cmdbuf_base; 932 n = cmdbuf_ptr - cmdbuf_base;
926 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp; 933 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp;
… …
963 } 970 }
964#endif 971#endif
965 972
966 if (want_refresh) 973 if (want_refresh)
967 { 974 {
975 if (SHOULD_INVOKE (HOOK_LINE_UPDATE))
976 {
977 int row = -view_start;
978
979 while (row > -nsaved && ROW (row - 1).is_longer ())
980 --row;
981
982 while (row < -view_start + nrow)
983 {
984 int start_row = row;
985 line_t *l;
986
987 do
988 {
989 l = &ROW (row);
990
991 if (!(l->f & LINE_FILTERED))
992 {
993 // line not filtered, mark it as filtered
994 l->f |= LINE_FILTERED;
995 while (l->is_longer ())
996 {
997 l = &ROW (++row);
998 l->f |= LINE_FILTERED;
999 }
1000
1001 // and filter it
1002 HOOK_INVOKE ((this, HOOK_LINE_UPDATE, DT_INT, start_row, DT_END));
1003
1004 break;
1005 }
1006 }
1007 while (l->is_longer ());
1008
1009 row++;
1010 }
1011
1012 }
1013
968 scr_refresh (refresh_type); 1014 scr_refresh (refresh_type);
969 scrollbar_show (1); 1015 scrollbar_show (1);
970#ifdef USE_XIM 1016#ifdef USE_XIM
971 IMSendSpot (); 1017 IMSendSpot ();
972#endif 1018#endif
… …
982 SET_LOCALE (locale); 1028 SET_LOCALE (locale);
983 1029
984 display->flush (); 1030 display->flush ();
985 1031
986 if (want_refresh && !flush_ev.active) 1032 if (want_refresh && !flush_ev.active)
987 flush_ev.start (NOW + 0.01); 1033 flush_ev.start (NOW + 1. / 60.); // refresh at max. 60 hz normally
988} 1034}
989 1035
990void 1036void
991rxvt_term::flush_cb (time_watcher &w) 1037rxvt_term::flush_cb (time_watcher &w)
992{ 1038{
… …
1067 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1113 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1068 } 1114 }
1069} 1115}
1070#endif 1116#endif
1071 1117
1118#if HAVE_SCHED_YIELD
1119static struct event_handler
1120{
1121 check_watcher cw_yield;
1122
1123 void yield (check_watcher &w)
1124 {
1125 sched_yield ();
1126 w.stop ();
1127 }
1128
1129 event_handler ()
1130 : cw_yield (this, &event_handler::yield)
1131 {
1132 }
1133} event_handler;
1134#endif
1135
1072bool 1136bool
1073rxvt_term::pty_fill () 1137rxvt_term::pty_fill ()
1074{ 1138{
1075 ssize_t n = cmdbuf_endp - cmdbuf_ptr; 1139 ssize_t n = cmdbuf_endp - cmdbuf_ptr;
1076 1140
1077 if (CBUFSIZ == n) 1141 if (CBUFSIZ == n)
1078 { 1142 {
1079 rxvt_warn ("pty_fill on full buffer, draining input, continuing.\n"); 1143 rxvt_warn ("PLEASE REPORT: pty_fill on full buffer, draining input, continuing.\n");
1080 n = 0; 1144 n = 0;
1081 } 1145 }
1082 1146
1083 memmove (cmdbuf_base, cmdbuf_ptr, n); 1147 memmove (cmdbuf_base, cmdbuf_ptr, n);
1084 cmdbuf_ptr = cmdbuf_base; 1148 cmdbuf_ptr = cmdbuf_base;
1085 cmdbuf_endp = cmdbuf_ptr + n; 1149 cmdbuf_endp = cmdbuf_ptr + n;
1086 1150
1087 n = read (pty.pty, cmdbuf_endp, CBUFSIZ - n); 1151 ssize_t r = read (pty.pty, cmdbuf_endp, CBUFSIZ - n);
1088 1152
1089 if (n > 0) 1153 if (r > 0)
1090 { 1154 {
1091 cmdbuf_endp += n; 1155 cmdbuf_endp += r;
1092 return true; 1156 return true;
1093 } 1157 }
1094 else if ((n < 0 && errno != EAGAIN && errno != EINTR) || n == 0) 1158 else if (r < 0 && (errno == EAGAIN || errno == EINTR))
1159 {
1160#if HAVE_SCHED_YIELD
1161 if (display->is_local)
1162 event_handler.cw_yield.start ();
1163#endif
1164 }
1165 else
1095 { 1166 {
1096 pty_ev.stop (); 1167 pty_ev.stop ();
1097 1168
1098 if (!(options & Opt_hold)) 1169 if (!OPTION (Opt_hold))
1099 destroy (); 1170 destroy ();
1100 } 1171 }
1101 1172
1102 return false; 1173 return false;
1103} 1174}
… …
1125 recolour_cursor (); 1196 recolour_cursor ();
1126 1197
1127#ifdef POINTER_BLANK 1198#ifdef POINTER_BLANK
1128 hidden_pointer = 0; 1199 hidden_pointer = 0;
1129 1200
1130 if (options & Opt_pointerBlank) 1201 if (OPTION (Opt_pointerBlank))
1131 pointer_ev.start (NOW + pointerBlankDelay); 1202 pointer_ev.start (NOW + pointerBlankDelay);
1132#endif 1203#endif
1133} 1204}
1134 1205
1135#ifdef POINTER_BLANK 1206#ifdef POINTER_BLANK
1136void 1207void
1137rxvt_term::pointer_blank () 1208rxvt_term::pointer_blank ()
1138{ 1209{
1139 if (! (options & Opt_pointerBlank)) 1210 if (!OPTION (Opt_pointerBlank))
1140 return; 1211 return;
1141 1212
1142 XDefineCursor (display->display, vt, display->blank_cursor); 1213 XDefineCursor (display->display, vt, display->blank_cursor);
1143 XFlush (display->display); 1214 XFlush (display->display);
1144 1215
… …
1240{ 1311{
1241 dDisp; 1312 dDisp;
1242 1313
1243 SET_R (this); 1314 SET_R (this);
1244 SET_LOCALE (locale); 1315 SET_LOCALE (locale);
1245
1246#if defined(CURSOR_BLINK)
1247 if ((options & Opt_cursorBlink) && ev.type == KeyPress)
1248 {
1249 if (hidden_cursor)
1250 {
1251 hidden_cursor = 0;
1252 want_refresh = 1;
1253 }
1254
1255 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1256 }
1257#endif
1258
1259#if defined(POINTER_BLANK)
1260 if ((options & Opt_pointerBlank) && pointerBlankDelay > 0)
1261 {
1262 if (ev.type == MotionNotify
1263 || ev.type == ButtonPress
1264 || ev.type == ButtonRelease)
1265 if (hidden_pointer)
1266 pointer_unblank ();
1267
1268 if (ev.type == KeyPress && hidden_pointer == 0)
1269 pointer_blank ();
1270 }
1271#endif
1272 1316
1273 Window unused_root, unused_child; 1317 Window unused_root, unused_child;
1274 int unused_root_x, unused_root_y; 1318 int unused_root_x, unused_root_y;
1275 unsigned int unused_mask; 1319 unsigned int unused_mask;
1276 1320
… …
1307 && ((ks >= 0x40 && ks <= 0x5f) 1351 && ((ks >= 0x40 && ks <= 0x5f)
1308 || (ks >= 0x61 && ks <= 0x7f))) 1352 || (ks >= 0x61 && ks <= 0x7f)))
1309 { 1353 {
1310 iso14755buf = ISO_14755_51 | 0x2400 | (ks & 0x1f); 1354 iso14755buf = ISO_14755_51 | 0x2400 | (ks & 0x1f);
1311 commit_iso14755 (); 1355 commit_iso14755 ();
1312 return; // case-break; 1356 goto skip_switch;
1313 } 1357 }
1314 1358
1315 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2) 1359 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
1316 if (i[0] == ks) 1360 if (i[0] == ks)
1317 { 1361 {
1318 iso14755buf = ISO_14755_51 | i[1]; 1362 iso14755buf = ISO_14755_51 | i[1];
1319 commit_iso14755 (); 1363 commit_iso14755 ();
1320 return; // case-break; 1364 goto skip_switch;
1321 } 1365 }
1322 1366
1323 scr_bell (); 1367 scr_bell ();
1324# endif 1368# endif
1325 iso14755buf = 0; 1369 iso14755buf = 0;
… …
1343# endif 1387# endif
1344 else 1388 else
1345 iso14755buf = 0; 1389 iso14755buf = 0;
1346 } 1390 }
1347#endif 1391#endif
1392
1393 if (ev.xany.window == vt
1394 && HOOK_INVOKE ((this, HOOK_KEY_RELEASE, DT_XEVENT, &ev, DT_END)))
1395 break;
1348 1396
1349#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1397#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1350 if (!(ev.xkey.state & ControlMask)) 1398 if (!(ev.xkey.state & ControlMask))
1351 slip_wheel_ev.stop (); 1399 slip_wheel_ev.stop ();
1352 else if (ks == XK_Control_L || ks == XK_Control_R) 1400 else if (ks == XK_Control_L || ks == XK_Control_R)
… …
1461 seen_resize = 1; 1509 seen_resize = 1;
1462 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1510 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1463 } 1511 }
1464 1512
1465#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */ 1513#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1466 if (options & Opt_transparent) 1514 if (OPTION (Opt_transparent))
1467 check_our_parents (); 1515 check_our_parents ();
1468#endif 1516#endif
1469 } 1517 }
1470 break; 1518 break;
1471 1519
… …
1487 1535
1488 case SelectionRequest: 1536 case SelectionRequest:
1489 selection_send (ev.xselectionrequest); 1537 selection_send (ev.xselectionrequest);
1490 break; 1538 break;
1491 1539
1540 case MapNotify:
1541 mapped = 1;
1542#ifdef TEXT_BLINK
1543 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1544#endif
1545 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1546 break;
1547
1492 case UnmapNotify: 1548 case UnmapNotify:
1493 mapped = 0; 1549 mapped = 0;
1494#ifdef TEXT_BLINK 1550#ifdef TEXT_BLINK
1495 text_blink_ev.stop (); 1551 text_blink_ev.stop ();
1496#endif 1552#endif
1497 break; 1553 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1498
1499 case MapNotify:
1500 mapped = 1;
1501#ifdef TEXT_BLINK
1502 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1503#endif
1504 break; 1554 break;
1505 1555
1506#ifdef TRANSPARENT 1556#ifdef TRANSPARENT
1507 case ReparentNotify: 1557 case ReparentNotify:
1508 rootwin_cb (ev); 1558 rootwin_cb (ev);
… …
1567 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1617 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1568 break; 1618 break;
1569 1619
1570 if (ev.xany.window == vt) 1620 if (ev.xany.window == vt)
1571 { 1621 {
1622 if (HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1623 ; // nop
1572 if (ev.xbutton.state & (Button1Mask | Button3Mask)) 1624 else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1573 { 1625 {
1574 while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev)) 1626 while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev))
1575 ; 1627 ;
1576 1628
1577 XQueryPointer (disp, vt, 1629 XQueryPointer (disp, vt,
… …
1663 refresh_limit = 0; 1715 refresh_limit = 0;
1664 scrollbar_show (1); 1716 scrollbar_show (1);
1665 } 1717 }
1666 break; 1718 break;
1667 } 1719 }
1720
1721skip_switch: ;
1722
1723#if defined(CURSOR_BLINK)
1724 if (OPTION (Opt_cursorBlink) && ev.type == KeyPress)
1725 {
1726 if (hidden_cursor)
1727 {
1728 hidden_cursor = 0;
1729 want_refresh = 1;
1730 }
1731
1732 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1733 }
1734#endif
1735
1736#if defined(POINTER_BLANK)
1737 if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0)
1738 {
1739 if (ev.type == MotionNotify
1740 || ev.type == ButtonPress
1741 || ev.type == ButtonRelease)
1742 if (hidden_pointer)
1743 pointer_unblank ();
1744
1745 if (ev.type == KeyPress && hidden_pointer == 0)
1746 pointer_blank ();
1747 }
1748#endif
1668} 1749}
1669 1750
1670void 1751void
1671rxvt_term::focus_in () 1752rxvt_term::focus_in ()
1672{ 1753{
1673 if (!focus) 1754 if (!focus)
1674 { 1755 {
1675 focus = 1; 1756 focus = 1;
1676 want_refresh = 1; 1757 want_refresh = 1;
1758
1759 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1760
1677#if USE_XIM 1761#if USE_XIM
1678 if (Input_Context != NULL) 1762 if (Input_Context != NULL)
1679 { 1763 {
1680 IMSetStatusPosition (); 1764 IMSetStatusPosition ();
1681 XSetICFocus (Input_Context); 1765 XSetICFocus (Input_Context);
1682 } 1766 }
1683#endif 1767#endif
1684#if CURSOR_BLINK 1768#if CURSOR_BLINK
1685 if (options & Opt_cursorBlink) 1769 if (OPTION (Opt_cursorBlink))
1686 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1770 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1687#endif 1771#endif
1688#if OFF_FOCUS_FADING 1772#if OFF_FOCUS_FADING
1689 if (rs[Rs_fade]) 1773 if (rs[Rs_fade])
1690 { 1774 {
… …
1701 if (focus) 1785 if (focus)
1702 { 1786 {
1703 focus = 0; 1787 focus = 0;
1704 want_refresh = 1; 1788 want_refresh = 1;
1705 1789
1790 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1791
1706#if ENABLE_FRILLS || ISO_14755 1792#if ENABLE_FRILLS || ISO_14755
1793 if (iso14755buf)
1794 {
1707 iso14755buf = 0; 1795 iso14755buf = 0;
1708#endif
1709#if ENABLE_OVERLAY 1796# if ENABLE_OVERLAY
1710 scr_overlay_off (); 1797 scr_overlay_off ();
1798# endif
1799 }
1711#endif 1800#endif
1712#if USE_XIM 1801#if USE_XIM
1713 if (Input_Context != NULL) 1802 if (Input_Context != NULL)
1714 XUnsetICFocus (Input_Context); 1803 XUnsetICFocus (Input_Context);
1715#endif 1804#endif
1716#if CURSOR_BLINK 1805#if CURSOR_BLINK
1717 if (options & Opt_cursorBlink) 1806 if (OPTION (Opt_cursorBlink))
1718 cursor_blink_ev.stop (); 1807 cursor_blink_ev.stop ();
1719 hidden_cursor = 0; 1808 hidden_cursor = 0;
1720#endif 1809#endif
1721#if OFF_FOCUS_FADING 1810#if OFF_FOCUS_FADING
1722 if (rs[Rs_fade]) 1811 if (rs[Rs_fade])
… …
1746 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID]) 1835 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID])
1747 return; 1836 return;
1748 1837
1749 /* FALLTHROUGH */ 1838 /* FALLTHROUGH */
1750 case ReparentNotify: 1839 case ReparentNotify:
1751 if ((options & Opt_transparent) && check_our_parents () && am_transparent) 1840 if (OPTION (Opt_transparent) && check_our_parents () && am_transparent)
1752 want_refresh = want_full_refresh = 1; 1841 want_refresh = want_full_refresh = 1;
1753 break; 1842 break;
1754 } 1843 }
1755} 1844}
1756#endif 1845#endif
… …
1759rxvt_term::button_press (XButtonEvent &ev) 1848rxvt_term::button_press (XButtonEvent &ev)
1760{ 1849{
1761 int reportmode = 0, clickintime; 1850 int reportmode = 0, clickintime;
1762 1851
1763 bypass_keystate = ev.state & (ModMetaMask | ShiftMask); 1852 bypass_keystate = ev.state & (ModMetaMask | ShiftMask);
1853
1764 if (!bypass_keystate) 1854 if (!bypass_keystate)
1765 reportmode = !! (priv_modes & PrivMode_mouse_report); 1855 reportmode = !! (priv_modes & PrivMode_mouse_report);
1766 1856
1767 /* 1857 /*
1768 * VT window processing of button press 1858 * VT window processing of button press
… …
1788#ifdef MOUSE_REPORT_DOUBLECLICK 1878#ifdef MOUSE_REPORT_DOUBLECLICK
1789 if (ev.button == MEvent.button && clickintime) 1879 if (ev.button == MEvent.button && clickintime)
1790 { 1880 {
1791 /* same button, within alloted time */ 1881 /* same button, within alloted time */
1792 MEvent.clicks++; 1882 MEvent.clicks++;
1883
1793 if (MEvent.clicks > 1) 1884 if (MEvent.clicks > 1)
1794 { 1885 {
1795 /* only report double clicks */ 1886 /* only report double clicks */
1796 MEvent.clicks = 2; 1887 MEvent.clicks = 2;
1797 mouse_report (ev); 1888 mouse_report (ev);
… …
1817 else 1908 else
1818 { 1909 {
1819 if (ev.button != MEvent.button) 1910 if (ev.button != MEvent.button)
1820 MEvent.clicks = 0; 1911 MEvent.clicks = 0;
1821 1912
1913 if (!HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1822 switch (ev.button) 1914 switch (ev.button)
1823 { 1915 {
1824 case Button1: 1916 case Button1:
1825 /* allow meta + click to select rectangular areas */ 1917 /* allow meta + click to select rectangular areas */
1826 /* should be done in screen.C */ 1918 /* should be done in screen.C */
1827#if ENABLE_FRILLS 1919#if ENABLE_FRILLS
1828 selection.rect = !!(ev.state & ModMetaMask); 1920 selection.rect = !!(ev.state & ModMetaMask);
1829#else 1921#else
1830 selection.rect = false; 1922 selection.rect = false;
1831#endif 1923#endif
1832 1924
1833 /* allow shift+left click to extend selection */ 1925 /* allow shift+left click to extend selection */
1834 if (ev.state & ShiftMask && ! (priv_modes & PrivMode_mouse_report)) 1926 if (ev.state & ShiftMask && ! (priv_modes & PrivMode_mouse_report))
1835 { 1927 {
1836 if (MEvent.button == Button1 && clickintime) 1928 if (MEvent.button == Button1 && clickintime)
1837 selection_rotate (ev.x, ev.y); 1929 selection_rotate (ev.x, ev.y);
1838 else 1930 else
1839 selection_extend (ev.x, ev.y, 1); 1931 selection_extend (ev.x, ev.y, 1);
1840 } 1932 }
1841 else 1933 else
1842 { 1934 {
1843 if (MEvent.button == Button1 && clickintime) 1935 if (MEvent.button == Button1 && clickintime)
1844 MEvent.clicks++; 1936 MEvent.clicks++;
1845 else 1937 else
1846 MEvent.clicks = 1; 1938 MEvent.clicks = 1;
1847 1939
1848 selection_click (MEvent.clicks, ev.x, ev.y); 1940 selection_click (MEvent.clicks, ev.x, ev.y);
1849 } 1941 }
1850 1942
1851 MEvent.button = Button1; 1943 MEvent.button = Button1;
1852 break; 1944 break;
1853 1945
1854 case Button3: 1946 case Button3:
1855 if (MEvent.button == Button3 && clickintime) 1947 if (MEvent.button == Button3 && clickintime)
1856 selection_rotate (ev.x, ev.y); 1948 selection_rotate (ev.x, ev.y);
1857 else 1949 else
1858 selection_extend (ev.x, ev.y, 1); 1950 selection_extend (ev.x, ev.y, 1);
1859 1951
1860 MEvent.button = Button3; 1952 MEvent.button = Button3;
1861 break; 1953 break;
1862 } 1954 }
1863 } 1955 }
1864 1956
1865 MEvent.time = ev.time; 1957 MEvent.time = ev.time;
1866 return; 1958 return;
1867 } 1959 }
1868 1960
… …
2004 } 2096 }
2005 2097
2006 break; 2098 break;
2007 } 2099 }
2008 } 2100 }
2101
2009 return; 2102 return;
2010 } 2103 }
2104
2011#if MENUBAR 2105#if MENUBAR
2012 /* 2106 /*
2013 * Menubar window processing of button press 2107 * Menubar window processing of button press
2014 */ 2108 */
2015 if (isMenuBarWindow (ev.window)) 2109 if (isMenuBarWindow (ev.window))
… …
2078 if (priv_modes & PrivMode_mouse_report 2172 if (priv_modes & PrivMode_mouse_report
2079 && bypass_keystate 2173 && bypass_keystate
2080 && ev.button == Button1 && MEvent.clicks <= 1) 2174 && ev.button == Button1 && MEvent.clicks <= 1)
2081 selection_extend (ev.x, ev.y, 0); 2175 selection_extend (ev.x, ev.y, 0);
2082 2176
2177 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2178 return;
2179
2083 switch (ev.button) 2180 switch (ev.button)
2084 { 2181 {
2085 case Button1: 2182 case Button1:
2086 case Button3: 2183 case Button3:
2087 selection_make (ev.time); 2184 selection_make (ev.time);
… …
2098 2195
2099 v = ev.button == Button4 ? UP : DN; 2196 v = ev.button == Button4 ? UP : DN;
2100 2197
2101 if (ev.state & ShiftMask) 2198 if (ev.state & ShiftMask)
2102 i = 1; 2199 i = 1;
2103 else if (options & Opt_mouseWheelScrollPage) 2200 else if (OPTION (Opt_mouseWheelScrollPage))
2104 i = nrow - 1; 2201 i = nrow - 1;
2105 else 2202 else
2106 i = 5; 2203 i = 5;
2107 2204
2108# ifdef MOUSE_SLIP_WHEELING 2205# ifdef MOUSE_SLIP_WHEELING
… …
2394 XWindowAttributes wattr, wrootattr; 2491 XWindowAttributes wattr, wrootattr;
2395 dDisp; 2492 dDisp;
2396 2493
2397 pchanged = 0; 2494 pchanged = 0;
2398 2495
2399 if (!(options & Opt_transparent)) 2496 if (!OPTION (Opt_transparent))
2400 return pchanged; /* Don't try any more */ 2497 return pchanged; /* Don't try any more */
2401 2498
2402 XGetWindowAttributes (disp, display->root, &wrootattr); 2499 XGetWindowAttributes (disp, display->root, &wrootattr);
2403 rootdepth = wrootattr.depth; 2500 rootdepth = wrootattr.depth;
2404 2501
… …
2631 2728
2632bool 2729bool
2633rxvt_term::cmd_parse () 2730rxvt_term::cmd_parse ()
2634{ 2731{
2635 bool flag = false; 2732 bool flag = false;
2636 unicode_t ch = NOCHAR; 2733 wchar_t ch = NOCHAR;
2637 unsigned char *seq_begin; // remember start of esc-sequence here 2734 char *seq_begin; // remember start of esc-sequence here
2638 2735
2639 for (;;) 2736 for (;;)
2640 { 2737 {
2641 if (ch == NOCHAR) 2738 if (ch == NOCHAR)
2642 { 2739 {
2643 seq_begin = cmdbuf_ptr; 2740 seq_begin = cmdbuf_ptr;
2644 ch = next_char (); 2741 ch = next_char ();
2645 }
2646 2742
2647 if (ch == NOCHAR) // TODO: improve 2743 if (ch == NOCHAR)
2648 break; 2744 break;
2745 }
2649 2746
2650 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT) 2747 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT)
2651 { 2748 {
2652 if (!seen_input) 2749 if (!seen_input)
2653 { 2750 {
… …
2662 if (seen_resize && cmd_pid) 2759 if (seen_resize && cmd_pid)
2663 kill (-cmd_pid, SIGWINCH); 2760 kill (-cmd_pid, SIGWINCH);
2664 } 2761 }
2665 2762
2666 /* Read a text string from the input buffer */ 2763 /* Read a text string from the input buffer */
2667 unicode_t buf[UBUFSIZ]; 2764 wchar_t buf[UBUFSIZ];
2668 bool refreshnow = false; 2765 bool refreshnow = false;
2669 int nlines = 0; 2766 int nlines = 0;
2670 unicode_t *str = buf; 2767 wchar_t *str = buf;
2671 unicode_t *eol = str + min (ncol, UBUFSIZ); 2768 wchar_t *eol = str + min (ncol, UBUFSIZ);
2672 2769
2673 for (;;) 2770 for (;;)
2674 { 2771 {
2675 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)) 2772 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))
2676 break; 2773 break;
… …
2682 if (ch == C0_LF) 2779 if (ch == C0_LF)
2683 nlines++; 2780 nlines++;
2684 2781
2685 refresh_count++; 2782 refresh_count++;
2686 2783
2687 if (!(options & Opt_jumpScroll) 2784 if (!OPTION (Opt_jumpScroll)
2688 || (refresh_count >= refresh_limit * (nrow - 1))) 2785 || (refresh_count >= refresh_limit * (nrow - 1)))
2689 { 2786 {
2690 refreshnow = true; 2787 refreshnow = true;
2788 refresh_count = 0;
2691 ch = NOCHAR; 2789 ch = NOCHAR;
2692 break; 2790 break;
2693 } 2791 }
2694 2792
2695 // scr_add_lines only works for nlines <= nrow - 1. 2793 // scr_add_lines only works for nlines <= nrow - 1.
2696 if (nlines >= nrow - 1) 2794 if (nlines >= nrow - 1)
2697 { 2795 {
2796 if (!HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END)))
2698 scr_add_lines (buf, nlines, str - buf); 2797 scr_add_lines (buf, str - buf, nlines);
2798
2699 nlines = 0; 2799 nlines = 0;
2700 str = buf; 2800 str = buf;
2701 eol = str + min (ncol, UBUFSIZ); 2801 eol = str + min (ncol, UBUFSIZ);
2702 } 2802 }
2703 2803
… …
2716 2816
2717 seq_begin = cmdbuf_ptr; 2817 seq_begin = cmdbuf_ptr;
2718 ch = next_char (); 2818 ch = next_char ();
2719 } 2819 }
2720 2820
2821 if (!HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END)))
2721 scr_add_lines (buf, nlines, str - buf); 2822 scr_add_lines (buf, str - buf, nlines);
2722 2823
2723 /* 2824 /*
2724 * If there have been a lot of new lines, then update the screen 2825 * If there have been a lot of new lines, then update the screen
2725 * What the heck I'll cheat and only refresh less than every page-full. 2826 * What the heck I'll cheat and only refresh less than every page-full.
2726 * the number of pages between refreshes is refresh_limit, which 2827 * the number of pages between refreshes is refresh_limit, which
2727 * is incremented here because we must be doing flat-out scrolling. 2828 * is incremented here because we must be doing flat-out scrolling.
2728 */ 2829 */
2729 if (refreshnow) 2830 if (refreshnow)
2730 { 2831 {
2731 if ((options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD) 2832 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2732 refresh_limit++; 2833 refresh_limit++;
2733 else 2834 else
2734 { 2835 {
2735 flag = true; 2836 flag = true;
2736 scr_refresh (refresh_type); 2837 scr_refresh (refresh_type);
2838 flush_ev.stop ();
2737 } 2839 }
2738 } 2840 }
2739 2841
2740 } 2842 }
2741 else 2843 else
… …
2756 } 2858 }
2757 2859
2758 return flag; 2860 return flag;
2759} 2861}
2760 2862
2761// read the next octet
2762unicode_t
2763rxvt_term::next_octet ()
2764{
2765 return cmdbuf_ptr < cmdbuf_endp
2766 ? *cmdbuf_ptr++
2767 : NOCHAR;
2768}
2769
2770// read the next character 2863// read the next character
2771unicode_t 2864wchar_t
2772rxvt_term::next_char () 2865rxvt_term::next_char ()
2773{ 2866{
2774 while (cmdbuf_ptr < cmdbuf_endp) 2867 while (cmdbuf_ptr < cmdbuf_endp)
2775 { 2868 {
2776 // assume 7-bit to be ascii ALWAYS 2869 // assume 7-bit to be ascii ALWAYS
2777 if (*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2870 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)
2778 return *cmdbuf_ptr++; 2871 return *cmdbuf_ptr++;
2779 2872
2780 wchar_t wc; 2873 wchar_t wc;
2781 size_t len = mbrtowc (&wc, (char *)cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate); 2874 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2782 2875
2783 if (len == (size_t)-2) 2876 if (len == (size_t)-2)
2784 { 2877 {
2785 // the mbstate stores incomplete sequences. didn't know this :/ 2878 // the mbstate stores incomplete sequences. didn't know this :/
2786 cmdbuf_ptr = cmdbuf_endp; 2879 cmdbuf_ptr = cmdbuf_endp;
2787 break; 2880 break;
2788 } 2881 }
2789 2882
2790 if (len == (size_t)-1) 2883 if (len == (size_t)-1)
2791 return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 2884 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2792 2885
2793 // assume wchar == unicode 2886 // assume wchar == unicode
2794 cmdbuf_ptr += len; 2887 cmdbuf_ptr += len;
2795 return wc & UNICODE_MASK; 2888 return wc & UNICODE_MASK;
2796 } 2889 }
2797 2890
2798 return NOCHAR; 2891 return NOCHAR;
2892}
2893
2894// read the next octet
2895uint32_t
2896rxvt_term::next_octet ()
2897{
2898 return cmdbuf_ptr < cmdbuf_endp
2899 ? (unsigned char)*cmdbuf_ptr++
2900 : NOCHAR;
2799} 2901}
2800 2902
2801/* rxvt_cmd_getc () - Return next input character */ 2903/* rxvt_cmd_getc () - Return next input character */
2802/* 2904/*
2803 * Return the next input character after first passing any keyboard input 2905 * Return the next input character after first passing any keyboard input
2804 * to the command. 2906 * to the command.
2805 */ 2907 */
2806unicode_t 2908wchar_t
2807rxvt_term::cmd_getc () 2909rxvt_term::cmd_getc ()
2808{ 2910{
2809 unicode_t c = next_char (); 2911 wchar_t c = next_char ();
2810 2912
2811 if (c == NOCHAR) 2913 if (c == NOCHAR)
2812 throw out_of_input; 2914 throw out_of_input;
2813 2915
2814 return c; 2916 return c;
2815} 2917}
2816 2918
2817unicode_t 2919uint32_t
2818rxvt_term::cmd_get8 () 2920rxvt_term::cmd_get8 ()
2819{ 2921{
2820 unicode_t c = next_octet (); 2922 uint32_t c = next_octet ();
2821 2923
2822 if (c == NOCHAR) 2924 if (c == NOCHAR)
2823 throw out_of_input; 2925 throw out_of_input;
2824 2926
2825 return c; 2927 return c;
… …
2925 case C0_ESC: 3027 case C0_ESC:
2926 process_escape_seq (); 3028 process_escape_seq ();
2927 break; 3029 break;
2928 case C0_ENQ: /* terminal Status */ 3030 case C0_ENQ: /* terminal Status */
2929 if (rs[Rs_answerbackstring]) 3031 if (rs[Rs_answerbackstring])
2930 tt_write ((const unsigned char *)rs[Rs_answerbackstring], 3032 tt_write (rs [Rs_answerbackstring], strlen (rs [Rs_answerbackstring]));
2931 (unsigned int)strlen (rs[Rs_answerbackstring]));
2932 else 3033 else
2933 tt_write ((unsigned char *)VT100_ANS, 3034 tt_write (VT100_ANS, strlen (VT100_ANS));
2934 (unsigned int)strlen (VT100_ANS));
2935 break; 3035 break;
2936 case C0_BEL: /* bell */ 3036 case C0_BEL: /* bell */
2937 scr_bell (); 3037 scr_bell ();
2938 break; 3038 break;
2939 case C0_BS: /* backspace */ 3039 case C0_BS: /* backspace */
… …
3094 break; 3194 break;
3095 3195
3096 /* 8.3.87: NEXT LINE */ 3196 /* 8.3.87: NEXT LINE */
3097 case C1_NEL: /* ESC E */ 3197 case C1_NEL: /* ESC E */
3098 { 3198 {
3099 unicode_t nlcr[] = { C0_LF, C0_CR }; 3199 wchar_t nlcr[] = { C0_LF, C0_CR };
3100 scr_add_lines (nlcr, 1, 2); 3200 scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1);
3101 } 3201 }
3102 break; 3202 break;
3103 3203
3104 /* kidnapped escape sequence: Should be 8.3.48 */ 3204 /* kidnapped escape sequence: Should be 8.3.48 */
3105 case C1_ESA: /* ESC G */ 3205 case C1_ESA: /* ESC G */
… …
3127 process_dcs_seq (); 3227 process_dcs_seq ();
3128 break; 3228 break;
3129 3229
3130 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 3230 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
3131 case C1_SCI: /* ESC Z */ 3231 case C1_SCI: /* ESC Z */
3132 tt_write ((const unsigned char *)ESCZ_ANSWER, 3232 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
3133 (unsigned int) (sizeof (ESCZ_ANSWER) - 1));
3134 break; /* steal obsolete ESC [ c */ 3233 break; /* steal obsolete ESC [ c */
3135 3234
3136 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 3235 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */
3137 case C1_CSI: /* ESC [ */ 3236 case C1_CSI: /* ESC [ */
3138 process_csi_seq (); 3237 process_csi_seq ();
… …
3382 case CSI_SU: /* 8.3.148: (1) SCROLL UP */ 3481 case CSI_SU: /* 8.3.148: (1) SCROLL UP */
3383 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0]); 3482 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0]);
3384 break; 3483 break;
3385 3484
3386 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ 3485 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
3387 tt_write ((const unsigned char *)VT100_ANS, 3486 tt_write (VT100_ANS, sizeof (VT100_ANS) - 1);
3388 (unsigned int) (sizeof (VT100_ANS) - 1));
3389 break; 3487 break;
3390 3488
3391 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */ 3489 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */
3392 process_sgr_mode (nargs, arg); 3490 process_sgr_mode (nargs, arg);
3393 break; 3491 break;
… …
3400 break; 3498 break;
3401 case 6: /* CPR requested */ 3499 case 6: /* CPR requested */
3402 scr_report_position (); 3500 scr_report_position ();
3403 break; 3501 break;
3404 case 7: /* unofficial extension */ 3502 case 7: /* unofficial extension */
3405 if (options & Opt_insecure) 3503 if (OPTION (Opt_insecure))
3406 tt_printf ("%-.250s\012", rs[Rs_display_name]); 3504 tt_printf ("%-.250s\012", rs[Rs_display_name]);
3407 break; 3505 break;
3408 case 8: /* unofficial extension */ 3506 case 8: /* unofficial extension */
3409 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 3507 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
3410 break; 3508 break;
… …
3574 break; 3672 break;
3575 case 20: /* report icon label */ 3673 case 20: /* report icon label */
3576 { 3674 {
3577 char *s; 3675 char *s;
3578 XGetIconName (disp, parent[0], &s); 3676 XGetIconName (disp, parent[0], &s);
3579 tt_printf ("\033]L%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */ 3677 tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */
3580 XFree (s); 3678 XFree (s);
3581 } 3679 }
3582 break; 3680 break;
3583 case 21: /* report window title */ 3681 case 21: /* report window title */
3584 { 3682 {
3585 char *s; 3683 char *s;
3586 XFetchName (disp, parent[0], &s); 3684 XFetchName (disp, parent[0], &s);
3587 tt_printf ("\033]l%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */ 3685 tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */
3588 XFree (s); 3686 XFree (s);
3589 } 3687 }
3590 break; 3688 break;
3591 } 3689 }
3592} 3690}
… …
3595/*----------------------------------------------------------------------*/ 3693/*----------------------------------------------------------------------*/
3596/* 3694/*
3597 * get input up until STRING TERMINATOR (or BEL) 3695 * get input up until STRING TERMINATOR (or BEL)
3598 * ends_how is terminator used. returned input must be free()'d 3696 * ends_how is terminator used. returned input must be free()'d
3599 */ 3697 */
3600unsigned char * 3698char *
3601rxvt_term::get_to_st (unicode_t &ends_how) 3699rxvt_term::get_to_st (unicode_t &ends_how)
3602{ 3700{
3603 unicode_t ch; 3701 unicode_t ch;
3604 bool seen_esc = false; 3702 bool seen_esc = false;
3605 unsigned int n = 0; 3703 unsigned int n = 0;
… …
3638 3736
3639 string[n++] = '\0'; 3737 string[n++] = '\0';
3640 3738
3641 ends_how = (ch == 0x5c ? C0_ESC : ch); 3739 ends_how = (ch == 0x5c ? C0_ESC : ch);
3642 3740
3643 return (unsigned char *)rxvt_wcstombs (string); 3741 return rxvt_wcstombs (string);
3644} 3742}
3645 3743
3646/*----------------------------------------------------------------------*/ 3744/*----------------------------------------------------------------------*/
3647/* 3745/*
3648 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 3746 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
3649 */ 3747 */
3650void 3748void
3651rxvt_term::process_dcs_seq () 3749rxvt_term::process_dcs_seq ()
3652{ 3750{
3653 unsigned char *s; 3751 char *s;
3654 unicode_t eh; 3752 unicode_t eh;
3655 3753
3656 /* 3754 /*
3657 * Not handled yet 3755 * Not handled yet
3658 */ 3756 */
… …
3677 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3775 for (arg = 0; isdigit (ch); ch = cmd_getc ())
3678 arg = arg * 10 + (ch - '0'); 3776 arg = arg * 10 + (ch - '0');
3679 3777
3680 if (ch == ';') 3778 if (ch == ';')
3681 { 3779 {
3682 unsigned char *s = get_to_st (eh); 3780 char *s = get_to_st (eh);
3683 3781
3684 if (s) 3782 if (s)
3685 { 3783 {
3686 process_xterm_seq (arg, (char *)s, eh); 3784 process_xterm_seq (arg, s, eh);
3687 free (s); 3785 free (s);
3688 } 3786 }
3689 } 3787 }
3690} 3788}
3691 3789
3692void 3790void
3693rxvt_term::process_color_seq (int report, int color, const char *str, unsigned char resp) 3791rxvt_term::process_color_seq (int report, int color, const char *str, char resp)
3694{ 3792{
3695 if (str[0] == '?' && !str[1]) 3793 if (str[0] == '?' && !str[1])
3696 { 3794 {
3697 unsigned short r, g, b; 3795 unsigned short r, g, b;
3698 pix_colors_focused[color].get (display, r, g, b); 3796 pix_colors_focused[color].get (display, r, g, b);
… …
3704 3802
3705/* 3803/*
3706 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3804 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3707 */ 3805 */
3708void 3806void
3709rxvt_term::process_xterm_seq (int op, const char *str, unsigned char resp) 3807rxvt_term::process_xterm_seq (int op, const char *str, char resp)
3710{ 3808{
3711 int changed = 0; 3809 int changed = 0;
3712 int color; 3810 int color;
3713 char *buf, *name; 3811 char *buf, *name;
3714 bool query = str[0] == '?' && !str[1]; 3812 bool query = str[0] == '?' && !str[1];
… …
3868 // TODO, when secure mode? 3966 // TODO, when secure mode?
3869 break; 3967 break;
3870 3968
3871#ifdef MENUBAR 3969#ifdef MENUBAR
3872 case URxvt_Menu: 3970 case URxvt_Menu:
3873 if (options & Opt_insecure) 3971 if (OPTION (Opt_insecure))
3874 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked 3972 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked
3875 break; 3973 break;
3876#endif 3974#endif
3877#if 0 3975#if 0
3878 case XTerm_dumpscreen: /* no error notices */ 3976 case XTerm_dumpscreen: /* no error notices */
… …
3894 case URxvt_italicFont: 3992 case URxvt_italicFont:
3895 case URxvt_boldItalicFont: 3993 case URxvt_boldItalicFont:
3896#endif 3994#endif
3897 if (query) 3995 if (query)
3898 tt_printf ("\33]%d;%-.250s%c", saveop, 3996 tt_printf ("\33]%d;%-.250s%c", saveop,
3899 (options & Opt_insecure) && fontset[op - URxvt_font]->fontdesc 3997 OPTION (Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3900 ? fontset[op - URxvt_font]->fontdesc : "", 3998 ? fontset[op - URxvt_font]->fontdesc : "",
3901 resp); 3999 resp);
3902 else 4000 else
3903 { 4001 {
3904 const char *&res = rs[Rs_font + (op - URxvt_font)]; 4002 const char *&res = rs[Rs_font + (op - URxvt_font)];
… …
3910 break; 4008 break;
3911 4009
3912#if ENABLE_FRILLS 4010#if ENABLE_FRILLS
3913 case URxvt_locale: 4011 case URxvt_locale:
3914 if (query) 4012 if (query)
3915 tt_printf ("\33]%d;%-.250s%c", URxvt_locale, (options & Opt_insecure) ? locale : "", resp); 4013 tt_printf ("\33]%d;%-.250s%c", URxvt_locale, OPTION (Opt_insecure) ? locale : "", resp);
3916 else 4014 else
3917 { 4015 {
3918 set_locale (str); 4016 set_locale (str);
3919 pty.set_utf8_mode (enc_utf8); 4017 pty.set_utf8_mode (enc_utf8);
3920 init_xlocale (); 4018 init_xlocale ();
3921 } 4019 }
3922 break; 4020 break;
3923 4021
3924 case URxvt_view_up: 4022 case URxvt_view_up:
3925 case URxvt_view_down: 4023 case URxvt_view_down:
4024 {
3926 int lines = atoi (str); 4025 int lines = atoi (str);
3927 4026
3928 if (lines) 4027 if (lines)
3929 scr_page (op == URxvt_view_up ? UP : DN, lines); 4028 scr_page (op == URxvt_view_up ? UP : DN, lines);
3930 else 4029 else
3931 {
3932 scr_erase_savelines (); 4030 scr_erase_savelines ();
3933 } 4031 }
3934 4032
4033 break;
4034#endif
4035
4036#if ENABLE_PERL
4037 case URxvt_perl:
4038 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_STR, str, DT_END)))
4039 ; // no responses yet
3935 break; 4040 break;
3936#endif 4041#endif
3937 } 4042 }
3938} 4043}
3939/*----------------------------------------------------------------------*/ 4044/*----------------------------------------------------------------------*/
… …
4048 } 4153 }
4049 4154
4050 /* extra handling for values with state unkept */ 4155 /* extra handling for values with state unkept */
4051 switch (arg[i]) 4156 switch (arg[i])
4052 { 4157 {
4158#if ENABLE_STYLES
4159 case 1021:
4160 set_option (Opt_intensityStyles, mode);
4161
4162 scr_touch (true);
4163 break;
4164#endif
4053 case 1048: /* alternative cursor save */ 4165 case 1048: /* alternative cursor save */
4054 case 1049: 4166 case 1049:
4055 if (options & Opt_secondaryScreen) 4167 if (OPTION (Opt_secondaryScreen))
4056 if (mode == 0) 4168 if (mode == 0)
4057 scr_cursor (RESTORE); 4169 scr_cursor (RESTORE);
4058 else if (mode == 1) 4170 else if (mode == 1)
4059 scr_cursor (SAVE); 4171 scr_cursor (SAVE);
4060 break; 4172 break;
… …
4075 case 3: /* 80/132 */ 4187 case 3: /* 80/132 */
4076 if (priv_modes & PrivMode_132OK) 4188 if (priv_modes & PrivMode_132OK)
4077 set_widthheight (((state ? 132 : 80) * fwidth), height); 4189 set_widthheight (((state ? 132 : 80) * fwidth), height);
4078 break; 4190 break;
4079 case 4: /* smooth scrolling */ 4191 case 4: /* smooth scrolling */
4080 if (state)
4081 options &= ~Opt_jumpScroll;
4082 else
4083 options |= Opt_jumpScroll; 4192 set_option (Opt_jumpScroll, !state);
4084 break; 4193 break;
4085 case 5: /* reverse video */ 4194 case 5: /* reverse video */
4086 scr_rvideo_mode (state); 4195 scr_rvideo_mode (state);
4087 break; 4196 break;
4088 case 6: /* relative/absolute origins */ 4197 case 6: /* relative/absolute origins */
… …
4129#if 0 4238#if 0
4130 case 1001: 4239 case 1001:
4131 break; /* X11 mouse highlighting */ 4240 break; /* X11 mouse highlighting */
4132#endif 4241#endif
4133 case 1010: /* scroll to bottom on TTY output inhibit */ 4242 case 1010: /* scroll to bottom on TTY output inhibit */
4134 if (state)
4135 options &= ~Opt_scrollTtyOutput;
4136 else
4137 options |= Opt_scrollTtyOutput; 4243 set_option (Opt_scrollTtyOutput, !state);
4138 break; 4244 break;
4139 case 1011: /* scroll to bottom on key press */ 4245 case 1011: /* scroll to bottom on key press */
4140 if (state)
4141 options |= Opt_scrollTtyKeypress; 4246 set_option (Opt_scrollTtyKeypress, state);
4142 else
4143 options &= ~Opt_scrollTtyKeypress;
4144 break; 4247 break;
4145 case 1047: /* secondary screen w/ clearing last */ 4248 case 1047: /* secondary screen w/ clearing last */
4146 if (options & Opt_secondaryScreen) 4249 if (OPTION (Opt_secondaryScreen))
4147 if (current_screen != PRIMARY) 4250 if (current_screen != PRIMARY)
4148 scr_erase_screen (2); 4251 scr_erase_screen (2);
4149 scr_change_screen (state); 4252 scr_change_screen (state);
4150 break; 4253 break;
4151 case 1049: /* secondary screen w/ clearing first */ 4254 case 1049: /* secondary screen w/ clearing first */
4152 scr_change_screen (state); 4255 scr_change_screen (state);
4153 if (options & Opt_secondaryScreen) 4256 if (OPTION (Opt_secondaryScreen))
4154 if (current_screen != PRIMARY) 4257 if (current_screen != PRIMARY)
4155 scr_erase_screen (2); 4258 scr_erase_screen (2);
4156 break; 4259 break;
4157 default: 4260 default:
4158 break; 4261 break;
… …
4286 scr_color (Color_bg, Color_bg); 4389 scr_color (Color_bg, Color_bg);
4287 break; 4390 break;
4288 4391
4289 //case 50: // not variable spacing 4392 //case 50: // not variable spacing
4290 4393
4291#ifndef NO_BRIGHTCOLOR 4394#if ENABLE_FRILLS
4292 case 90: 4395 case 90:
4293 case 91: /* set bright fg color */ 4396 case 91: /* set bright fg color */
4294 case 92: 4397 case 92:
4295 case 93: 4398 case 93:
4296 case 94: 4399 case 94:
… …
4308 case 106: 4411 case 106:
4309 case 107: 4412 case 107:
4310 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg); 4413 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg);
4311 break; 4414 break;
4312#endif 4415#endif
4313
4314 } 4416 }
4315 } 4417 }
4316} 4418}
4317/*}}} */ 4419/*}}} */
4318 4420
… …
4342 */ 4444 */
4343void 4445void
4344rxvt_term::tt_printf (const char *fmt,...) 4446rxvt_term::tt_printf (const char *fmt,...)
4345{ 4447{
4346 va_list arg_ptr; 4448 va_list arg_ptr;
4347 unsigned char buf[256]; 4449 char buf[256];
4348 4450
4349 va_start (arg_ptr, fmt); 4451 va_start (arg_ptr, fmt);
4350 vsnprintf ((char *)buf, 256, fmt, arg_ptr); 4452 vsnprintf ((char *)buf, 256, fmt, arg_ptr);
4351 va_end (arg_ptr); 4453 va_end (arg_ptr);
4352 tt_write (buf, strlen (buf)); 4454 tt_write (buf, strlen (buf));
… …
4357 * or generated by us in response to a query ESC sequence. 4459 * or generated by us in response to a query ESC sequence.
4358 */ 4460 */
4359const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT 4461const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4360 4462
4361void 4463void
4362rxvt_term::tt_write (const unsigned char *data, unsigned int len) 4464rxvt_term::tt_write (const char *data, unsigned int len)
4363{ 4465{
4466 if (pty.pty < 0)
4467 return;
4468
4364 if (v_buflen == 0) 4469 if (v_buflen == 0)
4365 { 4470 {
4366 ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE)); 4471 ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE));
4367 4472
4368 if ((unsigned int)written == len) 4473 if ((unsigned int)written == len)
… …
4370 4475
4371 data += written; 4476 data += written;
4372 len -= written; 4477 len -= written;
4373 } 4478 }
4374 4479
4375 v_buffer = (unsigned char *)realloc (v_buffer, v_buflen + len); 4480 v_buffer = (char *)realloc (v_buffer, v_buflen + len);
4376 4481
4377 memcpy (v_buffer + v_buflen, data, len); 4482 memcpy (v_buffer + v_buflen, data, len);
4378 v_buflen += len; 4483 v_buflen += len;
4379 4484
4380 pty_ev.set (EVENT_READ | EVENT_WRITE); 4485 pty_ev.set (EVENT_READ | EVENT_WRITE);

Diff Legend

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