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

Diff Legend

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