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.365 by ayin, Thu Nov 15 10:13:37 2007 UTC vs.
Revision 1.402 by ayin, Fri Feb 1 14:13:52 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.state == STATE_UP || scrollBar.state == STATE_DOWN)
1092 scr_page (scrollbar_isUp() ? UP : DN, 1)) 1096 && scr_page (scrollBar.state == STATE_UP ? 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{
… …
1428 && ev.xfocus.mode != NotifyGrab) 1438 && ev.xfocus.mode != NotifyGrab)
1429 focus_out (); 1439 focus_out ();
1430 break; 1440 break;
1431 1441
1432 case ConfigureNotify: 1442 case ConfigureNotify:
1433 /* 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",
1434 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,
1435 szHint.width, szHint.height); */ 1445 szHint.width, szHint.height);*/
1436 if (ev.xconfigure.window == parent[0]) 1446 if (ev.xconfigure.window == parent[0])
1437 { 1447 {
1438 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev)) 1448 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1439 ; 1449 ;
1440 1450
… …
1445 } 1455 }
1446 else 1456 else
1447 { 1457 {
1448#ifdef HAVE_BG_PIXMAP 1458#ifdef HAVE_BG_PIXMAP
1449 if (bgPixmap.window_position_sensitive ()) 1459 if (bgPixmap.window_position_sensitive ())
1460 {
1461 if (mapped)
1450 update_background (); 1462 update_background ();
1463 else
1464 bgPixmap.invalidate ();
1465 }
1451#endif 1466#endif
1452 } 1467 }
1468
1453 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END)); 1469 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1454 } 1470 }
1455 break; 1471 break;
1456 1472
1457 case PropertyNotify: 1473 case PropertyNotify:
… …
1474 case SelectionRequest: 1490 case SelectionRequest:
1475 selection_send (ev.xselectionrequest); 1491 selection_send (ev.xselectionrequest);
1476 break; 1492 break;
1477 1493
1478 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
1479 mapped = 1; 1511 mapped = 1;
1480#ifdef TEXT_BLINK 1512#ifdef TEXT_BLINK
1481 text_blink_ev.start (TEXT_BLINK_INTERVAL); 1513 text_blink_ev.start ();
1482#endif 1514#endif
1483 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END)); 1515 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1484 break; 1516 break;
1485 1517
1486 case UnmapNotify: 1518 case UnmapNotify:
… …
1507 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)) 1539 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1508 { 1540 {
1509 scr_expose (ev.xexpose.x, ev.xexpose.y, 1541 scr_expose (ev.xexpose.x, ev.xexpose.y,
1510 ev.xexpose.width, ev.xexpose.height, False); 1542 ev.xexpose.width, ev.xexpose.height, False);
1511 } 1543 }
1544
1512 want_refresh = 1; 1545 want_refresh = 1;
1513 } 1546 }
1514 else 1547 else
1515 { 1548 {
1516 XEvent unused_event; 1549 XEvent unused_event;
… …
1518 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event)) 1551 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event))
1519 ; 1552 ;
1520 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event)) 1553 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1521 ; 1554 ;
1522 1555
1523 if (isScrollbarWindow (ev.xany.window)) 1556 if (scrollBar.state && ev.xany.window == scrollBar.win)
1524 { 1557 {
1525 scrollBar.setIdle (); 1558 scrollBar.state = STATE_IDLE;
1526 scrollbar_show (0); 1559 scrollbar_show (0);
1527 } 1560 }
1528 } 1561 }
1529 break; 1562 break;
1530 1563
… …
1577 int dist; 1610 int dist;
1578 1611
1579 /* don't clobber the current delay if we are 1612 /* don't clobber the current delay if we are
1580 * already in the middle of scrolling. 1613 * already in the middle of scrolling.
1581 */ 1614 */
1582 if (!sel_scroll_ev.active) 1615 if (!sel_scroll_ev.is_active ())
1583 sel_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY); 1616 sel_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
1584 1617
1585 /* save the event params so we can highlight 1618 /* save the event params so we can highlight
1586 * the selection in the pending-scroll loop 1619 * the selection in the pending-scroll loop
1587 */ 1620 */
… …
1610 else 1643 else
1611 { 1644 {
1612 /* we are within the text window, so we 1645 /* we are within the text window, so we
1613 * shouldn't be scrolling 1646 * shouldn't be scrolling
1614 */ 1647 */
1615 if (sel_scroll_ev.active)
1616 sel_scroll_ev.stop(); 1648 sel_scroll_ev.stop();
1617 } 1649 }
1618#endif 1650#endif
1619#ifdef MOUSE_THRESHOLD 1651#ifdef MOUSE_THRESHOLD
1620 } 1652 }
1621#endif 1653#endif
1622 } 1654 }
1623 } 1655 }
1624 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1656 else if (scrollBar.state == STATE_MOTION && ev.xany.window == scrollBar.win)
1625 { 1657 {
1626 while (XCheckTypedWindowEvent (dpy, scrollBar.win, 1658 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1627 MotionNotify, &ev)) 1659 MotionNotify, &ev))
1628 ; 1660 ;
1629 1661
… …
1664 1696
1665 if (ev.type == KeyPress && hidden_pointer == 0) 1697 if (ev.type == KeyPress && hidden_pointer == 0)
1666 pointer_blank (); 1698 pointer_blank ();
1667 } 1699 }
1668#endif 1700#endif
1701
1702 refresh_check ();
1669} 1703}
1670 1704
1671void 1705void
1672rxvt_term::focus_in () 1706rxvt_term::focus_in ()
1673{ 1707{
… …
1685 XSetICFocus (Input_Context); 1719 XSetICFocus (Input_Context);
1686 } 1720 }
1687#endif 1721#endif
1688#if CURSOR_BLINK 1722#if CURSOR_BLINK
1689 if (option (Opt_cursorBlink)) 1723 if (option (Opt_cursorBlink))
1690 cursor_blink_ev.start (CURSOR_BLINK_INTERVAL, CURSOR_BLINK_INTERVAL); 1724 cursor_blink_ev.again ();
1691#endif 1725#endif
1692#if OFF_FOCUS_FADING 1726#if OFF_FOCUS_FADING
1693 if (rs[Rs_fade]) 1727 if (rs[Rs_fade])
1694 { 1728 {
1695 pix_colors = pix_colors_focused; 1729 pix_colors = pix_colors_focused;
… …
1783 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID]) 1817 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1784 { 1818 {
1785 bgPixmap.set_root_pixmap (); 1819 bgPixmap.set_root_pixmap ();
1786 update_background (); 1820 update_background ();
1787 } 1821 }
1822
1788 break; 1823 break;
1789 } 1824 }
1790# endif 1825# endif
1826
1827 refresh_check ();
1791} 1828}
1792#endif 1829#endif
1793 1830
1794void 1831void
1795rxvt_term::button_press (XButtonEvent &ev) 1832rxvt_term::button_press (XButtonEvent &ev)
… …
1850 mouse_report (ev); 1887 mouse_report (ev);
1851 } 1888 }
1852#else 1889#else
1853 MEvent.button = ev.button; 1890 MEvent.button = ev.button;
1854 mouse_report (ev); 1891 mouse_report (ev);
1855#endif /* MOUSE_REPORT_DOUBLECLICK */ 1892#endif /* MOUSE_REPORT_DOUBLECLICK */
1856 1893
1857 } 1894 }
1858 else 1895 else
1859 { 1896 {
1860 if (ev.button != MEvent.button) 1897 if (ev.button != MEvent.button)
… …
1908 } 1945 }
1909 1946
1910 /* 1947 /*
1911 * Scrollbar window processing of button press 1948 * Scrollbar window processing of button press
1912 */ 1949 */
1913 if (isScrollbarWindow (ev.window)) 1950 if (scrollBar.state && ev.window == scrollBar.win)
1914 { 1951 {
1915 scrollBar.setIdle (); 1952 int upordown = 0;
1953
1954 if (scrollBar.upButton (ev.y))
1955 upordown = -1; /* up */
1956 else if (scrollBar.dnButton (ev.y))
1957 upordown = 1; /* down */
1958
1959 scrollBar.state = STATE_IDLE;
1916 /* 1960 /*
1917 * Rxvt-style scrollbar: 1961 * Rxvt-style scrollbar:
1918 * move up if mouse is above slider 1962 * move up if mouse is above slider
1919 * move dn if mouse is below slider 1963 * move dn if mouse is below slider
1920 * 1964 *
… …
1929 /* 1973 /*
1930 * Mouse report disabled scrollbar: 1974 * Mouse report disabled scrollbar:
1931 * arrow buttons - send up/down 1975 * arrow buttons - send up/down
1932 * click on scrollbar - send pageup/down 1976 * click on scrollbar - send pageup/down
1933 */ 1977 */
1934 if ((scrollBar.style == R_SB_NEXT 1978 if (upordown < 0)
1935 && scrollbarnext_upButton (ev.y))
1936 || (scrollBar.style == R_SB_RXVT
1937 && scrollbarrxvt_upButton (ev.y)))
1938 tt_printf ("\033[A"); 1979 tt_printf ("\033[A");
1939 else if ((scrollBar.style == R_SB_NEXT 1980 else if (upordown > 0)
1940 && scrollbarnext_dnButton (ev.y))
1941 || (scrollBar.style == R_SB_RXVT
1942 && scrollbarrxvt_dnButton (ev.y)))
1943 tt_printf ("\033[B"); 1981 tt_printf ("\033[B");
1944 else 1982 else
1945 switch (ev.button) 1983 switch (ev.button)
1946 { 1984 {
1947 case Button2: 1985 case Button2:
… …
1954 tt_printf ("\033[5~"); 1992 tt_printf ("\033[5~");
1955 break; 1993 break;
1956 } 1994 }
1957 } 1995 }
1958 else 1996 else
1959#endif /* NO_SCROLLBAR_REPORT */ 1997#endif /* NO_SCROLLBAR_REPORT */
1960 1998
1961 {
1962 char upordown = 0;
1963
1964 if (scrollBar.style == R_SB_NEXT)
1965 { 1999 {
1966 if (scrollbarnext_upButton (ev.y))
1967 upordown = -1; /* up */
1968 else if (scrollbarnext_dnButton (ev.y))
1969 upordown = 1; /* down */
1970 }
1971 else if (scrollBar.style == R_SB_RXVT)
1972 {
1973 if (scrollbarrxvt_upButton (ev.y))
1974 upordown = -1; /* up */
1975 else if (scrollbarrxvt_dnButton (ev.y))
1976 upordown = 1; /* down */
1977 }
1978 if (upordown) 2000 if (upordown)
1979 { 2001 {
1980#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 2002#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
2003 if (!cont_scroll_ev.is_active ())
1981 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY); 2004 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
1982#endif 2005#endif
1983 if (scr_page (upordown < 0 ? UP : DN, 1)) 2006 if (scr_page (upordown < 0 ? UP : DN, 1))
1984 { 2007 {
1985 if (upordown < 0) 2008 if (upordown < 0)
1986 scrollBar.setUp (); 2009 scrollBar.state = STATE_UP;
1987 else 2010 else
1988 scrollBar.setDn (); 2011 scrollBar.state = STATE_DOWN;
1989 } 2012 }
1990 } 2013 }
1991 else 2014 else
1992 switch (ev.button) 2015 switch (ev.button)
1993 { 2016 {
1994 case Button2: 2017 case Button2:
1995 switch (scrollbar_align) 2018 switch (scrollBar.align)
1996 { 2019 {
1997 case R_SB_ALIGN_TOP: 2020 case R_SB_ALIGN_TOP:
1998 csrO = 0; 2021 csrO = 0;
1999 break; 2022 break;
2000 case R_SB_ALIGN_CENTRE: 2023 case R_SB_ALIGN_CENTRE:
… …
2008 if (scrollBar.style == R_SB_XTERM 2031 if (scrollBar.style == R_SB_XTERM
2009 || scrollbar_above_slider (ev.y) 2032 || scrollbar_above_slider (ev.y)
2010 || scrollbar_below_slider (ev.y)) 2033 || scrollbar_below_slider (ev.y))
2011 scr_move_to (scrollbar_position (ev.y) - csrO, scrollbar_size ()); 2034 scr_move_to (scrollbar_position (ev.y) - csrO, scrollbar_size ());
2012 2035
2013 scrollBar.setMotion (); 2036 scrollBar.state = STATE_MOTION;
2014 break; 2037 break;
2015 2038
2016 case Button1: 2039 case Button1:
2017 if (scrollbar_align == R_SB_ALIGN_CENTRE) 2040 if (scrollBar.align == R_SB_ALIGN_CENTRE)
2018 csrO = ev.y - scrollBar.top; 2041 csrO = ev.y - scrollBar.top;
2019 /* FALLTHROUGH */ 2042 /* FALLTHROUGH */
2020 2043
2021 case Button3: 2044 case Button3:
2022 if (scrollBar.style != R_SB_XTERM) 2045 if (scrollBar.style != R_SB_XTERM)
… …
2032 scr_page (DN, nrow - 1); 2055 scr_page (DN, nrow - 1);
2033# else 2056# else
2034 scr_page (DN, nrow / 4); 2057 scr_page (DN, nrow / 4);
2035# endif 2058# endif
2036 else 2059 else
2037 scrollBar.setMotion (); 2060 scrollBar.state = STATE_MOTION;
2038 } 2061 }
2039 else 2062 else
2040 { 2063 {
2041 scr_page ((ev.button == Button1 ? DN : UP), 2064 scr_page ((ev.button == Button1 ? DN : UP),
2042 (nrow 2065 (nrow
… …
2059 2082
2060 csrO = 0; /* reset csr Offset */ 2083 csrO = 0; /* reset csr Offset */
2061 if (!bypass_keystate) 2084 if (!bypass_keystate)
2062 reportmode = !! (priv_modes & PrivMode_mouse_report); 2085 reportmode = !! (priv_modes & PrivMode_mouse_report);
2063 2086
2064 if (scrollbar_isUpDn ()) 2087 if (scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN)
2065 { 2088 {
2066 scrollBar.setIdle (); 2089 scrollBar.state = STATE_IDLE;
2067 scrollbar_show (0); 2090 scrollbar_show (0);
2068 } 2091 }
2069 2092
2070#ifdef SELECTION_SCROLLING 2093#ifdef SELECTION_SCROLLING
2071 if (sel_scroll_ev.active)
2072 sel_scroll_ev.stop(); 2094 sel_scroll_ev.stop();
2073#endif 2095#endif
2074 2096
2075 if (ev.window == vt) 2097 if (ev.window == vt)
2076 { 2098 {
2077 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)))
… …
2101 mouse_report (ev); 2123 mouse_report (ev);
2102 } 2124 }
2103#else /* MOUSE_REPORT_DOUBLECLICK */ 2125#else /* MOUSE_REPORT_DOUBLECLICK */
2104 MEvent.button = AnyButton; 2126 MEvent.button = AnyButton;
2105 mouse_report (ev); 2127 mouse_report (ev);
2106#endif /* MOUSE_REPORT_DOUBLECLICK */ 2128#endif /* MOUSE_REPORT_DOUBLECLICK */
2107 return; 2129 return;
2108 } 2130 }
2109 2131
2110 /* 2132 /*
2111 * dumb hack to compensate for the failure of click-and-drag 2133 * dumb hack to compensate for the failure of click-and-drag
… …
2149 { 2171 {
2150 mouse_slip_wheel_speed += v ? -1 : 1; 2172 mouse_slip_wheel_speed += v ? -1 : 1;
2151 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow; 2173 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow;
2152 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow; 2174 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2153 2175
2176 if (!slip_wheel_ev.is_active ())
2154 slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY); 2177 slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2155 } 2178 }
2156 else 2179 else
2180# endif
2157 { 2181 {
2158# endif
2159 scr_page (v, i); 2182 scr_page (v, i);
2160 scrollbar_show (1); 2183 scrollbar_show (1);
2161# ifdef MOUSE_SLIP_WHEELING
2162 } 2184 }
2163# endif
2164 } 2185 }
2165 break; 2186 break;
2166#endif 2187#endif
2167 } 2188 }
2168 } 2189 }
… …
2227 2248
2228 if (!option (Opt_jumpScroll) || refresh_count >= nrow - 1) 2249 if (!option (Opt_jumpScroll) || refresh_count >= nrow - 1)
2229 { 2250 {
2230 refresh_count = 0; 2251 refresh_count = 0;
2231 2252
2232 if (!option (Opt_skipScroll) || ev::ev_time () > ev::now () + 1. / 60.) 2253 if (!option (Opt_skipScroll) || ev_time () > ev::now () + 1. / 60.)
2233 { 2254 {
2234 refreshnow = true; 2255 refreshnow = true;
2235 ch = NOCHAR; 2256 ch = NOCHAR;
2236 break; 2257 break;
2237 } 2258 }
… …
2448 } 2469 }
2449 } 2470 }
2450 2471
2451 pclose_printer (fd); 2472 pclose_printer (fd);
2452} 2473}
2453#endif /* PRINTPIPE */ 2474#endif /* PRINTPIPE */
2454/*}}} */ 2475/*}}} */
2455 2476
2456/* *INDENT-OFF* */ 2477/* *INDENT-OFF* */
2457enum { 2478enum {
2458 C1_40 = 0x40, 2479 C1_40 = 0x40,
… …
2751 nargs = 0; 2772 nargs = 0;
2752 2773
2753 priv = 0; 2774 priv = 0;
2754 ch = cmd_getc (); 2775 ch = cmd_getc ();
2755 if (ch >= '<' && ch <= '?') 2776 if (ch >= '<' && ch <= '?')
2777 {
2756 { /* '<' '=' '>' '?' */ 2778 /* '<' '=' '>' '?' */
2757 priv = ch; 2779 priv = ch;
2758 ch = cmd_getc (); 2780 ch = cmd_getc ();
2759 } 2781 }
2760 2782
2761 /* read any numerical arguments */ 2783 /* read any numerical arguments */
… …
2810 // versions. 2832 // versions.
2811 // 2833 //
2812 tt_printf ("\033[>%d;95;0c", 'U'); 2834 tt_printf ("\033[>%d;95;0c", 'U');
2813 } 2835 }
2814 break; 2836 break;
2837
2815 case '?': 2838 case '?':
2816 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2839 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
2817 process_terminal_mode (ch, priv, nargs, arg); 2840 process_terminal_mode (ch, priv, nargs, arg);
2818 break; 2841 break;
2819 } 2842 }
… …
3335 *buf++ = '\0'; 3358 *buf++ = '\0';
3336 3359
3337 process_color_seq (op, color, name, resp); 3360 process_color_seq (op, color, name, resp);
3338 } 3361 }
3339 break; 3362 break;
3363 case Rxvt_restoreFG:
3340 case XTerm_Color00: 3364 case XTerm_Color00:
3341 process_color_seq (op, Color_fg, str, resp); 3365 process_color_seq (op, Color_fg, str, resp);
3342 break; 3366 break;
3367 case Rxvt_restoreBG:
3343 case XTerm_Color01: 3368 case XTerm_Color01:
3344 process_color_seq (op, Color_bg, str, resp); 3369 process_color_seq (op, Color_bg, str, resp);
3345 break; 3370 break;
3346#ifndef NO_CURSORCOLOR 3371#ifndef NO_CURSORCOLOR
3347 case XTerm_Color_cursor: 3372 case XTerm_Color_cursor:
… …
3373#if ENABLE_TRANSPARENCY 3398#if ENABLE_TRANSPARENCY
3374 case URxvt_Color_tint: 3399 case URxvt_Color_tint:
3375 process_color_seq (op, Color_tint, str, resp); 3400 process_color_seq (op, Color_tint, str, resp);
3376 { 3401 {
3377 bool changed = false; 3402 bool changed = false;
3403
3378 if (ISSET_PIXCOLOR (Color_tint)) 3404 if (ISSET_PIXCOLOR (Color_tint))
3379 changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]); 3405 changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]);
3380 else 3406 else
3381 changed = bgPixmap.unset_tint (); 3407 changed = bgPixmap.unset_tint ();
3408
3382 if (changed) 3409 if (changed)
3383 update_background (); 3410 update_background ();
3384 } 3411 }
3385 3412
3386 break; 3413 break;
… …
3409 changed++; 3436 changed++;
3410 str = strchr (str, ';'); 3437 str = strchr (str, ';');
3411 if (str == NULL) 3438 if (str == NULL)
3412 bgPixmap.set_defaultGeometry (); 3439 bgPixmap.set_defaultGeometry ();
3413 } 3440 }
3441
3414 while (str) 3442 while (str)
3415 { 3443 {
3416 str++; 3444 str++;
3417 if (bgPixmap.set_geometry (str)) 3445 if (bgPixmap.set_geometry (str))
3418 changed++; 3446 changed++;
3419 str = strchr (str, ';'); 3447 str = strchr (str, ';');
3420 } 3448 }
3449
3421 if (changed) 3450 if (changed)
3422 update_background (); 3451 update_background ();
3423 } 3452 }
3424 break; 3453 break;
3425#endif 3454#endif
3426
3427 case Rxvt_restoreFG:
3428 set_window_color (Color_fg, str);
3429 break;
3430 case Rxvt_restoreBG:
3431 set_window_color (Color_bg, str);
3432 break;
3433 3455
3434 case XTerm_logfile: 3456 case XTerm_logfile:
3435 // TODO, when secure mode? 3457 // TODO, when secure mode?
3436 break; 3458 break;
3437 3459
… …
3581 { 66, PrivMode_aplKP }, 3603 { 66, PrivMode_aplKP },
3582#ifndef NO_BACKSPACE_KEY 3604#ifndef NO_BACKSPACE_KEY
3583 { 67, PrivMode_BackSpace }, 3605 { 67, PrivMode_BackSpace },
3584#endif 3606#endif
3585 { 1000, PrivMode_MouseX11 }, 3607 { 1000, PrivMode_MouseX11 },
3586 // 1001 Use Hilite Mouse Tracking. NYI, TODO
3587 { 1002, PrivMode_MouseBtnEvent }, 3608 { 1002, PrivMode_MouseBtnEvent },
3588 { 1003, PrivMode_MouseAnyEvent }, 3609 { 1003, PrivMode_MouseAnyEvent },
3589 { 1010, PrivMode_TtyOutputInh }, // rxvt extension 3610 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
3590 { 1011, PrivMode_Keypress }, // rxvt extension 3611 { 1011, PrivMode_Keypress }, // rxvt extension
3591 // 1035 enable modifiers for alt, numlock NYI 3612 // 1035 enable modifiers for alt, numlock NYI
… …
3593 // 1037 send DEL for keypad delete NYI 3614 // 1037 send DEL for keypad delete NYI
3594 { 1047, PrivMode_Screen }, 3615 { 1047, PrivMode_Screen },
3595 // 1048 save and restore cursor 3616 // 1048 save and restore cursor
3596 { 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 */
3597 // 1051, 1052, 1060, 1061 keyboard emulation NYI 3618 // 1051, 1052, 1060, 1061 keyboard emulation NYI
3619 { 2004, PrivMode_BracketPaste },
3598 }; 3620 };
3599 3621
3600 if (nargs == 0) 3622 if (nargs == 0)
3601 return; 3623 return;
3602 3624
… …
3650 */ 3672 */
3651 PrivMode (1, PrivMode_vt52); 3673 PrivMode (1, PrivMode_vt52);
3652 break; 3674 break;
3653 case 3: /* 80/132 */ 3675 case 3: /* 80/132 */
3654 if (priv_modes & PrivMode_132OK) 3676 if (priv_modes & PrivMode_132OK)
3677 {
3678 scr_poweron ();
3655 set_widthheight (((state ? 132 : 80) * fwidth), height); 3679 set_widthheight (((state ? 132 : 80) * fwidth), 24 * fheight);
3680 }
3656 break; 3681 break;
3657 case 4: /* smooth scrolling */ 3682 case 4: /* smooth scrolling */
3658 set_option (Opt_jumpScroll, !state); 3683 set_option (Opt_jumpScroll, !state);
3659 break; 3684 break;
3660 case 5: /* reverse video */ 3685 case 5: /* reverse video */
… …
3692 /* case 67: - backspace key */ 3717 /* case 67: - backspace key */
3693 case 1000: /* X11 mouse reporting */ 3718 case 1000: /* X11 mouse reporting */
3694 if (state) /* orthogonal */ 3719 if (state) /* orthogonal */
3695 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent); 3720 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
3696 break; 3721 break;
3697#if 0
3698 case 1001:
3699 break; /* X11 mouse highlighting */
3700#endif
3701 case 1002: 3722 case 1002:
3702 case 1003: 3723 case 1003:
3703 if (state) 3724 if (state)
3704 { 3725 {
3705 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11); 3726 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11);
… …
3894rxvt_term::process_graphics () 3915rxvt_term::process_graphics ()
3895{ 3916{
3896 unicode_t ch, cmd = cmd_getc (); 3917 unicode_t ch, cmd = cmd_getc ();
3897 3918
3898 if (cmd == 'Q') 3919 if (cmd == 'Q')
3920 {
3899 { /* query graphics */ 3921 /* query graphics */
3900 tt_printf ("\033G0\012"); /* no graphics */ 3922 tt_printf ("\033G0\012"); /* no graphics */
3901 return; 3923 return;
3902 } 3924 }
3903 /* swallow other graphics sequences until terminating ':' */ 3925 /* swallow other graphics sequences until terminating ':' */
3904 do 3926 do

Diff Legend

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