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.236 by root, Thu Jan 5 01:04:10 2006 UTC vs.
Revision 1.275 by root, Fri Jan 20 10:35:25 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.
… …
64 64
65/*----------------------------------------------------------------------*/ 65/*----------------------------------------------------------------------*/
66 66
67#define IS_CONTROL(ch) !((ch) & 0xffffff60UL) 67#define IS_CONTROL(ch) !((ch) & 0xffffff60UL)
68 68
69// exception thrown when the command parser runs out of input data
70class out_of_input { } out_of_input;
71
72#if ENABLE_FRILLS || ISO_14755 69#if ENABLE_FRILLS || ISO_14755
73 70
74#define ISO_14755_STARTED 0x80000000UL 71#define ISO_14755_STARTED 0x80000000UL
75#define ISO_14755_51 0x40000000UL // basic (section 5.1) 72#define ISO_14755_51 0x40000000UL // basic (section 5.1)
76#define ISO_14755_52 0x20000000UL // keycap (section 5.2) 73#define ISO_14755_52 0x20000000UL // keycap (section 5.2)
… …
147 || !IN_RANGE_EXC (y, 0, nrow)) 144 || !IN_RANGE_EXC (y, 0, nrow))
148 return; 145 return;
149 146
150 for (;;) 147 for (;;)
151 { 148 {
152 const line_t &l = ROW(y - view_start); 149 const line_t &l = ROW(y + view_start);
153 150
154 text_t t = l.t[x]; 151 text_t t = l.t[x];
155 152
156 if (t != NOCHAR || !x) 153 if (t != NOCHAR || !x)
157 { 154 {
… …
443 scr_move_to (0, 1); 440 scr_move_to (0, 1);
444 return; 441 return;
445 } 442 }
446 else if (keysym == XK_End) 443 else if (keysym == XK_End)
447 { 444 {
448 scr_move_to (1, 0); 445 scr_move_to (1, 1);
449 return; 446 return;
450 } 447 }
451 } 448 }
452#endif 449#endif
453 } 450 }
… …
464 { 461 {
465 switch (keysym) 462 switch (keysym)
466 { 463 {
467 /* normal XTerm key bindings */ 464 /* normal XTerm key bindings */
468 case XK_Insert: /* Shift+Insert = paste mouse selection */ 465 case XK_Insert: /* Shift+Insert = paste mouse selection */
469 selection_request (ev.time, 0, 0); 466 selection_request (ev.time);
470 return; 467 return;
471#if TODO 468#if TODO
472 /* rxvt extras */ 469 /* rxvt extras */
473 case XK_KP_Add: /* Shift+KP_Add = bigger font */ 470 case XK_KP_Add: /* Shift+KP_Add = bigger font */
474 change_font (FONT_UP); 471 change_font (FONT_UP);
… …
867#endif 864#endif
868 /* nil */ ; 865 /* nil */ ;
869 } 866 }
870 } 867 }
871 868
869 if (HOOK_INVOKE ((this, HOOK_KEY_PRESS, DT_XEVENT, &ev, DT_INT, keysym, DT_STR_LEN, kbuf, len, DT_END)))
870 return;
871
872 if (len <= 0) 872 if (len <= 0)
873 return; /* not mapped */ 873 return; /* not mapped */
874 874
875 if (OPTION (Opt_scrollTtyKeypress)) 875 if (OPTION (Opt_scrollTtyKeypress))
876 if (view_start) 876 if (view_start)
… …
916#endif /* DEBUG_CMD */ 916#endif /* DEBUG_CMD */
917 tt_write (kbuf, (unsigned int)len); 917 tt_write (kbuf, (unsigned int)len);
918} 918}
919/*}}} */ 919/*}}} */
920 920
921#if MENUBAR_MAX || defined (KEYSYM_RESOURCE) 921#if defined (KEYSYM_RESOURCE)
922/*{{{ rxvt_cmd_write (), rxvt_cmd_getc () */
923/* attempt to `write' count to the input buffer */
924unsigned int 922unsigned int
925rxvt_term::cmd_write (const char *str, unsigned int count) 923rxvt_term::cmd_write (const char *str, unsigned int count)
926{ 924{
927 unsigned int n, s; 925 unsigned int n, s;
928 926
… …
967 } 965 }
968#endif 966#endif
969 967
970 if (want_refresh) 968 if (want_refresh)
971 { 969 {
970 if (SHOULD_INVOKE (HOOK_LINE_UPDATE))
971 {
972 int row = view_start;
973 int end_row = row + nrow;
974
975 while (row > top_row && ROW (row - 1).is_longer ())
976 --row;
977
978 do
979 {
980 int start_row = row;
981 line_t *l;
982
983 do
984 {
985 l = &ROW (row++);
986
987 if (!(l->f & LINE_FILTERED))
988 {
989 // line not filtered, mark it as filtered
990 l->f |= LINE_FILTERED;
991 while (l->is_longer ())
992 {
993 l = &ROW (row++);
994 l->f |= LINE_FILTERED;
995 }
996
997 // and filter it
998 HOOK_INVOKE ((this, HOOK_LINE_UPDATE, DT_INT, start_row, DT_END));
999
1000 break;
1001 }
1002 }
1003 while (l->is_longer () && row < end_row);
1004 }
1005 while (row < end_row);
1006 }
1007
972 scr_refresh (refresh_type); 1008 scr_refresh ();
973 scrollbar_show (1); 1009 scrollbar_show (1);
974#ifdef USE_XIM 1010#ifdef USE_XIM
975 IMSendSpot (); 1011 IMSendSpot ();
976#endif 1012#endif
977 } 1013 }
… …
980} 1016}
981 1017
982void 1018void
983rxvt_term::check_cb (check_watcher &w) 1019rxvt_term::check_cb (check_watcher &w)
984{ 1020{
985 SET_R (this); 1021 make_current ();
986 SET_LOCALE (locale);
987 1022
988 display->flush (); 1023 display->flush ();
989 1024
990 if (want_refresh && !flush_ev.active) 1025 if (want_refresh && !flush_ev.active)
991 flush_ev.start (NOW + 1. / 60.); // refresh at max. 60 hz normally 1026 flush_ev.start (NOW + 1. / 60.); // refresh at max. 60 hz normally
992} 1027}
993 1028
994void 1029void
995rxvt_term::flush_cb (time_watcher &w) 1030rxvt_term::flush_cb (time_watcher &w)
996{ 1031{
997 SET_R (this); 1032 make_current ();
998 SET_LOCALE (locale);
999 1033
1000 refresh_limit = 1; 1034 refresh_limit = 1;
1001 refresh_count = 0; 1035 refresh_count = 0;
1002 flush (); 1036 flush ();
1003} 1037}
… …
1007rxvt_term::cursor_blink_cb (time_watcher &w) 1041rxvt_term::cursor_blink_cb (time_watcher &w)
1008{ 1042{
1009 hidden_cursor = !hidden_cursor; 1043 hidden_cursor = !hidden_cursor;
1010 want_refresh = 1; 1044 want_refresh = 1;
1011 1045
1012 w.start (w.at + BLINK_INTERVAL); 1046 w.start (w.at + CURSOR_BLINK_INTERVAL);
1013} 1047}
1014#endif 1048#endif
1015 1049
1016#ifdef TEXT_BLINK 1050#ifdef TEXT_BLINK
1017void 1051void
… …
1031rxvt_term::cont_scroll_cb (time_watcher &w) 1065rxvt_term::cont_scroll_cb (time_watcher &w)
1032{ 1066{
1033 if ((scrollbar_isUp() || scrollbar_isDn()) && 1067 if ((scrollbar_isUp() || scrollbar_isDn()) &&
1034 scr_page (scrollbar_isUp() ? UP : DN, 1)) 1068 scr_page (scrollbar_isUp() ? UP : DN, 1))
1035 { 1069 {
1036 refresh_type |= SMOOTH_REFRESH;
1037 want_refresh = 1; 1070 want_refresh = 1;
1038 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1071 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1039 } 1072 }
1040} 1073}
1041#endif 1074#endif
… …
1045rxvt_term::sel_scroll_cb (time_watcher &w) 1078rxvt_term::sel_scroll_cb (time_watcher &w)
1046{ 1079{
1047 if (scr_page (scroll_selection_dir, scroll_selection_lines)) 1080 if (scr_page (scroll_selection_dir, scroll_selection_lines))
1048 { 1081 {
1049 selection_extend (selection_save_x, selection_save_y, selection_save_state); 1082 selection_extend (selection_save_x, selection_save_y, selection_save_state);
1050 refresh_type |= SMOOTH_REFRESH;
1051 want_refresh = 1; 1083 want_refresh = 1;
1052 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1084 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1053 } 1085 }
1054} 1086}
1055#endif 1087#endif
… …
1060{ 1092{
1061 if (mouse_slip_wheel_speed == 0 1093 if (mouse_slip_wheel_speed == 0
1062 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed) 1094 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
1063 : scr_page (UP, mouse_slip_wheel_speed)) 1095 : scr_page (UP, mouse_slip_wheel_speed))
1064 { 1096 {
1065 if (view_start == nsaved || 1097 if (view_start == top_row || view_start == 0)
1066 view_start == 0)
1067 mouse_slip_wheel_speed = 0; 1098 mouse_slip_wheel_speed = 0;
1068 1099
1069 refresh_type |= SMOOTH_REFRESH;
1070 want_refresh = 1; 1100 want_refresh = 1;
1071 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1101 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1072 } 1102 }
1073} 1103}
1074#endif 1104#endif
… …
1104 1134
1105 memmove (cmdbuf_base, cmdbuf_ptr, n); 1135 memmove (cmdbuf_base, cmdbuf_ptr, n);
1106 cmdbuf_ptr = cmdbuf_base; 1136 cmdbuf_ptr = cmdbuf_base;
1107 cmdbuf_endp = cmdbuf_ptr + n; 1137 cmdbuf_endp = cmdbuf_ptr + n;
1108 1138
1109 ssize_t r = read (pty.pty, cmdbuf_endp, CBUFSIZ - n); 1139 ssize_t r = read (pty->pty, cmdbuf_endp, CBUFSIZ - n);
1110 1140
1111 if (r > 0) 1141 if (r > 0)
1112 { 1142 {
1113 cmdbuf_endp += r; 1143 cmdbuf_endp += r;
1114 return true; 1144 return true;
… …
1132} 1162}
1133 1163
1134void 1164void
1135rxvt_term::pty_cb (io_watcher &w, short revents) 1165rxvt_term::pty_cb (io_watcher &w, short revents)
1136{ 1166{
1137 SET_R (this); 1167 make_current ();
1138 SET_LOCALE (locale);
1139 1168
1140 if (revents & EVENT_READ) 1169 if (revents & EVENT_READ)
1141 // loop, but don't allow a single term to monopolize us 1170 // loop, but don't allow a single term to monopolize us
1142 while (pty_fill ()) 1171 while (pty_fill ())
1143 if (cmd_parse ()) 1172 if (cmd_parse ())
… …
1163 1192
1164#ifdef POINTER_BLANK 1193#ifdef POINTER_BLANK
1165void 1194void
1166rxvt_term::pointer_blank () 1195rxvt_term::pointer_blank ()
1167{ 1196{
1168 if (! OPTION (Opt_pointerBlank)) 1197 if (!OPTION (Opt_pointerBlank))
1169 return; 1198 return;
1170 1199
1171 XDefineCursor (display->display, vt, display->blank_cursor); 1200 XDefineCursor (display->display, vt, display->blank_cursor);
1172 XFlush (display->display); 1201 XFlush (display->display);
1173 1202
… …
1175} 1204}
1176 1205
1177void 1206void
1178rxvt_term::pointer_cb (time_watcher &w) 1207rxvt_term::pointer_cb (time_watcher &w)
1179{ 1208{
1180 SET_R (this); 1209 make_current ();
1181 SET_LOCALE (locale);
1182 1210
1183 pointer_blank (); 1211 pointer_blank ();
1184} 1212}
1185#endif 1213#endif
1186 1214
… …
1265 1293
1266/*{{{ process an X event */ 1294/*{{{ process an X event */
1267void 1295void
1268rxvt_term::x_cb (XEvent &ev) 1296rxvt_term::x_cb (XEvent &ev)
1269{ 1297{
1298 make_current ();
1299
1270 dDisp; 1300 dDisp;
1271 1301
1272 SET_R (this); 1302 if (ev.xany.window == vt
1273 SET_LOCALE (locale); 1303 && SHOULD_INVOKE (HOOK_X_EVENT)
1304 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END)))
1305 return;
1274 1306
1275#if defined(CURSOR_BLINK) 1307 // 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; 1308 Window unused_root, unused_child;
1303 int unused_root_x, unused_root_y; 1309 int unused_root_x, unused_root_y;
1304 unsigned int unused_mask; 1310 unsigned int unused_mask;
1305 1311
1306 switch (ev.type) 1312 switch (ev.type)
… …
1313 1319
1314 break; 1320 break;
1315 1321
1316 case KeyRelease: 1322 case KeyRelease:
1317 { 1323 {
1318#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 1324#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL
1319 KeySym ks; 1325 KeySym keysym;
1320 1326
1321 ks = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/ 1327 keysym = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
1322#endif 1328#endif
1323 1329
1324#if ENABLE_FRILLS || ISO_14755 1330#if ENABLE_FRILLS || ISO_14755
1325 // ISO 14755 support 1331 // ISO 14755 support
1326 if (iso14755buf) 1332 if (iso14755buf)
… …
1331# endif 1337# endif
1332# if ISO_14755 1338# if ISO_14755
1333 // iso14755 part 5.2 handling: release time 1339 // iso14755 part 5.2 handling: release time
1334 // first: controls 1340 // first: controls
1335 if ((ev.xkey.state & ControlMask) 1341 if ((ev.xkey.state & ControlMask)
1336 && ((ks >= 0x40 && ks <= 0x5f) 1342 && ((keysym >= 0x40 && keysym <= 0x5f)
1337 || (ks >= 0x61 && ks <= 0x7f))) 1343 || (keysym >= 0x61 && keysym <= 0x7f)))
1338 { 1344 {
1339 iso14755buf = ISO_14755_51 | 0x2400 | (ks & 0x1f); 1345 iso14755buf = ISO_14755_51 | 0x2400 | (keysym & 0x1f);
1340 commit_iso14755 (); 1346 commit_iso14755 ();
1341 return; // case-break; 1347 goto skip_switch;
1342 } 1348 }
1343 1349
1344 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2) 1350 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
1345 if (i[0] == ks) 1351 if (i[0] == keysym)
1346 { 1352 {
1347 iso14755buf = ISO_14755_51 | i[1]; 1353 iso14755buf = ISO_14755_51 | i[1];
1348 commit_iso14755 (); 1354 commit_iso14755 ();
1349 return; // case-break; 1355 goto skip_switch;
1350 } 1356 }
1351 1357
1352 scr_bell (); 1358 scr_bell ();
1353# endif 1359# endif
1354 iso14755buf = 0; 1360 iso14755buf = 0;
… …
1373 else 1379 else
1374 iso14755buf = 0; 1380 iso14755buf = 0;
1375 } 1381 }
1376#endif 1382#endif
1377 1383
1384 if (ev.xany.window == vt
1385 && HOOK_INVOKE ((this, HOOK_KEY_RELEASE, DT_XEVENT, &ev, DT_INT, keysym, DT_END)))
1386 break;
1387
1378#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1388#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1379 if (!(ev.xkey.state & ControlMask)) 1389 if (!(ev.xkey.state & ControlMask))
1380 slip_wheel_ev.stop (); 1390 slip_wheel_ev.stop ();
1381 else if (ks == XK_Control_L || ks == XK_Control_R) 1391 else if (keysym == XK_Control_L || keysym == XK_Control_R)
1382 mouse_slip_wheel_speed = 0; 1392 mouse_slip_wheel_speed = 0;
1383#endif 1393#endif
1384 break; 1394 break;
1385 } 1395 }
1386 1396
… …
1489 { 1499 {
1490 seen_resize = 1; 1500 seen_resize = 1;
1491 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1501 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1492 } 1502 }
1493 1503
1504 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1505
1494#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */ 1506#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1495 if (OPTION (Opt_transparent)) 1507 if (OPTION (Opt_transparent))
1496 check_our_parents (); 1508 check_our_parents ();
1497#endif 1509#endif
1498 } 1510 }
… …
1516 1528
1517 case SelectionRequest: 1529 case SelectionRequest:
1518 selection_send (ev.xselectionrequest); 1530 selection_send (ev.xselectionrequest);
1519 break; 1531 break;
1520 1532
1533 case MapNotify:
1534 mapped = 1;
1535#ifdef TEXT_BLINK
1536 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1537#endif
1538 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1539 break;
1540
1521 case UnmapNotify: 1541 case UnmapNotify:
1522 mapped = 0; 1542 mapped = 0;
1523#ifdef TEXT_BLINK 1543#ifdef TEXT_BLINK
1524 text_blink_ev.stop (); 1544 text_blink_ev.stop ();
1525#endif 1545#endif
1526 break; 1546 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; 1547 break;
1534 1548
1535#ifdef TRANSPARENT 1549#ifdef TRANSPARENT
1536 case ReparentNotify: 1550 case ReparentNotify:
1537 rootwin_cb (ev); 1551 rootwin_cb (ev);
… …
1551 1565
1552 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev)) 1566 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev))
1553 scr_expose (ev.xexpose.x, ev.xexpose.y, 1567 scr_expose (ev.xexpose.x, ev.xexpose.y,
1554 ev.xexpose.width, ev.xexpose.height, False); 1568 ev.xexpose.width, ev.xexpose.height, False);
1555 1569
1556 scr_refresh (refresh_type); 1570 want_refresh = 1;
1557 } 1571 }
1558 else 1572 else
1559 { 1573 {
1560 XEvent unused_event; 1574 XEvent unused_event;
1561 1575
… …
1567 if (isScrollbarWindow (ev.xany.window)) 1581 if (isScrollbarWindow (ev.xany.window))
1568 { 1582 {
1569 scrollBar.setIdle (); 1583 scrollBar.setIdle ();
1570 scrollbar_show (0); 1584 scrollbar_show (0);
1571 } 1585 }
1572#ifdef MENUBAR
1573 if (menubar_visible () && isMenuBarWindow (ev.xany.window))
1574 menubar_expose ();
1575#endif
1576 1586
1577#ifdef TRANSPARENT 1587#ifdef TRANSPARENT
1578 if (am_transparent && ev.xany.window == parent[0]) 1588 if (am_transparent && ev.xany.window == parent[0])
1579 XClearWindow (disp, ev.xany.window); 1589 XClearWindow (disp, ev.xany.window);
1580#endif 1590#endif
… …
1584 case MotionNotify: 1594 case MotionNotify:
1585#ifdef POINTER_BLANK 1595#ifdef POINTER_BLANK
1586 if (hidden_pointer) 1596 if (hidden_pointer)
1587 pointer_unblank (); 1597 pointer_unblank ();
1588#endif 1598#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) 1599 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1597 break; 1600 break;
1598 1601
1599 if (ev.xany.window == vt) 1602 if (ev.xany.window == vt)
1600 { 1603 {
1604 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)
1605 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1606 ; // nop
1601 if (ev.xbutton.state & (Button1Mask | Button3Mask)) 1607 else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1602 { 1608 {
1603 while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev)) 1609 while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev))
1604 ; 1610 ;
1605 1611
1606 XQueryPointer (disp, vt, 1612 XQueryPointer (disp, vt,
… …
1686 &unused_root_x, &unused_root_y, 1692 &unused_root_x, &unused_root_y,
1687 &ev.xbutton.x, &ev.xbutton.y, 1693 &ev.xbutton.x, &ev.xbutton.y,
1688 &unused_mask); 1694 &unused_mask);
1689 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1695 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1690 scrollbar_size ()); 1696 scrollbar_size ());
1691 scr_refresh (refresh_type); 1697 want_refresh = 1;
1692 refresh_limit = 0; 1698 refresh_limit = 0;
1693 scrollbar_show (1); 1699 scrollbar_show (1);
1694 } 1700 }
1695 break; 1701 break;
1696 } 1702 }
1703
1704skip_switch: ;
1705
1706#if defined(CURSOR_BLINK)
1707 if (OPTION (Opt_cursorBlink) && ev.type == KeyPress)
1708 {
1709 if (hidden_cursor)
1710 {
1711 hidden_cursor = 0;
1712 want_refresh = 1;
1713 }
1714
1715 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1716 }
1717#endif
1718
1719#if defined(POINTER_BLANK)
1720 if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0)
1721 {
1722 if (ev.type == MotionNotify
1723 || ev.type == ButtonPress
1724 || ev.type == ButtonRelease)
1725 if (hidden_pointer)
1726 pointer_unblank ();
1727
1728 if (ev.type == KeyPress && hidden_pointer == 0)
1729 pointer_blank ();
1730 }
1731#endif
1697} 1732}
1698 1733
1699void 1734void
1700rxvt_term::focus_in () 1735rxvt_term::focus_in ()
1701{ 1736{
1702 if (!focus) 1737 if (!focus)
1703 { 1738 {
1704 focus = 1; 1739 focus = 1;
1705 want_refresh = 1; 1740 want_refresh = 1;
1706 1741
1707 PERL_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1742 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1708 1743
1709#if USE_XIM 1744#if USE_XIM
1710 if (Input_Context != NULL) 1745 if (Input_Context != NULL)
1711 { 1746 {
1712 IMSetStatusPosition (); 1747 IMSetStatusPosition ();
1713 XSetICFocus (Input_Context); 1748 XSetICFocus (Input_Context);
1714 } 1749 }
1715#endif 1750#endif
1716#if CURSOR_BLINK 1751#if CURSOR_BLINK
1717 if (OPTION (Opt_cursorBlink)) 1752 if (OPTION (Opt_cursorBlink))
1718 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1753 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1719#endif 1754#endif
1720#if OFF_FOCUS_FADING 1755#if OFF_FOCUS_FADING
1721 if (rs[Rs_fade]) 1756 if (rs[Rs_fade])
1722 { 1757 {
1723 pix_colors = pix_colors_focused; 1758 pix_colors = pix_colors_focused;
… …
1733 if (focus) 1768 if (focus)
1734 { 1769 {
1735 focus = 0; 1770 focus = 0;
1736 want_refresh = 1; 1771 want_refresh = 1;
1737 1772
1738 PERL_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1773 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1739 1774
1740#if ENABLE_FRILLS || ISO_14755 1775#if ENABLE_FRILLS || ISO_14755
1741 if (iso14755buf) 1776 if (iso14755buf)
1742 { 1777 {
1743 iso14755buf = 0; 1778 iso14755buf = 0;
… …
1767 1802
1768#if TRANSPARENT 1803#if TRANSPARENT
1769void 1804void
1770rxvt_term::rootwin_cb (XEvent &ev) 1805rxvt_term::rootwin_cb (XEvent &ev)
1771{ 1806{
1772 SET_R (this); 1807 make_current ();
1773 SET_LOCALE (locale);
1774 1808
1775 switch (ev.type) 1809 switch (ev.type)
1776 { 1810 {
1777 case PropertyNotify: 1811 case PropertyNotify:
1778 /* 1812 /*
… …
1826#ifdef MOUSE_REPORT_DOUBLECLICK 1860#ifdef MOUSE_REPORT_DOUBLECLICK
1827 if (ev.button == MEvent.button && clickintime) 1861 if (ev.button == MEvent.button && clickintime)
1828 { 1862 {
1829 /* same button, within alloted time */ 1863 /* same button, within alloted time */
1830 MEvent.clicks++; 1864 MEvent.clicks++;
1865
1831 if (MEvent.clicks > 1) 1866 if (MEvent.clicks > 1)
1832 { 1867 {
1833 /* only report double clicks */ 1868 /* only report double clicks */
1834 MEvent.clicks = 2; 1869 MEvent.clicks = 2;
1835 mouse_report (ev); 1870 mouse_report (ev);
… …
1855 else 1890 else
1856 { 1891 {
1857 if (ev.button != MEvent.button) 1892 if (ev.button != MEvent.button)
1858 MEvent.clicks = 0; 1893 MEvent.clicks = 0;
1859 1894
1860 if (!PERL_INVOKE ((this, HOOK_MOUSE_CLICK, DT_XEVENT, &ev, DT_END))) 1895 if (!HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1861 switch (ev.button) 1896 switch (ev.button)
1862 { 1897 {
1863 case Button1: 1898 case Button1:
1864 /* allow meta + click to select rectangular areas */ 1899 /* allow meta + click to select rectangular areas */
1865 /* should be done in screen.C */ 1900 /* should be done in screen.C */
… …
1868#else 1903#else
1869 selection.rect = false; 1904 selection.rect = false;
1870#endif 1905#endif
1871 1906
1872 /* allow shift+left click to extend selection */ 1907 /* allow shift+left click to extend selection */
1873 if (ev.state & ShiftMask && ! (priv_modes & PrivMode_mouse_report)) 1908 if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report))
1874 { 1909 {
1875 if (MEvent.button == Button1 && clickintime) 1910 if (MEvent.button == Button1 && clickintime)
1876 selection_rotate (ev.x, ev.y); 1911 selection_rotate (ev.x, ev.y);
1877 else 1912 else
1878 selection_extend (ev.x, ev.y, 1); 1913 selection_extend (ev.x, ev.y, 1);
… …
2043 } 2078 }
2044 2079
2045 break; 2080 break;
2046 } 2081 }
2047 } 2082 }
2083
2048 return; 2084 return;
2049 } 2085 }
2050#if MENUBAR
2051 /*
2052 * Menubar window processing of button press
2053 */
2054 if (isMenuBarWindow (ev.window))
2055 menubar_control (ev);
2056#endif
2057} 2086}
2058 2087
2059void 2088void
2060rxvt_term::button_release (XButtonEvent &ev) 2089rxvt_term::button_release (XButtonEvent &ev)
2061{ 2090{
… …
2067 2096
2068 if (scrollbar_isUpDn ()) 2097 if (scrollbar_isUpDn ())
2069 { 2098 {
2070 scrollBar.setIdle (); 2099 scrollBar.setIdle ();
2071 scrollbar_show (0); 2100 scrollbar_show (0);
2072#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
2073 refresh_type &= ~SMOOTH_REFRESH;
2074#endif
2075 } 2101 }
2076 2102
2077#ifdef SELECTION_SCROLLING 2103#ifdef SELECTION_SCROLLING
2078 if (sel_scroll_ev.active) 2104 if (sel_scroll_ev.active)
2079 sel_scroll_ev.stop(); 2105 sel_scroll_ev.stop();
… …
2117 if (priv_modes & PrivMode_mouse_report 2143 if (priv_modes & PrivMode_mouse_report
2118 && bypass_keystate 2144 && bypass_keystate
2119 && ev.button == Button1 && MEvent.clicks <= 1) 2145 && ev.button == Button1 && MEvent.clicks <= 1)
2120 selection_extend (ev.x, ev.y, 0); 2146 selection_extend (ev.x, ev.y, 0);
2121 2147
2148 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2149 return;
2150
2122 switch (ev.button) 2151 switch (ev.button)
2123 { 2152 {
2124 case Button1: 2153 case Button1:
2125 case Button3: 2154 case Button3:
2126 selection_make (ev.time); 2155 selection_make (ev.time);
2127 break; 2156 break;
2157
2128 case Button2: 2158 case Button2:
2129 selection_request (ev.time, ev.x, ev.y); 2159 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window?
2160 selection_request (ev.time, ev.state & ShiftMask ? Sel_Clipboard : Sel_Primary);
2130 break; 2161 break;
2162
2131#ifdef MOUSE_WHEEL 2163#ifdef MOUSE_WHEEL
2132 case Button4: 2164 case Button4:
2133 case Button5: 2165 case Button5:
2134 { 2166 {
2135 int i; 2167 int i;
… …
2157 slip_wheel_ev.start (); 2189 slip_wheel_ev.start ();
2158 } 2190 }
2159 else 2191 else
2160 { 2192 {
2161# endif 2193# endif
2162# ifdef JUMP_MOUSE_WHEEL
2163 scr_page (v, i); 2194 scr_page (v, i);
2164 scr_refresh (SMOOTH_REFRESH);
2165 scrollbar_show (1); 2195 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 2196# ifdef MOUSE_SLIP_WHEELING
2175 } 2197 }
2176#endif 2198# endif
2177 } 2199 }
2178 break; 2200 break;
2179#endif 2201#endif
2180 } 2202 }
2181 } 2203 }
2182#ifdef MENUBAR
2183 else if (isMenuBarWindow (ev.window))
2184 menubar_control (ev);
2185#endif
2186} 2204}
2187 2205
2188#ifdef TRANSPARENT 2206#ifdef TRANSPARENT
2189#if TINTING 2207#if TINTING
2190/* taken from aterm-0.4.2 */ 2208/* taken from aterm-0.4.2 */
… …
2670 2688
2671bool 2689bool
2672rxvt_term::cmd_parse () 2690rxvt_term::cmd_parse ()
2673{ 2691{
2674 bool flag = false; 2692 bool flag = false;
2675 unicode_t ch = NOCHAR; 2693 wchar_t ch = NOCHAR;
2676 char *seq_begin; // remember start of esc-sequence here 2694 char *seq_begin; // remember start of esc-sequence here
2677 2695
2678 for (;;) 2696 for (;;)
2679 { 2697 {
2680 if (ch == NOCHAR) 2698 if (ch == NOCHAR)
2681 { 2699 {
2682 seq_begin = cmdbuf_ptr; 2700 seq_begin = cmdbuf_ptr;
2683 ch = next_char (); 2701 ch = next_char ();
2684 }
2685 2702
2686 if (ch == NOCHAR) // TODO: improve 2703 if (ch == NOCHAR)
2687 break; 2704 break;
2705 }
2688 2706
2689 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT) 2707 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT)
2690 { 2708 {
2691 if (!seen_input) 2709 if (!seen_input)
2692 { 2710 {
… …
2701 if (seen_resize && cmd_pid) 2719 if (seen_resize && cmd_pid)
2702 kill (-cmd_pid, SIGWINCH); 2720 kill (-cmd_pid, SIGWINCH);
2703 } 2721 }
2704 2722
2705 /* Read a text string from the input buffer */ 2723 /* Read a text string from the input buffer */
2706 unicode_t buf[UBUFSIZ]; 2724 wchar_t buf[UBUFSIZ];
2707 bool refreshnow = false; 2725 bool refreshnow = false;
2708 int nlines = 0; 2726 int nlines = 0;
2709 unicode_t *str = buf; 2727 wchar_t *str = buf;
2710 unicode_t *eol = str + min (ncol, UBUFSIZ); 2728 wchar_t *eol = str + min (ncol, UBUFSIZ);
2711 2729
2712 for (;;) 2730 for (;;)
2713 { 2731 {
2714 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)) 2732 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))
2715 break; 2733 break;
… …
2733 } 2751 }
2734 2752
2735 // scr_add_lines only works for nlines <= nrow - 1. 2753 // scr_add_lines only works for nlines <= nrow - 1.
2736 if (nlines >= nrow - 1) 2754 if (nlines >= nrow - 1)
2737 { 2755 {
2756 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2738 if (!PERL_INVOKE ((this, HOOK_ADD_LINES, DT_USTRING_LEN, buf, str - buf, DT_END))) 2757 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2739 scr_add_lines (buf, nlines, str - buf); 2758 scr_add_lines (buf, str - buf, nlines);
2740 2759
2741 nlines = 0; 2760 nlines = 0;
2742 str = buf; 2761 str = buf;
2743 eol = str + min (ncol, UBUFSIZ); 2762 eol = str + min (ncol, UBUFSIZ);
2744 } 2763 }
… …
2758 2777
2759 seq_begin = cmdbuf_ptr; 2778 seq_begin = cmdbuf_ptr;
2760 ch = next_char (); 2779 ch = next_char ();
2761 } 2780 }
2762 2781
2782 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2763 if (!PERL_INVOKE ((this, HOOK_ADD_LINES, DT_USTRING_LEN, buf, str - buf, DT_END))) 2783 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2764 scr_add_lines (buf, nlines, str - buf); 2784 scr_add_lines (buf, str - buf, nlines);
2765 2785
2766 /* 2786 /*
2767 * If there have been a lot of new lines, then update the screen 2787 * If there have been a lot of new lines, then update the screen
2768 * What the heck I'll cheat and only refresh less than every page-full. 2788 * What the heck I'll cheat and only refresh less than every page-full.
2769 * the number of pages between refreshes is refresh_limit, which 2789 * the number of pages between refreshes is refresh_limit, which
… …
2774 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD) 2794 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2775 refresh_limit++; 2795 refresh_limit++;
2776 else 2796 else
2777 { 2797 {
2778 flag = true; 2798 flag = true;
2779 scr_refresh (refresh_type); 2799 scr_refresh ();
2780 flush_ev.stop (); 2800 want_refresh = 1;
2781 } 2801 }
2782 } 2802 }
2783 2803
2784 } 2804 }
2785 else 2805 else
… …
2800 } 2820 }
2801 2821
2802 return flag; 2822 return flag;
2803} 2823}
2804 2824
2805// read the next octet
2806unicode_t
2807rxvt_term::next_octet ()
2808{
2809 return cmdbuf_ptr < cmdbuf_endp
2810 ? *cmdbuf_ptr++
2811 : NOCHAR;
2812}
2813
2814// read the next character 2825// read the next character
2815unicode_t 2826wchar_t
2816rxvt_term::next_char () 2827rxvt_term::next_char () NOTHROW
2817{ 2828{
2818 while (cmdbuf_ptr < cmdbuf_endp) 2829 while (cmdbuf_ptr < cmdbuf_endp)
2819 { 2830 {
2820 // assume 7-bit to be ascii ALWAYS 2831 // assume 7-bit to be ascii ALWAYS
2821 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2832 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)
… …
2830 cmdbuf_ptr = cmdbuf_endp; 2841 cmdbuf_ptr = cmdbuf_endp;
2831 break; 2842 break;
2832 } 2843 }
2833 2844
2834 if (len == (size_t)-1) 2845 if (len == (size_t)-1)
2835 return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 2846 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2836 2847
2837 // assume wchar == unicode 2848 // assume wchar == unicode
2838 cmdbuf_ptr += len; 2849 cmdbuf_ptr += len;
2839 return wc & UNICODE_MASK; 2850 return wc & UNICODE_MASK;
2840 } 2851 }
2841 2852
2842 return NOCHAR; 2853 return NOCHAR;
2843} 2854}
2855
2856// read the next octet
2857uint32_t
2858rxvt_term::next_octet () NOTHROW
2859{
2860 return cmdbuf_ptr < cmdbuf_endp
2861 ? (unsigned char)*cmdbuf_ptr++
2862 : NOCHAR;
2863}
2864
2865static class out_of_input out_of_input;
2844 2866
2845/* rxvt_cmd_getc () - Return next input character */ 2867/* rxvt_cmd_getc () - Return next input character */
2846/* 2868/*
2847 * Return the next input character after first passing any keyboard input 2869 * Return the next input character after first passing any keyboard input
2848 * to the command. 2870 * to the command.
2849 */ 2871 */
2850unicode_t 2872wchar_t
2851rxvt_term::cmd_getc () 2873rxvt_term::cmd_getc () THROW ((class out_of_input))
2852{ 2874{
2853 unicode_t c = next_char (); 2875 wchar_t c = next_char ();
2854 2876
2855 if (c == NOCHAR) 2877 if (c == NOCHAR)
2856 throw out_of_input; 2878 throw out_of_input;
2857 2879
2858 return c; 2880 return c;
2859} 2881}
2860 2882
2861unicode_t 2883uint32_t
2862rxvt_term::cmd_get8 () 2884rxvt_term::cmd_get8 () THROW ((class out_of_input))
2863{ 2885{
2864 unicode_t c = next_octet (); 2886 uint32_t c = next_octet ();
2865 2887
2866 if (c == NOCHAR) 2888 if (c == NOCHAR)
2867 throw out_of_input; 2889 throw out_of_input;
2868 2890
2869 return c; 2891 return c;
… …
3136 break; 3158 break;
3137 3159
3138 /* 8.3.87: NEXT LINE */ 3160 /* 8.3.87: NEXT LINE */
3139 case C1_NEL: /* ESC E */ 3161 case C1_NEL: /* ESC E */
3140 { 3162 {
3141 unicode_t nlcr[] = { C0_LF, C0_CR }; 3163 wchar_t nlcr[] = { C0_LF, C0_CR };
3142 scr_add_lines (nlcr, 1, 2); 3164 scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1);
3143 } 3165 }
3144 break; 3166 break;
3145 3167
3146 /* kidnapped escape sequence: Should be 8.3.48 */ 3168 /* kidnapped escape sequence: Should be 8.3.48 */
3147 case C1_ESA: /* ESC G */ 3169 case C1_ESA: /* ESC G */
… …
3746 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3768 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3747 */ 3769 */
3748void 3770void
3749rxvt_term::process_xterm_seq (int op, const char *str, char resp) 3771rxvt_term::process_xterm_seq (int op, const char *str, char resp)
3750{ 3772{
3751 int changed = 0;
3752 int color; 3773 int color;
3753 char *buf, *name; 3774 char *buf, *name;
3754 bool query = str[0] == '?' && !str[1]; 3775 bool query = str[0] == '?' && !str[1];
3755 int saveop = op; 3776 int saveop = op;
3756 dDisp; 3777 dDisp;
… …
3811 { 3832 {
3812 if ((name = strchr (buf, ';')) == NULL) 3833 if ((name = strchr (buf, ';')) == NULL)
3813 break; 3834 break;
3814 3835
3815 *name++ = '\0'; 3836 *name++ = '\0';
3816 color = atoi (buf); 3837 color = atoi (buf) + minCOLOR;
3817 3838
3818 if (color < 0 || color >= TOTAL_COLORS) 3839 if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR))
3819 break; 3840 break;
3820 3841
3821 if ((buf = strchr (name, ';')) != NULL) 3842 if ((buf = strchr (name, ';')) != NULL)
3822 *buf++ = '\0'; 3843 *buf++ = '\0';
3823 3844
3824 if (name[0] == '?' && !name[1]) 3845 if (name[0] == '?' && !name[1])
3825 { 3846 {
3826 unsigned short r, g, b; 3847 unsigned short r, g, b;
3827 pix_colors_focused[color + minCOLOR].get (display, r, g, b); 3848 pix_colors_focused[color].get (display, r, g, b);
3828 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp); 3849 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp);
3829 } 3850 }
3830 else 3851 else
3831 set_window_color (color + minCOLOR, name); 3852 set_window_color (color, name);
3832 } 3853 }
3833 break; 3854 break;
3834 case XTerm_Color00: 3855 case XTerm_Color00:
3835 process_color_seq (XTerm_Color00, Color_fg, str, resp); 3856 process_color_seq (XTerm_Color00, Color_fg, str, resp);
3836 break; 3857 break;
3837 case XTerm_Color01: 3858 case XTerm_Color01:
3838 process_color_seq (XTerm_Color00, Color_bg, str, resp); 3859 process_color_seq (XTerm_Color01, Color_bg, str, resp);
3839 break; 3860 break;
3840#ifndef NO_CURSORCOLOR 3861#ifndef NO_CURSORCOLOR
3841 case XTerm_Color_cursor: 3862 case XTerm_Color_cursor:
3842 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp); 3863 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp);
3843 break; 3864 break;
… …
3847 break; 3868 break;
3848 case XTerm_Color_pointer_bg: 3869 case XTerm_Color_pointer_bg:
3849 process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp); 3870 process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp);
3850 break; 3871 break;
3851#ifndef NO_BOLD_UNDERLINE_REVERSE 3872#ifndef NO_BOLD_UNDERLINE_REVERSE
3852 case XTerm_Color_BD:
3853 process_color_seq (XTerm_Color_BD, Color_BD, str, resp);
3854 break;
3855 case XTerm_Color_UL:
3856 process_color_seq (XTerm_Color_UL, Color_UL, str, resp);
3857 break;
3858 case XTerm_Color_RV: 3873 case XTerm_Color_RV:
3859 process_color_seq (XTerm_Color_RV, Color_RV, str, resp); 3874 process_color_seq (XTerm_Color_RV, Color_RV, str, resp);
3875 break;
3876 case Rxvt_Color_BD:
3877 case URxvt_Color_BD:
3878 process_color_seq (op, Color_BD, str, resp);
3879 break;
3880 case Rxvt_Color_UL:
3881 case URxvt_Color_UL:
3882 process_color_seq (op, Color_UL, str, resp);
3860 break; 3883 break;
3861 case URxvt_Color_IT: 3884 case URxvt_Color_IT:
3862 process_color_seq (URxvt_Color_IT, Color_IT, str, resp); 3885 process_color_seq (URxvt_Color_IT, Color_IT, str, resp);
3863 break; 3886 break;
3864#endif 3887#endif
… …
3869 if (am_transparent) 3892 if (am_transparent)
3870 want_full_refresh = want_refresh = 1; 3893 want_full_refresh = want_refresh = 1;
3871 break; 3894 break;
3872#endif 3895#endif
3873 3896
3874 case XTerm_Pixmap: 3897 case Rxvt_Pixmap:
3898 {
3875 if (*str != ';') 3899 if (*str != ';')
3876 { 3900 {
3877#if XPM_BACKGROUND 3901#if XPM_BACKGROUND
3878 scale_pixmap (""); /* reset to default scaling */ 3902 scale_pixmap (""); /* reset to default scaling */
3879 set_bgPixmap (str); /* change pixmap */ 3903 set_bgPixmap (str); /* change pixmap */
3880#endif
3881 scr_touch (true); 3904 scr_touch (true);
3905#endif
3882 } 3906 }
3907
3908 int changed = 0;
3909
3883 while ((str = strchr (str, ';')) != NULL) 3910 while ((str = strchr (str, ';')) != NULL)
3884 { 3911 {
3885 str++; 3912 str++;
3886#if XPM_BACKGROUND 3913#if XPM_BACKGROUND
3887 changed += scale_pixmap (str); 3914 changed += scale_pixmap (str);
3888#endif 3915#endif
3889 } 3916 }
3890 3917
3891 if (changed) 3918 if (changed)
3892 { 3919 {
3893#ifdef XPM_BACKGROUND 3920#ifdef XPM_BACKGROUND
3894 resize_pixmap (); 3921 resize_pixmap ();
3895#endif
3896 scr_touch (true); 3922 scr_touch (true);
3923#endif
3897 } 3924 }
3925 }
3898 break; 3926 break;
3899 3927
3900 case XTerm_restoreFG: 3928 case Rxvt_restoreFG:
3901 set_window_color (Color_fg, str); 3929 set_window_color (Color_fg, str);
3902 break; 3930 break;
3903 case XTerm_restoreBG: 3931 case Rxvt_restoreBG:
3904 set_window_color (Color_bg, str); 3932 set_window_color (Color_bg, str);
3905 break; 3933 break;
3906 3934
3907 case XTerm_logfile: 3935 case XTerm_logfile:
3908 // TODO, when secure mode? 3936 // TODO, when secure mode?
3909 break; 3937 break;
3910 3938
3911#ifdef MENUBAR
3912 case URxvt_Menu:
3913 if (OPTION (Opt_insecure))
3914 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked
3915 break;
3916#endif
3917#if 0 3939#if 0
3918 case XTerm_dumpscreen: /* no error notices */ 3940 case Rxvt_dumpscreen: /* no error notices */
3919 { 3941 {
3920 int fd; 3942 int fd;
3921 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0) 3943 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0)
3922 { 3944 {
3923 scr_dump (fd); 3945 scr_dump (fd);
… …
3954 if (query) 3976 if (query)
3955 tt_printf ("\33]%d;%-.250s%c", URxvt_locale, OPTION (Opt_insecure) ? locale : "", resp); 3977 tt_printf ("\33]%d;%-.250s%c", URxvt_locale, OPTION (Opt_insecure) ? locale : "", resp);
3956 else 3978 else
3957 { 3979 {
3958 set_locale (str); 3980 set_locale (str);
3959 pty.set_utf8_mode (enc_utf8); 3981 pty->set_utf8_mode (enc_utf8);
3960 init_xlocale (); 3982 init_xlocale ();
3961 } 3983 }
3962 break; 3984 break;
3963 3985
3964 case URxvt_view_up: 3986 case URxvt_view_up:
… …
3975 break; 3997 break;
3976#endif 3998#endif
3977 3999
3978#if ENABLE_PERL 4000#if ENABLE_PERL
3979 case URxvt_perl: 4001 case URxvt_perl:
3980 if (PERL_INVOKE ((this, HOOK_OSC_SEQ, DT_STRING, str, DT_END))) 4002 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_STR, str, DT_END)))
3981 ; // no responses yet 4003 ; // no responses yet
3982 break; 4004 break;
3983#endif 4005#endif
3984 } 4006 }
3985} 4007}
… …
4017 return state; 4039 return state;
4018} 4040}
4019 4041
4020/* we're not using priv _yet_ */ 4042/* we're not using priv _yet_ */
4021void 4043void
4022rxvt_term::process_terminal_mode (int mode, int priv __attribute__ ((unused)), unsigned int nargs, const int *arg) 4044rxvt_term::process_terminal_mode (int mode, int priv UNUSED, unsigned int nargs, const int *arg)
4023{ 4045{
4024 unsigned int i, j; 4046 unsigned int i, j;
4025 int state; 4047 int state;
4026 4048
4027 static const struct 4049 static const struct
… …
4038 { 5, PrivMode_rVideo }, 4060 { 5, PrivMode_rVideo },
4039 { 6, PrivMode_relOrigin }, 4061 { 6, PrivMode_relOrigin },
4040 { 7, PrivMode_Autowrap }, 4062 { 7, PrivMode_Autowrap },
4041 // 8, bi-directional support mode 4063 // 8, bi-directional support mode
4042 { 9, PrivMode_MouseX10 }, 4064 { 9, PrivMode_MouseX10 },
4043#ifdef menuBar_esc
4044 { menuBar_esc, PrivMode_menuBar },
4045#endif
4046 // 18, 19 printing-related 4065 // 18, 19 printing-related
4047 { 25, PrivMode_VisibleCursor }, 4066 { 25, PrivMode_VisibleCursor },
4048#ifdef scrollBar_esc 4067#ifdef scrollBar_esc
4049 { scrollBar_esc, PrivMode_scrollBar }, 4068 { scrollBar_esc, PrivMode_scrollBar },
4050#endif 4069#endif
… …
4097 /* extra handling for values with state unkept */ 4116 /* extra handling for values with state unkept */
4098 switch (arg[i]) 4117 switch (arg[i])
4099 { 4118 {
4100#if ENABLE_STYLES 4119#if ENABLE_STYLES
4101 case 1021: 4120 case 1021:
4102 if (mode) 4121 set_option (Opt_intensityStyles, mode);
4103 SET_OPTION (Opt_intensityStyles);
4104 else
4105 CLR_OPTION (Opt_intensityStyles);
4106 4122
4107 scr_touch (true); 4123 scr_touch (true);
4108 break; 4124 break;
4109#endif 4125#endif
4110 case 1048: /* alternative cursor save */ 4126 case 1048: /* alternative cursor save */
… …
4132 case 3: /* 80/132 */ 4148 case 3: /* 80/132 */
4133 if (priv_modes & PrivMode_132OK) 4149 if (priv_modes & PrivMode_132OK)
4134 set_widthheight (((state ? 132 : 80) * fwidth), height); 4150 set_widthheight (((state ? 132 : 80) * fwidth), height);
4135 break; 4151 break;
4136 case 4: /* smooth scrolling */ 4152 case 4: /* smooth scrolling */
4137 if (!state) 4153 set_option (Opt_jumpScroll, !state);
4138 SET_OPTION (Opt_jumpScroll);
4139 else
4140 CLR_OPTION (Opt_jumpScroll);
4141 break; 4154 break;
4142 case 5: /* reverse video */ 4155 case 5: /* reverse video */
4143 scr_rvideo_mode (state); 4156 scr_rvideo_mode (state);
4144 break; 4157 break;
4145 case 6: /* relative/absolute origins */ 4158 case 6: /* relative/absolute origins */
… …
4151 /* case 8: - auto repeat, can't do on a per window basis */ 4164 /* case 8: - auto repeat, can't do on a per window basis */
4152 case 9: /* X10 mouse reporting */ 4165 case 9: /* X10 mouse reporting */
4153 if (state) /* orthogonal */ 4166 if (state) /* orthogonal */
4154 priv_modes &= ~PrivMode_MouseX11; 4167 priv_modes &= ~PrivMode_MouseX11;
4155 break; 4168 break;
4156#ifdef menuBar_esc
4157 case menuBar_esc:
4158#ifdef MENUBAR
4159 map_menuBar (state);
4160#endif
4161 break;
4162#endif
4163#ifdef scrollBar_esc 4169#ifdef scrollBar_esc
4164 case scrollBar_esc: 4170 case scrollBar_esc:
4165 if (scrollbar_mapping (state)) 4171 if (scrollbar_mapping (state))
4166 { 4172 {
4167 resize_all_windows (0, 0, 0); 4173 resize_all_windows (0, 0, 0);
… …
4186#if 0 4192#if 0
4187 case 1001: 4193 case 1001:
4188 break; /* X11 mouse highlighting */ 4194 break; /* X11 mouse highlighting */
4189#endif 4195#endif
4190 case 1010: /* scroll to bottom on TTY output inhibit */ 4196 case 1010: /* scroll to bottom on TTY output inhibit */
4191 if (!state) 4197 set_option (Opt_scrollTtyOutput, !state);
4192 SET_OPTION (Opt_scrollTtyOutput);
4193 else
4194 CLR_OPTION (Opt_scrollTtyOutput);
4195 break; 4198 break;
4196 case 1011: /* scroll to bottom on key press */ 4199 case 1011: /* scroll to bottom on key press */
4197 if (state) 4200 set_option (Opt_scrollTtyKeypress, state);
4198 SET_OPTION (Opt_scrollTtyKeypress);
4199 else
4200 CLR_OPTION (Opt_scrollTtyKeypress);
4201 break; 4201 break;
4202 case 1047: /* secondary screen w/ clearing last */ 4202 case 1047: /* secondary screen w/ clearing last */
4203 if (OPTION (Opt_secondaryScreen)) 4203 if (OPTION (Opt_secondaryScreen))
4204 if (current_screen != PRIMARY) 4204 if (current_screen != PRIMARY)
4205 scr_erase_screen (2); 4205 scr_erase_screen (2);
… …
4415const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT 4415const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4416 4416
4417void 4417void
4418rxvt_term::tt_write (const char *data, unsigned int len) 4418rxvt_term::tt_write (const char *data, unsigned int len)
4419{ 4419{
4420 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
4421 return;
4422
4423 if (pty->pty < 0)
4424 return;
4425
4420 if (v_buflen == 0) 4426 if (v_buflen == 0)
4421 { 4427 {
4422 ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE)); 4428 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE));
4423 4429
4424 if ((unsigned int)written == len) 4430 if ((unsigned int)written == len)
4425 return; 4431 return;
4426 4432
4427 data += written; 4433 data += written;
… …
4436 pty_ev.set (EVENT_READ | EVENT_WRITE); 4442 pty_ev.set (EVENT_READ | EVENT_WRITE);
4437} 4443}
4438 4444
4439void rxvt_term::pty_write () 4445void rxvt_term::pty_write ()
4440{ 4446{
4441 int written = write (pty.pty, v_buffer, min (v_buflen, MAX_PTY_WRITE)); 4447 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
4442 4448
4443 if (written > 0) 4449 if (written > 0)
4444 { 4450 {
4445 v_buflen -= written; 4451 v_buflen -= written;
4446 4452

Diff Legend

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