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.498 by sf-exg, Fri Sep 30 13:31:21 2011 UTC vs.
Revision 1.511 by sf-exg, Fri May 25 18:45:40 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
… …
1014 refresh_count = 0; 1015 refresh_count = 0;
1015 flush (); 1016 flush ();
1016} 1017}
1017 1018
1018#ifdef CURSOR_BLINK 1019#ifdef CURSOR_BLINK
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
1019void 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;
… …
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;
… …
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 {
… …
2162 case Button3: 2170 case Button3:
2163 selection_make (ev.time); 2171 selection_make (ev.time);
2164 break; 2172 break;
2165 2173
2166 case Button2: 2174 case Button2:
2167 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?
2168 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary); 2176 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2169 break; 2177 break;
2170 2178
2171#ifdef MOUSE_WHEEL 2179#ifdef MOUSE_WHEEL
2172 case Button4: 2180 case Button4:
… …
2886 } 2894 }
2887 break; 2895 break;
2888#endif 2896#endif
2889 2897
2890 case CSI_CUU: /* 8.3.22: (1) CURSOR UP */ 2898 case CSI_CUU: /* 8.3.22: (1) CURSOR UP */
2891 case CSI_VPR: /* 8.3.161: (1) LINE POSITION FORWARD */ 2899 case CSI_VPB: /* 8.3.160: (1) LINE POSITION BACKWARD */
2892 arg[0] = -arg[0]; 2900 arg[0] = -arg[0];
2893 /* FALLTHROUGH */ 2901 /* FALLTHROUGH */
2894 case CSI_CUD: /* 8.3.19: (1) CURSOR DOWN */ 2902 case CSI_CUD: /* 8.3.19: (1) CURSOR DOWN */
2895 case CSI_VPB: /* 8.3.160: (1) LINE POSITION BACKWARD */ 2903 case CSI_VPR: /* 8.3.161: (1) LINE POSITION FORWARD */
2896 scr_gotorc (arg[0], 0, RELATIVE); 2904 scr_gotorc (arg[0], 0, RELATIVE);
2897 break; 2905 break;
2898 2906
2899 case CSI_CUB: /* 8.3.18: (1) CURSOR LEFT */ 2907 case CSI_CUB: /* 8.3.18: (1) CURSOR LEFT */
2900 case CSI_HPB: /* 8.3.59: (1) CHARACTER POSITION BACKWARD */ 2908 case CSI_HPB: /* 8.3.59: (1) CHARACTER POSITION BACKWARD */
… …
3133 break; 3141 break;
3134 3142
3135 //case 9: NYI, TODO, restore maximized window or maximize window 3143 //case 9: NYI, TODO, restore maximized window or maximize window
3136 default: 3144 default:
3137 if (args[0] >= 24) /* set height (chars) */ 3145 if (args[0] >= 24) /* set height (chars) */
3138 set_widthheight ((unsigned int)width, 3146 set_widthheight ((unsigned int)vt_width,
3139 (unsigned int) (args[1] * fheight)); 3147 (unsigned int) (args[1] * fheight));
3140 break; 3148 break;
3141 3149
3142 /* 3150 /*
3143 * reports - some output format copied from XTerm 3151 * reports - some output format copied from XTerm
… …
3443#if BG_IMAGE_FROM_FILE 3451#if BG_IMAGE_FROM_FILE
3444 case Rxvt_Pixmap: 3452 case Rxvt_Pixmap:
3445 if (!strcmp (str, "?")) 3453 if (!strcmp (str, "?"))
3446 { 3454 {
3447 char str[256]; 3455 char str[256];
3456 int h_scale = 0, v_scale = 0;
3457 int h_align = 0, v_align = 0;
3458 if (image_vec.size () > 0)
3459 {
3460 h_scale = image_vec[0].h_scale;
3461 v_scale = image_vec[0].v_scale;
3462 h_align = image_vec[0].h_align;
3463 v_align = image_vec[0].v_align;
3464 }
3448 3465
3449 sprintf (str, "[%dx%d+%d+%d]", 3466 sprintf (str, "[%dx%d+%d+%d]",
3450 min (h_scale, 32767), min (v_scale, 32767), 3467 h_scale, v_scale,
3451 min (h_align, 32767), min (v_align, 32767)); 3468 h_align, v_align);
3452 process_xterm_seq (XTerm_title, str, CHAR_ST); 3469 process_xterm_seq (XTerm_title, str, CHAR_ST);
3453 } 3470 }
3454 else 3471 else
3455 { 3472 {
3456 bool changed = false; 3473 bool changed = false;
3457 3474
3458 if (*str != ';') 3475 if (*str != ';')
3459 { 3476 {
3460 if (bg_set_file (str)) /* change pixmap */ 3477 if (image_vec.size () > 0)
3478 changed = image_vec[0].set_file_geometry (str);
3479 else
3480 {
3481 rxvt_image *image = new_image ();
3482 if (!image->set_file_geometry (str))
3483 image_vec.pop_back ();
3484 else
3461 changed = true; 3485 changed = true;
3486 }
3462 } 3487 }
3463 else 3488 else
3464 { 3489 {
3465 str++; 3490 str++;
3491 if (image_vec.size () > 0)
3466 if (bg_set_geometry (str, true)) 3492 changed = image_vec[0].set_geometry (str, true);
3467 changed = true;
3468 } 3493 }
3469 3494
3470 if (changed) 3495 if (changed)
3471 { 3496 {
3472 if (bg_window_position_sensitive ()) 3497 if (bg_window_position_sensitive ())
… …
3578{ 3603{
3579 int state; 3604 int state;
3580 3605
3581 if (mode == 's') 3606 if (mode == 's')
3582 { 3607 {
3583 SavedModes |= (priv_modes & bit); 3608 if (priv_modes & bit)
3609 SavedModes |= bit;
3610 else
3611 SavedModes &= ~bit;
3584 return -1; 3612 return -1;
3585 } 3613 }
3586 else 3614 else
3587 { 3615 {
3588 if (mode == 'r') 3616 if (mode == 'r')

Diff Legend

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