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.240 by root, Fri Jan 6 03:40:19 2006 UTC vs.
Revision 1.267 by root, Mon Jan 16 15:00:20 2006 UTC

25 * - extensive modifications 25 * - extensive modifications
26 * Copyright (c) 1998 Alfredo K. Kojima <kojima@windowmaker.org> 26 * Copyright (c) 1998 Alfredo K. Kojima <kojima@windowmaker.org>
27 * Copyright (c) 2001 Marius Gedminas 27 * Copyright (c) 2001 Marius Gedminas
28 * - Ctrl/Mod4+Tab works like Meta+Tab (options) 28 * - Ctrl/Mod4+Tab works like Meta+Tab (options)
29 * Copyright (c) 2003 Rob McMullen <robm@flipturn.org> 29 * Copyright (c) 2003 Rob McMullen <robm@flipturn.org>
30 * Copyright (c) 2003-2005 Marc Lehmann <pcg@goof.com> 30 * Copyright (c) 2003-2006 Marc Lehmann <pcg@goof.com>
31 * 31 *
32 * This program is free software; you can redistribute it and/or modify 32 * This program is free software; you can redistribute it and/or modify
33 * it under the terms of the GNU General Public License as published by 33 * it under the terms of the GNU General Public License as published by
34 * the Free Software Foundation; either version 2 of the License, or 34 * the Free Software Foundation; either version 2 of the License, or
35 * (at your option) any later version. 35 * (at your option) any later version.
147 || !IN_RANGE_EXC (y, 0, nrow)) 147 || !IN_RANGE_EXC (y, 0, nrow))
148 return; 148 return;
149 149
150 for (;;) 150 for (;;)
151 { 151 {
152 const line_t &l = ROW(y - view_start); 152 const line_t &l = ROW(y + view_start);
153 153
154 text_t t = l.t[x]; 154 text_t t = l.t[x];
155 155
156 if (t != NOCHAR || !x) 156 if (t != NOCHAR || !x)
157 { 157 {
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 }
1011 1008 while (row < end_row);
1012 } 1009 }
1013 1010
1014 scr_refresh (refresh_type); 1011 scr_refresh (refresh_type);
1015 scrollbar_show (1); 1012 scrollbar_show (1);
1016#ifdef USE_XIM 1013#ifdef USE_XIM
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}
1102{ 1097{
1103 if (mouse_slip_wheel_speed == 0 1098 if (mouse_slip_wheel_speed == 0
1104 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed) 1099 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
1105 : scr_page (UP, mouse_slip_wheel_speed)) 1100 : scr_page (UP, mouse_slip_wheel_speed))
1106 { 1101 {
1107 if (view_start == nsaved || 1102 if (view_start == top_row || view_start == 0)
1108 view_start == 0)
1109 mouse_slip_wheel_speed = 0; 1103 mouse_slip_wheel_speed = 0;
1110 1104
1111 refresh_type |= SMOOTH_REFRESH; 1105 refresh_type |= SMOOTH_REFRESH;
1112 want_refresh = 1; 1106 want_refresh = 1;
1113 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1107 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1174} 1168}
1175 1169
1176void 1170void
1177rxvt_term::pty_cb (io_watcher &w, short revents) 1171rxvt_term::pty_cb (io_watcher &w, short revents)
1178{ 1172{
1179 SET_R (this); 1173 make_current ();
1180 SET_LOCALE (locale);
1181 1174
1182 if (revents & EVENT_READ) 1175 if (revents & EVENT_READ)
1183 // loop, but don't allow a single term to monopolize us 1176 // loop, but don't allow a single term to monopolize us
1184 while (pty_fill ()) 1177 while (pty_fill ())
1185 if (cmd_parse ()) 1178 if (cmd_parse ())
1205 1198
1206#ifdef POINTER_BLANK 1199#ifdef POINTER_BLANK
1207void 1200void
1208rxvt_term::pointer_blank () 1201rxvt_term::pointer_blank ()
1209{ 1202{
1210 if (! OPTION (Opt_pointerBlank)) 1203 if (!OPTION (Opt_pointerBlank))
1211 return; 1204 return;
1212 1205
1213 XDefineCursor (display->display, vt, display->blank_cursor); 1206 XDefineCursor (display->display, vt, display->blank_cursor);
1214 XFlush (display->display); 1207 XFlush (display->display);
1215 1208
1217} 1210}
1218 1211
1219void 1212void
1220rxvt_term::pointer_cb (time_watcher &w) 1213rxvt_term::pointer_cb (time_watcher &w)
1221{ 1214{
1222 SET_R (this); 1215 make_current ();
1223 SET_LOCALE (locale);
1224 1216
1225 pointer_blank (); 1217 pointer_blank ();
1226} 1218}
1227#endif 1219#endif
1228 1220
1307 1299
1308/*{{{ process an X event */ 1300/*{{{ process an X event */
1309void 1301void
1310rxvt_term::x_cb (XEvent &ev) 1302rxvt_term::x_cb (XEvent &ev)
1311{ 1303{
1304 make_current ();
1305
1312 dDisp; 1306 dDisp;
1313 1307
1314 SET_R (this); 1308 if (ev.xany.window == vt
1315 SET_LOCALE (locale); 1309 && SHOULD_INVOKE (HOOK_X_EVENT)
1310 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END)))
1311 return;
1316 1312
1317#if defined(CURSOR_BLINK) 1313 // 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; 1314 Window unused_root, unused_child;
1345 int unused_root_x, unused_root_y; 1315 int unused_root_x, unused_root_y;
1346 unsigned int unused_mask; 1316 unsigned int unused_mask;
1347 1317
1348 switch (ev.type) 1318 switch (ev.type)
1355 1325
1356 break; 1326 break;
1357 1327
1358 case KeyRelease: 1328 case KeyRelease:
1359 { 1329 {
1360#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 1330#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL
1361 KeySym ks; 1331 KeySym keysym;
1362 1332
1363 ks = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/ 1333 keysym = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
1364#endif 1334#endif
1365 1335
1366#if ENABLE_FRILLS || ISO_14755 1336#if ENABLE_FRILLS || ISO_14755
1367 // ISO 14755 support 1337 // ISO 14755 support
1368 if (iso14755buf) 1338 if (iso14755buf)
1373# endif 1343# endif
1374# if ISO_14755 1344# if ISO_14755
1375 // iso14755 part 5.2 handling: release time 1345 // iso14755 part 5.2 handling: release time
1376 // first: controls 1346 // first: controls
1377 if ((ev.xkey.state & ControlMask) 1347 if ((ev.xkey.state & ControlMask)
1378 && ((ks >= 0x40 && ks <= 0x5f) 1348 && ((keysym >= 0x40 && keysym <= 0x5f)
1379 || (ks >= 0x61 && ks <= 0x7f))) 1349 || (keysym >= 0x61 && keysym <= 0x7f)))
1380 { 1350 {
1381 iso14755buf = ISO_14755_51 | 0x2400 | (ks & 0x1f); 1351 iso14755buf = ISO_14755_51 | 0x2400 | (keysym & 0x1f);
1382 commit_iso14755 (); 1352 commit_iso14755 ();
1383 return; // case-break; 1353 goto skip_switch;
1384 } 1354 }
1385 1355
1386 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2) 1356 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
1387 if (i[0] == ks) 1357 if (i[0] == keysym)
1388 { 1358 {
1389 iso14755buf = ISO_14755_51 | i[1]; 1359 iso14755buf = ISO_14755_51 | i[1];
1390 commit_iso14755 (); 1360 commit_iso14755 ();
1391 return; // case-break; 1361 goto skip_switch;
1392 } 1362 }
1393 1363
1394 scr_bell (); 1364 scr_bell ();
1395# endif 1365# endif
1396 iso14755buf = 0; 1366 iso14755buf = 0;
1415 else 1385 else
1416 iso14755buf = 0; 1386 iso14755buf = 0;
1417 } 1387 }
1418#endif 1388#endif
1419 1389
1390 if (ev.xany.window == vt
1391 && HOOK_INVOKE ((this, HOOK_KEY_RELEASE, DT_XEVENT, &ev, DT_INT, keysym, DT_END)))
1392 break;
1393
1420#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1394#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1421 if (!(ev.xkey.state & ControlMask)) 1395 if (!(ev.xkey.state & ControlMask))
1422 slip_wheel_ev.stop (); 1396 slip_wheel_ev.stop ();
1423 else if (ks == XK_Control_L || ks == XK_Control_R) 1397 else if (keysym == XK_Control_L || keysym == XK_Control_R)
1424 mouse_slip_wheel_speed = 0; 1398 mouse_slip_wheel_speed = 0;
1425#endif 1399#endif
1426 break; 1400 break;
1427 } 1401 }
1428 1402
1558 1532
1559 case SelectionRequest: 1533 case SelectionRequest:
1560 selection_send (ev.xselectionrequest); 1534 selection_send (ev.xselectionrequest);
1561 break; 1535 break;
1562 1536
1537 case MapNotify:
1538 mapped = 1;
1539#ifdef TEXT_BLINK
1540 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1541#endif
1542 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1543 break;
1544
1563 case UnmapNotify: 1545 case UnmapNotify:
1564 mapped = 0; 1546 mapped = 0;
1565#ifdef TEXT_BLINK 1547#ifdef TEXT_BLINK
1566 text_blink_ev.stop (); 1548 text_blink_ev.stop ();
1567#endif 1549#endif
1568 break; 1550 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1569
1570 case MapNotify:
1571 mapped = 1;
1572#ifdef TEXT_BLINK
1573 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1574#endif
1575 break; 1551 break;
1576 1552
1577#ifdef TRANSPARENT 1553#ifdef TRANSPARENT
1578 case ReparentNotify: 1554 case ReparentNotify:
1579 rootwin_cb (ev); 1555 rootwin_cb (ev);
1593 1569
1594 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev)) 1570 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev))
1595 scr_expose (ev.xexpose.x, ev.xexpose.y, 1571 scr_expose (ev.xexpose.x, ev.xexpose.y,
1596 ev.xexpose.width, ev.xexpose.height, False); 1572 ev.xexpose.width, ev.xexpose.height, False);
1597 1573
1598 scr_refresh (refresh_type); 1574 want_refresh = 1;
1599 } 1575 }
1600 else 1576 else
1601 { 1577 {
1602 XEvent unused_event; 1578 XEvent unused_event;
1603 1579
1609 if (isScrollbarWindow (ev.xany.window)) 1585 if (isScrollbarWindow (ev.xany.window))
1610 { 1586 {
1611 scrollBar.setIdle (); 1587 scrollBar.setIdle ();
1612 scrollbar_show (0); 1588 scrollbar_show (0);
1613 } 1589 }
1614#ifdef MENUBAR
1615 if (menubar_visible () && isMenuBarWindow (ev.xany.window))
1616 menubar_expose ();
1617#endif
1618 1590
1619#ifdef TRANSPARENT 1591#ifdef TRANSPARENT
1620 if (am_transparent && ev.xany.window == parent[0]) 1592 if (am_transparent && ev.xany.window == parent[0])
1621 XClearWindow (disp, ev.xany.window); 1593 XClearWindow (disp, ev.xany.window);
1622#endif 1594#endif
1626 case MotionNotify: 1598 case MotionNotify:
1627#ifdef POINTER_BLANK 1599#ifdef POINTER_BLANK
1628 if (hidden_pointer) 1600 if (hidden_pointer)
1629 pointer_unblank (); 1601 pointer_unblank ();
1630#endif 1602#endif
1631#if MENUBAR
1632 if (isMenuBarWindow (ev.xany.window))
1633 {
1634 menubar_control (ev.xbutton);
1635 break;
1636 }
1637#endif
1638 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1603 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1639 break; 1604 break;
1640 1605
1641 if (ev.xany.window == vt) 1606 if (ev.xany.window == vt)
1642 { 1607 {
1608 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)
1643 if (HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END))) 1609 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1644 ; // nop 1610 ; // nop
1645 else if (ev.xbutton.state & (Button1Mask | Button3Mask)) 1611 else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1646 { 1612 {
1647 while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev)) 1613 while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev))
1648 ; 1614 ;
1730 &unused_root_x, &unused_root_y, 1696 &unused_root_x, &unused_root_y,
1731 &ev.xbutton.x, &ev.xbutton.y, 1697 &ev.xbutton.x, &ev.xbutton.y,
1732 &unused_mask); 1698 &unused_mask);
1733 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1699 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1734 scrollbar_size ()); 1700 scrollbar_size ());
1735 scr_refresh (refresh_type); 1701 want_refresh = 1;
1736 refresh_limit = 0; 1702 refresh_limit = 0;
1737 scrollbar_show (1); 1703 scrollbar_show (1);
1738 } 1704 }
1739 break; 1705 break;
1740 } 1706 }
1707
1708skip_switch: ;
1709
1710#if defined(CURSOR_BLINK)
1711 if (OPTION (Opt_cursorBlink) && ev.type == KeyPress)
1712 {
1713 if (hidden_cursor)
1714 {
1715 hidden_cursor = 0;
1716 want_refresh = 1;
1717 }
1718
1719 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1720 }
1721#endif
1722
1723#if defined(POINTER_BLANK)
1724 if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0)
1725 {
1726 if (ev.type == MotionNotify
1727 || ev.type == ButtonPress
1728 || ev.type == ButtonRelease)
1729 if (hidden_pointer)
1730 pointer_unblank ();
1731
1732 if (ev.type == KeyPress && hidden_pointer == 0)
1733 pointer_blank ();
1734 }
1735#endif
1741} 1736}
1742 1737
1743void 1738void
1744rxvt_term::focus_in () 1739rxvt_term::focus_in ()
1745{ 1740{
1811 1806
1812#if TRANSPARENT 1807#if TRANSPARENT
1813void 1808void
1814rxvt_term::rootwin_cb (XEvent &ev) 1809rxvt_term::rootwin_cb (XEvent &ev)
1815{ 1810{
1816 SET_R (this); 1811 make_current ();
1817 SET_LOCALE (locale);
1818 1812
1819 switch (ev.type) 1813 switch (ev.type)
1820 { 1814 {
1821 case PropertyNotify: 1815 case PropertyNotify:
1822 /* 1816 /*
1870#ifdef MOUSE_REPORT_DOUBLECLICK 1864#ifdef MOUSE_REPORT_DOUBLECLICK
1871 if (ev.button == MEvent.button && clickintime) 1865 if (ev.button == MEvent.button && clickintime)
1872 { 1866 {
1873 /* same button, within alloted time */ 1867 /* same button, within alloted time */
1874 MEvent.clicks++; 1868 MEvent.clicks++;
1869
1875 if (MEvent.clicks > 1) 1870 if (MEvent.clicks > 1)
1876 { 1871 {
1877 /* only report double clicks */ 1872 /* only report double clicks */
1878 MEvent.clicks = 2; 1873 MEvent.clicks = 2;
1879 mouse_report (ev); 1874 mouse_report (ev);
1912#else 1907#else
1913 selection.rect = false; 1908 selection.rect = false;
1914#endif 1909#endif
1915 1910
1916 /* allow shift+left click to extend selection */ 1911 /* allow shift+left click to extend selection */
1917 if (ev.state & ShiftMask && ! (priv_modes & PrivMode_mouse_report)) 1912 if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report))
1918 { 1913 {
1919 if (MEvent.button == Button1 && clickintime) 1914 if (MEvent.button == Button1 && clickintime)
1920 selection_rotate (ev.x, ev.y); 1915 selection_rotate (ev.x, ev.y);
1921 else 1916 else
1922 selection_extend (ev.x, ev.y, 1); 1917 selection_extend (ev.x, ev.y, 1);
2087 } 2082 }
2088 2083
2089 break; 2084 break;
2090 } 2085 }
2091 } 2086 }
2087
2092 return; 2088 return;
2093 } 2089 }
2094#if MENUBAR
2095 /*
2096 * Menubar window processing of button press
2097 */
2098 if (isMenuBarWindow (ev.window))
2099 menubar_control (ev);
2100#endif
2101} 2090}
2102 2091
2103void 2092void
2104rxvt_term::button_release (XButtonEvent &ev) 2093rxvt_term::button_release (XButtonEvent &ev)
2105{ 2094{
2161 if (priv_modes & PrivMode_mouse_report 2150 if (priv_modes & PrivMode_mouse_report
2162 && bypass_keystate 2151 && bypass_keystate
2163 && ev.button == Button1 && MEvent.clicks <= 1) 2152 && ev.button == Button1 && MEvent.clicks <= 1)
2164 selection_extend (ev.x, ev.y, 0); 2153 selection_extend (ev.x, ev.y, 0);
2165 2154
2166 if (!HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END))) 2155 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2167 return; 2156 return;
2168 2157
2169 switch (ev.button) 2158 switch (ev.button)
2170 { 2159 {
2171 case Button1: 2160 case Button1:
2204 slip_wheel_ev.start (); 2193 slip_wheel_ev.start ();
2205 } 2194 }
2206 else 2195 else
2207 { 2196 {
2208# endif 2197# endif
2209# ifdef JUMP_MOUSE_WHEEL
2210 scr_page (v, i); 2198 scr_page (v, i);
2211 scr_refresh (SMOOTH_REFRESH);
2212 scrollbar_show (1); 2199 scrollbar_show (1);
2213# else
2214 while (i--)
2215 {
2216 scr_page (v, 1);
2217 scr_refresh (SMOOTH_REFRESH);
2218 scrollbar_show (1);
2219 }
2220# endif
2221# ifdef MOUSE_SLIP_WHEELING 2200# ifdef MOUSE_SLIP_WHEELING
2222 } 2201 }
2223#endif 2202# endif
2224 } 2203 }
2225 break; 2204 break;
2226#endif 2205#endif
2227 } 2206 }
2228 } 2207 }
2229#ifdef MENUBAR
2230 else if (isMenuBarWindow (ev.window))
2231 menubar_control (ev);
2232#endif
2233} 2208}
2234 2209
2235#ifdef TRANSPARENT 2210#ifdef TRANSPARENT
2236#if TINTING 2211#if TINTING
2237/* taken from aterm-0.4.2 */ 2212/* taken from aterm-0.4.2 */
2717 2692
2718bool 2693bool
2719rxvt_term::cmd_parse () 2694rxvt_term::cmd_parse ()
2720{ 2695{
2721 bool flag = false; 2696 bool flag = false;
2722 unicode_t ch = NOCHAR; 2697 wchar_t ch = NOCHAR;
2723 char *seq_begin; // remember start of esc-sequence here 2698 char *seq_begin; // remember start of esc-sequence here
2724 2699
2725 for (;;) 2700 for (;;)
2726 { 2701 {
2727 if (ch == NOCHAR) 2702 if (ch == NOCHAR)
2748 if (seen_resize && cmd_pid) 2723 if (seen_resize && cmd_pid)
2749 kill (-cmd_pid, SIGWINCH); 2724 kill (-cmd_pid, SIGWINCH);
2750 } 2725 }
2751 2726
2752 /* Read a text string from the input buffer */ 2727 /* Read a text string from the input buffer */
2753 unicode_t buf[UBUFSIZ]; 2728 wchar_t buf[UBUFSIZ];
2754 bool refreshnow = false; 2729 bool refreshnow = false;
2755 int nlines = 0; 2730 int nlines = 0;
2756 unicode_t *str = buf; 2731 wchar_t *str = buf;
2757 unicode_t *eol = str + min (ncol, UBUFSIZ); 2732 wchar_t *eol = str + min (ncol, UBUFSIZ);
2758 2733
2759 for (;;) 2734 for (;;)
2760 { 2735 {
2761 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)) 2736 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))
2762 break; 2737 break;
2780 } 2755 }
2781 2756
2782 // scr_add_lines only works for nlines <= nrow - 1. 2757 // scr_add_lines only works for nlines <= nrow - 1.
2783 if (nlines >= nrow - 1) 2758 if (nlines >= nrow - 1)
2784 { 2759 {
2760 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2785 if (!HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_USTRING_LEN, buf, str - buf, DT_END))) 2761 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2786 scr_add_lines (buf, nlines, str - buf); 2762 scr_add_lines (buf, str - buf, nlines);
2787 2763
2788 nlines = 0; 2764 nlines = 0;
2789 str = buf; 2765 str = buf;
2790 eol = str + min (ncol, UBUFSIZ); 2766 eol = str + min (ncol, UBUFSIZ);
2791 } 2767 }
2805 2781
2806 seq_begin = cmdbuf_ptr; 2782 seq_begin = cmdbuf_ptr;
2807 ch = next_char (); 2783 ch = next_char ();
2808 } 2784 }
2809 2785
2786 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2810 if (!HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_USTRING_LEN, buf, str - buf, DT_END))) 2787 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2811 scr_add_lines (buf, nlines, str - buf); 2788 scr_add_lines (buf, str - buf, nlines);
2812 2789
2813 /* 2790 /*
2814 * If there have been a lot of new lines, then update the screen 2791 * If there have been a lot of new lines, then update the screen
2815 * What the heck I'll cheat and only refresh less than every page-full. 2792 * What the heck I'll cheat and only refresh less than every page-full.
2816 * the number of pages between refreshes is refresh_limit, which 2793 * the number of pages between refreshes is refresh_limit, which
2822 refresh_limit++; 2799 refresh_limit++;
2823 else 2800 else
2824 { 2801 {
2825 flag = true; 2802 flag = true;
2826 scr_refresh (refresh_type); 2803 scr_refresh (refresh_type);
2827 flush_ev.stop (); 2804 want_refresh = 1;
2828 } 2805 }
2829 } 2806 }
2830 2807
2831 } 2808 }
2832 else 2809 else
2847 } 2824 }
2848 2825
2849 return flag; 2826 return flag;
2850} 2827}
2851 2828
2852// read the next octet
2853unicode_t
2854rxvt_term::next_octet ()
2855{
2856 return cmdbuf_ptr < cmdbuf_endp
2857 ? *cmdbuf_ptr++
2858 : NOCHAR;
2859}
2860
2861// read the next character 2829// read the next character
2862unicode_t 2830wchar_t
2863rxvt_term::next_char () 2831rxvt_term::next_char ()
2864{ 2832{
2865 while (cmdbuf_ptr < cmdbuf_endp) 2833 while (cmdbuf_ptr < cmdbuf_endp)
2866 { 2834 {
2867 // assume 7-bit to be ascii ALWAYS 2835 // assume 7-bit to be ascii ALWAYS
2877 cmdbuf_ptr = cmdbuf_endp; 2845 cmdbuf_ptr = cmdbuf_endp;
2878 break; 2846 break;
2879 } 2847 }
2880 2848
2881 if (len == (size_t)-1) 2849 if (len == (size_t)-1)
2882 return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 2850 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2883 2851
2884 // assume wchar == unicode 2852 // assume wchar == unicode
2885 cmdbuf_ptr += len; 2853 cmdbuf_ptr += len;
2886 return wc & UNICODE_MASK; 2854 return wc & UNICODE_MASK;
2887 } 2855 }
2888 2856
2889 return NOCHAR; 2857 return NOCHAR;
2858}
2859
2860// read the next octet
2861uint32_t
2862rxvt_term::next_octet ()
2863{
2864 return cmdbuf_ptr < cmdbuf_endp
2865 ? (unsigned char)*cmdbuf_ptr++
2866 : NOCHAR;
2890} 2867}
2891 2868
2892/* rxvt_cmd_getc () - Return next input character */ 2869/* rxvt_cmd_getc () - Return next input character */
2893/* 2870/*
2894 * Return the next input character after first passing any keyboard input 2871 * Return the next input character after first passing any keyboard input
2895 * to the command. 2872 * to the command.
2896 */ 2873 */
2897unicode_t 2874wchar_t
2898rxvt_term::cmd_getc () 2875rxvt_term::cmd_getc ()
2899{ 2876{
2900 unicode_t c = next_char (); 2877 wchar_t c = next_char ();
2901 2878
2902 if (c == NOCHAR) 2879 if (c == NOCHAR)
2903 throw out_of_input; 2880 throw out_of_input;
2904 2881
2905 return c; 2882 return c;
2906} 2883}
2907 2884
2908unicode_t 2885uint32_t
2909rxvt_term::cmd_get8 () 2886rxvt_term::cmd_get8 ()
2910{ 2887{
2911 unicode_t c = next_octet (); 2888 uint32_t c = next_octet ();
2912 2889
2913 if (c == NOCHAR) 2890 if (c == NOCHAR)
2914 throw out_of_input; 2891 throw out_of_input;
2915 2892
2916 return c; 2893 return c;
3183 break; 3160 break;
3184 3161
3185 /* 8.3.87: NEXT LINE */ 3162 /* 8.3.87: NEXT LINE */
3186 case C1_NEL: /* ESC E */ 3163 case C1_NEL: /* ESC E */
3187 { 3164 {
3188 unicode_t nlcr[] = { C0_LF, C0_CR }; 3165 wchar_t nlcr[] = { C0_LF, C0_CR };
3189 scr_add_lines (nlcr, 1, 2); 3166 scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1);
3190 } 3167 }
3191 break; 3168 break;
3192 3169
3193 /* kidnapped escape sequence: Should be 8.3.48 */ 3170 /* kidnapped escape sequence: Should be 8.3.48 */
3194 case C1_ESA: /* ESC G */ 3171 case C1_ESA: /* ESC G */
3858 { 3835 {
3859 if ((name = strchr (buf, ';')) == NULL) 3836 if ((name = strchr (buf, ';')) == NULL)
3860 break; 3837 break;
3861 3838
3862 *name++ = '\0'; 3839 *name++ = '\0';
3863 color = atoi (buf); 3840 color = atoi (buf) + minCOLOR;
3864 3841
3865 if (color < 0 || color >= TOTAL_COLORS) 3842 if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR))
3866 break; 3843 break;
3867 3844
3868 if ((buf = strchr (name, ';')) != NULL) 3845 if ((buf = strchr (name, ';')) != NULL)
3869 *buf++ = '\0'; 3846 *buf++ = '\0';
3870 3847
3871 if (name[0] == '?' && !name[1]) 3848 if (name[0] == '?' && !name[1])
3872 { 3849 {
3873 unsigned short r, g, b; 3850 unsigned short r, g, b;
3874 pix_colors_focused[color + minCOLOR].get (display, r, g, b); 3851 pix_colors_focused[color].get (display, r, g, b);
3875 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp); 3852 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp);
3876 } 3853 }
3877 else 3854 else
3878 set_window_color (color + minCOLOR, name); 3855 set_window_color (color, name);
3879 } 3856 }
3880 break; 3857 break;
3881 case XTerm_Color00: 3858 case XTerm_Color00:
3882 process_color_seq (XTerm_Color00, Color_fg, str, resp); 3859 process_color_seq (XTerm_Color00, Color_fg, str, resp);
3883 break; 3860 break;
3884 case XTerm_Color01: 3861 case XTerm_Color01:
3885 process_color_seq (XTerm_Color00, Color_bg, str, resp); 3862 process_color_seq (XTerm_Color01, Color_bg, str, resp);
3886 break; 3863 break;
3887#ifndef NO_CURSORCOLOR 3864#ifndef NO_CURSORCOLOR
3888 case XTerm_Color_cursor: 3865 case XTerm_Color_cursor:
3889 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp); 3866 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp);
3890 break; 3867 break;
3894 break; 3871 break;
3895 case XTerm_Color_pointer_bg: 3872 case XTerm_Color_pointer_bg:
3896 process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp); 3873 process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp);
3897 break; 3874 break;
3898#ifndef NO_BOLD_UNDERLINE_REVERSE 3875#ifndef NO_BOLD_UNDERLINE_REVERSE
3899 case XTerm_Color_BD:
3900 process_color_seq (XTerm_Color_BD, Color_BD, str, resp);
3901 break;
3902 case XTerm_Color_UL:
3903 process_color_seq (XTerm_Color_UL, Color_UL, str, resp);
3904 break;
3905 case XTerm_Color_RV: 3876 case XTerm_Color_RV:
3906 process_color_seq (XTerm_Color_RV, Color_RV, str, resp); 3877 process_color_seq (XTerm_Color_RV, Color_RV, str, resp);
3878 break;
3879 case Rxvt_Color_BD:
3880 case URxvt_Color_BD:
3881 process_color_seq (op, Color_BD, str, resp);
3882 break;
3883 case Rxvt_Color_UL:
3884 case URxvt_Color_UL:
3885 process_color_seq (op, Color_UL, str, resp);
3907 break; 3886 break;
3908 case URxvt_Color_IT: 3887 case URxvt_Color_IT:
3909 process_color_seq (URxvt_Color_IT, Color_IT, str, resp); 3888 process_color_seq (URxvt_Color_IT, Color_IT, str, resp);
3910 break; 3889 break;
3911#endif 3890#endif
3916 if (am_transparent) 3895 if (am_transparent)
3917 want_full_refresh = want_refresh = 1; 3896 want_full_refresh = want_refresh = 1;
3918 break; 3897 break;
3919#endif 3898#endif
3920 3899
3921 case XTerm_Pixmap: 3900 case Rxvt_Pixmap:
3922 if (*str != ';') 3901 if (*str != ';')
3923 { 3902 {
3924#if XPM_BACKGROUND 3903#if XPM_BACKGROUND
3925 scale_pixmap (""); /* reset to default scaling */ 3904 scale_pixmap (""); /* reset to default scaling */
3926 set_bgPixmap (str); /* change pixmap */ 3905 set_bgPixmap (str); /* change pixmap */
3927#endif
3928 scr_touch (true); 3906 scr_touch (true);
3907#endif
3929 } 3908 }
3909
3930 while ((str = strchr (str, ';')) != NULL) 3910 while ((str = strchr (str, ';')) != NULL)
3931 { 3911 {
3932 str++; 3912 str++;
3933#if XPM_BACKGROUND 3913#if XPM_BACKGROUND
3934 changed += scale_pixmap (str); 3914 changed += scale_pixmap (str);
3937 3917
3938 if (changed) 3918 if (changed)
3939 { 3919 {
3940#ifdef XPM_BACKGROUND 3920#ifdef XPM_BACKGROUND
3941 resize_pixmap (); 3921 resize_pixmap ();
3942#endif
3943 scr_touch (true); 3922 scr_touch (true);
3923#endif
3944 } 3924 }
3945 break; 3925 break;
3946 3926
3947 case XTerm_restoreFG: 3927 case Rxvt_restoreFG:
3948 set_window_color (Color_fg, str); 3928 set_window_color (Color_fg, str);
3949 break; 3929 break;
3950 case XTerm_restoreBG: 3930 case Rxvt_restoreBG:
3951 set_window_color (Color_bg, str); 3931 set_window_color (Color_bg, str);
3952 break; 3932 break;
3953 3933
3954 case XTerm_logfile: 3934 case XTerm_logfile:
3955 // TODO, when secure mode? 3935 // TODO, when secure mode?
3956 break; 3936 break;
3957 3937
3958#ifdef MENUBAR
3959 case URxvt_Menu:
3960 if (OPTION (Opt_insecure))
3961 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked
3962 break;
3963#endif
3964#if 0 3938#if 0
3965 case XTerm_dumpscreen: /* no error notices */ 3939 case Rxvt_dumpscreen: /* no error notices */
3966 { 3940 {
3967 int fd; 3941 int fd;
3968 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0) 3942 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0)
3969 { 3943 {
3970 scr_dump (fd); 3944 scr_dump (fd);
4022 break; 3996 break;
4023#endif 3997#endif
4024 3998
4025#if ENABLE_PERL 3999#if ENABLE_PERL
4026 case URxvt_perl: 4000 case URxvt_perl:
4027 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_STRING, str, DT_END))) 4001 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_STR, str, DT_END)))
4028 ; // no responses yet 4002 ; // no responses yet
4029 break; 4003 break;
4030#endif 4004#endif
4031 } 4005 }
4032} 4006}
4085 { 5, PrivMode_rVideo }, 4059 { 5, PrivMode_rVideo },
4086 { 6, PrivMode_relOrigin }, 4060 { 6, PrivMode_relOrigin },
4087 { 7, PrivMode_Autowrap }, 4061 { 7, PrivMode_Autowrap },
4088 // 8, bi-directional support mode 4062 // 8, bi-directional support mode
4089 { 9, PrivMode_MouseX10 }, 4063 { 9, PrivMode_MouseX10 },
4090#ifdef menuBar_esc
4091 { menuBar_esc, PrivMode_menuBar },
4092#endif
4093 // 18, 19 printing-related 4064 // 18, 19 printing-related
4094 { 25, PrivMode_VisibleCursor }, 4065 { 25, PrivMode_VisibleCursor },
4095#ifdef scrollBar_esc 4066#ifdef scrollBar_esc
4096 { scrollBar_esc, PrivMode_scrollBar }, 4067 { scrollBar_esc, PrivMode_scrollBar },
4097#endif 4068#endif
4144 /* extra handling for values with state unkept */ 4115 /* extra handling for values with state unkept */
4145 switch (arg[i]) 4116 switch (arg[i])
4146 { 4117 {
4147#if ENABLE_STYLES 4118#if ENABLE_STYLES
4148 case 1021: 4119 case 1021:
4149 if (mode) 4120 set_option (Opt_intensityStyles, mode);
4150 SET_OPTION (Opt_intensityStyles);
4151 else
4152 CLR_OPTION (Opt_intensityStyles);
4153 4121
4154 scr_touch (true); 4122 scr_touch (true);
4155 break; 4123 break;
4156#endif 4124#endif
4157 case 1048: /* alternative cursor save */ 4125 case 1048: /* alternative cursor save */
4179 case 3: /* 80/132 */ 4147 case 3: /* 80/132 */
4180 if (priv_modes & PrivMode_132OK) 4148 if (priv_modes & PrivMode_132OK)
4181 set_widthheight (((state ? 132 : 80) * fwidth), height); 4149 set_widthheight (((state ? 132 : 80) * fwidth), height);
4182 break; 4150 break;
4183 case 4: /* smooth scrolling */ 4151 case 4: /* smooth scrolling */
4184 if (!state) 4152 set_option (Opt_jumpScroll, !state);
4185 SET_OPTION (Opt_jumpScroll);
4186 else
4187 CLR_OPTION (Opt_jumpScroll);
4188 break; 4153 break;
4189 case 5: /* reverse video */ 4154 case 5: /* reverse video */
4190 scr_rvideo_mode (state); 4155 scr_rvideo_mode (state);
4191 break; 4156 break;
4192 case 6: /* relative/absolute origins */ 4157 case 6: /* relative/absolute origins */
4198 /* case 8: - auto repeat, can't do on a per window basis */ 4163 /* case 8: - auto repeat, can't do on a per window basis */
4199 case 9: /* X10 mouse reporting */ 4164 case 9: /* X10 mouse reporting */
4200 if (state) /* orthogonal */ 4165 if (state) /* orthogonal */
4201 priv_modes &= ~PrivMode_MouseX11; 4166 priv_modes &= ~PrivMode_MouseX11;
4202 break; 4167 break;
4203#ifdef menuBar_esc
4204 case menuBar_esc:
4205#ifdef MENUBAR
4206 map_menuBar (state);
4207#endif
4208 break;
4209#endif
4210#ifdef scrollBar_esc 4168#ifdef scrollBar_esc
4211 case scrollBar_esc: 4169 case scrollBar_esc:
4212 if (scrollbar_mapping (state)) 4170 if (scrollbar_mapping (state))
4213 { 4171 {
4214 resize_all_windows (0, 0, 0); 4172 resize_all_windows (0, 0, 0);
4233#if 0 4191#if 0
4234 case 1001: 4192 case 1001:
4235 break; /* X11 mouse highlighting */ 4193 break; /* X11 mouse highlighting */
4236#endif 4194#endif
4237 case 1010: /* scroll to bottom on TTY output inhibit */ 4195 case 1010: /* scroll to bottom on TTY output inhibit */
4238 if (!state) 4196 set_option (Opt_scrollTtyOutput, !state);
4239 SET_OPTION (Opt_scrollTtyOutput);
4240 else
4241 CLR_OPTION (Opt_scrollTtyOutput);
4242 break; 4197 break;
4243 case 1011: /* scroll to bottom on key press */ 4198 case 1011: /* scroll to bottom on key press */
4244 if (state) 4199 set_option (Opt_scrollTtyKeypress, state);
4245 SET_OPTION (Opt_scrollTtyKeypress);
4246 else
4247 CLR_OPTION (Opt_scrollTtyKeypress);
4248 break; 4200 break;
4249 case 1047: /* secondary screen w/ clearing last */ 4201 case 1047: /* secondary screen w/ clearing last */
4250 if (OPTION (Opt_secondaryScreen)) 4202 if (OPTION (Opt_secondaryScreen))
4251 if (current_screen != PRIMARY) 4203 if (current_screen != PRIMARY)
4252 scr_erase_screen (2); 4204 scr_erase_screen (2);
4462const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT 4414const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4463 4415
4464void 4416void
4465rxvt_term::tt_write (const char *data, unsigned int len) 4417rxvt_term::tt_write (const char *data, unsigned int len)
4466{ 4418{
4419 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
4420 return;
4421
4467 if (pty.pty < 0) 4422 if (pty.pty < 0)
4468 return; 4423 return;
4469 4424
4470 if (v_buflen == 0) 4425 if (v_buflen == 0)
4471 { 4426 {

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines