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.233 by root, Wed Jan 4 01:16:34 2006 UTC vs.
Revision 1.268 by root, Tue Jan 17 05:47:42 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.
… …
147 || !IN_RANGE_EXC (y, 0, nrow)) 147 || !IN_RANGE_EXC (y, 0, nrow))
148 return; 148 return;
149 149
150 for (;;) 150 for (;;)
151 { 151 {
152 const line_t &l = ROW(y - view_start); 152 const line_t &l = ROW(y + view_start);
153 153
154 text_t t = l.t[x]; 154 text_t t = l.t[x];
155 155
156 if (t != NOCHAR || !x) 156 if (t != NOCHAR || !x)
157 { 157 {
… …
268 mb[0] = ch[0]; 268 mb[0] = ch[0];
269 len = 1; 269 len = 1;
270 } 270 }
271 271
272 if (len > 0) 272 if (len > 0)
273 tt_write ((unsigned char *)mb, len); 273 tt_write (mb, len);
274 else 274 else
275 scr_bell (); 275 scr_bell ();
276 } 276 }
277 277
278 iso14755buf = 0; 278 iso14755buf = 0;
… …
306 KeySym keysym; 306 KeySym keysym;
307#ifdef DEBUG_CMD 307#ifdef DEBUG_CMD
308 static int debug_key = 1; /* accessible by a debugger only */ 308 static int debug_key = 1; /* accessible by a debugger only */
309#endif 309#endif
310 int valid_keysym; 310 int valid_keysym;
311 unsigned char kbuf[KBUFSZ]; 311 char kbuf[KBUFSZ];
312 312
313 /* 313 /*
314 * 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
315 * escape sequence to toggle the Keypad. 315 * escape sequence to toggle the Keypad.
316 * 316 *
… …
334 Status status_return; 334 Status status_return;
335 335
336#if 0 336#if 0
337#ifdef X_HAVE_UTF8_STRING 337#ifdef X_HAVE_UTF8_STRING
338 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
339 len = Xutf8LookupString (Input_Context, &ev, (char *)kbuf, 339 len = Xutf8LookupString (Input_Context, &ev, kbuf,
340 KBUFSZ, &keysym, &status_return); 340 KBUFSZ, &keysym, &status_return);
341 else 341 else
342#endif 342#endif
343#endif 343#endif
344 { 344 {
… …
381 || status_return == XLookupBoth; 381 || status_return == XLookupBoth;
382 } 382 }
383 else 383 else
384#endif 384#endif
385 { 385 {
386 len = XLookupString (&ev, (char *)kbuf, KBUFSZ, &keysym, &compose); 386 len = XLookupString (&ev, kbuf, KBUFSZ, &keysym, &compose);
387 valid_keysym = keysym != NoSymbol; 387 valid_keysym = keysym != NoSymbol;
388 } 388 }
389 389
390 if (valid_keysym) 390 if (valid_keysym)
391 { 391 {
… …
443 scr_move_to (0, 1); 443 scr_move_to (0, 1);
444 return; 444 return;
445 } 445 }
446 else if (keysym == XK_End) 446 else if (keysym == XK_End)
447 { 447 {
448 scr_move_to (1, 0); 448 scr_move_to (1, 1);
449 return; 449 return;
450 } 450 }
451 } 451 }
452#endif 452#endif
453 } 453 }
… …
855 { 855 {
856#ifdef META8_OPTION 856#ifdef META8_OPTION
857 /* set 8-bit on */ 857 /* set 8-bit on */
858 if (meta && (meta_char == 0x80)) 858 if (meta && (meta_char == 0x80))
859 { 859 {
860 unsigned char *ch; 860 char *ch;
861 861
862 for (ch = kbuf; ch < kbuf + len; ch++) 862 for (ch = kbuf; ch < kbuf + len; ch++)
863 *ch |= 0x80; 863 *ch |= 0x80;
864 864
865 meta = 0; 865 meta = 0;
866 } 866 }
867#endif 867#endif
868 /* nil */ ; 868 /* nil */ ;
869 } 869 }
870 } 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;
871 874
872 if (len <= 0) 875 if (len <= 0)
873 return; /* not mapped */ 876 return; /* not mapped */
874 877
875 if (OPTION (Opt_scrollTtyKeypress)) 878 if (OPTION (Opt_scrollTtyKeypress))
… …
898#ifdef META8_OPTION 901#ifdef META8_OPTION
899 && meta_char == C0_ESC 902 && meta_char == C0_ESC
900#endif 903#endif
901 ) 904 )
902 { 905 {
903 const unsigned char ch = C0_ESC; 906 const char ch = C0_ESC;
904 tt_write (&ch, 1); 907 tt_write (&ch, 1);
905 } 908 }
906 909
907#if defined(DEBUG_CMD) 910#if defined(DEBUG_CMD)
908 /* Display keyboard buffer contents */ 911 /* Display keyboard buffer contents */
… …
916#endif /* DEBUG_CMD */ 919#endif /* DEBUG_CMD */
917 tt_write (kbuf, (unsigned int)len); 920 tt_write (kbuf, (unsigned int)len);
918} 921}
919/*}}} */ 922/*}}} */
920 923
921#if MENUBAR_MAX || defined (KEYSYM_RESOURCE) 924#if defined (KEYSYM_RESOURCE)
922/*{{{ rxvt_cmd_write (), rxvt_cmd_getc () */
923/* attempt to `write' count to the input buffer */
924unsigned int 925unsigned int
925rxvt_term::cmd_write (const unsigned char *str, unsigned int count) 926rxvt_term::cmd_write (const char *str, unsigned int count)
926{ 927{
927 unsigned int n, s; 928 unsigned int n, s;
928 929
929 n = cmdbuf_ptr - cmdbuf_base; 930 n = cmdbuf_ptr - cmdbuf_base;
930 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp; 931 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp;
… …
967 } 968 }
968#endif 969#endif
969 970
970 if (want_refresh) 971 if (want_refresh)
971 { 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
972 scr_refresh (refresh_type); 1011 scr_refresh ();
973 scrollbar_show (1); 1012 scrollbar_show (1);
974#ifdef USE_XIM 1013#ifdef USE_XIM
975 IMSendSpot (); 1014 IMSendSpot ();
976#endif 1015#endif
977 } 1016 }
… …
980} 1019}
981 1020
982void 1021void
983rxvt_term::check_cb (check_watcher &w) 1022rxvt_term::check_cb (check_watcher &w)
984{ 1023{
985 SET_R (this); 1024 make_current ();
986 SET_LOCALE (locale);
987 1025
988 display->flush (); 1026 display->flush ();
989 1027
990 if (want_refresh && !flush_ev.active) 1028 if (want_refresh && !flush_ev.active)
991 flush_ev.start (NOW + 1. / 60.); // refresh at max. 60 hz normally 1029 flush_ev.start (NOW + 1. / 60.); // refresh at max. 60 hz normally
992} 1030}
993 1031
994void 1032void
995rxvt_term::flush_cb (time_watcher &w) 1033rxvt_term::flush_cb (time_watcher &w)
996{ 1034{
997 SET_R (this); 1035 make_current ();
998 SET_LOCALE (locale);
999 1036
1000 refresh_limit = 1; 1037 refresh_limit = 1;
1001 refresh_count = 0; 1038 refresh_count = 0;
1002 flush (); 1039 flush ();
1003} 1040}
… …
1031rxvt_term::cont_scroll_cb (time_watcher &w) 1068rxvt_term::cont_scroll_cb (time_watcher &w)
1032{ 1069{
1033 if ((scrollbar_isUp() || scrollbar_isDn()) && 1070 if ((scrollbar_isUp() || scrollbar_isDn()) &&
1034 scr_page (scrollbar_isUp() ? UP : DN, 1)) 1071 scr_page (scrollbar_isUp() ? UP : DN, 1))
1035 { 1072 {
1036 refresh_type |= SMOOTH_REFRESH;
1037 want_refresh = 1; 1073 want_refresh = 1;
1038 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1074 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1039 } 1075 }
1040} 1076}
1041#endif 1077#endif
… …
1045rxvt_term::sel_scroll_cb (time_watcher &w) 1081rxvt_term::sel_scroll_cb (time_watcher &w)
1046{ 1082{
1047 if (scr_page (scroll_selection_dir, scroll_selection_lines)) 1083 if (scr_page (scroll_selection_dir, scroll_selection_lines))
1048 { 1084 {
1049 selection_extend (selection_save_x, selection_save_y, selection_save_state); 1085 selection_extend (selection_save_x, selection_save_y, selection_save_state);
1050 refresh_type |= SMOOTH_REFRESH;
1051 want_refresh = 1; 1086 want_refresh = 1;
1052 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1087 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1053 } 1088 }
1054} 1089}
1055#endif 1090#endif
… …
1060{ 1095{
1061 if (mouse_slip_wheel_speed == 0 1096 if (mouse_slip_wheel_speed == 0
1062 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed) 1097 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
1063 : scr_page (UP, mouse_slip_wheel_speed)) 1098 : scr_page (UP, mouse_slip_wheel_speed))
1064 { 1099 {
1065 if (view_start == nsaved || 1100 if (view_start == top_row || view_start == 0)
1066 view_start == 0)
1067 mouse_slip_wheel_speed = 0; 1101 mouse_slip_wheel_speed = 0;
1068 1102
1069 refresh_type |= SMOOTH_REFRESH;
1070 want_refresh = 1; 1103 want_refresh = 1;
1071 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1104 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1072 } 1105 }
1073} 1106}
1074#endif 1107#endif
… …
1132} 1165}
1133 1166
1134void 1167void
1135rxvt_term::pty_cb (io_watcher &w, short revents) 1168rxvt_term::pty_cb (io_watcher &w, short revents)
1136{ 1169{
1137 SET_R (this); 1170 make_current ();
1138 SET_LOCALE (locale);
1139 1171
1140 if (revents & EVENT_READ) 1172 if (revents & EVENT_READ)
1141 // loop, but don't allow a single term to monopolize us 1173 // loop, but don't allow a single term to monopolize us
1142 while (pty_fill ()) 1174 while (pty_fill ())
1143 if (cmd_parse ()) 1175 if (cmd_parse ())
… …
1163 1195
1164#ifdef POINTER_BLANK 1196#ifdef POINTER_BLANK
1165void 1197void
1166rxvt_term::pointer_blank () 1198rxvt_term::pointer_blank ()
1167{ 1199{
1168 if (! OPTION (Opt_pointerBlank)) 1200 if (!OPTION (Opt_pointerBlank))
1169 return; 1201 return;
1170 1202
1171 XDefineCursor (display->display, vt, display->blank_cursor); 1203 XDefineCursor (display->display, vt, display->blank_cursor);
1172 XFlush (display->display); 1204 XFlush (display->display);
1173 1205
… …
1175} 1207}
1176 1208
1177void 1209void
1178rxvt_term::pointer_cb (time_watcher &w) 1210rxvt_term::pointer_cb (time_watcher &w)
1179{ 1211{
1180 SET_R (this); 1212 make_current ();
1181 SET_LOCALE (locale);
1182 1213
1183 pointer_blank (); 1214 pointer_blank ();
1184} 1215}
1185#endif 1216#endif
1186 1217
… …
1265 1296
1266/*{{{ process an X event */ 1297/*{{{ process an X event */
1267void 1298void
1268rxvt_term::x_cb (XEvent &ev) 1299rxvt_term::x_cb (XEvent &ev)
1269{ 1300{
1301 make_current ();
1302
1270 dDisp; 1303 dDisp;
1271 1304
1272 SET_R (this); 1305 if (ev.xany.window == vt
1273 SET_LOCALE (locale); 1306 && SHOULD_INVOKE (HOOK_X_EVENT)
1307 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END)))
1308 return;
1274 1309
1275#if defined(CURSOR_BLINK) 1310 // for XQueryPointer
1276 if (OPTION (Opt_cursorBlink) && ev.type == KeyPress)
1277 {
1278 if (hidden_cursor)
1279 {
1280 hidden_cursor = 0;
1281 want_refresh = 1;
1282 }
1283
1284 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1285 }
1286#endif
1287
1288#if defined(POINTER_BLANK)
1289 if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0)
1290 {
1291 if (ev.type == MotionNotify
1292 || ev.type == ButtonPress
1293 || ev.type == ButtonRelease)
1294 if (hidden_pointer)
1295 pointer_unblank ();
1296
1297 if (ev.type == KeyPress && hidden_pointer == 0)
1298 pointer_blank ();
1299 }
1300#endif
1301
1302 Window unused_root, unused_child; 1311 Window unused_root, unused_child;
1303 int unused_root_x, unused_root_y; 1312 int unused_root_x, unused_root_y;
1304 unsigned int unused_mask; 1313 unsigned int unused_mask;
1305 1314
1306 switch (ev.type) 1315 switch (ev.type)
… …
1313 1322
1314 break; 1323 break;
1315 1324
1316 case KeyRelease: 1325 case KeyRelease:
1317 { 1326 {
1318#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 1327#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL
1319 KeySym ks; 1328 KeySym keysym;
1320 1329
1321 ks = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/ 1330 keysym = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
1322#endif 1331#endif
1323 1332
1324#if ENABLE_FRILLS || ISO_14755 1333#if ENABLE_FRILLS || ISO_14755
1325 // ISO 14755 support 1334 // ISO 14755 support
1326 if (iso14755buf) 1335 if (iso14755buf)
… …
1331# endif 1340# endif
1332# if ISO_14755 1341# if ISO_14755
1333 // iso14755 part 5.2 handling: release time 1342 // iso14755 part 5.2 handling: release time
1334 // first: controls 1343 // first: controls
1335 if ((ev.xkey.state & ControlMask) 1344 if ((ev.xkey.state & ControlMask)
1336 && ((ks >= 0x40 && ks <= 0x5f) 1345 && ((keysym >= 0x40 && keysym <= 0x5f)
1337 || (ks >= 0x61 && ks <= 0x7f))) 1346 || (keysym >= 0x61 && keysym <= 0x7f)))
1338 { 1347 {
1339 iso14755buf = ISO_14755_51 | 0x2400 | (ks & 0x1f); 1348 iso14755buf = ISO_14755_51 | 0x2400 | (keysym & 0x1f);
1340 commit_iso14755 (); 1349 commit_iso14755 ();
1341 return; // case-break; 1350 goto skip_switch;
1342 } 1351 }
1343 1352
1344 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2) 1353 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
1345 if (i[0] == ks) 1354 if (i[0] == keysym)
1346 { 1355 {
1347 iso14755buf = ISO_14755_51 | i[1]; 1356 iso14755buf = ISO_14755_51 | i[1];
1348 commit_iso14755 (); 1357 commit_iso14755 ();
1349 return; // case-break; 1358 goto skip_switch;
1350 } 1359 }
1351 1360
1352 scr_bell (); 1361 scr_bell ();
1353# endif 1362# endif
1354 iso14755buf = 0; 1363 iso14755buf = 0;
… …
1373 else 1382 else
1374 iso14755buf = 0; 1383 iso14755buf = 0;
1375 } 1384 }
1376#endif 1385#endif
1377 1386
1387 if (ev.xany.window == vt
1388 && HOOK_INVOKE ((this, HOOK_KEY_RELEASE, DT_XEVENT, &ev, DT_INT, keysym, DT_END)))
1389 break;
1390
1378#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1391#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1379 if (!(ev.xkey.state & ControlMask)) 1392 if (!(ev.xkey.state & ControlMask))
1380 slip_wheel_ev.stop (); 1393 slip_wheel_ev.stop ();
1381 else if (ks == XK_Control_L || ks == XK_Control_R) 1394 else if (keysym == XK_Control_L || keysym == XK_Control_R)
1382 mouse_slip_wheel_speed = 0; 1395 mouse_slip_wheel_speed = 0;
1383#endif 1396#endif
1384 break; 1397 break;
1385 } 1398 }
1386 1399
… …
1516 1529
1517 case SelectionRequest: 1530 case SelectionRequest:
1518 selection_send (ev.xselectionrequest); 1531 selection_send (ev.xselectionrequest);
1519 break; 1532 break;
1520 1533
1534 case MapNotify:
1535 mapped = 1;
1536#ifdef TEXT_BLINK
1537 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1538#endif
1539 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1540 break;
1541
1521 case UnmapNotify: 1542 case UnmapNotify:
1522 mapped = 0; 1543 mapped = 0;
1523#ifdef TEXT_BLINK 1544#ifdef TEXT_BLINK
1524 text_blink_ev.stop (); 1545 text_blink_ev.stop ();
1525#endif 1546#endif
1526 break; 1547 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1527
1528 case MapNotify:
1529 mapped = 1;
1530#ifdef TEXT_BLINK
1531 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1532#endif
1533 break; 1548 break;
1534 1549
1535#ifdef TRANSPARENT 1550#ifdef TRANSPARENT
1536 case ReparentNotify: 1551 case ReparentNotify:
1537 rootwin_cb (ev); 1552 rootwin_cb (ev);
… …
1551 1566
1552 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev)) 1567 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev))
1553 scr_expose (ev.xexpose.x, ev.xexpose.y, 1568 scr_expose (ev.xexpose.x, ev.xexpose.y,
1554 ev.xexpose.width, ev.xexpose.height, False); 1569 ev.xexpose.width, ev.xexpose.height, False);
1555 1570
1556 scr_refresh (refresh_type); 1571 want_refresh = 1;
1557 } 1572 }
1558 else 1573 else
1559 { 1574 {
1560 XEvent unused_event; 1575 XEvent unused_event;
1561 1576
… …
1567 if (isScrollbarWindow (ev.xany.window)) 1582 if (isScrollbarWindow (ev.xany.window))
1568 { 1583 {
1569 scrollBar.setIdle (); 1584 scrollBar.setIdle ();
1570 scrollbar_show (0); 1585 scrollbar_show (0);
1571 } 1586 }
1572#ifdef MENUBAR
1573 if (menubar_visible () && isMenuBarWindow (ev.xany.window))
1574 menubar_expose ();
1575#endif
1576 1587
1577#ifdef TRANSPARENT 1588#ifdef TRANSPARENT
1578 if (am_transparent && ev.xany.window == parent[0]) 1589 if (am_transparent && ev.xany.window == parent[0])
1579 XClearWindow (disp, ev.xany.window); 1590 XClearWindow (disp, ev.xany.window);
1580#endif 1591#endif
… …
1584 case MotionNotify: 1595 case MotionNotify:
1585#ifdef POINTER_BLANK 1596#ifdef POINTER_BLANK
1586 if (hidden_pointer) 1597 if (hidden_pointer)
1587 pointer_unblank (); 1598 pointer_unblank ();
1588#endif 1599#endif
1589#if MENUBAR
1590 if (isMenuBarWindow (ev.xany.window))
1591 {
1592 menubar_control (ev.xbutton);
1593 break;
1594 }
1595#endif
1596 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1600 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1597 break; 1601 break;
1598 1602
1599 if (ev.xany.window == vt) 1603 if (ev.xany.window == vt)
1600 { 1604 {
1605 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)
1606 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1607 ; // nop
1601 if (ev.xbutton.state & (Button1Mask | Button3Mask)) 1608 else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1602 { 1609 {
1603 while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev)) 1610 while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev))
1604 ; 1611 ;
1605 1612
1606 XQueryPointer (disp, vt, 1613 XQueryPointer (disp, vt,
… …
1686 &unused_root_x, &unused_root_y, 1693 &unused_root_x, &unused_root_y,
1687 &ev.xbutton.x, &ev.xbutton.y, 1694 &ev.xbutton.x, &ev.xbutton.y,
1688 &unused_mask); 1695 &unused_mask);
1689 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1696 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1690 scrollbar_size ()); 1697 scrollbar_size ());
1691 scr_refresh (refresh_type); 1698 want_refresh = 1;
1692 refresh_limit = 0; 1699 refresh_limit = 0;
1693 scrollbar_show (1); 1700 scrollbar_show (1);
1694 } 1701 }
1695 break; 1702 break;
1696 } 1703 }
1704
1705skip_switch: ;
1706
1707#if defined(CURSOR_BLINK)
1708 if (OPTION (Opt_cursorBlink) && ev.type == KeyPress)
1709 {
1710 if (hidden_cursor)
1711 {
1712 hidden_cursor = 0;
1713 want_refresh = 1;
1714 }
1715
1716 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1717 }
1718#endif
1719
1720#if defined(POINTER_BLANK)
1721 if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0)
1722 {
1723 if (ev.type == MotionNotify
1724 || ev.type == ButtonPress
1725 || ev.type == ButtonRelease)
1726 if (hidden_pointer)
1727 pointer_unblank ();
1728
1729 if (ev.type == KeyPress && hidden_pointer == 0)
1730 pointer_blank ();
1731 }
1732#endif
1697} 1733}
1698 1734
1699void 1735void
1700rxvt_term::focus_in () 1736rxvt_term::focus_in ()
1701{ 1737{
1702 if (!focus) 1738 if (!focus)
1703 { 1739 {
1704 focus = 1; 1740 focus = 1;
1705 want_refresh = 1; 1741 want_refresh = 1;
1706 1742
1707 PERL_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1743 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1708 1744
1709#if USE_XIM 1745#if USE_XIM
1710 if (Input_Context != NULL) 1746 if (Input_Context != NULL)
1711 { 1747 {
1712 IMSetStatusPosition (); 1748 IMSetStatusPosition ();
… …
1733 if (focus) 1769 if (focus)
1734 { 1770 {
1735 focus = 0; 1771 focus = 0;
1736 want_refresh = 1; 1772 want_refresh = 1;
1737 1773
1738 PERL_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1774 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1739 1775
1740#if ENABLE_FRILLS || ISO_14755 1776#if ENABLE_FRILLS || ISO_14755
1741 if (iso14755buf) 1777 if (iso14755buf)
1742 { 1778 {
1743 iso14755buf = 0; 1779 iso14755buf = 0;
… …
1767 1803
1768#if TRANSPARENT 1804#if TRANSPARENT
1769void 1805void
1770rxvt_term::rootwin_cb (XEvent &ev) 1806rxvt_term::rootwin_cb (XEvent &ev)
1771{ 1807{
1772 SET_R (this); 1808 make_current ();
1773 SET_LOCALE (locale);
1774 1809
1775 switch (ev.type) 1810 switch (ev.type)
1776 { 1811 {
1777 case PropertyNotify: 1812 case PropertyNotify:
1778 /* 1813 /*
… …
1826#ifdef MOUSE_REPORT_DOUBLECLICK 1861#ifdef MOUSE_REPORT_DOUBLECLICK
1827 if (ev.button == MEvent.button && clickintime) 1862 if (ev.button == MEvent.button && clickintime)
1828 { 1863 {
1829 /* same button, within alloted time */ 1864 /* same button, within alloted time */
1830 MEvent.clicks++; 1865 MEvent.clicks++;
1866
1831 if (MEvent.clicks > 1) 1867 if (MEvent.clicks > 1)
1832 { 1868 {
1833 /* only report double clicks */ 1869 /* only report double clicks */
1834 MEvent.clicks = 2; 1870 MEvent.clicks = 2;
1835 mouse_report (ev); 1871 mouse_report (ev);
… …
1855 else 1891 else
1856 { 1892 {
1857 if (ev.button != MEvent.button) 1893 if (ev.button != MEvent.button)
1858 MEvent.clicks = 0; 1894 MEvent.clicks = 0;
1859 1895
1860 if (!PERL_INVOKE ((this, HOOK_MOUSE_CLICK, DT_XEVENT, &ev, DT_END))) 1896 if (!HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1861 switch (ev.button) 1897 switch (ev.button)
1862 { 1898 {
1863 case Button1: 1899 case Button1:
1864 /* allow meta + click to select rectangular areas */ 1900 /* allow meta + click to select rectangular areas */
1865 /* should be done in screen.C */ 1901 /* should be done in screen.C */
… …
1868#else 1904#else
1869 selection.rect = false; 1905 selection.rect = false;
1870#endif 1906#endif
1871 1907
1872 /* allow shift+left click to extend selection */ 1908 /* allow shift+left click to extend selection */
1873 if (ev.state & ShiftMask && ! (priv_modes & PrivMode_mouse_report)) 1909 if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report))
1874 { 1910 {
1875 if (MEvent.button == Button1 && clickintime) 1911 if (MEvent.button == Button1 && clickintime)
1876 selection_rotate (ev.x, ev.y); 1912 selection_rotate (ev.x, ev.y);
1877 else 1913 else
1878 selection_extend (ev.x, ev.y, 1); 1914 selection_extend (ev.x, ev.y, 1);
… …
2043 } 2079 }
2044 2080
2045 break; 2081 break;
2046 } 2082 }
2047 } 2083 }
2084
2048 return; 2085 return;
2049 } 2086 }
2050#if MENUBAR
2051 /*
2052 * Menubar window processing of button press
2053 */
2054 if (isMenuBarWindow (ev.window))
2055 menubar_control (ev);
2056#endif
2057} 2087}
2058 2088
2059void 2089void
2060rxvt_term::button_release (XButtonEvent &ev) 2090rxvt_term::button_release (XButtonEvent &ev)
2061{ 2091{
… …
2067 2097
2068 if (scrollbar_isUpDn ()) 2098 if (scrollbar_isUpDn ())
2069 { 2099 {
2070 scrollBar.setIdle (); 2100 scrollBar.setIdle ();
2071 scrollbar_show (0); 2101 scrollbar_show (0);
2072#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
2073 refresh_type &= ~SMOOTH_REFRESH;
2074#endif
2075 } 2102 }
2076 2103
2077#ifdef SELECTION_SCROLLING 2104#ifdef SELECTION_SCROLLING
2078 if (sel_scroll_ev.active) 2105 if (sel_scroll_ev.active)
2079 sel_scroll_ev.stop(); 2106 sel_scroll_ev.stop();
… …
2117 if (priv_modes & PrivMode_mouse_report 2144 if (priv_modes & PrivMode_mouse_report
2118 && bypass_keystate 2145 && bypass_keystate
2119 && ev.button == Button1 && MEvent.clicks <= 1) 2146 && ev.button == Button1 && MEvent.clicks <= 1)
2120 selection_extend (ev.x, ev.y, 0); 2147 selection_extend (ev.x, ev.y, 0);
2121 2148
2149 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2150 return;
2151
2122 switch (ev.button) 2152 switch (ev.button)
2123 { 2153 {
2124 case Button1: 2154 case Button1:
2125 case Button3: 2155 case Button3:
2126 selection_make (ev.time); 2156 selection_make (ev.time);
… …
2157 slip_wheel_ev.start (); 2187 slip_wheel_ev.start ();
2158 } 2188 }
2159 else 2189 else
2160 { 2190 {
2161# endif 2191# endif
2162# ifdef JUMP_MOUSE_WHEEL
2163 scr_page (v, i); 2192 scr_page (v, i);
2164 scr_refresh (SMOOTH_REFRESH);
2165 scrollbar_show (1); 2193 scrollbar_show (1);
2166# else
2167 while (i--)
2168 {
2169 scr_page (v, 1);
2170 scr_refresh (SMOOTH_REFRESH);
2171 scrollbar_show (1);
2172 }
2173# endif
2174# ifdef MOUSE_SLIP_WHEELING 2194# ifdef MOUSE_SLIP_WHEELING
2175 } 2195 }
2176#endif 2196# endif
2177 } 2197 }
2178 break; 2198 break;
2179#endif 2199#endif
2180 } 2200 }
2181 } 2201 }
2182#ifdef MENUBAR
2183 else if (isMenuBarWindow (ev.window))
2184 menubar_control (ev);
2185#endif
2186} 2202}
2187 2203
2188#ifdef TRANSPARENT 2204#ifdef TRANSPARENT
2189#if TINTING 2205#if TINTING
2190/* taken from aterm-0.4.2 */ 2206/* taken from aterm-0.4.2 */
… …
2670 2686
2671bool 2687bool
2672rxvt_term::cmd_parse () 2688rxvt_term::cmd_parse ()
2673{ 2689{
2674 bool flag = false; 2690 bool flag = false;
2675 unicode_t ch = NOCHAR; 2691 wchar_t ch = NOCHAR;
2676 unsigned char *seq_begin; // remember start of esc-sequence here 2692 char *seq_begin; // remember start of esc-sequence here
2677 2693
2678 for (;;) 2694 for (;;)
2679 { 2695 {
2680 if (ch == NOCHAR) 2696 if (ch == NOCHAR)
2681 { 2697 {
2682 seq_begin = cmdbuf_ptr; 2698 seq_begin = cmdbuf_ptr;
2683 ch = next_char (); 2699 ch = next_char ();
2684 }
2685 2700
2686 if (ch == NOCHAR) // TODO: improve 2701 if (ch == NOCHAR)
2687 break; 2702 break;
2703 }
2688 2704
2689 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT) 2705 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT)
2690 { 2706 {
2691 if (!seen_input) 2707 if (!seen_input)
2692 { 2708 {
… …
2701 if (seen_resize && cmd_pid) 2717 if (seen_resize && cmd_pid)
2702 kill (-cmd_pid, SIGWINCH); 2718 kill (-cmd_pid, SIGWINCH);
2703 } 2719 }
2704 2720
2705 /* Read a text string from the input buffer */ 2721 /* Read a text string from the input buffer */
2706 unicode_t buf[UBUFSIZ]; 2722 wchar_t buf[UBUFSIZ];
2707 bool refreshnow = false; 2723 bool refreshnow = false;
2708 int nlines = 0; 2724 int nlines = 0;
2709 unicode_t *str = buf; 2725 wchar_t *str = buf;
2710 unicode_t *eol = str + min (ncol, UBUFSIZ); 2726 wchar_t *eol = str + min (ncol, UBUFSIZ);
2711 2727
2712 for (;;) 2728 for (;;)
2713 { 2729 {
2714 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)) 2730 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))
2715 break; 2731 break;
… …
2733 } 2749 }
2734 2750
2735 // scr_add_lines only works for nlines <= nrow - 1. 2751 // scr_add_lines only works for nlines <= nrow - 1.
2736 if (nlines >= nrow - 1) 2752 if (nlines >= nrow - 1)
2737 { 2753 {
2754 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2755 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2738 scr_add_lines (buf, nlines, str - buf); 2756 scr_add_lines (buf, str - buf, nlines);
2757
2739 nlines = 0; 2758 nlines = 0;
2740 str = buf; 2759 str = buf;
2741 eol = str + min (ncol, UBUFSIZ); 2760 eol = str + min (ncol, UBUFSIZ);
2742 } 2761 }
2743 2762
… …
2756 2775
2757 seq_begin = cmdbuf_ptr; 2776 seq_begin = cmdbuf_ptr;
2758 ch = next_char (); 2777 ch = next_char ();
2759 } 2778 }
2760 2779
2780 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2781 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2761 scr_add_lines (buf, nlines, str - buf); 2782 scr_add_lines (buf, str - buf, nlines);
2762 2783
2763 /* 2784 /*
2764 * If there have been a lot of new lines, then update the screen 2785 * If there have been a lot of new lines, then update the screen
2765 * What the heck I'll cheat and only refresh less than every page-full. 2786 * What the heck I'll cheat and only refresh less than every page-full.
2766 * the number of pages between refreshes is refresh_limit, which 2787 * the number of pages between refreshes is refresh_limit, which
… …
2771 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD) 2792 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2772 refresh_limit++; 2793 refresh_limit++;
2773 else 2794 else
2774 { 2795 {
2775 flag = true; 2796 flag = true;
2776 scr_refresh (refresh_type); 2797 scr_refresh ();
2777 flush_ev.stop (); 2798 want_refresh = 1;
2778 } 2799 }
2779 } 2800 }
2780 2801
2781 } 2802 }
2782 else 2803 else
… …
2797 } 2818 }
2798 2819
2799 return flag; 2820 return flag;
2800} 2821}
2801 2822
2802// read the next octet
2803unicode_t
2804rxvt_term::next_octet ()
2805{
2806 return cmdbuf_ptr < cmdbuf_endp
2807 ? *cmdbuf_ptr++
2808 : NOCHAR;
2809}
2810
2811// read the next character 2823// read the next character
2812unicode_t 2824wchar_t
2813rxvt_term::next_char () 2825rxvt_term::next_char ()
2814{ 2826{
2815 while (cmdbuf_ptr < cmdbuf_endp) 2827 while (cmdbuf_ptr < cmdbuf_endp)
2816 { 2828 {
2817 // assume 7-bit to be ascii ALWAYS 2829 // assume 7-bit to be ascii ALWAYS
2818 if (*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2830 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)
2819 return *cmdbuf_ptr++; 2831 return *cmdbuf_ptr++;
2820 2832
2821 wchar_t wc; 2833 wchar_t wc;
2822 size_t len = mbrtowc (&wc, (char *)cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate); 2834 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2823 2835
2824 if (len == (size_t)-2) 2836 if (len == (size_t)-2)
2825 { 2837 {
2826 // the mbstate stores incomplete sequences. didn't know this :/ 2838 // the mbstate stores incomplete sequences. didn't know this :/
2827 cmdbuf_ptr = cmdbuf_endp; 2839 cmdbuf_ptr = cmdbuf_endp;
2828 break; 2840 break;
2829 } 2841 }
2830 2842
2831 if (len == (size_t)-1) 2843 if (len == (size_t)-1)
2832 return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 2844 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2833 2845
2834 // assume wchar == unicode 2846 // assume wchar == unicode
2835 cmdbuf_ptr += len; 2847 cmdbuf_ptr += len;
2836 return wc & UNICODE_MASK; 2848 return wc & UNICODE_MASK;
2837 } 2849 }
2838 2850
2839 return NOCHAR; 2851 return NOCHAR;
2852}
2853
2854// read the next octet
2855uint32_t
2856rxvt_term::next_octet ()
2857{
2858 return cmdbuf_ptr < cmdbuf_endp
2859 ? (unsigned char)*cmdbuf_ptr++
2860 : NOCHAR;
2840} 2861}
2841 2862
2842/* rxvt_cmd_getc () - Return next input character */ 2863/* rxvt_cmd_getc () - Return next input character */
2843/* 2864/*
2844 * Return the next input character after first passing any keyboard input 2865 * Return the next input character after first passing any keyboard input
2845 * to the command. 2866 * to the command.
2846 */ 2867 */
2847unicode_t 2868wchar_t
2848rxvt_term::cmd_getc () 2869rxvt_term::cmd_getc ()
2849{ 2870{
2850 unicode_t c = next_char (); 2871 wchar_t c = next_char ();
2851 2872
2852 if (c == NOCHAR) 2873 if (c == NOCHAR)
2853 throw out_of_input; 2874 throw out_of_input;
2854 2875
2855 return c; 2876 return c;
2856} 2877}
2857 2878
2858unicode_t 2879uint32_t
2859rxvt_term::cmd_get8 () 2880rxvt_term::cmd_get8 ()
2860{ 2881{
2861 unicode_t c = next_octet (); 2882 uint32_t c = next_octet ();
2862 2883
2863 if (c == NOCHAR) 2884 if (c == NOCHAR)
2864 throw out_of_input; 2885 throw out_of_input;
2865 2886
2866 return c; 2887 return c;
… …
2966 case C0_ESC: 2987 case C0_ESC:
2967 process_escape_seq (); 2988 process_escape_seq ();
2968 break; 2989 break;
2969 case C0_ENQ: /* terminal Status */ 2990 case C0_ENQ: /* terminal Status */
2970 if (rs[Rs_answerbackstring]) 2991 if (rs[Rs_answerbackstring])
2971 tt_write ((const unsigned char *)rs[Rs_answerbackstring], 2992 tt_write (rs [Rs_answerbackstring], strlen (rs [Rs_answerbackstring]));
2972 (unsigned int)strlen (rs[Rs_answerbackstring]));
2973 else 2993 else
2974 tt_write ((unsigned char *)VT100_ANS, 2994 tt_write (VT100_ANS, strlen (VT100_ANS));
2975 (unsigned int)strlen (VT100_ANS));
2976 break; 2995 break;
2977 case C0_BEL: /* bell */ 2996 case C0_BEL: /* bell */
2978 scr_bell (); 2997 scr_bell ();
2979 break; 2998 break;
2980 case C0_BS: /* backspace */ 2999 case C0_BS: /* backspace */
… …
3135 break; 3154 break;
3136 3155
3137 /* 8.3.87: NEXT LINE */ 3156 /* 8.3.87: NEXT LINE */
3138 case C1_NEL: /* ESC E */ 3157 case C1_NEL: /* ESC E */
3139 { 3158 {
3140 unicode_t nlcr[] = { C0_LF, C0_CR }; 3159 wchar_t nlcr[] = { C0_LF, C0_CR };
3141 scr_add_lines (nlcr, 1, 2); 3160 scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1);
3142 } 3161 }
3143 break; 3162 break;
3144 3163
3145 /* kidnapped escape sequence: Should be 8.3.48 */ 3164 /* kidnapped escape sequence: Should be 8.3.48 */
3146 case C1_ESA: /* ESC G */ 3165 case C1_ESA: /* ESC G */
… …
3168 process_dcs_seq (); 3187 process_dcs_seq ();
3169 break; 3188 break;
3170 3189
3171 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 3190 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
3172 case C1_SCI: /* ESC Z */ 3191 case C1_SCI: /* ESC Z */
3173 tt_write ((const unsigned char *)ESCZ_ANSWER, 3192 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
3174 (unsigned int) (sizeof (ESCZ_ANSWER) - 1));
3175 break; /* steal obsolete ESC [ c */ 3193 break; /* steal obsolete ESC [ c */
3176 3194
3177 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 3195 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */
3178 case C1_CSI: /* ESC [ */ 3196 case C1_CSI: /* ESC [ */
3179 process_csi_seq (); 3197 process_csi_seq ();
… …
3423 case CSI_SU: /* 8.3.148: (1) SCROLL UP */ 3441 case CSI_SU: /* 8.3.148: (1) SCROLL UP */
3424 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0]); 3442 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0]);
3425 break; 3443 break;
3426 3444
3427 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ 3445 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
3428 tt_write ((const unsigned char *)VT100_ANS, 3446 tt_write (VT100_ANS, sizeof (VT100_ANS) - 1);
3429 (unsigned int) (sizeof (VT100_ANS) - 1));
3430 break; 3447 break;
3431 3448
3432 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */ 3449 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */
3433 process_sgr_mode (nargs, arg); 3450 process_sgr_mode (nargs, arg);
3434 break; 3451 break;
… …
3636/*----------------------------------------------------------------------*/ 3653/*----------------------------------------------------------------------*/
3637/* 3654/*
3638 * get input up until STRING TERMINATOR (or BEL) 3655 * get input up until STRING TERMINATOR (or BEL)
3639 * ends_how is terminator used. returned input must be free()'d 3656 * ends_how is terminator used. returned input must be free()'d
3640 */ 3657 */
3641unsigned char * 3658char *
3642rxvt_term::get_to_st (unicode_t &ends_how) 3659rxvt_term::get_to_st (unicode_t &ends_how)
3643{ 3660{
3644 unicode_t ch; 3661 unicode_t ch;
3645 bool seen_esc = false; 3662 bool seen_esc = false;
3646 unsigned int n = 0; 3663 unsigned int n = 0;
… …
3679 3696
3680 string[n++] = '\0'; 3697 string[n++] = '\0';
3681 3698
3682 ends_how = (ch == 0x5c ? C0_ESC : ch); 3699 ends_how = (ch == 0x5c ? C0_ESC : ch);
3683 3700
3684 return (unsigned char *)rxvt_wcstombs (string); 3701 return rxvt_wcstombs (string);
3685} 3702}
3686 3703
3687/*----------------------------------------------------------------------*/ 3704/*----------------------------------------------------------------------*/
3688/* 3705/*
3689 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 3706 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
3690 */ 3707 */
3691void 3708void
3692rxvt_term::process_dcs_seq () 3709rxvt_term::process_dcs_seq ()
3693{ 3710{
3694 unsigned char *s; 3711 char *s;
3695 unicode_t eh; 3712 unicode_t eh;
3696 3713
3697 /* 3714 /*
3698 * Not handled yet 3715 * Not handled yet
3699 */ 3716 */
… …
3718 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3735 for (arg = 0; isdigit (ch); ch = cmd_getc ())
3719 arg = arg * 10 + (ch - '0'); 3736 arg = arg * 10 + (ch - '0');
3720 3737
3721 if (ch == ';') 3738 if (ch == ';')
3722 { 3739 {
3723 unsigned char *s = get_to_st (eh); 3740 char *s = get_to_st (eh);
3724 3741
3725 if (s) 3742 if (s)
3726 { 3743 {
3727 process_xterm_seq (arg, (char *)s, eh); 3744 process_xterm_seq (arg, s, eh);
3728 free (s); 3745 free (s);
3729 } 3746 }
3730 } 3747 }
3731} 3748}
3732 3749
3733void 3750void
3734rxvt_term::process_color_seq (int report, int color, const char *str, unsigned char resp) 3751rxvt_term::process_color_seq (int report, int color, const char *str, char resp)
3735{ 3752{
3736 if (str[0] == '?' && !str[1]) 3753 if (str[0] == '?' && !str[1])
3737 { 3754 {
3738 unsigned short r, g, b; 3755 unsigned short r, g, b;
3739 pix_colors_focused[color].get (display, r, g, b); 3756 pix_colors_focused[color].get (display, r, g, b);
… …
3745 3762
3746/* 3763/*
3747 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3764 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3748 */ 3765 */
3749void 3766void
3750rxvt_term::process_xterm_seq (int op, const char *str, unsigned char resp) 3767rxvt_term::process_xterm_seq (int op, const char *str, char resp)
3751{ 3768{
3752 int changed = 0; 3769 int changed = 0;
3753 int color; 3770 int color;
3754 char *buf, *name; 3771 char *buf, *name;
3755 bool query = str[0] == '?' && !str[1]; 3772 bool query = str[0] == '?' && !str[1];
… …
3812 { 3829 {
3813 if ((name = strchr (buf, ';')) == NULL) 3830 if ((name = strchr (buf, ';')) == NULL)
3814 break; 3831 break;
3815 3832
3816 *name++ = '\0'; 3833 *name++ = '\0';
3817 color = atoi (buf); 3834 color = atoi (buf) + minCOLOR;
3818 3835
3819 if (color < 0 || color >= TOTAL_COLORS) 3836 if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR))
3820 break; 3837 break;
3821 3838
3822 if ((buf = strchr (name, ';')) != NULL) 3839 if ((buf = strchr (name, ';')) != NULL)
3823 *buf++ = '\0'; 3840 *buf++ = '\0';
3824 3841
3825 if (name[0] == '?' && !name[1]) 3842 if (name[0] == '?' && !name[1])
3826 { 3843 {
3827 unsigned short r, g, b; 3844 unsigned short r, g, b;
3828 pix_colors_focused[color + minCOLOR].get (display, r, g, b); 3845 pix_colors_focused[color].get (display, r, g, b);
3829 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp); 3846 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp);
3830 } 3847 }
3831 else 3848 else
3832 set_window_color (color + minCOLOR, name); 3849 set_window_color (color, name);
3833 } 3850 }
3834 break; 3851 break;
3835 case XTerm_Color00: 3852 case XTerm_Color00:
3836 process_color_seq (XTerm_Color00, Color_fg, str, resp); 3853 process_color_seq (XTerm_Color00, Color_fg, str, resp);
3837 break; 3854 break;
3838 case XTerm_Color01: 3855 case XTerm_Color01:
3839 process_color_seq (XTerm_Color00, Color_bg, str, resp); 3856 process_color_seq (XTerm_Color01, Color_bg, str, resp);
3840 break; 3857 break;
3841#ifndef NO_CURSORCOLOR 3858#ifndef NO_CURSORCOLOR
3842 case XTerm_Color_cursor: 3859 case XTerm_Color_cursor:
3843 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp); 3860 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp);
3844 break; 3861 break;
… …
3848 break; 3865 break;
3849 case XTerm_Color_pointer_bg: 3866 case XTerm_Color_pointer_bg:
3850 process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp); 3867 process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp);
3851 break; 3868 break;
3852#ifndef NO_BOLD_UNDERLINE_REVERSE 3869#ifndef NO_BOLD_UNDERLINE_REVERSE
3853 case XTerm_Color_BD:
3854 process_color_seq (XTerm_Color_BD, Color_BD, str, resp);
3855 break;
3856 case XTerm_Color_UL:
3857 process_color_seq (XTerm_Color_UL, Color_UL, str, resp);
3858 break;
3859 case XTerm_Color_RV: 3870 case XTerm_Color_RV:
3860 process_color_seq (XTerm_Color_RV, Color_RV, str, resp); 3871 process_color_seq (XTerm_Color_RV, Color_RV, str, resp);
3872 break;
3873 case Rxvt_Color_BD:
3874 case URxvt_Color_BD:
3875 process_color_seq (op, Color_BD, str, resp);
3876 break;
3877 case Rxvt_Color_UL:
3878 case URxvt_Color_UL:
3879 process_color_seq (op, Color_UL, str, resp);
3861 break; 3880 break;
3862 case URxvt_Color_IT: 3881 case URxvt_Color_IT:
3863 process_color_seq (URxvt_Color_IT, Color_IT, str, resp); 3882 process_color_seq (URxvt_Color_IT, Color_IT, str, resp);
3864 break; 3883 break;
3865#endif 3884#endif
… …
3870 if (am_transparent) 3889 if (am_transparent)
3871 want_full_refresh = want_refresh = 1; 3890 want_full_refresh = want_refresh = 1;
3872 break; 3891 break;
3873#endif 3892#endif
3874 3893
3875 case XTerm_Pixmap: 3894 case Rxvt_Pixmap:
3876 if (*str != ';') 3895 if (*str != ';')
3877 { 3896 {
3878#if XPM_BACKGROUND 3897#if XPM_BACKGROUND
3879 scale_pixmap (""); /* reset to default scaling */ 3898 scale_pixmap (""); /* reset to default scaling */
3880 set_bgPixmap (str); /* change pixmap */ 3899 set_bgPixmap (str); /* change pixmap */
3881#endif
3882 scr_touch (true); 3900 scr_touch (true);
3901#endif
3883 } 3902 }
3903
3884 while ((str = strchr (str, ';')) != NULL) 3904 while ((str = strchr (str, ';')) != NULL)
3885 { 3905 {
3886 str++; 3906 str++;
3887#if XPM_BACKGROUND 3907#if XPM_BACKGROUND
3888 changed += scale_pixmap (str); 3908 changed += scale_pixmap (str);
… …
3891 3911
3892 if (changed) 3912 if (changed)
3893 { 3913 {
3894#ifdef XPM_BACKGROUND 3914#ifdef XPM_BACKGROUND
3895 resize_pixmap (); 3915 resize_pixmap ();
3896#endif
3897 scr_touch (true); 3916 scr_touch (true);
3917#endif
3898 } 3918 }
3899 break; 3919 break;
3900 3920
3901 case XTerm_restoreFG: 3921 case Rxvt_restoreFG:
3902 set_window_color (Color_fg, str); 3922 set_window_color (Color_fg, str);
3903 break; 3923 break;
3904 case XTerm_restoreBG: 3924 case Rxvt_restoreBG:
3905 set_window_color (Color_bg, str); 3925 set_window_color (Color_bg, str);
3906 break; 3926 break;
3907 3927
3908 case XTerm_logfile: 3928 case XTerm_logfile:
3909 // TODO, when secure mode? 3929 // TODO, when secure mode?
3910 break; 3930 break;
3911 3931
3912#ifdef MENUBAR
3913 case URxvt_Menu:
3914 if (OPTION (Opt_insecure))
3915 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked
3916 break;
3917#endif
3918#if 0 3932#if 0
3919 case XTerm_dumpscreen: /* no error notices */ 3933 case Rxvt_dumpscreen: /* no error notices */
3920 { 3934 {
3921 int fd; 3935 int fd;
3922 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0) 3936 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0)
3923 { 3937 {
3924 scr_dump (fd); 3938 scr_dump (fd);
… …
3976 break; 3990 break;
3977#endif 3991#endif
3978 3992
3979#if ENABLE_PERL 3993#if ENABLE_PERL
3980 case URxvt_perl: 3994 case URxvt_perl:
3981 if (PERL_INVOKE ((this, HOOK_OSC_SEQ, DT_STRING, str, DT_END))) 3995 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_STR, str, DT_END)))
3982 ; // no responses yet 3996 ; // no responses yet
3983 break; 3997 break;
3984#endif 3998#endif
3985 } 3999 }
3986} 4000}
… …
4039 { 5, PrivMode_rVideo }, 4053 { 5, PrivMode_rVideo },
4040 { 6, PrivMode_relOrigin }, 4054 { 6, PrivMode_relOrigin },
4041 { 7, PrivMode_Autowrap }, 4055 { 7, PrivMode_Autowrap },
4042 // 8, bi-directional support mode 4056 // 8, bi-directional support mode
4043 { 9, PrivMode_MouseX10 }, 4057 { 9, PrivMode_MouseX10 },
4044#ifdef menuBar_esc
4045 { menuBar_esc, PrivMode_menuBar },
4046#endif
4047 // 18, 19 printing-related 4058 // 18, 19 printing-related
4048 { 25, PrivMode_VisibleCursor }, 4059 { 25, PrivMode_VisibleCursor },
4049#ifdef scrollBar_esc 4060#ifdef scrollBar_esc
4050 { scrollBar_esc, PrivMode_scrollBar }, 4061 { scrollBar_esc, PrivMode_scrollBar },
4051#endif 4062#endif
… …
4098 /* extra handling for values with state unkept */ 4109 /* extra handling for values with state unkept */
4099 switch (arg[i]) 4110 switch (arg[i])
4100 { 4111 {
4101#if ENABLE_STYLES 4112#if ENABLE_STYLES
4102 case 1021: 4113 case 1021:
4103 if (mode) 4114 set_option (Opt_intensityStyles, mode);
4104 SET_OPTION (Opt_intensityStyles);
4105 else
4106 CLR_OPTION (Opt_intensityStyles);
4107 4115
4108 scr_touch (true); 4116 scr_touch (true);
4109 break; 4117 break;
4110#endif 4118#endif
4111 case 1048: /* alternative cursor save */ 4119 case 1048: /* alternative cursor save */
… …
4133 case 3: /* 80/132 */ 4141 case 3: /* 80/132 */
4134 if (priv_modes & PrivMode_132OK) 4142 if (priv_modes & PrivMode_132OK)
4135 set_widthheight (((state ? 132 : 80) * fwidth), height); 4143 set_widthheight (((state ? 132 : 80) * fwidth), height);
4136 break; 4144 break;
4137 case 4: /* smooth scrolling */ 4145 case 4: /* smooth scrolling */
4138 if (!state) 4146 set_option (Opt_jumpScroll, !state);
4139 SET_OPTION (Opt_jumpScroll);
4140 else
4141 CLR_OPTION (Opt_jumpScroll);
4142 break; 4147 break;
4143 case 5: /* reverse video */ 4148 case 5: /* reverse video */
4144 scr_rvideo_mode (state); 4149 scr_rvideo_mode (state);
4145 break; 4150 break;
4146 case 6: /* relative/absolute origins */ 4151 case 6: /* relative/absolute origins */
… …
4152 /* case 8: - auto repeat, can't do on a per window basis */ 4157 /* case 8: - auto repeat, can't do on a per window basis */
4153 case 9: /* X10 mouse reporting */ 4158 case 9: /* X10 mouse reporting */
4154 if (state) /* orthogonal */ 4159 if (state) /* orthogonal */
4155 priv_modes &= ~PrivMode_MouseX11; 4160 priv_modes &= ~PrivMode_MouseX11;
4156 break; 4161 break;
4157#ifdef menuBar_esc
4158 case menuBar_esc:
4159#ifdef MENUBAR
4160 map_menuBar (state);
4161#endif
4162 break;
4163#endif
4164#ifdef scrollBar_esc 4162#ifdef scrollBar_esc
4165 case scrollBar_esc: 4163 case scrollBar_esc:
4166 if (scrollbar_mapping (state)) 4164 if (scrollbar_mapping (state))
4167 { 4165 {
4168 resize_all_windows (0, 0, 0); 4166 resize_all_windows (0, 0, 0);
… …
4187#if 0 4185#if 0
4188 case 1001: 4186 case 1001:
4189 break; /* X11 mouse highlighting */ 4187 break; /* X11 mouse highlighting */
4190#endif 4188#endif
4191 case 1010: /* scroll to bottom on TTY output inhibit */ 4189 case 1010: /* scroll to bottom on TTY output inhibit */
4192 if (!state) 4190 set_option (Opt_scrollTtyOutput, !state);
4193 SET_OPTION (Opt_scrollTtyOutput);
4194 else
4195 CLR_OPTION (Opt_scrollTtyOutput);
4196 break; 4191 break;
4197 case 1011: /* scroll to bottom on key press */ 4192 case 1011: /* scroll to bottom on key press */
4198 if (state) 4193 set_option (Opt_scrollTtyKeypress, state);
4199 SET_OPTION (Opt_scrollTtyKeypress);
4200 else
4201 CLR_OPTION (Opt_scrollTtyKeypress);
4202 break; 4194 break;
4203 case 1047: /* secondary screen w/ clearing last */ 4195 case 1047: /* secondary screen w/ clearing last */
4204 if (OPTION (Opt_secondaryScreen)) 4196 if (OPTION (Opt_secondaryScreen))
4205 if (current_screen != PRIMARY) 4197 if (current_screen != PRIMARY)
4206 scr_erase_screen (2); 4198 scr_erase_screen (2);
… …
4344 scr_color (Color_bg, Color_bg); 4336 scr_color (Color_bg, Color_bg);
4345 break; 4337 break;
4346 4338
4347 //case 50: // not variable spacing 4339 //case 50: // not variable spacing
4348 4340
4349#ifndef NO_BRIGHTCOLOR 4341#if ENABLE_FRILLS
4350 case 90: 4342 case 90:
4351 case 91: /* set bright fg color */ 4343 case 91: /* set bright fg color */
4352 case 92: 4344 case 92:
4353 case 93: 4345 case 93:
4354 case 94: 4346 case 94:
… …
4399 */ 4391 */
4400void 4392void
4401rxvt_term::tt_printf (const char *fmt,...) 4393rxvt_term::tt_printf (const char *fmt,...)
4402{ 4394{
4403 va_list arg_ptr; 4395 va_list arg_ptr;
4404 unsigned char buf[256]; 4396 char buf[256];
4405 4397
4406 va_start (arg_ptr, fmt); 4398 va_start (arg_ptr, fmt);
4407 vsnprintf ((char *)buf, 256, fmt, arg_ptr); 4399 vsnprintf ((char *)buf, 256, fmt, arg_ptr);
4408 va_end (arg_ptr); 4400 va_end (arg_ptr);
4409 tt_write (buf, strlen (buf)); 4401 tt_write (buf, strlen (buf));
… …
4414 * or generated by us in response to a query ESC sequence. 4406 * or generated by us in response to a query ESC sequence.
4415 */ 4407 */
4416const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT 4408const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4417 4409
4418void 4410void
4419rxvt_term::tt_write (const unsigned char *data, unsigned int len) 4411rxvt_term::tt_write (const char *data, unsigned int len)
4420{ 4412{
4413 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
4414 return;
4415
4416 if (pty.pty < 0)
4417 return;
4418
4421 if (v_buflen == 0) 4419 if (v_buflen == 0)
4422 { 4420 {
4423 ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE)); 4421 ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE));
4424 4422
4425 if ((unsigned int)written == len) 4423 if ((unsigned int)written == len)
… …
4427 4425
4428 data += written; 4426 data += written;
4429 len -= written; 4427 len -= written;
4430 } 4428 }
4431 4429
4432 v_buffer = (unsigned char *)realloc (v_buffer, v_buflen + len); 4430 v_buffer = (char *)realloc (v_buffer, v_buflen + len);
4433 4431
4434 memcpy (v_buffer + v_buflen, data, len); 4432 memcpy (v_buffer + v_buflen, data, len);
4435 v_buflen += len; 4433 v_buflen += len;
4436 4434
4437 pty_ev.set (EVENT_READ | EVENT_WRITE); 4435 pty_ev.set (EVENT_READ | EVENT_WRITE);

Diff Legend

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