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.251 by root, Sun Jan 8 07:55:36 2006 UTC vs.
Revision 1.274 by root, Fri Jan 20 10:27:08 2006 UTC

… …
64 64
65/*----------------------------------------------------------------------*/ 65/*----------------------------------------------------------------------*/
66 66
67#define IS_CONTROL(ch) !((ch) & 0xffffff60UL) 67#define IS_CONTROL(ch) !((ch) & 0xffffff60UL)
68 68
69// exception thrown when the command parser runs out of input data
70class out_of_input { } out_of_input;
71
72#if ENABLE_FRILLS || ISO_14755 69#if ENABLE_FRILLS || ISO_14755
73 70
74#define ISO_14755_STARTED 0x80000000UL 71#define ISO_14755_STARTED 0x80000000UL
75#define ISO_14755_51 0x40000000UL // basic (section 5.1) 72#define ISO_14755_51 0x40000000UL // basic (section 5.1)
76#define ISO_14755_52 0x20000000UL // keycap (section 5.2) 73#define ISO_14755_52 0x20000000UL // keycap (section 5.2)
… …
147 || !IN_RANGE_EXC (y, 0, nrow)) 144 || !IN_RANGE_EXC (y, 0, nrow))
148 return; 145 return;
149 146
150 for (;;) 147 for (;;)
151 { 148 {
152 const line_t &l = ROW(y - view_start); 149 const line_t &l = ROW(y + view_start);
153 150
154 text_t t = l.t[x]; 151 text_t t = l.t[x];
155 152
156 if (t != NOCHAR || !x) 153 if (t != NOCHAR || !x)
157 { 154 {
… …
443 scr_move_to (0, 1); 440 scr_move_to (0, 1);
444 return; 441 return;
445 } 442 }
446 else if (keysym == XK_End) 443 else if (keysym == XK_End)
447 { 444 {
448 scr_move_to (1, 0); 445 scr_move_to (1, 1);
449 return; 446 return;
450 } 447 }
451 } 448 }
452#endif 449#endif
453 } 450 }
… …
464 { 461 {
465 switch (keysym) 462 switch (keysym)
466 { 463 {
467 /* normal XTerm key bindings */ 464 /* normal XTerm key bindings */
468 case XK_Insert: /* Shift+Insert = paste mouse selection */ 465 case XK_Insert: /* Shift+Insert = paste mouse selection */
469 selection_request (ev.time, 0, 0); 466 selection_request (ev.time, Sel_Primary);
470 return; 467 return;
471#if TODO 468#if TODO
472 /* rxvt extras */ 469 /* rxvt extras */
473 case XK_KP_Add: /* Shift+KP_Add = bigger font */ 470 case XK_KP_Add: /* Shift+KP_Add = bigger font */
474 change_font (FONT_UP); 471 change_font (FONT_UP);
… …
867#endif 864#endif
868 /* nil */ ; 865 /* nil */ ;
869 } 866 }
870 } 867 }
871 868
872 if (HOOK_INVOKE ((this, HOOK_KEY_PRESS, DT_XEVENT, &ev, DT_STR_LEN, kbuf, len, DT_END))) 869 if (HOOK_INVOKE ((this, HOOK_KEY_PRESS, DT_XEVENT, &ev, DT_INT, keysym, DT_STR_LEN, kbuf, len, DT_END)))
873 return; 870 return;
874 871
875 if (len <= 0) 872 if (len <= 0)
876 return; /* not mapped */ 873 return; /* not mapped */
877 874
… …
919#endif /* DEBUG_CMD */ 916#endif /* DEBUG_CMD */
920 tt_write (kbuf, (unsigned int)len); 917 tt_write (kbuf, (unsigned int)len);
921} 918}
922/*}}} */ 919/*}}} */
923 920
924#if MENUBAR_MAX || defined (KEYSYM_RESOURCE) 921#if defined (KEYSYM_RESOURCE)
925/*{{{ rxvt_cmd_write (), rxvt_cmd_getc () */
926/* attempt to `write' count to the input buffer */
927unsigned int 922unsigned int
928rxvt_term::cmd_write (const char *str, unsigned int count) 923rxvt_term::cmd_write (const char *str, unsigned int count)
929{ 924{
930 unsigned int n, s; 925 unsigned int n, s;
931 926
… …
972 967
973 if (want_refresh) 968 if (want_refresh)
974 { 969 {
975 if (SHOULD_INVOKE (HOOK_LINE_UPDATE)) 970 if (SHOULD_INVOKE (HOOK_LINE_UPDATE))
976 { 971 {
977 int row = -view_start; 972 int row = view_start;
978 int end_row = row + nrow; 973 int end_row = row + nrow;
979 974
980 while (row > -nsaved && ROW (row - 1).is_longer ()) 975 while (row > top_row && ROW (row - 1).is_longer ())
981 --row; 976 --row;
982 977
983 do 978 do
984 { 979 {
985 int start_row = row; 980 int start_row = row;
… …
987 982
988 do 983 do
989 { 984 {
990 l = &ROW (row++); 985 l = &ROW (row++);
991 986
992 if (l->f & LINE_FILTERED) 987 if (!(l->f & LINE_FILTERED))
993 row++;
994 else
995 { 988 {
996 // line not filtered, mark it as filtered 989 // line not filtered, mark it as filtered
997 l->f |= LINE_FILTERED; 990 l->f |= LINE_FILTERED;
998 while (l->is_longer ()) 991 while (l->is_longer ())
999 { 992 {
1000 l = &ROW (++row); 993 l = &ROW (row++);
1001 l->f |= LINE_FILTERED; 994 l->f |= LINE_FILTERED;
1002 } 995 }
1003 996
1004 // and filter it 997 // and filter it
1005 HOOK_INVOKE ((this, HOOK_LINE_UPDATE, DT_INT, start_row, DT_END)); 998 HOOK_INVOKE ((this, HOOK_LINE_UPDATE, DT_INT, start_row, DT_END));
… …
1007 break; 1000 break;
1008 } 1001 }
1009 } 1002 }
1010 while (l->is_longer () && row < end_row); 1003 while (l->is_longer () && row < end_row);
1011 } 1004 }
1012 while (++row < end_row); 1005 while (row < end_row);
1013 } 1006 }
1014 1007
1015 scr_refresh (refresh_type); 1008 scr_refresh ();
1016 scrollbar_show (1); 1009 scrollbar_show (1);
1017#ifdef USE_XIM 1010#ifdef USE_XIM
1018 IMSendSpot (); 1011 IMSendSpot ();
1019#endif 1012#endif
1020 } 1013 }
… …
1023} 1016}
1024 1017
1025void 1018void
1026rxvt_term::check_cb (check_watcher &w) 1019rxvt_term::check_cb (check_watcher &w)
1027{ 1020{
1028 SET_R (this); 1021 make_current ();
1029 SET_LOCALE (locale);
1030 1022
1031 display->flush (); 1023 display->flush ();
1032 1024
1033 if (want_refresh && !flush_ev.active) 1025 if (want_refresh && !flush_ev.active)
1034 flush_ev.start (NOW + 1. / 60.); // refresh at max. 60 hz normally 1026 flush_ev.start (NOW + 1. / 60.); // refresh at max. 60 hz normally
1035} 1027}
1036 1028
1037void 1029void
1038rxvt_term::flush_cb (time_watcher &w) 1030rxvt_term::flush_cb (time_watcher &w)
1039{ 1031{
1040 SET_R (this); 1032 make_current ();
1041 SET_LOCALE (locale);
1042 1033
1043 refresh_limit = 1; 1034 refresh_limit = 1;
1044 refresh_count = 0; 1035 refresh_count = 0;
1045 flush (); 1036 flush ();
1046} 1037}
… …
1050rxvt_term::cursor_blink_cb (time_watcher &w) 1041rxvt_term::cursor_blink_cb (time_watcher &w)
1051{ 1042{
1052 hidden_cursor = !hidden_cursor; 1043 hidden_cursor = !hidden_cursor;
1053 want_refresh = 1; 1044 want_refresh = 1;
1054 1045
1055 w.start (w.at + BLINK_INTERVAL); 1046 w.start (w.at + CURSOR_BLINK_INTERVAL);
1056} 1047}
1057#endif 1048#endif
1058 1049
1059#ifdef TEXT_BLINK 1050#ifdef TEXT_BLINK
1060void 1051void
… …
1074rxvt_term::cont_scroll_cb (time_watcher &w) 1065rxvt_term::cont_scroll_cb (time_watcher &w)
1075{ 1066{
1076 if ((scrollbar_isUp() || scrollbar_isDn()) && 1067 if ((scrollbar_isUp() || scrollbar_isDn()) &&
1077 scr_page (scrollbar_isUp() ? UP : DN, 1)) 1068 scr_page (scrollbar_isUp() ? UP : DN, 1))
1078 { 1069 {
1079 refresh_type |= SMOOTH_REFRESH;
1080 want_refresh = 1; 1070 want_refresh = 1;
1081 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1071 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1082 } 1072 }
1083} 1073}
1084#endif 1074#endif
… …
1088rxvt_term::sel_scroll_cb (time_watcher &w) 1078rxvt_term::sel_scroll_cb (time_watcher &w)
1089{ 1079{
1090 if (scr_page (scroll_selection_dir, scroll_selection_lines)) 1080 if (scr_page (scroll_selection_dir, scroll_selection_lines))
1091 { 1081 {
1092 selection_extend (selection_save_x, selection_save_y, selection_save_state); 1082 selection_extend (selection_save_x, selection_save_y, selection_save_state);
1093 refresh_type |= SMOOTH_REFRESH;
1094 want_refresh = 1; 1083 want_refresh = 1;
1095 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1084 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1096 } 1085 }
1097} 1086}
1098#endif 1087#endif
… …
1103{ 1092{
1104 if (mouse_slip_wheel_speed == 0 1093 if (mouse_slip_wheel_speed == 0
1105 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed) 1094 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
1106 : scr_page (UP, mouse_slip_wheel_speed)) 1095 : scr_page (UP, mouse_slip_wheel_speed))
1107 { 1096 {
1108 if (view_start == nsaved || 1097 if (view_start == top_row || view_start == 0)
1109 view_start == 0)
1110 mouse_slip_wheel_speed = 0; 1098 mouse_slip_wheel_speed = 0;
1111 1099
1112 refresh_type |= SMOOTH_REFRESH;
1113 want_refresh = 1; 1100 want_refresh = 1;
1114 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1101 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1115 } 1102 }
1116} 1103}
1117#endif 1104#endif
… …
1147 1134
1148 memmove (cmdbuf_base, cmdbuf_ptr, n); 1135 memmove (cmdbuf_base, cmdbuf_ptr, n);
1149 cmdbuf_ptr = cmdbuf_base; 1136 cmdbuf_ptr = cmdbuf_base;
1150 cmdbuf_endp = cmdbuf_ptr + n; 1137 cmdbuf_endp = cmdbuf_ptr + n;
1151 1138
1152 ssize_t r = read (pty.pty, cmdbuf_endp, CBUFSIZ - n); 1139 ssize_t r = read (pty->pty, cmdbuf_endp, CBUFSIZ - n);
1153 1140
1154 if (r > 0) 1141 if (r > 0)
1155 { 1142 {
1156 cmdbuf_endp += r; 1143 cmdbuf_endp += r;
1157 return true; 1144 return true;
… …
1175} 1162}
1176 1163
1177void 1164void
1178rxvt_term::pty_cb (io_watcher &w, short revents) 1165rxvt_term::pty_cb (io_watcher &w, short revents)
1179{ 1166{
1180 SET_R (this); 1167 make_current ();
1181 SET_LOCALE (locale);
1182 1168
1183 if (revents & EVENT_READ) 1169 if (revents & EVENT_READ)
1184 // loop, but don't allow a single term to monopolize us 1170 // loop, but don't allow a single term to monopolize us
1185 while (pty_fill ()) 1171 while (pty_fill ())
1186 if (cmd_parse ()) 1172 if (cmd_parse ())
… …
1218} 1204}
1219 1205
1220void 1206void
1221rxvt_term::pointer_cb (time_watcher &w) 1207rxvt_term::pointer_cb (time_watcher &w)
1222{ 1208{
1223 SET_R (this); 1209 make_current ();
1224 SET_LOCALE (locale);
1225 1210
1226 pointer_blank (); 1211 pointer_blank ();
1227} 1212}
1228#endif 1213#endif
1229 1214
… …
1308 1293
1309/*{{{ process an X event */ 1294/*{{{ process an X event */
1310void 1295void
1311rxvt_term::x_cb (XEvent &ev) 1296rxvt_term::x_cb (XEvent &ev)
1312{ 1297{
1298 make_current ();
1299
1313 dDisp; 1300 dDisp;
1314 1301
1315 SET_R (this); 1302 if (ev.xany.window == vt
1316 SET_LOCALE (locale); 1303 && SHOULD_INVOKE (HOOK_X_EVENT)
1304 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END)))
1305 return;
1317 1306
1307 // for XQueryPointer
1318 Window unused_root, unused_child; 1308 Window unused_root, unused_child;
1319 int unused_root_x, unused_root_y; 1309 int unused_root_x, unused_root_y;
1320 unsigned int unused_mask; 1310 unsigned int unused_mask;
1321 1311
1322 switch (ev.type) 1312 switch (ev.type)
… …
1329 1319
1330 break; 1320 break;
1331 1321
1332 case KeyRelease: 1322 case KeyRelease:
1333 { 1323 {
1334#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 1324#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL
1335 KeySym ks; 1325 KeySym keysym;
1336 1326
1337 ks = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/ 1327 keysym = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
1338#endif 1328#endif
1339 1329
1340#if ENABLE_FRILLS || ISO_14755 1330#if ENABLE_FRILLS || ISO_14755
1341 // ISO 14755 support 1331 // ISO 14755 support
1342 if (iso14755buf) 1332 if (iso14755buf)
… …
1347# endif 1337# endif
1348# if ISO_14755 1338# if ISO_14755
1349 // iso14755 part 5.2 handling: release time 1339 // iso14755 part 5.2 handling: release time
1350 // first: controls 1340 // first: controls
1351 if ((ev.xkey.state & ControlMask) 1341 if ((ev.xkey.state & ControlMask)
1352 && ((ks >= 0x40 && ks <= 0x5f) 1342 && ((keysym >= 0x40 && keysym <= 0x5f)
1353 || (ks >= 0x61 && ks <= 0x7f))) 1343 || (keysym >= 0x61 && keysym <= 0x7f)))
1354 { 1344 {
1355 iso14755buf = ISO_14755_51 | 0x2400 | (ks & 0x1f); 1345 iso14755buf = ISO_14755_51 | 0x2400 | (keysym & 0x1f);
1356 commit_iso14755 (); 1346 commit_iso14755 ();
1357 goto skip_switch; 1347 goto skip_switch;
1358 } 1348 }
1359 1349
1360 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2) 1350 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
1361 if (i[0] == ks) 1351 if (i[0] == keysym)
1362 { 1352 {
1363 iso14755buf = ISO_14755_51 | i[1]; 1353 iso14755buf = ISO_14755_51 | i[1];
1364 commit_iso14755 (); 1354 commit_iso14755 ();
1365 goto skip_switch; 1355 goto skip_switch;
1366 } 1356 }
… …
1390 iso14755buf = 0; 1380 iso14755buf = 0;
1391 } 1381 }
1392#endif 1382#endif
1393 1383
1394 if (ev.xany.window == vt 1384 if (ev.xany.window == vt
1395 && HOOK_INVOKE ((this, HOOK_KEY_RELEASE, DT_XEVENT, &ev, DT_END))) 1385 && HOOK_INVOKE ((this, HOOK_KEY_RELEASE, DT_XEVENT, &ev, DT_INT, keysym, DT_END)))
1396 break; 1386 break;
1397 1387
1398#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1388#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1399 if (!(ev.xkey.state & ControlMask)) 1389 if (!(ev.xkey.state & ControlMask))
1400 slip_wheel_ev.stop (); 1390 slip_wheel_ev.stop ();
1401 else if (ks == XK_Control_L || ks == XK_Control_R) 1391 else if (keysym == XK_Control_L || keysym == XK_Control_R)
1402 mouse_slip_wheel_speed = 0; 1392 mouse_slip_wheel_speed = 0;
1403#endif 1393#endif
1404 break; 1394 break;
1405 } 1395 }
1406 1396
… …
1509 { 1499 {
1510 seen_resize = 1; 1500 seen_resize = 1;
1511 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1501 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1512 } 1502 }
1513 1503
1504 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1505
1514#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */ 1506#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1515 if (OPTION (Opt_transparent)) 1507 if (OPTION (Opt_transparent))
1516 check_our_parents (); 1508 check_our_parents ();
1517#endif 1509#endif
1518 } 1510 }
… …
1573 1565
1574 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev)) 1566 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev))
1575 scr_expose (ev.xexpose.x, ev.xexpose.y, 1567 scr_expose (ev.xexpose.x, ev.xexpose.y,
1576 ev.xexpose.width, ev.xexpose.height, False); 1568 ev.xexpose.width, ev.xexpose.height, False);
1577 1569
1578 scr_refresh (refresh_type); 1570 want_refresh = 1;
1579 } 1571 }
1580 else 1572 else
1581 { 1573 {
1582 XEvent unused_event; 1574 XEvent unused_event;
1583 1575
… …
1589 if (isScrollbarWindow (ev.xany.window)) 1581 if (isScrollbarWindow (ev.xany.window))
1590 { 1582 {
1591 scrollBar.setIdle (); 1583 scrollBar.setIdle ();
1592 scrollbar_show (0); 1584 scrollbar_show (0);
1593 } 1585 }
1594#ifdef MENUBAR
1595 if (menubar_visible () && isMenuBarWindow (ev.xany.window))
1596 menubar_expose ();
1597#endif
1598 1586
1599#ifdef TRANSPARENT 1587#ifdef TRANSPARENT
1600 if (am_transparent && ev.xany.window == parent[0]) 1588 if (am_transparent && ev.xany.window == parent[0])
1601 XClearWindow (disp, ev.xany.window); 1589 XClearWindow (disp, ev.xany.window);
1602#endif 1590#endif
… …
1606 case MotionNotify: 1594 case MotionNotify:
1607#ifdef POINTER_BLANK 1595#ifdef POINTER_BLANK
1608 if (hidden_pointer) 1596 if (hidden_pointer)
1609 pointer_unblank (); 1597 pointer_unblank ();
1610#endif 1598#endif
1611#if MENUBAR
1612 if (isMenuBarWindow (ev.xany.window))
1613 {
1614 menubar_control (ev.xbutton);
1615 break;
1616 }
1617#endif
1618 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1599 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1619 break; 1600 break;
1620 1601
1621 if (ev.xany.window == vt) 1602 if (ev.xany.window == vt)
1622 { 1603 {
1604 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)
1623 if (HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END))) 1605 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1624 ; // nop 1606 ; // nop
1625 else if (ev.xbutton.state & (Button1Mask | Button3Mask)) 1607 else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1626 { 1608 {
1627 while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev)) 1609 while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev))
1628 ; 1610 ;
… …
1710 &unused_root_x, &unused_root_y, 1692 &unused_root_x, &unused_root_y,
1711 &ev.xbutton.x, &ev.xbutton.y, 1693 &ev.xbutton.x, &ev.xbutton.y,
1712 &unused_mask); 1694 &unused_mask);
1713 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1695 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1714 scrollbar_size ()); 1696 scrollbar_size ());
1715 scr_refresh (refresh_type); 1697 want_refresh = 1;
1716 refresh_limit = 0; 1698 refresh_limit = 0;
1717 scrollbar_show (1); 1699 scrollbar_show (1);
1718 } 1700 }
1719 break; 1701 break;
1720 } 1702 }
… …
1728 { 1710 {
1729 hidden_cursor = 0; 1711 hidden_cursor = 0;
1730 want_refresh = 1; 1712 want_refresh = 1;
1731 } 1713 }
1732 1714
1733 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1715 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1734 } 1716 }
1735#endif 1717#endif
1736 1718
1737#if defined(POINTER_BLANK) 1719#if defined(POINTER_BLANK)
1738 if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0) 1720 if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0)
… …
1766 XSetICFocus (Input_Context); 1748 XSetICFocus (Input_Context);
1767 } 1749 }
1768#endif 1750#endif
1769#if CURSOR_BLINK 1751#if CURSOR_BLINK
1770 if (OPTION (Opt_cursorBlink)) 1752 if (OPTION (Opt_cursorBlink))
1771 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1753 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1772#endif 1754#endif
1773#if OFF_FOCUS_FADING 1755#if OFF_FOCUS_FADING
1774 if (rs[Rs_fade]) 1756 if (rs[Rs_fade])
1775 { 1757 {
1776 pix_colors = pix_colors_focused; 1758 pix_colors = pix_colors_focused;
… …
1820 1802
1821#if TRANSPARENT 1803#if TRANSPARENT
1822void 1804void
1823rxvt_term::rootwin_cb (XEvent &ev) 1805rxvt_term::rootwin_cb (XEvent &ev)
1824{ 1806{
1825 SET_R (this); 1807 make_current ();
1826 SET_LOCALE (locale);
1827 1808
1828 switch (ev.type) 1809 switch (ev.type)
1829 { 1810 {
1830 case PropertyNotify: 1811 case PropertyNotify:
1831 /* 1812 /*
… …
1922#else 1903#else
1923 selection.rect = false; 1904 selection.rect = false;
1924#endif 1905#endif
1925 1906
1926 /* allow shift+left click to extend selection */ 1907 /* allow shift+left click to extend selection */
1927 if (ev.state & ShiftMask && ! (priv_modes & PrivMode_mouse_report)) 1908 if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report))
1928 { 1909 {
1929 if (MEvent.button == Button1 && clickintime) 1910 if (MEvent.button == Button1 && clickintime)
1930 selection_rotate (ev.x, ev.y); 1911 selection_rotate (ev.x, ev.y);
1931 else 1912 else
1932 selection_extend (ev.x, ev.y, 1); 1913 selection_extend (ev.x, ev.y, 1);
… …
2100 } 2081 }
2101 } 2082 }
2102 2083
2103 return; 2084 return;
2104 } 2085 }
2105
2106#if MENUBAR
2107 /*
2108 * Menubar window processing of button press
2109 */
2110 if (isMenuBarWindow (ev.window))
2111 menubar_control (ev);
2112#endif
2113} 2086}
2114 2087
2115void 2088void
2116rxvt_term::button_release (XButtonEvent &ev) 2089rxvt_term::button_release (XButtonEvent &ev)
2117{ 2090{
… …
2123 2096
2124 if (scrollbar_isUpDn ()) 2097 if (scrollbar_isUpDn ())
2125 { 2098 {
2126 scrollBar.setIdle (); 2099 scrollBar.setIdle ();
2127 scrollbar_show (0); 2100 scrollbar_show (0);
2128#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
2129 refresh_type &= ~SMOOTH_REFRESH;
2130#endif
2131 } 2101 }
2132 2102
2133#ifdef SELECTION_SCROLLING 2103#ifdef SELECTION_SCROLLING
2134 if (sel_scroll_ev.active) 2104 if (sel_scroll_ev.active)
2135 sel_scroll_ev.stop(); 2105 sel_scroll_ev.stop();
… …
2182 { 2152 {
2183 case Button1: 2153 case Button1:
2184 case Button3: 2154 case Button3:
2185 selection_make (ev.time); 2155 selection_make (ev.time);
2186 break; 2156 break;
2157
2187 case Button2: 2158 case Button2:
2188 selection_request (ev.time, ev.x, ev.y); 2159 if (IN_RANGE_EXC (ev.x, 0, width)
2160 && IN_RANGE_EXC (ev.y, 0, height)) // inside window?
2161 {
2162 if (ev.state & ShiftMask)
2163 selection_request (ev.time, Sel_Clipboard);
2164 else
2165 selection_request (ev.time, Sel_Primary);
2166 }
2189 break; 2167 break;
2168
2190#ifdef MOUSE_WHEEL 2169#ifdef MOUSE_WHEEL
2191 case Button4: 2170 case Button4:
2192 case Button5: 2171 case Button5:
2193 { 2172 {
2194 int i; 2173 int i;
… …
2216 slip_wheel_ev.start (); 2195 slip_wheel_ev.start ();
2217 } 2196 }
2218 else 2197 else
2219 { 2198 {
2220# endif 2199# endif
2221# ifdef JUMP_MOUSE_WHEEL
2222 scr_page (v, i); 2200 scr_page (v, i);
2223 scr_refresh (SMOOTH_REFRESH);
2224 scrollbar_show (1); 2201 scrollbar_show (1);
2225# else
2226 while (i--)
2227 {
2228 scr_page (v, 1);
2229 scr_refresh (SMOOTH_REFRESH);
2230 scrollbar_show (1);
2231 }
2232# endif
2233# ifdef MOUSE_SLIP_WHEELING 2202# ifdef MOUSE_SLIP_WHEELING
2234 } 2203 }
2235#endif 2204# endif
2236 } 2205 }
2237 break; 2206 break;
2238#endif 2207#endif
2239 } 2208 }
2240 } 2209 }
2241#ifdef MENUBAR
2242 else if (isMenuBarWindow (ev.window))
2243 menubar_control (ev);
2244#endif
2245} 2210}
2246 2211
2247#ifdef TRANSPARENT 2212#ifdef TRANSPARENT
2248#if TINTING 2213#if TINTING
2249/* taken from aterm-0.4.2 */ 2214/* taken from aterm-0.4.2 */
… …
2792 } 2757 }
2793 2758
2794 // scr_add_lines only works for nlines <= nrow - 1. 2759 // scr_add_lines only works for nlines <= nrow - 1.
2795 if (nlines >= nrow - 1) 2760 if (nlines >= nrow - 1)
2796 { 2761 {
2762 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2797 if (!HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))) 2763 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2798 scr_add_lines (buf, str - buf, nlines); 2764 scr_add_lines (buf, str - buf, nlines);
2799 2765
2800 nlines = 0; 2766 nlines = 0;
2801 str = buf; 2767 str = buf;
2802 eol = str + min (ncol, UBUFSIZ); 2768 eol = str + min (ncol, UBUFSIZ);
… …
2817 2783
2818 seq_begin = cmdbuf_ptr; 2784 seq_begin = cmdbuf_ptr;
2819 ch = next_char (); 2785 ch = next_char ();
2820 } 2786 }
2821 2787
2788 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2822 if (!HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))) 2789 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2823 scr_add_lines (buf, str - buf, nlines); 2790 scr_add_lines (buf, str - buf, nlines);
2824 2791
2825 /* 2792 /*
2826 * If there have been a lot of new lines, then update the screen 2793 * If there have been a lot of new lines, then update the screen
2827 * What the heck I'll cheat and only refresh less than every page-full. 2794 * What the heck I'll cheat and only refresh less than every page-full.
… …
2833 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD) 2800 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2834 refresh_limit++; 2801 refresh_limit++;
2835 else 2802 else
2836 { 2803 {
2837 flag = true; 2804 flag = true;
2838 scr_refresh (refresh_type); 2805 scr_refresh ();
2839 flush_ev.stop (); 2806 want_refresh = 1;
2840 } 2807 }
2841 } 2808 }
2842 2809
2843 } 2810 }
2844 else 2811 else
… …
2861 return flag; 2828 return flag;
2862} 2829}
2863 2830
2864// read the next character 2831// read the next character
2865wchar_t 2832wchar_t
2866rxvt_term::next_char () 2833rxvt_term::next_char () NOTHROW
2867{ 2834{
2868 while (cmdbuf_ptr < cmdbuf_endp) 2835 while (cmdbuf_ptr < cmdbuf_endp)
2869 { 2836 {
2870 // assume 7-bit to be ascii ALWAYS 2837 // assume 7-bit to be ascii ALWAYS
2871 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2838 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)
… …
2892 return NOCHAR; 2859 return NOCHAR;
2893} 2860}
2894 2861
2895// read the next octet 2862// read the next octet
2896uint32_t 2863uint32_t
2897rxvt_term::next_octet () 2864rxvt_term::next_octet () NOTHROW
2898{ 2865{
2899 return cmdbuf_ptr < cmdbuf_endp 2866 return cmdbuf_ptr < cmdbuf_endp
2900 ? (unsigned char)*cmdbuf_ptr++ 2867 ? (unsigned char)*cmdbuf_ptr++
2901 : NOCHAR; 2868 : NOCHAR;
2902} 2869}
2870
2871static class out_of_input out_of_input;
2903 2872
2904/* rxvt_cmd_getc () - Return next input character */ 2873/* rxvt_cmd_getc () - Return next input character */
2905/* 2874/*
2906 * Return the next input character after first passing any keyboard input 2875 * Return the next input character after first passing any keyboard input
2907 * to the command. 2876 * to the command.
2908 */ 2877 */
2909wchar_t 2878wchar_t
2910rxvt_term::cmd_getc () 2879rxvt_term::cmd_getc () THROW ((class out_of_input))
2911{ 2880{
2912 wchar_t c = next_char (); 2881 wchar_t c = next_char ();
2913 2882
2914 if (c == NOCHAR) 2883 if (c == NOCHAR)
2915 throw out_of_input; 2884 throw out_of_input;
2916 2885
2917 return c; 2886 return c;
2918} 2887}
2919 2888
2920uint32_t 2889uint32_t
2921rxvt_term::cmd_get8 () 2890rxvt_term::cmd_get8 () THROW ((class out_of_input))
2922{ 2891{
2923 uint32_t c = next_octet (); 2892 uint32_t c = next_octet ();
2924 2893
2925 if (c == NOCHAR) 2894 if (c == NOCHAR)
2926 throw out_of_input; 2895 throw out_of_input;
… …
3805 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3774 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3806 */ 3775 */
3807void 3776void
3808rxvt_term::process_xterm_seq (int op, const char *str, char resp) 3777rxvt_term::process_xterm_seq (int op, const char *str, char resp)
3809{ 3778{
3810 int changed = 0;
3811 int color; 3779 int color;
3812 char *buf, *name; 3780 char *buf, *name;
3813 bool query = str[0] == '?' && !str[1]; 3781 bool query = str[0] == '?' && !str[1];
3814 int saveop = op; 3782 int saveop = op;
3815 dDisp; 3783 dDisp;
… …
3870 { 3838 {
3871 if ((name = strchr (buf, ';')) == NULL) 3839 if ((name = strchr (buf, ';')) == NULL)
3872 break; 3840 break;
3873 3841
3874 *name++ = '\0'; 3842 *name++ = '\0';
3875 color = atoi (buf); 3843 color = atoi (buf) + minCOLOR;
3876 3844
3877 if (color < 0 || color >= TOTAL_COLORS) 3845 if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR))
3878 break; 3846 break;
3879 3847
3880 if ((buf = strchr (name, ';')) != NULL) 3848 if ((buf = strchr (name, ';')) != NULL)
3881 *buf++ = '\0'; 3849 *buf++ = '\0';
3882 3850
3883 if (name[0] == '?' && !name[1]) 3851 if (name[0] == '?' && !name[1])
3884 { 3852 {
3885 unsigned short r, g, b; 3853 unsigned short r, g, b;
3886 pix_colors_focused[color + minCOLOR].get (display, r, g, b); 3854 pix_colors_focused[color].get (display, r, g, b);
3887 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp); 3855 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp);
3888 } 3856 }
3889 else 3857 else
3890 set_window_color (color + minCOLOR, name); 3858 set_window_color (color, name);
3891 } 3859 }
3892 break; 3860 break;
3893 case XTerm_Color00: 3861 case XTerm_Color00:
3894 process_color_seq (XTerm_Color00, Color_fg, str, resp); 3862 process_color_seq (XTerm_Color00, Color_fg, str, resp);
3895 break; 3863 break;
3896 case XTerm_Color01: 3864 case XTerm_Color01:
3897 process_color_seq (XTerm_Color00, Color_bg, str, resp); 3865 process_color_seq (XTerm_Color01, Color_bg, str, resp);
3898 break; 3866 break;
3899#ifndef NO_CURSORCOLOR 3867#ifndef NO_CURSORCOLOR
3900 case XTerm_Color_cursor: 3868 case XTerm_Color_cursor:
3901 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp); 3869 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp);
3902 break; 3870 break;
… …
3906 break; 3874 break;
3907 case XTerm_Color_pointer_bg: 3875 case XTerm_Color_pointer_bg:
3908 process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp); 3876 process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp);
3909 break; 3877 break;
3910#ifndef NO_BOLD_UNDERLINE_REVERSE 3878#ifndef NO_BOLD_UNDERLINE_REVERSE
3911 case XTerm_Color_BD:
3912 process_color_seq (XTerm_Color_BD, Color_BD, str, resp);
3913 break;
3914 case XTerm_Color_UL:
3915 process_color_seq (XTerm_Color_UL, Color_UL, str, resp);
3916 break;
3917 case XTerm_Color_RV: 3879 case XTerm_Color_RV:
3918 process_color_seq (XTerm_Color_RV, Color_RV, str, resp); 3880 process_color_seq (XTerm_Color_RV, Color_RV, str, resp);
3881 break;
3882 case Rxvt_Color_BD:
3883 case URxvt_Color_BD:
3884 process_color_seq (op, Color_BD, str, resp);
3885 break;
3886 case Rxvt_Color_UL:
3887 case URxvt_Color_UL:
3888 process_color_seq (op, Color_UL, str, resp);
3919 break; 3889 break;
3920 case URxvt_Color_IT: 3890 case URxvt_Color_IT:
3921 process_color_seq (URxvt_Color_IT, Color_IT, str, resp); 3891 process_color_seq (URxvt_Color_IT, Color_IT, str, resp);
3922 break; 3892 break;
3923#endif 3893#endif
… …
3928 if (am_transparent) 3898 if (am_transparent)
3929 want_full_refresh = want_refresh = 1; 3899 want_full_refresh = want_refresh = 1;
3930 break; 3900 break;
3931#endif 3901#endif
3932 3902
3933 case XTerm_Pixmap: 3903 case Rxvt_Pixmap:
3904 {
3934 if (*str != ';') 3905 if (*str != ';')
3935 { 3906 {
3936#if XPM_BACKGROUND 3907#if XPM_BACKGROUND
3937 scale_pixmap (""); /* reset to default scaling */ 3908 scale_pixmap (""); /* reset to default scaling */
3938 set_bgPixmap (str); /* change pixmap */ 3909 set_bgPixmap (str); /* change pixmap */
3939#endif
3940 scr_touch (true); 3910 scr_touch (true);
3911#endif
3941 } 3912 }
3913
3914 int changed = 0;
3915
3942 while ((str = strchr (str, ';')) != NULL) 3916 while ((str = strchr (str, ';')) != NULL)
3943 { 3917 {
3944 str++; 3918 str++;
3945#if XPM_BACKGROUND 3919#if XPM_BACKGROUND
3946 changed += scale_pixmap (str); 3920 changed += scale_pixmap (str);
3947#endif 3921#endif
3948 } 3922 }
3949 3923
3950 if (changed) 3924 if (changed)
3951 { 3925 {
3952#ifdef XPM_BACKGROUND 3926#ifdef XPM_BACKGROUND
3953 resize_pixmap (); 3927 resize_pixmap ();
3954#endif
3955 scr_touch (true); 3928 scr_touch (true);
3929#endif
3956 } 3930 }
3931 }
3957 break; 3932 break;
3958 3933
3959 case XTerm_restoreFG: 3934 case Rxvt_restoreFG:
3960 set_window_color (Color_fg, str); 3935 set_window_color (Color_fg, str);
3961 break; 3936 break;
3962 case XTerm_restoreBG: 3937 case Rxvt_restoreBG:
3963 set_window_color (Color_bg, str); 3938 set_window_color (Color_bg, str);
3964 break; 3939 break;
3965 3940
3966 case XTerm_logfile: 3941 case XTerm_logfile:
3967 // TODO, when secure mode? 3942 // TODO, when secure mode?
3968 break; 3943 break;
3969 3944
3970#ifdef MENUBAR
3971 case URxvt_Menu:
3972 if (OPTION (Opt_insecure))
3973 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked
3974 break;
3975#endif
3976#if 0 3945#if 0
3977 case XTerm_dumpscreen: /* no error notices */ 3946 case Rxvt_dumpscreen: /* no error notices */
3978 { 3947 {
3979 int fd; 3948 int fd;
3980 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0) 3949 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0)
3981 { 3950 {
3982 scr_dump (fd); 3951 scr_dump (fd);
… …
4013 if (query) 3982 if (query)
4014 tt_printf ("\33]%d;%-.250s%c", URxvt_locale, OPTION (Opt_insecure) ? locale : "", resp); 3983 tt_printf ("\33]%d;%-.250s%c", URxvt_locale, OPTION (Opt_insecure) ? locale : "", resp);
4015 else 3984 else
4016 { 3985 {
4017 set_locale (str); 3986 set_locale (str);
4018 pty.set_utf8_mode (enc_utf8); 3987 pty->set_utf8_mode (enc_utf8);
4019 init_xlocale (); 3988 init_xlocale ();
4020 } 3989 }
4021 break; 3990 break;
4022 3991
4023 case URxvt_view_up: 3992 case URxvt_view_up:
… …
4076 return state; 4045 return state;
4077} 4046}
4078 4047
4079/* we're not using priv _yet_ */ 4048/* we're not using priv _yet_ */
4080void 4049void
4081rxvt_term::process_terminal_mode (int mode, int priv __attribute__ ((unused)), unsigned int nargs, const int *arg) 4050rxvt_term::process_terminal_mode (int mode, int priv UNUSED, unsigned int nargs, const int *arg)
4082{ 4051{
4083 unsigned int i, j; 4052 unsigned int i, j;
4084 int state; 4053 int state;
4085 4054
4086 static const struct 4055 static const struct
… …
4097 { 5, PrivMode_rVideo }, 4066 { 5, PrivMode_rVideo },
4098 { 6, PrivMode_relOrigin }, 4067 { 6, PrivMode_relOrigin },
4099 { 7, PrivMode_Autowrap }, 4068 { 7, PrivMode_Autowrap },
4100 // 8, bi-directional support mode 4069 // 8, bi-directional support mode
4101 { 9, PrivMode_MouseX10 }, 4070 { 9, PrivMode_MouseX10 },
4102#ifdef menuBar_esc
4103 { menuBar_esc, PrivMode_menuBar },
4104#endif
4105 // 18, 19 printing-related 4071 // 18, 19 printing-related
4106 { 25, PrivMode_VisibleCursor }, 4072 { 25, PrivMode_VisibleCursor },
4107#ifdef scrollBar_esc 4073#ifdef scrollBar_esc
4108 { scrollBar_esc, PrivMode_scrollBar }, 4074 { scrollBar_esc, PrivMode_scrollBar },
4109#endif 4075#endif
… …
4204 /* case 8: - auto repeat, can't do on a per window basis */ 4170 /* case 8: - auto repeat, can't do on a per window basis */
4205 case 9: /* X10 mouse reporting */ 4171 case 9: /* X10 mouse reporting */
4206 if (state) /* orthogonal */ 4172 if (state) /* orthogonal */
4207 priv_modes &= ~PrivMode_MouseX11; 4173 priv_modes &= ~PrivMode_MouseX11;
4208 break; 4174 break;
4209#ifdef menuBar_esc
4210 case menuBar_esc:
4211#ifdef MENUBAR
4212 map_menuBar (state);
4213#endif
4214 break;
4215#endif
4216#ifdef scrollBar_esc 4175#ifdef scrollBar_esc
4217 case scrollBar_esc: 4176 case scrollBar_esc:
4218 if (scrollbar_mapping (state)) 4177 if (scrollbar_mapping (state))
4219 { 4178 {
4220 resize_all_windows (0, 0, 0); 4179 resize_all_windows (0, 0, 0);
… …
4462const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT 4421const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4463 4422
4464void 4423void
4465rxvt_term::tt_write (const char *data, unsigned int len) 4424rxvt_term::tt_write (const char *data, unsigned int len)
4466{ 4425{
4467 if (pty.pty < 0) 4426 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
4468 return; 4427 return;
4469 4428
4429 if (pty->pty < 0)
4430 return;
4431
4470 if (v_buflen == 0) 4432 if (v_buflen == 0)
4471 { 4433 {
4472 ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE)); 4434 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE));
4473 4435
4474 if ((unsigned int)written == len) 4436 if ((unsigned int)written == len)
4475 return; 4437 return;
4476 4438
4477 data += written; 4439 data += written;
… …
4486 pty_ev.set (EVENT_READ | EVENT_WRITE); 4448 pty_ev.set (EVENT_READ | EVENT_WRITE);
4487} 4449}
4488 4450
4489void rxvt_term::pty_write () 4451void rxvt_term::pty_write ()
4490{ 4452{
4491 int written = write (pty.pty, v_buffer, min (v_buflen, MAX_PTY_WRITE)); 4453 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
4492 4454
4493 if (written > 0) 4455 if (written > 0)
4494 { 4456 {
4495 v_buflen -= written; 4457 v_buflen -= written;
4496 4458

Diff Legend

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