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.244 by root, Fri Jan 6 17:09:27 2006 UTC vs.
Revision 1.248 by root, Sun Jan 8 00:07:18 2006 UTC

… …
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
… …
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;
… …
1562 1535
1563 case SelectionRequest: 1536 case SelectionRequest:
1564 selection_send (ev.xselectionrequest); 1537 selection_send (ev.xselectionrequest);
1565 break; 1538 break;
1566 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
1567 case UnmapNotify: 1548 case UnmapNotify:
1568 mapped = 0; 1549 mapped = 0;
1569#ifdef TEXT_BLINK 1550#ifdef TEXT_BLINK
1570 text_blink_ev.stop (); 1551 text_blink_ev.stop ();
1571#endif 1552#endif
1572 break; 1553 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1573
1574 case MapNotify:
1575 mapped = 1;
1576#ifdef TEXT_BLINK
1577 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1578#endif
1579 break; 1554 break;
1580 1555
1581#ifdef TRANSPARENT 1556#ifdef TRANSPARENT
1582 case ReparentNotify: 1557 case ReparentNotify:
1583 rootwin_cb (ev); 1558 rootwin_cb (ev);
… …
1740 refresh_limit = 0; 1715 refresh_limit = 0;
1741 scrollbar_show (1); 1716 scrollbar_show (1);
1742 } 1717 }
1743 break; 1718 break;
1744 } 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
1745} 1749}
1746 1750
1747void 1751void
1748rxvt_term::focus_in () 1752rxvt_term::focus_in ()
1749{ 1753{
… …
2724 2728
2725bool 2729bool
2726rxvt_term::cmd_parse () 2730rxvt_term::cmd_parse ()
2727{ 2731{
2728 bool flag = false; 2732 bool flag = false;
2729 unicode_t ch = NOCHAR; 2733 wchar_t ch = NOCHAR;
2730 char *seq_begin; // remember start of esc-sequence here 2734 char *seq_begin; // remember start of esc-sequence here
2731 2735
2732 for (;;) 2736 for (;;)
2733 { 2737 {
2734 if (ch == NOCHAR) 2738 if (ch == NOCHAR)
… …
2755 if (seen_resize && cmd_pid) 2759 if (seen_resize && cmd_pid)
2756 kill (-cmd_pid, SIGWINCH); 2760 kill (-cmd_pid, SIGWINCH);
2757 } 2761 }
2758 2762
2759 /* Read a text string from the input buffer */ 2763 /* Read a text string from the input buffer */
2760 unicode_t buf[UBUFSIZ]; 2764 wchar_t buf[UBUFSIZ];
2761 bool refreshnow = false; 2765 bool refreshnow = false;
2762 int nlines = 0; 2766 int nlines = 0;
2763 unicode_t *str = buf; 2767 wchar_t *str = buf;
2764 unicode_t *eol = str + min (ncol, UBUFSIZ); 2768 wchar_t *eol = str + min (ncol, UBUFSIZ);
2765 2769
2766 for (;;) 2770 for (;;)
2767 { 2771 {
2768 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))
2769 break; 2773 break;
… …
2787 } 2791 }
2788 2792
2789 // scr_add_lines only works for nlines <= nrow - 1. 2793 // scr_add_lines only works for nlines <= nrow - 1.
2790 if (nlines >= nrow - 1) 2794 if (nlines >= nrow - 1)
2791 { 2795 {
2792 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)))
2793 scr_add_lines (buf, nlines, str - buf); 2797 scr_add_lines (buf, str - buf, nlines);
2794 2798
2795 nlines = 0; 2799 nlines = 0;
2796 str = buf; 2800 str = buf;
2797 eol = str + min (ncol, UBUFSIZ); 2801 eol = str + min (ncol, UBUFSIZ);
2798 } 2802 }
… …
2812 2816
2813 seq_begin = cmdbuf_ptr; 2817 seq_begin = cmdbuf_ptr;
2814 ch = next_char (); 2818 ch = next_char ();
2815 } 2819 }
2816 2820
2817 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)))
2818 scr_add_lines (buf, nlines, str - buf); 2822 scr_add_lines (buf, str - buf, nlines);
2819 2823
2820 /* 2824 /*
2821 * 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
2822 * 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.
2823 * the number of pages between refreshes is refresh_limit, which 2827 * the number of pages between refreshes is refresh_limit, which
… …
2854 } 2858 }
2855 2859
2856 return flag; 2860 return flag;
2857} 2861}
2858 2862
2859// read the next octet
2860unicode_t
2861rxvt_term::next_octet ()
2862{
2863 return cmdbuf_ptr < cmdbuf_endp
2864 ? *cmdbuf_ptr++
2865 : NOCHAR;
2866}
2867
2868// read the next character 2863// read the next character
2869unicode_t 2864wchar_t
2870rxvt_term::next_char () 2865rxvt_term::next_char ()
2871{ 2866{
2872 while (cmdbuf_ptr < cmdbuf_endp) 2867 while (cmdbuf_ptr < cmdbuf_endp)
2873 { 2868 {
2874 // assume 7-bit to be ascii ALWAYS 2869 // assume 7-bit to be ascii ALWAYS
… …
2884 cmdbuf_ptr = cmdbuf_endp; 2879 cmdbuf_ptr = cmdbuf_endp;
2885 break; 2880 break;
2886 } 2881 }
2887 2882
2888 if (len == (size_t)-1) 2883 if (len == (size_t)-1)
2889 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
2890 2885
2891 // assume wchar == unicode 2886 // assume wchar == unicode
2892 cmdbuf_ptr += len; 2887 cmdbuf_ptr += len;
2893 return wc & UNICODE_MASK; 2888 return wc & UNICODE_MASK;
2894 } 2889 }
2895 2890
2896 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;
2897} 2901}
2898 2902
2899/* rxvt_cmd_getc () - Return next input character */ 2903/* rxvt_cmd_getc () - Return next input character */
2900/* 2904/*
2901 * Return the next input character after first passing any keyboard input 2905 * Return the next input character after first passing any keyboard input
2902 * to the command. 2906 * to the command.
2903 */ 2907 */
2904unicode_t 2908wchar_t
2905rxvt_term::cmd_getc () 2909rxvt_term::cmd_getc ()
2906{ 2910{
2907 unicode_t c = next_char (); 2911 wchar_t c = next_char ();
2908 2912
2909 if (c == NOCHAR) 2913 if (c == NOCHAR)
2910 throw out_of_input; 2914 throw out_of_input;
2911 2915
2912 return c; 2916 return c;
2913} 2917}
2914 2918
2915unicode_t 2919uint32_t
2916rxvt_term::cmd_get8 () 2920rxvt_term::cmd_get8 ()
2917{ 2921{
2918 unicode_t c = next_octet (); 2922 uint32_t c = next_octet ();
2919 2923
2920 if (c == NOCHAR) 2924 if (c == NOCHAR)
2921 throw out_of_input; 2925 throw out_of_input;
2922 2926
2923 return c; 2927 return c;
… …
3190 break; 3194 break;
3191 3195
3192 /* 8.3.87: NEXT LINE */ 3196 /* 8.3.87: NEXT LINE */
3193 case C1_NEL: /* ESC E */ 3197 case C1_NEL: /* ESC E */
3194 { 3198 {
3195 unicode_t nlcr[] = { C0_LF, C0_CR }; 3199 wchar_t nlcr[] = { C0_LF, C0_CR };
3196 scr_add_lines (nlcr, 1, 2); 3200 scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1);
3197 } 3201 }
3198 break; 3202 break;
3199 3203
3200 /* kidnapped escape sequence: Should be 8.3.48 */ 3204 /* kidnapped escape sequence: Should be 8.3.48 */
3201 case C1_ESA: /* ESC G */ 3205 case C1_ESA: /* ESC G */
… …
4029 break; 4033 break;
4030#endif 4034#endif
4031 4035
4032#if ENABLE_PERL 4036#if ENABLE_PERL
4033 case URxvt_perl: 4037 case URxvt_perl:
4034 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)))
4035 ; // no responses yet 4039 ; // no responses yet
4036 break; 4040 break;
4037#endif 4041#endif
4038 } 4042 }
4039} 4043}

Diff Legend

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