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.242 by root, Fri Jan 6 05:37:59 2006 UTC vs.
Revision 1.249 by root, Sun Jan 8 01:02:15 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;
… …
1415 else 1388 else
1416 iso14755buf = 0; 1389 iso14755buf = 0;
1417 } 1390 }
1418#endif 1391#endif
1419 1392
1393 if (ev.xany.window == vt
1420 if (ev.xany.window == vt && HOOK_INVOKE ((this, HOOK_KEY_RELEASE, DT_XEVENT, &ev, DT_END))) 1394 && HOOK_INVOKE ((this, HOOK_KEY_RELEASE, DT_XEVENT, &ev, DT_END)))
1421 break; 1395 break;
1422 1396
1423#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1397#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1424 if (!(ev.xkey.state & ControlMask)) 1398 if (!(ev.xkey.state & ControlMask))
1425 slip_wheel_ev.stop (); 1399 slip_wheel_ev.stop ();
… …
1561 1535
1562 case SelectionRequest: 1536 case SelectionRequest:
1563 selection_send (ev.xselectionrequest); 1537 selection_send (ev.xselectionrequest);
1564 break; 1538 break;
1565 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
1566 case UnmapNotify: 1548 case UnmapNotify:
1567 mapped = 0; 1549 mapped = 0;
1568#ifdef TEXT_BLINK 1550#ifdef TEXT_BLINK
1569 text_blink_ev.stop (); 1551 text_blink_ev.stop ();
1570#endif 1552#endif
1571 break; 1553 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1572
1573 case MapNotify:
1574 mapped = 1;
1575#ifdef TEXT_BLINK
1576 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1577#endif
1578 break; 1554 break;
1579 1555
1580#ifdef TRANSPARENT 1556#ifdef TRANSPARENT
1581 case ReparentNotify: 1557 case ReparentNotify:
1582 rootwin_cb (ev); 1558 rootwin_cb (ev);
… …
1739 refresh_limit = 0; 1715 refresh_limit = 0;
1740 scrollbar_show (1); 1716 scrollbar_show (1);
1741 } 1717 }
1742 break; 1718 break;
1743 } 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
1744} 1749}
1745 1750
1746void 1751void
1747rxvt_term::focus_in () 1752rxvt_term::focus_in ()
1748{ 1753{
… …
1873#ifdef MOUSE_REPORT_DOUBLECLICK 1878#ifdef MOUSE_REPORT_DOUBLECLICK
1874 if (ev.button == MEvent.button && clickintime) 1879 if (ev.button == MEvent.button && clickintime)
1875 { 1880 {
1876 /* same button, within alloted time */ 1881 /* same button, within alloted time */
1877 MEvent.clicks++; 1882 MEvent.clicks++;
1883
1878 if (MEvent.clicks > 1) 1884 if (MEvent.clicks > 1)
1879 { 1885 {
1880 /* only report double clicks */ 1886 /* only report double clicks */
1881 MEvent.clicks = 2; 1887 MEvent.clicks = 2;
1882 mouse_report (ev); 1888 mouse_report (ev);
… …
2090 } 2096 }
2091 2097
2092 break; 2098 break;
2093 } 2099 }
2094 } 2100 }
2101
2095 return; 2102 return;
2096 } 2103 }
2104
2097#if MENUBAR 2105#if MENUBAR
2098 /* 2106 /*
2099 * Menubar window processing of button press 2107 * Menubar window processing of button press
2100 */ 2108 */
2101 if (isMenuBarWindow (ev.window)) 2109 if (isMenuBarWindow (ev.window))
… …
2164 if (priv_modes & PrivMode_mouse_report 2172 if (priv_modes & PrivMode_mouse_report
2165 && bypass_keystate 2173 && bypass_keystate
2166 && ev.button == Button1 && MEvent.clicks <= 1) 2174 && ev.button == Button1 && MEvent.clicks <= 1)
2167 selection_extend (ev.x, ev.y, 0); 2175 selection_extend (ev.x, ev.y, 0);
2168 2176
2169 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)))
2170 return; 2178 return;
2171 2179
2172 switch (ev.button) 2180 switch (ev.button)
2173 { 2181 {
2174 case Button1: 2182 case Button1:
… …
2720 2728
2721bool 2729bool
2722rxvt_term::cmd_parse () 2730rxvt_term::cmd_parse ()
2723{ 2731{
2724 bool flag = false; 2732 bool flag = false;
2725 unicode_t ch = NOCHAR; 2733 wchar_t ch = NOCHAR;
2726 char *seq_begin; // remember start of esc-sequence here 2734 char *seq_begin; // remember start of esc-sequence here
2727 2735
2728 for (;;) 2736 for (;;)
2729 { 2737 {
2730 if (ch == NOCHAR) 2738 if (ch == NOCHAR)
… …
2751 if (seen_resize && cmd_pid) 2759 if (seen_resize && cmd_pid)
2752 kill (-cmd_pid, SIGWINCH); 2760 kill (-cmd_pid, SIGWINCH);
2753 } 2761 }
2754 2762
2755 /* Read a text string from the input buffer */ 2763 /* Read a text string from the input buffer */
2756 unicode_t buf[UBUFSIZ]; 2764 wchar_t buf[UBUFSIZ];
2757 bool refreshnow = false; 2765 bool refreshnow = false;
2758 int nlines = 0; 2766 int nlines = 0;
2759 unicode_t *str = buf; 2767 wchar_t *str = buf;
2760 unicode_t *eol = str + min (ncol, UBUFSIZ); 2768 wchar_t *eol = str + min (ncol, UBUFSIZ);
2761 2769
2762 for (;;) 2770 for (;;)
2763 { 2771 {
2764 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))
2765 break; 2773 break;
… …
2783 } 2791 }
2784 2792
2785 // scr_add_lines only works for nlines <= nrow - 1. 2793 // scr_add_lines only works for nlines <= nrow - 1.
2786 if (nlines >= nrow - 1) 2794 if (nlines >= nrow - 1)
2787 { 2795 {
2788 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)))
2789 scr_add_lines (buf, nlines, str - buf); 2797 scr_add_lines (buf, str - buf, nlines);
2790 2798
2791 nlines = 0; 2799 nlines = 0;
2792 str = buf; 2800 str = buf;
2793 eol = str + min (ncol, UBUFSIZ); 2801 eol = str + min (ncol, UBUFSIZ);
2794 } 2802 }
… …
2808 2816
2809 seq_begin = cmdbuf_ptr; 2817 seq_begin = cmdbuf_ptr;
2810 ch = next_char (); 2818 ch = next_char ();
2811 } 2819 }
2812 2820
2813 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)))
2814 scr_add_lines (buf, nlines, str - buf); 2822 scr_add_lines (buf, str - buf, nlines);
2815 2823
2816 /* 2824 /*
2817 * 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
2818 * 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.
2819 * the number of pages between refreshes is refresh_limit, which 2827 * the number of pages between refreshes is refresh_limit, which
… …
2850 } 2858 }
2851 2859
2852 return flag; 2860 return flag;
2853} 2861}
2854 2862
2855// read the next octet
2856unicode_t
2857rxvt_term::next_octet ()
2858{
2859 return cmdbuf_ptr < cmdbuf_endp
2860 ? *cmdbuf_ptr++
2861 : NOCHAR;
2862}
2863
2864// read the next character 2863// read the next character
2865unicode_t 2864wchar_t
2866rxvt_term::next_char () 2865rxvt_term::next_char ()
2867{ 2866{
2868 while (cmdbuf_ptr < cmdbuf_endp) 2867 while (cmdbuf_ptr < cmdbuf_endp)
2869 { 2868 {
2870 // assume 7-bit to be ascii ALWAYS 2869 // assume 7-bit to be ascii ALWAYS
… …
2880 cmdbuf_ptr = cmdbuf_endp; 2879 cmdbuf_ptr = cmdbuf_endp;
2881 break; 2880 break;
2882 } 2881 }
2883 2882
2884 if (len == (size_t)-1) 2883 if (len == (size_t)-1)
2885 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
2886 2885
2887 // assume wchar == unicode 2886 // assume wchar == unicode
2888 cmdbuf_ptr += len; 2887 cmdbuf_ptr += len;
2889 return wc & UNICODE_MASK; 2888 return wc & UNICODE_MASK;
2890 } 2889 }
2891 2890
2892 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;
2893} 2901}
2894 2902
2895/* rxvt_cmd_getc () - Return next input character */ 2903/* rxvt_cmd_getc () - Return next input character */
2896/* 2904/*
2897 * Return the next input character after first passing any keyboard input 2905 * Return the next input character after first passing any keyboard input
2898 * to the command. 2906 * to the command.
2899 */ 2907 */
2900unicode_t 2908wchar_t
2901rxvt_term::cmd_getc () 2909rxvt_term::cmd_getc ()
2902{ 2910{
2903 unicode_t c = next_char (); 2911 wchar_t c = next_char ();
2904 2912
2905 if (c == NOCHAR) 2913 if (c == NOCHAR)
2906 throw out_of_input; 2914 throw out_of_input;
2907 2915
2908 return c; 2916 return c;
2909} 2917}
2910 2918
2911unicode_t 2919uint32_t
2912rxvt_term::cmd_get8 () 2920rxvt_term::cmd_get8 ()
2913{ 2921{
2914 unicode_t c = next_octet (); 2922 uint32_t c = next_octet ();
2915 2923
2916 if (c == NOCHAR) 2924 if (c == NOCHAR)
2917 throw out_of_input; 2925 throw out_of_input;
2918 2926
2919 return c; 2927 return c;
… …
3186 break; 3194 break;
3187 3195
3188 /* 8.3.87: NEXT LINE */ 3196 /* 8.3.87: NEXT LINE */
3189 case C1_NEL: /* ESC E */ 3197 case C1_NEL: /* ESC E */
3190 { 3198 {
3191 unicode_t nlcr[] = { C0_LF, C0_CR }; 3199 wchar_t nlcr[] = { C0_LF, C0_CR };
3192 scr_add_lines (nlcr, 1, 2); 3200 scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1);
3193 } 3201 }
3194 break; 3202 break;
3195 3203
3196 /* kidnapped escape sequence: Should be 8.3.48 */ 3204 /* kidnapped escape sequence: Should be 8.3.48 */
3197 case C1_ESA: /* ESC G */ 3205 case C1_ESA: /* ESC G */
… …
4025 break; 4033 break;
4026#endif 4034#endif
4027 4035
4028#if ENABLE_PERL 4036#if ENABLE_PERL
4029 case URxvt_perl: 4037 case URxvt_perl:
4030 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)))
4031 ; // no responses yet 4039 ; // no responses yet
4032 break; 4040 break;
4033#endif 4041#endif
4034 } 4042 }
4035} 4043}
… …
4147 /* extra handling for values with state unkept */ 4155 /* extra handling for values with state unkept */
4148 switch (arg[i]) 4156 switch (arg[i])
4149 { 4157 {
4150#if ENABLE_STYLES 4158#if ENABLE_STYLES
4151 case 1021: 4159 case 1021:
4152 if (mode) 4160 set_option (Opt_intensityStyles, mode);
4153 SET_OPTION (Opt_intensityStyles);
4154 else
4155 CLR_OPTION (Opt_intensityStyles);
4156 4161
4157 scr_touch (true); 4162 scr_touch (true);
4158 break; 4163 break;
4159#endif 4164#endif
4160 case 1048: /* alternative cursor save */ 4165 case 1048: /* alternative cursor save */
… …
4182 case 3: /* 80/132 */ 4187 case 3: /* 80/132 */
4183 if (priv_modes & PrivMode_132OK) 4188 if (priv_modes & PrivMode_132OK)
4184 set_widthheight (((state ? 132 : 80) * fwidth), height); 4189 set_widthheight (((state ? 132 : 80) * fwidth), height);
4185 break; 4190 break;
4186 case 4: /* smooth scrolling */ 4191 case 4: /* smooth scrolling */
4187 if (!state) 4192 set_option (Opt_jumpScroll, !state);
4188 SET_OPTION (Opt_jumpScroll);
4189 else
4190 CLR_OPTION (Opt_jumpScroll);
4191 break; 4193 break;
4192 case 5: /* reverse video */ 4194 case 5: /* reverse video */
4193 scr_rvideo_mode (state); 4195 scr_rvideo_mode (state);
4194 break; 4196 break;
4195 case 6: /* relative/absolute origins */ 4197 case 6: /* relative/absolute origins */
… …
4236#if 0 4238#if 0
4237 case 1001: 4239 case 1001:
4238 break; /* X11 mouse highlighting */ 4240 break; /* X11 mouse highlighting */
4239#endif 4241#endif
4240 case 1010: /* scroll to bottom on TTY output inhibit */ 4242 case 1010: /* scroll to bottom on TTY output inhibit */
4241 if (!state) 4243 set_option (Opt_scrollTtyOutput, !state);
4242 SET_OPTION (Opt_scrollTtyOutput);
4243 else
4244 CLR_OPTION (Opt_scrollTtyOutput);
4245 break; 4244 break;
4246 case 1011: /* scroll to bottom on key press */ 4245 case 1011: /* scroll to bottom on key press */
4247 if (state) 4246 set_option (Opt_scrollTtyKeypress, state);
4248 SET_OPTION (Opt_scrollTtyKeypress);
4249 else
4250 CLR_OPTION (Opt_scrollTtyKeypress);
4251 break; 4247 break;
4252 case 1047: /* secondary screen w/ clearing last */ 4248 case 1047: /* secondary screen w/ clearing last */
4253 if (OPTION (Opt_secondaryScreen)) 4249 if (OPTION (Opt_secondaryScreen))
4254 if (current_screen != PRIMARY) 4250 if (current_screen != PRIMARY)
4255 scr_erase_screen (2); 4251 scr_erase_screen (2);

Diff Legend

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