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

Diff Legend

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