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.251 by root, Sun Jan 8 07:55:36 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
… …
973 if (want_refresh) 973 if (want_refresh)
974 { 974 {
975 if (SHOULD_INVOKE (HOOK_LINE_UPDATE)) 975 if (SHOULD_INVOKE (HOOK_LINE_UPDATE))
976 { 976 {
977 int row = -view_start; 977 int row = -view_start;
978 int end_row = row + nrow;
978 979
979 while (row > -nsaved && ROW (row - 1).is_longer ()) 980 while (row > -nsaved && ROW (row - 1).is_longer ())
980 --row; 981 --row;
981 982
982 while (row < -view_start + nrow) 983 do
983 { 984 {
984 int start_row = row; 985 int start_row = row;
985 line_t *l; 986 line_t *l;
986 987
987 do 988 do
988 { 989 {
989 l = &ROW (row); 990 l = &ROW (row++);
990 991
991 if (!(l->f & LINE_FILTERED)) 992 if (l->f & LINE_FILTERED)
993 row++;
994 else
992 { 995 {
993 // line not filtered, mark it as filtered 996 // line not filtered, mark it as filtered
994 l->f |= LINE_FILTERED; 997 l->f |= LINE_FILTERED;
995 while (l->is_longer ()) 998 while (l->is_longer ())
996 { 999 {
… …
1002 HOOK_INVOKE ((this, HOOK_LINE_UPDATE, DT_INT, start_row, DT_END)); 1005 HOOK_INVOKE ((this, HOOK_LINE_UPDATE, DT_INT, start_row, DT_END));
1003 1006
1004 break; 1007 break;
1005 } 1008 }
1006 } 1009 }
1007 while (l->is_longer ()); 1010 while (l->is_longer () && row < end_row);
1008
1009 row++;
1010 } 1011 }
1011 1012 while (++row < end_row);
1012 } 1013 }
1013 1014
1014 scr_refresh (refresh_type); 1015 scr_refresh (refresh_type);
1015 scrollbar_show (1); 1016 scrollbar_show (1);
1016#ifdef USE_XIM 1017#ifdef USE_XIM
… …
1205 1206
1206#ifdef POINTER_BLANK 1207#ifdef POINTER_BLANK
1207void 1208void
1208rxvt_term::pointer_blank () 1209rxvt_term::pointer_blank ()
1209{ 1210{
1210 if (! OPTION (Opt_pointerBlank)) 1211 if (!OPTION (Opt_pointerBlank))
1211 return; 1212 return;
1212 1213
1213 XDefineCursor (display->display, vt, display->blank_cursor); 1214 XDefineCursor (display->display, vt, display->blank_cursor);
1214 XFlush (display->display); 1215 XFlush (display->display);
1215 1216
… …
1311{ 1312{
1312 dDisp; 1313 dDisp;
1313 1314
1314 SET_R (this); 1315 SET_R (this);
1315 SET_LOCALE (locale); 1316 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 1317
1344 Window unused_root, unused_child; 1318 Window unused_root, unused_child;
1345 int unused_root_x, unused_root_y; 1319 int unused_root_x, unused_root_y;
1346 unsigned int unused_mask; 1320 unsigned int unused_mask;
1347 1321
… …
1378 && ((ks >= 0x40 && ks <= 0x5f) 1352 && ((ks >= 0x40 && ks <= 0x5f)
1379 || (ks >= 0x61 && ks <= 0x7f))) 1353 || (ks >= 0x61 && ks <= 0x7f)))
1380 { 1354 {
1381 iso14755buf = ISO_14755_51 | 0x2400 | (ks & 0x1f); 1355 iso14755buf = ISO_14755_51 | 0x2400 | (ks & 0x1f);
1382 commit_iso14755 (); 1356 commit_iso14755 ();
1383 return; // case-break; 1357 goto skip_switch;
1384 } 1358 }
1385 1359
1386 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2) 1360 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
1387 if (i[0] == ks) 1361 if (i[0] == ks)
1388 { 1362 {
1389 iso14755buf = ISO_14755_51 | i[1]; 1363 iso14755buf = ISO_14755_51 | i[1];
1390 commit_iso14755 (); 1364 commit_iso14755 ();
1391 return; // case-break; 1365 goto skip_switch;
1392 } 1366 }
1393 1367
1394 scr_bell (); 1368 scr_bell ();
1395# endif 1369# endif
1396 iso14755buf = 0; 1370 iso14755buf = 0;
… …
1414# endif 1388# endif
1415 else 1389 else
1416 iso14755buf = 0; 1390 iso14755buf = 0;
1417 } 1391 }
1418#endif 1392#endif
1393
1394 if (ev.xany.window == vt
1395 && HOOK_INVOKE ((this, HOOK_KEY_RELEASE, DT_XEVENT, &ev, DT_END)))
1396 break;
1419 1397
1420#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1398#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1421 if (!(ev.xkey.state & ControlMask)) 1399 if (!(ev.xkey.state & ControlMask))
1422 slip_wheel_ev.stop (); 1400 slip_wheel_ev.stop ();
1423 else if (ks == XK_Control_L || ks == XK_Control_R) 1401 else if (ks == XK_Control_L || ks == XK_Control_R)
… …
1558 1536
1559 case SelectionRequest: 1537 case SelectionRequest:
1560 selection_send (ev.xselectionrequest); 1538 selection_send (ev.xselectionrequest);
1561 break; 1539 break;
1562 1540
1541 case MapNotify:
1542 mapped = 1;
1543#ifdef TEXT_BLINK
1544 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1545#endif
1546 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1547 break;
1548
1563 case UnmapNotify: 1549 case UnmapNotify:
1564 mapped = 0; 1550 mapped = 0;
1565#ifdef TEXT_BLINK 1551#ifdef TEXT_BLINK
1566 text_blink_ev.stop (); 1552 text_blink_ev.stop ();
1567#endif 1553#endif
1568 break; 1554 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; 1555 break;
1576 1556
1577#ifdef TRANSPARENT 1557#ifdef TRANSPARENT
1578 case ReparentNotify: 1558 case ReparentNotify:
1579 rootwin_cb (ev); 1559 rootwin_cb (ev);
… …
1736 refresh_limit = 0; 1716 refresh_limit = 0;
1737 scrollbar_show (1); 1717 scrollbar_show (1);
1738 } 1718 }
1739 break; 1719 break;
1740 } 1720 }
1721
1722skip_switch: ;
1723
1724#if defined(CURSOR_BLINK)
1725 if (OPTION (Opt_cursorBlink) && ev.type == KeyPress)
1726 {
1727 if (hidden_cursor)
1728 {
1729 hidden_cursor = 0;
1730 want_refresh = 1;
1731 }
1732
1733 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1734 }
1735#endif
1736
1737#if defined(POINTER_BLANK)
1738 if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0)
1739 {
1740 if (ev.type == MotionNotify
1741 || ev.type == ButtonPress
1742 || ev.type == ButtonRelease)
1743 if (hidden_pointer)
1744 pointer_unblank ();
1745
1746 if (ev.type == KeyPress && hidden_pointer == 0)
1747 pointer_blank ();
1748 }
1749#endif
1741} 1750}
1742 1751
1743void 1752void
1744rxvt_term::focus_in () 1753rxvt_term::focus_in ()
1745{ 1754{
… …
1870#ifdef MOUSE_REPORT_DOUBLECLICK 1879#ifdef MOUSE_REPORT_DOUBLECLICK
1871 if (ev.button == MEvent.button && clickintime) 1880 if (ev.button == MEvent.button && clickintime)
1872 { 1881 {
1873 /* same button, within alloted time */ 1882 /* same button, within alloted time */
1874 MEvent.clicks++; 1883 MEvent.clicks++;
1884
1875 if (MEvent.clicks > 1) 1885 if (MEvent.clicks > 1)
1876 { 1886 {
1877 /* only report double clicks */ 1887 /* only report double clicks */
1878 MEvent.clicks = 2; 1888 MEvent.clicks = 2;
1879 mouse_report (ev); 1889 mouse_report (ev);
… …
2087 } 2097 }
2088 2098
2089 break; 2099 break;
2090 } 2100 }
2091 } 2101 }
2102
2092 return; 2103 return;
2093 } 2104 }
2105
2094#if MENUBAR 2106#if MENUBAR
2095 /* 2107 /*
2096 * Menubar window processing of button press 2108 * Menubar window processing of button press
2097 */ 2109 */
2098 if (isMenuBarWindow (ev.window)) 2110 if (isMenuBarWindow (ev.window))
… …
2161 if (priv_modes & PrivMode_mouse_report 2173 if (priv_modes & PrivMode_mouse_report
2162 && bypass_keystate 2174 && bypass_keystate
2163 && ev.button == Button1 && MEvent.clicks <= 1) 2175 && ev.button == Button1 && MEvent.clicks <= 1)
2164 selection_extend (ev.x, ev.y, 0); 2176 selection_extend (ev.x, ev.y, 0);
2165 2177
2166 if (!HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END))) 2178 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2167 return; 2179 return;
2168 2180
2169 switch (ev.button) 2181 switch (ev.button)
2170 { 2182 {
2171 case Button1: 2183 case Button1:
… …
2717 2729
2718bool 2730bool
2719rxvt_term::cmd_parse () 2731rxvt_term::cmd_parse ()
2720{ 2732{
2721 bool flag = false; 2733 bool flag = false;
2722 unicode_t ch = NOCHAR; 2734 wchar_t ch = NOCHAR;
2723 char *seq_begin; // remember start of esc-sequence here 2735 char *seq_begin; // remember start of esc-sequence here
2724 2736
2725 for (;;) 2737 for (;;)
2726 { 2738 {
2727 if (ch == NOCHAR) 2739 if (ch == NOCHAR)
… …
2748 if (seen_resize && cmd_pid) 2760 if (seen_resize && cmd_pid)
2749 kill (-cmd_pid, SIGWINCH); 2761 kill (-cmd_pid, SIGWINCH);
2750 } 2762 }
2751 2763
2752 /* Read a text string from the input buffer */ 2764 /* Read a text string from the input buffer */
2753 unicode_t buf[UBUFSIZ]; 2765 wchar_t buf[UBUFSIZ];
2754 bool refreshnow = false; 2766 bool refreshnow = false;
2755 int nlines = 0; 2767 int nlines = 0;
2756 unicode_t *str = buf; 2768 wchar_t *str = buf;
2757 unicode_t *eol = str + min (ncol, UBUFSIZ); 2769 wchar_t *eol = str + min (ncol, UBUFSIZ);
2758 2770
2759 for (;;) 2771 for (;;)
2760 { 2772 {
2761 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)) 2773 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))
2762 break; 2774 break;
… …
2780 } 2792 }
2781 2793
2782 // scr_add_lines only works for nlines <= nrow - 1. 2794 // scr_add_lines only works for nlines <= nrow - 1.
2783 if (nlines >= nrow - 1) 2795 if (nlines >= nrow - 1)
2784 { 2796 {
2785 if (!HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_USTRING_LEN, buf, str - buf, DT_END))) 2797 if (!HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END)))
2786 scr_add_lines (buf, nlines, str - buf); 2798 scr_add_lines (buf, str - buf, nlines);
2787 2799
2788 nlines = 0; 2800 nlines = 0;
2789 str = buf; 2801 str = buf;
2790 eol = str + min (ncol, UBUFSIZ); 2802 eol = str + min (ncol, UBUFSIZ);
2791 } 2803 }
… …
2805 2817
2806 seq_begin = cmdbuf_ptr; 2818 seq_begin = cmdbuf_ptr;
2807 ch = next_char (); 2819 ch = next_char ();
2808 } 2820 }
2809 2821
2810 if (!HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_USTRING_LEN, buf, str - buf, DT_END))) 2822 if (!HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END)))
2811 scr_add_lines (buf, nlines, str - buf); 2823 scr_add_lines (buf, str - buf, nlines);
2812 2824
2813 /* 2825 /*
2814 * If there have been a lot of new lines, then update the screen 2826 * 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. 2827 * 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 2828 * the number of pages between refreshes is refresh_limit, which
… …
2847 } 2859 }
2848 2860
2849 return flag; 2861 return flag;
2850} 2862}
2851 2863
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 2864// read the next character
2862unicode_t 2865wchar_t
2863rxvt_term::next_char () 2866rxvt_term::next_char ()
2864{ 2867{
2865 while (cmdbuf_ptr < cmdbuf_endp) 2868 while (cmdbuf_ptr < cmdbuf_endp)
2866 { 2869 {
2867 // assume 7-bit to be ascii ALWAYS 2870 // assume 7-bit to be ascii ALWAYS
… …
2877 cmdbuf_ptr = cmdbuf_endp; 2880 cmdbuf_ptr = cmdbuf_endp;
2878 break; 2881 break;
2879 } 2882 }
2880 2883
2881 if (len == (size_t)-1) 2884 if (len == (size_t)-1)
2882 return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 2885 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2883 2886
2884 // assume wchar == unicode 2887 // assume wchar == unicode
2885 cmdbuf_ptr += len; 2888 cmdbuf_ptr += len;
2886 return wc & UNICODE_MASK; 2889 return wc & UNICODE_MASK;
2887 } 2890 }
2888 2891
2889 return NOCHAR; 2892 return NOCHAR;
2893}
2894
2895// read the next octet
2896uint32_t
2897rxvt_term::next_octet ()
2898{
2899 return cmdbuf_ptr < cmdbuf_endp
2900 ? (unsigned char)*cmdbuf_ptr++
2901 : NOCHAR;
2890} 2902}
2891 2903
2892/* rxvt_cmd_getc () - Return next input character */ 2904/* rxvt_cmd_getc () - Return next input character */
2893/* 2905/*
2894 * Return the next input character after first passing any keyboard input 2906 * Return the next input character after first passing any keyboard input
2895 * to the command. 2907 * to the command.
2896 */ 2908 */
2897unicode_t 2909wchar_t
2898rxvt_term::cmd_getc () 2910rxvt_term::cmd_getc ()
2899{ 2911{
2900 unicode_t c = next_char (); 2912 wchar_t c = next_char ();
2901 2913
2902 if (c == NOCHAR) 2914 if (c == NOCHAR)
2903 throw out_of_input; 2915 throw out_of_input;
2904 2916
2905 return c; 2917 return c;
2906} 2918}
2907 2919
2908unicode_t 2920uint32_t
2909rxvt_term::cmd_get8 () 2921rxvt_term::cmd_get8 ()
2910{ 2922{
2911 unicode_t c = next_octet (); 2923 uint32_t c = next_octet ();
2912 2924
2913 if (c == NOCHAR) 2925 if (c == NOCHAR)
2914 throw out_of_input; 2926 throw out_of_input;
2915 2927
2916 return c; 2928 return c;
… …
3183 break; 3195 break;
3184 3196
3185 /* 8.3.87: NEXT LINE */ 3197 /* 8.3.87: NEXT LINE */
3186 case C1_NEL: /* ESC E */ 3198 case C1_NEL: /* ESC E */
3187 { 3199 {
3188 unicode_t nlcr[] = { C0_LF, C0_CR }; 3200 wchar_t nlcr[] = { C0_LF, C0_CR };
3189 scr_add_lines (nlcr, 1, 2); 3201 scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1);
3190 } 3202 }
3191 break; 3203 break;
3192 3204
3193 /* kidnapped escape sequence: Should be 8.3.48 */ 3205 /* kidnapped escape sequence: Should be 8.3.48 */
3194 case C1_ESA: /* ESC G */ 3206 case C1_ESA: /* ESC G */
… …
4022 break; 4034 break;
4023#endif 4035#endif
4024 4036
4025#if ENABLE_PERL 4037#if ENABLE_PERL
4026 case URxvt_perl: 4038 case URxvt_perl:
4027 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_STRING, str, DT_END))) 4039 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_STR, str, DT_END)))
4028 ; // no responses yet 4040 ; // no responses yet
4029 break; 4041 break;
4030#endif 4042#endif
4031 } 4043 }
4032} 4044}
… …
4144 /* extra handling for values with state unkept */ 4156 /* extra handling for values with state unkept */
4145 switch (arg[i]) 4157 switch (arg[i])
4146 { 4158 {
4147#if ENABLE_STYLES 4159#if ENABLE_STYLES
4148 case 1021: 4160 case 1021:
4149 if (mode) 4161 set_option (Opt_intensityStyles, mode);
4150 SET_OPTION (Opt_intensityStyles);
4151 else
4152 CLR_OPTION (Opt_intensityStyles);
4153 4162
4154 scr_touch (true); 4163 scr_touch (true);
4155 break; 4164 break;
4156#endif 4165#endif
4157 case 1048: /* alternative cursor save */ 4166 case 1048: /* alternative cursor save */
… …
4179 case 3: /* 80/132 */ 4188 case 3: /* 80/132 */
4180 if (priv_modes & PrivMode_132OK) 4189 if (priv_modes & PrivMode_132OK)
4181 set_widthheight (((state ? 132 : 80) * fwidth), height); 4190 set_widthheight (((state ? 132 : 80) * fwidth), height);
4182 break; 4191 break;
4183 case 4: /* smooth scrolling */ 4192 case 4: /* smooth scrolling */
4184 if (!state) 4193 set_option (Opt_jumpScroll, !state);
4185 SET_OPTION (Opt_jumpScroll);
4186 else
4187 CLR_OPTION (Opt_jumpScroll);
4188 break; 4194 break;
4189 case 5: /* reverse video */ 4195 case 5: /* reverse video */
4190 scr_rvideo_mode (state); 4196 scr_rvideo_mode (state);
4191 break; 4197 break;
4192 case 6: /* relative/absolute origins */ 4198 case 6: /* relative/absolute origins */
… …
4233#if 0 4239#if 0
4234 case 1001: 4240 case 1001:
4235 break; /* X11 mouse highlighting */ 4241 break; /* X11 mouse highlighting */
4236#endif 4242#endif
4237 case 1010: /* scroll to bottom on TTY output inhibit */ 4243 case 1010: /* scroll to bottom on TTY output inhibit */
4238 if (!state) 4244 set_option (Opt_scrollTtyOutput, !state);
4239 SET_OPTION (Opt_scrollTtyOutput);
4240 else
4241 CLR_OPTION (Opt_scrollTtyOutput);
4242 break; 4245 break;
4243 case 1011: /* scroll to bottom on key press */ 4246 case 1011: /* scroll to bottom on key press */
4244 if (state) 4247 set_option (Opt_scrollTtyKeypress, state);
4245 SET_OPTION (Opt_scrollTtyKeypress);
4246 else
4247 CLR_OPTION (Opt_scrollTtyKeypress);
4248 break; 4248 break;
4249 case 1047: /* secondary screen w/ clearing last */ 4249 case 1047: /* secondary screen w/ clearing last */
4250 if (OPTION (Opt_secondaryScreen)) 4250 if (OPTION (Opt_secondaryScreen))
4251 if (current_screen != PRIMARY) 4251 if (current_screen != PRIMARY)
4252 scr_erase_screen (2); 4252 scr_erase_screen (2);

Diff Legend

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