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.219 by root, Sat Dec 31 17:16:17 2005 UTC vs.
Revision 1.267 by root, Mon Jan 16 15:00:20 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
… …
141 || !IN_RANGE_EXC (y, 0, nrow)) 147 || !IN_RANGE_EXC (y, 0, nrow))
142 return; 148 return;
143 149
144 for (;;) 150 for (;;)
145 { 151 {
146 const line_t &l = ROW(y - view_start); 152 const line_t &l = ROW(y + view_start);
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 {
… …
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 {
… …
439 scr_move_to (0, 1); 443 scr_move_to (0, 1);
440 return; 444 return;
441 } 445 }
442 else if (keysym == XK_End) 446 else if (keysym == XK_End)
443 { 447 {
444 scr_move_to (1, 0); 448 scr_move_to (1, 1);
445 return; 449 return;
446 } 450 }
447 } 451 }
448#endif 452#endif
449 } 453 }
… …
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;
862 } 866 }
863#endif 867#endif
864 /* nil */ ; 868 /* nil */ ;
865 } 869 }
866 } 870 }
871
872 if (HOOK_INVOKE ((this, HOOK_KEY_PRESS, DT_XEVENT, &ev, DT_INT, keysym, DT_STR_LEN, kbuf, len, DT_END)))
873 return;
867 874
868 if (len <= 0) 875 if (len <= 0)
869 return; /* not mapped */ 876 return; /* not mapped */
870 877
871 if (OPTION (Opt_scrollTtyKeypress)) 878 if (OPTION (Opt_scrollTtyKeypress))
… …
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 */
… …
912#endif /* DEBUG_CMD */ 919#endif /* DEBUG_CMD */
913 tt_write (kbuf, (unsigned int)len); 920 tt_write (kbuf, (unsigned int)len);
914} 921}
915/*}}} */ 922/*}}} */
916 923
917#if MENUBAR_MAX || defined (KEYSYM_RESOURCE) 924#if defined (KEYSYM_RESOURCE)
918/*{{{ rxvt_cmd_write (), rxvt_cmd_getc () */
919/* attempt to `write' count to the input buffer */
920unsigned int 925unsigned int
921rxvt_term::cmd_write (const unsigned char *str, unsigned int count) 926rxvt_term::cmd_write (const char *str, unsigned int count)
922{ 927{
923 unsigned int n, s; 928 unsigned int n, s;
924 929
925 n = cmdbuf_ptr - cmdbuf_base; 930 n = cmdbuf_ptr - cmdbuf_base;
926 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp; 931 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp;
… …
963 } 968 }
964#endif 969#endif
965 970
966 if (want_refresh) 971 if (want_refresh)
967 { 972 {
973 if (SHOULD_INVOKE (HOOK_LINE_UPDATE))
974 {
975 int row = view_start;
976 int end_row = row + nrow;
977
978 while (row > top_row && ROW (row - 1).is_longer ())
979 --row;
980
981 do
982 {
983 int start_row = row;
984 line_t *l;
985
986 do
987 {
988 l = &ROW (row++);
989
990 if (!(l->f & LINE_FILTERED))
991 {
992 // line not filtered, mark it as filtered
993 l->f |= LINE_FILTERED;
994 while (l->is_longer ())
995 {
996 l = &ROW (row++);
997 l->f |= LINE_FILTERED;
998 }
999
1000 // and filter it
1001 HOOK_INVOKE ((this, HOOK_LINE_UPDATE, DT_INT, start_row, DT_END));
1002
1003 break;
1004 }
1005 }
1006 while (l->is_longer () && row < end_row);
1007 }
1008 while (row < end_row);
1009 }
1010
968 scr_refresh (refresh_type); 1011 scr_refresh (refresh_type);
969 scrollbar_show (1); 1012 scrollbar_show (1);
970#ifdef USE_XIM 1013#ifdef USE_XIM
971 IMSendSpot (); 1014 IMSendSpot ();
972#endif 1015#endif
… …
976} 1019}
977 1020
978void 1021void
979rxvt_term::check_cb (check_watcher &w) 1022rxvt_term::check_cb (check_watcher &w)
980{ 1023{
981 SET_R (this); 1024 make_current ();
982 SET_LOCALE (locale);
983 1025
984 display->flush (); 1026 display->flush ();
985 1027
986 if (want_refresh && !flush_ev.active) 1028 if (want_refresh && !flush_ev.active)
987 flush_ev.start (NOW + 0.01); 1029 flush_ev.start (NOW + 1. / 60.); // refresh at max. 60 hz normally
988} 1030}
989 1031
990void 1032void
991rxvt_term::flush_cb (time_watcher &w) 1033rxvt_term::flush_cb (time_watcher &w)
992{ 1034{
993 SET_R (this); 1035 make_current ();
994 SET_LOCALE (locale);
995 1036
996 refresh_limit = 1; 1037 refresh_limit = 1;
997 refresh_count = 0; 1038 refresh_count = 0;
998 flush (); 1039 flush ();
999} 1040}
… …
1056{ 1097{
1057 if (mouse_slip_wheel_speed == 0 1098 if (mouse_slip_wheel_speed == 0
1058 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed) 1099 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
1059 : scr_page (UP, mouse_slip_wheel_speed)) 1100 : scr_page (UP, mouse_slip_wheel_speed))
1060 { 1101 {
1061 if (view_start == nsaved || 1102 if (view_start == top_row || view_start == 0)
1062 view_start == 0)
1063 mouse_slip_wheel_speed = 0; 1103 mouse_slip_wheel_speed = 0;
1064 1104
1065 refresh_type |= SMOOTH_REFRESH; 1105 refresh_type |= SMOOTH_REFRESH;
1066 want_refresh = 1; 1106 want_refresh = 1;
1067 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1107 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1068 } 1108 }
1069} 1109}
1070#endif 1110#endif
1071 1111
1112#if HAVE_SCHED_YIELD
1113static struct event_handler
1114{
1115 check_watcher cw_yield;
1116
1117 void yield (check_watcher &w)
1118 {
1119 sched_yield ();
1120 w.stop ();
1121 }
1122
1123 event_handler ()
1124 : cw_yield (this, &event_handler::yield)
1125 {
1126 }
1127} event_handler;
1128#endif
1129
1072bool 1130bool
1073rxvt_term::pty_fill () 1131rxvt_term::pty_fill ()
1074{ 1132{
1075 ssize_t n = cmdbuf_endp - cmdbuf_ptr; 1133 ssize_t n = cmdbuf_endp - cmdbuf_ptr;
1076 1134
1077 if (CBUFSIZ == n) 1135 if (CBUFSIZ == n)
1078 { 1136 {
1079 rxvt_warn ("pty_fill on full buffer, draining input, continuing.\n"); 1137 rxvt_warn ("PLEASE REPORT: pty_fill on full buffer, draining input, continuing.\n");
1080 n = 0; 1138 n = 0;
1081 } 1139 }
1082 1140
1083 memmove (cmdbuf_base, cmdbuf_ptr, n); 1141 memmove (cmdbuf_base, cmdbuf_ptr, n);
1084 cmdbuf_ptr = cmdbuf_base; 1142 cmdbuf_ptr = cmdbuf_base;
1085 cmdbuf_endp = cmdbuf_ptr + n; 1143 cmdbuf_endp = cmdbuf_ptr + n;
1086 1144
1087 n = read (pty.pty, cmdbuf_endp, CBUFSIZ - n); 1145 ssize_t r = read (pty.pty, cmdbuf_endp, CBUFSIZ - n);
1088 1146
1089 if (n > 0) 1147 if (r > 0)
1090 { 1148 {
1091 cmdbuf_endp += n; 1149 cmdbuf_endp += r;
1092 return true; 1150 return true;
1093 } 1151 }
1094 else if ((n < 0 && errno != EAGAIN && errno != EINTR) || n == 0) 1152 else if (r < 0 && (errno == EAGAIN || errno == EINTR))
1153 {
1154#if HAVE_SCHED_YIELD
1155 if (display->is_local)
1156 event_handler.cw_yield.start ();
1157#endif
1158 }
1159 else
1095 { 1160 {
1096 pty_ev.stop (); 1161 pty_ev.stop ();
1097 1162
1098 if (!OPTION (Opt_hold)) 1163 if (!OPTION (Opt_hold))
1099 destroy (); 1164 destroy ();
… …
1103} 1168}
1104 1169
1105void 1170void
1106rxvt_term::pty_cb (io_watcher &w, short revents) 1171rxvt_term::pty_cb (io_watcher &w, short revents)
1107{ 1172{
1108 SET_R (this); 1173 make_current ();
1109 SET_LOCALE (locale);
1110 1174
1111 if (revents & EVENT_READ) 1175 if (revents & EVENT_READ)
1112 // loop, but don't allow a single term to monopolize us 1176 // loop, but don't allow a single term to monopolize us
1113 while (pty_fill ()) 1177 while (pty_fill ())
1114 if (cmd_parse ()) 1178 if (cmd_parse ())
… …
1134 1198
1135#ifdef POINTER_BLANK 1199#ifdef POINTER_BLANK
1136void 1200void
1137rxvt_term::pointer_blank () 1201rxvt_term::pointer_blank ()
1138{ 1202{
1139 if (! OPTION (Opt_pointerBlank)) 1203 if (!OPTION (Opt_pointerBlank))
1140 return; 1204 return;
1141 1205
1142 XDefineCursor (display->display, vt, display->blank_cursor); 1206 XDefineCursor (display->display, vt, display->blank_cursor);
1143 XFlush (display->display); 1207 XFlush (display->display);
1144 1208
… …
1146} 1210}
1147 1211
1148void 1212void
1149rxvt_term::pointer_cb (time_watcher &w) 1213rxvt_term::pointer_cb (time_watcher &w)
1150{ 1214{
1151 SET_R (this); 1215 make_current ();
1152 SET_LOCALE (locale);
1153 1216
1154 pointer_blank (); 1217 pointer_blank ();
1155} 1218}
1156#endif 1219#endif
1157 1220
… …
1236 1299
1237/*{{{ process an X event */ 1300/*{{{ process an X event */
1238void 1301void
1239rxvt_term::x_cb (XEvent &ev) 1302rxvt_term::x_cb (XEvent &ev)
1240{ 1303{
1304 make_current ();
1305
1241 dDisp; 1306 dDisp;
1242 1307
1243 SET_R (this); 1308 if (ev.xany.window == vt
1244 SET_LOCALE (locale); 1309 && SHOULD_INVOKE (HOOK_X_EVENT)
1310 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END)))
1311 return;
1245 1312
1246#if defined(CURSOR_BLINK) 1313 // for XQueryPointer
1247 if (OPTION (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 (OPTION (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
1273 Window unused_root, unused_child; 1314 Window unused_root, unused_child;
1274 int unused_root_x, unused_root_y; 1315 int unused_root_x, unused_root_y;
1275 unsigned int unused_mask; 1316 unsigned int unused_mask;
1276 1317
1277 switch (ev.type) 1318 switch (ev.type)
… …
1284 1325
1285 break; 1326 break;
1286 1327
1287 case KeyRelease: 1328 case KeyRelease:
1288 { 1329 {
1289#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 1330#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL
1290 KeySym ks; 1331 KeySym keysym;
1291 1332
1292 ks = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/ 1333 keysym = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
1293#endif 1334#endif
1294 1335
1295#if ENABLE_FRILLS || ISO_14755 1336#if ENABLE_FRILLS || ISO_14755
1296 // ISO 14755 support 1337 // ISO 14755 support
1297 if (iso14755buf) 1338 if (iso14755buf)
… …
1302# endif 1343# endif
1303# if ISO_14755 1344# if ISO_14755
1304 // iso14755 part 5.2 handling: release time 1345 // iso14755 part 5.2 handling: release time
1305 // first: controls 1346 // first: controls
1306 if ((ev.xkey.state & ControlMask) 1347 if ((ev.xkey.state & ControlMask)
1307 && ((ks >= 0x40 && ks <= 0x5f) 1348 && ((keysym >= 0x40 && keysym <= 0x5f)
1308 || (ks >= 0x61 && ks <= 0x7f))) 1349 || (keysym >= 0x61 && keysym <= 0x7f)))
1309 { 1350 {
1310 iso14755buf = ISO_14755_51 | 0x2400 | (ks & 0x1f); 1351 iso14755buf = ISO_14755_51 | 0x2400 | (keysym & 0x1f);
1311 commit_iso14755 (); 1352 commit_iso14755 ();
1312 return; // case-break; 1353 goto skip_switch;
1313 } 1354 }
1314 1355
1315 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2) 1356 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
1316 if (i[0] == ks) 1357 if (i[0] == keysym)
1317 { 1358 {
1318 iso14755buf = ISO_14755_51 | i[1]; 1359 iso14755buf = ISO_14755_51 | i[1];
1319 commit_iso14755 (); 1360 commit_iso14755 ();
1320 return; // case-break; 1361 goto skip_switch;
1321 } 1362 }
1322 1363
1323 scr_bell (); 1364 scr_bell ();
1324# endif 1365# endif
1325 iso14755buf = 0; 1366 iso14755buf = 0;
… …
1344 else 1385 else
1345 iso14755buf = 0; 1386 iso14755buf = 0;
1346 } 1387 }
1347#endif 1388#endif
1348 1389
1390 if (ev.xany.window == vt
1391 && HOOK_INVOKE ((this, HOOK_KEY_RELEASE, DT_XEVENT, &ev, DT_INT, keysym, DT_END)))
1392 break;
1393
1349#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1394#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1350 if (!(ev.xkey.state & ControlMask)) 1395 if (!(ev.xkey.state & ControlMask))
1351 slip_wheel_ev.stop (); 1396 slip_wheel_ev.stop ();
1352 else if (ks == XK_Control_L || ks == XK_Control_R) 1397 else if (keysym == XK_Control_L || keysym == XK_Control_R)
1353 mouse_slip_wheel_speed = 0; 1398 mouse_slip_wheel_speed = 0;
1354#endif 1399#endif
1355 break; 1400 break;
1356 } 1401 }
1357 1402
… …
1487 1532
1488 case SelectionRequest: 1533 case SelectionRequest:
1489 selection_send (ev.xselectionrequest); 1534 selection_send (ev.xselectionrequest);
1490 break; 1535 break;
1491 1536
1537 case MapNotify:
1538 mapped = 1;
1539#ifdef TEXT_BLINK
1540 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1541#endif
1542 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1543 break;
1544
1492 case UnmapNotify: 1545 case UnmapNotify:
1493 mapped = 0; 1546 mapped = 0;
1494#ifdef TEXT_BLINK 1547#ifdef TEXT_BLINK
1495 text_blink_ev.stop (); 1548 text_blink_ev.stop ();
1496#endif 1549#endif
1497 break; 1550 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; 1551 break;
1505 1552
1506#ifdef TRANSPARENT 1553#ifdef TRANSPARENT
1507 case ReparentNotify: 1554 case ReparentNotify:
1508 rootwin_cb (ev); 1555 rootwin_cb (ev);
… …
1522 1569
1523 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev)) 1570 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev))
1524 scr_expose (ev.xexpose.x, ev.xexpose.y, 1571 scr_expose (ev.xexpose.x, ev.xexpose.y,
1525 ev.xexpose.width, ev.xexpose.height, False); 1572 ev.xexpose.width, ev.xexpose.height, False);
1526 1573
1527 scr_refresh (refresh_type); 1574 want_refresh = 1;
1528 } 1575 }
1529 else 1576 else
1530 { 1577 {
1531 XEvent unused_event; 1578 XEvent unused_event;
1532 1579
… …
1538 if (isScrollbarWindow (ev.xany.window)) 1585 if (isScrollbarWindow (ev.xany.window))
1539 { 1586 {
1540 scrollBar.setIdle (); 1587 scrollBar.setIdle ();
1541 scrollbar_show (0); 1588 scrollbar_show (0);
1542 } 1589 }
1543#ifdef MENUBAR
1544 if (menubar_visible () && isMenuBarWindow (ev.xany.window))
1545 menubar_expose ();
1546#endif
1547 1590
1548#ifdef TRANSPARENT 1591#ifdef TRANSPARENT
1549 if (am_transparent && ev.xany.window == parent[0]) 1592 if (am_transparent && ev.xany.window == parent[0])
1550 XClearWindow (disp, ev.xany.window); 1593 XClearWindow (disp, ev.xany.window);
1551#endif 1594#endif
… …
1555 case MotionNotify: 1598 case MotionNotify:
1556#ifdef POINTER_BLANK 1599#ifdef POINTER_BLANK
1557 if (hidden_pointer) 1600 if (hidden_pointer)
1558 pointer_unblank (); 1601 pointer_unblank ();
1559#endif 1602#endif
1560#if MENUBAR
1561 if (isMenuBarWindow (ev.xany.window))
1562 {
1563 menubar_control (ev.xbutton);
1564 break;
1565 }
1566#endif
1567 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1603 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1568 break; 1604 break;
1569 1605
1570 if (ev.xany.window == vt) 1606 if (ev.xany.window == vt)
1571 { 1607 {
1608 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)
1609 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1610 ; // nop
1572 if (ev.xbutton.state & (Button1Mask | Button3Mask)) 1611 else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1573 { 1612 {
1574 while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev)) 1613 while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev))
1575 ; 1614 ;
1576 1615
1577 XQueryPointer (disp, vt, 1616 XQueryPointer (disp, vt,
… …
1657 &unused_root_x, &unused_root_y, 1696 &unused_root_x, &unused_root_y,
1658 &ev.xbutton.x, &ev.xbutton.y, 1697 &ev.xbutton.x, &ev.xbutton.y,
1659 &unused_mask); 1698 &unused_mask);
1660 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1699 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1661 scrollbar_size ()); 1700 scrollbar_size ());
1662 scr_refresh (refresh_type); 1701 want_refresh = 1;
1663 refresh_limit = 0; 1702 refresh_limit = 0;
1664 scrollbar_show (1); 1703 scrollbar_show (1);
1665 } 1704 }
1666 break; 1705 break;
1667 } 1706 }
1707
1708skip_switch: ;
1709
1710#if defined(CURSOR_BLINK)
1711 if (OPTION (Opt_cursorBlink) && ev.type == KeyPress)
1712 {
1713 if (hidden_cursor)
1714 {
1715 hidden_cursor = 0;
1716 want_refresh = 1;
1717 }
1718
1719 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1720 }
1721#endif
1722
1723#if defined(POINTER_BLANK)
1724 if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0)
1725 {
1726 if (ev.type == MotionNotify
1727 || ev.type == ButtonPress
1728 || ev.type == ButtonRelease)
1729 if (hidden_pointer)
1730 pointer_unblank ();
1731
1732 if (ev.type == KeyPress && hidden_pointer == 0)
1733 pointer_blank ();
1734 }
1735#endif
1668} 1736}
1669 1737
1670void 1738void
1671rxvt_term::focus_in () 1739rxvt_term::focus_in ()
1672{ 1740{
1673 if (!focus) 1741 if (!focus)
1674 { 1742 {
1675 focus = 1; 1743 focus = 1;
1676 want_refresh = 1; 1744 want_refresh = 1;
1745
1746 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1747
1677#if USE_XIM 1748#if USE_XIM
1678 if (Input_Context != NULL) 1749 if (Input_Context != NULL)
1679 { 1750 {
1680 IMSetStatusPosition (); 1751 IMSetStatusPosition ();
1681 XSetICFocus (Input_Context); 1752 XSetICFocus (Input_Context);
… …
1701 if (focus) 1772 if (focus)
1702 { 1773 {
1703 focus = 0; 1774 focus = 0;
1704 want_refresh = 1; 1775 want_refresh = 1;
1705 1776
1777 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1778
1706#if ENABLE_FRILLS || ISO_14755 1779#if ENABLE_FRILLS || ISO_14755
1780 if (iso14755buf)
1781 {
1707 iso14755buf = 0; 1782 iso14755buf = 0;
1708#endif
1709#if ENABLE_OVERLAY 1783# if ENABLE_OVERLAY
1710 scr_overlay_off (); 1784 scr_overlay_off ();
1785# endif
1786 }
1711#endif 1787#endif
1712#if USE_XIM 1788#if USE_XIM
1713 if (Input_Context != NULL) 1789 if (Input_Context != NULL)
1714 XUnsetICFocus (Input_Context); 1790 XUnsetICFocus (Input_Context);
1715#endif 1791#endif
… …
1730 1806
1731#if TRANSPARENT 1807#if TRANSPARENT
1732void 1808void
1733rxvt_term::rootwin_cb (XEvent &ev) 1809rxvt_term::rootwin_cb (XEvent &ev)
1734{ 1810{
1735 SET_R (this); 1811 make_current ();
1736 SET_LOCALE (locale);
1737 1812
1738 switch (ev.type) 1813 switch (ev.type)
1739 { 1814 {
1740 case PropertyNotify: 1815 case PropertyNotify:
1741 /* 1816 /*
… …
1759rxvt_term::button_press (XButtonEvent &ev) 1834rxvt_term::button_press (XButtonEvent &ev)
1760{ 1835{
1761 int reportmode = 0, clickintime; 1836 int reportmode = 0, clickintime;
1762 1837
1763 bypass_keystate = ev.state & (ModMetaMask | ShiftMask); 1838 bypass_keystate = ev.state & (ModMetaMask | ShiftMask);
1839
1764 if (!bypass_keystate) 1840 if (!bypass_keystate)
1765 reportmode = !! (priv_modes & PrivMode_mouse_report); 1841 reportmode = !! (priv_modes & PrivMode_mouse_report);
1766 1842
1767 /* 1843 /*
1768 * VT window processing of button press 1844 * VT window processing of button press
… …
1788#ifdef MOUSE_REPORT_DOUBLECLICK 1864#ifdef MOUSE_REPORT_DOUBLECLICK
1789 if (ev.button == MEvent.button && clickintime) 1865 if (ev.button == MEvent.button && clickintime)
1790 { 1866 {
1791 /* same button, within alloted time */ 1867 /* same button, within alloted time */
1792 MEvent.clicks++; 1868 MEvent.clicks++;
1869
1793 if (MEvent.clicks > 1) 1870 if (MEvent.clicks > 1)
1794 { 1871 {
1795 /* only report double clicks */ 1872 /* only report double clicks */
1796 MEvent.clicks = 2; 1873 MEvent.clicks = 2;
1797 mouse_report (ev); 1874 mouse_report (ev);
… …
1817 else 1894 else
1818 { 1895 {
1819 if (ev.button != MEvent.button) 1896 if (ev.button != MEvent.button)
1820 MEvent.clicks = 0; 1897 MEvent.clicks = 0;
1821 1898
1899 if (!HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1822 switch (ev.button) 1900 switch (ev.button)
1823 { 1901 {
1824 case Button1: 1902 case Button1:
1825 /* allow meta + click to select rectangular areas */ 1903 /* allow meta + click to select rectangular areas */
1826 /* should be done in screen.C */ 1904 /* should be done in screen.C */
1827#if ENABLE_FRILLS 1905#if ENABLE_FRILLS
1828 selection.rect = !!(ev.state & ModMetaMask); 1906 selection.rect = !!(ev.state & ModMetaMask);
1829#else 1907#else
1830 selection.rect = false; 1908 selection.rect = false;
1831#endif 1909#endif
1832 1910
1833 /* allow shift+left click to extend selection */ 1911 /* allow shift+left click to extend selection */
1834 if (ev.state & ShiftMask && ! (priv_modes & PrivMode_mouse_report)) 1912 if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report))
1835 { 1913 {
1836 if (MEvent.button == Button1 && clickintime) 1914 if (MEvent.button == Button1 && clickintime)
1837 selection_rotate (ev.x, ev.y); 1915 selection_rotate (ev.x, ev.y);
1838 else 1916 else
1839 selection_extend (ev.x, ev.y, 1); 1917 selection_extend (ev.x, ev.y, 1);
1840 } 1918 }
1841 else 1919 else
1842 { 1920 {
1843 if (MEvent.button == Button1 && clickintime) 1921 if (MEvent.button == Button1 && clickintime)
1844 MEvent.clicks++; 1922 MEvent.clicks++;
1845 else 1923 else
1846 MEvent.clicks = 1; 1924 MEvent.clicks = 1;
1847 1925
1848 selection_click (MEvent.clicks, ev.x, ev.y); 1926 selection_click (MEvent.clicks, ev.x, ev.y);
1849 } 1927 }
1850 1928
1851 MEvent.button = Button1; 1929 MEvent.button = Button1;
1852 break; 1930 break;
1853 1931
1854 case Button3: 1932 case Button3:
1855 if (MEvent.button == Button3 && clickintime) 1933 if (MEvent.button == Button3 && clickintime)
1856 selection_rotate (ev.x, ev.y); 1934 selection_rotate (ev.x, ev.y);
1857 else 1935 else
1858 selection_extend (ev.x, ev.y, 1); 1936 selection_extend (ev.x, ev.y, 1);
1859 1937
1860 MEvent.button = Button3; 1938 MEvent.button = Button3;
1861 break; 1939 break;
1862 } 1940 }
1863 } 1941 }
1864 1942
1865 MEvent.time = ev.time; 1943 MEvent.time = ev.time;
1866 return; 1944 return;
1867 } 1945 }
1868 1946
… …
2004 } 2082 }
2005 2083
2006 break; 2084 break;
2007 } 2085 }
2008 } 2086 }
2087
2009 return; 2088 return;
2010 } 2089 }
2011#if MENUBAR
2012 /*
2013 * Menubar window processing of button press
2014 */
2015 if (isMenuBarWindow (ev.window))
2016 menubar_control (ev);
2017#endif
2018} 2090}
2019 2091
2020void 2092void
2021rxvt_term::button_release (XButtonEvent &ev) 2093rxvt_term::button_release (XButtonEvent &ev)
2022{ 2094{
… …
2078 if (priv_modes & PrivMode_mouse_report 2150 if (priv_modes & PrivMode_mouse_report
2079 && bypass_keystate 2151 && bypass_keystate
2080 && ev.button == Button1 && MEvent.clicks <= 1) 2152 && ev.button == Button1 && MEvent.clicks <= 1)
2081 selection_extend (ev.x, ev.y, 0); 2153 selection_extend (ev.x, ev.y, 0);
2082 2154
2155 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2156 return;
2157
2083 switch (ev.button) 2158 switch (ev.button)
2084 { 2159 {
2085 case Button1: 2160 case Button1:
2086 case Button3: 2161 case Button3:
2087 selection_make (ev.time); 2162 selection_make (ev.time);
… …
2118 slip_wheel_ev.start (); 2193 slip_wheel_ev.start ();
2119 } 2194 }
2120 else 2195 else
2121 { 2196 {
2122# endif 2197# endif
2123# ifdef JUMP_MOUSE_WHEEL
2124 scr_page (v, i); 2198 scr_page (v, i);
2125 scr_refresh (SMOOTH_REFRESH);
2126 scrollbar_show (1); 2199 scrollbar_show (1);
2127# else
2128 while (i--)
2129 {
2130 scr_page (v, 1);
2131 scr_refresh (SMOOTH_REFRESH);
2132 scrollbar_show (1);
2133 }
2134# endif
2135# ifdef MOUSE_SLIP_WHEELING 2200# ifdef MOUSE_SLIP_WHEELING
2136 } 2201 }
2137#endif 2202# endif
2138 } 2203 }
2139 break; 2204 break;
2140#endif 2205#endif
2141 } 2206 }
2142 } 2207 }
2143#ifdef MENUBAR
2144 else if (isMenuBarWindow (ev.window))
2145 menubar_control (ev);
2146#endif
2147} 2208}
2148 2209
2149#ifdef TRANSPARENT 2210#ifdef TRANSPARENT
2150#if TINTING 2211#if TINTING
2151/* taken from aterm-0.4.2 */ 2212/* taken from aterm-0.4.2 */
… …
2631 2692
2632bool 2693bool
2633rxvt_term::cmd_parse () 2694rxvt_term::cmd_parse ()
2634{ 2695{
2635 bool flag = false; 2696 bool flag = false;
2636 unicode_t ch = NOCHAR; 2697 wchar_t ch = NOCHAR;
2637 unsigned char *seq_begin; // remember start of esc-sequence here 2698 char *seq_begin; // remember start of esc-sequence here
2638 2699
2639 for (;;) 2700 for (;;)
2640 { 2701 {
2641 if (ch == NOCHAR) 2702 if (ch == NOCHAR)
2642 { 2703 {
2643 seq_begin = cmdbuf_ptr; 2704 seq_begin = cmdbuf_ptr;
2644 ch = next_char (); 2705 ch = next_char ();
2645 }
2646 2706
2647 if (ch == NOCHAR) // TODO: improve 2707 if (ch == NOCHAR)
2648 break; 2708 break;
2709 }
2649 2710
2650 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT) 2711 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT)
2651 { 2712 {
2652 if (!seen_input) 2713 if (!seen_input)
2653 { 2714 {
… …
2662 if (seen_resize && cmd_pid) 2723 if (seen_resize && cmd_pid)
2663 kill (-cmd_pid, SIGWINCH); 2724 kill (-cmd_pid, SIGWINCH);
2664 } 2725 }
2665 2726
2666 /* Read a text string from the input buffer */ 2727 /* Read a text string from the input buffer */
2667 unicode_t buf[UBUFSIZ]; 2728 wchar_t buf[UBUFSIZ];
2668 bool refreshnow = false; 2729 bool refreshnow = false;
2669 int nlines = 0; 2730 int nlines = 0;
2670 unicode_t *str = buf; 2731 wchar_t *str = buf;
2671 unicode_t *eol = str + min (ncol, UBUFSIZ); 2732 wchar_t *eol = str + min (ncol, UBUFSIZ);
2672 2733
2673 for (;;) 2734 for (;;)
2674 { 2735 {
2675 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)) 2736 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))
2676 break; 2737 break;
… …
2686 2747
2687 if (!OPTION (Opt_jumpScroll) 2748 if (!OPTION (Opt_jumpScroll)
2688 || (refresh_count >= refresh_limit * (nrow - 1))) 2749 || (refresh_count >= refresh_limit * (nrow - 1)))
2689 { 2750 {
2690 refreshnow = true; 2751 refreshnow = true;
2752 refresh_count = 0;
2691 ch = NOCHAR; 2753 ch = NOCHAR;
2692 break; 2754 break;
2693 } 2755 }
2694 2756
2695 // scr_add_lines only works for nlines <= nrow - 1. 2757 // scr_add_lines only works for nlines <= nrow - 1.
2696 if (nlines >= nrow - 1) 2758 if (nlines >= nrow - 1)
2697 { 2759 {
2760 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2761 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2698 scr_add_lines (buf, nlines, str - buf); 2762 scr_add_lines (buf, str - buf, nlines);
2763
2699 nlines = 0; 2764 nlines = 0;
2700 str = buf; 2765 str = buf;
2701 eol = str + min (ncol, UBUFSIZ); 2766 eol = str + min (ncol, UBUFSIZ);
2702 } 2767 }
2703 2768
… …
2716 2781
2717 seq_begin = cmdbuf_ptr; 2782 seq_begin = cmdbuf_ptr;
2718 ch = next_char (); 2783 ch = next_char ();
2719 } 2784 }
2720 2785
2786 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2787 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2721 scr_add_lines (buf, nlines, str - buf); 2788 scr_add_lines (buf, str - buf, nlines);
2722 2789
2723 /* 2790 /*
2724 * If there have been a lot of new lines, then update the screen 2791 * 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. 2792 * 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 2793 * the number of pages between refreshes is refresh_limit, which
… …
2732 refresh_limit++; 2799 refresh_limit++;
2733 else 2800 else
2734 { 2801 {
2735 flag = true; 2802 flag = true;
2736 scr_refresh (refresh_type); 2803 scr_refresh (refresh_type);
2804 want_refresh = 1;
2737 } 2805 }
2738 } 2806 }
2739 2807
2740 } 2808 }
2741 else 2809 else
… …
2756 } 2824 }
2757 2825
2758 return flag; 2826 return flag;
2759} 2827}
2760 2828
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 2829// read the next character
2771unicode_t 2830wchar_t
2772rxvt_term::next_char () 2831rxvt_term::next_char ()
2773{ 2832{
2774 while (cmdbuf_ptr < cmdbuf_endp) 2833 while (cmdbuf_ptr < cmdbuf_endp)
2775 { 2834 {
2776 // assume 7-bit to be ascii ALWAYS 2835 // assume 7-bit to be ascii ALWAYS
2777 if (*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2836 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)
2778 return *cmdbuf_ptr++; 2837 return *cmdbuf_ptr++;
2779 2838
2780 wchar_t wc; 2839 wchar_t wc;
2781 size_t len = mbrtowc (&wc, (char *)cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate); 2840 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2782 2841
2783 if (len == (size_t)-2) 2842 if (len == (size_t)-2)
2784 { 2843 {
2785 // the mbstate stores incomplete sequences. didn't know this :/ 2844 // the mbstate stores incomplete sequences. didn't know this :/
2786 cmdbuf_ptr = cmdbuf_endp; 2845 cmdbuf_ptr = cmdbuf_endp;
2787 break; 2846 break;
2788 } 2847 }
2789 2848
2790 if (len == (size_t)-1) 2849 if (len == (size_t)-1)
2791 return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 2850 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2792 2851
2793 // assume wchar == unicode 2852 // assume wchar == unicode
2794 cmdbuf_ptr += len; 2853 cmdbuf_ptr += len;
2795 return wc & UNICODE_MASK; 2854 return wc & UNICODE_MASK;
2796 } 2855 }
2797 2856
2798 return NOCHAR; 2857 return NOCHAR;
2858}
2859
2860// read the next octet
2861uint32_t
2862rxvt_term::next_octet ()
2863{
2864 return cmdbuf_ptr < cmdbuf_endp
2865 ? (unsigned char)*cmdbuf_ptr++
2866 : NOCHAR;
2799} 2867}
2800 2868
2801/* rxvt_cmd_getc () - Return next input character */ 2869/* rxvt_cmd_getc () - Return next input character */
2802/* 2870/*
2803 * Return the next input character after first passing any keyboard input 2871 * Return the next input character after first passing any keyboard input
2804 * to the command. 2872 * to the command.
2805 */ 2873 */
2806unicode_t 2874wchar_t
2807rxvt_term::cmd_getc () 2875rxvt_term::cmd_getc ()
2808{ 2876{
2809 unicode_t c = next_char (); 2877 wchar_t c = next_char ();
2810 2878
2811 if (c == NOCHAR) 2879 if (c == NOCHAR)
2812 throw out_of_input; 2880 throw out_of_input;
2813 2881
2814 return c; 2882 return c;
2815} 2883}
2816 2884
2817unicode_t 2885uint32_t
2818rxvt_term::cmd_get8 () 2886rxvt_term::cmd_get8 ()
2819{ 2887{
2820 unicode_t c = next_octet (); 2888 uint32_t c = next_octet ();
2821 2889
2822 if (c == NOCHAR) 2890 if (c == NOCHAR)
2823 throw out_of_input; 2891 throw out_of_input;
2824 2892
2825 return c; 2893 return c;
… …
2925 case C0_ESC: 2993 case C0_ESC:
2926 process_escape_seq (); 2994 process_escape_seq ();
2927 break; 2995 break;
2928 case C0_ENQ: /* terminal Status */ 2996 case C0_ENQ: /* terminal Status */
2929 if (rs[Rs_answerbackstring]) 2997 if (rs[Rs_answerbackstring])
2930 tt_write ((const unsigned char *)rs[Rs_answerbackstring], 2998 tt_write (rs [Rs_answerbackstring], strlen (rs [Rs_answerbackstring]));
2931 (unsigned int)strlen (rs[Rs_answerbackstring]));
2932 else 2999 else
2933 tt_write ((unsigned char *)VT100_ANS, 3000 tt_write (VT100_ANS, strlen (VT100_ANS));
2934 (unsigned int)strlen (VT100_ANS));
2935 break; 3001 break;
2936 case C0_BEL: /* bell */ 3002 case C0_BEL: /* bell */
2937 scr_bell (); 3003 scr_bell ();
2938 break; 3004 break;
2939 case C0_BS: /* backspace */ 3005 case C0_BS: /* backspace */
… …
3094 break; 3160 break;
3095 3161
3096 /* 8.3.87: NEXT LINE */ 3162 /* 8.3.87: NEXT LINE */
3097 case C1_NEL: /* ESC E */ 3163 case C1_NEL: /* ESC E */
3098 { 3164 {
3099 unicode_t nlcr[] = { C0_LF, C0_CR }; 3165 wchar_t nlcr[] = { C0_LF, C0_CR };
3100 scr_add_lines (nlcr, 1, 2); 3166 scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1);
3101 } 3167 }
3102 break; 3168 break;
3103 3169
3104 /* kidnapped escape sequence: Should be 8.3.48 */ 3170 /* kidnapped escape sequence: Should be 8.3.48 */
3105 case C1_ESA: /* ESC G */ 3171 case C1_ESA: /* ESC G */
… …
3127 process_dcs_seq (); 3193 process_dcs_seq ();
3128 break; 3194 break;
3129 3195
3130 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 3196 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
3131 case C1_SCI: /* ESC Z */ 3197 case C1_SCI: /* ESC Z */
3132 tt_write ((const unsigned char *)ESCZ_ANSWER, 3198 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
3133 (unsigned int) (sizeof (ESCZ_ANSWER) - 1));
3134 break; /* steal obsolete ESC [ c */ 3199 break; /* steal obsolete ESC [ c */
3135 3200
3136 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 3201 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */
3137 case C1_CSI: /* ESC [ */ 3202 case C1_CSI: /* ESC [ */
3138 process_csi_seq (); 3203 process_csi_seq ();
… …
3382 case CSI_SU: /* 8.3.148: (1) SCROLL UP */ 3447 case CSI_SU: /* 8.3.148: (1) SCROLL UP */
3383 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0]); 3448 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0]);
3384 break; 3449 break;
3385 3450
3386 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ 3451 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
3387 tt_write ((const unsigned char *)VT100_ANS, 3452 tt_write (VT100_ANS, sizeof (VT100_ANS) - 1);
3388 (unsigned int) (sizeof (VT100_ANS) - 1));
3389 break; 3453 break;
3390 3454
3391 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */ 3455 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */
3392 process_sgr_mode (nargs, arg); 3456 process_sgr_mode (nargs, arg);
3393 break; 3457 break;
… …
3595/*----------------------------------------------------------------------*/ 3659/*----------------------------------------------------------------------*/
3596/* 3660/*
3597 * get input up until STRING TERMINATOR (or BEL) 3661 * get input up until STRING TERMINATOR (or BEL)
3598 * ends_how is terminator used. returned input must be free()'d 3662 * ends_how is terminator used. returned input must be free()'d
3599 */ 3663 */
3600unsigned char * 3664char *
3601rxvt_term::get_to_st (unicode_t &ends_how) 3665rxvt_term::get_to_st (unicode_t &ends_how)
3602{ 3666{
3603 unicode_t ch; 3667 unicode_t ch;
3604 bool seen_esc = false; 3668 bool seen_esc = false;
3605 unsigned int n = 0; 3669 unsigned int n = 0;
… …
3638 3702
3639 string[n++] = '\0'; 3703 string[n++] = '\0';
3640 3704
3641 ends_how = (ch == 0x5c ? C0_ESC : ch); 3705 ends_how = (ch == 0x5c ? C0_ESC : ch);
3642 3706
3643 return (unsigned char *)rxvt_wcstombs (string); 3707 return rxvt_wcstombs (string);
3644} 3708}
3645 3709
3646/*----------------------------------------------------------------------*/ 3710/*----------------------------------------------------------------------*/
3647/* 3711/*
3648 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 3712 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
3649 */ 3713 */
3650void 3714void
3651rxvt_term::process_dcs_seq () 3715rxvt_term::process_dcs_seq ()
3652{ 3716{
3653 unsigned char *s; 3717 char *s;
3654 unicode_t eh; 3718 unicode_t eh;
3655 3719
3656 /* 3720 /*
3657 * Not handled yet 3721 * Not handled yet
3658 */ 3722 */
… …
3677 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3741 for (arg = 0; isdigit (ch); ch = cmd_getc ())
3678 arg = arg * 10 + (ch - '0'); 3742 arg = arg * 10 + (ch - '0');
3679 3743
3680 if (ch == ';') 3744 if (ch == ';')
3681 { 3745 {
3682 unsigned char *s = get_to_st (eh); 3746 char *s = get_to_st (eh);
3683 3747
3684 if (s) 3748 if (s)
3685 { 3749 {
3686 process_xterm_seq (arg, (char *)s, eh); 3750 process_xterm_seq (arg, s, eh);
3687 free (s); 3751 free (s);
3688 } 3752 }
3689 } 3753 }
3690} 3754}
3691 3755
3692void 3756void
3693rxvt_term::process_color_seq (int report, int color, const char *str, unsigned char resp) 3757rxvt_term::process_color_seq (int report, int color, const char *str, char resp)
3694{ 3758{
3695 if (str[0] == '?' && !str[1]) 3759 if (str[0] == '?' && !str[1])
3696 { 3760 {
3697 unsigned short r, g, b; 3761 unsigned short r, g, b;
3698 pix_colors_focused[color].get (display, r, g, b); 3762 pix_colors_focused[color].get (display, r, g, b);
… …
3704 3768
3705/* 3769/*
3706 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3770 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3707 */ 3771 */
3708void 3772void
3709rxvt_term::process_xterm_seq (int op, const char *str, unsigned char resp) 3773rxvt_term::process_xterm_seq (int op, const char *str, char resp)
3710{ 3774{
3711 int changed = 0; 3775 int changed = 0;
3712 int color; 3776 int color;
3713 char *buf, *name; 3777 char *buf, *name;
3714 bool query = str[0] == '?' && !str[1]; 3778 bool query = str[0] == '?' && !str[1];
… …
3771 { 3835 {
3772 if ((name = strchr (buf, ';')) == NULL) 3836 if ((name = strchr (buf, ';')) == NULL)
3773 break; 3837 break;
3774 3838
3775 *name++ = '\0'; 3839 *name++ = '\0';
3776 color = atoi (buf); 3840 color = atoi (buf) + minCOLOR;
3777 3841
3778 if (color < 0 || color >= TOTAL_COLORS) 3842 if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR))
3779 break; 3843 break;
3780 3844
3781 if ((buf = strchr (name, ';')) != NULL) 3845 if ((buf = strchr (name, ';')) != NULL)
3782 *buf++ = '\0'; 3846 *buf++ = '\0';
3783 3847
3784 if (name[0] == '?' && !name[1]) 3848 if (name[0] == '?' && !name[1])
3785 { 3849 {
3786 unsigned short r, g, b; 3850 unsigned short r, g, b;
3787 pix_colors_focused[color + minCOLOR].get (display, r, g, b); 3851 pix_colors_focused[color].get (display, r, g, b);
3788 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp); 3852 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp);
3789 } 3853 }
3790 else 3854 else
3791 set_window_color (color + minCOLOR, name); 3855 set_window_color (color, name);
3792 } 3856 }
3793 break; 3857 break;
3794 case XTerm_Color00: 3858 case XTerm_Color00:
3795 process_color_seq (XTerm_Color00, Color_fg, str, resp); 3859 process_color_seq (XTerm_Color00, Color_fg, str, resp);
3796 break; 3860 break;
3797 case XTerm_Color01: 3861 case XTerm_Color01:
3798 process_color_seq (XTerm_Color00, Color_bg, str, resp); 3862 process_color_seq (XTerm_Color01, Color_bg, str, resp);
3799 break; 3863 break;
3800#ifndef NO_CURSORCOLOR 3864#ifndef NO_CURSORCOLOR
3801 case XTerm_Color_cursor: 3865 case XTerm_Color_cursor:
3802 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp); 3866 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp);
3803 break; 3867 break;
… …
3807 break; 3871 break;
3808 case XTerm_Color_pointer_bg: 3872 case XTerm_Color_pointer_bg:
3809 process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp); 3873 process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp);
3810 break; 3874 break;
3811#ifndef NO_BOLD_UNDERLINE_REVERSE 3875#ifndef NO_BOLD_UNDERLINE_REVERSE
3812 case XTerm_Color_BD:
3813 process_color_seq (XTerm_Color_BD, Color_BD, str, resp);
3814 break;
3815 case XTerm_Color_UL:
3816 process_color_seq (XTerm_Color_UL, Color_UL, str, resp);
3817 break;
3818 case XTerm_Color_RV: 3876 case XTerm_Color_RV:
3819 process_color_seq (XTerm_Color_RV, Color_RV, str, resp); 3877 process_color_seq (XTerm_Color_RV, Color_RV, str, resp);
3878 break;
3879 case Rxvt_Color_BD:
3880 case URxvt_Color_BD:
3881 process_color_seq (op, Color_BD, str, resp);
3882 break;
3883 case Rxvt_Color_UL:
3884 case URxvt_Color_UL:
3885 process_color_seq (op, Color_UL, str, resp);
3820 break; 3886 break;
3821 case URxvt_Color_IT: 3887 case URxvt_Color_IT:
3822 process_color_seq (URxvt_Color_IT, Color_IT, str, resp); 3888 process_color_seq (URxvt_Color_IT, Color_IT, str, resp);
3823 break; 3889 break;
3824#endif 3890#endif
… …
3829 if (am_transparent) 3895 if (am_transparent)
3830 want_full_refresh = want_refresh = 1; 3896 want_full_refresh = want_refresh = 1;
3831 break; 3897 break;
3832#endif 3898#endif
3833 3899
3834 case XTerm_Pixmap: 3900 case Rxvt_Pixmap:
3835 if (*str != ';') 3901 if (*str != ';')
3836 { 3902 {
3837#if XPM_BACKGROUND 3903#if XPM_BACKGROUND
3838 scale_pixmap (""); /* reset to default scaling */ 3904 scale_pixmap (""); /* reset to default scaling */
3839 set_bgPixmap (str); /* change pixmap */ 3905 set_bgPixmap (str); /* change pixmap */
3840#endif
3841 scr_touch (true); 3906 scr_touch (true);
3907#endif
3842 } 3908 }
3909
3843 while ((str = strchr (str, ';')) != NULL) 3910 while ((str = strchr (str, ';')) != NULL)
3844 { 3911 {
3845 str++; 3912 str++;
3846#if XPM_BACKGROUND 3913#if XPM_BACKGROUND
3847 changed += scale_pixmap (str); 3914 changed += scale_pixmap (str);
… …
3850 3917
3851 if (changed) 3918 if (changed)
3852 { 3919 {
3853#ifdef XPM_BACKGROUND 3920#ifdef XPM_BACKGROUND
3854 resize_pixmap (); 3921 resize_pixmap ();
3855#endif
3856 scr_touch (true); 3922 scr_touch (true);
3923#endif
3857 } 3924 }
3858 break; 3925 break;
3859 3926
3860 case XTerm_restoreFG: 3927 case Rxvt_restoreFG:
3861 set_window_color (Color_fg, str); 3928 set_window_color (Color_fg, str);
3862 break; 3929 break;
3863 case XTerm_restoreBG: 3930 case Rxvt_restoreBG:
3864 set_window_color (Color_bg, str); 3931 set_window_color (Color_bg, str);
3865 break; 3932 break;
3866 3933
3867 case XTerm_logfile: 3934 case XTerm_logfile:
3868 // TODO, when secure mode? 3935 // TODO, when secure mode?
3869 break; 3936 break;
3870 3937
3871#ifdef MENUBAR
3872 case URxvt_Menu:
3873 if (OPTION (Opt_insecure))
3874 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked
3875 break;
3876#endif
3877#if 0 3938#if 0
3878 case XTerm_dumpscreen: /* no error notices */ 3939 case Rxvt_dumpscreen: /* no error notices */
3879 { 3940 {
3880 int fd; 3941 int fd;
3881 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0) 3942 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0)
3882 { 3943 {
3883 scr_dump (fd); 3944 scr_dump (fd);
… …
3921 } 3982 }
3922 break; 3983 break;
3923 3984
3924 case URxvt_view_up: 3985 case URxvt_view_up:
3925 case URxvt_view_down: 3986 case URxvt_view_down:
3987 {
3926 int lines = atoi (str); 3988 int lines = atoi (str);
3927 3989
3928 if (lines) 3990 if (lines)
3929 scr_page (op == URxvt_view_up ? UP : DN, lines); 3991 scr_page (op == URxvt_view_up ? UP : DN, lines);
3930 else 3992 else
3931 {
3932 scr_erase_savelines (); 3993 scr_erase_savelines ();
3933 } 3994 }
3934 3995
3996 break;
3997#endif
3998
3999#if ENABLE_PERL
4000 case URxvt_perl:
4001 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_STR, str, DT_END)))
4002 ; // no responses yet
3935 break; 4003 break;
3936#endif 4004#endif
3937 } 4005 }
3938} 4006}
3939/*----------------------------------------------------------------------*/ 4007/*----------------------------------------------------------------------*/
… …
3991 { 5, PrivMode_rVideo }, 4059 { 5, PrivMode_rVideo },
3992 { 6, PrivMode_relOrigin }, 4060 { 6, PrivMode_relOrigin },
3993 { 7, PrivMode_Autowrap }, 4061 { 7, PrivMode_Autowrap },
3994 // 8, bi-directional support mode 4062 // 8, bi-directional support mode
3995 { 9, PrivMode_MouseX10 }, 4063 { 9, PrivMode_MouseX10 },
3996#ifdef menuBar_esc
3997 { menuBar_esc, PrivMode_menuBar },
3998#endif
3999 // 18, 19 printing-related 4064 // 18, 19 printing-related
4000 { 25, PrivMode_VisibleCursor }, 4065 { 25, PrivMode_VisibleCursor },
4001#ifdef scrollBar_esc 4066#ifdef scrollBar_esc
4002 { scrollBar_esc, PrivMode_scrollBar }, 4067 { scrollBar_esc, PrivMode_scrollBar },
4003#endif 4068#endif
… …
4048 } 4113 }
4049 4114
4050 /* extra handling for values with state unkept */ 4115 /* extra handling for values with state unkept */
4051 switch (arg[i]) 4116 switch (arg[i])
4052 { 4117 {
4118#if ENABLE_STYLES
4119 case 1021:
4120 set_option (Opt_intensityStyles, mode);
4121
4122 scr_touch (true);
4123 break;
4124#endif
4053 case 1048: /* alternative cursor save */ 4125 case 1048: /* alternative cursor save */
4054 case 1049: 4126 case 1049:
4055 if (OPTION (Opt_secondaryScreen)) 4127 if (OPTION (Opt_secondaryScreen))
4056 if (mode == 0) 4128 if (mode == 0)
4057 scr_cursor (RESTORE); 4129 scr_cursor (RESTORE);
… …
4075 case 3: /* 80/132 */ 4147 case 3: /* 80/132 */
4076 if (priv_modes & PrivMode_132OK) 4148 if (priv_modes & PrivMode_132OK)
4077 set_widthheight (((state ? 132 : 80) * fwidth), height); 4149 set_widthheight (((state ? 132 : 80) * fwidth), height);
4078 break; 4150 break;
4079 case 4: /* smooth scrolling */ 4151 case 4: /* smooth scrolling */
4080 if (!state) 4152 set_option (Opt_jumpScroll, !state);
4081 SET_OPTION (Opt_jumpScroll);
4082 else
4083 CLR_OPTION (Opt_jumpScroll);
4084 break; 4153 break;
4085 case 5: /* reverse video */ 4154 case 5: /* reverse video */
4086 scr_rvideo_mode (state); 4155 scr_rvideo_mode (state);
4087 break; 4156 break;
4088 case 6: /* relative/absolute origins */ 4157 case 6: /* relative/absolute origins */
… …
4094 /* case 8: - auto repeat, can't do on a per window basis */ 4163 /* case 8: - auto repeat, can't do on a per window basis */
4095 case 9: /* X10 mouse reporting */ 4164 case 9: /* X10 mouse reporting */
4096 if (state) /* orthogonal */ 4165 if (state) /* orthogonal */
4097 priv_modes &= ~PrivMode_MouseX11; 4166 priv_modes &= ~PrivMode_MouseX11;
4098 break; 4167 break;
4099#ifdef menuBar_esc
4100 case menuBar_esc:
4101#ifdef MENUBAR
4102 map_menuBar (state);
4103#endif
4104 break;
4105#endif
4106#ifdef scrollBar_esc 4168#ifdef scrollBar_esc
4107 case scrollBar_esc: 4169 case scrollBar_esc:
4108 if (scrollbar_mapping (state)) 4170 if (scrollbar_mapping (state))
4109 { 4171 {
4110 resize_all_windows (0, 0, 0); 4172 resize_all_windows (0, 0, 0);
… …
4129#if 0 4191#if 0
4130 case 1001: 4192 case 1001:
4131 break; /* X11 mouse highlighting */ 4193 break; /* X11 mouse highlighting */
4132#endif 4194#endif
4133 case 1010: /* scroll to bottom on TTY output inhibit */ 4195 case 1010: /* scroll to bottom on TTY output inhibit */
4134 if (!state) 4196 set_option (Opt_scrollTtyOutput, !state);
4135 SET_OPTION (Opt_scrollTtyOutput);
4136 else
4137 CLR_OPTION (Opt_scrollTtyOutput);
4138 break; 4197 break;
4139 case 1011: /* scroll to bottom on key press */ 4198 case 1011: /* scroll to bottom on key press */
4140 if (state) 4199 set_option (Opt_scrollTtyKeypress, state);
4141 SET_OPTION (Opt_scrollTtyKeypress);
4142 else
4143 CLR_OPTION (Opt_scrollTtyKeypress);
4144 break; 4200 break;
4145#if ENABLE_STYLES
4146 case 1021:
4147 if (state)
4148 SET_OPTION (Opt_intensityStyles);
4149 else
4150 CLR_OPTION (Opt_intensityStyles);
4151#endif
4152 case 1047: /* secondary screen w/ clearing last */ 4201 case 1047: /* secondary screen w/ clearing last */
4153 if (OPTION (Opt_secondaryScreen)) 4202 if (OPTION (Opt_secondaryScreen))
4154 if (current_screen != PRIMARY) 4203 if (current_screen != PRIMARY)
4155 scr_erase_screen (2); 4204 scr_erase_screen (2);
4156 scr_change_screen (state); 4205 scr_change_screen (state);
… …
4293 scr_color (Color_bg, Color_bg); 4342 scr_color (Color_bg, Color_bg);
4294 break; 4343 break;
4295 4344
4296 //case 50: // not variable spacing 4345 //case 50: // not variable spacing
4297 4346
4298#ifndef NO_BRIGHTCOLOR 4347#if ENABLE_FRILLS
4299 case 90: 4348 case 90:
4300 case 91: /* set bright fg color */ 4349 case 91: /* set bright fg color */
4301 case 92: 4350 case 92:
4302 case 93: 4351 case 93:
4303 case 94: 4352 case 94:
… …
4315 case 106: 4364 case 106:
4316 case 107: 4365 case 107:
4317 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg); 4366 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg);
4318 break; 4367 break;
4319#endif 4368#endif
4320
4321 } 4369 }
4322 } 4370 }
4323} 4371}
4324/*}}} */ 4372/*}}} */
4325 4373
… …
4349 */ 4397 */
4350void 4398void
4351rxvt_term::tt_printf (const char *fmt,...) 4399rxvt_term::tt_printf (const char *fmt,...)
4352{ 4400{
4353 va_list arg_ptr; 4401 va_list arg_ptr;
4354 unsigned char buf[256]; 4402 char buf[256];
4355 4403
4356 va_start (arg_ptr, fmt); 4404 va_start (arg_ptr, fmt);
4357 vsnprintf ((char *)buf, 256, fmt, arg_ptr); 4405 vsnprintf ((char *)buf, 256, fmt, arg_ptr);
4358 va_end (arg_ptr); 4406 va_end (arg_ptr);
4359 tt_write (buf, strlen (buf)); 4407 tt_write (buf, strlen (buf));
… …
4364 * or generated by us in response to a query ESC sequence. 4412 * or generated by us in response to a query ESC sequence.
4365 */ 4413 */
4366const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT 4414const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4367 4415
4368void 4416void
4369rxvt_term::tt_write (const unsigned char *data, unsigned int len) 4417rxvt_term::tt_write (const char *data, unsigned int len)
4370{ 4418{
4419 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
4420 return;
4421
4422 if (pty.pty < 0)
4423 return;
4424
4371 if (v_buflen == 0) 4425 if (v_buflen == 0)
4372 { 4426 {
4373 ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE)); 4427 ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE));
4374 4428
4375 if ((unsigned int)written == len) 4429 if ((unsigned int)written == len)
… …
4377 4431
4378 data += written; 4432 data += written;
4379 len -= written; 4433 len -= written;
4380 } 4434 }
4381 4435
4382 v_buffer = (unsigned char *)realloc (v_buffer, v_buflen + len); 4436 v_buffer = (char *)realloc (v_buffer, v_buflen + len);
4383 4437
4384 memcpy (v_buffer + v_buflen, data, len); 4438 memcpy (v_buffer + v_buflen, data, len);
4385 v_buflen += len; 4439 v_buflen += len;
4386 4440
4387 pty_ev.set (EVENT_READ | EVENT_WRITE); 4441 pty_ev.set (EVENT_READ | EVENT_WRITE);

Diff Legend

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