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.354 by sasha, Wed Sep 12 21:06:08 2007 UTC vs.
Revision 1.363 by root, Sun Nov 11 04:08:00 2007 UTC

… …
596 newlen = 0; 596 newlen = 0;
597 } 597 }
598 break; 598 break;
599 599
600#ifdef XK_KP_Left 600#ifdef XK_KP_Left
601 case XK_KP_Left: /* \033Ot or standard */
601 case XK_KP_Up: /* \033Ox or standard */ 602 case XK_KP_Up: /* \033Ox or standard */
603 case XK_KP_Right: /* \033Ov or standard */
602 case XK_KP_Down: /* \033Or or standard */ 604 case XK_KP_Down: /* \033Or or standard */
603 case XK_KP_Right: /* \033Ov or standard */
604 case XK_KP_Left: /* \033Ot or standard */
605 if (kp) 605 if (kp)
606 { 606 {
607 strcpy (kbuf, "\033OZ"); 607 strcpy (kbuf, "\033OZ");
608 kbuf[2] = "txvr"[keysym - XK_KP_Left]; 608 kbuf[2] = "txvr"[keysym - XK_KP_Left];
609 break; 609 break;
… …
1035void 1035void
1036rxvt_term::flush () 1036rxvt_term::flush ()
1037{ 1037{
1038 flush_ev.stop (); 1038 flush_ev.stop ();
1039 1039
1040#ifdef HAVE_BG_PIXMAP
1041 if (bgPixmap.check_clearChanged ())
1042 {
1043// scr_clear (true); This needs to be researched further!
1044 scr_touch (false);
1045 }
1046#endif
1047
1040 if (want_refresh) 1048 if (want_refresh)
1041 { 1049 {
1042 if (SHOULD_INVOKE (HOOK_LINE_UPDATE)) 1050 if (SHOULD_INVOKE (HOOK_LINE_UPDATE))
1043 { 1051 {
1044 int row = view_start; 1052 int row = view_start;
… …
1086 1094
1087 display->flush (); 1095 display->flush ();
1088} 1096}
1089 1097
1090void 1098void
1091rxvt_term::check_cb (check_watcher &w) 1099rxvt_term::prepare_cb (ev::prepare &w, int revents)
1092{ 1100{
1093 make_current (); 1101 make_current ();
1094 1102
1095 display->flush (); 1103 display->flush ();
1096 1104
1097 if (want_refresh && !flush_ev.active) 1105 if (want_refresh && !flush_ev.active)
1098 flush_ev.start (NOW + 1. / 60.); // refresh at max. 60 hz normally 1106 flush_ev.start (1. / 60.); // refresh at max. 60 hz normally
1099} 1107}
1100 1108
1101void 1109void
1102rxvt_term::flush_cb (time_watcher &w) 1110rxvt_term::flush_cb (ev::timer &w, int revents)
1103{ 1111{
1104 make_current (); 1112 make_current ();
1105 1113
1106 refresh_count = 0; 1114 refresh_count = 0;
1107 flush (); 1115 flush ();
1108} 1116}
1109 1117
1110#ifdef CURSOR_BLINK 1118#ifdef CURSOR_BLINK
1111void 1119void
1112rxvt_term::cursor_blink_cb (time_watcher &w) 1120rxvt_term::cursor_blink_cb (ev::timer &w, int revents)
1113{ 1121{
1114 hidden_cursor = !hidden_cursor; 1122 hidden_cursor = !hidden_cursor;
1115 want_refresh = 1; 1123 want_refresh = 1;
1116
1117 w.start (w.at + CURSOR_BLINK_INTERVAL);
1118} 1124}
1119#endif 1125#endif
1120 1126
1121#ifdef TEXT_BLINK 1127#ifdef TEXT_BLINK
1122void 1128void
1123rxvt_term::text_blink_cb (time_watcher &w) 1129rxvt_term::text_blink_cb (ev::timer &w, int revents)
1124{ 1130{
1125 if (scr_refresh_rend (RS_Blink, RS_Blink)) 1131 if (scr_refresh_rend (RS_Blink, RS_Blink))
1126 { 1132 {
1127 hidden_text = !hidden_text; 1133 hidden_text = !hidden_text;
1128 want_refresh = 1; 1134 want_refresh = 1;
1129 w.start (w.at + TEXT_BLINK_INTERVAL);
1130 } 1135 }
1131} 1136}
1132#endif 1137#endif
1133 1138
1134#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1139#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1135void 1140void
1136rxvt_term::cont_scroll_cb (time_watcher &w) 1141rxvt_term::cont_scroll_cb (ev::timer &w, int revents)
1137{ 1142{
1138 if ((scrollbar_isUp() || scrollbar_isDn()) && 1143 if ((scrollbar_isUp() || scrollbar_isDn()) &&
1139 scr_page (scrollbar_isUp() ? UP : DN, 1)) 1144 scr_page (scrollbar_isUp() ? UP : DN, 1))
1140 {
1141 want_refresh = 1; 1145 want_refresh = 1;
1142 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1146 else
1143 } 1147 w.stop ();
1144} 1148}
1145#endif 1149#endif
1146 1150
1147#ifdef SELECTION_SCROLLING 1151#ifdef SELECTION_SCROLLING
1148void 1152void
1149rxvt_term::sel_scroll_cb (time_watcher &w) 1153rxvt_term::sel_scroll_cb (ev::timer &w, int revents)
1150{ 1154{
1151 if (scr_page (scroll_selection_dir, scroll_selection_lines)) 1155 if (scr_page (scroll_selection_dir, scroll_selection_lines))
1152 { 1156 {
1153 selection_extend (selection_save_x, selection_save_y, selection_save_state); 1157 selection_extend (selection_save_x, selection_save_y, selection_save_state);
1154 want_refresh = 1; 1158 want_refresh = 1;
1155 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1156 } 1159 }
1160 else
1161 w.stop ();
1157} 1162}
1158#endif 1163#endif
1159 1164
1160#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1165#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1161void 1166void
1162rxvt_term::slip_wheel_cb (time_watcher &w) 1167rxvt_term::slip_wheel_cb (ev::timer &w, int revents)
1163{ 1168{
1164 if (mouse_slip_wheel_speed == 0 1169 if (mouse_slip_wheel_speed == 0
1165 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed) 1170 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
1166 : scr_page (UP, mouse_slip_wheel_speed)) 1171 : scr_page (UP, mouse_slip_wheel_speed))
1167 { 1172 {
1168 if (view_start == top_row || view_start == 0) 1173 if (view_start == top_row || view_start == 0)
1169 mouse_slip_wheel_speed = 0; 1174 mouse_slip_wheel_speed = 0;
1170 1175
1171 want_refresh = 1; 1176 want_refresh = 1;
1172 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1173 } 1177 }
1178 else
1179 w.stop ();
1174} 1180}
1175#endif 1181#endif
1176 1182
1177#if LINUX_YIELD_HACK 1183#if LINUX_YIELD_HACK
1178static struct event_handler 1184static struct event_handler
1179{ 1185{
1180 check_watcher yield_ev; 1186 ev::prepare yield_ev;
1181 1187
1182 void yield_cb (check_watcher &w) 1188 void yield_cb (ev::prepare &w, int revents)
1183 { 1189 {
1184 // this should really be sched_yield(), but the linux guys thought 1190 // this should really be sched_yield(), but the linux guys thought
1185 // that giving a process calling sched_yield () less cpu time than 1191 // that giving a process calling sched_yield () less cpu time than
1186 // ones with high nice levels is a useful thing to do. It surely is is 1192 // ones with high nice levels is a useful thing to do. It surely is is
1187 // allowed by the sus... as is returning ENOSYS. 1193 // allowed by the sus... as is returning ENOSYS.
… …
1238 1244
1239 return false; 1245 return false;
1240} 1246}
1241 1247
1242void 1248void
1243rxvt_term::pty_cb (io_watcher &w, short revents) 1249rxvt_term::pty_cb (ev::io &w, int revents)
1244{ 1250{
1245 make_current (); 1251 make_current ();
1246 1252
1247 if (revents & EVENT_READ) 1253 if (revents & ev::READ)
1248 // loop, but don't allow a single term to monopolize us 1254 // loop, but don't allow a single term to monopolize us
1249 while (pty_fill ()) 1255 while (pty_fill ())
1250 if (cmd_parse ()) 1256 if (cmd_parse ())
1251 break; 1257 break;
1252 1258
1253 if (revents & EVENT_WRITE) 1259 if (revents & ev::WRITE)
1254 pty_write (); 1260 pty_write ();
1255} 1261}
1256 1262
1257void 1263void
1258rxvt_term::pointer_unblank () 1264rxvt_term::pointer_unblank ()
… …
1262 1268
1263#ifdef POINTER_BLANK 1269#ifdef POINTER_BLANK
1264 hidden_pointer = 0; 1270 hidden_pointer = 0;
1265 1271
1266 if (option (Opt_pointerBlank)) 1272 if (option (Opt_pointerBlank))
1267 pointer_ev.start (NOW + pointerBlankDelay); 1273 pointer_ev.start (pointerBlankDelay);
1268#endif 1274#endif
1269} 1275}
1270 1276
1271#ifdef POINTER_BLANK 1277#ifdef POINTER_BLANK
1272void 1278void
… …
1280 1286
1281 hidden_pointer = 1; 1287 hidden_pointer = 1;
1282} 1288}
1283 1289
1284void 1290void
1285rxvt_term::pointer_cb (time_watcher &w) 1291rxvt_term::pointer_cb (ev::timer &w, int revents)
1286{ 1292{
1287 make_current (); 1293 make_current ();
1288 1294
1289 pointer_blank (); 1295 pointer_blank ();
1290} 1296}
… …
1293void 1299void
1294rxvt_term::mouse_report (XButtonEvent &ev) 1300rxvt_term::mouse_report (XButtonEvent &ev)
1295{ 1301{
1296 int button_number, key_state = 0; 1302 int button_number, key_state = 0;
1297 int x, y; 1303 int x, y;
1304 int code = 32;
1298 1305
1299 x = ev.x; 1306 x = Pixel2Col (ev.x);
1300 y = ev.y; 1307 y = Pixel2Row (ev.y);
1301 pixel_position (&x, &y); 1308 if (ev.type == MotionNotify) {
1309 if (x == mouse_row && y == mouse_col)
1310 return;
1311 mouse_row = x;
1312 mouse_col = y;
1313 code += 32;
1314 }
1302 1315
1303 if (MEvent.button == AnyButton) 1316 if (MEvent.button == AnyButton)
1304 button_number = 3; 1317 button_number = 3;
1305 else 1318 else
1306 { 1319 {
… …
1352 x + 1, 1365 x + 1,
1353 y + 1); 1366 y + 1);
1354#endif 1367#endif
1355 1368
1356 tt_printf ("\033[M%c%c%c", 1369 tt_printf ("\033[M%c%c%c",
1357 (32 + button_number + key_state), 1370 (code + button_number + key_state),
1358 (32 + x + 1), 1371 (32 + x + 1),
1359 (32 + y + 1)); 1372 (32 + y + 1));
1360} 1373}
1361 1374
1362/*{{{ process an X event */ 1375/*{{{ process an X event */
… …
1466 && ev.xfocus.mode != NotifyGrab) 1479 && ev.xfocus.mode != NotifyGrab)
1467 focus_out (); 1480 focus_out ();
1468 break; 1481 break;
1469 1482
1470 case ConfigureNotify: 1483 case ConfigureNotify:
1471/* fprintf (stderr, "ConfigureNotify for %X, parent is %X, geom is %dx%d%+d%+d, old geom was %dx%d\n", 1484 /* fprintf (stderr, "ConfigureNotify for %X, parent is %X, geom is %dx%d%+d%+d, old geom was %dx%d\n",
1472 ev.xconfigure.window, parent[0], ev.xconfigure.width, ev.xconfigure.height, ev.xconfigure.x, ev.xconfigure.y, 1485 ev.xconfigure.window, parent[0], ev.xconfigure.width, ev.xconfigure.height, ev.xconfigure.x, ev.xconfigure.y,
1473 szHint.width, szHint.height);*/ 1486 szHint.width, szHint.height); */
1474 if (ev.xconfigure.window == parent[0]) 1487 if (ev.xconfigure.window == parent[0])
1475 { 1488 {
1476 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev)) 1489 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1477 ; 1490 ;
1478 1491
… …
1514 break; 1527 break;
1515 1528
1516 case MapNotify: 1529 case MapNotify:
1517 mapped = 1; 1530 mapped = 1;
1518#ifdef TEXT_BLINK 1531#ifdef TEXT_BLINK
1519 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); 1532 text_blink_ev.start (TEXT_BLINK_INTERVAL);
1520#endif 1533#endif
1521 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END)); 1534 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1522 break; 1535 break;
1523 1536
1524 case UnmapNotify: 1537 case UnmapNotify:
… …
1532 case GraphicsExpose: 1545 case GraphicsExpose:
1533 case Expose: 1546 case Expose:
1534 if (ev.xany.window == vt) 1547 if (ev.xany.window == vt)
1535 { 1548 {
1536 do 1549 do
1550 {
1537 scr_expose (ev.xexpose.x, ev.xexpose.y, 1551 scr_expose (ev.xexpose.x, ev.xexpose.y,
1538 ev.xexpose.width, ev.xexpose.height, False); 1552 ev.xexpose.width, ev.xexpose.height, False);
1553 }
1539 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)); 1554 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1540 1555
1541 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1556 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1542 1557
1543 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)) 1558 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1559 {
1544 scr_expose (ev.xexpose.x, ev.xexpose.y, 1560 scr_expose (ev.xexpose.x, ev.xexpose.y,
1545 ev.xexpose.width, ev.xexpose.height, False); 1561 ev.xexpose.width, ev.xexpose.height, False);
1546 1562 }
1547 want_refresh = 1; 1563 want_refresh = 1;
1548 } 1564 }
1549 else 1565 else
1550 { 1566 {
1551 XEvent unused_event; 1567 XEvent unused_event;
… …
1566 case MotionNotify: 1582 case MotionNotify:
1567#ifdef POINTER_BLANK 1583#ifdef POINTER_BLANK
1568 if (hidden_pointer) 1584 if (hidden_pointer)
1569 pointer_unblank (); 1585 pointer_unblank ();
1570#endif 1586#endif
1587 if ((priv_modes & PrivMode_MouseBtnEvent && ev.xbutton.state & (Button1Mask|Button2Mask|Button3Mask))
1588 || priv_modes & PrivMode_MouseAnyEvent)
1589 mouse_report (ev.xbutton);
1571 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1590 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1572 break; 1591 break;
1573 1592
1574 if (ev.xany.window == vt) 1593 if (ev.xany.window == vt)
1575 { 1594 {
… …
1610 1629
1611 /* don't clobber the current delay if we are 1630 /* don't clobber the current delay if we are
1612 * already in the middle of scrolling. 1631 * already in the middle of scrolling.
1613 */ 1632 */
1614 if (!sel_scroll_ev.active) 1633 if (!sel_scroll_ev.active)
1615 sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 1634 sel_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
1616 1635
1617 /* save the event params so we can highlight 1636 /* save the event params so we can highlight
1618 * the selection in the pending-scroll loop 1637 * the selection in the pending-scroll loop
1619 */ 1638 */
1620 selection_save_x = ev.xbutton.x; 1639 selection_save_x = ev.xbutton.x;
… …
1679 { 1698 {
1680 hidden_cursor = 0; 1699 hidden_cursor = 0;
1681 want_refresh = 1; 1700 want_refresh = 1;
1682 } 1701 }
1683 1702
1684 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL); 1703 cursor_blink_ev.again ();
1685 } 1704 }
1686#endif 1705#endif
1687 1706
1688#if defined(POINTER_BLANK) 1707#if defined(POINTER_BLANK)
1689 if (option (Opt_pointerBlank) && pointerBlankDelay > 0) 1708 if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
… …
1717 XSetICFocus (Input_Context); 1736 XSetICFocus (Input_Context);
1718 } 1737 }
1719#endif 1738#endif
1720#if CURSOR_BLINK 1739#if CURSOR_BLINK
1721 if (option (Opt_cursorBlink)) 1740 if (option (Opt_cursorBlink))
1722 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL); 1741 cursor_blink_ev.start (CURSOR_BLINK_INTERVAL, CURSOR_BLINK_INTERVAL);
1723#endif 1742#endif
1724#if OFF_FOCUS_FADING 1743#if OFF_FOCUS_FADING
1725 if (rs[Rs_fade]) 1744 if (rs[Rs_fade])
1726 { 1745 {
1727 pix_colors = pix_colors_focused; 1746 pix_colors = pix_colors_focused;
… …
1729 } 1748 }
1730#endif 1749#endif
1731#if ENABLE_FRILLS 1750#if ENABLE_FRILLS
1732 if (option (Opt_urgentOnBell)) 1751 if (option (Opt_urgentOnBell))
1733 { 1752 {
1734 XWMHints *h;
1735
1736 h = XGetWMHints(dpy, parent[0]); 1753 if (XWMHints *h = XGetWMHints(dpy, parent[0]))
1737 if (h != NULL)
1738 { 1754 {
1739 h->flags &= ~XUrgencyHint; 1755 h->flags &= ~XUrgencyHint;
1740 XSetWMHints(dpy, parent[0], h); 1756 XSetWMHints (dpy, parent[0], h);
1741 } 1757 }
1742 } 1758 }
1743#endif 1759#endif
1744 } 1760 }
1745} 1761}
… …
1768 XUnsetICFocus (Input_Context); 1784 XUnsetICFocus (Input_Context);
1769#endif 1785#endif
1770#if CURSOR_BLINK 1786#if CURSOR_BLINK
1771 if (option (Opt_cursorBlink)) 1787 if (option (Opt_cursorBlink))
1772 cursor_blink_ev.stop (); 1788 cursor_blink_ev.stop ();
1789
1773 hidden_cursor = 0; 1790 hidden_cursor = 0;
1774#endif 1791#endif
1775#if OFF_FOCUS_FADING 1792#if OFF_FOCUS_FADING
1776 if (rs[Rs_fade]) 1793 if (rs[Rs_fade])
1777 { 1794 {
… …
2010 upordown = 1; /* down */ 2027 upordown = 1; /* down */
2011 } 2028 }
2012 if (upordown) 2029 if (upordown)
2013 { 2030 {
2014#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 2031#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
2015 cont_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 2032 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2016#endif 2033#endif
2017 if (scr_page (upordown < 0 ? UP : DN, 1)) 2034 if (scr_page (upordown < 0 ? UP : DN, 1))
2018 { 2035 {
2019 if (upordown < 0) 2036 if (upordown < 0)
2020 scrollBar.setUp (); 2037 scrollBar.setUp ();
… …
2183 { 2200 {
2184 mouse_slip_wheel_speed += v ? -1 : 1; 2201 mouse_slip_wheel_speed += v ? -1 : 1;
2185 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow; 2202 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow;
2186 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow; 2203 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2187 2204
2188 if (slip_wheel_ev.at < NOW) 2205 slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2189 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY;
2190
2191 slip_wheel_ev.start ();
2192 } 2206 }
2193 else 2207 else
2194 { 2208 {
2195# endif 2209# endif
2196 scr_page (v, i); 2210 scr_page (v, i);
… …
2264 2278
2265 if (!option (Opt_jumpScroll) || refresh_count >= nrow - 1) 2279 if (!option (Opt_jumpScroll) || refresh_count >= nrow - 1)
2266 { 2280 {
2267 refresh_count = 0; 2281 refresh_count = 0;
2268 2282
2269 if (!option (Opt_skipScroll) || io_manager::now () > NOW + 1. / 60.) 2283 if (!option (Opt_skipScroll) || ev::ev_time () > ev::now () + 1. / 60.)
2270 { 2284 {
2271 refreshnow = true; 2285 refreshnow = true;
2272 ch = NOCHAR; 2286 ch = NOCHAR;
2273 break; 2287 break;
2274 } 2288 }
… …
2841 { 2855 {
2842 // first parameter is normally 0 for vt100, 1 for vt220, 'R' for rxvt, 2856 // first parameter is normally 0 for vt100, 1 for vt220, 'R' for rxvt,
2843 // 'U' for rxvt-unicode != 7.[34] (where it was broken). 2857 // 'U' for rxvt-unicode != 7.[34] (where it was broken).
2844 // 2858 //
2845 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt 2859 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt
2846 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, and 94 for later versions, to signify 2860 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, 94 for urxvt <= 8.3, and 95 for later
2847 // that we do not support xterm mouse reporting (should be 95 when we do). 2861 // versions.
2848 // 2862 //
2849 tt_printf ("\033[>%d;94;0c", 'U'); 2863 tt_printf ("\033[>%d;95;0c", 'U');
2850 } 2864 }
2851 break; 2865 break;
2852 case '?': 2866 case '?':
2853 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2867 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
2854 process_terminal_mode (ch, priv, nargs, arg); 2868 process_terminal_mode (ch, priv, nargs, arg);
… …
3619#ifndef NO_BACKSPACE_KEY 3633#ifndef NO_BACKSPACE_KEY
3620 { 67, PrivMode_BackSpace }, 3634 { 67, PrivMode_BackSpace },
3621#endif 3635#endif
3622 { 1000, PrivMode_MouseX11 }, 3636 { 1000, PrivMode_MouseX11 },
3623 // 1001 Use Hilite Mouse Tracking. NYI, TODO 3637 // 1001 Use Hilite Mouse Tracking. NYI, TODO
3624 // 1002 Use Cell Motion Mouse Tracking. NYI, TODO 3638 { 1002, PrivMode_MouseBtnEvent },
3625 // 1003 Use All Motion Mouse Tracking. NYI, TODO 3639 { 1003, PrivMode_MouseAnyEvent },
3626 { 1010, PrivMode_TtyOutputInh }, // rxvt extension 3640 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
3627 { 1011, PrivMode_Keypress }, // rxvt extension 3641 { 1011, PrivMode_Keypress }, // rxvt extension
3628 // 1035 enable modifiers for alt, numlock NYI 3642 // 1035 enable modifiers for alt, numlock NYI
3629 // 1036 send ESC for meta keys NYI 3643 // 1036 send ESC for meta keys NYI
3630 // 1037 send DEL for keypad delete NYI 3644 // 1037 send DEL for keypad delete NYI
… …
3704 scr_autowrap (state); 3718 scr_autowrap (state);
3705 break; 3719 break;
3706 /* case 8: - auto repeat, can't do on a per window basis */ 3720 /* case 8: - auto repeat, can't do on a per window basis */
3707 case 9: /* X10 mouse reporting */ 3721 case 9: /* X10 mouse reporting */
3708 if (state) /* orthogonal */ 3722 if (state) /* orthogonal */
3709 priv_modes &= ~PrivMode_MouseX11; 3723 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
3710 break; 3724 break;
3711#ifdef scrollBar_esc 3725#ifdef scrollBar_esc
3712 case scrollBar_esc: 3726 case scrollBar_esc:
3713 if (scrollbar_mapping (state)) 3727 if (scrollbar_mapping (state))
3714 { 3728 {
… …
3727 break; 3741 break;
3728 /* case 66: - application key pad */ 3742 /* case 66: - application key pad */
3729 /* case 67: - backspace key */ 3743 /* case 67: - backspace key */
3730 case 1000: /* X11 mouse reporting */ 3744 case 1000: /* X11 mouse reporting */
3731 if (state) /* orthogonal */ 3745 if (state) /* orthogonal */
3732 priv_modes &= ~PrivMode_MouseX10; 3746 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
3733 break; 3747 break;
3734#if 0 3748#if 0
3735 case 1001: 3749 case 1001:
3736 break; /* X11 mouse highlighting */ 3750 break; /* X11 mouse highlighting */
3737#endif 3751#endif
3752 case 1002:
3753 case 1003:
3754 if (state) {
3755 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11);
3756 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent;
3757 vt_emask_mouse = PointerMotionMask;
3758 } else
3759 vt_emask_mouse = NoEventMask;
3760 vt_select_input ();
3761 break;
3738 case 1010: /* scroll to bottom on TTY output inhibit */ 3762 case 1010: /* scroll to bottom on TTY output inhibit */
3739 set_option (Opt_scrollTtyOutput, !state); 3763 set_option (Opt_scrollTtyOutput, !state);
3740 break; 3764 break;
3741 case 1011: /* scroll to bottom on key press */ 3765 case 1011: /* scroll to bottom on key press */
3742 set_option (Opt_scrollTtyKeypress, state); 3766 set_option (Opt_scrollTtyKeypress, state);
… …
3979 v_buffer = (char *)realloc (v_buffer, v_buflen + len); 4003 v_buffer = (char *)realloc (v_buffer, v_buflen + len);
3980 4004
3981 memcpy (v_buffer + v_buflen, data, len); 4005 memcpy (v_buffer + v_buflen, data, len);
3982 v_buflen += len; 4006 v_buflen += len;
3983 4007
3984 pty_ev.set (EVENT_READ | EVENT_WRITE); 4008 pty_ev.set (ev::READ | ev::WRITE);
3985} 4009}
3986 4010
3987void rxvt_term::pty_write () 4011void rxvt_term::pty_write ()
3988{ 4012{
3989 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE)); 4013 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
… …
3994 4018
3995 if (v_buflen == 0) 4019 if (v_buflen == 0)
3996 { 4020 {
3997 free (v_buffer); 4021 free (v_buffer);
3998 v_buffer = 0; 4022 v_buffer = 0;
3999 v_buflen = 0;
4000 4023
4001 pty_ev.set (EVENT_READ); 4024 pty_ev.set (ev::READ);
4002 return; 4025 return;
4003 } 4026 }
4004 4027
4005 memmove (v_buffer, v_buffer + written, v_buflen); 4028 memmove (v_buffer, v_buffer + written, v_buflen);
4006 } 4029 }
4007 else if (written != -1 || (errno != EAGAIN && errno != EINTR)) 4030 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4008 pty_ev.set (EVENT_READ); 4031 pty_ev.set (ev::READ);
4009} 4032}
4010 4033
4011/*----------------------- end-of-file (C source) -----------------------*/ 4034/*----------------------- end-of-file (C source) -----------------------*/
4012 4035

Diff Legend

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