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.375 by root, Tue Dec 11 21:10:46 2007 UTC vs.
Revision 1.405 by ayin, Thu Feb 14 23:51:46 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
… …
301 302
302void 303void
303rxvt_term::key_press (XKeyEvent &ev) 304rxvt_term::key_press (XKeyEvent &ev)
304{ 305{
305 int ctrl, meta, shft, len; 306 int ctrl, meta, shft, len;
306 unsigned int newlen;
307 KeySym keysym; 307 KeySym keysym;
308 int valid_keysym; 308 int valid_keysym;
309 char kbuf[KBUFSZ]; 309 char kbuf[KBUFSZ];
310 310
311#if ISO_14755 311#if ISO_14755
… …
548 548
549 if (keysym >= 0xFF00 && keysym <= 0xFFFF) 549 if (keysym >= 0xFF00 && keysym <= 0xFFFF)
550 { 550 {
551 { 551 {
552 bool kp = priv_modes & PrivMode_aplKP ? !shft : shft; 552 bool kp = priv_modes & PrivMode_aplKP ? !shft : shft;
553 newlen = 1; 553 unsigned int newlen = 1;
554#ifdef XK_KP_Home 554#ifdef XK_KP_Home
555 static const KeySym keypadtrans[] = { 555 static const KeySym keypadtrans[] = {
556 XK_KP_7, // XK_KP_Home 556 XK_KP_7, // XK_KP_Home
557 XK_KP_4, // XK_KP_Left 557 XK_KP_4, // XK_KP_Left
558 XK_KP_8, // XK_KP_Up 558 XK_KP_8, // XK_KP_Up
… …
1041 } 1041 }
1042 1042
1043 display->flush (); 1043 display->flush ();
1044} 1044}
1045 1045
1046/* checks wether a refresh is requested and starts the refresh timer */
1046void 1047void
1047rxvt_term::prepare_cb (ev::prepare &w, int revents) 1048rxvt_term::refresh_check ()
1048{ 1049{
1049 make_current (); 1050 if (want_refresh && !flush_ev.is_active ())
1051 flush_ev.start (1. / 60.); // refresh at max. 60 Hz normally
1050 1052
1051 display->flush (); 1053 display->flush ();
1052
1053 if (want_refresh && !ev_is_active (&flush_ev))
1054 flush_ev.start (1. / 60.); // refresh at max. 60 Hz normally
1055} 1054}
1056 1055
1057void 1056void
1058rxvt_term::flush_cb (ev::timer &w, int revents) 1057rxvt_term::flush_cb (ev::timer &w, int revents)
1059{ 1058{
… …
1067void 1066void
1068rxvt_term::cursor_blink_cb (ev::timer &w, int revents) 1067rxvt_term::cursor_blink_cb (ev::timer &w, int revents)
1069{ 1068{
1070 hidden_cursor = !hidden_cursor; 1069 hidden_cursor = !hidden_cursor;
1071 want_refresh = 1; 1070 want_refresh = 1;
1071 refresh_check ();
1072} 1072}
1073#endif 1073#endif
1074 1074
1075#ifdef TEXT_BLINK 1075#ifdef TEXT_BLINK
1076void 1076void
… …
1078{ 1078{
1079 if (scr_refresh_rend (RS_Blink, RS_Blink)) 1079 if (scr_refresh_rend (RS_Blink, RS_Blink))
1080 { 1080 {
1081 hidden_text = !hidden_text; 1081 hidden_text = !hidden_text;
1082 want_refresh = 1; 1082 want_refresh = 1;
1083 refresh_check ();
1083 } 1084 }
1084 else 1085 else
1085 w.stop (); 1086 w.stop ();
1086} 1087}
1087#endif 1088#endif
1088 1089
1089#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1090#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1090void 1091void
1091rxvt_term::cont_scroll_cb (ev::timer &w, int revents) 1092rxvt_term::cont_scroll_cb (ev::timer &w, int revents)
1092{ 1093{
1093 if ((scrollbar_isUp() || scrollbar_isDn()) && 1094 if ((scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN)
1094 scr_page (scrollbar_isUp() ? UP : DN, 1)) 1095 && scr_page (scrollBar.state == STATE_UP ? UP : DN, 1))
1096 {
1095 want_refresh = 1; 1097 want_refresh = 1;
1098 refresh_check ();
1099 }
1096 else 1100 else
1097 w.stop (); 1101 w.stop ();
1098} 1102}
1099#endif 1103#endif
1100 1104
… …
1104{ 1108{
1105 if (scr_page (scroll_selection_dir, scroll_selection_lines)) 1109 if (scr_page (scroll_selection_dir, scroll_selection_lines))
1106 { 1110 {
1107 selection_extend (selection_save_x, selection_save_y, selection_save_state); 1111 selection_extend (selection_save_x, selection_save_y, selection_save_state);
1108 want_refresh = 1; 1112 want_refresh = 1;
1113 refresh_check ();
1109 } 1114 }
1110 else 1115 else
1111 w.stop (); 1116 w.stop ();
1112} 1117}
1113#endif 1118#endif
1114 1119
1115#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1120#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1116void 1121void
1117rxvt_term::slip_wheel_cb (ev::timer &w, int revents) 1122rxvt_term::slip_wheel_cb (ev::timer &w, int revents)
1118{ 1123{
1119 if (mouse_slip_wheel_speed == 0 1124 if (scr_changeview (view_start - mouse_slip_wheel_speed))
1120 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
1121 : scr_page (UP, mouse_slip_wheel_speed))
1122 { 1125 {
1123 if (view_start == top_row || view_start == 0)
1124 mouse_slip_wheel_speed = 0;
1125
1126 want_refresh = 1; 1126 want_refresh = 1;
1127 refresh_check ();
1128 }
1129
1130 if (view_start == top_row || view_start == 0 || mouse_slip_wheel_speed == 0)
1127 } 1131 {
1128 else 1132 mouse_slip_wheel_speed = 0;
1129 w.stop (); 1133 w.stop ();
1134 }
1130} 1135}
1131#endif 1136#endif
1132 1137
1133#if LINUX_YIELD_HACK 1138#if LINUX_YIELD_HACK
1134static struct event_handler 1139static struct event_handler
… …
1206 if (cmd_parse ()) 1211 if (cmd_parse ())
1207 break; 1212 break;
1208 1213
1209 if (revents & ev::WRITE) 1214 if (revents & ev::WRITE)
1210 pty_write (); 1215 pty_write ();
1216
1217 refresh_check ();
1211} 1218}
1212 1219
1213void 1220void
1214rxvt_term::pointer_unblank () 1221rxvt_term::pointer_unblank ()
1215{ 1222{
… …
1430 && ev.xfocus.mode != NotifyGrab) 1437 && ev.xfocus.mode != NotifyGrab)
1431 focus_out (); 1438 focus_out ();
1432 break; 1439 break;
1433 1440
1434 case ConfigureNotify: 1441 case ConfigureNotify:
1435 /* fprintf (stderr, "ConfigureNotify for %X, parent is %X, geom is %dx%d%+d%+d, old geom was %dx%d\n", 1442 /*fprintf (stderr, "ConfigureNotify for %X, parent is %X, geom is %dx%d%+d%+d, old geom was %dx%d\n",
1436 ev.xconfigure.window, parent[0], ev.xconfigure.width, ev.xconfigure.height, ev.xconfigure.x, ev.xconfigure.y, 1443 ev.xconfigure.window, parent[0], ev.xconfigure.width, ev.xconfigure.height, ev.xconfigure.x, ev.xconfigure.y,
1437 szHint.width, szHint.height); */ 1444 szHint.width, szHint.height);*/
1438 if (ev.xconfigure.window == parent[0]) 1445 if (ev.xconfigure.window == parent[0])
1439 { 1446 {
1440 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev)) 1447 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1441 ; 1448 ;
1442 1449
… …
1447 } 1454 }
1448 else 1455 else
1449 { 1456 {
1450#ifdef HAVE_BG_PIXMAP 1457#ifdef HAVE_BG_PIXMAP
1451 if (bgPixmap.window_position_sensitive ()) 1458 if (bgPixmap.window_position_sensitive ())
1459 {
1460 if (mapped)
1452 update_background (); 1461 update_background ();
1462 else
1463 bgPixmap.invalidate ();
1464 }
1453#endif 1465#endif
1454 } 1466 }
1467
1455 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END)); 1468 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1456 } 1469 }
1457 break; 1470 break;
1458 1471
1459 case PropertyNotify: 1472 case PropertyNotify:
… …
1476 case SelectionRequest: 1489 case SelectionRequest:
1477 selection_send (ev.xselectionrequest); 1490 selection_send (ev.xselectionrequest);
1478 break; 1491 break;
1479 1492
1480 case MapNotify: 1493 case MapNotify:
1494#ifdef HAVE_BG_PIXMAP
1495 /* This is needed spcifically to fix the case of no window manager or a
1496 * non-reparenting window manager. In those cases we never get first
1497 * ConfigureNotify. Also that speeds startup under normal WM, by taking
1498 * care of multiplicity of ConfigureNotify events arriwing while WM does
1499 * reparenting.
1500 * We should not render background immidiately, as there could be several
1501 * ConfigureNotify's to follow. Lets take care of all of them in one scoop
1502 * by scheduling background redraw as soon as we can, but giving a short
1503 * bit of time for ConfigureNotifies to arrive.
1504 * We should render background PRIOR to drawing any text, but AFTER all
1505 * of ConfigureNotifys for the best results.
1506 */
1507 if (bgPixmap.flags & bgPixmap_t::isInvalid)
1508 update_background_ev.start (0.025);
1509#endif
1481 mapped = 1; 1510 mapped = 1;
1482#ifdef TEXT_BLINK 1511#ifdef TEXT_BLINK
1483 text_blink_ev.start (); 1512 text_blink_ev.start ();
1484#endif 1513#endif
1485 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END)); 1514 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
… …
1509 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)) 1538 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1510 { 1539 {
1511 scr_expose (ev.xexpose.x, ev.xexpose.y, 1540 scr_expose (ev.xexpose.x, ev.xexpose.y,
1512 ev.xexpose.width, ev.xexpose.height, False); 1541 ev.xexpose.width, ev.xexpose.height, False);
1513 } 1542 }
1543
1514 want_refresh = 1; 1544 want_refresh = 1;
1515 } 1545 }
1516 else 1546 else
1517 { 1547 {
1518 XEvent unused_event; 1548 XEvent unused_event;
… …
1520 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event)) 1550 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event))
1521 ; 1551 ;
1522 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event)) 1552 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1523 ; 1553 ;
1524 1554
1525 if (isScrollbarWindow (ev.xany.window)) 1555 if (scrollBar.state && ev.xany.window == scrollBar.win)
1526 { 1556 {
1527 scrollBar.setIdle (); 1557 scrollBar.state = STATE_IDLE;
1528 scrollbar_show (0); 1558 scrollbar_show (0);
1529 } 1559 }
1530 } 1560 }
1531 break; 1561 break;
1532 1562
… …
1579 int dist; 1609 int dist;
1580 1610
1581 /* don't clobber the current delay if we are 1611 /* don't clobber the current delay if we are
1582 * already in the middle of scrolling. 1612 * already in the middle of scrolling.
1583 */ 1613 */
1584 if (!ev_is_active (&sel_scroll_ev)) 1614 if (!sel_scroll_ev.is_active ())
1585 sel_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY); 1615 sel_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
1586 1616
1587 /* save the event params so we can highlight 1617 /* save the event params so we can highlight
1588 * the selection in the pending-scroll loop 1618 * the selection in the pending-scroll loop
1589 */ 1619 */
… …
1612 else 1642 else
1613 { 1643 {
1614 /* we are within the text window, so we 1644 /* we are within the text window, so we
1615 * shouldn't be scrolling 1645 * shouldn't be scrolling
1616 */ 1646 */
1617 if (ev_is_active (&sel_scroll_ev))
1618 sel_scroll_ev.stop(); 1647 sel_scroll_ev.stop();
1619 } 1648 }
1620#endif 1649#endif
1621#ifdef MOUSE_THRESHOLD 1650#ifdef MOUSE_THRESHOLD
1622 } 1651 }
1623#endif 1652#endif
1624 } 1653 }
1625 } 1654 }
1626 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1655 else if (scrollBar.state == STATE_MOTION && ev.xany.window == scrollBar.win)
1627 { 1656 {
1628 while (XCheckTypedWindowEvent (dpy, scrollBar.win, 1657 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1629 MotionNotify, &ev)) 1658 MotionNotify, &ev))
1630 ; 1659 ;
1631 1660
… …
1666 1695
1667 if (ev.type == KeyPress && hidden_pointer == 0) 1696 if (ev.type == KeyPress && hidden_pointer == 0)
1668 pointer_blank (); 1697 pointer_blank ();
1669 } 1698 }
1670#endif 1699#endif
1700
1701 refresh_check ();
1671} 1702}
1672 1703
1673void 1704void
1674rxvt_term::focus_in () 1705rxvt_term::focus_in ()
1675{ 1706{
… …
1785 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID]) 1816 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1786 { 1817 {
1787 bgPixmap.set_root_pixmap (); 1818 bgPixmap.set_root_pixmap ();
1788 update_background (); 1819 update_background ();
1789 } 1820 }
1821
1790 break; 1822 break;
1791 } 1823 }
1792# endif 1824# endif
1825
1826 refresh_check ();
1793} 1827}
1794#endif 1828#endif
1795 1829
1796void 1830void
1797rxvt_term::button_press (XButtonEvent &ev) 1831rxvt_term::button_press (XButtonEvent &ev)
… …
1910 } 1944 }
1911 1945
1912 /* 1946 /*
1913 * Scrollbar window processing of button press 1947 * Scrollbar window processing of button press
1914 */ 1948 */
1915 if (isScrollbarWindow (ev.window)) 1949 if (scrollBar.state && ev.window == scrollBar.win)
1916 { 1950 {
1917 scrollBar.setIdle (); 1951 page_dirn direction = NO_DIR;
1952
1953 if (scrollBar.upButton (ev.y))
1954 direction = UP; /* up */
1955 else if (scrollBar.dnButton (ev.y))
1956 direction = DN; /* down */
1957
1958 scrollBar.state = STATE_IDLE;
1918 /* 1959 /*
1919 * Rxvt-style scrollbar: 1960 * Rxvt-style scrollbar:
1920 * move up if mouse is above slider 1961 * move up if mouse is above slider
1921 * move dn if mouse is below slider 1962 * move dn if mouse is below slider
1922 * 1963 *
… …
1931 /* 1972 /*
1932 * Mouse report disabled scrollbar: 1973 * Mouse report disabled scrollbar:
1933 * arrow buttons - send up/down 1974 * arrow buttons - send up/down
1934 * click on scrollbar - send pageup/down 1975 * click on scrollbar - send pageup/down
1935 */ 1976 */
1936 if ((scrollBar.style == R_SB_NEXT 1977 if (direction == UP)
1937 && scrollbarnext_upButton (ev.y))
1938 || (scrollBar.style == R_SB_RXVT
1939 && scrollbarrxvt_upButton (ev.y)))
1940 tt_printf ("\033[A"); 1978 tt_printf ("\033[A");
1941 else if ((scrollBar.style == R_SB_NEXT 1979 else if (direction == DN)
1942 && scrollbarnext_dnButton (ev.y))
1943 || (scrollBar.style == R_SB_RXVT
1944 && scrollbarrxvt_dnButton (ev.y)))
1945 tt_printf ("\033[B"); 1980 tt_printf ("\033[B");
1946 else 1981 else
1947 switch (ev.button) 1982 switch (ev.button)
1948 { 1983 {
1949 case Button2: 1984 case Button2:
… …
1957 break; 1992 break;
1958 } 1993 }
1959 } 1994 }
1960 else 1995 else
1961#endif /* NO_SCROLLBAR_REPORT */ 1996#endif /* NO_SCROLLBAR_REPORT */
1962
1963 {
1964 char upordown = 0;
1965
1966 if (scrollBar.style == R_SB_NEXT)
1967 { 1997 {
1968 if (scrollbarnext_upButton (ev.y)) 1998 if (direction != NO_DIR)
1969 upordown = -1; /* up */
1970 else if (scrollbarnext_dnButton (ev.y))
1971 upordown = 1; /* down */
1972 }
1973 else if (scrollBar.style == R_SB_RXVT)
1974 {
1975 if (scrollbarrxvt_upButton (ev.y))
1976 upordown = -1; /* up */
1977 else if (scrollbarrxvt_dnButton (ev.y))
1978 upordown = 1; /* down */
1979 }
1980 if (upordown)
1981 { 1999 {
1982#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 2000#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
2001 if (!cont_scroll_ev.is_active ())
1983 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY); 2002 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
1984#endif 2003#endif
1985 if (scr_page (upordown < 0 ? UP : DN, 1)) 2004 if (scr_page (direction, 1))
1986 { 2005 {
1987 if (upordown < 0) 2006 if (direction == UP)
1988 scrollBar.setUp (); 2007 scrollBar.state = STATE_UP;
1989 else 2008 else
1990 scrollBar.setDn (); 2009 scrollBar.state = STATE_DOWN;
1991 } 2010 }
1992 } 2011 }
1993 else 2012 else
1994 switch (ev.button) 2013 switch (ev.button)
1995 { 2014 {
1996 case Button2: 2015 case Button2:
1997 switch (scrollbar_align) 2016 switch (scrollBar.align)
1998 { 2017 {
1999 case R_SB_ALIGN_TOP: 2018 case R_SB_ALIGN_TOP:
2000 csrO = 0; 2019 csrO = 0;
2001 break; 2020 break;
2002 case R_SB_ALIGN_CENTRE: 2021 case R_SB_ALIGN_CENTRE:
… …
2010 if (scrollBar.style == R_SB_XTERM 2029 if (scrollBar.style == R_SB_XTERM
2011 || scrollbar_above_slider (ev.y) 2030 || scrollbar_above_slider (ev.y)
2012 || scrollbar_below_slider (ev.y)) 2031 || scrollbar_below_slider (ev.y))
2013 scr_move_to (scrollbar_position (ev.y) - csrO, scrollbar_size ()); 2032 scr_move_to (scrollbar_position (ev.y) - csrO, scrollbar_size ());
2014 2033
2015 scrollBar.setMotion (); 2034 scrollBar.state = STATE_MOTION;
2016 break; 2035 break;
2017 2036
2018 case Button1: 2037 case Button1:
2019 if (scrollbar_align == R_SB_ALIGN_CENTRE) 2038 if (scrollBar.align == R_SB_ALIGN_CENTRE)
2020 csrO = ev.y - scrollBar.top; 2039 csrO = ev.y - scrollBar.top;
2021 /* FALLTHROUGH */ 2040 /* FALLTHROUGH */
2022 2041
2023 case Button3: 2042 case Button3:
2024 if (scrollBar.style != R_SB_XTERM) 2043 if (scrollBar.style != R_SB_XTERM)
… …
2034 scr_page (DN, nrow - 1); 2053 scr_page (DN, nrow - 1);
2035# else 2054# else
2036 scr_page (DN, nrow / 4); 2055 scr_page (DN, nrow / 4);
2037# endif 2056# endif
2038 else 2057 else
2039 scrollBar.setMotion (); 2058 scrollBar.state = STATE_MOTION;
2040 } 2059 }
2041 else 2060 else
2042 { 2061 {
2043 scr_page ((ev.button == Button1 ? DN : UP), 2062 scr_page ((ev.button == Button1 ? DN : UP),
2044 (nrow 2063 (nrow
… …
2061 2080
2062 csrO = 0; /* reset csr Offset */ 2081 csrO = 0; /* reset csr Offset */
2063 if (!bypass_keystate) 2082 if (!bypass_keystate)
2064 reportmode = !! (priv_modes & PrivMode_mouse_report); 2083 reportmode = !! (priv_modes & PrivMode_mouse_report);
2065 2084
2066 if (scrollbar_isUpDn ()) 2085 if (scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN)
2067 { 2086 {
2068 scrollBar.setIdle (); 2087 scrollBar.state = STATE_IDLE;
2069 scrollbar_show (0); 2088 scrollbar_show (0);
2070 } 2089 }
2071 2090
2072#ifdef SELECTION_SCROLLING 2091#ifdef SELECTION_SCROLLING
2073 if (ev_is_active (&sel_scroll_ev))
2074 sel_scroll_ev.stop(); 2092 sel_scroll_ev.stop();
2075#endif 2093#endif
2076 2094
2077 if (ev.window == vt) 2095 if (ev.window == vt)
2078 { 2096 {
2079 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END))) 2097 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
… …
2151 { 2169 {
2152 mouse_slip_wheel_speed += v ? -1 : 1; 2170 mouse_slip_wheel_speed += v ? -1 : 1;
2153 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow; 2171 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow;
2154 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow; 2172 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2155 2173
2174 if (!slip_wheel_ev.is_active ())
2156 slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY); 2175 slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2157 } 2176 }
2158 else 2177 else
2178# endif
2159 { 2179 {
2160# endif
2161 scr_page (v, i); 2180 scr_page (v, i);
2162 scrollbar_show (1); 2181 scrollbar_show (1);
2163# ifdef MOUSE_SLIP_WHEELING
2164 } 2182 }
2165# endif
2166 } 2183 }
2167 break; 2184 break;
2168#endif 2185#endif
2169 } 2186 }
2170 } 2187 }
… …
2813 // versions. 2830 // versions.
2814 // 2831 //
2815 tt_printf ("\033[>%d;95;0c", 'U'); 2832 tt_printf ("\033[>%d;95;0c", 'U');
2816 } 2833 }
2817 break; 2834 break;
2835
2818 case '?': 2836 case '?':
2819 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2837 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
2820 process_terminal_mode (ch, priv, nargs, arg); 2838 process_terminal_mode (ch, priv, nargs, arg);
2821 break; 2839 break;
2822 } 2840 }
… …
3338 *buf++ = '\0'; 3356 *buf++ = '\0';
3339 3357
3340 process_color_seq (op, color, name, resp); 3358 process_color_seq (op, color, name, resp);
3341 } 3359 }
3342 break; 3360 break;
3361 case Rxvt_restoreFG:
3343 case XTerm_Color00: 3362 case XTerm_Color00:
3344 process_color_seq (op, Color_fg, str, resp); 3363 process_color_seq (op, Color_fg, str, resp);
3345 break; 3364 break;
3365 case Rxvt_restoreBG:
3346 case XTerm_Color01: 3366 case XTerm_Color01:
3347 process_color_seq (op, Color_bg, str, resp); 3367 process_color_seq (op, Color_bg, str, resp);
3348 break; 3368 break;
3349#ifndef NO_CURSORCOLOR 3369#ifndef NO_CURSORCOLOR
3350 case XTerm_Color_cursor: 3370 case XTerm_Color_cursor:
… …
3376#if ENABLE_TRANSPARENCY 3396#if ENABLE_TRANSPARENCY
3377 case URxvt_Color_tint: 3397 case URxvt_Color_tint:
3378 process_color_seq (op, Color_tint, str, resp); 3398 process_color_seq (op, Color_tint, str, resp);
3379 { 3399 {
3380 bool changed = false; 3400 bool changed = false;
3401
3381 if (ISSET_PIXCOLOR (Color_tint)) 3402 if (ISSET_PIXCOLOR (Color_tint))
3382 changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]); 3403 changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]);
3383 else 3404 else
3384 changed = bgPixmap.unset_tint (); 3405 changed = bgPixmap.unset_tint ();
3406
3385 if (changed) 3407 if (changed)
3386 update_background (); 3408 update_background ();
3387 } 3409 }
3388 3410
3389 break; 3411 break;
… …
3412 changed++; 3434 changed++;
3413 str = strchr (str, ';'); 3435 str = strchr (str, ';');
3414 if (str == NULL) 3436 if (str == NULL)
3415 bgPixmap.set_defaultGeometry (); 3437 bgPixmap.set_defaultGeometry ();
3416 } 3438 }
3439
3417 while (str) 3440 while (str)
3418 { 3441 {
3419 str++; 3442 str++;
3420 if (bgPixmap.set_geometry (str)) 3443 if (bgPixmap.set_geometry (str))
3421 changed++; 3444 changed++;
3422 str = strchr (str, ';'); 3445 str = strchr (str, ';');
3423 } 3446 }
3447
3424 if (changed) 3448 if (changed)
3425 update_background (); 3449 update_background ();
3426 } 3450 }
3427 break; 3451 break;
3428#endif 3452#endif
3429
3430 case Rxvt_restoreFG:
3431 set_window_color (Color_fg, str);
3432 break;
3433 case Rxvt_restoreBG:
3434 set_window_color (Color_bg, str);
3435 break;
3436 3453
3437 case XTerm_logfile: 3454 case XTerm_logfile:
3438 // TODO, when secure mode? 3455 // TODO, when secure mode?
3439 break; 3456 break;
3440 3457
… …
3595 // 1037 send DEL for keypad delete NYI 3612 // 1037 send DEL for keypad delete NYI
3596 { 1047, PrivMode_Screen }, 3613 { 1047, PrivMode_Screen },
3597 // 1048 save and restore cursor 3614 // 1048 save and restore cursor
3598 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */ 3615 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */
3599 // 1051, 1052, 1060, 1061 keyboard emulation NYI 3616 // 1051, 1052, 1060, 1061 keyboard emulation NYI
3617 { 2004, PrivMode_BracketPaste },
3600 }; 3618 };
3601 3619
3602 if (nargs == 0) 3620 if (nargs == 0)
3603 return; 3621 return;
3604 3622
… …
3652 */ 3670 */
3653 PrivMode (1, PrivMode_vt52); 3671 PrivMode (1, PrivMode_vt52);
3654 break; 3672 break;
3655 case 3: /* 80/132 */ 3673 case 3: /* 80/132 */
3656 if (priv_modes & PrivMode_132OK) 3674 if (priv_modes & PrivMode_132OK)
3675 {
3676 scr_poweron ();
3657 set_widthheight (((state ? 132 : 80) * fwidth), height); 3677 set_widthheight (((state ? 132 : 80) * fwidth), 24 * fheight);
3678 }
3658 break; 3679 break;
3659 case 4: /* smooth scrolling */ 3680 case 4: /* smooth scrolling */
3660 set_option (Opt_jumpScroll, !state); 3681 set_option (Opt_jumpScroll, !state);
3661 break; 3682 break;
3662 case 5: /* reverse video */ 3683 case 5: /* reverse video */

Diff Legend

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