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.394 by ayin, Sat Jan 19 15:00:49 2008 UTC vs.
Revision 1.406 by ayin, Thu Feb 14 23:53:05 2008 UTC

… …
302 302
303void 303void
304rxvt_term::key_press (XKeyEvent &ev) 304rxvt_term::key_press (XKeyEvent &ev)
305{ 305{
306 int ctrl, meta, shft, len; 306 int ctrl, meta, shft, len;
307 unsigned int newlen;
308 KeySym keysym; 307 KeySym keysym;
309 int valid_keysym; 308 int valid_keysym;
310 char kbuf[KBUFSZ]; 309 char kbuf[KBUFSZ];
311 310
312#if ISO_14755 311#if ISO_14755
… …
547 } 546 }
548#endif 547#endif
549 548
550 if (keysym >= 0xFF00 && keysym <= 0xFFFF) 549 if (keysym >= 0xFF00 && keysym <= 0xFFFF)
551 { 550 {
552 {
553 bool kp = priv_modes & PrivMode_aplKP ? !shft : shft; 551 bool kp = priv_modes & PrivMode_aplKP ? !shft : shft;
554 newlen = 1; 552 unsigned int newlen = 1;
555#ifdef XK_KP_Home 553#ifdef XK_KP_Home
556 static const KeySym keypadtrans[] = { 554 static const KeySym keypadtrans[] = {
557 XK_KP_7, // XK_KP_Home 555 XK_KP_7, // XK_KP_Home
558 XK_KP_4, // XK_KP_Left 556 XK_KP_4, // XK_KP_Left
559 XK_KP_8, // XK_KP_Up 557 XK_KP_8, // XK_KP_Up
… …
789 break; 787 break;
790 } 788 }
791 789
792 if (newlen) 790 if (newlen)
793 len = strlen (kbuf); 791 len = strlen (kbuf);
794 }
795 792
796 /* 793 /*
797 * Pass meta for all function keys, if 'meta' option set 794 * Pass meta for all function keys, if 'meta' option set
798 */ 795 */
799#ifdef META8_OPTION 796#ifdef META8_OPTION
… …
1090 1087
1091#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1088#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1092void 1089void
1093rxvt_term::cont_scroll_cb (ev::timer &w, int revents) 1090rxvt_term::cont_scroll_cb (ev::timer &w, int revents)
1094{ 1091{
1095 if ((scrollbar_isUp () || scrollbar_isDn ()) 1092 if ((scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN)
1096 && scr_page (scrollbar_isUp () ? UP : DN, 1)) 1093 && scr_page (scrollBar.state == STATE_UP ? UP : DN, 1))
1097 { 1094 {
1098 want_refresh = 1; 1095 want_refresh = 1;
1099 refresh_check (); 1096 refresh_check ();
1100 } 1097 }
1101 else 1098 else
… …
1438 && ev.xfocus.mode != NotifyGrab) 1435 && ev.xfocus.mode != NotifyGrab)
1439 focus_out (); 1436 focus_out ();
1440 break; 1437 break;
1441 1438
1442 case ConfigureNotify: 1439 case ConfigureNotify:
1443 /*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",
1444 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,
1445 szHint.width, szHint.height); */ 1442 szHint.width, szHint.height);*/
1446 if (ev.xconfigure.window == parent[0]) 1443 if (ev.xconfigure.window == parent[0])
1447 { 1444 {
1448 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev)) 1445 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1449 ; 1446 ;
1450 1447
… …
1553 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event)) 1550 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1554 ; 1551 ;
1555 1552
1556 if (scrollBar.state && ev.xany.window == scrollBar.win) 1553 if (scrollBar.state && ev.xany.window == scrollBar.win)
1557 { 1554 {
1558 scrollBar.setIdle (); 1555 scrollBar.state = STATE_IDLE;
1559 scrollbar_show (0); 1556 scrollbar_show (0);
1560 } 1557 }
1561 } 1558 }
1562 break; 1559 break;
1563 1560
… …
1651#ifdef MOUSE_THRESHOLD 1648#ifdef MOUSE_THRESHOLD
1652 } 1649 }
1653#endif 1650#endif
1654 } 1651 }
1655 } 1652 }
1656 else if (scrollbar_isMotion () && ev.xany.window == scrollBar.win) 1653 else if (scrollBar.state == STATE_MOTION && ev.xany.window == scrollBar.win)
1657 { 1654 {
1658 while (XCheckTypedWindowEvent (dpy, scrollBar.win, 1655 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1659 MotionNotify, &ev)) 1656 MotionNotify, &ev))
1660 ; 1657 ;
1661 1658
… …
1947 /* 1944 /*
1948 * Scrollbar window processing of button press 1945 * Scrollbar window processing of button press
1949 */ 1946 */
1950 if (scrollBar.state && ev.window == scrollBar.win) 1947 if (scrollBar.state && ev.window == scrollBar.win)
1951 { 1948 {
1952 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;
1953 /* 1957 /*
1954 * Rxvt-style scrollbar: 1958 * Rxvt-style scrollbar:
1955 * move up if mouse is above slider 1959 * move up if mouse is above slider
1956 * move dn if mouse is below slider 1960 * move dn if mouse is below slider
1957 * 1961 *
… …
1966 /* 1970 /*
1967 * Mouse report disabled scrollbar: 1971 * Mouse report disabled scrollbar:
1968 * arrow buttons - send up/down 1972 * arrow buttons - send up/down
1969 * click on scrollbar - send pageup/down 1973 * click on scrollbar - send pageup/down
1970 */ 1974 */
1971 if ((scrollBar.style == R_SB_NEXT 1975 if (direction == UP)
1972 && scrollbarnext_upButton (ev.y))
1973 || (scrollBar.style == R_SB_RXVT
1974 && scrollbarrxvt_upButton (ev.y)))
1975 tt_printf ("\033[A"); 1976 tt_printf ("\033[A");
1976 else if ((scrollBar.style == R_SB_NEXT 1977 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"); 1978 tt_printf ("\033[B");
1981 else 1979 else
1982 switch (ev.button) 1980 switch (ev.button)
1983 { 1981 {
1984 case Button2: 1982 case Button2:
… …
1992 break; 1990 break;
1993 } 1991 }
1994 } 1992 }
1995 else 1993 else
1996#endif /* NO_SCROLLBAR_REPORT */ 1994#endif /* NO_SCROLLBAR_REPORT */
1997
1998 {
1999 char upordown = 0;
2000
2001 if (scrollBar.style == R_SB_NEXT)
2002 { 1995 {
2003 if (scrollbarnext_upButton (ev.y)) 1996 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 { 1997 {
2018#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1998#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
2019 if (!cont_scroll_ev.is_active ()) 1999 if (!cont_scroll_ev.is_active ())
2020 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY); 2000 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2021#endif 2001#endif
2022 if (scr_page (upordown < 0 ? UP : DN, 1)) 2002 if (scr_page (direction, 1))
2023 { 2003 {
2024 if (upordown < 0) 2004 if (direction == UP)
2025 scrollBar.setUp (); 2005 scrollBar.state = STATE_UP;
2026 else 2006 else
2027 scrollBar.setDn (); 2007 scrollBar.state = STATE_DOWN;
2028 } 2008 }
2029 } 2009 }
2030 else 2010 else
2031 switch (ev.button) 2011 switch (ev.button)
2032 { 2012 {
… …
2047 if (scrollBar.style == R_SB_XTERM 2027 if (scrollBar.style == R_SB_XTERM
2048 || scrollbar_above_slider (ev.y) 2028 || scrollbar_above_slider (ev.y)
2049 || scrollbar_below_slider (ev.y)) 2029 || scrollbar_below_slider (ev.y))
2050 scr_move_to (scrollbar_position (ev.y) - csrO, scrollbar_size ()); 2030 scr_move_to (scrollbar_position (ev.y) - csrO, scrollbar_size ());
2051 2031
2052 scrollBar.setMotion (); 2032 scrollBar.state = STATE_MOTION;
2053 break; 2033 break;
2054 2034
2055 case Button1: 2035 case Button1:
2056 if (scrollBar.align == R_SB_ALIGN_CENTRE) 2036 if (scrollBar.align == R_SB_ALIGN_CENTRE)
2057 csrO = ev.y - scrollBar.top; 2037 csrO = ev.y - scrollBar.top;
… …
2071 scr_page (DN, nrow - 1); 2051 scr_page (DN, nrow - 1);
2072# else 2052# else
2073 scr_page (DN, nrow / 4); 2053 scr_page (DN, nrow / 4);
2074# endif 2054# endif
2075 else 2055 else
2076 scrollBar.setMotion (); 2056 scrollBar.state = STATE_MOTION;
2077 } 2057 }
2078 else 2058 else
2079 { 2059 {
2080 scr_page ((ev.button == Button1 ? DN : UP), 2060 scr_page ((ev.button == Button1 ? DN : UP),
2081 (nrow 2061 (nrow
… …
2098 2078
2099 csrO = 0; /* reset csr Offset */ 2079 csrO = 0; /* reset csr Offset */
2100 if (!bypass_keystate) 2080 if (!bypass_keystate)
2101 reportmode = !! (priv_modes & PrivMode_mouse_report); 2081 reportmode = !! (priv_modes & PrivMode_mouse_report);
2102 2082
2103 if (scrollbar_isUpDn ()) 2083 if (scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN)
2104 { 2084 {
2105 scrollBar.setIdle (); 2085 scrollBar.state = STATE_IDLE;
2106 scrollbar_show (0); 2086 scrollbar_show (0);
2107 } 2087 }
2108 2088
2109#ifdef SELECTION_SCROLLING 2089#ifdef SELECTION_SCROLLING
2110 sel_scroll_ev.stop(); 2090 sel_scroll_ev.stop();
… …
2848 // versions. 2828 // versions.
2849 // 2829 //
2850 tt_printf ("\033[>%d;95;0c", 'U'); 2830 tt_printf ("\033[>%d;95;0c", 'U');
2851 } 2831 }
2852 break; 2832 break;
2833
2853 case '?': 2834 case '?':
2854 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2835 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
2855 process_terminal_mode (ch, priv, nargs, arg); 2836 process_terminal_mode (ch, priv, nargs, arg);
2856 break; 2837 break;
2857 } 2838 }
… …
3629 // 1037 send DEL for keypad delete NYI 3610 // 1037 send DEL for keypad delete NYI
3630 { 1047, PrivMode_Screen }, 3611 { 1047, PrivMode_Screen },
3631 // 1048 save and restore cursor 3612 // 1048 save and restore cursor
3632 { 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 */
3633 // 1051, 1052, 1060, 1061 keyboard emulation NYI 3614 // 1051, 1052, 1060, 1061 keyboard emulation NYI
3615 { 2004, PrivMode_BracketPaste },
3634 }; 3616 };
3635 3617
3636 if (nargs == 0) 3618 if (nargs == 0)
3637 return; 3619 return;
3638 3620

Diff Legend

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