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.253 by root, Mon Jan 9 23:30:01 2006 UTC vs.
Revision 1.276 by root, Fri Jan 20 11:02:46 2006 UTC

… …
64 64
65/*----------------------------------------------------------------------*/ 65/*----------------------------------------------------------------------*/
66 66
67#define IS_CONTROL(ch) !((ch) & 0xffffff60UL) 67#define IS_CONTROL(ch) !((ch) & 0xffffff60UL)
68 68
69// exception thrown when the command parser runs out of input data
70class out_of_input { } out_of_input;
71
72#if ENABLE_FRILLS || ISO_14755 69#if ENABLE_FRILLS || ISO_14755
73 70
74#define ISO_14755_STARTED 0x80000000UL 71#define ISO_14755_STARTED 0x80000000UL
75#define ISO_14755_51 0x40000000UL // basic (section 5.1) 72#define ISO_14755_51 0x40000000UL // basic (section 5.1)
76#define ISO_14755_52 0x20000000UL // keycap (section 5.2) 73#define ISO_14755_52 0x20000000UL // keycap (section 5.2)
… …
147 || !IN_RANGE_EXC (y, 0, nrow)) 144 || !IN_RANGE_EXC (y, 0, nrow))
148 return; 145 return;
149 146
150 for (;;) 147 for (;;)
151 { 148 {
152 const line_t &l = ROW(y - view_start); 149 const line_t &l = ROW(y + view_start);
153 150
154 text_t t = l.t[x]; 151 text_t t = l.t[x];
155 152
156 if (t != NOCHAR || !x) 153 if (t != NOCHAR || !x)
157 { 154 {
… …
443 scr_move_to (0, 1); 440 scr_move_to (0, 1);
444 return; 441 return;
445 } 442 }
446 else if (keysym == XK_End) 443 else if (keysym == XK_End)
447 { 444 {
448 scr_move_to (1, 0); 445 scr_move_to (1, 1);
449 return; 446 return;
450 } 447 }
451 } 448 }
452#endif 449#endif
453 } 450 }
… …
464 { 461 {
465 switch (keysym) 462 switch (keysym)
466 { 463 {
467 /* normal XTerm key bindings */ 464 /* normal XTerm key bindings */
468 case XK_Insert: /* Shift+Insert = paste mouse selection */ 465 case XK_Insert: /* Shift+Insert = paste mouse selection */
469 selection_request (ev.time, 0, 0); 466 selection_request (ev.time);
470 return; 467 return;
471#if TODO 468#if TODO
472 /* rxvt extras */ 469 /* rxvt extras */
473 case XK_KP_Add: /* Shift+KP_Add = bigger font */ 470 case XK_KP_Add: /* Shift+KP_Add = bigger font */
474 change_font (FONT_UP); 471 change_font (FONT_UP);
… …
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)
… …
1411 case ButtonRelease: 1401 case ButtonRelease:
1412 button_release (ev.xbutton); 1402 button_release (ev.xbutton);
1413 break; 1403 break;
1414 1404
1415 case ClientMessage: 1405 case ClientMessage:
1416 if (ev.xclient.format == 32 1406 if (ev.xclient.format == 32)
1417 && ev.xclient.message_type == xa[XA_WM_PROTOCOLS])
1418 { 1407 {
1408 if (ev.xclient.message_type == xa[XA_WM_PROTOCOLS])
1409 {
1419 if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW]) 1410 if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW])
1411 {
1412 if (!HOOK_INVOKE ((this, HOOK_WM_DELETE_WINDOW, DT_XEVENT, ev, DT_END)))
1420 destroy (); 1413 destroy ();
1414 }
1421#if ENABLE_EWMH 1415#if ENABLE_EWMH
1422 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING]) 1416 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING])
1423 XSendEvent (disp, ev.xclient.window = display->root, 1417 XSendEvent (disp, ev.xclient.window = display->root,
1424 False, SubstructureRedirectMask | SubstructureNotifyMask, 1418 False, SubstructureRedirectMask | SubstructureNotifyMask,
1425 &ev); 1419 &ev);
1420#endif
1421 }
1422#if ENABLE_XEMBED
1423 else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
1424 {
1425 if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
1426 focus_in ();
1427 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1428 focus_out ();
1429 }
1426#endif 1430#endif
1427 } 1431 }
1428#if ENABLE_XEMBED
1429 else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
1430 {
1431 if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
1432 focus_in ();
1433 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1434 focus_out ();
1435 }
1436#endif
1437#ifdef OFFIX_DND
1438 /* OffiX Dnd (drag 'n' drop) protocol */
1439 else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL]
1440 && (ev.xclient.data.l[0] == DndFile
1441 || ev.xclient.data.l[0] == DndDir
1442 || ev.xclient.data.l[0] == DndLink))
1443 {
1444 /* Get Dnd data */
1445 Atom ActualType;
1446 int ActualFormat;
1447 unsigned char *data;
1448 unsigned long Size, RemainingBytes;
1449
1450 XGetWindowProperty (disp, display->root,
1451 xa[XA_DNDSELECTION],
1452 0L, 1000000L,
1453 False, AnyPropertyType,
1454 &ActualType, &ActualFormat,
1455 &Size, &RemainingBytes,
1456 &data);
1457 set_string_property (XA_CUT_BUFFER0, data);
1458 XFree (data);
1459 selection_paste (display->root, XA_CUT_BUFFER0, true);
1460 XSetInputFocus (disp, display->root, RevertToNone, CurrentTime);
1461 }
1462#endif /* OFFIX_DND */
1463 break; 1432 break;
1464 1433
1465 case MappingNotify: 1434 case MappingNotify:
1466 XRefreshKeyboardMapping (&ev.xmapping); 1435 XRefreshKeyboardMapping (&ev.xmapping);
1467 break; 1436 break;
… …
1509 { 1478 {
1510 seen_resize = 1; 1479 seen_resize = 1;
1511 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1480 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1512 } 1481 }
1513 1482
1483 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1484
1514#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */ 1485#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1515 if (OPTION (Opt_transparent)) 1486 if (OPTION (Opt_transparent))
1516 check_our_parents (); 1487 check_our_parents ();
1517#endif 1488#endif
1518 } 1489 }
… …
1573 1544
1574 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev)) 1545 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev))
1575 scr_expose (ev.xexpose.x, ev.xexpose.y, 1546 scr_expose (ev.xexpose.x, ev.xexpose.y,
1576 ev.xexpose.width, ev.xexpose.height, False); 1547 ev.xexpose.width, ev.xexpose.height, False);
1577 1548
1578 scr_refresh (refresh_type); 1549 want_refresh = 1;
1579 } 1550 }
1580 else 1551 else
1581 { 1552 {
1582 XEvent unused_event; 1553 XEvent unused_event;
1583 1554
… …
1589 if (isScrollbarWindow (ev.xany.window)) 1560 if (isScrollbarWindow (ev.xany.window))
1590 { 1561 {
1591 scrollBar.setIdle (); 1562 scrollBar.setIdle ();
1592 scrollbar_show (0); 1563 scrollbar_show (0);
1593 } 1564 }
1594#ifdef MENUBAR
1595 if (menubar_visible () && isMenuBarWindow (ev.xany.window))
1596 menubar_expose ();
1597#endif
1598 1565
1599#ifdef TRANSPARENT 1566#ifdef TRANSPARENT
1600 if (am_transparent && ev.xany.window == parent[0]) 1567 if (am_transparent && ev.xany.window == parent[0])
1601 XClearWindow (disp, ev.xany.window); 1568 XClearWindow (disp, ev.xany.window);
1602#endif 1569#endif
… …
1606 case MotionNotify: 1573 case MotionNotify:
1607#ifdef POINTER_BLANK 1574#ifdef POINTER_BLANK
1608 if (hidden_pointer) 1575 if (hidden_pointer)
1609 pointer_unblank (); 1576 pointer_unblank ();
1610#endif 1577#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) 1578 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1619 break; 1579 break;
1620 1580
1621 if (ev.xany.window == vt) 1581 if (ev.xany.window == vt)
1622 { 1582 {
1583 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)
1623 if (HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END))) 1584 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1624 ; // nop 1585 ; // nop
1625 else if (ev.xbutton.state & (Button1Mask | Button3Mask)) 1586 else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1626 { 1587 {
1627 while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev)) 1588 while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev))
1628 ; 1589 ;
… …
1710 &unused_root_x, &unused_root_y, 1671 &unused_root_x, &unused_root_y,
1711 &ev.xbutton.x, &ev.xbutton.y, 1672 &ev.xbutton.x, &ev.xbutton.y,
1712 &unused_mask); 1673 &unused_mask);
1713 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1674 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1714 scrollbar_size ()); 1675 scrollbar_size ());
1715 scr_refresh (refresh_type); 1676 want_refresh = 1;
1716 refresh_limit = 0; 1677 refresh_limit = 0;
1717 scrollbar_show (1); 1678 scrollbar_show (1);
1718 } 1679 }
1719 break; 1680 break;
1720 } 1681 }
… …
1728 { 1689 {
1729 hidden_cursor = 0; 1690 hidden_cursor = 0;
1730 want_refresh = 1; 1691 want_refresh = 1;
1731 } 1692 }
1732 1693
1733 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1694 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1734 } 1695 }
1735#endif 1696#endif
1736 1697
1737#if defined(POINTER_BLANK) 1698#if defined(POINTER_BLANK)
1738 if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0) 1699 if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0)
… …
1766 XSetICFocus (Input_Context); 1727 XSetICFocus (Input_Context);
1767 } 1728 }
1768#endif 1729#endif
1769#if CURSOR_BLINK 1730#if CURSOR_BLINK
1770 if (OPTION (Opt_cursorBlink)) 1731 if (OPTION (Opt_cursorBlink))
1771 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1732 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1772#endif 1733#endif
1773#if OFF_FOCUS_FADING 1734#if OFF_FOCUS_FADING
1774 if (rs[Rs_fade]) 1735 if (rs[Rs_fade])
1775 { 1736 {
1776 pix_colors = pix_colors_focused; 1737 pix_colors = pix_colors_focused;
… …
1820 1781
1821#if TRANSPARENT 1782#if TRANSPARENT
1822void 1783void
1823rxvt_term::rootwin_cb (XEvent &ev) 1784rxvt_term::rootwin_cb (XEvent &ev)
1824{ 1785{
1825 SET_R (this); 1786 make_current ();
1826 SET_LOCALE (locale);
1827 1787
1828 switch (ev.type) 1788 switch (ev.type)
1829 { 1789 {
1830 case PropertyNotify: 1790 case PropertyNotify:
1831 /* 1791 /*
… …
1922#else 1882#else
1923 selection.rect = false; 1883 selection.rect = false;
1924#endif 1884#endif
1925 1885
1926 /* allow shift+left click to extend selection */ 1886 /* allow shift+left click to extend selection */
1927 if (ev.state & ShiftMask && ! (priv_modes & PrivMode_mouse_report)) 1887 if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report))
1928 { 1888 {
1929 if (MEvent.button == Button1 && clickintime) 1889 if (MEvent.button == Button1 && clickintime)
1930 selection_rotate (ev.x, ev.y); 1890 selection_rotate (ev.x, ev.y);
1931 else 1891 else
1932 selection_extend (ev.x, ev.y, 1); 1892 selection_extend (ev.x, ev.y, 1);
… …
2100 } 2060 }
2101 } 2061 }
2102 2062
2103 return; 2063 return;
2104 } 2064 }
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} 2065}
2114 2066
2115void 2067void
2116rxvt_term::button_release (XButtonEvent &ev) 2068rxvt_term::button_release (XButtonEvent &ev)
2117{ 2069{
… …
2123 2075
2124 if (scrollbar_isUpDn ()) 2076 if (scrollbar_isUpDn ())
2125 { 2077 {
2126 scrollBar.setIdle (); 2078 scrollBar.setIdle ();
2127 scrollbar_show (0); 2079 scrollbar_show (0);
2128#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
2129 refresh_type &= ~SMOOTH_REFRESH;
2130#endif
2131 } 2080 }
2132 2081
2133#ifdef SELECTION_SCROLLING 2082#ifdef SELECTION_SCROLLING
2134 if (sel_scroll_ev.active) 2083 if (sel_scroll_ev.active)
2135 sel_scroll_ev.stop(); 2084 sel_scroll_ev.stop();
… …
2182 { 2131 {
2183 case Button1: 2132 case Button1:
2184 case Button3: 2133 case Button3:
2185 selection_make (ev.time); 2134 selection_make (ev.time);
2186 break; 2135 break;
2136
2187 case Button2: 2137 case Button2:
2188 selection_request (ev.time, ev.x, ev.y); 2138 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window?
2139 selection_request (ev.time, ev.state & ShiftMask ? Sel_Clipboard : Sel_Primary);
2189 break; 2140 break;
2141
2190#ifdef MOUSE_WHEEL 2142#ifdef MOUSE_WHEEL
2191 case Button4: 2143 case Button4:
2192 case Button5: 2144 case Button5:
2193 { 2145 {
2194 int i; 2146 int i;
… …
2216 slip_wheel_ev.start (); 2168 slip_wheel_ev.start ();
2217 } 2169 }
2218 else 2170 else
2219 { 2171 {
2220# endif 2172# endif
2221# ifdef JUMP_MOUSE_WHEEL
2222 scr_page (v, i); 2173 scr_page (v, i);
2223 scr_refresh (SMOOTH_REFRESH);
2224 scrollbar_show (1); 2174 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 2175# ifdef MOUSE_SLIP_WHEELING
2234 } 2176 }
2235#endif 2177# endif
2236 } 2178 }
2237 break; 2179 break;
2238#endif 2180#endif
2239 } 2181 }
2240 } 2182 }
2241#ifdef MENUBAR
2242 else if (isMenuBarWindow (ev.window))
2243 menubar_control (ev);
2244#endif
2245} 2183}
2246 2184
2247#ifdef TRANSPARENT 2185#ifdef TRANSPARENT
2248#if TINTING 2186#if TINTING
2249/* taken from aterm-0.4.2 */ 2187/* taken from aterm-0.4.2 */
… …
2792 } 2730 }
2793 2731
2794 // scr_add_lines only works for nlines <= nrow - 1. 2732 // scr_add_lines only works for nlines <= nrow - 1.
2795 if (nlines >= nrow - 1) 2733 if (nlines >= nrow - 1)
2796 { 2734 {
2735 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2797 if (!HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))) 2736 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2798 scr_add_lines (buf, str - buf, nlines); 2737 scr_add_lines (buf, str - buf, nlines);
2799 2738
2800 nlines = 0; 2739 nlines = 0;
2801 str = buf; 2740 str = buf;
2802 eol = str + min (ncol, UBUFSIZ); 2741 eol = str + min (ncol, UBUFSIZ);
… …
2817 2756
2818 seq_begin = cmdbuf_ptr; 2757 seq_begin = cmdbuf_ptr;
2819 ch = next_char (); 2758 ch = next_char ();
2820 } 2759 }
2821 2760
2761 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2822 if (!HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))) 2762 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2823 scr_add_lines (buf, str - buf, nlines); 2763 scr_add_lines (buf, str - buf, nlines);
2824 2764
2825 /* 2765 /*
2826 * If there have been a lot of new lines, then update the screen 2766 * 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. 2767 * What the heck I'll cheat and only refresh less than every page-full.
… …
2833 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD) 2773 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2834 refresh_limit++; 2774 refresh_limit++;
2835 else 2775 else
2836 { 2776 {
2837 flag = true; 2777 flag = true;
2838 scr_refresh (refresh_type); 2778 scr_refresh ();
2839 flush_ev.stop (); 2779 want_refresh = 1;
2840 } 2780 }
2841 } 2781 }
2842 2782
2843 } 2783 }
2844 else 2784 else
… …
2861 return flag; 2801 return flag;
2862} 2802}
2863 2803
2864// read the next character 2804// read the next character
2865wchar_t 2805wchar_t
2866rxvt_term::next_char () 2806rxvt_term::next_char () NOTHROW
2867{ 2807{
2868 while (cmdbuf_ptr < cmdbuf_endp) 2808 while (cmdbuf_ptr < cmdbuf_endp)
2869 { 2809 {
2870 // assume 7-bit to be ascii ALWAYS 2810 // assume 7-bit to be ascii ALWAYS
2871 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2811 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)
… …
2892 return NOCHAR; 2832 return NOCHAR;
2893} 2833}
2894 2834
2895// read the next octet 2835// read the next octet
2896uint32_t 2836uint32_t
2897rxvt_term::next_octet () 2837rxvt_term::next_octet () NOTHROW
2898{ 2838{
2899 return cmdbuf_ptr < cmdbuf_endp 2839 return cmdbuf_ptr < cmdbuf_endp
2900 ? (unsigned char)*cmdbuf_ptr++ 2840 ? (unsigned char)*cmdbuf_ptr++
2901 : NOCHAR; 2841 : NOCHAR;
2902} 2842}
2843
2844static class out_of_input out_of_input;
2903 2845
2904/* rxvt_cmd_getc () - Return next input character */ 2846/* rxvt_cmd_getc () - Return next input character */
2905/* 2847/*
2906 * Return the next input character after first passing any keyboard input 2848 * Return the next input character after first passing any keyboard input
2907 * to the command. 2849 * to the command.
2908 */ 2850 */
2909wchar_t 2851wchar_t
2910rxvt_term::cmd_getc () 2852rxvt_term::cmd_getc () THROW ((class out_of_input))
2911{ 2853{
2912 wchar_t c = next_char (); 2854 wchar_t c = next_char ();
2913 2855
2914 if (c == NOCHAR) 2856 if (c == NOCHAR)
2915 throw out_of_input; 2857 throw out_of_input;
2916 2858
2917 return c; 2859 return c;
2918} 2860}
2919 2861
2920uint32_t 2862uint32_t
2921rxvt_term::cmd_get8 () 2863rxvt_term::cmd_get8 () THROW ((class out_of_input))
2922{ 2864{
2923 uint32_t c = next_octet (); 2865 uint32_t c = next_octet ();
2924 2866
2925 if (c == NOCHAR) 2867 if (c == NOCHAR)
2926 throw out_of_input; 2868 throw out_of_input;
… …
3805 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3747 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3806 */ 3748 */
3807void 3749void
3808rxvt_term::process_xterm_seq (int op, const char *str, char resp) 3750rxvt_term::process_xterm_seq (int op, const char *str, char resp)
3809{ 3751{
3810 int changed = 0;
3811 int color; 3752 int color;
3812 char *buf, *name; 3753 char *buf, *name;
3813 bool query = str[0] == '?' && !str[1]; 3754 bool query = str[0] == '?' && !str[1];
3814 int saveop = op; 3755 int saveop = op;
3815 dDisp; 3756 dDisp;
… …
3870 { 3811 {
3871 if ((name = strchr (buf, ';')) == NULL) 3812 if ((name = strchr (buf, ';')) == NULL)
3872 break; 3813 break;
3873 3814
3874 *name++ = '\0'; 3815 *name++ = '\0';
3875 color = atoi (buf); 3816 color = atoi (buf) + minCOLOR;
3876 3817
3877 if (color < 0 || color >= TOTAL_COLORS) 3818 if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR))
3878 break; 3819 break;
3879 3820
3880 if ((buf = strchr (name, ';')) != NULL) 3821 if ((buf = strchr (name, ';')) != NULL)
3881 *buf++ = '\0'; 3822 *buf++ = '\0';
3882 3823
3883 if (name[0] == '?' && !name[1]) 3824 if (name[0] == '?' && !name[1])
3884 { 3825 {
3885 unsigned short r, g, b; 3826 unsigned short r, g, b;
3886 pix_colors_focused[color + minCOLOR].get (display, r, g, b); 3827 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); 3828 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp);
3888 } 3829 }
3889 else 3830 else
3890 set_window_color (color + minCOLOR, name); 3831 set_window_color (color, name);
3891 } 3832 }
3892 break; 3833 break;
3893 case XTerm_Color00: 3834 case XTerm_Color00:
3894 process_color_seq (XTerm_Color00, Color_fg, str, resp); 3835 process_color_seq (XTerm_Color00, Color_fg, str, resp);
3895 break; 3836 break;
3896 case XTerm_Color01: 3837 case XTerm_Color01:
3897 process_color_seq (XTerm_Color00, Color_bg, str, resp); 3838 process_color_seq (XTerm_Color01, Color_bg, str, resp);
3898 break; 3839 break;
3899#ifndef NO_CURSORCOLOR 3840#ifndef NO_CURSORCOLOR
3900 case XTerm_Color_cursor: 3841 case XTerm_Color_cursor:
3901 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp); 3842 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp);
3902 break; 3843 break;
… …
3906 break; 3847 break;
3907 case XTerm_Color_pointer_bg: 3848 case XTerm_Color_pointer_bg:
3908 process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp); 3849 process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp);
3909 break; 3850 break;
3910#ifndef NO_BOLD_UNDERLINE_REVERSE 3851#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: 3852 case XTerm_Color_RV:
3918 process_color_seq (XTerm_Color_RV, Color_RV, str, resp); 3853 process_color_seq (XTerm_Color_RV, Color_RV, str, resp);
3854 break;
3855 case Rxvt_Color_BD:
3856 case URxvt_Color_BD:
3857 process_color_seq (op, Color_BD, str, resp);
3858 break;
3859 case Rxvt_Color_UL:
3860 case URxvt_Color_UL:
3861 process_color_seq (op, Color_UL, str, resp);
3919 break; 3862 break;
3920 case URxvt_Color_IT: 3863 case URxvt_Color_IT:
3921 process_color_seq (URxvt_Color_IT, Color_IT, str, resp); 3864 process_color_seq (URxvt_Color_IT, Color_IT, str, resp);
3922 break; 3865 break;
3923#endif 3866#endif
… …
3928 if (am_transparent) 3871 if (am_transparent)
3929 want_full_refresh = want_refresh = 1; 3872 want_full_refresh = want_refresh = 1;
3930 break; 3873 break;
3931#endif 3874#endif
3932 3875
3933 case XTerm_Pixmap: 3876 case Rxvt_Pixmap:
3877 {
3934 if (*str != ';') 3878 if (*str != ';')
3935 { 3879 {
3936#if XPM_BACKGROUND 3880#if XPM_BACKGROUND
3937 scale_pixmap (""); /* reset to default scaling */ 3881 scale_pixmap (""); /* reset to default scaling */
3938 set_bgPixmap (str); /* change pixmap */ 3882 set_bgPixmap (str); /* change pixmap */
3939#endif
3940 scr_touch (true); 3883 scr_touch (true);
3884#endif
3941 } 3885 }
3886
3887 int changed = 0;
3888
3942 while ((str = strchr (str, ';')) != NULL) 3889 while ((str = strchr (str, ';')) != NULL)
3943 { 3890 {
3944 str++; 3891 str++;
3945#if XPM_BACKGROUND 3892#if XPM_BACKGROUND
3946 changed += scale_pixmap (str); 3893 changed += scale_pixmap (str);
3947#endif 3894#endif
3948 } 3895 }
3949 3896
3950 if (changed) 3897 if (changed)
3951 { 3898 {
3952#ifdef XPM_BACKGROUND 3899#ifdef XPM_BACKGROUND
3953 resize_pixmap (); 3900 resize_pixmap ();
3954#endif
3955 scr_touch (true); 3901 scr_touch (true);
3902#endif
3956 } 3903 }
3904 }
3957 break; 3905 break;
3958 3906
3959 case XTerm_restoreFG: 3907 case Rxvt_restoreFG:
3960 set_window_color (Color_fg, str); 3908 set_window_color (Color_fg, str);
3961 break; 3909 break;
3962 case XTerm_restoreBG: 3910 case Rxvt_restoreBG:
3963 set_window_color (Color_bg, str); 3911 set_window_color (Color_bg, str);
3964 break; 3912 break;
3965 3913
3966 case XTerm_logfile: 3914 case XTerm_logfile:
3967 // TODO, when secure mode? 3915 // TODO, when secure mode?
3968 break; 3916 break;
3969 3917
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 3918#if 0
3977 case XTerm_dumpscreen: /* no error notices */ 3919 case Rxvt_dumpscreen: /* no error notices */
3978 { 3920 {
3979 int fd; 3921 int fd;
3980 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0) 3922 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0)
3981 { 3923 {
3982 scr_dump (fd); 3924 scr_dump (fd);
… …
4013 if (query) 3955 if (query)
4014 tt_printf ("\33]%d;%-.250s%c", URxvt_locale, OPTION (Opt_insecure) ? locale : "", resp); 3956 tt_printf ("\33]%d;%-.250s%c", URxvt_locale, OPTION (Opt_insecure) ? locale : "", resp);
4015 else 3957 else
4016 { 3958 {
4017 set_locale (str); 3959 set_locale (str);
4018 pty.set_utf8_mode (enc_utf8); 3960 pty->set_utf8_mode (enc_utf8);
4019 init_xlocale (); 3961 init_xlocale ();
4020 } 3962 }
4021 break; 3963 break;
4022 3964
4023 case URxvt_view_up: 3965 case URxvt_view_up:
… …
4076 return state; 4018 return state;
4077} 4019}
4078 4020
4079/* we're not using priv _yet_ */ 4021/* we're not using priv _yet_ */
4080void 4022void
4081rxvt_term::process_terminal_mode (int mode, int priv __attribute__ ((unused)), unsigned int nargs, const int *arg) 4023rxvt_term::process_terminal_mode (int mode, int priv UNUSED, unsigned int nargs, const int *arg)
4082{ 4024{
4083 unsigned int i, j; 4025 unsigned int i, j;
4084 int state; 4026 int state;
4085 4027
4086 static const struct 4028 static const struct
… …
4097 { 5, PrivMode_rVideo }, 4039 { 5, PrivMode_rVideo },
4098 { 6, PrivMode_relOrigin }, 4040 { 6, PrivMode_relOrigin },
4099 { 7, PrivMode_Autowrap }, 4041 { 7, PrivMode_Autowrap },
4100 // 8, bi-directional support mode 4042 // 8, bi-directional support mode
4101 { 9, PrivMode_MouseX10 }, 4043 { 9, PrivMode_MouseX10 },
4102#ifdef menuBar_esc
4103 { menuBar_esc, PrivMode_menuBar },
4104#endif
4105 // 18, 19 printing-related 4044 // 18, 19 printing-related
4106 { 25, PrivMode_VisibleCursor }, 4045 { 25, PrivMode_VisibleCursor },
4107#ifdef scrollBar_esc 4046#ifdef scrollBar_esc
4108 { scrollBar_esc, PrivMode_scrollBar }, 4047 { scrollBar_esc, PrivMode_scrollBar },
4109#endif 4048#endif
… …
4204 /* case 8: - auto repeat, can't do on a per window basis */ 4143 /* case 8: - auto repeat, can't do on a per window basis */
4205 case 9: /* X10 mouse reporting */ 4144 case 9: /* X10 mouse reporting */
4206 if (state) /* orthogonal */ 4145 if (state) /* orthogonal */
4207 priv_modes &= ~PrivMode_MouseX11; 4146 priv_modes &= ~PrivMode_MouseX11;
4208 break; 4147 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 4148#ifdef scrollBar_esc
4217 case scrollBar_esc: 4149 case scrollBar_esc:
4218 if (scrollbar_mapping (state)) 4150 if (scrollbar_mapping (state))
4219 { 4151 {
4220 resize_all_windows (0, 0, 0); 4152 resize_all_windows (0, 0, 0);
… …
4465rxvt_term::tt_write (const char *data, unsigned int len) 4397rxvt_term::tt_write (const char *data, unsigned int len)
4466{ 4398{
4467 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END))) 4399 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
4468 return; 4400 return;
4469 4401
4470 if (pty.pty < 0) 4402 if (pty->pty < 0)
4471 return; 4403 return;
4472 4404
4473 if (v_buflen == 0) 4405 if (v_buflen == 0)
4474 { 4406 {
4475 ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE)); 4407 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE));
4476 4408
4477 if ((unsigned int)written == len) 4409 if ((unsigned int)written == len)
4478 return; 4410 return;
4479 4411
4480 data += written; 4412 data += written;
… …
4489 pty_ev.set (EVENT_READ | EVENT_WRITE); 4421 pty_ev.set (EVENT_READ | EVENT_WRITE);
4490} 4422}
4491 4423
4492void rxvt_term::pty_write () 4424void rxvt_term::pty_write ()
4493{ 4425{
4494 int written = write (pty.pty, v_buffer, min (v_buflen, MAX_PTY_WRITE)); 4426 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
4495 4427
4496 if (written > 0) 4428 if (written > 0)
4497 { 4429 {
4498 v_buflen -= written; 4430 v_buflen -= written;
4499 4431

Diff Legend

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