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.250 by root, Sun Jan 8 06:35:23 2006 UTC vs.
Revision 1.280 by root, Mon Jan 23 23:33:58 2006 UTC

… …
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
872 if (HOOK_INVOKE ((this, HOOK_KEY_PRESS, DT_XEVENT, &ev, DT_STR_LEN, kbuf, len, DT_END))) 869 if (HOOK_INVOKE ((this, HOOK_KEY_PRESS, DT_XEVENT, &ev, DT_INT, keysym, DT_STR_LEN, kbuf, len, DT_END)))
873 return; 870 return;
874 871
875 if (len <= 0) 872 if (len <= 0)
876 return; /* not mapped */ 873 return; /* not mapped */
877 874
… …
919#endif /* DEBUG_CMD */ 916#endif /* DEBUG_CMD */
920 tt_write (kbuf, (unsigned int)len); 917 tt_write (kbuf, (unsigned int)len);
921} 918}
922/*}}} */ 919/*}}} */
923 920
924#if MENUBAR_MAX || defined (KEYSYM_RESOURCE) 921#if defined (KEYSYM_RESOURCE)
925/*{{{ rxvt_cmd_write (), rxvt_cmd_getc () */
926/* attempt to `write' count to the input buffer */
927unsigned int 922unsigned int
928rxvt_term::cmd_write (const char *str, unsigned int count) 923rxvt_term::cmd_write (const char *str, unsigned int count)
929{ 924{
930 unsigned int n, s; 925 unsigned int n, s;
931 926
… …
972 967
973 if (want_refresh) 968 if (want_refresh)
974 { 969 {
975 if (SHOULD_INVOKE (HOOK_LINE_UPDATE)) 970 if (SHOULD_INVOKE (HOOK_LINE_UPDATE))
976 { 971 {
977 int row = -view_start; 972 int row = view_start;
978 int end_row = row + nrow; 973 int end_row = row + nrow;
979 974
980 while (row > -nsaved && ROW (row - 1).is_longer ()) 975 while (row > top_row && ROW (row - 1).is_longer ())
981 --row; 976 --row;
982 977
983 do 978 do
984 { 979 {
985 int start_row = row; 980 int start_row = row;
… …
1005 break; 1000 break;
1006 } 1001 }
1007 } 1002 }
1008 while (l->is_longer () && row < end_row); 1003 while (l->is_longer () && row < end_row);
1009 } 1004 }
1010 while (++row < end_row); 1005 while (row < end_row);
1011 } 1006 }
1012 1007
1013 scr_refresh (refresh_type); 1008 scr_refresh ();
1014 scrollbar_show (1); 1009 scrollbar_show (1);
1015#ifdef USE_XIM 1010#ifdef USE_XIM
1016 IMSendSpot (); 1011 IMSendSpot ();
1017#endif 1012#endif
1018 } 1013 }
… …
1021} 1016}
1022 1017
1023void 1018void
1024rxvt_term::check_cb (check_watcher &w) 1019rxvt_term::check_cb (check_watcher &w)
1025{ 1020{
1026 SET_R (this); 1021 make_current ();
1027 SET_LOCALE (locale);
1028 1022
1029 display->flush (); 1023 display->flush ();
1030 1024
1031 if (want_refresh && !flush_ev.active) 1025 if (want_refresh && !flush_ev.active)
1032 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
1033} 1027}
1034 1028
1035void 1029void
1036rxvt_term::flush_cb (time_watcher &w) 1030rxvt_term::flush_cb (time_watcher &w)
1037{ 1031{
1038 SET_R (this); 1032 make_current ();
1039 SET_LOCALE (locale);
1040 1033
1041 refresh_limit = 1; 1034 refresh_limit = 1;
1042 refresh_count = 0; 1035 refresh_count = 0;
1043 flush (); 1036 flush ();
1044} 1037}
… …
1048rxvt_term::cursor_blink_cb (time_watcher &w) 1041rxvt_term::cursor_blink_cb (time_watcher &w)
1049{ 1042{
1050 hidden_cursor = !hidden_cursor; 1043 hidden_cursor = !hidden_cursor;
1051 want_refresh = 1; 1044 want_refresh = 1;
1052 1045
1053 w.start (w.at + BLINK_INTERVAL); 1046 w.start (w.at + CURSOR_BLINK_INTERVAL);
1054} 1047}
1055#endif 1048#endif
1056 1049
1057#ifdef TEXT_BLINK 1050#ifdef TEXT_BLINK
1058void 1051void
… …
1072rxvt_term::cont_scroll_cb (time_watcher &w) 1065rxvt_term::cont_scroll_cb (time_watcher &w)
1073{ 1066{
1074 if ((scrollbar_isUp() || scrollbar_isDn()) && 1067 if ((scrollbar_isUp() || scrollbar_isDn()) &&
1075 scr_page (scrollbar_isUp() ? UP : DN, 1)) 1068 scr_page (scrollbar_isUp() ? UP : DN, 1))
1076 { 1069 {
1077 refresh_type |= SMOOTH_REFRESH;
1078 want_refresh = 1; 1070 want_refresh = 1;
1079 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1071 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1080 } 1072 }
1081} 1073}
1082#endif 1074#endif
… …
1086rxvt_term::sel_scroll_cb (time_watcher &w) 1078rxvt_term::sel_scroll_cb (time_watcher &w)
1087{ 1079{
1088 if (scr_page (scroll_selection_dir, scroll_selection_lines)) 1080 if (scr_page (scroll_selection_dir, scroll_selection_lines))
1089 { 1081 {
1090 selection_extend (selection_save_x, selection_save_y, selection_save_state); 1082 selection_extend (selection_save_x, selection_save_y, selection_save_state);
1091 refresh_type |= SMOOTH_REFRESH;
1092 want_refresh = 1; 1083 want_refresh = 1;
1093 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1084 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1094 } 1085 }
1095} 1086}
1096#endif 1087#endif
… …
1101{ 1092{
1102 if (mouse_slip_wheel_speed == 0 1093 if (mouse_slip_wheel_speed == 0
1103 || 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)
1104 : scr_page (UP, mouse_slip_wheel_speed)) 1095 : scr_page (UP, mouse_slip_wheel_speed))
1105 { 1096 {
1106 if (view_start == nsaved || 1097 if (view_start == top_row || view_start == 0)
1107 view_start == 0)
1108 mouse_slip_wheel_speed = 0; 1098 mouse_slip_wheel_speed = 0;
1109 1099
1110 refresh_type |= SMOOTH_REFRESH;
1111 want_refresh = 1; 1100 want_refresh = 1;
1112 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1101 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1113 } 1102 }
1114} 1103}
1115#endif 1104#endif
… …
1145 1134
1146 memmove (cmdbuf_base, cmdbuf_ptr, n); 1135 memmove (cmdbuf_base, cmdbuf_ptr, n);
1147 cmdbuf_ptr = cmdbuf_base; 1136 cmdbuf_ptr = cmdbuf_base;
1148 cmdbuf_endp = cmdbuf_ptr + n; 1137 cmdbuf_endp = cmdbuf_ptr + n;
1149 1138
1150 ssize_t r = read (pty.pty, cmdbuf_endp, CBUFSIZ - n); 1139 ssize_t r = read (pty->pty, cmdbuf_endp, CBUFSIZ - n);
1151 1140
1152 if (r > 0) 1141 if (r > 0)
1153 { 1142 {
1154 cmdbuf_endp += r; 1143 cmdbuf_endp += r;
1155 return true; 1144 return true;
… …
1173} 1162}
1174 1163
1175void 1164void
1176rxvt_term::pty_cb (io_watcher &w, short revents) 1165rxvt_term::pty_cb (io_watcher &w, short revents)
1177{ 1166{
1178 SET_R (this); 1167 make_current ();
1179 SET_LOCALE (locale);
1180 1168
1181 if (revents & EVENT_READ) 1169 if (revents & EVENT_READ)
1182 // loop, but don't allow a single term to monopolize us 1170 // loop, but don't allow a single term to monopolize us
1183 while (pty_fill ()) 1171 while (pty_fill ())
1184 if (cmd_parse ()) 1172 if (cmd_parse ())
… …
1216} 1204}
1217 1205
1218void 1206void
1219rxvt_term::pointer_cb (time_watcher &w) 1207rxvt_term::pointer_cb (time_watcher &w)
1220{ 1208{
1221 SET_R (this); 1209 make_current ();
1222 SET_LOCALE (locale);
1223 1210
1224 pointer_blank (); 1211 pointer_blank ();
1225} 1212}
1226#endif 1213#endif
1227 1214
… …
1306 1293
1307/*{{{ process an X event */ 1294/*{{{ process an X event */
1308void 1295void
1309rxvt_term::x_cb (XEvent &ev) 1296rxvt_term::x_cb (XEvent &ev)
1310{ 1297{
1298 make_current ();
1299
1311 dDisp; 1300 dDisp;
1312 1301
1313 SET_R (this); 1302 if (ev.xany.window == vt
1314 SET_LOCALE (locale); 1303 && SHOULD_INVOKE (HOOK_X_EVENT)
1304 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END)))
1305 return;
1315 1306
1307 // for XQueryPointer
1316 Window unused_root, unused_child; 1308 Window unused_root, unused_child;
1317 int unused_root_x, unused_root_y; 1309 int unused_root_x, unused_root_y;
1318 unsigned int unused_mask; 1310 unsigned int unused_mask;
1319 1311
1320 switch (ev.type) 1312 switch (ev.type)
… …
1327 1319
1328 break; 1320 break;
1329 1321
1330 case KeyRelease: 1322 case KeyRelease:
1331 { 1323 {
1332#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 1324#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL
1333 KeySym ks; 1325 KeySym keysym;
1334 1326
1335 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 :/
1336#endif 1328#endif
1337 1329
1338#if ENABLE_FRILLS || ISO_14755 1330#if ENABLE_FRILLS || ISO_14755
1339 // ISO 14755 support 1331 // ISO 14755 support
1340 if (iso14755buf) 1332 if (iso14755buf)
… …
1345# endif 1337# endif
1346# if ISO_14755 1338# if ISO_14755
1347 // iso14755 part 5.2 handling: release time 1339 // iso14755 part 5.2 handling: release time
1348 // first: controls 1340 // first: controls
1349 if ((ev.xkey.state & ControlMask) 1341 if ((ev.xkey.state & ControlMask)
1350 && ((ks >= 0x40 && ks <= 0x5f) 1342 && ((keysym >= 0x40 && keysym <= 0x5f)
1351 || (ks >= 0x61 && ks <= 0x7f))) 1343 || (keysym >= 0x61 && keysym <= 0x7f)))
1352 { 1344 {
1353 iso14755buf = ISO_14755_51 | 0x2400 | (ks & 0x1f); 1345 iso14755buf = ISO_14755_51 | 0x2400 | (keysym & 0x1f);
1354 commit_iso14755 (); 1346 commit_iso14755 ();
1355 goto skip_switch; 1347 goto skip_switch;
1356 } 1348 }
1357 1349
1358 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2) 1350 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
1359 if (i[0] == ks) 1351 if (i[0] == keysym)
1360 { 1352 {
1361 iso14755buf = ISO_14755_51 | i[1]; 1353 iso14755buf = ISO_14755_51 | i[1];
1362 commit_iso14755 (); 1354 commit_iso14755 ();
1363 goto skip_switch; 1355 goto skip_switch;
1364 } 1356 }
… …
1388 iso14755buf = 0; 1380 iso14755buf = 0;
1389 } 1381 }
1390#endif 1382#endif
1391 1383
1392 if (ev.xany.window == vt 1384 if (ev.xany.window == vt
1393 && HOOK_INVOKE ((this, HOOK_KEY_RELEASE, DT_XEVENT, &ev, DT_END))) 1385 && HOOK_INVOKE ((this, HOOK_KEY_RELEASE, DT_XEVENT, &ev, DT_INT, keysym, DT_END)))
1394 break; 1386 break;
1395 1387
1396#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1388#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1397 if (!(ev.xkey.state & ControlMask)) 1389 if (!(ev.xkey.state & ControlMask))
1398 slip_wheel_ev.stop (); 1390 slip_wheel_ev.stop ();
1399 else if (ks == XK_Control_L || ks == XK_Control_R) 1391 else if (keysym == XK_Control_L || keysym == XK_Control_R)
1400 mouse_slip_wheel_speed = 0; 1392 mouse_slip_wheel_speed = 0;
1401#endif 1393#endif
1402 break; 1394 break;
1403 } 1395 }
1404 1396
… …
1410 button_release (ev.xbutton); 1402 button_release (ev.xbutton);
1411 break; 1403 break;
1412 1404
1413 case ClientMessage: 1405 case ClientMessage:
1414 if (ev.xclient.format == 32 1406 if (ev.xclient.format == 32
1415 && ev.xclient.message_type == xa[XA_WM_PROTOCOLS]) 1407 && !HOOK_INVOKE ((this, HOOK_CLIENT_MESSAGE, DT_XEVENT, &ev, DT_END)))
1416 { 1408 {
1409 if (ev.xclient.message_type == xa[XA_WM_PROTOCOLS])
1410 {
1411 if (!HOOK_INVOKE ((this, HOOK_WM_PROTOCOLS, DT_XEVENT, &ev, DT_END)))
1412 {
1417 if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW]) 1413 if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW])
1414 {
1415 if (!HOOK_INVOKE ((this, HOOK_WM_DELETE_WINDOW, DT_XEVENT, &ev, DT_END)))
1418 destroy (); 1416 destroy ();
1417 }
1419#if ENABLE_EWMH 1418#if ENABLE_EWMH
1420 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING]) 1419 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING])
1421 XSendEvent (disp, ev.xclient.window = display->root, 1420 XSendEvent (disp, ev.xclient.window = display->root,
1422 False, SubstructureRedirectMask | SubstructureNotifyMask, 1421 False, SubstructureRedirectMask | SubstructureNotifyMask,
1423 &ev); 1422 &ev);
1423#endif
1424 }
1425 }
1426#if ENABLE_XEMBED
1427 else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
1428 {
1429 if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
1430 focus_in ();
1431 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1432 focus_out ();
1433 }
1424#endif 1434#endif
1425 } 1435 }
1426#if ENABLE_XEMBED
1427 else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
1428 {
1429 if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
1430 focus_in ();
1431 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1432 focus_out ();
1433 }
1434#endif
1435#ifdef OFFIX_DND
1436 /* OffiX Dnd (drag 'n' drop) protocol */
1437 else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL]
1438 && (ev.xclient.data.l[0] == DndFile
1439 || ev.xclient.data.l[0] == DndDir
1440 || ev.xclient.data.l[0] == DndLink))
1441 {
1442 /* Get Dnd data */
1443 Atom ActualType;
1444 int ActualFormat;
1445 unsigned char *data;
1446 unsigned long Size, RemainingBytes;
1447
1448 XGetWindowProperty (disp, display->root,
1449 xa[XA_DNDSELECTION],
1450 0L, 1000000L,
1451 False, AnyPropertyType,
1452 &ActualType, &ActualFormat,
1453 &Size, &RemainingBytes,
1454 &data);
1455 set_string_property (XA_CUT_BUFFER0, data);
1456 XFree (data);
1457 selection_paste (display->root, XA_CUT_BUFFER0, true);
1458 XSetInputFocus (disp, display->root, RevertToNone, CurrentTime);
1459 }
1460#endif /* OFFIX_DND */
1461 break; 1436 break;
1462 1437
1463 case MappingNotify: 1438 case MappingNotify:
1464 XRefreshKeyboardMapping (&ev.xmapping); 1439 XRefreshKeyboardMapping (&ev.xmapping);
1465 break; 1440 break;
… …
1507 { 1482 {
1508 seen_resize = 1; 1483 seen_resize = 1;
1509 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1484 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1510 } 1485 }
1511 1486
1487 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1488
1512#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */ 1489#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1513 if (OPTION (Opt_transparent)) 1490 if (OPTION (Opt_transparent))
1514 check_our_parents (); 1491 check_our_parents ();
1515#endif 1492#endif
1516 } 1493 }
1517 break; 1494 break;
1518 1495
1519 case PropertyNotify: 1496 case PropertyNotify:
1497 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END)))
1520 if (ev.xproperty.atom == xa[XA_VT_SELECTION] 1498 if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1521 && ev.xproperty.state == PropertyNewValue) 1499 && ev.xproperty.state == PropertyNewValue)
1522 selection_property (ev.xproperty.window, ev.xproperty.atom); 1500 selection_property (ev.xproperty.window, ev.xproperty.atom);
1523 1501
1524 break; 1502 break;
1525 1503
1526 case SelectionClear: 1504 case SelectionClear:
1527 selection_clear (); 1505 selection_clear ();
… …
1571 1549
1572 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev)) 1550 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev))
1573 scr_expose (ev.xexpose.x, ev.xexpose.y, 1551 scr_expose (ev.xexpose.x, ev.xexpose.y,
1574 ev.xexpose.width, ev.xexpose.height, False); 1552 ev.xexpose.width, ev.xexpose.height, False);
1575 1553
1576 scr_refresh (refresh_type); 1554 want_refresh = 1;
1577 } 1555 }
1578 else 1556 else
1579 { 1557 {
1580 XEvent unused_event; 1558 XEvent unused_event;
1581 1559
… …
1587 if (isScrollbarWindow (ev.xany.window)) 1565 if (isScrollbarWindow (ev.xany.window))
1588 { 1566 {
1589 scrollBar.setIdle (); 1567 scrollBar.setIdle ();
1590 scrollbar_show (0); 1568 scrollbar_show (0);
1591 } 1569 }
1592#ifdef MENUBAR
1593 if (menubar_visible () && isMenuBarWindow (ev.xany.window))
1594 menubar_expose ();
1595#endif
1596 1570
1597#ifdef TRANSPARENT 1571#ifdef TRANSPARENT
1598 if (am_transparent && ev.xany.window == parent[0]) 1572 if (am_transparent && ev.xany.window == parent[0])
1599 XClearWindow (disp, ev.xany.window); 1573 XClearWindow (disp, ev.xany.window);
1600#endif 1574#endif
… …
1604 case MotionNotify: 1578 case MotionNotify:
1605#ifdef POINTER_BLANK 1579#ifdef POINTER_BLANK
1606 if (hidden_pointer) 1580 if (hidden_pointer)
1607 pointer_unblank (); 1581 pointer_unblank ();
1608#endif 1582#endif
1609#if MENUBAR
1610 if (isMenuBarWindow (ev.xany.window))
1611 {
1612 menubar_control (ev.xbutton);
1613 break;
1614 }
1615#endif
1616 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1583 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1617 break; 1584 break;
1618 1585
1619 if (ev.xany.window == vt) 1586 if (ev.xany.window == vt)
1620 { 1587 {
1588 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)
1621 if (HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END))) 1589 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1622 ; // nop 1590 ; // nop
1623 else if (ev.xbutton.state & (Button1Mask | Button3Mask)) 1591 else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1624 { 1592 {
1625 while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev)) 1593 while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev))
1626 ; 1594 ;
… …
1708 &unused_root_x, &unused_root_y, 1676 &unused_root_x, &unused_root_y,
1709 &ev.xbutton.x, &ev.xbutton.y, 1677 &ev.xbutton.x, &ev.xbutton.y,
1710 &unused_mask); 1678 &unused_mask);
1711 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1679 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1712 scrollbar_size ()); 1680 scrollbar_size ());
1713 scr_refresh (refresh_type); 1681 want_refresh = 1;
1714 refresh_limit = 0; 1682 refresh_limit = 0;
1715 scrollbar_show (1); 1683 scrollbar_show (1);
1716 } 1684 }
1717 break; 1685 break;
1718 } 1686 }
… …
1726 { 1694 {
1727 hidden_cursor = 0; 1695 hidden_cursor = 0;
1728 want_refresh = 1; 1696 want_refresh = 1;
1729 } 1697 }
1730 1698
1731 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1699 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1732 } 1700 }
1733#endif 1701#endif
1734 1702
1735#if defined(POINTER_BLANK) 1703#if defined(POINTER_BLANK)
1736 if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0) 1704 if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0)
… …
1764 XSetICFocus (Input_Context); 1732 XSetICFocus (Input_Context);
1765 } 1733 }
1766#endif 1734#endif
1767#if CURSOR_BLINK 1735#if CURSOR_BLINK
1768 if (OPTION (Opt_cursorBlink)) 1736 if (OPTION (Opt_cursorBlink))
1769 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1737 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1770#endif 1738#endif
1771#if OFF_FOCUS_FADING 1739#if OFF_FOCUS_FADING
1772 if (rs[Rs_fade]) 1740 if (rs[Rs_fade])
1773 { 1741 {
1774 pix_colors = pix_colors_focused; 1742 pix_colors = pix_colors_focused;
… …
1818 1786
1819#if TRANSPARENT 1787#if TRANSPARENT
1820void 1788void
1821rxvt_term::rootwin_cb (XEvent &ev) 1789rxvt_term::rootwin_cb (XEvent &ev)
1822{ 1790{
1823 SET_R (this); 1791 make_current ();
1824 SET_LOCALE (locale);
1825 1792
1826 switch (ev.type) 1793 switch (ev.type)
1827 { 1794 {
1828 case PropertyNotify: 1795 case PropertyNotify:
1829 /* 1796 /*
… …
1856 /* 1823 /*
1857 * VT window processing of button press 1824 * VT window processing of button press
1858 */ 1825 */
1859 if (ev.window == vt) 1826 if (ev.window == vt)
1860 { 1827 {
1828 if (HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1829 return;
1830
1861#if ISO_14755 1831#if ISO_14755
1862 // 5.4 1832 // 5.4
1863 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 1833 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1864 { 1834 {
1865 iso14755_54 (ev.x, ev.y); 1835 iso14755_54 (ev.x, ev.y);
… …
1907 else 1877 else
1908 { 1878 {
1909 if (ev.button != MEvent.button) 1879 if (ev.button != MEvent.button)
1910 MEvent.clicks = 0; 1880 MEvent.clicks = 0;
1911 1881
1912 if (!HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1913 switch (ev.button) 1882 switch (ev.button)
1914 { 1883 {
1915 case Button1: 1884 case Button1:
1916 /* allow meta + click to select rectangular areas */ 1885 /* allow meta + click to select rectangular areas */
1917 /* should be done in screen.C */ 1886 /* should be done in screen.C */
1918#if ENABLE_FRILLS 1887#if ENABLE_FRILLS
1919 selection.rect = !!(ev.state & ModMetaMask); 1888 selection.rect = !!(ev.state & ModMetaMask);
1920#else 1889#else
1921 selection.rect = false; 1890 selection.rect = false;
1922#endif 1891#endif
1923 1892
1924 /* allow shift+left click to extend selection */ 1893 /* allow shift+left click to extend selection */
1925 if (ev.state & ShiftMask && ! (priv_modes & PrivMode_mouse_report)) 1894 if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report))
1926 { 1895 {
1927 if (MEvent.button == Button1 && clickintime) 1896 if (MEvent.button == Button1 && clickintime)
1928 selection_rotate (ev.x, ev.y); 1897 selection_rotate (ev.x, ev.y);
1929 else 1898 else
1930 selection_extend (ev.x, ev.y, 1); 1899 selection_extend (ev.x, ev.y, 1);
1931 } 1900 }
1932 else 1901 else
1933 { 1902 {
1934 if (MEvent.button == Button1 && clickintime) 1903 if (MEvent.button == Button1 && clickintime)
1935 MEvent.clicks++; 1904 MEvent.clicks++;
1936 else 1905 else
1937 MEvent.clicks = 1; 1906 MEvent.clicks = 1;
1938 1907
1939 selection_click (MEvent.clicks, ev.x, ev.y); 1908 selection_click (MEvent.clicks, ev.x, ev.y);
1940 } 1909 }
1941 1910
1942 MEvent.button = Button1; 1911 MEvent.button = Button1;
1943 break; 1912 break;
1944 1913
1945 case Button3: 1914 case Button3:
1946 if (MEvent.button == Button3 && clickintime) 1915 if (MEvent.button == Button3 && clickintime)
1947 selection_rotate (ev.x, ev.y); 1916 selection_rotate (ev.x, ev.y);
1948 else 1917 else
1949 selection_extend (ev.x, ev.y, 1); 1918 selection_extend (ev.x, ev.y, 1);
1950 1919
1951 MEvent.button = Button3; 1920 MEvent.button = Button3;
1952 break; 1921 break;
1953 } 1922 }
1954 } 1923 }
1955 1924
1956 MEvent.time = ev.time; 1925 MEvent.time = ev.time;
1957 return; 1926 return;
1958 } 1927 }
1959 1928
… …
2098 } 2067 }
2099 } 2068 }
2100 2069
2101 return; 2070 return;
2102 } 2071 }
2103
2104#if MENUBAR
2105 /*
2106 * Menubar window processing of button press
2107 */
2108 if (isMenuBarWindow (ev.window))
2109 menubar_control (ev);
2110#endif
2111} 2072}
2112 2073
2113void 2074void
2114rxvt_term::button_release (XButtonEvent &ev) 2075rxvt_term::button_release (XButtonEvent &ev)
2115{ 2076{
… …
2121 2082
2122 if (scrollbar_isUpDn ()) 2083 if (scrollbar_isUpDn ())
2123 { 2084 {
2124 scrollBar.setIdle (); 2085 scrollBar.setIdle ();
2125 scrollbar_show (0); 2086 scrollbar_show (0);
2126#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
2127 refresh_type &= ~SMOOTH_REFRESH;
2128#endif
2129 } 2087 }
2130 2088
2131#ifdef SELECTION_SCROLLING 2089#ifdef SELECTION_SCROLLING
2132 if (sel_scroll_ev.active) 2090 if (sel_scroll_ev.active)
2133 sel_scroll_ev.stop(); 2091 sel_scroll_ev.stop();
2134#endif 2092#endif
2135 2093
2136 if (ev.window == vt) 2094 if (ev.window == vt)
2137 { 2095 {
2096 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2097 return;
2098
2138#if ISO_14755 2099#if ISO_14755
2139 // 5.4 2100 // 5.4
2140 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 2101 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
2141 return; 2102 return;
2142#endif 2103#endif
2104
2143 if (reportmode) 2105 if (reportmode)
2144 { 2106 {
2145 /* mouse report from vt window */ 2107 /* mouse report from vt window */
2146 /* don't report release of wheel "buttons" */ 2108 /* don't report release of wheel "buttons" */
2147 if (ev.button >= 4) 2109 if (ev.button >= 4)
… …
2171 if (priv_modes & PrivMode_mouse_report 2133 if (priv_modes & PrivMode_mouse_report
2172 && bypass_keystate 2134 && bypass_keystate
2173 && ev.button == Button1 && MEvent.clicks <= 1) 2135 && ev.button == Button1 && MEvent.clicks <= 1)
2174 selection_extend (ev.x, ev.y, 0); 2136 selection_extend (ev.x, ev.y, 0);
2175 2137
2176 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2177 return;
2178
2179 switch (ev.button) 2138 switch (ev.button)
2180 { 2139 {
2181 case Button1: 2140 case Button1:
2182 case Button3: 2141 case Button3:
2183 selection_make (ev.time); 2142 selection_make (ev.time);
2184 break; 2143 break;
2144
2185 case Button2: 2145 case Button2:
2186 selection_request (ev.time, ev.x, ev.y); 2146 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window?
2147 selection_request (ev.time, ev.state & ShiftMask ? Sel_Clipboard : Sel_Primary);
2187 break; 2148 break;
2149
2188#ifdef MOUSE_WHEEL 2150#ifdef MOUSE_WHEEL
2189 case Button4: 2151 case Button4:
2190 case Button5: 2152 case Button5:
2191 { 2153 {
2192 int i; 2154 int i;
… …
2214 slip_wheel_ev.start (); 2176 slip_wheel_ev.start ();
2215 } 2177 }
2216 else 2178 else
2217 { 2179 {
2218# endif 2180# endif
2219# ifdef JUMP_MOUSE_WHEEL
2220 scr_page (v, i); 2181 scr_page (v, i);
2221 scr_refresh (SMOOTH_REFRESH);
2222 scrollbar_show (1); 2182 scrollbar_show (1);
2223# else
2224 while (i--)
2225 {
2226 scr_page (v, 1);
2227 scr_refresh (SMOOTH_REFRESH);
2228 scrollbar_show (1);
2229 }
2230# endif
2231# ifdef MOUSE_SLIP_WHEELING 2183# ifdef MOUSE_SLIP_WHEELING
2232 } 2184 }
2233#endif 2185# endif
2234 } 2186 }
2235 break; 2187 break;
2236#endif 2188#endif
2237 } 2189 }
2238 } 2190 }
2239#ifdef MENUBAR
2240 else if (isMenuBarWindow (ev.window))
2241 menubar_control (ev);
2242#endif
2243} 2191}
2244 2192
2245#ifdef TRANSPARENT 2193#ifdef TRANSPARENT
2246#if TINTING 2194#if TINTING
2247/* taken from aterm-0.4.2 */ 2195/* taken from aterm-0.4.2 */
… …
2684 am_transparent = 0; 2632 am_transparent = 0;
2685 /* XXX: also turn off Opt_transparent? */ 2633 /* XXX: also turn off Opt_transparent? */
2686 } 2634 }
2687 else 2635 else
2688 { 2636 {
2689#if WAIT_FOR_WM
2690 /* wait (an arbitrary period) for the WM to do its thing
2691 * needed for fvwm2.2.2 (and before?) */
2692 sleep (1);
2693#endif
2694 for (n = 0; n < (unsigned int)i; n++) 2637 for (n = 0; n < (unsigned int)i; n++)
2695 { 2638 {
2696 XSetWindowBackgroundPixmap (disp, parent[n], ParentRelative); 2639 XSetWindowBackgroundPixmap (disp, parent[n], ParentRelative);
2697 XClearWindow (disp, parent[n]); 2640 XClearWindow (disp, parent[n]);
2698 } 2641 }
… …
2790 } 2733 }
2791 2734
2792 // scr_add_lines only works for nlines <= nrow - 1. 2735 // scr_add_lines only works for nlines <= nrow - 1.
2793 if (nlines >= nrow - 1) 2736 if (nlines >= nrow - 1)
2794 { 2737 {
2738 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2795 if (!HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))) 2739 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2796 scr_add_lines (buf, str - buf, nlines); 2740 scr_add_lines (buf, str - buf, nlines);
2797 2741
2798 nlines = 0; 2742 nlines = 0;
2799 str = buf; 2743 str = buf;
2800 eol = str + min (ncol, UBUFSIZ); 2744 eol = str + min (ncol, UBUFSIZ);
… …
2815 2759
2816 seq_begin = cmdbuf_ptr; 2760 seq_begin = cmdbuf_ptr;
2817 ch = next_char (); 2761 ch = next_char ();
2818 } 2762 }
2819 2763
2764 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2820 if (!HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))) 2765 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2821 scr_add_lines (buf, str - buf, nlines); 2766 scr_add_lines (buf, str - buf, nlines);
2822 2767
2823 /* 2768 /*
2824 * If there have been a lot of new lines, then update the screen 2769 * If there have been a lot of new lines, then update the screen
2825 * What the heck I'll cheat and only refresh less than every page-full. 2770 * What the heck I'll cheat and only refresh less than every page-full.
… …
2831 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD) 2776 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2832 refresh_limit++; 2777 refresh_limit++;
2833 else 2778 else
2834 { 2779 {
2835 flag = true; 2780 flag = true;
2836 scr_refresh (refresh_type); 2781 scr_refresh ();
2837 flush_ev.stop (); 2782 want_refresh = 1;
2838 } 2783 }
2839 } 2784 }
2840 2785
2841 } 2786 }
2842 else 2787 else
… …
2859 return flag; 2804 return flag;
2860} 2805}
2861 2806
2862// read the next character 2807// read the next character
2863wchar_t 2808wchar_t
2864rxvt_term::next_char () 2809rxvt_term::next_char () NOTHROW
2865{ 2810{
2866 while (cmdbuf_ptr < cmdbuf_endp) 2811 while (cmdbuf_ptr < cmdbuf_endp)
2867 { 2812 {
2868 // assume 7-bit to be ascii ALWAYS 2813 // assume 7-bit to be ascii ALWAYS
2869 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2814 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)
… …
2890 return NOCHAR; 2835 return NOCHAR;
2891} 2836}
2892 2837
2893// read the next octet 2838// read the next octet
2894uint32_t 2839uint32_t
2895rxvt_term::next_octet () 2840rxvt_term::next_octet () NOTHROW
2896{ 2841{
2897 return cmdbuf_ptr < cmdbuf_endp 2842 return cmdbuf_ptr < cmdbuf_endp
2898 ? (unsigned char)*cmdbuf_ptr++ 2843 ? (unsigned char)*cmdbuf_ptr++
2899 : NOCHAR; 2844 : NOCHAR;
2900} 2845}
2846
2847static class out_of_input out_of_input;
2901 2848
2902/* rxvt_cmd_getc () - Return next input character */ 2849/* rxvt_cmd_getc () - Return next input character */
2903/* 2850/*
2904 * Return the next input character after first passing any keyboard input 2851 * Return the next input character after first passing any keyboard input
2905 * to the command. 2852 * to the command.
2906 */ 2853 */
2907wchar_t 2854wchar_t
2908rxvt_term::cmd_getc () 2855rxvt_term::cmd_getc () THROW ((class out_of_input))
2909{ 2856{
2910 wchar_t c = next_char (); 2857 wchar_t c = next_char ();
2911 2858
2912 if (c == NOCHAR) 2859 if (c == NOCHAR)
2913 throw out_of_input; 2860 throw out_of_input;
2914 2861
2915 return c; 2862 return c;
2916} 2863}
2917 2864
2918uint32_t 2865uint32_t
2919rxvt_term::cmd_get8 () 2866rxvt_term::cmd_get8 () THROW ((class out_of_input))
2920{ 2867{
2921 uint32_t c = next_octet (); 2868 uint32_t c = next_octet ();
2922 2869
2923 if (c == NOCHAR) 2870 if (c == NOCHAR)
2924 throw out_of_input; 2871 throw out_of_input;
… …
3803 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3750 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3804 */ 3751 */
3805void 3752void
3806rxvt_term::process_xterm_seq (int op, const char *str, char resp) 3753rxvt_term::process_xterm_seq (int op, const char *str, char resp)
3807{ 3754{
3808 int changed = 0;
3809 int color; 3755 int color;
3810 char *buf, *name; 3756 char *buf, *name;
3811 bool query = str[0] == '?' && !str[1]; 3757 bool query = str[0] == '?' && !str[1];
3812 int saveop = op; 3758 int saveop = op;
3813 dDisp; 3759 dDisp;
… …
3868 { 3814 {
3869 if ((name = strchr (buf, ';')) == NULL) 3815 if ((name = strchr (buf, ';')) == NULL)
3870 break; 3816 break;
3871 3817
3872 *name++ = '\0'; 3818 *name++ = '\0';
3873 color = atoi (buf); 3819 color = atoi (buf) + minCOLOR;
3874 3820
3875 if (color < 0 || color >= TOTAL_COLORS) 3821 if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR))
3876 break; 3822 break;
3877 3823
3878 if ((buf = strchr (name, ';')) != NULL) 3824 if ((buf = strchr (name, ';')) != NULL)
3879 *buf++ = '\0'; 3825 *buf++ = '\0';
3880 3826
3881 if (name[0] == '?' && !name[1]) 3827 if (name[0] == '?' && !name[1])
3882 { 3828 {
3883 unsigned short r, g, b; 3829 unsigned short r, g, b;
3884 pix_colors_focused[color + minCOLOR].get (display, r, g, b); 3830 pix_colors_focused[color].get (display, r, g, b);
3885 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp); 3831 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp);
3886 } 3832 }
3887 else 3833 else
3888 set_window_color (color + minCOLOR, name); 3834 set_window_color (color, name);
3889 } 3835 }
3890 break; 3836 break;
3891 case XTerm_Color00: 3837 case XTerm_Color00:
3892 process_color_seq (XTerm_Color00, Color_fg, str, resp); 3838 process_color_seq (XTerm_Color00, Color_fg, str, resp);
3893 break; 3839 break;
3894 case XTerm_Color01: 3840 case XTerm_Color01:
3895 process_color_seq (XTerm_Color00, Color_bg, str, resp); 3841 process_color_seq (XTerm_Color01, Color_bg, str, resp);
3896 break; 3842 break;
3897#ifndef NO_CURSORCOLOR 3843#ifndef NO_CURSORCOLOR
3898 case XTerm_Color_cursor: 3844 case XTerm_Color_cursor:
3899 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp); 3845 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp);
3900 break; 3846 break;
… …
3904 break; 3850 break;
3905 case XTerm_Color_pointer_bg: 3851 case XTerm_Color_pointer_bg:
3906 process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp); 3852 process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp);
3907 break; 3853 break;
3908#ifndef NO_BOLD_UNDERLINE_REVERSE 3854#ifndef NO_BOLD_UNDERLINE_REVERSE
3909 case XTerm_Color_BD:
3910 process_color_seq (XTerm_Color_BD, Color_BD, str, resp);
3911 break;
3912 case XTerm_Color_UL:
3913 process_color_seq (XTerm_Color_UL, Color_UL, str, resp);
3914 break;
3915 case XTerm_Color_RV: 3855 case XTerm_Color_RV:
3916 process_color_seq (XTerm_Color_RV, Color_RV, str, resp); 3856 process_color_seq (XTerm_Color_RV, Color_RV, str, resp);
3857 break;
3858 case Rxvt_Color_BD:
3859 case URxvt_Color_BD:
3860 process_color_seq (op, Color_BD, str, resp);
3861 break;
3862 case Rxvt_Color_UL:
3863 case URxvt_Color_UL:
3864 process_color_seq (op, Color_UL, str, resp);
3917 break; 3865 break;
3918 case URxvt_Color_IT: 3866 case URxvt_Color_IT:
3919 process_color_seq (URxvt_Color_IT, Color_IT, str, resp); 3867 process_color_seq (URxvt_Color_IT, Color_IT, str, resp);
3920 break; 3868 break;
3921#endif 3869#endif
… …
3926 if (am_transparent) 3874 if (am_transparent)
3927 want_full_refresh = want_refresh = 1; 3875 want_full_refresh = want_refresh = 1;
3928 break; 3876 break;
3929#endif 3877#endif
3930 3878
3931 case XTerm_Pixmap: 3879 case Rxvt_Pixmap:
3880 {
3932 if (*str != ';') 3881 if (*str != ';')
3933 { 3882 {
3934#if XPM_BACKGROUND 3883#if XPM_BACKGROUND
3935 scale_pixmap (""); /* reset to default scaling */ 3884 scale_pixmap (""); /* reset to default scaling */
3936 set_bgPixmap (str); /* change pixmap */ 3885 set_bgPixmap (str); /* change pixmap */
3937#endif
3938 scr_touch (true); 3886 scr_touch (true);
3887#endif
3939 } 3888 }
3889
3890 int changed = 0;
3891
3940 while ((str = strchr (str, ';')) != NULL) 3892 while ((str = strchr (str, ';')) != NULL)
3941 { 3893 {
3942 str++; 3894 str++;
3943#if XPM_BACKGROUND 3895#if XPM_BACKGROUND
3944 changed += scale_pixmap (str); 3896 changed += scale_pixmap (str);
3945#endif 3897#endif
3946 } 3898 }
3947 3899
3948 if (changed) 3900 if (changed)
3949 { 3901 {
3950#ifdef XPM_BACKGROUND 3902#ifdef XPM_BACKGROUND
3951 resize_pixmap (); 3903 resize_pixmap ();
3952#endif
3953 scr_touch (true); 3904 scr_touch (true);
3905#endif
3954 } 3906 }
3907 }
3955 break; 3908 break;
3956 3909
3957 case XTerm_restoreFG: 3910 case Rxvt_restoreFG:
3958 set_window_color (Color_fg, str); 3911 set_window_color (Color_fg, str);
3959 break; 3912 break;
3960 case XTerm_restoreBG: 3913 case Rxvt_restoreBG:
3961 set_window_color (Color_bg, str); 3914 set_window_color (Color_bg, str);
3962 break; 3915 break;
3963 3916
3964 case XTerm_logfile: 3917 case XTerm_logfile:
3965 // TODO, when secure mode? 3918 // TODO, when secure mode?
3966 break; 3919 break;
3967 3920
3968#ifdef MENUBAR
3969 case URxvt_Menu:
3970 if (OPTION (Opt_insecure))
3971 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked
3972 break;
3973#endif
3974#if 0 3921#if 0
3975 case XTerm_dumpscreen: /* no error notices */ 3922 case Rxvt_dumpscreen: /* no error notices */
3976 { 3923 {
3977 int fd; 3924 int fd;
3978 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0) 3925 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0)
3979 { 3926 {
3980 scr_dump (fd); 3927 scr_dump (fd);
… …
4011 if (query) 3958 if (query)
4012 tt_printf ("\33]%d;%-.250s%c", URxvt_locale, OPTION (Opt_insecure) ? locale : "", resp); 3959 tt_printf ("\33]%d;%-.250s%c", URxvt_locale, OPTION (Opt_insecure) ? locale : "", resp);
4013 else 3960 else
4014 { 3961 {
4015 set_locale (str); 3962 set_locale (str);
4016 pty.set_utf8_mode (enc_utf8); 3963 pty->set_utf8_mode (enc_utf8);
4017 init_xlocale (); 3964 init_xlocale ();
4018 } 3965 }
4019 break; 3966 break;
4020 3967
4021 case URxvt_view_up: 3968 case URxvt_view_up:
… …
4074 return state; 4021 return state;
4075} 4022}
4076 4023
4077/* we're not using priv _yet_ */ 4024/* we're not using priv _yet_ */
4078void 4025void
4079rxvt_term::process_terminal_mode (int mode, int priv __attribute__ ((unused)), unsigned int nargs, const int *arg) 4026rxvt_term::process_terminal_mode (int mode, int priv UNUSED, unsigned int nargs, const int *arg)
4080{ 4027{
4081 unsigned int i, j; 4028 unsigned int i, j;
4082 int state; 4029 int state;
4083 4030
4084 static const struct 4031 static const struct
… …
4095 { 5, PrivMode_rVideo }, 4042 { 5, PrivMode_rVideo },
4096 { 6, PrivMode_relOrigin }, 4043 { 6, PrivMode_relOrigin },
4097 { 7, PrivMode_Autowrap }, 4044 { 7, PrivMode_Autowrap },
4098 // 8, bi-directional support mode 4045 // 8, bi-directional support mode
4099 { 9, PrivMode_MouseX10 }, 4046 { 9, PrivMode_MouseX10 },
4100#ifdef menuBar_esc
4101 { menuBar_esc, PrivMode_menuBar },
4102#endif
4103 // 18, 19 printing-related 4047 // 18, 19 printing-related
4104 { 25, PrivMode_VisibleCursor }, 4048 { 25, PrivMode_VisibleCursor },
4105#ifdef scrollBar_esc 4049#ifdef scrollBar_esc
4106 { scrollBar_esc, PrivMode_scrollBar }, 4050 { scrollBar_esc, PrivMode_scrollBar },
4107#endif 4051#endif
… …
4202 /* case 8: - auto repeat, can't do on a per window basis */ 4146 /* case 8: - auto repeat, can't do on a per window basis */
4203 case 9: /* X10 mouse reporting */ 4147 case 9: /* X10 mouse reporting */
4204 if (state) /* orthogonal */ 4148 if (state) /* orthogonal */
4205 priv_modes &= ~PrivMode_MouseX11; 4149 priv_modes &= ~PrivMode_MouseX11;
4206 break; 4150 break;
4207#ifdef menuBar_esc
4208 case menuBar_esc:
4209#ifdef MENUBAR
4210 map_menuBar (state);
4211#endif
4212 break;
4213#endif
4214#ifdef scrollBar_esc 4151#ifdef scrollBar_esc
4215 case scrollBar_esc: 4152 case scrollBar_esc:
4216 if (scrollbar_mapping (state)) 4153 if (scrollbar_mapping (state))
4217 { 4154 {
4218 resize_all_windows (0, 0, 0); 4155 resize_all_windows (0, 0, 0);
… …
4460const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT 4397const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4461 4398
4462void 4399void
4463rxvt_term::tt_write (const char *data, unsigned int len) 4400rxvt_term::tt_write (const char *data, unsigned int len)
4464{ 4401{
4465 if (pty.pty < 0) 4402 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
4466 return; 4403 return;
4467 4404
4405 if (pty->pty < 0)
4406 return;
4407
4468 if (v_buflen == 0) 4408 if (v_buflen == 0)
4469 { 4409 {
4470 ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE)); 4410 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE));
4471 4411
4472 if ((unsigned int)written == len) 4412 if ((unsigned int)written == len)
4473 return; 4413 return;
4474 4414
4475 data += written; 4415 data += written;
… …
4484 pty_ev.set (EVENT_READ | EVENT_WRITE); 4424 pty_ev.set (EVENT_READ | EVENT_WRITE);
4485} 4425}
4486 4426
4487void rxvt_term::pty_write () 4427void rxvt_term::pty_write ()
4488{ 4428{
4489 int written = write (pty.pty, v_buffer, min (v_buflen, MAX_PTY_WRITE)); 4429 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
4490 4430
4491 if (written > 0) 4431 if (written > 0)
4492 { 4432 {
4493 v_buflen -= written; 4433 v_buflen -= written;
4494 4434

Diff Legend

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