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.240 by root, Fri Jan 6 03:40:19 2006 UTC vs.
Revision 1.249 by root, Sun Jan 8 01:02:15 2006 UTC

… …
25 * - extensive modifications 25 * - extensive modifications
26 * Copyright (c) 1998 Alfredo K. Kojima <kojima@windowmaker.org> 26 * Copyright (c) 1998 Alfredo K. Kojima <kojima@windowmaker.org>
27 * Copyright (c) 2001 Marius Gedminas 27 * Copyright (c) 2001 Marius Gedminas
28 * - Ctrl/Mod4+Tab works like Meta+Tab (options) 28 * - Ctrl/Mod4+Tab works like Meta+Tab (options)
29 * Copyright (c) 2003 Rob McMullen <robm@flipturn.org> 29 * Copyright (c) 2003 Rob McMullen <robm@flipturn.org>
30 * Copyright (c) 2003-2005 Marc Lehmann <pcg@goof.com> 30 * Copyright (c) 2003-2006 Marc Lehmann <pcg@goof.com>
31 * 31 *
32 * This program is free software; you can redistribute it and/or modify 32 * This program is free software; you can redistribute it and/or modify
33 * it under the terms of the GNU General Public License as published by 33 * it under the terms of the GNU General Public License as published by
34 * the Free Software Foundation; either version 2 of the License, or 34 * the Free Software Foundation; either version 2 of the License, or
35 * (at your option) any later version. 35 * (at your option) any later version.
… …
867#endif 867#endif
868 /* nil */ ; 868 /* nil */ ;
869 } 869 }
870 } 870 }
871 871
872 if (HOOK_INVOKE ((this, HOOK_KEY_PRESS, DT_XEVENT, &ev, DT_STRING_LEN, kbuf, len, DT_END))) 872 if (HOOK_INVOKE ((this, HOOK_KEY_PRESS, DT_XEVENT, &ev, DT_STR_LEN, kbuf, len, DT_END)))
873 return; 873 return;
874 874
875 if (len <= 0) 875 if (len <= 0)
876 return; /* not mapped */ 876 return; /* not mapped */
877 877
… …
1205 1205
1206#ifdef POINTER_BLANK 1206#ifdef POINTER_BLANK
1207void 1207void
1208rxvt_term::pointer_blank () 1208rxvt_term::pointer_blank ()
1209{ 1209{
1210 if (! OPTION (Opt_pointerBlank)) 1210 if (!OPTION (Opt_pointerBlank))
1211 return; 1211 return;
1212 1212
1213 XDefineCursor (display->display, vt, display->blank_cursor); 1213 XDefineCursor (display->display, vt, display->blank_cursor);
1214 XFlush (display->display); 1214 XFlush (display->display);
1215 1215
… …
1311{ 1311{
1312 dDisp; 1312 dDisp;
1313 1313
1314 SET_R (this); 1314 SET_R (this);
1315 SET_LOCALE (locale); 1315 SET_LOCALE (locale);
1316
1317#if defined(CURSOR_BLINK)
1318 if (OPTION (Opt_cursorBlink) && ev.type == KeyPress)
1319 {
1320 if (hidden_cursor)
1321 {
1322 hidden_cursor = 0;
1323 want_refresh = 1;
1324 }
1325
1326 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1327 }
1328#endif
1329
1330#if defined(POINTER_BLANK)
1331 if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0)
1332 {
1333 if (ev.type == MotionNotify
1334 || ev.type == ButtonPress
1335 || ev.type == ButtonRelease)
1336 if (hidden_pointer)
1337 pointer_unblank ();
1338
1339 if (ev.type == KeyPress && hidden_pointer == 0)
1340 pointer_blank ();
1341 }
1342#endif
1343 1316
1344 Window unused_root, unused_child; 1317 Window unused_root, unused_child;
1345 int unused_root_x, unused_root_y; 1318 int unused_root_x, unused_root_y;
1346 unsigned int unused_mask; 1319 unsigned int unused_mask;
1347 1320
… …
1378 && ((ks >= 0x40 && ks <= 0x5f) 1351 && ((ks >= 0x40 && ks <= 0x5f)
1379 || (ks >= 0x61 && ks <= 0x7f))) 1352 || (ks >= 0x61 && ks <= 0x7f)))
1380 { 1353 {
1381 iso14755buf = ISO_14755_51 | 0x2400 | (ks & 0x1f); 1354 iso14755buf = ISO_14755_51 | 0x2400 | (ks & 0x1f);
1382 commit_iso14755 (); 1355 commit_iso14755 ();
1383 return; // case-break; 1356 goto skip_switch;
1384 } 1357 }
1385 1358
1386 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2) 1359 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
1387 if (i[0] == ks) 1360 if (i[0] == ks)
1388 { 1361 {
1389 iso14755buf = ISO_14755_51 | i[1]; 1362 iso14755buf = ISO_14755_51 | i[1];
1390 commit_iso14755 (); 1363 commit_iso14755 ();
1391 return; // case-break; 1364 goto skip_switch;
1392 } 1365 }
1393 1366
1394 scr_bell (); 1367 scr_bell ();
1395# endif 1368# endif
1396 iso14755buf = 0; 1369 iso14755buf = 0;
… …
1414# endif 1387# endif
1415 else 1388 else
1416 iso14755buf = 0; 1389 iso14755buf = 0;
1417 } 1390 }
1418#endif 1391#endif
1392
1393 if (ev.xany.window == vt
1394 && HOOK_INVOKE ((this, HOOK_KEY_RELEASE, DT_XEVENT, &ev, DT_END)))
1395 break;
1419 1396
1420#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1397#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1421 if (!(ev.xkey.state & ControlMask)) 1398 if (!(ev.xkey.state & ControlMask))
1422 slip_wheel_ev.stop (); 1399 slip_wheel_ev.stop ();
1423 else if (ks == XK_Control_L || ks == XK_Control_R) 1400 else if (ks == XK_Control_L || ks == XK_Control_R)
… …
1558 1535
1559 case SelectionRequest: 1536 case SelectionRequest:
1560 selection_send (ev.xselectionrequest); 1537 selection_send (ev.xselectionrequest);
1561 break; 1538 break;
1562 1539
1540 case MapNotify:
1541 mapped = 1;
1542#ifdef TEXT_BLINK
1543 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1544#endif
1545 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1546 break;
1547
1563 case UnmapNotify: 1548 case UnmapNotify:
1564 mapped = 0; 1549 mapped = 0;
1565#ifdef TEXT_BLINK 1550#ifdef TEXT_BLINK
1566 text_blink_ev.stop (); 1551 text_blink_ev.stop ();
1567#endif 1552#endif
1568 break; 1553 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1569
1570 case MapNotify:
1571 mapped = 1;
1572#ifdef TEXT_BLINK
1573 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1574#endif
1575 break; 1554 break;
1576 1555
1577#ifdef TRANSPARENT 1556#ifdef TRANSPARENT
1578 case ReparentNotify: 1557 case ReparentNotify:
1579 rootwin_cb (ev); 1558 rootwin_cb (ev);
… …
1736 refresh_limit = 0; 1715 refresh_limit = 0;
1737 scrollbar_show (1); 1716 scrollbar_show (1);
1738 } 1717 }
1739 break; 1718 break;
1740 } 1719 }
1720
1721skip_switch: ;
1722
1723#if defined(CURSOR_BLINK)
1724 if (OPTION (Opt_cursorBlink) && ev.type == KeyPress)
1725 {
1726 if (hidden_cursor)
1727 {
1728 hidden_cursor = 0;
1729 want_refresh = 1;
1730 }
1731
1732 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1733 }
1734#endif
1735
1736#if defined(POINTER_BLANK)
1737 if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0)
1738 {
1739 if (ev.type == MotionNotify
1740 || ev.type == ButtonPress
1741 || ev.type == ButtonRelease)
1742 if (hidden_pointer)
1743 pointer_unblank ();
1744
1745 if (ev.type == KeyPress && hidden_pointer == 0)
1746 pointer_blank ();
1747 }
1748#endif
1741} 1749}
1742 1750
1743void 1751void
1744rxvt_term::focus_in () 1752rxvt_term::focus_in ()
1745{ 1753{
… …
1870#ifdef MOUSE_REPORT_DOUBLECLICK 1878#ifdef MOUSE_REPORT_DOUBLECLICK
1871 if (ev.button == MEvent.button && clickintime) 1879 if (ev.button == MEvent.button && clickintime)
1872 { 1880 {
1873 /* same button, within alloted time */ 1881 /* same button, within alloted time */
1874 MEvent.clicks++; 1882 MEvent.clicks++;
1883
1875 if (MEvent.clicks > 1) 1884 if (MEvent.clicks > 1)
1876 { 1885 {
1877 /* only report double clicks */ 1886 /* only report double clicks */
1878 MEvent.clicks = 2; 1887 MEvent.clicks = 2;
1879 mouse_report (ev); 1888 mouse_report (ev);
… …
2087 } 2096 }
2088 2097
2089 break; 2098 break;
2090 } 2099 }
2091 } 2100 }
2101
2092 return; 2102 return;
2093 } 2103 }
2104
2094#if MENUBAR 2105#if MENUBAR
2095 /* 2106 /*
2096 * Menubar window processing of button press 2107 * Menubar window processing of button press
2097 */ 2108 */
2098 if (isMenuBarWindow (ev.window)) 2109 if (isMenuBarWindow (ev.window))
… …
2161 if (priv_modes & PrivMode_mouse_report 2172 if (priv_modes & PrivMode_mouse_report
2162 && bypass_keystate 2173 && bypass_keystate
2163 && ev.button == Button1 && MEvent.clicks <= 1) 2174 && ev.button == Button1 && MEvent.clicks <= 1)
2164 selection_extend (ev.x, ev.y, 0); 2175 selection_extend (ev.x, ev.y, 0);
2165 2176
2166 if (!HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END))) 2177 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2167 return; 2178 return;
2168 2179
2169 switch (ev.button) 2180 switch (ev.button)
2170 { 2181 {
2171 case Button1: 2182 case Button1:
… …
2717 2728
2718bool 2729bool
2719rxvt_term::cmd_parse () 2730rxvt_term::cmd_parse ()
2720{ 2731{
2721 bool flag = false; 2732 bool flag = false;
2722 unicode_t ch = NOCHAR; 2733 wchar_t ch = NOCHAR;
2723 char *seq_begin; // remember start of esc-sequence here 2734 char *seq_begin; // remember start of esc-sequence here
2724 2735
2725 for (;;) 2736 for (;;)
2726 { 2737 {
2727 if (ch == NOCHAR) 2738 if (ch == NOCHAR)
… …
2748 if (seen_resize && cmd_pid) 2759 if (seen_resize && cmd_pid)
2749 kill (-cmd_pid, SIGWINCH); 2760 kill (-cmd_pid, SIGWINCH);
2750 } 2761 }
2751 2762
2752 /* Read a text string from the input buffer */ 2763 /* Read a text string from the input buffer */
2753 unicode_t buf[UBUFSIZ]; 2764 wchar_t buf[UBUFSIZ];
2754 bool refreshnow = false; 2765 bool refreshnow = false;
2755 int nlines = 0; 2766 int nlines = 0;
2756 unicode_t *str = buf; 2767 wchar_t *str = buf;
2757 unicode_t *eol = str + min (ncol, UBUFSIZ); 2768 wchar_t *eol = str + min (ncol, UBUFSIZ);
2758 2769
2759 for (;;) 2770 for (;;)
2760 { 2771 {
2761 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)) 2772 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))
2762 break; 2773 break;
… …
2780 } 2791 }
2781 2792
2782 // scr_add_lines only works for nlines <= nrow - 1. 2793 // scr_add_lines only works for nlines <= nrow - 1.
2783 if (nlines >= nrow - 1) 2794 if (nlines >= nrow - 1)
2784 { 2795 {
2785 if (!HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_USTRING_LEN, buf, str - buf, DT_END))) 2796 if (!HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END)))
2786 scr_add_lines (buf, nlines, str - buf); 2797 scr_add_lines (buf, str - buf, nlines);
2787 2798
2788 nlines = 0; 2799 nlines = 0;
2789 str = buf; 2800 str = buf;
2790 eol = str + min (ncol, UBUFSIZ); 2801 eol = str + min (ncol, UBUFSIZ);
2791 } 2802 }
… …
2805 2816
2806 seq_begin = cmdbuf_ptr; 2817 seq_begin = cmdbuf_ptr;
2807 ch = next_char (); 2818 ch = next_char ();
2808 } 2819 }
2809 2820
2810 if (!HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_USTRING_LEN, buf, str - buf, DT_END))) 2821 if (!HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END)))
2811 scr_add_lines (buf, nlines, str - buf); 2822 scr_add_lines (buf, str - buf, nlines);
2812 2823
2813 /* 2824 /*
2814 * If there have been a lot of new lines, then update the screen 2825 * If there have been a lot of new lines, then update the screen
2815 * What the heck I'll cheat and only refresh less than every page-full. 2826 * What the heck I'll cheat and only refresh less than every page-full.
2816 * the number of pages between refreshes is refresh_limit, which 2827 * the number of pages between refreshes is refresh_limit, which
… …
2847 } 2858 }
2848 2859
2849 return flag; 2860 return flag;
2850} 2861}
2851 2862
2852// read the next octet
2853unicode_t
2854rxvt_term::next_octet ()
2855{
2856 return cmdbuf_ptr < cmdbuf_endp
2857 ? *cmdbuf_ptr++
2858 : NOCHAR;
2859}
2860
2861// read the next character 2863// read the next character
2862unicode_t 2864wchar_t
2863rxvt_term::next_char () 2865rxvt_term::next_char ()
2864{ 2866{
2865 while (cmdbuf_ptr < cmdbuf_endp) 2867 while (cmdbuf_ptr < cmdbuf_endp)
2866 { 2868 {
2867 // assume 7-bit to be ascii ALWAYS 2869 // assume 7-bit to be ascii ALWAYS
… …
2877 cmdbuf_ptr = cmdbuf_endp; 2879 cmdbuf_ptr = cmdbuf_endp;
2878 break; 2880 break;
2879 } 2881 }
2880 2882
2881 if (len == (size_t)-1) 2883 if (len == (size_t)-1)
2882 return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 2884 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2883 2885
2884 // assume wchar == unicode 2886 // assume wchar == unicode
2885 cmdbuf_ptr += len; 2887 cmdbuf_ptr += len;
2886 return wc & UNICODE_MASK; 2888 return wc & UNICODE_MASK;
2887 } 2889 }
2888 2890
2889 return NOCHAR; 2891 return NOCHAR;
2892}
2893
2894// read the next octet
2895uint32_t
2896rxvt_term::next_octet ()
2897{
2898 return cmdbuf_ptr < cmdbuf_endp
2899 ? (unsigned char)*cmdbuf_ptr++
2900 : NOCHAR;
2890} 2901}
2891 2902
2892/* rxvt_cmd_getc () - Return next input character */ 2903/* rxvt_cmd_getc () - Return next input character */
2893/* 2904/*
2894 * Return the next input character after first passing any keyboard input 2905 * Return the next input character after first passing any keyboard input
2895 * to the command. 2906 * to the command.
2896 */ 2907 */
2897unicode_t 2908wchar_t
2898rxvt_term::cmd_getc () 2909rxvt_term::cmd_getc ()
2899{ 2910{
2900 unicode_t c = next_char (); 2911 wchar_t c = next_char ();
2901 2912
2902 if (c == NOCHAR) 2913 if (c == NOCHAR)
2903 throw out_of_input; 2914 throw out_of_input;
2904 2915
2905 return c; 2916 return c;
2906} 2917}
2907 2918
2908unicode_t 2919uint32_t
2909rxvt_term::cmd_get8 () 2920rxvt_term::cmd_get8 ()
2910{ 2921{
2911 unicode_t c = next_octet (); 2922 uint32_t c = next_octet ();
2912 2923
2913 if (c == NOCHAR) 2924 if (c == NOCHAR)
2914 throw out_of_input; 2925 throw out_of_input;
2915 2926
2916 return c; 2927 return c;
… …
3183 break; 3194 break;
3184 3195
3185 /* 8.3.87: NEXT LINE */ 3196 /* 8.3.87: NEXT LINE */
3186 case C1_NEL: /* ESC E */ 3197 case C1_NEL: /* ESC E */
3187 { 3198 {
3188 unicode_t nlcr[] = { C0_LF, C0_CR }; 3199 wchar_t nlcr[] = { C0_LF, C0_CR };
3189 scr_add_lines (nlcr, 1, 2); 3200 scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1);
3190 } 3201 }
3191 break; 3202 break;
3192 3203
3193 /* kidnapped escape sequence: Should be 8.3.48 */ 3204 /* kidnapped escape sequence: Should be 8.3.48 */
3194 case C1_ESA: /* ESC G */ 3205 case C1_ESA: /* ESC G */
… …
4022 break; 4033 break;
4023#endif 4034#endif
4024 4035
4025#if ENABLE_PERL 4036#if ENABLE_PERL
4026 case URxvt_perl: 4037 case URxvt_perl:
4027 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_STRING, str, DT_END))) 4038 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_STR, str, DT_END)))
4028 ; // no responses yet 4039 ; // no responses yet
4029 break; 4040 break;
4030#endif 4041#endif
4031 } 4042 }
4032} 4043}
… …
4144 /* extra handling for values with state unkept */ 4155 /* extra handling for values with state unkept */
4145 switch (arg[i]) 4156 switch (arg[i])
4146 { 4157 {
4147#if ENABLE_STYLES 4158#if ENABLE_STYLES
4148 case 1021: 4159 case 1021:
4149 if (mode) 4160 set_option (Opt_intensityStyles, mode);
4150 SET_OPTION (Opt_intensityStyles);
4151 else
4152 CLR_OPTION (Opt_intensityStyles);
4153 4161
4154 scr_touch (true); 4162 scr_touch (true);
4155 break; 4163 break;
4156#endif 4164#endif
4157 case 1048: /* alternative cursor save */ 4165 case 1048: /* alternative cursor save */
… …
4179 case 3: /* 80/132 */ 4187 case 3: /* 80/132 */
4180 if (priv_modes & PrivMode_132OK) 4188 if (priv_modes & PrivMode_132OK)
4181 set_widthheight (((state ? 132 : 80) * fwidth), height); 4189 set_widthheight (((state ? 132 : 80) * fwidth), height);
4182 break; 4190 break;
4183 case 4: /* smooth scrolling */ 4191 case 4: /* smooth scrolling */
4184 if (!state) 4192 set_option (Opt_jumpScroll, !state);
4185 SET_OPTION (Opt_jumpScroll);
4186 else
4187 CLR_OPTION (Opt_jumpScroll);
4188 break; 4193 break;
4189 case 5: /* reverse video */ 4194 case 5: /* reverse video */
4190 scr_rvideo_mode (state); 4195 scr_rvideo_mode (state);
4191 break; 4196 break;
4192 case 6: /* relative/absolute origins */ 4197 case 6: /* relative/absolute origins */
… …
4233#if 0 4238#if 0
4234 case 1001: 4239 case 1001:
4235 break; /* X11 mouse highlighting */ 4240 break; /* X11 mouse highlighting */
4236#endif 4241#endif
4237 case 1010: /* scroll to bottom on TTY output inhibit */ 4242 case 1010: /* scroll to bottom on TTY output inhibit */
4238 if (!state) 4243 set_option (Opt_scrollTtyOutput, !state);
4239 SET_OPTION (Opt_scrollTtyOutput);
4240 else
4241 CLR_OPTION (Opt_scrollTtyOutput);
4242 break; 4244 break;
4243 case 1011: /* scroll to bottom on key press */ 4245 case 1011: /* scroll to bottom on key press */
4244 if (state) 4246 set_option (Opt_scrollTtyKeypress, state);
4245 SET_OPTION (Opt_scrollTtyKeypress);
4246 else
4247 CLR_OPTION (Opt_scrollTtyKeypress);
4248 break; 4247 break;
4249 case 1047: /* secondary screen w/ clearing last */ 4248 case 1047: /* secondary screen w/ clearing last */
4250 if (OPTION (Opt_secondaryScreen)) 4249 if (OPTION (Opt_secondaryScreen))
4251 if (current_screen != PRIMARY) 4250 if (current_screen != PRIMARY)
4252 scr_erase_screen (2); 4251 scr_erase_screen (2);

Diff Legend

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