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.364 by ayin, Mon Nov 12 14:53:13 2007 UTC vs.
Revision 1.399 by ayin, Mon Jan 28 10:54:54 2008 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-2006 Marc Lehmann <pcg@goof.com> 30 * Copyright (c) 2003-2007 Marc Lehmann <pcg@goof.com>
31 * Copyright (c) 2007 Emanuele Giaquinta <e.giaquinta@glauco.it>
31 * 32 *
32 * This program is free software; you can redistribute it and/or modify 33 * 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 34 * 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 35 * the Free Software Foundation; either version 2 of the License, or
35 * (at your option) any later version. 36 * (at your option) any later version.
… …
198 r & RS_Uline ? " uline" : "", 199 r & RS_Uline ? " uline" : "",
199 r & RS_Careful ? " careful" : ""); 200 r & RS_Careful ? " careful" : "");
200 201
201 int width = wcswidth (fname, wcslen (fname)); 202 int width = wcswidth (fname, wcslen (fname));
202 203
203 max_it (width, 8+5); // for char + hey 204 max_it (width, 8+5); // for char + hex
204 max_it (width, strlen (attr)); 205 max_it (width, strlen (attr));
205 206
206 if (y >= 0) 207 if (y >= 0)
207 { 208 {
208 y = (y >= nrow - len - 4 && x < width + 2) ? 0 : -1; 209 y = (y >= nrow - len - 4 && x < width + 2) ? 0 : -1;
… …
220 ch = *chr++; 221 ch = *chr++;
221 222
222 sprintf (buf, "%8x", ch); 223 sprintf (buf, "%8x", ch);
223 scr_overlay_set (0, y, buf); 224 scr_overlay_set (0, y, buf);
224 scr_overlay_set (9, y, '='); 225 scr_overlay_set (9, y, '=');
225# if !UNICODE3 226# if !UNICODE_3
226 if (ch >= 0x10000) 227 if (ch >= 0x10000)
227 ch = 0xfffd; 228 ch = 0xfffd;
228# endif 229# endif
229 scr_overlay_set (11, y, ch, r); 230 scr_overlay_set (11, y, ch, r);
230 231
… …
1041 } 1042 }
1042 1043
1043 display->flush (); 1044 display->flush ();
1044} 1045}
1045 1046
1047/* checks wether a refresh is requested and starts the refresh timer */
1046void 1048void
1047rxvt_term::prepare_cb (ev::prepare &w, int revents) 1049rxvt_term::refresh_check ()
1048{ 1050{
1049 make_current (); 1051 if (want_refresh && !flush_ev.is_active ())
1052 flush_ev.start (1. / 60.); // refresh at max. 60 Hz normally
1050 1053
1051 display->flush (); 1054 display->flush ();
1052
1053 if (want_refresh && !flush_ev.active)
1054 flush_ev.start (1. / 60.); // refresh at max. 60 hz normally
1055} 1055}
1056 1056
1057void 1057void
1058rxvt_term::flush_cb (ev::timer &w, int revents) 1058rxvt_term::flush_cb (ev::timer &w, int revents)
1059{ 1059{
… …
1067void 1067void
1068rxvt_term::cursor_blink_cb (ev::timer &w, int revents) 1068rxvt_term::cursor_blink_cb (ev::timer &w, int revents)
1069{ 1069{
1070 hidden_cursor = !hidden_cursor; 1070 hidden_cursor = !hidden_cursor;
1071 want_refresh = 1; 1071 want_refresh = 1;
1072 refresh_check ();
1072} 1073}
1073#endif 1074#endif
1074 1075
1075#ifdef TEXT_BLINK 1076#ifdef TEXT_BLINK
1076void 1077void
… …
1078{ 1079{
1079 if (scr_refresh_rend (RS_Blink, RS_Blink)) 1080 if (scr_refresh_rend (RS_Blink, RS_Blink))
1080 { 1081 {
1081 hidden_text = !hidden_text; 1082 hidden_text = !hidden_text;
1082 want_refresh = 1; 1083 want_refresh = 1;
1084 refresh_check ();
1083 } 1085 }
1086 else
1087 w.stop ();
1084} 1088}
1085#endif 1089#endif
1086 1090
1087#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1091#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1088void 1092void
1089rxvt_term::cont_scroll_cb (ev::timer &w, int revents) 1093rxvt_term::cont_scroll_cb (ev::timer &w, int revents)
1090{ 1094{
1091 if ((scrollbar_isUp() || scrollbar_isDn()) && 1095 if ((scrollbar_isUp () || scrollbar_isDn ())
1092 scr_page (scrollbar_isUp() ? UP : DN, 1)) 1096 && scr_page (scrollbar_isUp () ? UP : DN, 1))
1097 {
1093 want_refresh = 1; 1098 want_refresh = 1;
1099 refresh_check ();
1100 }
1094 else 1101 else
1095 w.stop (); 1102 w.stop ();
1096} 1103}
1097#endif 1104#endif
1098 1105
… …
1102{ 1109{
1103 if (scr_page (scroll_selection_dir, scroll_selection_lines)) 1110 if (scr_page (scroll_selection_dir, scroll_selection_lines))
1104 { 1111 {
1105 selection_extend (selection_save_x, selection_save_y, selection_save_state); 1112 selection_extend (selection_save_x, selection_save_y, selection_save_state);
1106 want_refresh = 1; 1113 want_refresh = 1;
1114 refresh_check ();
1107 } 1115 }
1108 else 1116 else
1109 w.stop (); 1117 w.stop ();
1110} 1118}
1111#endif 1119#endif
1112 1120
1113#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1121#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1114void 1122void
1115rxvt_term::slip_wheel_cb (ev::timer &w, int revents) 1123rxvt_term::slip_wheel_cb (ev::timer &w, int revents)
1116{ 1124{
1117 if (mouse_slip_wheel_speed == 0 1125 if (scr_changeview (view_start - mouse_slip_wheel_speed))
1118 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
1119 : scr_page (UP, mouse_slip_wheel_speed))
1120 { 1126 {
1121 if (view_start == top_row || view_start == 0)
1122 mouse_slip_wheel_speed = 0;
1123
1124 want_refresh = 1; 1127 want_refresh = 1;
1128 refresh_check ();
1129 }
1130
1131 if (view_start == top_row || view_start == 0 || mouse_slip_wheel_speed == 0)
1125 } 1132 {
1126 else 1133 mouse_slip_wheel_speed = 0;
1127 w.stop (); 1134 w.stop ();
1135 }
1128} 1136}
1129#endif 1137#endif
1130 1138
1131#if LINUX_YIELD_HACK 1139#if LINUX_YIELD_HACK
1132static struct event_handler 1140static struct event_handler
… …
1204 if (cmd_parse ()) 1212 if (cmd_parse ())
1205 break; 1213 break;
1206 1214
1207 if (revents & ev::WRITE) 1215 if (revents & ev::WRITE)
1208 pty_write (); 1216 pty_write ();
1217
1218 refresh_check ();
1209} 1219}
1210 1220
1211void 1221void
1212rxvt_term::pointer_unblank () 1222rxvt_term::pointer_unblank ()
1213{ 1223{
… …
1251 int x, y; 1261 int x, y;
1252 int code = 32; 1262 int code = 32;
1253 1263
1254 x = Pixel2Col (ev.x); 1264 x = Pixel2Col (ev.x);
1255 y = Pixel2Row (ev.y); 1265 y = Pixel2Row (ev.y);
1256 if (ev.type == MotionNotify) { 1266 if (ev.type == MotionNotify)
1267 {
1257 if (x == mouse_row && y == mouse_col) 1268 if (x == mouse_row && y == mouse_col)
1258 return; 1269 return;
1259 mouse_row = x; 1270 mouse_row = x;
1260 mouse_col = y; 1271 mouse_col = y;
1261 code += 32; 1272 code += 32;
1262 } 1273 }
1263 1274
1264 if (MEvent.button == AnyButton) 1275 if (MEvent.button == AnyButton)
1265 button_number = 3; 1276 button_number = 3;
1266 else 1277 else
1267 { 1278 {
… …
1427 && ev.xfocus.mode != NotifyGrab) 1438 && ev.xfocus.mode != NotifyGrab)
1428 focus_out (); 1439 focus_out ();
1429 break; 1440 break;
1430 1441
1431 case ConfigureNotify: 1442 case ConfigureNotify:
1432 /* fprintf (stderr, "ConfigureNotify for %X, parent is %X, geom is %dx%d%+d%+d, old geom was %dx%d\n", 1443 /*fprintf (stderr, "ConfigureNotify for %X, parent is %X, geom is %dx%d%+d%+d, old geom was %dx%d\n",
1433 ev.xconfigure.window, parent[0], ev.xconfigure.width, ev.xconfigure.height, ev.xconfigure.x, ev.xconfigure.y, 1444 ev.xconfigure.window, parent[0], ev.xconfigure.width, ev.xconfigure.height, ev.xconfigure.x, ev.xconfigure.y,
1434 szHint.width, szHint.height); */ 1445 szHint.width, szHint.height);*/
1435 if (ev.xconfigure.window == parent[0]) 1446 if (ev.xconfigure.window == parent[0])
1436 { 1447 {
1437 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev)) 1448 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1438 ; 1449 ;
1439 1450
… …
1444 } 1455 }
1445 else 1456 else
1446 { 1457 {
1447#ifdef HAVE_BG_PIXMAP 1458#ifdef HAVE_BG_PIXMAP
1448 if (bgPixmap.window_position_sensitive ()) 1459 if (bgPixmap.window_position_sensitive ())
1460 {
1461 if (mapped)
1449 update_background (); 1462 update_background ();
1463 else
1464 bgPixmap.invalidate ();
1465 }
1450#endif 1466#endif
1451 } 1467 }
1468
1452 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END)); 1469 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1453 } 1470 }
1454 break; 1471 break;
1455 1472
1456 case PropertyNotify: 1473 case PropertyNotify:
… …
1473 case SelectionRequest: 1490 case SelectionRequest:
1474 selection_send (ev.xselectionrequest); 1491 selection_send (ev.xselectionrequest);
1475 break; 1492 break;
1476 1493
1477 case MapNotify: 1494 case MapNotify:
1495#ifdef HAVE_BG_PIXMAP
1496 /* This is needed spcifically to fix the case of no window manager or a
1497 * non-reparenting window manager. In those cases we never get first
1498 * ConfigureNotify. Also that speeds startup under normal WM, by taking
1499 * care of multiplicity of ConfigureNotify events arriwing while WM does
1500 * reparenting.
1501 * We should not render background immidiately, as there could be several
1502 * ConfigureNotify's to follow. Lets take care of all of them in one scoop
1503 * by scheduling background redraw as soon as we can, but giving a short
1504 * bit of time for ConfigureNotifies to arrive.
1505 * We should render background PRIOR to drawing any text, but AFTER all
1506 * of ConfigureNotifys for the best results.
1507 */
1508 if (bgPixmap.flags & bgPixmap_t::isInvalid)
1509 update_background_ev.start (0.025);
1510#endif
1478 mapped = 1; 1511 mapped = 1;
1479#ifdef TEXT_BLINK 1512#ifdef TEXT_BLINK
1480 text_blink_ev.start (TEXT_BLINK_INTERVAL); 1513 text_blink_ev.start ();
1481#endif 1514#endif
1482 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END)); 1515 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1483 break; 1516 break;
1484 1517
1485 case UnmapNotify: 1518 case UnmapNotify:
… …
1506 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)) 1539 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1507 { 1540 {
1508 scr_expose (ev.xexpose.x, ev.xexpose.y, 1541 scr_expose (ev.xexpose.x, ev.xexpose.y,
1509 ev.xexpose.width, ev.xexpose.height, False); 1542 ev.xexpose.width, ev.xexpose.height, False);
1510 } 1543 }
1544
1511 want_refresh = 1; 1545 want_refresh = 1;
1512 } 1546 }
1513 else 1547 else
1514 { 1548 {
1515 XEvent unused_event; 1549 XEvent unused_event;
… …
1517 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event)) 1551 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event))
1518 ; 1552 ;
1519 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event)) 1553 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1520 ; 1554 ;
1521 1555
1522 if (isScrollbarWindow (ev.xany.window)) 1556 if (scrollBar.state && ev.xany.window == scrollBar.win)
1523 { 1557 {
1524 scrollBar.setIdle (); 1558 scrollBar.setIdle ();
1525 scrollbar_show (0); 1559 scrollbar_show (0);
1526 } 1560 }
1527 } 1561 }
… …
1576 int dist; 1610 int dist;
1577 1611
1578 /* don't clobber the current delay if we are 1612 /* don't clobber the current delay if we are
1579 * already in the middle of scrolling. 1613 * already in the middle of scrolling.
1580 */ 1614 */
1581 if (!sel_scroll_ev.active) 1615 if (!sel_scroll_ev.is_active ())
1582 sel_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY); 1616 sel_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
1583 1617
1584 /* save the event params so we can highlight 1618 /* save the event params so we can highlight
1585 * the selection in the pending-scroll loop 1619 * the selection in the pending-scroll loop
1586 */ 1620 */
… …
1609 else 1643 else
1610 { 1644 {
1611 /* we are within the text window, so we 1645 /* we are within the text window, so we
1612 * shouldn't be scrolling 1646 * shouldn't be scrolling
1613 */ 1647 */
1614 if (sel_scroll_ev.active)
1615 sel_scroll_ev.stop(); 1648 sel_scroll_ev.stop();
1616 } 1649 }
1617#endif 1650#endif
1618#ifdef MOUSE_THRESHOLD 1651#ifdef MOUSE_THRESHOLD
1619 } 1652 }
1620#endif 1653#endif
1621 } 1654 }
1622 } 1655 }
1623 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1656 else if (scrollbar_isMotion () && ev.xany.window == scrollBar.win)
1624 { 1657 {
1625 while (XCheckTypedWindowEvent (dpy, scrollBar.win, 1658 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1626 MotionNotify, &ev)) 1659 MotionNotify, &ev))
1627 ; 1660 ;
1628 1661
… …
1663 1696
1664 if (ev.type == KeyPress && hidden_pointer == 0) 1697 if (ev.type == KeyPress && hidden_pointer == 0)
1665 pointer_blank (); 1698 pointer_blank ();
1666 } 1699 }
1667#endif 1700#endif
1701
1702 refresh_check ();
1668} 1703}
1669 1704
1670void 1705void
1671rxvt_term::focus_in () 1706rxvt_term::focus_in ()
1672{ 1707{
… …
1684 XSetICFocus (Input_Context); 1719 XSetICFocus (Input_Context);
1685 } 1720 }
1686#endif 1721#endif
1687#if CURSOR_BLINK 1722#if CURSOR_BLINK
1688 if (option (Opt_cursorBlink)) 1723 if (option (Opt_cursorBlink))
1689 cursor_blink_ev.start (CURSOR_BLINK_INTERVAL, CURSOR_BLINK_INTERVAL); 1724 cursor_blink_ev.again ();
1690#endif 1725#endif
1691#if OFF_FOCUS_FADING 1726#if OFF_FOCUS_FADING
1692 if (rs[Rs_fade]) 1727 if (rs[Rs_fade])
1693 { 1728 {
1694 pix_colors = pix_colors_focused; 1729 pix_colors = pix_colors_focused;
… …
1782 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID]) 1817 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1783 { 1818 {
1784 bgPixmap.set_root_pixmap (); 1819 bgPixmap.set_root_pixmap ();
1785 update_background (); 1820 update_background ();
1786 } 1821 }
1822
1787 break; 1823 break;
1788 } 1824 }
1789# endif 1825# endif
1826
1827 refresh_check ();
1790} 1828}
1791#endif 1829#endif
1792 1830
1793void 1831void
1794rxvt_term::button_press (XButtonEvent &ev) 1832rxvt_term::button_press (XButtonEvent &ev)
… …
1849 mouse_report (ev); 1887 mouse_report (ev);
1850 } 1888 }
1851#else 1889#else
1852 MEvent.button = ev.button; 1890 MEvent.button = ev.button;
1853 mouse_report (ev); 1891 mouse_report (ev);
1854#endif /* MOUSE_REPORT_DOUBLECLICK */ 1892#endif /* MOUSE_REPORT_DOUBLECLICK */
1855 1893
1856 } 1894 }
1857 else 1895 else
1858 { 1896 {
1859 if (ev.button != MEvent.button) 1897 if (ev.button != MEvent.button)
… …
1907 } 1945 }
1908 1946
1909 /* 1947 /*
1910 * Scrollbar window processing of button press 1948 * Scrollbar window processing of button press
1911 */ 1949 */
1912 if (isScrollbarWindow (ev.window)) 1950 if (scrollBar.state && ev.window == scrollBar.win)
1913 { 1951 {
1914 scrollBar.setIdle (); 1952 scrollBar.setIdle ();
1915 /* 1953 /*
1916 * Rxvt-style scrollbar: 1954 * Rxvt-style scrollbar:
1917 * move up if mouse is above slider 1955 * move up if mouse is above slider
… …
1928 /* 1966 /*
1929 * Mouse report disabled scrollbar: 1967 * Mouse report disabled scrollbar:
1930 * arrow buttons - send up/down 1968 * arrow buttons - send up/down
1931 * click on scrollbar - send pageup/down 1969 * click on scrollbar - send pageup/down
1932 */ 1970 */
1933 if ((scrollBar.style == R_SB_NEXT
1934 && scrollbarnext_upButton (ev.y)) 1971 if (scrollBar.upButton (ev.y))
1935 || (scrollBar.style == R_SB_RXVT
1936 && scrollbarrxvt_upButton (ev.y)))
1937 tt_printf ("\033[A"); 1972 tt_printf ("\033[A");
1938 else if ((scrollBar.style == R_SB_NEXT 1973 else if (scrollBar.dnButton (ev.y))
1939 && scrollbarnext_dnButton (ev.y))
1940 || (scrollBar.style == R_SB_RXVT
1941 && scrollbarrxvt_dnButton (ev.y)))
1942 tt_printf ("\033[B"); 1974 tt_printf ("\033[B");
1943 else 1975 else
1944 switch (ev.button) 1976 switch (ev.button)
1945 { 1977 {
1946 case Button2: 1978 case Button2:
… …
1953 tt_printf ("\033[5~"); 1985 tt_printf ("\033[5~");
1954 break; 1986 break;
1955 } 1987 }
1956 } 1988 }
1957 else 1989 else
1958#endif /* NO_SCROLLBAR_REPORT */ 1990#endif /* NO_SCROLLBAR_REPORT */
1959 1991
1960 { 1992 {
1961 char upordown = 0; 1993 char upordown = 0;
1962 1994
1963 if (scrollBar.style == R_SB_NEXT)
1964 {
1965 if (scrollbarnext_upButton (ev.y)) 1995 if (scrollBar.upButton (ev.y))
1966 upordown = -1; /* up */ 1996 upordown = -1; /* up */
1967 else if (scrollbarnext_dnButton (ev.y)) 1997 else if (scrollBar.dnButton (ev.y))
1968 upordown = 1; /* down */ 1998 upordown = 1; /* down */
1969 } 1999
1970 else if (scrollBar.style == R_SB_RXVT)
1971 {
1972 if (scrollbarrxvt_upButton (ev.y))
1973 upordown = -1; /* up */
1974 else if (scrollbarrxvt_dnButton (ev.y))
1975 upordown = 1; /* down */
1976 }
1977 if (upordown) 2000 if (upordown)
1978 { 2001 {
1979#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 2002#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
2003 if (!cont_scroll_ev.is_active ())
1980 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY); 2004 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
1981#endif 2005#endif
1982 if (scr_page (upordown < 0 ? UP : DN, 1)) 2006 if (scr_page (upordown < 0 ? UP : DN, 1))
1983 { 2007 {
1984 if (upordown < 0) 2008 if (upordown < 0)
1985 scrollBar.setUp (); 2009 scrollBar.setUp ();
… …
1989 } 2013 }
1990 else 2014 else
1991 switch (ev.button) 2015 switch (ev.button)
1992 { 2016 {
1993 case Button2: 2017 case Button2:
1994 switch (scrollbar_align) 2018 switch (scrollBar.align)
1995 { 2019 {
1996 case R_SB_ALIGN_TOP: 2020 case R_SB_ALIGN_TOP:
1997 csrO = 0; 2021 csrO = 0;
1998 break; 2022 break;
1999 case R_SB_ALIGN_CENTRE: 2023 case R_SB_ALIGN_CENTRE:
… …
2011 2035
2012 scrollBar.setMotion (); 2036 scrollBar.setMotion ();
2013 break; 2037 break;
2014 2038
2015 case Button1: 2039 case Button1:
2016 if (scrollbar_align == R_SB_ALIGN_CENTRE) 2040 if (scrollBar.align == R_SB_ALIGN_CENTRE)
2017 csrO = ev.y - scrollBar.top; 2041 csrO = ev.y - scrollBar.top;
2018 /* FALLTHROUGH */ 2042 /* FALLTHROUGH */
2019 2043
2020 case Button3: 2044 case Button3:
2021 if (scrollBar.style != R_SB_XTERM) 2045 if (scrollBar.style != R_SB_XTERM)
… …
2065 scrollBar.setIdle (); 2089 scrollBar.setIdle ();
2066 scrollbar_show (0); 2090 scrollbar_show (0);
2067 } 2091 }
2068 2092
2069#ifdef SELECTION_SCROLLING 2093#ifdef SELECTION_SCROLLING
2070 if (sel_scroll_ev.active)
2071 sel_scroll_ev.stop(); 2094 sel_scroll_ev.stop();
2072#endif 2095#endif
2073 2096
2074 if (ev.window == vt) 2097 if (ev.window == vt)
2075 { 2098 {
2076 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END))) 2099 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
… …
2100 mouse_report (ev); 2123 mouse_report (ev);
2101 } 2124 }
2102#else /* MOUSE_REPORT_DOUBLECLICK */ 2125#else /* MOUSE_REPORT_DOUBLECLICK */
2103 MEvent.button = AnyButton; 2126 MEvent.button = AnyButton;
2104 mouse_report (ev); 2127 mouse_report (ev);
2105#endif /* MOUSE_REPORT_DOUBLECLICK */ 2128#endif /* MOUSE_REPORT_DOUBLECLICK */
2106 return; 2129 return;
2107 } 2130 }
2108 2131
2109 /* 2132 /*
2110 * dumb hack to compensate for the failure of click-and-drag 2133 * dumb hack to compensate for the failure of click-and-drag
… …
2148 { 2171 {
2149 mouse_slip_wheel_speed += v ? -1 : 1; 2172 mouse_slip_wheel_speed += v ? -1 : 1;
2150 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow; 2173 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow;
2151 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow; 2174 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2152 2175
2176 if (!slip_wheel_ev.is_active ())
2153 slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY); 2177 slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2154 } 2178 }
2155 else 2179 else
2180# endif
2156 { 2181 {
2157# endif
2158 scr_page (v, i); 2182 scr_page (v, i);
2159 scrollbar_show (1); 2183 scrollbar_show (1);
2160# ifdef MOUSE_SLIP_WHEELING
2161 } 2184 }
2162# endif
2163 } 2185 }
2164 break; 2186 break;
2165#endif 2187#endif
2166 } 2188 }
2167 } 2189 }
… …
2226 2248
2227 if (!option (Opt_jumpScroll) || refresh_count >= nrow - 1) 2249 if (!option (Opt_jumpScroll) || refresh_count >= nrow - 1)
2228 { 2250 {
2229 refresh_count = 0; 2251 refresh_count = 0;
2230 2252
2231 if (!option (Opt_skipScroll) || ev::ev_time () > ev::now () + 1. / 60.) 2253 if (!option (Opt_skipScroll) || ev_time () > ev::now () + 1. / 60.)
2232 { 2254 {
2233 refreshnow = true; 2255 refreshnow = true;
2234 ch = NOCHAR; 2256 ch = NOCHAR;
2235 break; 2257 break;
2236 } 2258 }
… …
2447 } 2469 }
2448 } 2470 }
2449 2471
2450 pclose_printer (fd); 2472 pclose_printer (fd);
2451} 2473}
2452#endif /* PRINTPIPE */ 2474#endif /* PRINTPIPE */
2453/*}}} */ 2475/*}}} */
2454 2476
2455/* *INDENT-OFF* */ 2477/* *INDENT-OFF* */
2456enum { 2478enum {
2457 C1_40 = 0x40, 2479 C1_40 = 0x40,
… …
2750 nargs = 0; 2772 nargs = 0;
2751 2773
2752 priv = 0; 2774 priv = 0;
2753 ch = cmd_getc (); 2775 ch = cmd_getc ();
2754 if (ch >= '<' && ch <= '?') 2776 if (ch >= '<' && ch <= '?')
2777 {
2755 { /* '<' '=' '>' '?' */ 2778 /* '<' '=' '>' '?' */
2756 priv = ch; 2779 priv = ch;
2757 ch = cmd_getc (); 2780 ch = cmd_getc ();
2758 } 2781 }
2759 2782
2760 /* read any numerical arguments */ 2783 /* read any numerical arguments */
… …
2809 // versions. 2832 // versions.
2810 // 2833 //
2811 tt_printf ("\033[>%d;95;0c", 'U'); 2834 tt_printf ("\033[>%d;95;0c", 'U');
2812 } 2835 }
2813 break; 2836 break;
2837
2814 case '?': 2838 case '?':
2815 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2839 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
2816 process_terminal_mode (ch, priv, nargs, arg); 2840 process_terminal_mode (ch, priv, nargs, arg);
2817 break; 2841 break;
2818 } 2842 }
… …
3334 *buf++ = '\0'; 3358 *buf++ = '\0';
3335 3359
3336 process_color_seq (op, color, name, resp); 3360 process_color_seq (op, color, name, resp);
3337 } 3361 }
3338 break; 3362 break;
3363 case Rxvt_restoreFG:
3339 case XTerm_Color00: 3364 case XTerm_Color00:
3340 process_color_seq (op, Color_fg, str, resp); 3365 process_color_seq (op, Color_fg, str, resp);
3341 break; 3366 break;
3367 case Rxvt_restoreBG:
3342 case XTerm_Color01: 3368 case XTerm_Color01:
3343 process_color_seq (op, Color_bg, str, resp); 3369 process_color_seq (op, Color_bg, str, resp);
3344 break; 3370 break;
3345#ifndef NO_CURSORCOLOR 3371#ifndef NO_CURSORCOLOR
3346 case XTerm_Color_cursor: 3372 case XTerm_Color_cursor:
… …
3372#if ENABLE_TRANSPARENCY 3398#if ENABLE_TRANSPARENCY
3373 case URxvt_Color_tint: 3399 case URxvt_Color_tint:
3374 process_color_seq (op, Color_tint, str, resp); 3400 process_color_seq (op, Color_tint, str, resp);
3375 { 3401 {
3376 bool changed = false; 3402 bool changed = false;
3403
3377 if (ISSET_PIXCOLOR (Color_tint)) 3404 if (ISSET_PIXCOLOR (Color_tint))
3378 changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]); 3405 changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]);
3379 else 3406 else
3380 changed = bgPixmap.unset_tint (); 3407 changed = bgPixmap.unset_tint ();
3408
3381 if (changed) 3409 if (changed)
3382 update_background (); 3410 update_background ();
3383 } 3411 }
3384 3412
3385 break; 3413 break;
… …
3408 changed++; 3436 changed++;
3409 str = strchr (str, ';'); 3437 str = strchr (str, ';');
3410 if (str == NULL) 3438 if (str == NULL)
3411 bgPixmap.set_defaultGeometry (); 3439 bgPixmap.set_defaultGeometry ();
3412 } 3440 }
3441
3413 while (str) 3442 while (str)
3414 { 3443 {
3415 str++; 3444 str++;
3416 if (bgPixmap.set_geometry (str)) 3445 if (bgPixmap.set_geometry (str))
3417 changed++; 3446 changed++;
3418 str = strchr (str, ';'); 3447 str = strchr (str, ';');
3419 } 3448 }
3449
3420 if (changed) 3450 if (changed)
3421 update_background (); 3451 update_background ();
3422 } 3452 }
3423 break; 3453 break;
3424#endif 3454#endif
3425
3426 case Rxvt_restoreFG:
3427 set_window_color (Color_fg, str);
3428 break;
3429 case Rxvt_restoreBG:
3430 set_window_color (Color_bg, str);
3431 break;
3432 3455
3433 case XTerm_logfile: 3456 case XTerm_logfile:
3434 // TODO, when secure mode? 3457 // TODO, when secure mode?
3435 break; 3458 break;
3436 3459
… …
3580 { 66, PrivMode_aplKP }, 3603 { 66, PrivMode_aplKP },
3581#ifndef NO_BACKSPACE_KEY 3604#ifndef NO_BACKSPACE_KEY
3582 { 67, PrivMode_BackSpace }, 3605 { 67, PrivMode_BackSpace },
3583#endif 3606#endif
3584 { 1000, PrivMode_MouseX11 }, 3607 { 1000, PrivMode_MouseX11 },
3585 // 1001 Use Hilite Mouse Tracking. NYI, TODO
3586 { 1002, PrivMode_MouseBtnEvent }, 3608 { 1002, PrivMode_MouseBtnEvent },
3587 { 1003, PrivMode_MouseAnyEvent }, 3609 { 1003, PrivMode_MouseAnyEvent },
3588 { 1010, PrivMode_TtyOutputInh }, // rxvt extension 3610 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
3589 { 1011, PrivMode_Keypress }, // rxvt extension 3611 { 1011, PrivMode_Keypress }, // rxvt extension
3590 // 1035 enable modifiers for alt, numlock NYI 3612 // 1035 enable modifiers for alt, numlock NYI
… …
3592 // 1037 send DEL for keypad delete NYI 3614 // 1037 send DEL for keypad delete NYI
3593 { 1047, PrivMode_Screen }, 3615 { 1047, PrivMode_Screen },
3594 // 1048 save and restore cursor 3616 // 1048 save and restore cursor
3595 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */ 3617 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */
3596 // 1051, 1052, 1060, 1061 keyboard emulation NYI 3618 // 1051, 1052, 1060, 1061 keyboard emulation NYI
3619 { 2004, PrivMode_BracketPaste },
3597 }; 3620 };
3598 3621
3599 if (nargs == 0) 3622 if (nargs == 0)
3600 return; 3623 return;
3601 3624
… …
3649 */ 3672 */
3650 PrivMode (1, PrivMode_vt52); 3673 PrivMode (1, PrivMode_vt52);
3651 break; 3674 break;
3652 case 3: /* 80/132 */ 3675 case 3: /* 80/132 */
3653 if (priv_modes & PrivMode_132OK) 3676 if (priv_modes & PrivMode_132OK)
3677 {
3678 scr_poweron ();
3654 set_widthheight (((state ? 132 : 80) * fwidth), height); 3679 set_widthheight (((state ? 132 : 80) * fwidth), 24 * fheight);
3680 }
3655 break; 3681 break;
3656 case 4: /* smooth scrolling */ 3682 case 4: /* smooth scrolling */
3657 set_option (Opt_jumpScroll, !state); 3683 set_option (Opt_jumpScroll, !state);
3658 break; 3684 break;
3659 case 5: /* reverse video */ 3685 case 5: /* reverse video */
… …
3691 /* case 67: - backspace key */ 3717 /* case 67: - backspace key */
3692 case 1000: /* X11 mouse reporting */ 3718 case 1000: /* X11 mouse reporting */
3693 if (state) /* orthogonal */ 3719 if (state) /* orthogonal */
3694 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent); 3720 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
3695 break; 3721 break;
3696#if 0
3697 case 1001:
3698 break; /* X11 mouse highlighting */
3699#endif
3700 case 1002: 3722 case 1002:
3701 case 1003: 3723 case 1003:
3702 if (state) { 3724 if (state)
3725 {
3703 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11); 3726 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11);
3704 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent; 3727 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent;
3705 vt_emask_mouse = PointerMotionMask; 3728 vt_emask_mouse = PointerMotionMask;
3729 }
3706 } else 3730 else
3707 vt_emask_mouse = NoEventMask; 3731 vt_emask_mouse = NoEventMask;
3708 vt_select_input (); 3732 vt_select_input ();
3709 break; 3733 break;
3710 case 1010: /* scroll to bottom on TTY output inhibit */ 3734 case 1010: /* scroll to bottom on TTY output inhibit */
3711 set_option (Opt_scrollTtyOutput, !state); 3735 set_option (Opt_scrollTtyOutput, !state);
… …
3891rxvt_term::process_graphics () 3915rxvt_term::process_graphics ()
3892{ 3916{
3893 unicode_t ch, cmd = cmd_getc (); 3917 unicode_t ch, cmd = cmd_getc ();
3894 3918
3895 if (cmd == 'Q') 3919 if (cmd == 'Q')
3920 {
3896 { /* query graphics */ 3921 /* query graphics */
3897 tt_printf ("\033G0\012"); /* no graphics */ 3922 tt_printf ("\033G0\012"); /* no graphics */
3898 return; 3923 return;
3899 } 3924 }
3900 /* swallow other graphics sequences until terminating ':' */ 3925 /* swallow other graphics sequences until terminating ':' */
3901 do 3926 do

Diff Legend

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