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.239 by root, Fri Jan 6 03:02:22 2006 UTC vs.
Revision 1.248 by root, Sun Jan 8 00:07:18 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_STR_LEN, kbuf, len, DT_END)))
873 return;
874
872 if (len <= 0) 875 if (len <= 0)
873 return; /* not mapped */ 876 return; /* not mapped */
874 877
875 if (OPTION (Opt_scrollTtyKeypress)) 878 if (OPTION (Opt_scrollTtyKeypress))
876 if (view_start) 879 if (view_start)
… …
1202 1205
1203#ifdef POINTER_BLANK 1206#ifdef POINTER_BLANK
1204void 1207void
1205rxvt_term::pointer_blank () 1208rxvt_term::pointer_blank ()
1206{ 1209{
1207 if (! OPTION (Opt_pointerBlank)) 1210 if (!OPTION (Opt_pointerBlank))
1208 return; 1211 return;
1209 1212
1210 XDefineCursor (display->display, vt, display->blank_cursor); 1213 XDefineCursor (display->display, vt, display->blank_cursor);
1211 XFlush (display->display); 1214 XFlush (display->display);
1212 1215
… …
1308{ 1311{
1309 dDisp; 1312 dDisp;
1310 1313
1311 SET_R (this); 1314 SET_R (this);
1312 SET_LOCALE (locale); 1315 SET_LOCALE (locale);
1313
1314#if defined(CURSOR_BLINK)
1315 if (OPTION (Opt_cursorBlink) && ev.type == KeyPress)
1316 {
1317 if (hidden_cursor)
1318 {
1319 hidden_cursor = 0;
1320 want_refresh = 1;
1321 }
1322
1323 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1324 }
1325#endif
1326
1327#if defined(POINTER_BLANK)
1328 if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0)
1329 {
1330 if (ev.type == MotionNotify
1331 || ev.type == ButtonPress
1332 || ev.type == ButtonRelease)
1333 if (hidden_pointer)
1334 pointer_unblank ();
1335
1336 if (ev.type == KeyPress && hidden_pointer == 0)
1337 pointer_blank ();
1338 }
1339#endif
1340 1316
1341 Window unused_root, unused_child; 1317 Window unused_root, unused_child;
1342 int unused_root_x, unused_root_y; 1318 int unused_root_x, unused_root_y;
1343 unsigned int unused_mask; 1319 unsigned int unused_mask;
1344 1320
… …
1375 && ((ks >= 0x40 && ks <= 0x5f) 1351 && ((ks >= 0x40 && ks <= 0x5f)
1376 || (ks >= 0x61 && ks <= 0x7f))) 1352 || (ks >= 0x61 && ks <= 0x7f)))
1377 { 1353 {
1378 iso14755buf = ISO_14755_51 | 0x2400 | (ks & 0x1f); 1354 iso14755buf = ISO_14755_51 | 0x2400 | (ks & 0x1f);
1379 commit_iso14755 (); 1355 commit_iso14755 ();
1380 return; // case-break; 1356 goto skip_switch;
1381 } 1357 }
1382 1358
1383 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2) 1359 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
1384 if (i[0] == ks) 1360 if (i[0] == ks)
1385 { 1361 {
1386 iso14755buf = ISO_14755_51 | i[1]; 1362 iso14755buf = ISO_14755_51 | i[1];
1387 commit_iso14755 (); 1363 commit_iso14755 ();
1388 return; // case-break; 1364 goto skip_switch;
1389 } 1365 }
1390 1366
1391 scr_bell (); 1367 scr_bell ();
1392# endif 1368# endif
1393 iso14755buf = 0; 1369 iso14755buf = 0;
… …
1411# endif 1387# endif
1412 else 1388 else
1413 iso14755buf = 0; 1389 iso14755buf = 0;
1414 } 1390 }
1415#endif 1391#endif
1392
1393 if (ev.xany.window == vt
1394 && HOOK_INVOKE ((this, HOOK_KEY_RELEASE, DT_XEVENT, &ev, DT_END)))
1395 break;
1416 1396
1417#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1397#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1418 if (!(ev.xkey.state & ControlMask)) 1398 if (!(ev.xkey.state & ControlMask))
1419 slip_wheel_ev.stop (); 1399 slip_wheel_ev.stop ();
1420 else if (ks == XK_Control_L || ks == XK_Control_R) 1400 else if (ks == XK_Control_L || ks == XK_Control_R)
… …
1555 1535
1556 case SelectionRequest: 1536 case SelectionRequest:
1557 selection_send (ev.xselectionrequest); 1537 selection_send (ev.xselectionrequest);
1558 break; 1538 break;
1559 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
1560 case UnmapNotify: 1548 case UnmapNotify:
1561 mapped = 0; 1549 mapped = 0;
1562#ifdef TEXT_BLINK 1550#ifdef TEXT_BLINK
1563 text_blink_ev.stop (); 1551 text_blink_ev.stop ();
1564#endif 1552#endif
1565 break; 1553 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1566
1567 case MapNotify:
1568 mapped = 1;
1569#ifdef TEXT_BLINK
1570 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1571#endif
1572 break; 1554 break;
1573 1555
1574#ifdef TRANSPARENT 1556#ifdef TRANSPARENT
1575 case ReparentNotify: 1557 case ReparentNotify:
1576 rootwin_cb (ev); 1558 rootwin_cb (ev);
… …
1635 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1617 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1636 break; 1618 break;
1637 1619
1638 if (ev.xany.window == vt) 1620 if (ev.xany.window == vt)
1639 { 1621 {
1622 if (HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1623 ; // nop
1640 if (ev.xbutton.state & (Button1Mask | Button3Mask)) 1624 else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1641 { 1625 {
1642 while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev)) 1626 while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev))
1643 ; 1627 ;
1644 1628
1645 XQueryPointer (disp, vt, 1629 XQueryPointer (disp, vt,
… …
1731 refresh_limit = 0; 1715 refresh_limit = 0;
1732 scrollbar_show (1); 1716 scrollbar_show (1);
1733 } 1717 }
1734 break; 1718 break;
1735 } 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
1736} 1749}
1737 1750
1738void 1751void
1739rxvt_term::focus_in () 1752rxvt_term::focus_in ()
1740{ 1753{
… …
1865#ifdef MOUSE_REPORT_DOUBLECLICK 1878#ifdef MOUSE_REPORT_DOUBLECLICK
1866 if (ev.button == MEvent.button && clickintime) 1879 if (ev.button == MEvent.button && clickintime)
1867 { 1880 {
1868 /* same button, within alloted time */ 1881 /* same button, within alloted time */
1869 MEvent.clicks++; 1882 MEvent.clicks++;
1883
1870 if (MEvent.clicks > 1) 1884 if (MEvent.clicks > 1)
1871 { 1885 {
1872 /* only report double clicks */ 1886 /* only report double clicks */
1873 MEvent.clicks = 2; 1887 MEvent.clicks = 2;
1874 mouse_report (ev); 1888 mouse_report (ev);
… …
1894 else 1908 else
1895 { 1909 {
1896 if (ev.button != MEvent.button) 1910 if (ev.button != MEvent.button)
1897 MEvent.clicks = 0; 1911 MEvent.clicks = 0;
1898 1912
1899 if (!HOOK_INVOKE ((this, HOOK_MOUSE_CLICK, DT_XEVENT, &ev, DT_END))) 1913 if (!HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1900 switch (ev.button) 1914 switch (ev.button)
1901 { 1915 {
1902 case Button1: 1916 case Button1:
1903 /* allow meta + click to select rectangular areas */ 1917 /* allow meta + click to select rectangular areas */
1904 /* should be done in screen.C */ 1918 /* should be done in screen.C */
… …
2082 } 2096 }
2083 2097
2084 break; 2098 break;
2085 } 2099 }
2086 } 2100 }
2101
2087 return; 2102 return;
2088 } 2103 }
2104
2089#if MENUBAR 2105#if MENUBAR
2090 /* 2106 /*
2091 * Menubar window processing of button press 2107 * Menubar window processing of button press
2092 */ 2108 */
2093 if (isMenuBarWindow (ev.window)) 2109 if (isMenuBarWindow (ev.window))
… …
2155 */ 2171 */
2156 if (priv_modes & PrivMode_mouse_report 2172 if (priv_modes & PrivMode_mouse_report
2157 && bypass_keystate 2173 && bypass_keystate
2158 && ev.button == Button1 && MEvent.clicks <= 1) 2174 && ev.button == Button1 && MEvent.clicks <= 1)
2159 selection_extend (ev.x, ev.y, 0); 2175 selection_extend (ev.x, ev.y, 0);
2176
2177 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2178 return;
2160 2179
2161 switch (ev.button) 2180 switch (ev.button)
2162 { 2181 {
2163 case Button1: 2182 case Button1:
2164 case Button3: 2183 case Button3:
… …
2709 2728
2710bool 2729bool
2711rxvt_term::cmd_parse () 2730rxvt_term::cmd_parse ()
2712{ 2731{
2713 bool flag = false; 2732 bool flag = false;
2714 unicode_t ch = NOCHAR; 2733 wchar_t ch = NOCHAR;
2715 char *seq_begin; // remember start of esc-sequence here 2734 char *seq_begin; // remember start of esc-sequence here
2716 2735
2717 for (;;) 2736 for (;;)
2718 { 2737 {
2719 if (ch == NOCHAR) 2738 if (ch == NOCHAR)
… …
2740 if (seen_resize && cmd_pid) 2759 if (seen_resize && cmd_pid)
2741 kill (-cmd_pid, SIGWINCH); 2760 kill (-cmd_pid, SIGWINCH);
2742 } 2761 }
2743 2762
2744 /* Read a text string from the input buffer */ 2763 /* Read a text string from the input buffer */
2745 unicode_t buf[UBUFSIZ]; 2764 wchar_t buf[UBUFSIZ];
2746 bool refreshnow = false; 2765 bool refreshnow = false;
2747 int nlines = 0; 2766 int nlines = 0;
2748 unicode_t *str = buf; 2767 wchar_t *str = buf;
2749 unicode_t *eol = str + min (ncol, UBUFSIZ); 2768 wchar_t *eol = str + min (ncol, UBUFSIZ);
2750 2769
2751 for (;;) 2770 for (;;)
2752 { 2771 {
2753 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))
2754 break; 2773 break;
… …
2772 } 2791 }
2773 2792
2774 // scr_add_lines only works for nlines <= nrow - 1. 2793 // scr_add_lines only works for nlines <= nrow - 1.
2775 if (nlines >= nrow - 1) 2794 if (nlines >= nrow - 1)
2776 { 2795 {
2777 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)))
2778 scr_add_lines (buf, nlines, str - buf); 2797 scr_add_lines (buf, str - buf, nlines);
2779 2798
2780 nlines = 0; 2799 nlines = 0;
2781 str = buf; 2800 str = buf;
2782 eol = str + min (ncol, UBUFSIZ); 2801 eol = str + min (ncol, UBUFSIZ);
2783 } 2802 }
… …
2797 2816
2798 seq_begin = cmdbuf_ptr; 2817 seq_begin = cmdbuf_ptr;
2799 ch = next_char (); 2818 ch = next_char ();
2800 } 2819 }
2801 2820
2802 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)))
2803 scr_add_lines (buf, nlines, str - buf); 2822 scr_add_lines (buf, str - buf, nlines);
2804 2823
2805 /* 2824 /*
2806 * 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
2807 * 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.
2808 * the number of pages between refreshes is refresh_limit, which 2827 * the number of pages between refreshes is refresh_limit, which
… …
2839 } 2858 }
2840 2859
2841 return flag; 2860 return flag;
2842} 2861}
2843 2862
2844// read the next octet
2845unicode_t
2846rxvt_term::next_octet ()
2847{
2848 return cmdbuf_ptr < cmdbuf_endp
2849 ? *cmdbuf_ptr++
2850 : NOCHAR;
2851}
2852
2853// read the next character 2863// read the next character
2854unicode_t 2864wchar_t
2855rxvt_term::next_char () 2865rxvt_term::next_char ()
2856{ 2866{
2857 while (cmdbuf_ptr < cmdbuf_endp) 2867 while (cmdbuf_ptr < cmdbuf_endp)
2858 { 2868 {
2859 // assume 7-bit to be ascii ALWAYS 2869 // assume 7-bit to be ascii ALWAYS
… …
2869 cmdbuf_ptr = cmdbuf_endp; 2879 cmdbuf_ptr = cmdbuf_endp;
2870 break; 2880 break;
2871 } 2881 }
2872 2882
2873 if (len == (size_t)-1) 2883 if (len == (size_t)-1)
2874 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
2875 2885
2876 // assume wchar == unicode 2886 // assume wchar == unicode
2877 cmdbuf_ptr += len; 2887 cmdbuf_ptr += len;
2878 return wc & UNICODE_MASK; 2888 return wc & UNICODE_MASK;
2879 } 2889 }
2880 2890
2881 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;
2882} 2901}
2883 2902
2884/* rxvt_cmd_getc () - Return next input character */ 2903/* rxvt_cmd_getc () - Return next input character */
2885/* 2904/*
2886 * Return the next input character after first passing any keyboard input 2905 * Return the next input character after first passing any keyboard input
2887 * to the command. 2906 * to the command.
2888 */ 2907 */
2889unicode_t 2908wchar_t
2890rxvt_term::cmd_getc () 2909rxvt_term::cmd_getc ()
2891{ 2910{
2892 unicode_t c = next_char (); 2911 wchar_t c = next_char ();
2893 2912
2894 if (c == NOCHAR) 2913 if (c == NOCHAR)
2895 throw out_of_input; 2914 throw out_of_input;
2896 2915
2897 return c; 2916 return c;
2898} 2917}
2899 2918
2900unicode_t 2919uint32_t
2901rxvt_term::cmd_get8 () 2920rxvt_term::cmd_get8 ()
2902{ 2921{
2903 unicode_t c = next_octet (); 2922 uint32_t c = next_octet ();
2904 2923
2905 if (c == NOCHAR) 2924 if (c == NOCHAR)
2906 throw out_of_input; 2925 throw out_of_input;
2907 2926
2908 return c; 2927 return c;
… …
3175 break; 3194 break;
3176 3195
3177 /* 8.3.87: NEXT LINE */ 3196 /* 8.3.87: NEXT LINE */
3178 case C1_NEL: /* ESC E */ 3197 case C1_NEL: /* ESC E */
3179 { 3198 {
3180 unicode_t nlcr[] = { C0_LF, C0_CR }; 3199 wchar_t nlcr[] = { C0_LF, C0_CR };
3181 scr_add_lines (nlcr, 1, 2); 3200 scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1);
3182 } 3201 }
3183 break; 3202 break;
3184 3203
3185 /* kidnapped escape sequence: Should be 8.3.48 */ 3204 /* kidnapped escape sequence: Should be 8.3.48 */
3186 case C1_ESA: /* ESC G */ 3205 case C1_ESA: /* ESC G */
… …
4014 break; 4033 break;
4015#endif 4034#endif
4016 4035
4017#if ENABLE_PERL 4036#if ENABLE_PERL
4018 case URxvt_perl: 4037 case URxvt_perl:
4019 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)))
4020 ; // no responses yet 4039 ; // no responses yet
4021 break; 4040 break;
4022#endif 4041#endif
4023 } 4042 }
4024} 4043}

Diff Legend

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