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

Diff Legend

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