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.260 by root, Fri Jan 13 05:04:33 2006 UTC vs.
Revision 1.283 by root, Tue Jan 24 19:40:12 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 {
… …
302rxvt_term::lookup_key (XKeyEvent &ev) 299rxvt_term::lookup_key (XKeyEvent &ev)
303{ 300{
304 int ctrl, meta, shft, len; 301 int ctrl, meta, shft, len;
305 unsigned int newlen; 302 unsigned int newlen;
306 KeySym keysym; 303 KeySym keysym;
307#ifdef DEBUG_CMD
308 static int debug_key = 1; /* accessible by a debugger only */
309#endif
310 int valid_keysym; 304 int valid_keysym;
311 char kbuf[KBUFSZ]; 305 char kbuf[KBUFSZ];
312 306
313 /* 307 /*
314 * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an 308 * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an
… …
443 scr_move_to (0, 1); 437 scr_move_to (0, 1);
444 return; 438 return;
445 } 439 }
446 else if (keysym == XK_End) 440 else if (keysym == XK_End)
447 { 441 {
448 scr_move_to (1, 0); 442 scr_move_to (1, 1);
449 return; 443 return;
450 } 444 }
451 } 445 }
452#endif 446#endif
453 } 447 }
… …
464 { 458 {
465 switch (keysym) 459 switch (keysym)
466 { 460 {
467 /* normal XTerm key bindings */ 461 /* normal XTerm key bindings */
468 case XK_Insert: /* Shift+Insert = paste mouse selection */ 462 case XK_Insert: /* Shift+Insert = paste mouse selection */
469 selection_request (ev.time, 0, 0); 463 selection_request (ev.time);
470 return; 464 return;
471#if TODO 465#if TODO
472 /* rxvt extras */ 466 /* rxvt extras */
473 case XK_KP_Add: /* Shift+KP_Add = bigger font */ 467 case XK_KP_Add: /* Shift+KP_Add = bigger font */
474 change_font (FONT_UP); 468 change_font (FONT_UP);
… …
905 { 899 {
906 const char ch = C0_ESC; 900 const char ch = C0_ESC;
907 tt_write (&ch, 1); 901 tt_write (&ch, 1);
908 } 902 }
909 903
910#if defined(DEBUG_CMD)
911 /* Display keyboard buffer contents */
912 unsigned char *p;
913 int i;
914
915 fprintf (stderr, "key 0x%04X [%d]: `", (unsigned int)keysym, len);
916 for (i = 0, p = kbuf; i < len; i++, p++)
917 fprintf (stderr, (*p >= ' ' && *p < '\177' ? "%c" : "\\%03o"), *p);
918 fprintf (stderr, "'\n");
919#endif /* DEBUG_CMD */
920 tt_write (kbuf, (unsigned int)len); 904 tt_write (kbuf, (unsigned int)len);
921} 905}
922/*}}} */ 906/*}}} */
923 907
924#if MENUBAR_MAX || defined (KEYSYM_RESOURCE) 908#if defined (KEYSYM_RESOURCE)
925/*{{{ rxvt_cmd_write (), rxvt_cmd_getc () */
926/* attempt to `write' count to the input buffer */
927unsigned int 909unsigned int
928rxvt_term::cmd_write (const char *str, unsigned int count) 910rxvt_term::cmd_write (const char *str, unsigned int count)
929{ 911{
930 unsigned int n, s; 912 unsigned int n, s;
931 913
… …
972 954
973 if (want_refresh) 955 if (want_refresh)
974 { 956 {
975 if (SHOULD_INVOKE (HOOK_LINE_UPDATE)) 957 if (SHOULD_INVOKE (HOOK_LINE_UPDATE))
976 { 958 {
977 int row = -view_start; 959 int row = view_start;
978 int end_row = row + nrow; 960 int end_row = row + nrow;
979 961
980 while (row > -nsaved && ROW (row - 1).is_longer ()) 962 while (row > top_row && ROW (row - 1).is_longer ())
981 --row; 963 --row;
982 964
983 do 965 do
984 { 966 {
985 int start_row = row; 967 int start_row = row;
… …
1008 while (l->is_longer () && row < end_row); 990 while (l->is_longer () && row < end_row);
1009 } 991 }
1010 while (row < end_row); 992 while (row < end_row);
1011 } 993 }
1012 994
1013 scr_refresh (refresh_type); 995 scr_refresh ();
1014 scrollbar_show (1); 996 scrollbar_show (1);
1015#ifdef USE_XIM 997#ifdef USE_XIM
1016 IMSendSpot (); 998 IMSendSpot ();
1017#endif 999#endif
1018 } 1000 }
… …
1021} 1003}
1022 1004
1023void 1005void
1024rxvt_term::check_cb (check_watcher &w) 1006rxvt_term::check_cb (check_watcher &w)
1025{ 1007{
1026 SET_R (this); 1008 make_current ();
1027 SET_LOCALE (locale);
1028 1009
1029 display->flush (); 1010 display->flush ();
1030 1011
1031 if (want_refresh && !flush_ev.active) 1012 if (want_refresh && !flush_ev.active)
1032 flush_ev.start (NOW + 1. / 60.); // refresh at max. 60 hz normally 1013 flush_ev.start (NOW + 1. / 60.); // refresh at max. 60 hz normally
1033} 1014}
1034 1015
1035void 1016void
1036rxvt_term::flush_cb (time_watcher &w) 1017rxvt_term::flush_cb (time_watcher &w)
1037{ 1018{
1038 SET_R (this); 1019 make_current ();
1039 SET_LOCALE (locale);
1040 1020
1041 refresh_limit = 1; 1021 refresh_limit = 1;
1042 refresh_count = 0; 1022 refresh_count = 0;
1043 flush (); 1023 flush ();
1044} 1024}
… …
1048rxvt_term::cursor_blink_cb (time_watcher &w) 1028rxvt_term::cursor_blink_cb (time_watcher &w)
1049{ 1029{
1050 hidden_cursor = !hidden_cursor; 1030 hidden_cursor = !hidden_cursor;
1051 want_refresh = 1; 1031 want_refresh = 1;
1052 1032
1053 w.start (w.at + BLINK_INTERVAL); 1033 w.start (w.at + CURSOR_BLINK_INTERVAL);
1054} 1034}
1055#endif 1035#endif
1056 1036
1057#ifdef TEXT_BLINK 1037#ifdef TEXT_BLINK
1058void 1038void
… …
1072rxvt_term::cont_scroll_cb (time_watcher &w) 1052rxvt_term::cont_scroll_cb (time_watcher &w)
1073{ 1053{
1074 if ((scrollbar_isUp() || scrollbar_isDn()) && 1054 if ((scrollbar_isUp() || scrollbar_isDn()) &&
1075 scr_page (scrollbar_isUp() ? UP : DN, 1)) 1055 scr_page (scrollbar_isUp() ? UP : DN, 1))
1076 { 1056 {
1077 refresh_type |= SMOOTH_REFRESH;
1078 want_refresh = 1; 1057 want_refresh = 1;
1079 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1058 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1080 } 1059 }
1081} 1060}
1082#endif 1061#endif
… …
1086rxvt_term::sel_scroll_cb (time_watcher &w) 1065rxvt_term::sel_scroll_cb (time_watcher &w)
1087{ 1066{
1088 if (scr_page (scroll_selection_dir, scroll_selection_lines)) 1067 if (scr_page (scroll_selection_dir, scroll_selection_lines))
1089 { 1068 {
1090 selection_extend (selection_save_x, selection_save_y, selection_save_state); 1069 selection_extend (selection_save_x, selection_save_y, selection_save_state);
1091 refresh_type |= SMOOTH_REFRESH;
1092 want_refresh = 1; 1070 want_refresh = 1;
1093 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1071 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1094 } 1072 }
1095} 1073}
1096#endif 1074#endif
… …
1101{ 1079{
1102 if (mouse_slip_wheel_speed == 0 1080 if (mouse_slip_wheel_speed == 0
1103 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed) 1081 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
1104 : scr_page (UP, mouse_slip_wheel_speed)) 1082 : scr_page (UP, mouse_slip_wheel_speed))
1105 { 1083 {
1106 if (view_start == nsaved || 1084 if (view_start == top_row || view_start == 0)
1107 view_start == 0)
1108 mouse_slip_wheel_speed = 0; 1085 mouse_slip_wheel_speed = 0;
1109 1086
1110 refresh_type |= SMOOTH_REFRESH;
1111 want_refresh = 1; 1087 want_refresh = 1;
1112 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1088 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1113 } 1089 }
1114} 1090}
1115#endif 1091#endif
… …
1145 1121
1146 memmove (cmdbuf_base, cmdbuf_ptr, n); 1122 memmove (cmdbuf_base, cmdbuf_ptr, n);
1147 cmdbuf_ptr = cmdbuf_base; 1123 cmdbuf_ptr = cmdbuf_base;
1148 cmdbuf_endp = cmdbuf_ptr + n; 1124 cmdbuf_endp = cmdbuf_ptr + n;
1149 1125
1150 ssize_t r = read (pty.pty, cmdbuf_endp, CBUFSIZ - n); 1126 ssize_t r = read (pty->pty, cmdbuf_endp, CBUFSIZ - n);
1151 1127
1152 if (r > 0) 1128 if (r > 0)
1153 { 1129 {
1154 cmdbuf_endp += r; 1130 cmdbuf_endp += r;
1155 return true; 1131 return true;
… …
1173} 1149}
1174 1150
1175void 1151void
1176rxvt_term::pty_cb (io_watcher &w, short revents) 1152rxvt_term::pty_cb (io_watcher &w, short revents)
1177{ 1153{
1178 SET_R (this); 1154 make_current ();
1179 SET_LOCALE (locale);
1180 1155
1181 if (revents & EVENT_READ) 1156 if (revents & EVENT_READ)
1182 // loop, but don't allow a single term to monopolize us 1157 // loop, but don't allow a single term to monopolize us
1183 while (pty_fill ()) 1158 while (pty_fill ())
1184 if (cmd_parse ()) 1159 if (cmd_parse ())
… …
1216} 1191}
1217 1192
1218void 1193void
1219rxvt_term::pointer_cb (time_watcher &w) 1194rxvt_term::pointer_cb (time_watcher &w)
1220{ 1195{
1221 SET_R (this); 1196 make_current ();
1222 SET_LOCALE (locale);
1223 1197
1224 pointer_blank (); 1198 pointer_blank ();
1225} 1199}
1226#endif 1200#endif
1227 1201
… …
1306 1280
1307/*{{{ process an X event */ 1281/*{{{ process an X event */
1308void 1282void
1309rxvt_term::x_cb (XEvent &ev) 1283rxvt_term::x_cb (XEvent &ev)
1310{ 1284{
1285 make_current ();
1286
1311 dDisp; 1287 dDisp;
1312 1288
1313 SET_R (this);
1314 SET_LOCALE (locale);
1315
1316 if (ev.xany.window == vt 1289 if (ev.xany.window == vt
1290 && SHOULD_INVOKE (HOOK_X_EVENT)
1317 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END))) 1291 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END)))
1318 return; 1292 return;
1319 1293
1320 // for XQueryPointer 1294 // for XQueryPointer
1321 Window unused_root, unused_child; 1295 Window unused_root, unused_child;
… …
1415 button_release (ev.xbutton); 1389 button_release (ev.xbutton);
1416 break; 1390 break;
1417 1391
1418 case ClientMessage: 1392 case ClientMessage:
1419 if (ev.xclient.format == 32 1393 if (ev.xclient.format == 32
1420 && ev.xclient.message_type == xa[XA_WM_PROTOCOLS]) 1394 && !HOOK_INVOKE ((this, HOOK_CLIENT_MESSAGE, DT_XEVENT, &ev, DT_END)))
1421 { 1395 {
1396 if (ev.xclient.message_type == xa[XA_WM_PROTOCOLS])
1397 {
1398 if (!HOOK_INVOKE ((this, HOOK_WM_PROTOCOLS, DT_XEVENT, &ev, DT_END)))
1399 {
1422 if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW]) 1400 if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW])
1401 {
1402 if (!HOOK_INVOKE ((this, HOOK_WM_DELETE_WINDOW, DT_XEVENT, &ev, DT_END)))
1423 destroy (); 1403 destroy ();
1404 }
1424#if ENABLE_EWMH 1405#if ENABLE_EWMH
1425 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING]) 1406 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING])
1426 XSendEvent (disp, ev.xclient.window = display->root, 1407 XSendEvent (disp, ev.xclient.window = display->root,
1427 False, SubstructureRedirectMask | SubstructureNotifyMask, 1408 False, SubstructureRedirectMask | SubstructureNotifyMask,
1428 &ev); 1409 &ev);
1410#endif
1411 }
1412 }
1413#if ENABLE_XEMBED
1414 else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
1415 {
1416 if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
1417 focus_in ();
1418 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1419 focus_out ();
1420 }
1429#endif 1421#endif
1430 } 1422 }
1431#if ENABLE_XEMBED
1432 else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
1433 {
1434 if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
1435 focus_in ();
1436 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1437 focus_out ();
1438 }
1439#endif
1440#ifdef OFFIX_DND
1441 /* OffiX Dnd (drag 'n' drop) protocol */
1442 else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL]
1443 && (ev.xclient.data.l[0] == DndFile
1444 || ev.xclient.data.l[0] == DndDir
1445 || ev.xclient.data.l[0] == DndLink))
1446 {
1447 /* Get Dnd data */
1448 Atom ActualType;
1449 int ActualFormat;
1450 unsigned char *data;
1451 unsigned long Size, RemainingBytes;
1452
1453 XGetWindowProperty (disp, display->root,
1454 xa[XA_DNDSELECTION],
1455 0L, 1000000L,
1456 False, AnyPropertyType,
1457 &ActualType, &ActualFormat,
1458 &Size, &RemainingBytes,
1459 &data);
1460 set_string_property (XA_CUT_BUFFER0, data);
1461 XFree (data);
1462 selection_paste (display->root, XA_CUT_BUFFER0, true);
1463 XSetInputFocus (disp, display->root, RevertToNone, CurrentTime);
1464 }
1465#endif /* OFFIX_DND */
1466 break; 1423 break;
1467 1424
1468 case MappingNotify: 1425 case MappingNotify:
1469 XRefreshKeyboardMapping (&ev.xmapping); 1426 XRefreshKeyboardMapping (&ev.xmapping);
1470 break; 1427 break;
… …
1512 { 1469 {
1513 seen_resize = 1; 1470 seen_resize = 1;
1514 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1471 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1515 } 1472 }
1516 1473
1474 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1475
1517#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */ 1476#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1518 if (OPTION (Opt_transparent)) 1477 if (OPTION (Opt_transparent))
1519 check_our_parents (); 1478 check_our_parents ();
1520#endif 1479#endif
1521 } 1480 }
1522 break; 1481 break;
1523 1482
1524 case PropertyNotify: 1483 case PropertyNotify:
1484 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END)))
1525 if (ev.xproperty.atom == xa[XA_VT_SELECTION] 1485 if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1526 && ev.xproperty.state == PropertyNewValue) 1486 && ev.xproperty.state == PropertyNewValue)
1527 selection_property (ev.xproperty.window, ev.xproperty.atom); 1487 selection_property (ev.xproperty.window, ev.xproperty.atom);
1528 1488
1529 break; 1489 break;
1530 1490
1531 case SelectionClear: 1491 case SelectionClear:
1532 selection_clear (); 1492 selection_clear ();
… …
1592 if (isScrollbarWindow (ev.xany.window)) 1552 if (isScrollbarWindow (ev.xany.window))
1593 { 1553 {
1594 scrollBar.setIdle (); 1554 scrollBar.setIdle ();
1595 scrollbar_show (0); 1555 scrollbar_show (0);
1596 } 1556 }
1597#ifdef MENUBAR
1598 if (menubar_visible () && isMenuBarWindow (ev.xany.window))
1599 menubar_expose ();
1600#endif
1601 1557
1602#ifdef TRANSPARENT 1558#ifdef TRANSPARENT
1603 if (am_transparent && ev.xany.window == parent[0]) 1559 if (am_transparent && ev.xany.window == parent[0])
1604 XClearWindow (disp, ev.xany.window); 1560 XClearWindow (disp, ev.xany.window);
1605#endif 1561#endif
1606 } 1562 }
1607 break; 1563 break;
1608 1564
1609 case MotionNotify: 1565 case MotionNotify:
1610 printf ("motion notify\n");//D
1611#ifdef POINTER_BLANK 1566#ifdef POINTER_BLANK
1612 if (hidden_pointer) 1567 if (hidden_pointer)
1613 pointer_unblank (); 1568 pointer_unblank ();
1614#endif 1569#endif
1615#if MENUBAR
1616 if (isMenuBarWindow (ev.xany.window))
1617 {
1618 menubar_control (ev.xbutton);
1619 break;
1620 }
1621#endif
1622 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1570 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1623 break; 1571 break;
1624 1572
1625 if (ev.xany.window == vt) 1573 if (ev.xany.window == vt)
1626 { 1574 {
1575 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)
1627 if (HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END))) 1576 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1628 ; // nop 1577 ; // nop
1629 else if (ev.xbutton.state & (Button1Mask | Button3Mask)) 1578 else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1630 { 1579 {
1631 while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev)) 1580 while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev))
1632 ; 1581 ;
… …
1732 { 1681 {
1733 hidden_cursor = 0; 1682 hidden_cursor = 0;
1734 want_refresh = 1; 1683 want_refresh = 1;
1735 } 1684 }
1736 1685
1737 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1686 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1738 } 1687 }
1739#endif 1688#endif
1740 1689
1741#if defined(POINTER_BLANK) 1690#if defined(POINTER_BLANK)
1742 if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0) 1691 if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0)
… …
1770 XSetICFocus (Input_Context); 1719 XSetICFocus (Input_Context);
1771 } 1720 }
1772#endif 1721#endif
1773#if CURSOR_BLINK 1722#if CURSOR_BLINK
1774 if (OPTION (Opt_cursorBlink)) 1723 if (OPTION (Opt_cursorBlink))
1775 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1724 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1776#endif 1725#endif
1777#if OFF_FOCUS_FADING 1726#if OFF_FOCUS_FADING
1778 if (rs[Rs_fade]) 1727 if (rs[Rs_fade])
1779 { 1728 {
1780 pix_colors = pix_colors_focused; 1729 pix_colors = pix_colors_focused;
… …
1824 1773
1825#if TRANSPARENT 1774#if TRANSPARENT
1826void 1775void
1827rxvt_term::rootwin_cb (XEvent &ev) 1776rxvt_term::rootwin_cb (XEvent &ev)
1828{ 1777{
1829 SET_R (this); 1778 make_current ();
1830 SET_LOCALE (locale);
1831 1779
1832 switch (ev.type) 1780 switch (ev.type)
1833 { 1781 {
1834 case PropertyNotify: 1782 case PropertyNotify:
1835 /* 1783 /*
… …
1862 /* 1810 /*
1863 * VT window processing of button press 1811 * VT window processing of button press
1864 */ 1812 */
1865 if (ev.window == vt) 1813 if (ev.window == vt)
1866 { 1814 {
1815 if (HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1816 return;
1817
1867#if ISO_14755 1818#if ISO_14755
1868 // 5.4 1819 // 5.4
1869 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 1820 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1870 { 1821 {
1871 iso14755_54 (ev.x, ev.y); 1822 iso14755_54 (ev.x, ev.y);
… …
1913 else 1864 else
1914 { 1865 {
1915 if (ev.button != MEvent.button) 1866 if (ev.button != MEvent.button)
1916 MEvent.clicks = 0; 1867 MEvent.clicks = 0;
1917 1868
1918 if (!HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1919 switch (ev.button) 1869 switch (ev.button)
1920 { 1870 {
1921 case Button1: 1871 case Button1:
1922 /* allow meta + click to select rectangular areas */ 1872 /* allow meta + click to select rectangular areas */
1923 /* should be done in screen.C */ 1873 /* should be done in screen.C */
1924#if ENABLE_FRILLS 1874#if ENABLE_FRILLS
1925 selection.rect = !!(ev.state & ModMetaMask); 1875 selection.rect = !!(ev.state & ModMetaMask);
1926#else 1876#else
1927 selection.rect = false; 1877 selection.rect = false;
1928#endif 1878#endif
1929 1879
1930 /* allow shift+left click to extend selection */ 1880 /* allow shift+left click to extend selection */
1931 if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report)) 1881 if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report))
1932 { 1882 {
1933 if (MEvent.button == Button1 && clickintime) 1883 if (MEvent.button == Button1 && clickintime)
1934 selection_rotate (ev.x, ev.y); 1884 selection_rotate (ev.x, ev.y);
1935 else 1885 else
1936 selection_extend (ev.x, ev.y, 1); 1886 selection_extend (ev.x, ev.y, 1);
1937 } 1887 }
1938 else 1888 else
1939 { 1889 {
1940 if (MEvent.button == Button1 && clickintime) 1890 if (MEvent.button == Button1 && clickintime)
1941 MEvent.clicks++; 1891 MEvent.clicks++;
1942 else 1892 else
1943 MEvent.clicks = 1; 1893 MEvent.clicks = 1;
1944 1894
1945 selection_click (MEvent.clicks, ev.x, ev.y); 1895 selection_click (MEvent.clicks, ev.x, ev.y);
1946 } 1896 }
1947 1897
1948 MEvent.button = Button1; 1898 MEvent.button = Button1;
1949 break; 1899 break;
1950 1900
1951 case Button3: 1901 case Button3:
1952 if (MEvent.button == Button3 && clickintime) 1902 if (MEvent.button == Button3 && clickintime)
1953 selection_rotate (ev.x, ev.y); 1903 selection_rotate (ev.x, ev.y);
1954 else 1904 else
1955 selection_extend (ev.x, ev.y, 1); 1905 selection_extend (ev.x, ev.y, 1);
1956 1906
1957 MEvent.button = Button3; 1907 MEvent.button = Button3;
1958 break; 1908 break;
1959 } 1909 }
1960 } 1910 }
1961 1911
1962 MEvent.time = ev.time; 1912 MEvent.time = ev.time;
1963 return; 1913 return;
1964 } 1914 }
1965 1915
… …
2104 } 2054 }
2105 } 2055 }
2106 2056
2107 return; 2057 return;
2108 } 2058 }
2109
2110#if MENUBAR
2111 /*
2112 * Menubar window processing of button press
2113 */
2114 if (isMenuBarWindow (ev.window))
2115 menubar_control (ev);
2116#endif
2117} 2059}
2118 2060
2119void 2061void
2120rxvt_term::button_release (XButtonEvent &ev) 2062rxvt_term::button_release (XButtonEvent &ev)
2121{ 2063{
… …
2127 2069
2128 if (scrollbar_isUpDn ()) 2070 if (scrollbar_isUpDn ())
2129 { 2071 {
2130 scrollBar.setIdle (); 2072 scrollBar.setIdle ();
2131 scrollbar_show (0); 2073 scrollbar_show (0);
2132#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
2133 refresh_type &= ~SMOOTH_REFRESH;
2134#endif
2135 } 2074 }
2136 2075
2137#ifdef SELECTION_SCROLLING 2076#ifdef SELECTION_SCROLLING
2138 if (sel_scroll_ev.active) 2077 if (sel_scroll_ev.active)
2139 sel_scroll_ev.stop(); 2078 sel_scroll_ev.stop();
2140#endif 2079#endif
2141 2080
2142 if (ev.window == vt) 2081 if (ev.window == vt)
2143 { 2082 {
2083 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2084 return;
2085
2144#if ISO_14755 2086#if ISO_14755
2145 // 5.4 2087 // 5.4
2146 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 2088 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
2147 return; 2089 return;
2148#endif 2090#endif
2091
2149 if (reportmode) 2092 if (reportmode)
2150 { 2093 {
2151 /* mouse report from vt window */ 2094 /* mouse report from vt window */
2152 /* don't report release of wheel "buttons" */ 2095 /* don't report release of wheel "buttons" */
2153 if (ev.button >= 4) 2096 if (ev.button >= 4)
… …
2177 if (priv_modes & PrivMode_mouse_report 2120 if (priv_modes & PrivMode_mouse_report
2178 && bypass_keystate 2121 && bypass_keystate
2179 && ev.button == Button1 && MEvent.clicks <= 1) 2122 && ev.button == Button1 && MEvent.clicks <= 1)
2180 selection_extend (ev.x, ev.y, 0); 2123 selection_extend (ev.x, ev.y, 0);
2181 2124
2182 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2183 return;
2184
2185 switch (ev.button) 2125 switch (ev.button)
2186 { 2126 {
2187 case Button1: 2127 case Button1:
2188 case Button3: 2128 case Button3:
2189 selection_make (ev.time); 2129 selection_make (ev.time);
2190 break; 2130 break;
2131
2191 case Button2: 2132 case Button2:
2192 selection_request (ev.time, ev.x, ev.y); 2133 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window?
2134 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Primary : Sel_Primary);
2193 break; 2135 break;
2136
2194#ifdef MOUSE_WHEEL 2137#ifdef MOUSE_WHEEL
2195 case Button4: 2138 case Button4:
2196 case Button5: 2139 case Button5:
2197 { 2140 {
2198 int i; 2141 int i;
… …
2230 } 2173 }
2231 break; 2174 break;
2232#endif 2175#endif
2233 } 2176 }
2234 } 2177 }
2235#ifdef MENUBAR
2236 else if (isMenuBarWindow (ev.window))
2237 menubar_control (ev);
2238#endif
2239} 2178}
2240 2179
2241#ifdef TRANSPARENT 2180#ifdef TRANSPARENT
2242#if TINTING 2181#if TINTING
2243/* taken from aterm-0.4.2 */ 2182/* taken from aterm-0.4.2 */
… …
2680 am_transparent = 0; 2619 am_transparent = 0;
2681 /* XXX: also turn off Opt_transparent? */ 2620 /* XXX: also turn off Opt_transparent? */
2682 } 2621 }
2683 else 2622 else
2684 { 2623 {
2685#if WAIT_FOR_WM
2686 /* wait (an arbitrary period) for the WM to do its thing
2687 * needed for fvwm2.2.2 (and before?) */
2688 sleep (1);
2689#endif
2690 for (n = 0; n < (unsigned int)i; n++) 2624 for (n = 0; n < (unsigned int)i; n++)
2691 { 2625 {
2692 XSetWindowBackgroundPixmap (disp, parent[n], ParentRelative); 2626 XSetWindowBackgroundPixmap (disp, parent[n], ParentRelative);
2693 XClearWindow (disp, parent[n]); 2627 XClearWindow (disp, parent[n]);
2694 } 2628 }
… …
2786 } 2720 }
2787 2721
2788 // scr_add_lines only works for nlines <= nrow - 1. 2722 // scr_add_lines only works for nlines <= nrow - 1.
2789 if (nlines >= nrow - 1) 2723 if (nlines >= nrow - 1)
2790 { 2724 {
2725 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2791 if (!HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))) 2726 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2792 scr_add_lines (buf, str - buf, nlines); 2727 scr_add_lines (buf, str - buf, nlines);
2793 2728
2794 nlines = 0; 2729 nlines = 0;
2795 str = buf; 2730 str = buf;
2796 eol = str + min (ncol, UBUFSIZ); 2731 eol = str + min (ncol, UBUFSIZ);
… …
2811 2746
2812 seq_begin = cmdbuf_ptr; 2747 seq_begin = cmdbuf_ptr;
2813 ch = next_char (); 2748 ch = next_char ();
2814 } 2749 }
2815 2750
2751 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2816 if (!HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))) 2752 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2817 scr_add_lines (buf, str - buf, nlines); 2753 scr_add_lines (buf, str - buf, nlines);
2818 2754
2819 /* 2755 /*
2820 * If there have been a lot of new lines, then update the screen 2756 * If there have been a lot of new lines, then update the screen
2821 * What the heck I'll cheat and only refresh less than every page-full. 2757 * What the heck I'll cheat and only refresh less than every page-full.
… …
2827 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD) 2763 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2828 refresh_limit++; 2764 refresh_limit++;
2829 else 2765 else
2830 { 2766 {
2831 flag = true; 2767 flag = true;
2832 scr_refresh (refresh_type); 2768 scr_refresh ();
2833 want_refresh = 1; 2769 want_refresh = 1;
2834 } 2770 }
2835 } 2771 }
2836 2772
2837 } 2773 }
… …
2855 return flag; 2791 return flag;
2856} 2792}
2857 2793
2858// read the next character 2794// read the next character
2859wchar_t 2795wchar_t
2860rxvt_term::next_char () 2796rxvt_term::next_char () NOTHROW
2861{ 2797{
2862 while (cmdbuf_ptr < cmdbuf_endp) 2798 while (cmdbuf_ptr < cmdbuf_endp)
2863 { 2799 {
2864 // assume 7-bit to be ascii ALWAYS 2800 // assume 7-bit to be ascii ALWAYS
2865 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2801 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)
… …
2886 return NOCHAR; 2822 return NOCHAR;
2887} 2823}
2888 2824
2889// read the next octet 2825// read the next octet
2890uint32_t 2826uint32_t
2891rxvt_term::next_octet () 2827rxvt_term::next_octet () NOTHROW
2892{ 2828{
2893 return cmdbuf_ptr < cmdbuf_endp 2829 return cmdbuf_ptr < cmdbuf_endp
2894 ? (unsigned char)*cmdbuf_ptr++ 2830 ? (unsigned char)*cmdbuf_ptr++
2895 : NOCHAR; 2831 : NOCHAR;
2896} 2832}
2833
2834static class out_of_input out_of_input;
2897 2835
2898/* rxvt_cmd_getc () - Return next input character */ 2836/* rxvt_cmd_getc () - Return next input character */
2899/* 2837/*
2900 * Return the next input character after first passing any keyboard input 2838 * Return the next input character after first passing any keyboard input
2901 * to the command. 2839 * to the command.
2902 */ 2840 */
2903wchar_t 2841wchar_t
2904rxvt_term::cmd_getc () 2842rxvt_term::cmd_getc () THROW ((class out_of_input))
2905{ 2843{
2906 wchar_t c = next_char (); 2844 wchar_t c = next_char ();
2907 2845
2908 if (c == NOCHAR) 2846 if (c == NOCHAR)
2909 throw out_of_input; 2847 throw out_of_input;
2910 2848
2911 return c; 2849 return c;
2912} 2850}
2913 2851
2914uint32_t 2852uint32_t
2915rxvt_term::cmd_get8 () 2853rxvt_term::cmd_get8 () THROW ((class out_of_input))
2916{ 2854{
2917 uint32_t c = next_octet (); 2855 uint32_t c = next_octet ();
2918 2856
2919 if (c == NOCHAR) 2857 if (c == NOCHAR)
2920 throw out_of_input; 2858 throw out_of_input;
… …
3341 ndef = get_byte_array_bit (csi_defaults, i); 3279 ndef = get_byte_array_bit (csi_defaults, i);
3342 for (p = 0; p < nargs; p++) 3280 for (p = 0; p < nargs; p++)
3343 if (arg[p] == -1) 3281 if (arg[p] == -1)
3344 arg[p] = ndef; 3282 arg[p] = ndef;
3345 3283
3346#ifdef DEBUG_CMD
3347 fprintf (stderr, "CSI ");
3348 for (p = 0; p < nargs; p++)
3349 fprintf (stderr, "%d%s", arg[p], p < nargs - 1 ? ";" : "");
3350 fprintf (stderr, "%c\n", ch);
3351#endif
3352
3353 /* 3284 /*
3354 * private mode handling 3285 * private mode handling
3355 */ 3286 */
3356 if (priv) 3287 if (priv)
3357 { 3288 {
3358 switch (priv) 3289 switch (priv)
3359 { 3290 {
3360 case '>': 3291 case '>':
3361 if (ch == CSI_DA) /* secondary device attributes */ 3292 if (ch == CSI_DA) /* secondary device attributes */
3293 {
3294 // first parameter is normally 0 for vt100, 1 for some newer vtxxx, 'R' for rxvt,
3295 // 'U' for rxvt-unicode <= 7.2, and Mm85 (e.g. 7385 for 7.3) for later versions.
3296 //
3297 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt
3298 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, and 94 for later versions, to signify
3299 // that we do not support xterm mouse reporting (should be 95 when we do).
3300 //
3362 tt_printf ("\033[>%d;%c%c;0c", 'U', VERSION[0], VERSION[2]); 3301 tt_printf ("\033[>%c%c85;94;0c", VERSION[0], VERSION[1]);
3302 }
3363 break; 3303 break;
3364 case '?': 3304 case '?':
3365 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 3305 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
3366 process_terminal_mode (ch, priv, nargs, arg); 3306 process_terminal_mode (ch, priv, nargs, arg);
3367 break; 3307 break;
… …
3799 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3739 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3800 */ 3740 */
3801void 3741void
3802rxvt_term::process_xterm_seq (int op, const char *str, char resp) 3742rxvt_term::process_xterm_seq (int op, const char *str, char resp)
3803{ 3743{
3804 int changed = 0;
3805 int color; 3744 int color;
3806 char *buf, *name; 3745 char *buf, *name;
3807 bool query = str[0] == '?' && !str[1]; 3746 bool query = str[0] == '?' && !str[1];
3808 int saveop = op; 3747 int saveop = op;
3809 dDisp; 3748 dDisp;
… …
3925 want_full_refresh = want_refresh = 1; 3864 want_full_refresh = want_refresh = 1;
3926 break; 3865 break;
3927#endif 3866#endif
3928 3867
3929 case Rxvt_Pixmap: 3868 case Rxvt_Pixmap:
3869 {
3930 if (*str != ';') 3870 if (*str != ';')
3931 { 3871 {
3932#if XPM_BACKGROUND 3872#if XPM_BACKGROUND
3933 scale_pixmap (""); /* reset to default scaling */ 3873 scale_pixmap (""); /* reset to default scaling */
3934 set_bgPixmap (str); /* change pixmap */ 3874 set_bgPixmap (str); /* change pixmap */
3935 scr_touch (true); 3875 scr_touch (true);
3936#endif 3876#endif
3937 } 3877 }
3938 3878
3879 int changed = 0;
3880
3939 while ((str = strchr (str, ';')) != NULL) 3881 while ((str = strchr (str, ';')) != NULL)
3940 { 3882 {
3941 str++; 3883 str++;
3942#if XPM_BACKGROUND 3884#if XPM_BACKGROUND
3943 changed += scale_pixmap (str); 3885 changed += scale_pixmap (str);
3944#endif 3886#endif
3945 } 3887 }
3946 3888
3947 if (changed) 3889 if (changed)
3948 { 3890 {
3949#ifdef XPM_BACKGROUND 3891#ifdef XPM_BACKGROUND
3950 resize_pixmap (); 3892 resize_pixmap ();
3951 scr_touch (true); 3893 scr_touch (true);
3952#endif 3894#endif
3953 } 3895 }
3896 }
3954 break; 3897 break;
3955 3898
3956 case Rxvt_restoreFG: 3899 case Rxvt_restoreFG:
3957 set_window_color (Color_fg, str); 3900 set_window_color (Color_fg, str);
3958 break; 3901 break;
… …
3962 3905
3963 case XTerm_logfile: 3906 case XTerm_logfile:
3964 // TODO, when secure mode? 3907 // TODO, when secure mode?
3965 break; 3908 break;
3966 3909
3967#ifdef MENUBAR
3968 case URxvt_Menu:
3969 if (OPTION (Opt_insecure))
3970 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked
3971 break;
3972#endif
3973#if 0 3910#if 0
3974 case Rxvt_dumpscreen: /* no error notices */ 3911 case Rxvt_dumpscreen: /* no error notices */
3975 { 3912 {
3976 int fd; 3913 int fd;
3977 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0) 3914 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0)
… …
4010 if (query) 3947 if (query)
4011 tt_printf ("\33]%d;%-.250s%c", URxvt_locale, OPTION (Opt_insecure) ? locale : "", resp); 3948 tt_printf ("\33]%d;%-.250s%c", URxvt_locale, OPTION (Opt_insecure) ? locale : "", resp);
4012 else 3949 else
4013 { 3950 {
4014 set_locale (str); 3951 set_locale (str);
4015 pty.set_utf8_mode (enc_utf8); 3952 pty->set_utf8_mode (enc_utf8);
4016 init_xlocale (); 3953 init_xlocale ();
4017 } 3954 }
4018 break; 3955 break;
4019 3956
4020 case URxvt_view_up: 3957 case URxvt_view_up:
… …
4073 return state; 4010 return state;
4074} 4011}
4075 4012
4076/* we're not using priv _yet_ */ 4013/* we're not using priv _yet_ */
4077void 4014void
4078rxvt_term::process_terminal_mode (int mode, int priv __attribute__ ((unused)), unsigned int nargs, const int *arg) 4015rxvt_term::process_terminal_mode (int mode, int priv UNUSED, unsigned int nargs, const int *arg)
4079{ 4016{
4080 unsigned int i, j; 4017 unsigned int i, j;
4081 int state; 4018 int state;
4082 4019
4083 static const struct 4020 static const struct
… …
4094 { 5, PrivMode_rVideo }, 4031 { 5, PrivMode_rVideo },
4095 { 6, PrivMode_relOrigin }, 4032 { 6, PrivMode_relOrigin },
4096 { 7, PrivMode_Autowrap }, 4033 { 7, PrivMode_Autowrap },
4097 // 8, bi-directional support mode 4034 // 8, bi-directional support mode
4098 { 9, PrivMode_MouseX10 }, 4035 { 9, PrivMode_MouseX10 },
4099#ifdef menuBar_esc
4100 { menuBar_esc, PrivMode_menuBar },
4101#endif
4102 // 18, 19 printing-related 4036 // 18, 19 printing-related
4103 { 25, PrivMode_VisibleCursor }, 4037 { 25, PrivMode_VisibleCursor },
4104#ifdef scrollBar_esc 4038#ifdef scrollBar_esc
4105 { scrollBar_esc, PrivMode_scrollBar }, 4039 { scrollBar_esc, PrivMode_scrollBar },
4106#endif 4040#endif
… …
4201 /* case 8: - auto repeat, can't do on a per window basis */ 4135 /* case 8: - auto repeat, can't do on a per window basis */
4202 case 9: /* X10 mouse reporting */ 4136 case 9: /* X10 mouse reporting */
4203 if (state) /* orthogonal */ 4137 if (state) /* orthogonal */
4204 priv_modes &= ~PrivMode_MouseX11; 4138 priv_modes &= ~PrivMode_MouseX11;
4205 break; 4139 break;
4206#ifdef menuBar_esc
4207 case menuBar_esc:
4208#ifdef MENUBAR
4209 map_menuBar (state);
4210#endif
4211 break;
4212#endif
4213#ifdef scrollBar_esc 4140#ifdef scrollBar_esc
4214 case scrollBar_esc: 4141 case scrollBar_esc:
4215 if (scrollbar_mapping (state)) 4142 if (scrollbar_mapping (state))
4216 { 4143 {
4217 resize_all_windows (0, 0, 0); 4144 resize_all_windows (0, 0, 0);
… …
4462rxvt_term::tt_write (const char *data, unsigned int len) 4389rxvt_term::tt_write (const char *data, unsigned int len)
4463{ 4390{
4464 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END))) 4391 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
4465 return; 4392 return;
4466 4393
4467 if (pty.pty < 0) 4394 if (pty->pty < 0)
4468 return; 4395 return;
4469 4396
4470 if (v_buflen == 0) 4397 if (v_buflen == 0)
4471 { 4398 {
4472 ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE)); 4399 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE));
4473 4400
4474 if ((unsigned int)written == len) 4401 if ((unsigned int)written == len)
4475 return; 4402 return;
4476 4403
4477 data += written; 4404 data += written;
… …
4486 pty_ev.set (EVENT_READ | EVENT_WRITE); 4413 pty_ev.set (EVENT_READ | EVENT_WRITE);
4487} 4414}
4488 4415
4489void rxvt_term::pty_write () 4416void rxvt_term::pty_write ()
4490{ 4417{
4491 int written = write (pty.pty, v_buffer, min (v_buflen, MAX_PTY_WRITE)); 4418 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
4492 4419
4493 if (written > 0) 4420 if (written > 0)
4494 { 4421 {
4495 v_buflen -= written; 4422 v_buflen -= written;
4496 4423

Diff Legend

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