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.490 by sf-exg, Sat Jul 9 18:23:48 2011 UTC vs.
Revision 1.502 by sf-exg, Mon Dec 5 12:52:34 2011 UTC

… …
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
… …
1042 1043
1043#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1044#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1044void 1045void
1045rxvt_term::cont_scroll_cb (ev::timer &w, int revents) 1046rxvt_term::cont_scroll_cb (ev::timer &w, int revents)
1046{ 1047{
1047 if ((scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN) 1048 if ((scrollBar.state == SB_STATE_UP || scrollBar.state == SB_STATE_DOWN)
1048 && scr_page (scrollBar.state == STATE_UP ? UP : DN, 1)) 1049 && scr_page (scrollBar.state == SB_STATE_UP ? UP : DN, 1))
1049 { 1050 {
1050 want_refresh = 1; 1051 want_refresh = 1;
1051 refresh_check (); 1052 refresh_check ();
1052 } 1053 }
1053 else 1054 else
… …
1473 } 1474 }
1474 else 1475 else
1475 { 1476 {
1476#ifdef HAVE_BG_PIXMAP 1477#ifdef HAVE_BG_PIXMAP
1477 if (moved) 1478 if (moved)
1478 {
1479 if (mapped)
1480 update_background (); 1479 update_background ();
1481 else
1482 bg_invalidate ();
1483 }
1484#endif 1480#endif
1485 } 1481 }
1486 1482
1487 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END)); 1483 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1488 } 1484 }
… …
1562 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event)) 1558 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1563 ; 1559 ;
1564 1560
1565 if (scrollBar.state && ev.xany.window == scrollBar.win) 1561 if (scrollBar.state && ev.xany.window == scrollBar.win)
1566 { 1562 {
1567 scrollBar.state = STATE_IDLE; 1563 scrollBar.state = SB_STATE_IDLE;
1568 scrollBar.show (0); 1564 scrollBar.show (0);
1569 } 1565 }
1570 } 1566 }
1571 break; 1567 break;
1572 1568
… …
1660#ifdef MOUSE_THRESHOLD 1656#ifdef MOUSE_THRESHOLD
1661 } 1657 }
1662#endif 1658#endif
1663 } 1659 }
1664 } 1660 }
1665 else if (scrollBar.state == STATE_MOTION && ev.xany.window == scrollBar.win) 1661 else if (scrollBar.state == SB_STATE_MOTION && ev.xany.window == scrollBar.win)
1666 { 1662 {
1667 while (XCheckTypedWindowEvent (dpy, scrollBar.win, 1663 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1668 MotionNotify, &ev)) 1664 MotionNotify, &ev))
1669 ; 1665 ;
1670 1666
1671 XQueryPointer (dpy, scrollBar.win, 1667 XQueryPointer (dpy, scrollBar.win,
1672 &unused_root, &unused_child, 1668 &unused_root, &unused_child,
1673 &unused_root_x, &unused_root_y, 1669 &unused_root_x, &unused_root_y,
1674 &ev.xbutton.x, &ev.xbutton.y, 1670 &ev.xbutton.x, &ev.xbutton.y,
1675 &unused_mask); 1671 &unused_mask);
1676 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1672 scr_move_to (scrollBar.position (ev.xbutton.y) - csrO,
1677 scrollBar.size ()); 1673 scrollBar.size ());
1678 want_refresh = 1; 1674 want_refresh = 1;
1679 scrollBar.show (1); 1675 scrollBar.show (1);
1680 } 1676 }
1681 break; 1677 break;
… …
1713 1709
1714#if ENABLE_FRILLS 1710#if ENABLE_FRILLS
1715void 1711void
1716rxvt_term::set_urgency (bool enable) 1712rxvt_term::set_urgency (bool enable)
1717{ 1713{
1718 if (enable == urgency_hint) 1714 if (!(enable || urgency_hint))
1719 return; 1715 return;
1720 1716
1721 if (XWMHints *h = XGetWMHints (dpy, parent)) 1717 if (XWMHints *h = XGetWMHints (dpy, parent))
1722 { 1718 {
1723 h->flags = h->flags & ~XUrgencyHint | (enable ? XUrgencyHint : 0); 1719 h->flags = h->flags & ~XUrgencyHint | (enable ? XUrgencyHint : 0);
1724 XSetWMHints (dpy, parent, h); 1720 XSetWMHints (dpy, parent, h);
1725 urgency_hint = enable; 1721 urgency_hint = enable;
1722 XFree (h);
1726 } 1723 }
1727} 1724}
1728#endif 1725#endif
1729 1726
1730void 1727void
… …
1977 if (scrollBar.upButton (ev.y)) 1974 if (scrollBar.upButton (ev.y))
1978 direction = UP; /* up */ 1975 direction = UP; /* up */
1979 else if (scrollBar.dnButton (ev.y)) 1976 else if (scrollBar.dnButton (ev.y))
1980 direction = DN; /* down */ 1977 direction = DN; /* down */
1981 1978
1982 scrollBar.state = STATE_IDLE; 1979 scrollBar.state = SB_STATE_IDLE;
1983 /* 1980 /*
1984 * Rxvt-style scrollbar: 1981 * Rxvt-style scrollbar:
1985 * move up if mouse is above slider 1982 * move up if mouse is above slider
1986 * move dn if mouse is below slider 1983 * move dn if mouse is below slider
1987 * 1984 *
… …
2026 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY); 2023 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2027#endif 2024#endif
2028 if (scr_page (direction, 1)) 2025 if (scr_page (direction, 1))
2029 { 2026 {
2030 if (direction == UP) 2027 if (direction == UP)
2031 scrollBar.state = STATE_UP; 2028 scrollBar.state = SB_STATE_UP;
2032 else 2029 else
2033 scrollBar.state = STATE_DOWN; 2030 scrollBar.state = SB_STATE_DOWN;
2034 } 2031 }
2035 } 2032 }
2036 else 2033 else
2037 switch (ev.button) 2034 switch (ev.button)
2038 { 2035 {
2039 case Button2: 2036 case Button2:
2040 switch (scrollBar.align) 2037 switch (scrollBar.align)
2041 { 2038 {
2042 case R_SB_ALIGN_TOP: 2039 case SB_ALIGN_TOP:
2043 csrO = 0; 2040 csrO = 0;
2044 break; 2041 break;
2045 case R_SB_ALIGN_CENTRE: 2042 case SB_ALIGN_CENTRE:
2046 csrO = (scrollBar.bot - scrollBar.top) / 2; 2043 csrO = (scrollBar.bot - scrollBar.top) / 2;
2047 break; 2044 break;
2048 case R_SB_ALIGN_BOTTOM: 2045 case SB_ALIGN_BOTTOM:
2049 csrO = scrollBar.bot - scrollBar.top; 2046 csrO = scrollBar.bot - scrollBar.top;
2050 break; 2047 break;
2051 } 2048 }
2052 2049
2053 if (scrollBar.style == R_SB_XTERM 2050 if (scrollBar.style == SB_STYLE_XTERM
2054 || scrollbar_above_slider (ev.y) 2051 || scrollBar.above_slider (ev.y)
2055 || scrollbar_below_slider (ev.y)) 2052 || scrollBar.below_slider (ev.y))
2056 scr_move_to (scrollbar_position (ev.y) - csrO, scrollBar.size ()); 2053 scr_move_to (scrollBar.position (ev.y) - csrO, scrollBar.size ());
2057 2054
2058 scrollBar.state = STATE_MOTION; 2055 scrollBar.state = SB_STATE_MOTION;
2059 break; 2056 break;
2060 2057
2061 case Button1: 2058 case Button1:
2062 if (scrollBar.align == R_SB_ALIGN_CENTRE) 2059 if (scrollBar.align == SB_ALIGN_CENTRE)
2063 csrO = ev.y - scrollBar.top; 2060 csrO = ev.y - scrollBar.top;
2064 /* FALLTHROUGH */ 2061 /* FALLTHROUGH */
2065 2062
2066 case Button3: 2063 case Button3:
2067 if (scrollBar.style != R_SB_XTERM) 2064 if (scrollBar.style != SB_STYLE_XTERM)
2068 { 2065 {
2069 if (scrollbar_above_slider (ev.y)) 2066 if (scrollBar.above_slider (ev.y))
2070# ifdef RXVT_SCROLL_FULL 2067# ifdef RXVT_SCROLL_FULL
2071 scr_page (UP, nrow - 1); 2068 scr_page (UP, nrow - 1);
2072# else 2069# else
2073 scr_page (UP, nrow / 4); 2070 scr_page (UP, nrow / 4);
2074# endif 2071# endif
2075 else if (scrollbar_below_slider (ev.y)) 2072 else if (scrollBar.below_slider (ev.y))
2076# ifdef RXVT_SCROLL_FULL 2073# ifdef RXVT_SCROLL_FULL
2077 scr_page (DN, nrow - 1); 2074 scr_page (DN, nrow - 1);
2078# else 2075# else
2079 scr_page (DN, nrow / 4); 2076 scr_page (DN, nrow / 4);
2080# endif 2077# endif
2081 else 2078 else
2082 scrollBar.state = STATE_MOTION; 2079 scrollBar.state = SB_STATE_MOTION;
2083 } 2080 }
2084 else 2081 else
2085 { 2082 {
2086 scr_page ((ev.button == Button1 ? DN : UP), 2083 scr_page ((ev.button == Button1 ? DN : UP),
2087 (nrow 2084 (nrow
2088 * scrollbar_position (ev.y) 2085 * scrollBar.position (ev.y)
2089 / scrollBar.size ())); 2086 / scrollBar.size ()));
2090 } 2087 }
2091 2088
2092 break; 2089 break;
2093 } 2090 }
… …
2104 2101
2105 csrO = 0; /* reset csr Offset */ 2102 csrO = 0; /* reset csr Offset */
2106 if (!bypass_keystate) 2103 if (!bypass_keystate)
2107 reportmode = !! (priv_modes & PrivMode_mouse_report); 2104 reportmode = !! (priv_modes & PrivMode_mouse_report);
2108 2105
2109 if (scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN) 2106 if (scrollBar.state == SB_STATE_UP || scrollBar.state == SB_STATE_DOWN)
2110 { 2107 {
2111 scrollBar.state = STATE_IDLE; 2108 scrollBar.state = SB_STATE_IDLE;
2112 scrollBar.show (0); 2109 scrollBar.show (0);
2113 } 2110 }
2114 2111
2115#ifdef SELECTION_SCROLLING 2112#ifdef SELECTION_SCROLLING
2116 sel_scroll_ev.stop(); 2113 sel_scroll_ev.stop();
… …
2595 break; 2592 break;
2596 case 'Z': /* identify the terminal type */ 2593 case 'Z': /* identify the terminal type */
2597 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */ 2594 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */
2598 break; 2595 break;
2599 case '<': /* turn off VT52 mode */ 2596 case '<': /* turn off VT52 mode */
2600 set_privmode (PrivMode_vt52, 0); 2597 priv_modes &= ~PrivMode_vt52;
2601 break; 2598 break;
2602 case 'F': /* use special graphics character set */ 2599 case 'F': /* use special graphics character set */
2603 case 'G': /* use regular character set */ 2600 case 'G': /* use regular character set */
2604 /* unimplemented */ 2601 /* unimplemented */
2605 break; 2602 break;
… …
2658 scr_forwardindex (); 2655 scr_forwardindex ();
2659 break; 2656 break;
2660#endif 2657#endif
2661 // DECPAM/DECPNM 2658 // DECPAM/DECPNM
2662 case '=': 2659 case '=':
2660 priv_modes |= PrivMode_aplKP;
2661 break;
2663 case '>': 2662 case '>':
2664 set_privmode (PrivMode_aplKP, ch == '='); 2663 priv_modes &= ~PrivMode_aplKP;
2665 break; 2664 break;
2666 2665
2667 case C1_40: 2666 case C1_40:
2668 cmd_getc (); 2667 cmd_getc ();
2669 break; 2668 break;
… …
2888 } 2887 }
2889 break; 2888 break;
2890#endif 2889#endif
2891 2890
2892 case CSI_CUU: /* 8.3.22: (1) CURSOR UP */ 2891 case CSI_CUU: /* 8.3.22: (1) CURSOR UP */
2893 case CSI_VPR: /* 8.3.161: (1) LINE POSITION FORWARD */ 2892 case CSI_VPB: /* 8.3.160: (1) LINE POSITION BACKWARD */
2894 arg[0] = -arg[0]; 2893 arg[0] = -arg[0];
2895 /* FALLTHROUGH */ 2894 /* FALLTHROUGH */
2896 case CSI_CUD: /* 8.3.19: (1) CURSOR DOWN */ 2895 case CSI_CUD: /* 8.3.19: (1) CURSOR DOWN */
2897 case CSI_VPB: /* 8.3.160: (1) LINE POSITION BACKWARD */ 2896 case CSI_VPR: /* 8.3.161: (1) LINE POSITION FORWARD */
2898 scr_gotorc (arg[0], 0, RELATIVE); 2897 scr_gotorc (arg[0], 0, RELATIVE);
2899 break; 2898 break;
2900 2899
2901 case CSI_CUB: /* 8.3.18: (1) CURSOR LEFT */ 2900 case CSI_CUB: /* 8.3.18: (1) CURSOR LEFT */
2902 case CSI_HPB: /* 8.3.59: (1) CHARACTER POSITION BACKWARD */ 2901 case CSI_HPB: /* 8.3.59: (1) CHARACTER POSITION BACKWARD */
… …
3453 min (h_align, 32767), min (v_align, 32767)); 3452 min (h_align, 32767), min (v_align, 32767));
3454 process_xterm_seq (XTerm_title, str, CHAR_ST); 3453 process_xterm_seq (XTerm_title, str, CHAR_ST);
3455 } 3454 }
3456 else 3455 else
3457 { 3456 {
3458 int changed = 0; 3457 bool changed = false;
3459 3458
3460 if (*str != ';') 3459 if (*str != ';')
3461 { 3460 {
3462 if (bg_set_file (str)) /* change pixmap */ 3461 if (bg_set_file (str)) /* change pixmap */
3463 {
3464 changed++; 3462 changed = true;
3465 str = strchr (str, ';');
3466 if (str == NULL)
3467 bg_set_default_geometry ();
3468 else
3469 bg_set_geometry (str+1);
3470 }
3471 } 3463 }
3472 else 3464 else
3473 { 3465 {
3474 str++; 3466 str++;
3475 if (bg_set_geometry (str, true)) 3467 if (bg_set_geometry (str, true))
3476 changed++; 3468 changed = true;
3477 } 3469 }
3478 3470
3479 if (changed) 3471 if (changed)
3480 { 3472 {
3481 if (bg_window_position_sensitive ()) 3473 if (bg_window_position_sensitive ())
… …
3597 if (mode == 'r') 3589 if (mode == 'r')
3598 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 3590 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3599 else 3591 else
3600 state = (mode == 't') ? ! (priv_modes & bit) : mode; 3592 state = (mode == 't') ? ! (priv_modes & bit) : mode;
3601 3593
3602 set_privmode (bit, state); 3594 if (state)
3595 priv_modes |= bit;
3596 else
3597 priv_modes &= ~bit;
3603 } 3598 }
3604 3599
3605 return state; 3600 return state;
3606} 3601}
3607 3602
… …
3712 case 2: /* VT52 mode */ 3707 case 2: /* VT52 mode */
3713 /* oddball mode. should be set regardless of set/reset 3708 /* oddball mode. should be set regardless of set/reset
3714 * parameter. Return from VT52 mode with an ESC < from 3709 * parameter. Return from VT52 mode with an ESC < from
3715 * within VT52 mode 3710 * within VT52 mode
3716 */ 3711 */
3717 set_privmode (PrivMode_vt52, 1); 3712 priv_modes |= PrivMode_vt52;
3718 break; 3713 break;
3719 case 3: /* 80/132 */ 3714 case 3: /* 80/132 */
3720 if (priv_modes & PrivMode_132OK) 3715 if (priv_modes & PrivMode_132OK)
3721 set_widthheight ((state ? 132 : 80) * fwidth, 24 * fheight); 3716 set_widthheight ((state ? 132 : 80) * fwidth, 24 * fheight);
3722 break; 3717 break;
… …
3737 if (state) /* orthogonal */ 3732 if (state) /* orthogonal */
3738 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent); 3733 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
3739 break; 3734 break;
3740#ifdef scrollBar_esc 3735#ifdef scrollBar_esc
3741 case scrollBar_esc: 3736 case scrollBar_esc:
3742 if (scrollBar.map (state)) 3737 scrollBar.map (state);
3743 {
3744 resize_all_windows (0, 0, 0); 3738 resize_all_windows (0, 0, 0);
3745 scr_touch (true); 3739 scr_touch (true);
3746 }
3747 break; 3740 break;
3748#endif 3741#endif
3749 case 25: /* visible/invisible cursor */ 3742 case 25: /* visible/invisible cursor */
3750 scr_cursor_visible (state); 3743 scr_cursor_visible (state);
3751 break; 3744 break;

Diff Legend

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