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.367 by root, Sat Nov 24 11:06:12 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 && !flush_ev.active)
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 }
1085 else
1086 w.stop ();
1084} 1087}
1085#endif 1088#endif
1086 1089
1087#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1090#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1088void 1091void
1089rxvt_term::cont_scroll_cb (ev::timer &w, int revents) 1092rxvt_term::cont_scroll_cb (ev::timer &w, int revents)
1090{ 1093{
1091 if ((scrollbar_isUp() || scrollbar_isDn()) && 1094 if ((scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN)
1092 scr_page (scrollbar_isUp() ? UP : DN, 1)) 1095 && scr_page (scrollBar.state == STATE_UP ? UP : DN, 1))
1096 {
1093 want_refresh = 1; 1097 want_refresh = 1;
1098 refresh_check ();
1099 }
1094 else 1100 else
1095 w.stop (); 1101 w.stop ();
1096} 1102}
1097#endif 1103#endif
1098 1104
… …
1102{ 1108{
1103 if (scr_page (scroll_selection_dir, scroll_selection_lines)) 1109 if (scr_page (scroll_selection_dir, scroll_selection_lines))
1104 { 1110 {
1105 selection_extend (selection_save_x, selection_save_y, selection_save_state); 1111 selection_extend (selection_save_x, selection_save_y, selection_save_state);
1106 want_refresh = 1; 1112 want_refresh = 1;
1113 refresh_check ();
1107 } 1114 }
1108 else 1115 else
1109 w.stop (); 1116 w.stop ();
1110} 1117}
1111#endif 1118#endif
1112 1119
1113#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1120#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1114void 1121void
1115rxvt_term::slip_wheel_cb (ev::timer &w, int revents) 1122rxvt_term::slip_wheel_cb (ev::timer &w, int revents)
1116{ 1123{
1117 if (mouse_slip_wheel_speed == 0 1124 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 { 1125 {
1121 if (view_start == top_row || view_start == 0)
1122 mouse_slip_wheel_speed = 0;
1123
1124 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)
1125 } 1131 {
1126 else 1132 mouse_slip_wheel_speed = 0;
1127 w.stop (); 1133 w.stop ();
1134 }
1128} 1135}
1129#endif 1136#endif
1130 1137
1131#if LINUX_YIELD_HACK 1138#if LINUX_YIELD_HACK
1132static struct event_handler 1139static struct event_handler
… …
1204 if (cmd_parse ()) 1211 if (cmd_parse ())
1205 break; 1212 break;
1206 1213
1207 if (revents & ev::WRITE) 1214 if (revents & ev::WRITE)
1208 pty_write (); 1215 pty_write ();
1216
1217 refresh_check ();
1209} 1218}
1210 1219
1211void 1220void
1212rxvt_term::pointer_unblank () 1221rxvt_term::pointer_unblank ()
1213{ 1222{
… …
1428 && ev.xfocus.mode != NotifyGrab) 1437 && ev.xfocus.mode != NotifyGrab)
1429 focus_out (); 1438 focus_out ();
1430 break; 1439 break;
1431 1440
1432 case ConfigureNotify: 1441 case ConfigureNotify:
1433 /* 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",
1434 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,
1435 szHint.width, szHint.height); */ 1444 szHint.width, szHint.height);*/
1436 if (ev.xconfigure.window == parent[0]) 1445 if (ev.xconfigure.window == parent[0])
1437 { 1446 {
1438 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev)) 1447 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1439 ; 1448 ;
1440 1449
… …
1445 } 1454 }
1446 else 1455 else
1447 { 1456 {
1448#ifdef HAVE_BG_PIXMAP 1457#ifdef HAVE_BG_PIXMAP
1449 if (bgPixmap.window_position_sensitive ()) 1458 if (bgPixmap.window_position_sensitive ())
1459 {
1460 if (mapped)
1450 update_background (); 1461 update_background ();
1462 else
1463 bgPixmap.invalidate ();
1464 }
1451#endif 1465#endif
1452 } 1466 }
1467
1453 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END)); 1468 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1454 } 1469 }
1455 break; 1470 break;
1456 1471
1457 case PropertyNotify: 1472 case PropertyNotify:
… …
1474 case SelectionRequest: 1489 case SelectionRequest:
1475 selection_send (ev.xselectionrequest); 1490 selection_send (ev.xselectionrequest);
1476 break; 1491 break;
1477 1492
1478 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
1479 mapped = 1; 1510 mapped = 1;
1480#ifdef TEXT_BLINK 1511#ifdef TEXT_BLINK
1481 text_blink_ev.start (TEXT_BLINK_INTERVAL); 1512 text_blink_ev.start ();
1482#endif 1513#endif
1483 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END)); 1514 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1484 break; 1515 break;
1485 1516
1486 case UnmapNotify: 1517 case UnmapNotify:
… …
1507 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)) 1538 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1508 { 1539 {
1509 scr_expose (ev.xexpose.x, ev.xexpose.y, 1540 scr_expose (ev.xexpose.x, ev.xexpose.y,
1510 ev.xexpose.width, ev.xexpose.height, False); 1541 ev.xexpose.width, ev.xexpose.height, False);
1511 } 1542 }
1543
1512 want_refresh = 1; 1544 want_refresh = 1;
1513 } 1545 }
1514 else 1546 else
1515 { 1547 {
1516 XEvent unused_event; 1548 XEvent unused_event;
… …
1518 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event)) 1550 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event))
1519 ; 1551 ;
1520 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event)) 1552 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1521 ; 1553 ;
1522 1554
1523 if (isScrollbarWindow (ev.xany.window)) 1555 if (scrollBar.state && ev.xany.window == scrollBar.win)
1524 { 1556 {
1525 scrollBar.setIdle (); 1557 scrollBar.state = STATE_IDLE;
1526 scrollbar_show (0); 1558 scrollbar_show (0);
1527 } 1559 }
1528 } 1560 }
1529 break; 1561 break;
1530 1562
… …
1577 int dist; 1609 int dist;
1578 1610
1579 /* don't clobber the current delay if we are 1611 /* don't clobber the current delay if we are
1580 * already in the middle of scrolling. 1612 * already in the middle of scrolling.
1581 */ 1613 */
1582 if (!sel_scroll_ev.active) 1614 if (!sel_scroll_ev.is_active ())
1583 sel_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY); 1615 sel_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
1584 1616
1585 /* save the event params so we can highlight 1617 /* save the event params so we can highlight
1586 * the selection in the pending-scroll loop 1618 * the selection in the pending-scroll loop
1587 */ 1619 */
… …
1610 else 1642 else
1611 { 1643 {
1612 /* we are within the text window, so we 1644 /* we are within the text window, so we
1613 * shouldn't be scrolling 1645 * shouldn't be scrolling
1614 */ 1646 */
1615 if (sel_scroll_ev.active)
1616 sel_scroll_ev.stop(); 1647 sel_scroll_ev.stop();
1617 } 1648 }
1618#endif 1649#endif
1619#ifdef MOUSE_THRESHOLD 1650#ifdef MOUSE_THRESHOLD
1620 } 1651 }
1621#endif 1652#endif
1622 } 1653 }
1623 } 1654 }
1624 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1655 else if (scrollBar.state == STATE_MOTION && ev.xany.window == scrollBar.win)
1625 { 1656 {
1626 while (XCheckTypedWindowEvent (dpy, scrollBar.win, 1657 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1627 MotionNotify, &ev)) 1658 MotionNotify, &ev))
1628 ; 1659 ;
1629 1660
… …
1664 1695
1665 if (ev.type == KeyPress && hidden_pointer == 0) 1696 if (ev.type == KeyPress && hidden_pointer == 0)
1666 pointer_blank (); 1697 pointer_blank ();
1667 } 1698 }
1668#endif 1699#endif
1700
1701 refresh_check ();
1669} 1702}
1670 1703
1671void 1704void
1672rxvt_term::focus_in () 1705rxvt_term::focus_in ()
1673{ 1706{
… …
1685 XSetICFocus (Input_Context); 1718 XSetICFocus (Input_Context);
1686 } 1719 }
1687#endif 1720#endif
1688#if CURSOR_BLINK 1721#if CURSOR_BLINK
1689 if (option (Opt_cursorBlink)) 1722 if (option (Opt_cursorBlink))
1690 cursor_blink_ev.start (CURSOR_BLINK_INTERVAL, CURSOR_BLINK_INTERVAL); 1723 cursor_blink_ev.again ();
1691#endif 1724#endif
1692#if OFF_FOCUS_FADING 1725#if OFF_FOCUS_FADING
1693 if (rs[Rs_fade]) 1726 if (rs[Rs_fade])
1694 { 1727 {
1695 pix_colors = pix_colors_focused; 1728 pix_colors = pix_colors_focused;
… …
1783 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID]) 1816 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1784 { 1817 {
1785 bgPixmap.set_root_pixmap (); 1818 bgPixmap.set_root_pixmap ();
1786 update_background (); 1819 update_background ();
1787 } 1820 }
1821
1788 break; 1822 break;
1789 } 1823 }
1790# endif 1824# endif
1825
1826 refresh_check ();
1791} 1827}
1792#endif 1828#endif
1793 1829
1794void 1830void
1795rxvt_term::button_press (XButtonEvent &ev) 1831rxvt_term::button_press (XButtonEvent &ev)
… …
1908 } 1944 }
1909 1945
1910 /* 1946 /*
1911 * Scrollbar window processing of button press 1947 * Scrollbar window processing of button press
1912 */ 1948 */
1913 if (isScrollbarWindow (ev.window)) 1949 if (scrollBar.state && ev.window == scrollBar.win)
1914 { 1950 {
1915 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;
1916 /* 1959 /*
1917 * Rxvt-style scrollbar: 1960 * Rxvt-style scrollbar:
1918 * move up if mouse is above slider 1961 * move up if mouse is above slider
1919 * move dn if mouse is below slider 1962 * move dn if mouse is below slider
1920 * 1963 *
… …
1929 /* 1972 /*
1930 * Mouse report disabled scrollbar: 1973 * Mouse report disabled scrollbar:
1931 * arrow buttons - send up/down 1974 * arrow buttons - send up/down
1932 * click on scrollbar - send pageup/down 1975 * click on scrollbar - send pageup/down
1933 */ 1976 */
1934 if ((scrollBar.style == R_SB_NEXT 1977 if (direction == UP)
1935 && scrollbarnext_upButton (ev.y))
1936 || (scrollBar.style == R_SB_RXVT
1937 && scrollbarrxvt_upButton (ev.y)))
1938 tt_printf ("\033[A"); 1978 tt_printf ("\033[A");
1939 else if ((scrollBar.style == R_SB_NEXT 1979 else if (direction == DN)
1940 && scrollbarnext_dnButton (ev.y))
1941 || (scrollBar.style == R_SB_RXVT
1942 && scrollbarrxvt_dnButton (ev.y)))
1943 tt_printf ("\033[B"); 1980 tt_printf ("\033[B");
1944 else 1981 else
1945 switch (ev.button) 1982 switch (ev.button)
1946 { 1983 {
1947 case Button2: 1984 case Button2:
… …
1955 break; 1992 break;
1956 } 1993 }
1957 } 1994 }
1958 else 1995 else
1959#endif /* NO_SCROLLBAR_REPORT */ 1996#endif /* NO_SCROLLBAR_REPORT */
1960
1961 {
1962 char upordown = 0;
1963
1964 if (scrollBar.style == R_SB_NEXT)
1965 { 1997 {
1966 if (scrollbarnext_upButton (ev.y)) 1998 if (direction != NO_DIR)
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)
1979 { 1999 {
1980#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 2000#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
2001 if (!cont_scroll_ev.is_active ())
1981 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY); 2002 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
1982#endif 2003#endif
1983 if (scr_page (upordown < 0 ? UP : DN, 1)) 2004 if (scr_page (direction, 1))
1984 { 2005 {
1985 if (upordown < 0) 2006 if (direction == UP)
1986 scrollBar.setUp (); 2007 scrollBar.state = STATE_UP;
1987 else 2008 else
1988 scrollBar.setDn (); 2009 scrollBar.state = STATE_DOWN;
1989 } 2010 }
1990 } 2011 }
1991 else 2012 else
1992 switch (ev.button) 2013 switch (ev.button)
1993 { 2014 {
1994 case Button2: 2015 case Button2:
1995 switch (scrollbar_align) 2016 switch (scrollBar.align)
1996 { 2017 {
1997 case R_SB_ALIGN_TOP: 2018 case R_SB_ALIGN_TOP:
1998 csrO = 0; 2019 csrO = 0;
1999 break; 2020 break;
2000 case R_SB_ALIGN_CENTRE: 2021 case R_SB_ALIGN_CENTRE:
… …
2008 if (scrollBar.style == R_SB_XTERM 2029 if (scrollBar.style == R_SB_XTERM
2009 || scrollbar_above_slider (ev.y) 2030 || scrollbar_above_slider (ev.y)
2010 || scrollbar_below_slider (ev.y)) 2031 || scrollbar_below_slider (ev.y))
2011 scr_move_to (scrollbar_position (ev.y) - csrO, scrollbar_size ()); 2032 scr_move_to (scrollbar_position (ev.y) - csrO, scrollbar_size ());
2012 2033
2013 scrollBar.setMotion (); 2034 scrollBar.state = STATE_MOTION;
2014 break; 2035 break;
2015 2036
2016 case Button1: 2037 case Button1:
2017 if (scrollbar_align == R_SB_ALIGN_CENTRE) 2038 if (scrollBar.align == R_SB_ALIGN_CENTRE)
2018 csrO = ev.y - scrollBar.top; 2039 csrO = ev.y - scrollBar.top;
2019 /* FALLTHROUGH */ 2040 /* FALLTHROUGH */
2020 2041
2021 case Button3: 2042 case Button3:
2022 if (scrollBar.style != R_SB_XTERM) 2043 if (scrollBar.style != R_SB_XTERM)
… …
2032 scr_page (DN, nrow - 1); 2053 scr_page (DN, nrow - 1);
2033# else 2054# else
2034 scr_page (DN, nrow / 4); 2055 scr_page (DN, nrow / 4);
2035# endif 2056# endif
2036 else 2057 else
2037 scrollBar.setMotion (); 2058 scrollBar.state = STATE_MOTION;
2038 } 2059 }
2039 else 2060 else
2040 { 2061 {
2041 scr_page ((ev.button == Button1 ? DN : UP), 2062 scr_page ((ev.button == Button1 ? DN : UP),
2042 (nrow 2063 (nrow
… …
2059 2080
2060 csrO = 0; /* reset csr Offset */ 2081 csrO = 0; /* reset csr Offset */
2061 if (!bypass_keystate) 2082 if (!bypass_keystate)
2062 reportmode = !! (priv_modes & PrivMode_mouse_report); 2083 reportmode = !! (priv_modes & PrivMode_mouse_report);
2063 2084
2064 if (scrollbar_isUpDn ()) 2085 if (scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN)
2065 { 2086 {
2066 scrollBar.setIdle (); 2087 scrollBar.state = STATE_IDLE;
2067 scrollbar_show (0); 2088 scrollbar_show (0);
2068 } 2089 }
2069 2090
2070#ifdef SELECTION_SCROLLING 2091#ifdef SELECTION_SCROLLING
2071 if (sel_scroll_ev.active)
2072 sel_scroll_ev.stop(); 2092 sel_scroll_ev.stop();
2073#endif 2093#endif
2074 2094
2075 if (ev.window == vt) 2095 if (ev.window == vt)
2076 { 2096 {
2077 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)))
… …
2149 { 2169 {
2150 mouse_slip_wheel_speed += v ? -1 : 1; 2170 mouse_slip_wheel_speed += v ? -1 : 1;
2151 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow; 2171 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow;
2152 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow; 2172 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2153 2173
2174 if (!slip_wheel_ev.is_active ())
2154 slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY); 2175 slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2155 } 2176 }
2156 else 2177 else
2178# endif
2157 { 2179 {
2158# endif
2159 scr_page (v, i); 2180 scr_page (v, i);
2160 scrollbar_show (1); 2181 scrollbar_show (1);
2161# ifdef MOUSE_SLIP_WHEELING
2162 } 2182 }
2163# endif
2164 } 2183 }
2165 break; 2184 break;
2166#endif 2185#endif
2167 } 2186 }
2168 } 2187 }
… …
2751 nargs = 0; 2770 nargs = 0;
2752 2771
2753 priv = 0; 2772 priv = 0;
2754 ch = cmd_getc (); 2773 ch = cmd_getc ();
2755 if (ch >= '<' && ch <= '?') 2774 if (ch >= '<' && ch <= '?')
2775 {
2756 { /* '<' '=' '>' '?' */ 2776 /* '<' '=' '>' '?' */
2757 priv = ch; 2777 priv = ch;
2758 ch = cmd_getc (); 2778 ch = cmd_getc ();
2759 } 2779 }
2760 2780
2761 /* read any numerical arguments */ 2781 /* read any numerical arguments */
… …
2810 // versions. 2830 // versions.
2811 // 2831 //
2812 tt_printf ("\033[>%d;95;0c", 'U'); 2832 tt_printf ("\033[>%d;95;0c", 'U');
2813 } 2833 }
2814 break; 2834 break;
2835
2815 case '?': 2836 case '?':
2816 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2837 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
2817 process_terminal_mode (ch, priv, nargs, arg); 2838 process_terminal_mode (ch, priv, nargs, arg);
2818 break; 2839 break;
2819 } 2840 }
… …
3335 *buf++ = '\0'; 3356 *buf++ = '\0';
3336 3357
3337 process_color_seq (op, color, name, resp); 3358 process_color_seq (op, color, name, resp);
3338 } 3359 }
3339 break; 3360 break;
3361 case Rxvt_restoreFG:
3340 case XTerm_Color00: 3362 case XTerm_Color00:
3341 process_color_seq (op, Color_fg, str, resp); 3363 process_color_seq (op, Color_fg, str, resp);
3342 break; 3364 break;
3365 case Rxvt_restoreBG:
3343 case XTerm_Color01: 3366 case XTerm_Color01:
3344 process_color_seq (op, Color_bg, str, resp); 3367 process_color_seq (op, Color_bg, str, resp);
3345 break; 3368 break;
3346#ifndef NO_CURSORCOLOR 3369#ifndef NO_CURSORCOLOR
3347 case XTerm_Color_cursor: 3370 case XTerm_Color_cursor:
… …
3373#if ENABLE_TRANSPARENCY 3396#if ENABLE_TRANSPARENCY
3374 case URxvt_Color_tint: 3397 case URxvt_Color_tint:
3375 process_color_seq (op, Color_tint, str, resp); 3398 process_color_seq (op, Color_tint, str, resp);
3376 { 3399 {
3377 bool changed = false; 3400 bool changed = false;
3401
3378 if (ISSET_PIXCOLOR (Color_tint)) 3402 if (ISSET_PIXCOLOR (Color_tint))
3379 changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]); 3403 changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]);
3380 else 3404 else
3381 changed = bgPixmap.unset_tint (); 3405 changed = bgPixmap.unset_tint ();
3406
3382 if (changed) 3407 if (changed)
3383 update_background (); 3408 update_background ();
3384 } 3409 }
3385 3410
3386 break; 3411 break;
… …
3409 changed++; 3434 changed++;
3410 str = strchr (str, ';'); 3435 str = strchr (str, ';');
3411 if (str == NULL) 3436 if (str == NULL)
3412 bgPixmap.set_defaultGeometry (); 3437 bgPixmap.set_defaultGeometry ();
3413 } 3438 }
3439
3414 while (str) 3440 while (str)
3415 { 3441 {
3416 str++; 3442 str++;
3417 if (bgPixmap.set_geometry (str)) 3443 if (bgPixmap.set_geometry (str))
3418 changed++; 3444 changed++;
3419 str = strchr (str, ';'); 3445 str = strchr (str, ';');
3420 } 3446 }
3447
3421 if (changed) 3448 if (changed)
3422 update_background (); 3449 update_background ();
3423 } 3450 }
3424 break; 3451 break;
3425#endif 3452#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 3453
3434 case XTerm_logfile: 3454 case XTerm_logfile:
3435 // TODO, when secure mode? 3455 // TODO, when secure mode?
3436 break; 3456 break;
3437 3457
… …
3581 { 66, PrivMode_aplKP }, 3601 { 66, PrivMode_aplKP },
3582#ifndef NO_BACKSPACE_KEY 3602#ifndef NO_BACKSPACE_KEY
3583 { 67, PrivMode_BackSpace }, 3603 { 67, PrivMode_BackSpace },
3584#endif 3604#endif
3585 { 1000, PrivMode_MouseX11 }, 3605 { 1000, PrivMode_MouseX11 },
3586 // 1001 Use Hilite Mouse Tracking. NYI, TODO
3587 { 1002, PrivMode_MouseBtnEvent }, 3606 { 1002, PrivMode_MouseBtnEvent },
3588 { 1003, PrivMode_MouseAnyEvent }, 3607 { 1003, PrivMode_MouseAnyEvent },
3589 { 1010, PrivMode_TtyOutputInh }, // rxvt extension 3608 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
3590 { 1011, PrivMode_Keypress }, // rxvt extension 3609 { 1011, PrivMode_Keypress }, // rxvt extension
3591 // 1035 enable modifiers for alt, numlock NYI 3610 // 1035 enable modifiers for alt, numlock NYI
… …
3593 // 1037 send DEL for keypad delete NYI 3612 // 1037 send DEL for keypad delete NYI
3594 { 1047, PrivMode_Screen }, 3613 { 1047, PrivMode_Screen },
3595 // 1048 save and restore cursor 3614 // 1048 save and restore cursor
3596 { 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 */
3597 // 1051, 1052, 1060, 1061 keyboard emulation NYI 3616 // 1051, 1052, 1060, 1061 keyboard emulation NYI
3617 { 2004, PrivMode_BracketPaste },
3598 }; 3618 };
3599 3619
3600 if (nargs == 0) 3620 if (nargs == 0)
3601 return; 3621 return;
3602 3622
… …
3650 */ 3670 */
3651 PrivMode (1, PrivMode_vt52); 3671 PrivMode (1, PrivMode_vt52);
3652 break; 3672 break;
3653 case 3: /* 80/132 */ 3673 case 3: /* 80/132 */
3654 if (priv_modes & PrivMode_132OK) 3674 if (priv_modes & PrivMode_132OK)
3675 {
3676 scr_poweron ();
3655 set_widthheight (((state ? 132 : 80) * fwidth), height); 3677 set_widthheight (((state ? 132 : 80) * fwidth), 24 * fheight);
3678 }
3656 break; 3679 break;
3657 case 4: /* smooth scrolling */ 3680 case 4: /* smooth scrolling */
3658 set_option (Opt_jumpScroll, !state); 3681 set_option (Opt_jumpScroll, !state);
3659 break; 3682 break;
3660 case 5: /* reverse video */ 3683 case 5: /* reverse video */
… …
3692 /* case 67: - backspace key */ 3715 /* case 67: - backspace key */
3693 case 1000: /* X11 mouse reporting */ 3716 case 1000: /* X11 mouse reporting */
3694 if (state) /* orthogonal */ 3717 if (state) /* orthogonal */
3695 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent); 3718 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
3696 break; 3719 break;
3697#if 0
3698 case 1001:
3699 break; /* X11 mouse highlighting */
3700#endif
3701 case 1002: 3720 case 1002:
3702 case 1003: 3721 case 1003:
3703 if (state) 3722 if (state)
3704 { 3723 {
3705 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11); 3724 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11);
… …
3894rxvt_term::process_graphics () 3913rxvt_term::process_graphics ()
3895{ 3914{
3896 unicode_t ch, cmd = cmd_getc (); 3915 unicode_t ch, cmd = cmd_getc ();
3897 3916
3898 if (cmd == 'Q') 3917 if (cmd == 'Q')
3918 {
3899 { /* query graphics */ 3919 /* query graphics */
3900 tt_printf ("\033G0\012"); /* no graphics */ 3920 tt_printf ("\033G0\012"); /* no graphics */
3901 return; 3921 return;
3902 } 3922 }
3903 /* swallow other graphics sequences until terminating ':' */ 3923 /* swallow other graphics sequences until terminating ':' */
3904 do 3924 do

Diff Legend

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