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.400 by ayin, Mon Jan 28 12:54:47 2008 UTC

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
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 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
1952 scrollBar.setIdle (); 1959 scrollBar.setIdle ();
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
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);

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines