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.398 by root, Sat Jan 26 12:12:37 2008 UTC vs.
Revision 1.401 by ayin, Tue Jan 29 13:57:23 2008 UTC

… …
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 int upordown = 0;
1953
1954 if (scrollBar.upButton (ev.y))
1955 upordown = -1; /* up */
1956 else if (scrollBar.dnButton (ev.y))
1957 upordown = 1; /* 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 (upordown < 0)
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 (upordown > 0)
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:
… …
1994 } 1995 }
1995 else 1996 else
1996#endif /* NO_SCROLLBAR_REPORT */ 1997#endif /* NO_SCROLLBAR_REPORT */
1997 1998
1998 { 1999 {
1999 char upordown = 0;
2000
2001 if (scrollBar.style == R_SB_NEXT)
2002 {
2003 if (scrollbarnext_upButton (ev.y))
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) 2000 if (upordown)
2017 { 2001 {
2018#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 2002#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
2019 if (!cont_scroll_ev.is_active ()) 2003 if (!cont_scroll_ev.is_active ())
2020 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY); 2004 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2021#endif 2005#endif
2022 if (scr_page (upordown < 0 ? UP : DN, 1)) 2006 if (scr_page (upordown < 0 ? UP : DN, 1))
2023 { 2007 {
2024 if (upordown < 0) 2008 if (upordown < 0)
2025 scrollBar.setUp (); 2009 scrollBar.state = STATE_UP;
2026 else 2010 else
2027 scrollBar.setDn (); 2011 scrollBar.state = STATE_DOWN;
2028 } 2012 }
2029 } 2013 }
2030 else 2014 else
2031 switch (ev.button) 2015 switch (ev.button)
2032 { 2016 {
… …
2047 if (scrollBar.style == R_SB_XTERM 2031 if (scrollBar.style == R_SB_XTERM
2048 || scrollbar_above_slider (ev.y) 2032 || scrollbar_above_slider (ev.y)
2049 || scrollbar_below_slider (ev.y)) 2033 || scrollbar_below_slider (ev.y))
2050 scr_move_to (scrollbar_position (ev.y) - csrO, scrollbar_size ()); 2034 scr_move_to (scrollbar_position (ev.y) - csrO, scrollbar_size ());
2051 2035
2052 scrollBar.setMotion (); 2036 scrollBar.state = STATE_MOTION;
2053 break; 2037 break;
2054 2038
2055 case Button1: 2039 case Button1:
2056 if (scrollBar.align == R_SB_ALIGN_CENTRE) 2040 if (scrollBar.align == R_SB_ALIGN_CENTRE)
2057 csrO = ev.y - scrollBar.top; 2041 csrO = ev.y - scrollBar.top;
… …
2071 scr_page (DN, nrow - 1); 2055 scr_page (DN, nrow - 1);
2072# else 2056# else
2073 scr_page (DN, nrow / 4); 2057 scr_page (DN, nrow / 4);
2074# endif 2058# endif
2075 else 2059 else
2076 scrollBar.setMotion (); 2060 scrollBar.state = STATE_MOTION;
2077 } 2061 }
2078 else 2062 else
2079 { 2063 {
2080 scr_page ((ev.button == Button1 ? DN : UP), 2064 scr_page ((ev.button == Button1 ? DN : UP),
2081 (nrow 2065 (nrow
… …
2098 2082
2099 csrO = 0; /* reset csr Offset */ 2083 csrO = 0; /* reset csr Offset */
2100 if (!bypass_keystate) 2084 if (!bypass_keystate)
2101 reportmode = !! (priv_modes & PrivMode_mouse_report); 2085 reportmode = !! (priv_modes & PrivMode_mouse_report);
2102 2086
2103 if (scrollbar_isUpDn ()) 2087 if (scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN)
2104 { 2088 {
2105 scrollBar.setIdle (); 2089 scrollBar.state = STATE_IDLE;
2106 scrollbar_show (0); 2090 scrollbar_show (0);
2107 } 2091 }
2108 2092
2109#ifdef SELECTION_SCROLLING 2093#ifdef SELECTION_SCROLLING
2110 sel_scroll_ev.stop(); 2094 sel_scroll_ev.stop();

Diff Legend

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