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.494 by sf-exg, Mon Aug 22 17:23:56 2011 UTC vs.
Revision 1.509 by sf-exg, Thu May 17 10:18:32 2012 UTC

… …
54 54
55#ifdef KEYSYM_RESOURCE 55#ifdef KEYSYM_RESOURCE
56# include "keyboard.h" 56# include "keyboard.h"
57#endif 57#endif
58 58
59#include <csignal> 59#include <signal.h>
60 60
61#if LINUX_YIELD_HACK 61#if LINUX_YIELD_HACK
62# include <ctime> 62# include <time.h>
63#endif 63#endif
64 64
65/*----------------------------------------------------------------------*/ 65/*----------------------------------------------------------------------*/
66 66
67#define IS_CONTROL(ch) !((ch) & 0xffffff60UL) 67#define IS_CONTROL(ch) !((ch) & 0xffffff60UL)
… …
776 } 776 }
777 777
778 if (newlen) 778 if (newlen)
779 len = strlen (kbuf); 779 len = strlen (kbuf);
780 780
781 if (len > 0)
782 {
781 /* 783 /*
784 * pass Shift/Control indicators for function keys ending with `~'
785 *
786 * eg,
787 * Prior = "ESC[5~"
788 * Shift+Prior = "ESC[5$"
789 * Ctrl+Prior = "ESC[5^"
790 * Ctrl+Shift+Prior = "ESC[5@"
791 */
792 if (kbuf[0] == C0_ESC && kbuf[1] == '[' && kbuf[len - 1] == '~')
793 kbuf[len - 1] = (shft ? (ctrl ? '@' : '$') : (ctrl ? '^' : '~'));
794
795 /*
782 * Pass meta for all function keys, if 'meta' option set 796 * Pass meta for all function keys, if 'meta' option set
783 */ 797 */
784#ifdef META8_OPTION 798#ifdef META8_OPTION
785 if (meta && (meta_char == 0x80) && len > 0) 799 if (meta && (meta_char == 0x80))
786 kbuf[len - 1] |= 0x80; 800 kbuf[len - 1] |= 0x80;
787#endif 801#endif
802 }
788 803
789 } 804 }
790 else if (ctrl && keysym == XK_minus) 805 else if (ctrl && keysym == XK_minus)
791 { 806 {
792 len = 1; 807 len = 1;
… …
825 if (view_start) 840 if (view_start)
826 { 841 {
827 view_start = 0; 842 view_start = 0;
828 want_refresh = 1; 843 want_refresh = 1;
829 } 844 }
830
831 /*
832 * these modifications only affect the static keybuffer
833 * pass Shift/Control indicators for function keys ending with `~'
834 *
835 * eg,
836 * Prior = "ESC[5~"
837 * Shift+Prior = "ESC[5$"
838 * Ctrl+Prior = "ESC[5^"
839 * Ctrl+Shift+Prior = "ESC[5@"
840 * Meta adds an Escape prefix (with META8_OPTION, if meta == <escape>).
841 */
842 if (kbuf[0] == C0_ESC && kbuf[1] == '[' && kbuf[len - 1] == '~')
843 kbuf[len - 1] = (shft ? (ctrl ? '@' : '$') : (ctrl ? '^' : '~'));
844 845
845 /* escape prefix */ 846 /* escape prefix */
846 if (meta 847 if (meta
847#ifdef META8_OPTION 848#ifdef META8_OPTION
848 && meta_char == C0_ESC 849 && meta_char == C0_ESC
… …
1015 flush (); 1016 flush ();
1016} 1017}
1017 1018
1018#ifdef CURSOR_BLINK 1019#ifdef CURSOR_BLINK
1019void 1020void
1021rxvt_term::cursor_blink_reset ()
1022{
1023 if (hidden_cursor)
1024 {
1025 hidden_cursor = 0;
1026 want_refresh = 1;
1027 }
1028
1029 if (option (Opt_cursorBlink))
1030 cursor_blink_ev.again ();
1031 else
1032 cursor_blink_ev.stop ();
1033}
1034
1035void
1020rxvt_term::cursor_blink_cb (ev::timer &w, int revents) 1036rxvt_term::cursor_blink_cb (ev::timer &w, int revents)
1021{ 1037{
1022 hidden_cursor = !hidden_cursor; 1038 hidden_cursor = !hidden_cursor;
1023 want_refresh = 1; 1039 want_refresh = 1;
1024 refresh_check (); 1040 refresh_check ();
… …
1042 1058
1043#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1059#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1044void 1060void
1045rxvt_term::cont_scroll_cb (ev::timer &w, int revents) 1061rxvt_term::cont_scroll_cb (ev::timer &w, int revents)
1046{ 1062{
1047 if ((scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN) 1063 if ((scrollBar.state == SB_STATE_UP || scrollBar.state == SB_STATE_DOWN)
1048 && scr_page (scrollBar.state == STATE_UP ? UP : DN, 1)) 1064 && scr_page (scrollBar.state == SB_STATE_UP ? UP : DN, 1))
1049 { 1065 {
1050 want_refresh = 1; 1066 want_refresh = 1;
1051 refresh_check (); 1067 refresh_check ();
1052 } 1068 }
1053 else 1069 else
… …
1557 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event)) 1573 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1558 ; 1574 ;
1559 1575
1560 if (scrollBar.state && ev.xany.window == scrollBar.win) 1576 if (scrollBar.state && ev.xany.window == scrollBar.win)
1561 { 1577 {
1562 scrollBar.state = STATE_IDLE; 1578 scrollBar.state = SB_STATE_IDLE;
1563 scrollBar.show (0); 1579 scrollBar.show (0);
1564 } 1580 }
1565 } 1581 }
1566 break; 1582 break;
1567 1583
… …
1633 dist = int_bwidth - ev.xbutton.y; 1649 dist = int_bwidth - ev.xbutton.y;
1634 } 1650 }
1635 else 1651 else
1636 { 1652 {
1637 scroll_selection_dir = DN; 1653 scroll_selection_dir = DN;
1638 dist = ev.xbutton.y - (int_bwidth + height); 1654 dist = ev.xbutton.y - (int_bwidth + vt_height);
1639 } 1655 }
1640 1656
1641 scroll_selection_lines = Pixel2Height (dist) 1657 scroll_selection_lines = Pixel2Height (dist)
1642 / SELECTION_SCROLL_LINE_SPEEDUP 1658 / SELECTION_SCROLL_LINE_SPEEDUP
1643 + 1; 1659 + 1;
… …
1655#ifdef MOUSE_THRESHOLD 1671#ifdef MOUSE_THRESHOLD
1656 } 1672 }
1657#endif 1673#endif
1658 } 1674 }
1659 } 1675 }
1660 else if (scrollBar.state == STATE_MOTION && ev.xany.window == scrollBar.win) 1676 else if (scrollBar.state == SB_STATE_MOTION && ev.xany.window == scrollBar.win)
1661 { 1677 {
1662 while (XCheckTypedWindowEvent (dpy, scrollBar.win, 1678 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1663 MotionNotify, &ev)) 1679 MotionNotify, &ev))
1664 ; 1680 ;
1665 1681
… …
1675 } 1691 }
1676 break; 1692 break;
1677 } 1693 }
1678 1694
1679#if defined(CURSOR_BLINK) 1695#if defined(CURSOR_BLINK)
1680 if (option (Opt_cursorBlink) && ev.type == KeyPress) 1696 if (ev.type == KeyPress)
1681 {
1682 if (hidden_cursor)
1683 {
1684 hidden_cursor = 0;
1685 want_refresh = 1;
1686 }
1687
1688 cursor_blink_ev.again (); 1697 cursor_blink_reset ();
1689 }
1690#endif 1698#endif
1691 1699
1692#if defined(POINTER_BLANK) 1700#if defined(POINTER_BLANK)
1693 if (option (Opt_pointerBlank) && pointerBlankDelay > 0) 1701 if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
1694 { 1702 {
… …
1716 if (XWMHints *h = XGetWMHints (dpy, parent)) 1724 if (XWMHints *h = XGetWMHints (dpy, parent))
1717 { 1725 {
1718 h->flags = h->flags & ~XUrgencyHint | (enable ? XUrgencyHint : 0); 1726 h->flags = h->flags & ~XUrgencyHint | (enable ? XUrgencyHint : 0);
1719 XSetWMHints (dpy, parent, h); 1727 XSetWMHints (dpy, parent, h);
1720 urgency_hint = enable; 1728 urgency_hint = enable;
1729 XFree (h);
1721 } 1730 }
1722} 1731}
1723#endif 1732#endif
1724 1733
1725void 1734void
… …
1972 if (scrollBar.upButton (ev.y)) 1981 if (scrollBar.upButton (ev.y))
1973 direction = UP; /* up */ 1982 direction = UP; /* up */
1974 else if (scrollBar.dnButton (ev.y)) 1983 else if (scrollBar.dnButton (ev.y))
1975 direction = DN; /* down */ 1984 direction = DN; /* down */
1976 1985
1977 scrollBar.state = STATE_IDLE; 1986 scrollBar.state = SB_STATE_IDLE;
1978 /* 1987 /*
1979 * Rxvt-style scrollbar: 1988 * Rxvt-style scrollbar:
1980 * move up if mouse is above slider 1989 * move up if mouse is above slider
1981 * move dn if mouse is below slider 1990 * move dn if mouse is below slider
1982 * 1991 *
… …
2021 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY); 2030 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2022#endif 2031#endif
2023 if (scr_page (direction, 1)) 2032 if (scr_page (direction, 1))
2024 { 2033 {
2025 if (direction == UP) 2034 if (direction == UP)
2026 scrollBar.state = STATE_UP; 2035 scrollBar.state = SB_STATE_UP;
2027 else 2036 else
2028 scrollBar.state = STATE_DOWN; 2037 scrollBar.state = SB_STATE_DOWN;
2029 } 2038 }
2030 } 2039 }
2031 else 2040 else
2032 switch (ev.button) 2041 switch (ev.button)
2033 { 2042 {
2034 case Button2: 2043 case Button2:
2035 switch (scrollBar.align) 2044 switch (scrollBar.align)
2036 { 2045 {
2037 case R_SB_ALIGN_TOP: 2046 case SB_ALIGN_TOP:
2038 csrO = 0; 2047 csrO = 0;
2039 break; 2048 break;
2040 case R_SB_ALIGN_CENTRE: 2049 case SB_ALIGN_CENTRE:
2041 csrO = (scrollBar.bot - scrollBar.top) / 2; 2050 csrO = (scrollBar.bot - scrollBar.top) / 2;
2042 break; 2051 break;
2043 case R_SB_ALIGN_BOTTOM: 2052 case SB_ALIGN_BOTTOM:
2044 csrO = scrollBar.bot - scrollBar.top; 2053 csrO = scrollBar.bot - scrollBar.top;
2045 break; 2054 break;
2046 } 2055 }
2047 2056
2048 if (scrollBar.style == R_SB_XTERM 2057 if (scrollBar.style == SB_STYLE_XTERM
2049 || scrollBar.above_slider (ev.y) 2058 || scrollBar.above_slider (ev.y)
2050 || scrollBar.below_slider (ev.y)) 2059 || scrollBar.below_slider (ev.y))
2051 scr_move_to (scrollBar.position (ev.y) - csrO, scrollBar.size ()); 2060 scr_move_to (scrollBar.position (ev.y) - csrO, scrollBar.size ());
2052 2061
2053 scrollBar.state = STATE_MOTION; 2062 scrollBar.state = SB_STATE_MOTION;
2054 break; 2063 break;
2055 2064
2056 case Button1: 2065 case Button1:
2057 if (scrollBar.align == R_SB_ALIGN_CENTRE) 2066 if (scrollBar.align == SB_ALIGN_CENTRE)
2058 csrO = ev.y - scrollBar.top; 2067 csrO = ev.y - scrollBar.top;
2059 /* FALLTHROUGH */ 2068 /* FALLTHROUGH */
2060 2069
2061 case Button3: 2070 case Button3:
2062 if (scrollBar.style != R_SB_XTERM) 2071 if (scrollBar.style != SB_STYLE_XTERM)
2063 { 2072 {
2064 if (scrollBar.above_slider (ev.y)) 2073 if (scrollBar.above_slider (ev.y))
2065# ifdef RXVT_SCROLL_FULL 2074# ifdef RXVT_SCROLL_FULL
2066 scr_page (UP, nrow - 1); 2075 scr_page (UP, nrow - 1);
2067# else 2076# else
… …
2072 scr_page (DN, nrow - 1); 2081 scr_page (DN, nrow - 1);
2073# else 2082# else
2074 scr_page (DN, nrow / 4); 2083 scr_page (DN, nrow / 4);
2075# endif 2084# endif
2076 else 2085 else
2077 scrollBar.state = STATE_MOTION; 2086 scrollBar.state = SB_STATE_MOTION;
2078 } 2087 }
2079 else 2088 else
2080 { 2089 {
2081 scr_page ((ev.button == Button1 ? DN : UP), 2090 scr_page ((ev.button == Button1 ? DN : UP),
2082 (nrow 2091 (nrow
… …
2099 2108
2100 csrO = 0; /* reset csr Offset */ 2109 csrO = 0; /* reset csr Offset */
2101 if (!bypass_keystate) 2110 if (!bypass_keystate)
2102 reportmode = !! (priv_modes & PrivMode_mouse_report); 2111 reportmode = !! (priv_modes & PrivMode_mouse_report);
2103 2112
2104 if (scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN) 2113 if (scrollBar.state == SB_STATE_UP || scrollBar.state == SB_STATE_DOWN)
2105 { 2114 {
2106 scrollBar.state = STATE_IDLE; 2115 scrollBar.state = SB_STATE_IDLE;
2107 scrollBar.show (0); 2116 scrollBar.show (0);
2108 } 2117 }
2109 2118
2110#ifdef SELECTION_SCROLLING 2119#ifdef SELECTION_SCROLLING
2111 sel_scroll_ev.stop(); 2120 sel_scroll_ev.stop();
… …
2161 case Button3: 2170 case Button3:
2162 selection_make (ev.time); 2171 selection_make (ev.time);
2163 break; 2172 break;
2164 2173
2165 case Button2: 2174 case Button2:
2166 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window? 2175 if (IN_RANGE_EXC (ev.x, 0, vt_width) && IN_RANGE_EXC (ev.y, 0, vt_height)) // inside window?
2167 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary); 2176 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2168 break; 2177 break;
2169 2178
2170#ifdef MOUSE_WHEEL 2179#ifdef MOUSE_WHEEL
2171 case Button4: 2180 case Button4:
… …
2590 break; 2599 break;
2591 case 'Z': /* identify the terminal type */ 2600 case 'Z': /* identify the terminal type */
2592 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */ 2601 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */
2593 break; 2602 break;
2594 case '<': /* turn off VT52 mode */ 2603 case '<': /* turn off VT52 mode */
2595 set_privmode (PrivMode_vt52, 0); 2604 priv_modes &= ~PrivMode_vt52;
2596 break; 2605 break;
2597 case 'F': /* use special graphics character set */ 2606 case 'F': /* use special graphics character set */
2598 case 'G': /* use regular character set */ 2607 case 'G': /* use regular character set */
2599 /* unimplemented */ 2608 /* unimplemented */
2600 break; 2609 break;
… …
2653 scr_forwardindex (); 2662 scr_forwardindex ();
2654 break; 2663 break;
2655#endif 2664#endif
2656 // DECPAM/DECPNM 2665 // DECPAM/DECPNM
2657 case '=': 2666 case '=':
2667 priv_modes |= PrivMode_aplKP;
2668 break;
2658 case '>': 2669 case '>':
2659 set_privmode (PrivMode_aplKP, ch == '='); 2670 priv_modes &= ~PrivMode_aplKP;
2660 break; 2671 break;
2661 2672
2662 case C1_40: 2673 case C1_40:
2663 cmd_getc (); 2674 cmd_getc ();
2664 break; 2675 break;
… …
2883 } 2894 }
2884 break; 2895 break;
2885#endif 2896#endif
2886 2897
2887 case CSI_CUU: /* 8.3.22: (1) CURSOR UP */ 2898 case CSI_CUU: /* 8.3.22: (1) CURSOR UP */
2888 case CSI_VPR: /* 8.3.161: (1) LINE POSITION FORWARD */ 2899 case CSI_VPB: /* 8.3.160: (1) LINE POSITION BACKWARD */
2889 arg[0] = -arg[0]; 2900 arg[0] = -arg[0];
2890 /* FALLTHROUGH */ 2901 /* FALLTHROUGH */
2891 case CSI_CUD: /* 8.3.19: (1) CURSOR DOWN */ 2902 case CSI_CUD: /* 8.3.19: (1) CURSOR DOWN */
2892 case CSI_VPB: /* 8.3.160: (1) LINE POSITION BACKWARD */ 2903 case CSI_VPR: /* 8.3.161: (1) LINE POSITION FORWARD */
2893 scr_gotorc (arg[0], 0, RELATIVE); 2904 scr_gotorc (arg[0], 0, RELATIVE);
2894 break; 2905 break;
2895 2906
2896 case CSI_CUB: /* 8.3.18: (1) CURSOR LEFT */ 2907 case CSI_CUB: /* 8.3.18: (1) CURSOR LEFT */
2897 case CSI_HPB: /* 8.3.59: (1) CHARACTER POSITION BACKWARD */ 2908 case CSI_HPB: /* 8.3.59: (1) CHARACTER POSITION BACKWARD */
… …
3130 break; 3141 break;
3131 3142
3132 //case 9: NYI, TODO, restore maximized window or maximize window 3143 //case 9: NYI, TODO, restore maximized window or maximize window
3133 default: 3144 default:
3134 if (args[0] >= 24) /* set height (chars) */ 3145 if (args[0] >= 24) /* set height (chars) */
3135 set_widthheight ((unsigned int)width, 3146 set_widthheight ((unsigned int)vt_width,
3136 (unsigned int) (args[1] * fheight)); 3147 (unsigned int) (args[1] * fheight));
3137 break; 3148 break;
3138 3149
3139 /* 3150 /*
3140 * reports - some output format copied from XTerm 3151 * reports - some output format copied from XTerm
… …
3442 if (!strcmp (str, "?")) 3453 if (!strcmp (str, "?"))
3443 { 3454 {
3444 char str[256]; 3455 char str[256];
3445 3456
3446 sprintf (str, "[%dx%d+%d+%d]", 3457 sprintf (str, "[%dx%d+%d+%d]",
3447 min (h_scale, 32767), min (v_scale, 32767), 3458 min (bg_image.h_scale, 32767), min (bg_image.v_scale, 32767),
3448 min (h_align, 32767), min (v_align, 32767)); 3459 min (bg_image.h_align, 32767), min (bg_image.v_align, 32767));
3449 process_xterm_seq (XTerm_title, str, CHAR_ST); 3460 process_xterm_seq (XTerm_title, str, CHAR_ST);
3450 } 3461 }
3451 else 3462 else
3452 { 3463 {
3453 bool changed = false; 3464 bool changed = false;
3454 3465
3455 if (*str != ';') 3466 if (*str != ';')
3456 { 3467 {
3457 if (bg_set_file (str)) /* change pixmap */ 3468 if (bg_image.set_file (str)) /* change pixmap */
3458 changed = true; 3469 changed = true;
3459 } 3470 }
3460 else 3471 else
3461 { 3472 {
3462 str++; 3473 str++;
3463 if (bg_set_geometry (str, true)) 3474 if (bg_image.set_geometry (str, true))
3464 changed = true; 3475 changed = true;
3465 } 3476 }
3466 3477
3467 if (changed) 3478 if (changed)
3468 { 3479 {
… …
3575{ 3586{
3576 int state; 3587 int state;
3577 3588
3578 if (mode == 's') 3589 if (mode == 's')
3579 { 3590 {
3580 SavedModes |= (priv_modes & bit); 3591 if (priv_modes & bit)
3592 SavedModes |= bit;
3593 else
3594 SavedModes &= ~bit;
3581 return -1; 3595 return -1;
3582 } 3596 }
3583 else 3597 else
3584 { 3598 {
3585 if (mode == 'r') 3599 if (mode == 'r')
3586 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 3600 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3587 else 3601 else
3588 state = (mode == 't') ? ! (priv_modes & bit) : mode; 3602 state = (mode == 't') ? ! (priv_modes & bit) : mode;
3589 3603
3590 set_privmode (bit, state); 3604 if (state)
3605 priv_modes |= bit;
3606 else
3607 priv_modes &= ~bit;
3591 } 3608 }
3592 3609
3593 return state; 3610 return state;
3594} 3611}
3595 3612
… …
3700 case 2: /* VT52 mode */ 3717 case 2: /* VT52 mode */
3701 /* oddball mode. should be set regardless of set/reset 3718 /* oddball mode. should be set regardless of set/reset
3702 * parameter. Return from VT52 mode with an ESC < from 3719 * parameter. Return from VT52 mode with an ESC < from
3703 * within VT52 mode 3720 * within VT52 mode
3704 */ 3721 */
3705 set_privmode (PrivMode_vt52, 1); 3722 priv_modes |= PrivMode_vt52;
3706 break; 3723 break;
3707 case 3: /* 80/132 */ 3724 case 3: /* 80/132 */
3708 if (priv_modes & PrivMode_132OK) 3725 if (priv_modes & PrivMode_132OK)
3709 set_widthheight ((state ? 132 : 80) * fwidth, 24 * fheight); 3726 set_widthheight ((state ? 132 : 80) * fwidth, 24 * fheight);
3710 break; 3727 break;
… …
3725 if (state) /* orthogonal */ 3742 if (state) /* orthogonal */
3726 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent); 3743 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
3727 break; 3744 break;
3728#ifdef scrollBar_esc 3745#ifdef scrollBar_esc
3729 case scrollBar_esc: 3746 case scrollBar_esc:
3730 if (scrollBar.map (state)) 3747 scrollBar.map (state);
3731 {
3732 resize_all_windows (0, 0, 0); 3748 resize_all_windows (0, 0, 0);
3733 scr_touch (true); 3749 scr_touch (true);
3734 }
3735 break; 3750 break;
3736#endif 3751#endif
3737 case 25: /* visible/invisible cursor */ 3752 case 25: /* visible/invisible cursor */
3738 scr_cursor_visible (state); 3753 scr_cursor_visible (state);
3739 break; 3754 break;

Diff Legend

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