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.243 by root, Fri Jan 6 05:43:36 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{
… …
2167 if (priv_modes & PrivMode_mouse_report 2171 if (priv_modes & PrivMode_mouse_report
2168 && bypass_keystate 2172 && bypass_keystate
2169 && ev.button == Button1 && MEvent.clicks <= 1) 2173 && ev.button == Button1 && MEvent.clicks <= 1)
2170 selection_extend (ev.x, ev.y, 0); 2174 selection_extend (ev.x, ev.y, 0);
2171 2175
2172 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)))
2173 return; 2177 return;
2174 2178
2175 switch (ev.button) 2179 switch (ev.button)
2176 { 2180 {
2177 case Button1: 2181 case Button1:
… …
2723 2727
2724bool 2728bool
2725rxvt_term::cmd_parse () 2729rxvt_term::cmd_parse ()
2726{ 2730{
2727 bool flag = false; 2731 bool flag = false;
2728 unicode_t ch = NOCHAR; 2732 wchar_t ch = NOCHAR;
2729 char *seq_begin; // remember start of esc-sequence here 2733 char *seq_begin; // remember start of esc-sequence here
2730 2734
2731 for (;;) 2735 for (;;)
2732 { 2736 {
2733 if (ch == NOCHAR) 2737 if (ch == NOCHAR)
… …
2754 if (seen_resize && cmd_pid) 2758 if (seen_resize && cmd_pid)
2755 kill (-cmd_pid, SIGWINCH); 2759 kill (-cmd_pid, SIGWINCH);
2756 } 2760 }
2757 2761
2758 /* Read a text string from the input buffer */ 2762 /* Read a text string from the input buffer */
2759 unicode_t buf[UBUFSIZ]; 2763 wchar_t buf[UBUFSIZ];
2760 bool refreshnow = false; 2764 bool refreshnow = false;
2761 int nlines = 0; 2765 int nlines = 0;
2762 unicode_t *str = buf; 2766 wchar_t *str = buf;
2763 unicode_t *eol = str + min (ncol, UBUFSIZ); 2767 wchar_t *eol = str + min (ncol, UBUFSIZ);
2764 2768
2765 for (;;) 2769 for (;;)
2766 { 2770 {
2767 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))
2768 break; 2772 break;
… …
2786 } 2790 }
2787 2791
2788 // scr_add_lines only works for nlines <= nrow - 1. 2792 // scr_add_lines only works for nlines <= nrow - 1.
2789 if (nlines >= nrow - 1) 2793 if (nlines >= nrow - 1)
2790 { 2794 {
2791 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)))
2792 scr_add_lines (buf, nlines, str - buf); 2796 scr_add_lines (buf, str - buf, nlines);
2793 2797
2794 nlines = 0; 2798 nlines = 0;
2795 str = buf; 2799 str = buf;
2796 eol = str + min (ncol, UBUFSIZ); 2800 eol = str + min (ncol, UBUFSIZ);
2797 } 2801 }
… …
2811 2815
2812 seq_begin = cmdbuf_ptr; 2816 seq_begin = cmdbuf_ptr;
2813 ch = next_char (); 2817 ch = next_char ();
2814 } 2818 }
2815 2819
2816 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)))
2817 scr_add_lines (buf, nlines, str - buf); 2821 scr_add_lines (buf, str - buf, nlines);
2818 2822
2819 /* 2823 /*
2820 * 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
2821 * 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.
2822 * the number of pages between refreshes is refresh_limit, which 2826 * the number of pages between refreshes is refresh_limit, which
… …
2853 } 2857 }
2854 2858
2855 return flag; 2859 return flag;
2856} 2860}
2857 2861
2858// read the next octet
2859unicode_t
2860rxvt_term::next_octet ()
2861{
2862 return cmdbuf_ptr < cmdbuf_endp
2863 ? *cmdbuf_ptr++
2864 : NOCHAR;
2865}
2866
2867// read the next character 2862// read the next character
2868unicode_t 2863wchar_t
2869rxvt_term::next_char () 2864rxvt_term::next_char ()
2870{ 2865{
2871 while (cmdbuf_ptr < cmdbuf_endp) 2866 while (cmdbuf_ptr < cmdbuf_endp)
2872 { 2867 {
2873 // assume 7-bit to be ascii ALWAYS 2868 // assume 7-bit to be ascii ALWAYS
… …
2883 cmdbuf_ptr = cmdbuf_endp; 2878 cmdbuf_ptr = cmdbuf_endp;
2884 break; 2879 break;
2885 } 2880 }
2886 2881
2887 if (len == (size_t)-1) 2882 if (len == (size_t)-1)
2888 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
2889 2884
2890 // assume wchar == unicode 2885 // assume wchar == unicode
2891 cmdbuf_ptr += len; 2886 cmdbuf_ptr += len;
2892 return wc & UNICODE_MASK; 2887 return wc & UNICODE_MASK;
2893 } 2888 }
2894 2889
2895 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;
2896} 2900}
2897 2901
2898/* rxvt_cmd_getc () - Return next input character */ 2902/* rxvt_cmd_getc () - Return next input character */
2899/* 2903/*
2900 * Return the next input character after first passing any keyboard input 2904 * Return the next input character after first passing any keyboard input
2901 * to the command. 2905 * to the command.
2902 */ 2906 */
2903unicode_t 2907wchar_t
2904rxvt_term::cmd_getc () 2908rxvt_term::cmd_getc ()
2905{ 2909{
2906 unicode_t c = next_char (); 2910 wchar_t c = next_char ();
2907 2911
2908 if (c == NOCHAR) 2912 if (c == NOCHAR)
2909 throw out_of_input; 2913 throw out_of_input;
2910 2914
2911 return c; 2915 return c;
2912} 2916}
2913 2917
2914unicode_t 2918uint32_t
2915rxvt_term::cmd_get8 () 2919rxvt_term::cmd_get8 ()
2916{ 2920{
2917 unicode_t c = next_octet (); 2921 uint32_t c = next_octet ();
2918 2922
2919 if (c == NOCHAR) 2923 if (c == NOCHAR)
2920 throw out_of_input; 2924 throw out_of_input;
2921 2925
2922 return c; 2926 return c;
… …
3189 break; 3193 break;
3190 3194
3191 /* 8.3.87: NEXT LINE */ 3195 /* 8.3.87: NEXT LINE */
3192 case C1_NEL: /* ESC E */ 3196 case C1_NEL: /* ESC E */
3193 { 3197 {
3194 unicode_t nlcr[] = { C0_LF, C0_CR }; 3198 wchar_t nlcr[] = { C0_LF, C0_CR };
3195 scr_add_lines (nlcr, 1, 2); 3199 scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1);
3196 } 3200 }
3197 break; 3201 break;
3198 3202
3199 /* kidnapped escape sequence: Should be 8.3.48 */ 3203 /* kidnapped escape sequence: Should be 8.3.48 */
3200 case C1_ESA: /* ESC G */ 3204 case C1_ESA: /* ESC G */
… …
4028 break; 4032 break;
4029#endif 4033#endif
4030 4034
4031#if ENABLE_PERL 4035#if ENABLE_PERL
4032 case URxvt_perl: 4036 case URxvt_perl:
4033 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)))
4034 ; // no responses yet 4038 ; // no responses yet
4035 break; 4039 break;
4036#endif 4040#endif
4037 } 4041 }
4038} 4042}
… …
4150 /* extra handling for values with state unkept */ 4154 /* extra handling for values with state unkept */
4151 switch (arg[i]) 4155 switch (arg[i])
4152 { 4156 {
4153#if ENABLE_STYLES 4157#if ENABLE_STYLES
4154 case 1021: 4158 case 1021:
4155 if (mode) 4159 set_option (Opt_intensityStyles, mode);
4156 SET_OPTION (Opt_intensityStyles);
4157 else
4158 CLR_OPTION (Opt_intensityStyles);
4159 4160
4160 scr_touch (true); 4161 scr_touch (true);
4161 break; 4162 break;
4162#endif 4163#endif
4163 case 1048: /* alternative cursor save */ 4164 case 1048: /* alternative cursor save */
… …
4185 case 3: /* 80/132 */ 4186 case 3: /* 80/132 */
4186 if (priv_modes & PrivMode_132OK) 4187 if (priv_modes & PrivMode_132OK)
4187 set_widthheight (((state ? 132 : 80) * fwidth), height); 4188 set_widthheight (((state ? 132 : 80) * fwidth), height);
4188 break; 4189 break;
4189 case 4: /* smooth scrolling */ 4190 case 4: /* smooth scrolling */
4190 if (!state) 4191 set_option (Opt_jumpScroll, !state);
4191 SET_OPTION (Opt_jumpScroll);
4192 else
4193 CLR_OPTION (Opt_jumpScroll);
4194 break; 4192 break;
4195 case 5: /* reverse video */ 4193 case 5: /* reverse video */
4196 scr_rvideo_mode (state); 4194 scr_rvideo_mode (state);
4197 break; 4195 break;
4198 case 6: /* relative/absolute origins */ 4196 case 6: /* relative/absolute origins */
… …
4239#if 0 4237#if 0
4240 case 1001: 4238 case 1001:
4241 break; /* X11 mouse highlighting */ 4239 break; /* X11 mouse highlighting */
4242#endif 4240#endif
4243 case 1010: /* scroll to bottom on TTY output inhibit */ 4241 case 1010: /* scroll to bottom on TTY output inhibit */
4244 if (!state) 4242 set_option (Opt_scrollTtyOutput, !state);
4245 SET_OPTION (Opt_scrollTtyOutput);
4246 else
4247 CLR_OPTION (Opt_scrollTtyOutput);
4248 break; 4243 break;
4249 case 1011: /* scroll to bottom on key press */ 4244 case 1011: /* scroll to bottom on key press */
4250 if (state) 4245 set_option (Opt_scrollTtyKeypress, state);
4251 SET_OPTION (Opt_scrollTtyKeypress);
4252 else
4253 CLR_OPTION (Opt_scrollTtyKeypress);
4254 break; 4246 break;
4255 case 1047: /* secondary screen w/ clearing last */ 4247 case 1047: /* secondary screen w/ clearing last */
4256 if (OPTION (Opt_secondaryScreen)) 4248 if (OPTION (Opt_secondaryScreen))
4257 if (current_screen != PRIMARY) 4249 if (current_screen != PRIMARY)
4258 scr_erase_screen (2); 4250 scr_erase_screen (2);

Diff Legend

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