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.242 by root, Fri Jan 6 05:37:59 2006 UTC vs.
Revision 1.268 by root, Tue Jan 17 05:47:42 2006 UTC

147 || !IN_RANGE_EXC (y, 0, nrow)) 147 || !IN_RANGE_EXC (y, 0, nrow))
148 return; 148 return;
149 149
150 for (;;) 150 for (;;)
151 { 151 {
152 const line_t &l = ROW(y - view_start); 152 const line_t &l = ROW(y + view_start);
153 153
154 text_t t = l.t[x]; 154 text_t t = l.t[x];
155 155
156 if (t != NOCHAR || !x) 156 if (t != NOCHAR || !x)
157 { 157 {
443 scr_move_to (0, 1); 443 scr_move_to (0, 1);
444 return; 444 return;
445 } 445 }
446 else if (keysym == XK_End) 446 else if (keysym == XK_End)
447 { 447 {
448 scr_move_to (1, 0); 448 scr_move_to (1, 1);
449 return; 449 return;
450 } 450 }
451 } 451 }
452#endif 452#endif
453 } 453 }
867#endif 867#endif
868 /* nil */ ; 868 /* nil */ ;
869 } 869 }
870 } 870 }
871 871
872 if (HOOK_INVOKE ((this, HOOK_KEY_PRESS, DT_XEVENT, &ev, DT_STRING_LEN, kbuf, len, DT_END))) 872 if (HOOK_INVOKE ((this, HOOK_KEY_PRESS, DT_XEVENT, &ev, DT_INT, keysym, DT_STR_LEN, kbuf, len, DT_END)))
873 return; 873 return;
874 874
875 if (len <= 0) 875 if (len <= 0)
876 return; /* not mapped */ 876 return; /* not mapped */
877 877
919#endif /* DEBUG_CMD */ 919#endif /* DEBUG_CMD */
920 tt_write (kbuf, (unsigned int)len); 920 tt_write (kbuf, (unsigned int)len);
921} 921}
922/*}}} */ 922/*}}} */
923 923
924#if MENUBAR_MAX || defined (KEYSYM_RESOURCE) 924#if defined (KEYSYM_RESOURCE)
925/*{{{ rxvt_cmd_write (), rxvt_cmd_getc () */
926/* attempt to `write' count to the input buffer */
927unsigned int 925unsigned int
928rxvt_term::cmd_write (const char *str, unsigned int count) 926rxvt_term::cmd_write (const char *str, unsigned int count)
929{ 927{
930 unsigned int n, s; 928 unsigned int n, s;
931 929
972 970
973 if (want_refresh) 971 if (want_refresh)
974 { 972 {
975 if (SHOULD_INVOKE (HOOK_LINE_UPDATE)) 973 if (SHOULD_INVOKE (HOOK_LINE_UPDATE))
976 { 974 {
977 int row = -view_start; 975 int row = view_start;
976 int end_row = row + nrow;
978 977
979 while (row > -nsaved && ROW (row - 1).is_longer ()) 978 while (row > top_row && ROW (row - 1).is_longer ())
980 --row; 979 --row;
981 980
982 while (row < -view_start + nrow) 981 do
983 { 982 {
984 int start_row = row; 983 int start_row = row;
985 line_t *l; 984 line_t *l;
986 985
987 do 986 do
988 { 987 {
989 l = &ROW (row); 988 l = &ROW (row++);
990 989
991 if (!(l->f & LINE_FILTERED)) 990 if (!(l->f & LINE_FILTERED))
992 { 991 {
993 // line not filtered, mark it as filtered 992 // line not filtered, mark it as filtered
994 l->f |= LINE_FILTERED; 993 l->f |= LINE_FILTERED;
995 while (l->is_longer ()) 994 while (l->is_longer ())
996 { 995 {
997 l = &ROW (++row); 996 l = &ROW (row++);
998 l->f |= LINE_FILTERED; 997 l->f |= LINE_FILTERED;
999 } 998 }
1000 999
1001 // and filter it 1000 // and filter it
1002 HOOK_INVOKE ((this, HOOK_LINE_UPDATE, DT_INT, start_row, DT_END)); 1001 HOOK_INVOKE ((this, HOOK_LINE_UPDATE, DT_INT, start_row, DT_END));
1003 1002
1004 break; 1003 break;
1005 } 1004 }
1006 } 1005 }
1007 while (l->is_longer ()); 1006 while (l->is_longer () && row < end_row);
1008
1009 row++;
1010 } 1007 }
1008 while (row < end_row);
1011 1009 }
1012 }
1013 1010
1014 scr_refresh (refresh_type); 1011 scr_refresh ();
1015 scrollbar_show (1); 1012 scrollbar_show (1);
1016#ifdef USE_XIM 1013#ifdef USE_XIM
1017 IMSendSpot (); 1014 IMSendSpot ();
1018#endif 1015#endif
1019 } 1016 }
1022} 1019}
1023 1020
1024void 1021void
1025rxvt_term::check_cb (check_watcher &w) 1022rxvt_term::check_cb (check_watcher &w)
1026{ 1023{
1027 SET_R (this); 1024 make_current ();
1028 SET_LOCALE (locale);
1029 1025
1030 display->flush (); 1026 display->flush ();
1031 1027
1032 if (want_refresh && !flush_ev.active) 1028 if (want_refresh && !flush_ev.active)
1033 flush_ev.start (NOW + 1. / 60.); // refresh at max. 60 hz normally 1029 flush_ev.start (NOW + 1. / 60.); // refresh at max. 60 hz normally
1034} 1030}
1035 1031
1036void 1032void
1037rxvt_term::flush_cb (time_watcher &w) 1033rxvt_term::flush_cb (time_watcher &w)
1038{ 1034{
1039 SET_R (this); 1035 make_current ();
1040 SET_LOCALE (locale);
1041 1036
1042 refresh_limit = 1; 1037 refresh_limit = 1;
1043 refresh_count = 0; 1038 refresh_count = 0;
1044 flush (); 1039 flush ();
1045} 1040}
1073rxvt_term::cont_scroll_cb (time_watcher &w) 1068rxvt_term::cont_scroll_cb (time_watcher &w)
1074{ 1069{
1075 if ((scrollbar_isUp() || scrollbar_isDn()) && 1070 if ((scrollbar_isUp() || scrollbar_isDn()) &&
1076 scr_page (scrollbar_isUp() ? UP : DN, 1)) 1071 scr_page (scrollbar_isUp() ? UP : DN, 1))
1077 { 1072 {
1078 refresh_type |= SMOOTH_REFRESH;
1079 want_refresh = 1; 1073 want_refresh = 1;
1080 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1074 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1081 } 1075 }
1082} 1076}
1083#endif 1077#endif
1087rxvt_term::sel_scroll_cb (time_watcher &w) 1081rxvt_term::sel_scroll_cb (time_watcher &w)
1088{ 1082{
1089 if (scr_page (scroll_selection_dir, scroll_selection_lines)) 1083 if (scr_page (scroll_selection_dir, scroll_selection_lines))
1090 { 1084 {
1091 selection_extend (selection_save_x, selection_save_y, selection_save_state); 1085 selection_extend (selection_save_x, selection_save_y, selection_save_state);
1092 refresh_type |= SMOOTH_REFRESH;
1093 want_refresh = 1; 1086 want_refresh = 1;
1094 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1087 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1095 } 1088 }
1096} 1089}
1097#endif 1090#endif
1102{ 1095{
1103 if (mouse_slip_wheel_speed == 0 1096 if (mouse_slip_wheel_speed == 0
1104 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed) 1097 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
1105 : scr_page (UP, mouse_slip_wheel_speed)) 1098 : scr_page (UP, mouse_slip_wheel_speed))
1106 { 1099 {
1107 if (view_start == nsaved || 1100 if (view_start == top_row || view_start == 0)
1108 view_start == 0)
1109 mouse_slip_wheel_speed = 0; 1101 mouse_slip_wheel_speed = 0;
1110 1102
1111 refresh_type |= SMOOTH_REFRESH;
1112 want_refresh = 1; 1103 want_refresh = 1;
1113 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1104 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1114 } 1105 }
1115} 1106}
1116#endif 1107#endif
1174} 1165}
1175 1166
1176void 1167void
1177rxvt_term::pty_cb (io_watcher &w, short revents) 1168rxvt_term::pty_cb (io_watcher &w, short revents)
1178{ 1169{
1179 SET_R (this); 1170 make_current ();
1180 SET_LOCALE (locale);
1181 1171
1182 if (revents & EVENT_READ) 1172 if (revents & EVENT_READ)
1183 // loop, but don't allow a single term to monopolize us 1173 // loop, but don't allow a single term to monopolize us
1184 while (pty_fill ()) 1174 while (pty_fill ())
1185 if (cmd_parse ()) 1175 if (cmd_parse ())
1217} 1207}
1218 1208
1219void 1209void
1220rxvt_term::pointer_cb (time_watcher &w) 1210rxvt_term::pointer_cb (time_watcher &w)
1221{ 1211{
1222 SET_R (this); 1212 make_current ();
1223 SET_LOCALE (locale);
1224 1213
1225 pointer_blank (); 1214 pointer_blank ();
1226} 1215}
1227#endif 1216#endif
1228 1217
1307 1296
1308/*{{{ process an X event */ 1297/*{{{ process an X event */
1309void 1298void
1310rxvt_term::x_cb (XEvent &ev) 1299rxvt_term::x_cb (XEvent &ev)
1311{ 1300{
1301 make_current ();
1302
1312 dDisp; 1303 dDisp;
1313 1304
1314 SET_R (this); 1305 if (ev.xany.window == vt
1315 SET_LOCALE (locale); 1306 && SHOULD_INVOKE (HOOK_X_EVENT)
1307 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END)))
1308 return;
1316 1309
1317#if defined(CURSOR_BLINK) 1310 // for XQueryPointer
1318 if (OPTION (Opt_cursorBlink) && ev.type == KeyPress)
1319 {
1320 if (hidden_cursor)
1321 {
1322 hidden_cursor = 0;
1323 want_refresh = 1;
1324 }
1325
1326 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1327 }
1328#endif
1329
1330#if defined(POINTER_BLANK)
1331 if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0)
1332 {
1333 if (ev.type == MotionNotify
1334 || ev.type == ButtonPress
1335 || ev.type == ButtonRelease)
1336 if (hidden_pointer)
1337 pointer_unblank ();
1338
1339 if (ev.type == KeyPress && hidden_pointer == 0)
1340 pointer_blank ();
1341 }
1342#endif
1343
1344 Window unused_root, unused_child; 1311 Window unused_root, unused_child;
1345 int unused_root_x, unused_root_y; 1312 int unused_root_x, unused_root_y;
1346 unsigned int unused_mask; 1313 unsigned int unused_mask;
1347 1314
1348 switch (ev.type) 1315 switch (ev.type)
1355 1322
1356 break; 1323 break;
1357 1324
1358 case KeyRelease: 1325 case KeyRelease:
1359 { 1326 {
1360#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 1327#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL
1361 KeySym ks; 1328 KeySym keysym;
1362 1329
1363 ks = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/ 1330 keysym = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
1364#endif 1331#endif
1365 1332
1366#if ENABLE_FRILLS || ISO_14755 1333#if ENABLE_FRILLS || ISO_14755
1367 // ISO 14755 support 1334 // ISO 14755 support
1368 if (iso14755buf) 1335 if (iso14755buf)
1373# endif 1340# endif
1374# if ISO_14755 1341# if ISO_14755
1375 // iso14755 part 5.2 handling: release time 1342 // iso14755 part 5.2 handling: release time
1376 // first: controls 1343 // first: controls
1377 if ((ev.xkey.state & ControlMask) 1344 if ((ev.xkey.state & ControlMask)
1378 && ((ks >= 0x40 && ks <= 0x5f) 1345 && ((keysym >= 0x40 && keysym <= 0x5f)
1379 || (ks >= 0x61 && ks <= 0x7f))) 1346 || (keysym >= 0x61 && keysym <= 0x7f)))
1380 { 1347 {
1381 iso14755buf = ISO_14755_51 | 0x2400 | (ks & 0x1f); 1348 iso14755buf = ISO_14755_51 | 0x2400 | (keysym & 0x1f);
1382 commit_iso14755 (); 1349 commit_iso14755 ();
1383 return; // case-break; 1350 goto skip_switch;
1384 } 1351 }
1385 1352
1386 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2) 1353 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
1387 if (i[0] == ks) 1354 if (i[0] == keysym)
1388 { 1355 {
1389 iso14755buf = ISO_14755_51 | i[1]; 1356 iso14755buf = ISO_14755_51 | i[1];
1390 commit_iso14755 (); 1357 commit_iso14755 ();
1391 return; // case-break; 1358 goto skip_switch;
1392 } 1359 }
1393 1360
1394 scr_bell (); 1361 scr_bell ();
1395# endif 1362# endif
1396 iso14755buf = 0; 1363 iso14755buf = 0;
1415 else 1382 else
1416 iso14755buf = 0; 1383 iso14755buf = 0;
1417 } 1384 }
1418#endif 1385#endif
1419 1386
1387 if (ev.xany.window == vt
1420 if (ev.xany.window == vt && HOOK_INVOKE ((this, HOOK_KEY_RELEASE, DT_XEVENT, &ev, DT_END))) 1388 && HOOK_INVOKE ((this, HOOK_KEY_RELEASE, DT_XEVENT, &ev, DT_INT, keysym, DT_END)))
1421 break; 1389 break;
1422 1390
1423#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1391#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1424 if (!(ev.xkey.state & ControlMask)) 1392 if (!(ev.xkey.state & ControlMask))
1425 slip_wheel_ev.stop (); 1393 slip_wheel_ev.stop ();
1426 else if (ks == XK_Control_L || ks == XK_Control_R) 1394 else if (keysym == XK_Control_L || keysym == XK_Control_R)
1427 mouse_slip_wheel_speed = 0; 1395 mouse_slip_wheel_speed = 0;
1428#endif 1396#endif
1429 break; 1397 break;
1430 } 1398 }
1431 1399
1561 1529
1562 case SelectionRequest: 1530 case SelectionRequest:
1563 selection_send (ev.xselectionrequest); 1531 selection_send (ev.xselectionrequest);
1564 break; 1532 break;
1565 1533
1534 case MapNotify:
1535 mapped = 1;
1536#ifdef TEXT_BLINK
1537 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1538#endif
1539 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1540 break;
1541
1566 case UnmapNotify: 1542 case UnmapNotify:
1567 mapped = 0; 1543 mapped = 0;
1568#ifdef TEXT_BLINK 1544#ifdef TEXT_BLINK
1569 text_blink_ev.stop (); 1545 text_blink_ev.stop ();
1570#endif 1546#endif
1571 break; 1547 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1572
1573 case MapNotify:
1574 mapped = 1;
1575#ifdef TEXT_BLINK
1576 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1577#endif
1578 break; 1548 break;
1579 1549
1580#ifdef TRANSPARENT 1550#ifdef TRANSPARENT
1581 case ReparentNotify: 1551 case ReparentNotify:
1582 rootwin_cb (ev); 1552 rootwin_cb (ev);
1596 1566
1597 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev)) 1567 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev))
1598 scr_expose (ev.xexpose.x, ev.xexpose.y, 1568 scr_expose (ev.xexpose.x, ev.xexpose.y,
1599 ev.xexpose.width, ev.xexpose.height, False); 1569 ev.xexpose.width, ev.xexpose.height, False);
1600 1570
1601 scr_refresh (refresh_type); 1571 want_refresh = 1;
1602 } 1572 }
1603 else 1573 else
1604 { 1574 {
1605 XEvent unused_event; 1575 XEvent unused_event;
1606 1576
1612 if (isScrollbarWindow (ev.xany.window)) 1582 if (isScrollbarWindow (ev.xany.window))
1613 { 1583 {
1614 scrollBar.setIdle (); 1584 scrollBar.setIdle ();
1615 scrollbar_show (0); 1585 scrollbar_show (0);
1616 } 1586 }
1617#ifdef MENUBAR
1618 if (menubar_visible () && isMenuBarWindow (ev.xany.window))
1619 menubar_expose ();
1620#endif
1621 1587
1622#ifdef TRANSPARENT 1588#ifdef TRANSPARENT
1623 if (am_transparent && ev.xany.window == parent[0]) 1589 if (am_transparent && ev.xany.window == parent[0])
1624 XClearWindow (disp, ev.xany.window); 1590 XClearWindow (disp, ev.xany.window);
1625#endif 1591#endif
1629 case MotionNotify: 1595 case MotionNotify:
1630#ifdef POINTER_BLANK 1596#ifdef POINTER_BLANK
1631 if (hidden_pointer) 1597 if (hidden_pointer)
1632 pointer_unblank (); 1598 pointer_unblank ();
1633#endif 1599#endif
1634#if MENUBAR
1635 if (isMenuBarWindow (ev.xany.window))
1636 {
1637 menubar_control (ev.xbutton);
1638 break;
1639 }
1640#endif
1641 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1600 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1642 break; 1601 break;
1643 1602
1644 if (ev.xany.window == vt) 1603 if (ev.xany.window == vt)
1645 { 1604 {
1605 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)
1646 if (HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END))) 1606 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1647 ; // nop 1607 ; // nop
1648 else if (ev.xbutton.state & (Button1Mask | Button3Mask)) 1608 else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1649 { 1609 {
1650 while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev)) 1610 while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev))
1651 ; 1611 ;
1733 &unused_root_x, &unused_root_y, 1693 &unused_root_x, &unused_root_y,
1734 &ev.xbutton.x, &ev.xbutton.y, 1694 &ev.xbutton.x, &ev.xbutton.y,
1735 &unused_mask); 1695 &unused_mask);
1736 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1696 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1737 scrollbar_size ()); 1697 scrollbar_size ());
1738 scr_refresh (refresh_type); 1698 want_refresh = 1;
1739 refresh_limit = 0; 1699 refresh_limit = 0;
1740 scrollbar_show (1); 1700 scrollbar_show (1);
1741 } 1701 }
1742 break; 1702 break;
1743 } 1703 }
1704
1705skip_switch: ;
1706
1707#if defined(CURSOR_BLINK)
1708 if (OPTION (Opt_cursorBlink) && ev.type == KeyPress)
1709 {
1710 if (hidden_cursor)
1711 {
1712 hidden_cursor = 0;
1713 want_refresh = 1;
1714 }
1715
1716 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1717 }
1718#endif
1719
1720#if defined(POINTER_BLANK)
1721 if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0)
1722 {
1723 if (ev.type == MotionNotify
1724 || ev.type == ButtonPress
1725 || ev.type == ButtonRelease)
1726 if (hidden_pointer)
1727 pointer_unblank ();
1728
1729 if (ev.type == KeyPress && hidden_pointer == 0)
1730 pointer_blank ();
1731 }
1732#endif
1744} 1733}
1745 1734
1746void 1735void
1747rxvt_term::focus_in () 1736rxvt_term::focus_in ()
1748{ 1737{
1814 1803
1815#if TRANSPARENT 1804#if TRANSPARENT
1816void 1805void
1817rxvt_term::rootwin_cb (XEvent &ev) 1806rxvt_term::rootwin_cb (XEvent &ev)
1818{ 1807{
1819 SET_R (this); 1808 make_current ();
1820 SET_LOCALE (locale);
1821 1809
1822 switch (ev.type) 1810 switch (ev.type)
1823 { 1811 {
1824 case PropertyNotify: 1812 case PropertyNotify:
1825 /* 1813 /*
1873#ifdef MOUSE_REPORT_DOUBLECLICK 1861#ifdef MOUSE_REPORT_DOUBLECLICK
1874 if (ev.button == MEvent.button && clickintime) 1862 if (ev.button == MEvent.button && clickintime)
1875 { 1863 {
1876 /* same button, within alloted time */ 1864 /* same button, within alloted time */
1877 MEvent.clicks++; 1865 MEvent.clicks++;
1866
1878 if (MEvent.clicks > 1) 1867 if (MEvent.clicks > 1)
1879 { 1868 {
1880 /* only report double clicks */ 1869 /* only report double clicks */
1881 MEvent.clicks = 2; 1870 MEvent.clicks = 2;
1882 mouse_report (ev); 1871 mouse_report (ev);
1915#else 1904#else
1916 selection.rect = false; 1905 selection.rect = false;
1917#endif 1906#endif
1918 1907
1919 /* allow shift+left click to extend selection */ 1908 /* allow shift+left click to extend selection */
1920 if (ev.state & ShiftMask && ! (priv_modes & PrivMode_mouse_report)) 1909 if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report))
1921 { 1910 {
1922 if (MEvent.button == Button1 && clickintime) 1911 if (MEvent.button == Button1 && clickintime)
1923 selection_rotate (ev.x, ev.y); 1912 selection_rotate (ev.x, ev.y);
1924 else 1913 else
1925 selection_extend (ev.x, ev.y, 1); 1914 selection_extend (ev.x, ev.y, 1);
2090 } 2079 }
2091 2080
2092 break; 2081 break;
2093 } 2082 }
2094 } 2083 }
2084
2095 return; 2085 return;
2096 } 2086 }
2097#if MENUBAR
2098 /*
2099 * Menubar window processing of button press
2100 */
2101 if (isMenuBarWindow (ev.window))
2102 menubar_control (ev);
2103#endif
2104} 2087}
2105 2088
2106void 2089void
2107rxvt_term::button_release (XButtonEvent &ev) 2090rxvt_term::button_release (XButtonEvent &ev)
2108{ 2091{
2114 2097
2115 if (scrollbar_isUpDn ()) 2098 if (scrollbar_isUpDn ())
2116 { 2099 {
2117 scrollBar.setIdle (); 2100 scrollBar.setIdle ();
2118 scrollbar_show (0); 2101 scrollbar_show (0);
2119#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
2120 refresh_type &= ~SMOOTH_REFRESH;
2121#endif
2122 } 2102 }
2123 2103
2124#ifdef SELECTION_SCROLLING 2104#ifdef SELECTION_SCROLLING
2125 if (sel_scroll_ev.active) 2105 if (sel_scroll_ev.active)
2126 sel_scroll_ev.stop(); 2106 sel_scroll_ev.stop();
2164 if (priv_modes & PrivMode_mouse_report 2144 if (priv_modes & PrivMode_mouse_report
2165 && bypass_keystate 2145 && bypass_keystate
2166 && ev.button == Button1 && MEvent.clicks <= 1) 2146 && ev.button == Button1 && MEvent.clicks <= 1)
2167 selection_extend (ev.x, ev.y, 0); 2147 selection_extend (ev.x, ev.y, 0);
2168 2148
2169 if (!HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END))) 2149 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2170 return; 2150 return;
2171 2151
2172 switch (ev.button) 2152 switch (ev.button)
2173 { 2153 {
2174 case Button1: 2154 case Button1:
2207 slip_wheel_ev.start (); 2187 slip_wheel_ev.start ();
2208 } 2188 }
2209 else 2189 else
2210 { 2190 {
2211# endif 2191# endif
2212# ifdef JUMP_MOUSE_WHEEL
2213 scr_page (v, i); 2192 scr_page (v, i);
2214 scr_refresh (SMOOTH_REFRESH);
2215 scrollbar_show (1); 2193 scrollbar_show (1);
2216# else
2217 while (i--)
2218 {
2219 scr_page (v, 1);
2220 scr_refresh (SMOOTH_REFRESH);
2221 scrollbar_show (1);
2222 }
2223# endif
2224# ifdef MOUSE_SLIP_WHEELING 2194# ifdef MOUSE_SLIP_WHEELING
2225 } 2195 }
2226#endif 2196# endif
2227 } 2197 }
2228 break; 2198 break;
2229#endif 2199#endif
2230 } 2200 }
2231 } 2201 }
2232#ifdef MENUBAR
2233 else if (isMenuBarWindow (ev.window))
2234 menubar_control (ev);
2235#endif
2236} 2202}
2237 2203
2238#ifdef TRANSPARENT 2204#ifdef TRANSPARENT
2239#if TINTING 2205#if TINTING
2240/* taken from aterm-0.4.2 */ 2206/* taken from aterm-0.4.2 */
2720 2686
2721bool 2687bool
2722rxvt_term::cmd_parse () 2688rxvt_term::cmd_parse ()
2723{ 2689{
2724 bool flag = false; 2690 bool flag = false;
2725 unicode_t ch = NOCHAR; 2691 wchar_t ch = NOCHAR;
2726 char *seq_begin; // remember start of esc-sequence here 2692 char *seq_begin; // remember start of esc-sequence here
2727 2693
2728 for (;;) 2694 for (;;)
2729 { 2695 {
2730 if (ch == NOCHAR) 2696 if (ch == NOCHAR)
2751 if (seen_resize && cmd_pid) 2717 if (seen_resize && cmd_pid)
2752 kill (-cmd_pid, SIGWINCH); 2718 kill (-cmd_pid, SIGWINCH);
2753 } 2719 }
2754 2720
2755 /* Read a text string from the input buffer */ 2721 /* Read a text string from the input buffer */
2756 unicode_t buf[UBUFSIZ]; 2722 wchar_t buf[UBUFSIZ];
2757 bool refreshnow = false; 2723 bool refreshnow = false;
2758 int nlines = 0; 2724 int nlines = 0;
2759 unicode_t *str = buf; 2725 wchar_t *str = buf;
2760 unicode_t *eol = str + min (ncol, UBUFSIZ); 2726 wchar_t *eol = str + min (ncol, UBUFSIZ);
2761 2727
2762 for (;;) 2728 for (;;)
2763 { 2729 {
2764 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)) 2730 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))
2765 break; 2731 break;
2783 } 2749 }
2784 2750
2785 // scr_add_lines only works for nlines <= nrow - 1. 2751 // scr_add_lines only works for nlines <= nrow - 1.
2786 if (nlines >= nrow - 1) 2752 if (nlines >= nrow - 1)
2787 { 2753 {
2754 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2788 if (!HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_USTRING_LEN, buf, str - buf, DT_END))) 2755 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2789 scr_add_lines (buf, nlines, str - buf); 2756 scr_add_lines (buf, str - buf, nlines);
2790 2757
2791 nlines = 0; 2758 nlines = 0;
2792 str = buf; 2759 str = buf;
2793 eol = str + min (ncol, UBUFSIZ); 2760 eol = str + min (ncol, UBUFSIZ);
2794 } 2761 }
2808 2775
2809 seq_begin = cmdbuf_ptr; 2776 seq_begin = cmdbuf_ptr;
2810 ch = next_char (); 2777 ch = next_char ();
2811 } 2778 }
2812 2779
2780 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2813 if (!HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_USTRING_LEN, buf, str - buf, DT_END))) 2781 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2814 scr_add_lines (buf, nlines, str - buf); 2782 scr_add_lines (buf, str - buf, nlines);
2815 2783
2816 /* 2784 /*
2817 * If there have been a lot of new lines, then update the screen 2785 * If there have been a lot of new lines, then update the screen
2818 * What the heck I'll cheat and only refresh less than every page-full. 2786 * What the heck I'll cheat and only refresh less than every page-full.
2819 * the number of pages between refreshes is refresh_limit, which 2787 * the number of pages between refreshes is refresh_limit, which
2824 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD) 2792 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2825 refresh_limit++; 2793 refresh_limit++;
2826 else 2794 else
2827 { 2795 {
2828 flag = true; 2796 flag = true;
2829 scr_refresh (refresh_type); 2797 scr_refresh ();
2830 flush_ev.stop (); 2798 want_refresh = 1;
2831 } 2799 }
2832 } 2800 }
2833 2801
2834 } 2802 }
2835 else 2803 else
2850 } 2818 }
2851 2819
2852 return flag; 2820 return flag;
2853} 2821}
2854 2822
2855// read the next octet
2856unicode_t
2857rxvt_term::next_octet ()
2858{
2859 return cmdbuf_ptr < cmdbuf_endp
2860 ? *cmdbuf_ptr++
2861 : NOCHAR;
2862}
2863
2864// read the next character 2823// read the next character
2865unicode_t 2824wchar_t
2866rxvt_term::next_char () 2825rxvt_term::next_char ()
2867{ 2826{
2868 while (cmdbuf_ptr < cmdbuf_endp) 2827 while (cmdbuf_ptr < cmdbuf_endp)
2869 { 2828 {
2870 // assume 7-bit to be ascii ALWAYS 2829 // assume 7-bit to be ascii ALWAYS
2880 cmdbuf_ptr = cmdbuf_endp; 2839 cmdbuf_ptr = cmdbuf_endp;
2881 break; 2840 break;
2882 } 2841 }
2883 2842
2884 if (len == (size_t)-1) 2843 if (len == (size_t)-1)
2885 return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 2844 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2886 2845
2887 // assume wchar == unicode 2846 // assume wchar == unicode
2888 cmdbuf_ptr += len; 2847 cmdbuf_ptr += len;
2889 return wc & UNICODE_MASK; 2848 return wc & UNICODE_MASK;
2890 } 2849 }
2891 2850
2892 return NOCHAR; 2851 return NOCHAR;
2852}
2853
2854// read the next octet
2855uint32_t
2856rxvt_term::next_octet ()
2857{
2858 return cmdbuf_ptr < cmdbuf_endp
2859 ? (unsigned char)*cmdbuf_ptr++
2860 : NOCHAR;
2893} 2861}
2894 2862
2895/* rxvt_cmd_getc () - Return next input character */ 2863/* rxvt_cmd_getc () - Return next input character */
2896/* 2864/*
2897 * Return the next input character after first passing any keyboard input 2865 * Return the next input character after first passing any keyboard input
2898 * to the command. 2866 * to the command.
2899 */ 2867 */
2900unicode_t 2868wchar_t
2901rxvt_term::cmd_getc () 2869rxvt_term::cmd_getc ()
2902{ 2870{
2903 unicode_t c = next_char (); 2871 wchar_t c = next_char ();
2904 2872
2905 if (c == NOCHAR) 2873 if (c == NOCHAR)
2906 throw out_of_input; 2874 throw out_of_input;
2907 2875
2908 return c; 2876 return c;
2909} 2877}
2910 2878
2911unicode_t 2879uint32_t
2912rxvt_term::cmd_get8 () 2880rxvt_term::cmd_get8 ()
2913{ 2881{
2914 unicode_t c = next_octet (); 2882 uint32_t c = next_octet ();
2915 2883
2916 if (c == NOCHAR) 2884 if (c == NOCHAR)
2917 throw out_of_input; 2885 throw out_of_input;
2918 2886
2919 return c; 2887 return c;
3186 break; 3154 break;
3187 3155
3188 /* 8.3.87: NEXT LINE */ 3156 /* 8.3.87: NEXT LINE */
3189 case C1_NEL: /* ESC E */ 3157 case C1_NEL: /* ESC E */
3190 { 3158 {
3191 unicode_t nlcr[] = { C0_LF, C0_CR }; 3159 wchar_t nlcr[] = { C0_LF, C0_CR };
3192 scr_add_lines (nlcr, 1, 2); 3160 scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1);
3193 } 3161 }
3194 break; 3162 break;
3195 3163
3196 /* kidnapped escape sequence: Should be 8.3.48 */ 3164 /* kidnapped escape sequence: Should be 8.3.48 */
3197 case C1_ESA: /* ESC G */ 3165 case C1_ESA: /* ESC G */
3861 { 3829 {
3862 if ((name = strchr (buf, ';')) == NULL) 3830 if ((name = strchr (buf, ';')) == NULL)
3863 break; 3831 break;
3864 3832
3865 *name++ = '\0'; 3833 *name++ = '\0';
3866 color = atoi (buf); 3834 color = atoi (buf) + minCOLOR;
3867 3835
3868 if (color < 0 || color >= TOTAL_COLORS) 3836 if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR))
3869 break; 3837 break;
3870 3838
3871 if ((buf = strchr (name, ';')) != NULL) 3839 if ((buf = strchr (name, ';')) != NULL)
3872 *buf++ = '\0'; 3840 *buf++ = '\0';
3873 3841
3874 if (name[0] == '?' && !name[1]) 3842 if (name[0] == '?' && !name[1])
3875 { 3843 {
3876 unsigned short r, g, b; 3844 unsigned short r, g, b;
3877 pix_colors_focused[color + minCOLOR].get (display, r, g, b); 3845 pix_colors_focused[color].get (display, r, g, b);
3878 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp); 3846 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp);
3879 } 3847 }
3880 else 3848 else
3881 set_window_color (color + minCOLOR, name); 3849 set_window_color (color, name);
3882 } 3850 }
3883 break; 3851 break;
3884 case XTerm_Color00: 3852 case XTerm_Color00:
3885 process_color_seq (XTerm_Color00, Color_fg, str, resp); 3853 process_color_seq (XTerm_Color00, Color_fg, str, resp);
3886 break; 3854 break;
3887 case XTerm_Color01: 3855 case XTerm_Color01:
3888 process_color_seq (XTerm_Color00, Color_bg, str, resp); 3856 process_color_seq (XTerm_Color01, Color_bg, str, resp);
3889 break; 3857 break;
3890#ifndef NO_CURSORCOLOR 3858#ifndef NO_CURSORCOLOR
3891 case XTerm_Color_cursor: 3859 case XTerm_Color_cursor:
3892 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp); 3860 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp);
3893 break; 3861 break;
3897 break; 3865 break;
3898 case XTerm_Color_pointer_bg: 3866 case XTerm_Color_pointer_bg:
3899 process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp); 3867 process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp);
3900 break; 3868 break;
3901#ifndef NO_BOLD_UNDERLINE_REVERSE 3869#ifndef NO_BOLD_UNDERLINE_REVERSE
3902 case XTerm_Color_BD:
3903 process_color_seq (XTerm_Color_BD, Color_BD, str, resp);
3904 break;
3905 case XTerm_Color_UL:
3906 process_color_seq (XTerm_Color_UL, Color_UL, str, resp);
3907 break;
3908 case XTerm_Color_RV: 3870 case XTerm_Color_RV:
3909 process_color_seq (XTerm_Color_RV, Color_RV, str, resp); 3871 process_color_seq (XTerm_Color_RV, Color_RV, str, resp);
3872 break;
3873 case Rxvt_Color_BD:
3874 case URxvt_Color_BD:
3875 process_color_seq (op, Color_BD, str, resp);
3876 break;
3877 case Rxvt_Color_UL:
3878 case URxvt_Color_UL:
3879 process_color_seq (op, Color_UL, str, resp);
3910 break; 3880 break;
3911 case URxvt_Color_IT: 3881 case URxvt_Color_IT:
3912 process_color_seq (URxvt_Color_IT, Color_IT, str, resp); 3882 process_color_seq (URxvt_Color_IT, Color_IT, str, resp);
3913 break; 3883 break;
3914#endif 3884#endif
3919 if (am_transparent) 3889 if (am_transparent)
3920 want_full_refresh = want_refresh = 1; 3890 want_full_refresh = want_refresh = 1;
3921 break; 3891 break;
3922#endif 3892#endif
3923 3893
3924 case XTerm_Pixmap: 3894 case Rxvt_Pixmap:
3925 if (*str != ';') 3895 if (*str != ';')
3926 { 3896 {
3927#if XPM_BACKGROUND 3897#if XPM_BACKGROUND
3928 scale_pixmap (""); /* reset to default scaling */ 3898 scale_pixmap (""); /* reset to default scaling */
3929 set_bgPixmap (str); /* change pixmap */ 3899 set_bgPixmap (str); /* change pixmap */
3930#endif
3931 scr_touch (true); 3900 scr_touch (true);
3901#endif
3932 } 3902 }
3903
3933 while ((str = strchr (str, ';')) != NULL) 3904 while ((str = strchr (str, ';')) != NULL)
3934 { 3905 {
3935 str++; 3906 str++;
3936#if XPM_BACKGROUND 3907#if XPM_BACKGROUND
3937 changed += scale_pixmap (str); 3908 changed += scale_pixmap (str);
3940 3911
3941 if (changed) 3912 if (changed)
3942 { 3913 {
3943#ifdef XPM_BACKGROUND 3914#ifdef XPM_BACKGROUND
3944 resize_pixmap (); 3915 resize_pixmap ();
3945#endif
3946 scr_touch (true); 3916 scr_touch (true);
3917#endif
3947 } 3918 }
3948 break; 3919 break;
3949 3920
3950 case XTerm_restoreFG: 3921 case Rxvt_restoreFG:
3951 set_window_color (Color_fg, str); 3922 set_window_color (Color_fg, str);
3952 break; 3923 break;
3953 case XTerm_restoreBG: 3924 case Rxvt_restoreBG:
3954 set_window_color (Color_bg, str); 3925 set_window_color (Color_bg, str);
3955 break; 3926 break;
3956 3927
3957 case XTerm_logfile: 3928 case XTerm_logfile:
3958 // TODO, when secure mode? 3929 // TODO, when secure mode?
3959 break; 3930 break;
3960 3931
3961#ifdef MENUBAR
3962 case URxvt_Menu:
3963 if (OPTION (Opt_insecure))
3964 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked
3965 break;
3966#endif
3967#if 0 3932#if 0
3968 case XTerm_dumpscreen: /* no error notices */ 3933 case Rxvt_dumpscreen: /* no error notices */
3969 { 3934 {
3970 int fd; 3935 int fd;
3971 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0) 3936 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0)
3972 { 3937 {
3973 scr_dump (fd); 3938 scr_dump (fd);
4025 break; 3990 break;
4026#endif 3991#endif
4027 3992
4028#if ENABLE_PERL 3993#if ENABLE_PERL
4029 case URxvt_perl: 3994 case URxvt_perl:
4030 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_STRING, str, DT_END))) 3995 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_STR, str, DT_END)))
4031 ; // no responses yet 3996 ; // no responses yet
4032 break; 3997 break;
4033#endif 3998#endif
4034 } 3999 }
4035} 4000}
4088 { 5, PrivMode_rVideo }, 4053 { 5, PrivMode_rVideo },
4089 { 6, PrivMode_relOrigin }, 4054 { 6, PrivMode_relOrigin },
4090 { 7, PrivMode_Autowrap }, 4055 { 7, PrivMode_Autowrap },
4091 // 8, bi-directional support mode 4056 // 8, bi-directional support mode
4092 { 9, PrivMode_MouseX10 }, 4057 { 9, PrivMode_MouseX10 },
4093#ifdef menuBar_esc
4094 { menuBar_esc, PrivMode_menuBar },
4095#endif
4096 // 18, 19 printing-related 4058 // 18, 19 printing-related
4097 { 25, PrivMode_VisibleCursor }, 4059 { 25, PrivMode_VisibleCursor },
4098#ifdef scrollBar_esc 4060#ifdef scrollBar_esc
4099 { scrollBar_esc, PrivMode_scrollBar }, 4061 { scrollBar_esc, PrivMode_scrollBar },
4100#endif 4062#endif
4147 /* extra handling for values with state unkept */ 4109 /* extra handling for values with state unkept */
4148 switch (arg[i]) 4110 switch (arg[i])
4149 { 4111 {
4150#if ENABLE_STYLES 4112#if ENABLE_STYLES
4151 case 1021: 4113 case 1021:
4152 if (mode) 4114 set_option (Opt_intensityStyles, mode);
4153 SET_OPTION (Opt_intensityStyles);
4154 else
4155 CLR_OPTION (Opt_intensityStyles);
4156 4115
4157 scr_touch (true); 4116 scr_touch (true);
4158 break; 4117 break;
4159#endif 4118#endif
4160 case 1048: /* alternative cursor save */ 4119 case 1048: /* alternative cursor save */
4182 case 3: /* 80/132 */ 4141 case 3: /* 80/132 */
4183 if (priv_modes & PrivMode_132OK) 4142 if (priv_modes & PrivMode_132OK)
4184 set_widthheight (((state ? 132 : 80) * fwidth), height); 4143 set_widthheight (((state ? 132 : 80) * fwidth), height);
4185 break; 4144 break;
4186 case 4: /* smooth scrolling */ 4145 case 4: /* smooth scrolling */
4187 if (!state) 4146 set_option (Opt_jumpScroll, !state);
4188 SET_OPTION (Opt_jumpScroll);
4189 else
4190 CLR_OPTION (Opt_jumpScroll);
4191 break; 4147 break;
4192 case 5: /* reverse video */ 4148 case 5: /* reverse video */
4193 scr_rvideo_mode (state); 4149 scr_rvideo_mode (state);
4194 break; 4150 break;
4195 case 6: /* relative/absolute origins */ 4151 case 6: /* relative/absolute origins */
4201 /* case 8: - auto repeat, can't do on a per window basis */ 4157 /* case 8: - auto repeat, can't do on a per window basis */
4202 case 9: /* X10 mouse reporting */ 4158 case 9: /* X10 mouse reporting */
4203 if (state) /* orthogonal */ 4159 if (state) /* orthogonal */
4204 priv_modes &= ~PrivMode_MouseX11; 4160 priv_modes &= ~PrivMode_MouseX11;
4205 break; 4161 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 4162#ifdef scrollBar_esc
4214 case scrollBar_esc: 4163 case scrollBar_esc:
4215 if (scrollbar_mapping (state)) 4164 if (scrollbar_mapping (state))
4216 { 4165 {
4217 resize_all_windows (0, 0, 0); 4166 resize_all_windows (0, 0, 0);
4236#if 0 4185#if 0
4237 case 1001: 4186 case 1001:
4238 break; /* X11 mouse highlighting */ 4187 break; /* X11 mouse highlighting */
4239#endif 4188#endif
4240 case 1010: /* scroll to bottom on TTY output inhibit */ 4189 case 1010: /* scroll to bottom on TTY output inhibit */
4241 if (!state) 4190 set_option (Opt_scrollTtyOutput, !state);
4242 SET_OPTION (Opt_scrollTtyOutput);
4243 else
4244 CLR_OPTION (Opt_scrollTtyOutput);
4245 break; 4191 break;
4246 case 1011: /* scroll to bottom on key press */ 4192 case 1011: /* scroll to bottom on key press */
4247 if (state) 4193 set_option (Opt_scrollTtyKeypress, state);
4248 SET_OPTION (Opt_scrollTtyKeypress);
4249 else
4250 CLR_OPTION (Opt_scrollTtyKeypress);
4251 break; 4194 break;
4252 case 1047: /* secondary screen w/ clearing last */ 4195 case 1047: /* secondary screen w/ clearing last */
4253 if (OPTION (Opt_secondaryScreen)) 4196 if (OPTION (Opt_secondaryScreen))
4254 if (current_screen != PRIMARY) 4197 if (current_screen != PRIMARY)
4255 scr_erase_screen (2); 4198 scr_erase_screen (2);
4465const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT 4408const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4466 4409
4467void 4410void
4468rxvt_term::tt_write (const char *data, unsigned int len) 4411rxvt_term::tt_write (const char *data, unsigned int len)
4469{ 4412{
4413 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
4414 return;
4415
4470 if (pty.pty < 0) 4416 if (pty.pty < 0)
4471 return; 4417 return;
4472 4418
4473 if (v_buflen == 0) 4419 if (v_buflen == 0)
4474 { 4420 {

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines