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.409 by ayin, Sat Feb 16 15:39:20 2008 UTC

… …
279 } 279 }
280 280
281 iso14755buf = 0; 281 iso14755buf = 0;
282} 282}
283 283
284int 284static int
285rxvt_term::hex_keyval (XKeyEvent &ev) 285hex_keyval (XKeyEvent &ev)
286{ 286{
287 // check wether this event corresponds to a hex digit 287 // check wether this event corresponds to a hex digit
288 // if the modifiers had not been pressed. 288 // if the modifiers had not been pressed.
289 for (int index = 0; index < 8; index++) 289 for (int index = 0; index < 8; index++)
290 { 290 {
… …
298 298
299 return -1; 299 return -1;
300} 300}
301#endif 301#endif
302 302
303static inline KeySym
304translate_keypad (KeySym keysym, bool kp)
305{
306#ifdef XK_KP_Home
307 static const KeySym keypadtrans[] = {
308 XK_KP_7, // XK_KP_Home
309 XK_KP_4, // XK_KP_Left
310 XK_KP_8, // XK_KP_Up
311 XK_KP_6, // XK_KP_Right
312 XK_KP_2, // XK_KP_Down
313# ifndef UNSHIFTED_SCROLLKEYS
314 XK_KP_9, // XK_KP_Prior
315 XK_KP_3, // XK_KP_Next
316# else
317 XK_Prior,
318 XK_Next,
319# endif
320 XK_KP_1, // XK_KP_End
321 XK_KP_5, // XK_KP_Begin
322 };
323
324 if (IN_RANGE_INC (keysym, XK_KP_Home, XK_KP_Begin))
325 {
326 unsigned int index = keysym - XK_KP_Home;
327 keysym = kp ? keypadtrans[index] : XK_Home + index;
328 }
329 else if (keysym == XK_KP_Insert)
330 keysym = kp ? XK_KP_0 : XK_Insert;
331# ifndef NO_DELETE_KEY
332 else if (keysym == XK_KP_Delete)
333 keysym = kp ? XK_KP_Decimal : XK_Delete;
334# endif
335#endif
336 return keysym;
337}
338
339static inline int
340map_function_key (KeySym keysym)
341{
342 int param = 0;
343
344 if (IN_RANGE_INC (keysym, XK_F1, XK_F35))
345 {
346 param = 11 + keysym - XK_F1;
347 if (keysym >= XK_F17)
348 param += 4;
349 else if (keysym >= XK_F15)
350 param += 3;
351 else if (keysym >= XK_F11)
352 param += 2;
353 else if (keysym >= XK_F6)
354 param += 1;
355 }
356 else
357 switch (keysym)
358 {
359 case XK_Find:
360 param = 1;
361 break;
362 case XK_Insert:
363 param = 2;
364 break;
365#ifdef DXK_Remove
366 case DXK_Remove:
367#endif
368 case XK_Execute:
369 param = 3;
370 break;
371 case XK_Select:
372 param = 4;
373 break;
374#ifndef UNSHIFTED_SCROLLKEYS
375 case XK_Prior:
376 param = 5;
377 break;
378 case XK_Next:
379 param = 6;
380 break;
381#endif
382 case XK_Help:
383 param = 28;
384 break;
385 case XK_Menu:
386 param = 29;
387 break;
388 }
389 return param;
390}
391
303void 392void
304rxvt_term::key_press (XKeyEvent &ev) 393rxvt_term::key_press (XKeyEvent &ev)
305{ 394{
306 int ctrl, meta, shft, len; 395 int ctrl, meta, shft, len;
307 unsigned int newlen;
308 KeySym keysym; 396 KeySym keysym;
309 int valid_keysym; 397 int valid_keysym;
310 char kbuf[KBUFSZ]; 398 char kbuf[KBUFSZ];
311 399
312#if ISO_14755 400#if ISO_14755
… …
547 } 635 }
548#endif 636#endif
549 637
550 if (keysym >= 0xFF00 && keysym <= 0xFFFF) 638 if (keysym >= 0xFF00 && keysym <= 0xFFFF)
551 { 639 {
552 {
553 bool kp = priv_modes & PrivMode_aplKP ? !shft : shft; 640 bool kp = priv_modes & PrivMode_aplKP ? !shft : shft;
554 newlen = 1; 641 unsigned int newlen = 1;
555#ifdef XK_KP_Home
556 static const KeySym keypadtrans[] = {
557 XK_KP_7, // XK_KP_Home
558 XK_KP_4, // XK_KP_Left
559 XK_KP_8, // XK_KP_Up
560 XK_KP_6, // XK_KP_Right
561 XK_KP_2, // XK_KP_Down
562#ifndef UNSHIFTED_SCROLLKEYS
563 XK_KP_9, // XK_KP_Prior
564 XK_KP_3, // XK_KP_Next
565#else
566 XK_Prior,
567 XK_Next,
568#endif
569 XK_KP_1, // XK_KP_End
570 XK_KP_5, // XK_KP_Begin
571 };
572 642
573 if (IN_RANGE_INC (keysym, XK_KP_Home, XK_KP_Begin)) 643 switch (translate_keypad (keysym, kp))
574 {
575 unsigned int index = keysym - XK_KP_Home;
576 keysym = kp ? keypadtrans[index] : XK_Home + index;
577 }
578 else if (keysym == XK_KP_Insert)
579 keysym = kp ? XK_KP_0 : XK_Insert;
580#ifndef NO_DELETE_KEY
581 else if (keysym == XK_KP_Delete)
582 keysym = kp ? XK_KP_Decimal : XK_Delete;
583#endif
584#endif
585 switch (keysym)
586 { 644 {
587#ifndef NO_BACKSPACE_KEY 645#ifndef NO_BACKSPACE_KEY
588 case XK_BackSpace: 646 case XK_BackSpace:
589 if (priv_modes & PrivMode_HaveBackSpace) 647 if (priv_modes & PrivMode_HaveBackSpace)
590 { 648 {
… …
634 } 692 }
635 else if (priv_modes & PrivMode_aplCUR) 693 else if (priv_modes & PrivMode_aplCUR)
636 kbuf[1] = 'O'; 694 kbuf[1] = 'O';
637 break; 695 break;
638 696
639#ifndef UNSHIFTED_SCROLLKEYS
640 case XK_Prior:
641 strcpy (kbuf, "\033[5~");
642 break;
643 case XK_Next:
644 strcpy (kbuf, "\033[6~");
645 break;
646#endif
647 case XK_KP_Enter: 697 case XK_KP_Enter:
648 /* allow shift to override */ 698 /* allow shift to override */
649 if (kp) 699 if (kp)
650 { 700 {
651 strcpy (kbuf, "\033OM"); 701 strcpy (kbuf, "\033OM");
… …
703 kbuf[0] = ('*' + (keysym - XK_KP_Multiply)); 753 kbuf[0] = ('*' + (keysym - XK_KP_Multiply));
704 kbuf[1] = '\0'; 754 kbuf[1] = '\0';
705 } 755 }
706 break; 756 break;
707 757
708 case XK_Find:
709 strcpy (kbuf, "\033[1~");
710 break;
711
712 case XK_Insert:
713 strcpy (kbuf, "\033[2~");
714 break;
715#ifdef DXK_Remove /* support for DEC remove like key */
716 case DXK_Remove:
717 /* FALLTHROUGH */
718#endif
719 case XK_Execute:
720 strcpy (kbuf, "\033[3~");
721 break;
722 case XK_Select:
723 strcpy (kbuf, "\033[4~");
724 break;
725 case XK_End: 758 case XK_End:
726 strcpy (kbuf, KS_END); 759 strcpy (kbuf, KS_END);
727 break; 760 break;
728 case XK_Home: 761 case XK_Home:
729 strcpy (kbuf, KS_HOME); 762 strcpy (kbuf, KS_HOME);
730 break; 763 break;
731 764
732#define FKEY(n, fkey) \
733 sprintf ((char *)kbuf,"\033[%2d~", (int) ((n) + (keysym - fkey)))
734
735 case XK_F1: /* "\033[11~" */
736 case XK_F2: /* "\033[12~" */
737 case XK_F3: /* "\033[13~" */
738 case XK_F4: /* "\033[14~" */
739 case XK_F5: /* "\033[15~" */
740 FKEY (11, XK_F1);
741 break;
742 case XK_F6: /* "\033[17~" */
743 case XK_F7: /* "\033[18~" */
744 case XK_F8: /* "\033[19~" */
745 case XK_F9: /* "\033[20~" */
746 case XK_F10: /* "\033[21~" */
747 FKEY (17, XK_F6);
748 break;
749 case XK_F11: /* "\033[23~" */
750 case XK_F12: /* "\033[24~" */
751 case XK_F13: /* "\033[25~" */
752 case XK_F14: /* "\033[26~" */
753 FKEY (23, XK_F11);
754 break;
755 case XK_F15: /* "\033[28~" */
756 case XK_F16: /* "\033[29~" */
757 FKEY (28, XK_F15);
758 break;
759 case XK_Help: /* "\033[28~" */
760 FKEY (28, XK_Help);
761 break;
762 case XK_Menu: /* "\033[29~" */
763 FKEY (29, XK_Menu);
764 break;
765 case XK_F17: /* "\033[31~" */
766 case XK_F18: /* "\033[32~" */
767 case XK_F19: /* "\033[33~" */
768 case XK_F20: /* "\033[34~" */
769 case XK_F21: /* "\033[35~" */
770 case XK_F22: /* "\033[36~" */
771 case XK_F23: /* "\033[37~" */
772 case XK_F24: /* "\033[38~" */
773 case XK_F25: /* "\033[39~" */
774 case XK_F26: /* "\033[40~" */
775 case XK_F27: /* "\033[41~" */
776 case XK_F28: /* "\033[42~" */
777 case XK_F29: /* "\033[43~" */
778 case XK_F30: /* "\033[44~" */
779 case XK_F31: /* "\033[45~" */
780 case XK_F32: /* "\033[46~" */
781 case XK_F33: /* "\033[47~" */
782 case XK_F34: /* "\033[48~" */
783 case XK_F35: /* "\033[49~" */
784 FKEY (31, XK_F17);
785 break;
786#undef FKEY
787 default: 765 default:
766 {
767 int param = map_function_key (keysym);
768 if (param > 0)
769 sprintf (kbuf,"\033[%d~", param);
770 else
788 newlen = 0; 771 newlen = 0;
772 }
789 break; 773 break;
790 } 774 }
791 775
792 if (newlen) 776 if (newlen)
793 len = strlen (kbuf); 777 len = strlen (kbuf);
794 }
795 778
796 /* 779 /*
797 * Pass meta for all function keys, if 'meta' option set 780 * Pass meta for all function keys, if 'meta' option set
798 */ 781 */
799#ifdef META8_OPTION 782#ifdef META8_OPTION
… …
1090 1073
1091#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1074#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1092void 1075void
1093rxvt_term::cont_scroll_cb (ev::timer &w, int revents) 1076rxvt_term::cont_scroll_cb (ev::timer &w, int revents)
1094{ 1077{
1095 if ((scrollbar_isUp () || scrollbar_isDn ()) 1078 if ((scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN)
1096 && scr_page (scrollbar_isUp () ? UP : DN, 1)) 1079 && scr_page (scrollBar.state == STATE_UP ? UP : DN, 1))
1097 { 1080 {
1098 want_refresh = 1; 1081 want_refresh = 1;
1099 refresh_check (); 1082 refresh_check ();
1100 } 1083 }
1101 else 1084 else
… …
1438 && ev.xfocus.mode != NotifyGrab) 1421 && ev.xfocus.mode != NotifyGrab)
1439 focus_out (); 1422 focus_out ();
1440 break; 1423 break;
1441 1424
1442 case ConfigureNotify: 1425 case ConfigureNotify:
1443 /*fprintf (stderr, "ConfigureNotify for %X, parent is %X, geom is %dx%d%+d%+d, old geom was %dx%d\n", 1426 /*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, 1427 ev.xconfigure.window, parent[0], ev.xconfigure.width, ev.xconfigure.height, ev.xconfigure.x, ev.xconfigure.y,
1445 szHint.width, szHint.height); */ 1428 szHint.width, szHint.height);*/
1446 if (ev.xconfigure.window == parent[0]) 1429 if (ev.xconfigure.window == parent[0])
1447 { 1430 {
1448 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev)) 1431 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1449 ; 1432 ;
1450 1433
… …
1553 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event)) 1536 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1554 ; 1537 ;
1555 1538
1556 if (scrollBar.state && ev.xany.window == scrollBar.win) 1539 if (scrollBar.state && ev.xany.window == scrollBar.win)
1557 { 1540 {
1558 scrollBar.setIdle (); 1541 scrollBar.state = STATE_IDLE;
1559 scrollbar_show (0); 1542 scrollbar_show (0);
1560 } 1543 }
1561 } 1544 }
1562 break; 1545 break;
1563 1546
… …
1651#ifdef MOUSE_THRESHOLD 1634#ifdef MOUSE_THRESHOLD
1652 } 1635 }
1653#endif 1636#endif
1654 } 1637 }
1655 } 1638 }
1656 else if (scrollbar_isMotion () && ev.xany.window == scrollBar.win) 1639 else if (scrollBar.state == STATE_MOTION && ev.xany.window == scrollBar.win)
1657 { 1640 {
1658 while (XCheckTypedWindowEvent (dpy, scrollBar.win, 1641 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1659 MotionNotify, &ev)) 1642 MotionNotify, &ev))
1660 ; 1643 ;
1661 1644
… …
1947 /* 1930 /*
1948 * Scrollbar window processing of button press 1931 * Scrollbar window processing of button press
1949 */ 1932 */
1950 if (scrollBar.state && ev.window == scrollBar.win) 1933 if (scrollBar.state && ev.window == scrollBar.win)
1951 { 1934 {
1952 scrollBar.setIdle (); 1935 page_dirn direction = NO_DIR;
1936
1937 if (scrollBar.upButton (ev.y))
1938 direction = UP; /* up */
1939 else if (scrollBar.dnButton (ev.y))
1940 direction = DN; /* down */
1941
1942 scrollBar.state = STATE_IDLE;
1953 /* 1943 /*
1954 * Rxvt-style scrollbar: 1944 * Rxvt-style scrollbar:
1955 * move up if mouse is above slider 1945 * move up if mouse is above slider
1956 * move dn if mouse is below slider 1946 * move dn if mouse is below slider
1957 * 1947 *
… …
1966 /* 1956 /*
1967 * Mouse report disabled scrollbar: 1957 * Mouse report disabled scrollbar:
1968 * arrow buttons - send up/down 1958 * arrow buttons - send up/down
1969 * click on scrollbar - send pageup/down 1959 * click on scrollbar - send pageup/down
1970 */ 1960 */
1971 if ((scrollBar.style == R_SB_NEXT 1961 if (direction == UP)
1972 && scrollbarnext_upButton (ev.y))
1973 || (scrollBar.style == R_SB_RXVT
1974 && scrollbarrxvt_upButton (ev.y)))
1975 tt_printf ("\033[A"); 1962 tt_printf ("\033[A");
1976 else if ((scrollBar.style == R_SB_NEXT 1963 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"); 1964 tt_printf ("\033[B");
1981 else 1965 else
1982 switch (ev.button) 1966 switch (ev.button)
1983 { 1967 {
1984 case Button2: 1968 case Button2:
… …
1992 break; 1976 break;
1993 } 1977 }
1994 } 1978 }
1995 else 1979 else
1996#endif /* NO_SCROLLBAR_REPORT */ 1980#endif /* NO_SCROLLBAR_REPORT */
1997
1998 {
1999 char upordown = 0;
2000
2001 if (scrollBar.style == R_SB_NEXT)
2002 { 1981 {
2003 if (scrollbarnext_upButton (ev.y)) 1982 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 { 1983 {
2018#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1984#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
2019 if (!cont_scroll_ev.is_active ()) 1985 if (!cont_scroll_ev.is_active ())
2020 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY); 1986 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2021#endif 1987#endif
2022 if (scr_page (upordown < 0 ? UP : DN, 1)) 1988 if (scr_page (direction, 1))
2023 { 1989 {
2024 if (upordown < 0) 1990 if (direction == UP)
2025 scrollBar.setUp (); 1991 scrollBar.state = STATE_UP;
2026 else 1992 else
2027 scrollBar.setDn (); 1993 scrollBar.state = STATE_DOWN;
2028 } 1994 }
2029 } 1995 }
2030 else 1996 else
2031 switch (ev.button) 1997 switch (ev.button)
2032 { 1998 {
… …
2047 if (scrollBar.style == R_SB_XTERM 2013 if (scrollBar.style == R_SB_XTERM
2048 || scrollbar_above_slider (ev.y) 2014 || scrollbar_above_slider (ev.y)
2049 || scrollbar_below_slider (ev.y)) 2015 || scrollbar_below_slider (ev.y))
2050 scr_move_to (scrollbar_position (ev.y) - csrO, scrollbar_size ()); 2016 scr_move_to (scrollbar_position (ev.y) - csrO, scrollbar_size ());
2051 2017
2052 scrollBar.setMotion (); 2018 scrollBar.state = STATE_MOTION;
2053 break; 2019 break;
2054 2020
2055 case Button1: 2021 case Button1:
2056 if (scrollBar.align == R_SB_ALIGN_CENTRE) 2022 if (scrollBar.align == R_SB_ALIGN_CENTRE)
2057 csrO = ev.y - scrollBar.top; 2023 csrO = ev.y - scrollBar.top;
… …
2071 scr_page (DN, nrow - 1); 2037 scr_page (DN, nrow - 1);
2072# else 2038# else
2073 scr_page (DN, nrow / 4); 2039 scr_page (DN, nrow / 4);
2074# endif 2040# endif
2075 else 2041 else
2076 scrollBar.setMotion (); 2042 scrollBar.state = STATE_MOTION;
2077 } 2043 }
2078 else 2044 else
2079 { 2045 {
2080 scr_page ((ev.button == Button1 ? DN : UP), 2046 scr_page ((ev.button == Button1 ? DN : UP),
2081 (nrow 2047 (nrow
… …
2098 2064
2099 csrO = 0; /* reset csr Offset */ 2065 csrO = 0; /* reset csr Offset */
2100 if (!bypass_keystate) 2066 if (!bypass_keystate)
2101 reportmode = !! (priv_modes & PrivMode_mouse_report); 2067 reportmode = !! (priv_modes & PrivMode_mouse_report);
2102 2068
2103 if (scrollbar_isUpDn ()) 2069 if (scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN)
2104 { 2070 {
2105 scrollBar.setIdle (); 2071 scrollBar.state = STATE_IDLE;
2106 scrollbar_show (0); 2072 scrollbar_show (0);
2107 } 2073 }
2108 2074
2109#ifdef SELECTION_SCROLLING 2075#ifdef SELECTION_SCROLLING
2110 sel_scroll_ev.stop(); 2076 sel_scroll_ev.stop();
… …
2848 // versions. 2814 // versions.
2849 // 2815 //
2850 tt_printf ("\033[>%d;95;0c", 'U'); 2816 tt_printf ("\033[>%d;95;0c", 'U');
2851 } 2817 }
2852 break; 2818 break;
2819
2853 case '?': 2820 case '?':
2854 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2821 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
2855 process_terminal_mode (ch, priv, nargs, arg); 2822 process_terminal_mode (ch, priv, nargs, arg);
2856 break; 2823 break;
2857 } 2824 }
… …
3629 // 1037 send DEL for keypad delete NYI 3596 // 1037 send DEL for keypad delete NYI
3630 { 1047, PrivMode_Screen }, 3597 { 1047, PrivMode_Screen },
3631 // 1048 save and restore cursor 3598 // 1048 save and restore cursor
3632 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */ 3599 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */
3633 // 1051, 1052, 1060, 1061 keyboard emulation NYI 3600 // 1051, 1052, 1060, 1061 keyboard emulation NYI
3601 { 2004, PrivMode_BracketPaste },
3634 }; 3602 };
3635 3603
3636 if (nargs == 0) 3604 if (nargs == 0)
3637 return; 3605 return;
3638 3606

Diff Legend

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