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.396 by ayin, Sun Jan 20 14:12:39 2008 UTC vs.
Revision 1.404 by root, Sat Feb 2 15:19:55 2008 UTC

… …
1090 1090
1091#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1091#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1092void 1092void
1093rxvt_term::cont_scroll_cb (ev::timer &w, int revents) 1093rxvt_term::cont_scroll_cb (ev::timer &w, int revents)
1094{ 1094{
1095 if ((scrollbar_isUp () || scrollbar_isDn ()) 1095 if ((scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN)
1096 && scr_page (scrollbar_isUp () ? UP : DN, 1)) 1096 && scr_page (scrollBar.state == STATE_UP ? UP : DN, 1))
1097 { 1097 {
1098 want_refresh = 1; 1098 want_refresh = 1;
1099 refresh_check (); 1099 refresh_check ();
1100 } 1100 }
1101 else 1101 else
… …
1438 && ev.xfocus.mode != NotifyGrab) 1438 && ev.xfocus.mode != NotifyGrab)
1439 focus_out (); 1439 focus_out ();
1440 break; 1440 break;
1441 1441
1442 case ConfigureNotify: 1442 case ConfigureNotify:
1443 /*fprintf (stderr, "ConfigureNotify for %X, parent is %X, geom is %dx%d%+d%+d, old geom was %dx%d\n", 1443 /*fprintf (stderr, "ConfigureNotify for %X, parent is %X, geom is %dx%d%+d%+d, old geom was %dx%d\n",
1444 ev.xconfigure.window, parent[0], ev.xconfigure.width, ev.xconfigure.height, ev.xconfigure.x, ev.xconfigure.y, 1444 ev.xconfigure.window, parent[0], ev.xconfigure.width, ev.xconfigure.height, ev.xconfigure.x, ev.xconfigure.y,
1445 szHint.width, szHint.height); */ 1445 szHint.width, szHint.height);*/
1446 if (ev.xconfigure.window == parent[0]) 1446 if (ev.xconfigure.window == parent[0])
1447 { 1447 {
1448 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev)) 1448 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1449 ; 1449 ;
1450 1450
… …
1553 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event)) 1553 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1554 ; 1554 ;
1555 1555
1556 if (scrollBar.state && ev.xany.window == scrollBar.win) 1556 if (scrollBar.state && ev.xany.window == scrollBar.win)
1557 { 1557 {
1558 scrollBar.setIdle (); 1558 scrollBar.state = STATE_IDLE;
1559 scrollbar_show (0); 1559 scrollbar_show (0);
1560 } 1560 }
1561 } 1561 }
1562 break; 1562 break;
1563 1563
… …
1651#ifdef MOUSE_THRESHOLD 1651#ifdef MOUSE_THRESHOLD
1652 } 1652 }
1653#endif 1653#endif
1654 } 1654 }
1655 } 1655 }
1656 else if (scrollbar_isMotion () && ev.xany.window == scrollBar.win) 1656 else if (scrollBar.state == STATE_MOTION && ev.xany.window == scrollBar.win)
1657 { 1657 {
1658 while (XCheckTypedWindowEvent (dpy, scrollBar.win, 1658 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1659 MotionNotify, &ev)) 1659 MotionNotify, &ev))
1660 ; 1660 ;
1661 1661
… …
1947 /* 1947 /*
1948 * Scrollbar window processing of button press 1948 * Scrollbar window processing of button press
1949 */ 1949 */
1950 if (scrollBar.state && ev.window == scrollBar.win) 1950 if (scrollBar.state && ev.window == scrollBar.win)
1951 { 1951 {
1952 scrollBar.setIdle (); 1952 page_dirn direction = NO_DIR;
1953
1954 if (scrollBar.upButton (ev.y))
1955 direction = UP; /* up */
1956 else if (scrollBar.dnButton (ev.y))
1957 direction = DN; /* down */
1958
1959 scrollBar.state = STATE_IDLE;
1953 /* 1960 /*
1954 * Rxvt-style scrollbar: 1961 * Rxvt-style scrollbar:
1955 * move up if mouse is above slider 1962 * move up if mouse is above slider
1956 * move dn if mouse is below slider 1963 * move dn if mouse is below slider
1957 * 1964 *
… …
1966 /* 1973 /*
1967 * Mouse report disabled scrollbar: 1974 * Mouse report disabled scrollbar:
1968 * arrow buttons - send up/down 1975 * arrow buttons - send up/down
1969 * click on scrollbar - send pageup/down 1976 * click on scrollbar - send pageup/down
1970 */ 1977 */
1971 if ((scrollBar.style == R_SB_NEXT 1978 if (direction == UP)
1972 && scrollbarnext_upButton (ev.y))
1973 || (scrollBar.style == R_SB_RXVT
1974 && scrollbarrxvt_upButton (ev.y)))
1975 tt_printf ("\033[A"); 1979 tt_printf ("\033[A");
1976 else if ((scrollBar.style == R_SB_NEXT 1980 else if (direction == DN)
1977 && scrollbarnext_dnButton (ev.y))
1978 || (scrollBar.style == R_SB_RXVT
1979 && scrollbarrxvt_dnButton (ev.y)))
1980 tt_printf ("\033[B"); 1981 tt_printf ("\033[B");
1981 else 1982 else
1982 switch (ev.button) 1983 switch (ev.button)
1983 { 1984 {
1984 case Button2: 1985 case Button2:
… …
1992 break; 1993 break;
1993 } 1994 }
1994 } 1995 }
1995 else 1996 else
1996#endif /* NO_SCROLLBAR_REPORT */ 1997#endif /* NO_SCROLLBAR_REPORT */
1997
1998 {
1999 char upordown = 0;
2000
2001 if (scrollBar.style == R_SB_NEXT)
2002 { 1998 {
2003 if (scrollbarnext_upButton (ev.y)) 1999 if (direction != NO_DIR)
2004 upordown = -1; /* up */
2005 else if (scrollbarnext_dnButton (ev.y))
2006 upordown = 1; /* down */
2007 }
2008 else if (scrollBar.style == R_SB_RXVT)
2009 {
2010 if (scrollbarrxvt_upButton (ev.y))
2011 upordown = -1; /* up */
2012 else if (scrollbarrxvt_dnButton (ev.y))
2013 upordown = 1; /* down */
2014 }
2015
2016 if (upordown)
2017 { 2000 {
2018#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 2001#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
2019 if (!cont_scroll_ev.is_active ()) 2002 if (!cont_scroll_ev.is_active ())
2020 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY); 2003 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2021#endif 2004#endif
2022 if (scr_page (upordown < 0 ? UP : DN, 1)) 2005 if (scr_page (direction, 1))
2023 { 2006 {
2024 if (upordown < 0) 2007 if (direction == UP)
2025 scrollBar.setUp (); 2008 scrollBar.state = STATE_UP;
2026 else 2009 else
2027 scrollBar.setDn (); 2010 scrollBar.state = STATE_DOWN;
2028 } 2011 }
2029 } 2012 }
2030 else 2013 else
2031 switch (ev.button) 2014 switch (ev.button)
2032 { 2015 {
… …
2047 if (scrollBar.style == R_SB_XTERM 2030 if (scrollBar.style == R_SB_XTERM
2048 || scrollbar_above_slider (ev.y) 2031 || scrollbar_above_slider (ev.y)
2049 || scrollbar_below_slider (ev.y)) 2032 || scrollbar_below_slider (ev.y))
2050 scr_move_to (scrollbar_position (ev.y) - csrO, scrollbar_size ()); 2033 scr_move_to (scrollbar_position (ev.y) - csrO, scrollbar_size ());
2051 2034
2052 scrollBar.setMotion (); 2035 scrollBar.state = STATE_MOTION;
2053 break; 2036 break;
2054 2037
2055 case Button1: 2038 case Button1:
2056 if (scrollBar.align == R_SB_ALIGN_CENTRE) 2039 if (scrollBar.align == R_SB_ALIGN_CENTRE)
2057 csrO = ev.y - scrollBar.top; 2040 csrO = ev.y - scrollBar.top;
… …
2071 scr_page (DN, nrow - 1); 2054 scr_page (DN, nrow - 1);
2072# else 2055# else
2073 scr_page (DN, nrow / 4); 2056 scr_page (DN, nrow / 4);
2074# endif 2057# endif
2075 else 2058 else
2076 scrollBar.setMotion (); 2059 scrollBar.state = STATE_MOTION;
2077 } 2060 }
2078 else 2061 else
2079 { 2062 {
2080 scr_page ((ev.button == Button1 ? DN : UP), 2063 scr_page ((ev.button == Button1 ? DN : UP),
2081 (nrow 2064 (nrow
… …
2098 2081
2099 csrO = 0; /* reset csr Offset */ 2082 csrO = 0; /* reset csr Offset */
2100 if (!bypass_keystate) 2083 if (!bypass_keystate)
2101 reportmode = !! (priv_modes & PrivMode_mouse_report); 2084 reportmode = !! (priv_modes & PrivMode_mouse_report);
2102 2085
2103 if (scrollbar_isUpDn ()) 2086 if (scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN)
2104 { 2087 {
2105 scrollBar.setIdle (); 2088 scrollBar.state = STATE_IDLE;
2106 scrollbar_show (0); 2089 scrollbar_show (0);
2107 } 2090 }
2108 2091
2109#ifdef SELECTION_SCROLLING 2092#ifdef SELECTION_SCROLLING
2110 sel_scroll_ev.stop(); 2093 sel_scroll_ev.stop();

Diff Legend

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