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.476 by sf-exg, Fri Feb 11 01:24:46 2011 UTC vs.
Revision 1.496 by sf-exg, Wed Aug 31 22:39:49 2011 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-2007 Marc Lehmann <pcg@goof.com> 30 * Copyright (c) 2003-2011 Marc Lehmann <schmorp@schmorp.de>
31 * Copyright (c) 2007 Emanuele Giaquinta <e.giaquinta@glauco.it> 31 * Copyright (c) 2007 Emanuele Giaquinta <e.giaquinta@glauco.it>
32 * 32 *
33 * This program is free software; you can redistribute it and/or modify 33 * This program is free software; you can redistribute it and/or modify
34 * it under the terms of the GNU General Public License as published by 34 * it under the terms of the GNU General Public License as published by
35 * the Free Software Foundation; either version 2 of the License, or 35 * the Free Software Foundation; either version 2 of the License, or
… …
257#endif 257#endif
258 258
259void 259void
260rxvt_term::commit_iso14755 () 260rxvt_term::commit_iso14755 ()
261{ 261{
262 wchar_t ch[2];
263
264 ch[0] = iso14755buf & ISO_14755_MASK; 262 wchar_t ch = iso14755buf & ISO_14755_MASK;
265 ch[1] = 0;
266 263
267 if (iso14755buf & ISO_14755_51) 264 if (iso14755buf & ISO_14755_51)
268 { 265 {
269 char mb[16]; 266 char mb[MB_LEN_MAX];
270 int len; 267 int len;
271 268
272 // allow verbatim 0-bytes and control-bytes to be entered 269 // allow verbatim 0-bytes and control-bytes to be entered
273 if (ch[0] >= 0x20) 270 if (ch >= 0x20)
274 len = wcstombs (mb, ch, 16); 271 len = wctomb (mb, ch);
275 else 272 else
276 { 273 {
277 mb[0] = ch[0]; 274 mb[0] = ch;
278 len = 1; 275 len = 1;
279 } 276 }
280 277
281 if (len > 0) 278 if (len > 0)
282 tt_write (mb, len); 279 tt_write (mb, len);
… …
569 selection_request (ev.time); 566 selection_request (ev.time);
570 return; 567 return;
571#if TODO 568#if TODO
572 /* rxvt extras */ 569 /* rxvt extras */
573 case XK_KP_Add: /* Shift+KP_Add = bigger font */ 570 case XK_KP_Add: /* Shift+KP_Add = bigger font */
574 change_font (FONT_UP);
575 return; 571 return;
576 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */ 572 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */
577 change_font (FONT_DN);
578 return; 573 return;
579#endif 574#endif
580 } 575 }
581 } 576 }
582 } 577 }
… …
936 else if (keysym == XK_Control_L || keysym == XK_Control_R) 931 else if (keysym == XK_Control_L || keysym == XK_Control_R)
937 mouse_slip_wheel_speed = 0; 932 mouse_slip_wheel_speed = 0;
938#endif 933#endif
939} 934}
940 935
941#if defined (KEYSYM_RESOURCE)
942unsigned int
943rxvt_term::cmd_write (const char *str, unsigned int count)
944{
945 unsigned int n, s;
946
947 n = cmdbuf_ptr - cmdbuf_base;
948 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp;
949
950 if (n > 0 && s < count)
951 {
952 memmove (cmdbuf_base, cmdbuf_ptr,
953 (unsigned int) (cmdbuf_endp - cmdbuf_ptr));
954 cmdbuf_ptr = cmdbuf_base;
955 cmdbuf_endp -= n;
956 s += n;
957 }
958
959 if (count > s)
960 {
961 rxvt_warn ("data loss: cmd_write too large, continuing.\n");
962 count = s;
963 }
964
965 for (; count--;)
966 *cmdbuf_endp++ = *str++;
967
968 cmd_parse ();
969
970 return 0;
971}
972#endif
973
974void 936void
975rxvt_term::flush () 937rxvt_term::flush ()
976{ 938{
977 flush_ev.stop (); 939 flush_ev.stop ();
978 940
… …
1025 } 987 }
1026 988
1027 scr_refresh (); 989 scr_refresh ();
1028 scrollBar.show (1); 990 scrollBar.show (1);
1029#ifdef USE_XIM 991#ifdef USE_XIM
1030 IMSendSpot (); 992 im_send_spot ();
1031#endif 993#endif
1032 } 994 }
1033 995
1034 display->flush (); 996 display->flush ();
1035} 997}
… …
1152 { 1114 {
1153 } 1115 }
1154} event_handler; 1116} event_handler;
1155#endif 1117#endif
1156 1118
1119/* make sure all the cmd data is at beginning of cmdbuf */
1120void
1121rxvt_term::cmdbuf_reify ()
1122{
1123 if (cmdbuf_ptr == cmdbuf_base)
1124 return;
1125
1126 ssize_t used = cmdbuf_endp - cmdbuf_ptr;
1127
1128 memmove (cmdbuf_base, cmdbuf_ptr, used);
1129 cmdbuf_ptr = cmdbuf_base;
1130 cmdbuf_endp = cmdbuf_ptr + used;
1131
1132}
1133
1134#if defined (KEYSYM_RESOURCE)
1135void
1136rxvt_term::cmdbuf_append (const char *str, size_t count)
1137{
1138 cmdbuf_reify ();
1139
1140 size_t avail = cmdbuf_base + CBUFSIZ - cmdbuf_endp;
1141
1142 if (count > avail)
1143 return;
1144
1145 memcpy (cmdbuf_endp, str, count);
1146 cmdbuf_endp += count;
1147
1148 cmd_parse ();
1149}
1150#endif
1151
1157bool 1152bool
1158rxvt_term::pty_fill () 1153rxvt_term::pty_fill ()
1159{ 1154{
1160 ssize_t n = cmdbuf_endp - cmdbuf_ptr; 1155 cmdbuf_reify ();
1161 1156
1162 if (CBUFSIZ == n) 1157 size_t avail = cmdbuf_base + CBUFSIZ - cmdbuf_endp;
1163 { 1158
1164 rxvt_warn ("PLEASE REPORT: pty_fill on full buffer, draining input, continuing.\n"); 1159 if (!avail)
1165 n = 0;
1166 } 1160 {
1167 1161 // normally this indicates a "too long" command sequence - just drop the data we have
1168 memmove (cmdbuf_base, cmdbuf_ptr, n);
1169 cmdbuf_ptr = cmdbuf_base; 1162 cmdbuf_ptr = cmdbuf_base;
1170 cmdbuf_endp = cmdbuf_ptr + n; 1163 cmdbuf_endp = cmdbuf_ptr;
1164 avail = CBUFSIZ;
1165 }
1171 1166
1172 ssize_t r = read (pty->pty, cmdbuf_endp, CBUFSIZ - n); 1167 ssize_t r = read (pty->pty, cmdbuf_endp, avail);
1173 1168
1174 if (r > 0) 1169 if (r > 0)
1175 { 1170 {
1176 cmdbuf_endp += r; 1171 cmdbuf_endp += r;
1177 return true; 1172 return true;
… …
1445 && ev.xfocus.mode != NotifyGrab) 1440 && ev.xfocus.mode != NotifyGrab)
1446 focus_out (); 1441 focus_out ();
1447 break; 1442 break;
1448 1443
1449 case ConfigureNotify: 1444 case ConfigureNotify:
1450 if (ev.xconfigure.window == parent[0]) 1445 if (ev.xconfigure.window == parent)
1451 { 1446 {
1452 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev)) 1447 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1453 ; 1448 ;
1454 1449
1455#ifdef HAVE_BG_PIXMAP 1450#ifdef HAVE_BG_PIXMAP
… …
1478 } 1473 }
1479 else 1474 else
1480 { 1475 {
1481#ifdef HAVE_BG_PIXMAP 1476#ifdef HAVE_BG_PIXMAP
1482 if (moved) 1477 if (moved)
1483 {
1484 if (mapped)
1485 update_background (); 1478 update_background ();
1486 else
1487 bg_invalidate ();
1488 }
1489#endif 1479#endif
1490 } 1480 }
1491 1481
1492 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END)); 1482 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1493 } 1483 }
… …
1676 XQueryPointer (dpy, scrollBar.win, 1666 XQueryPointer (dpy, scrollBar.win,
1677 &unused_root, &unused_child, 1667 &unused_root, &unused_child,
1678 &unused_root_x, &unused_root_y, 1668 &unused_root_x, &unused_root_y,
1679 &ev.xbutton.x, &ev.xbutton.y, 1669 &ev.xbutton.x, &ev.xbutton.y,
1680 &unused_mask); 1670 &unused_mask);
1681 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1671 scr_move_to (scrollBar.position (ev.xbutton.y) - csrO,
1682 scrollBar.size ()); 1672 scrollBar.size ());
1683 want_refresh = 1; 1673 want_refresh = 1;
1684 scrollBar.show (1); 1674 scrollBar.show (1);
1685 } 1675 }
1686 break; 1676 break;
… …
1721rxvt_term::set_urgency (bool enable) 1711rxvt_term::set_urgency (bool enable)
1722{ 1712{
1723 if (enable == urgency_hint) 1713 if (enable == urgency_hint)
1724 return; 1714 return;
1725 1715
1726 if (XWMHints *h = XGetWMHints (dpy, parent[0])) 1716 if (XWMHints *h = XGetWMHints (dpy, parent))
1727 { 1717 {
1728 h->flags = h->flags & ~XUrgencyHint | (enable ? XUrgencyHint : 0); 1718 h->flags = h->flags & ~XUrgencyHint | (enable ? XUrgencyHint : 0);
1729 XSetWMHints (dpy, parent[0], h); 1719 XSetWMHints (dpy, parent, h);
1730 urgency_hint = enable; 1720 urgency_hint = enable;
1731 } 1721 }
1732} 1722}
1733#endif 1723#endif
1734 1724
… …
1741 want_refresh = 1; 1731 want_refresh = 1;
1742 1732
1743#if USE_XIM 1733#if USE_XIM
1744 if (Input_Context != NULL) 1734 if (Input_Context != NULL)
1745 { 1735 {
1746 IMSetPosition (); 1736 im_set_position ();
1747 XSetICFocus (Input_Context); 1737 XSetICFocus (Input_Context);
1748 } 1738 }
1749#endif 1739#endif
1750#if CURSOR_BLINK 1740#if CURSOR_BLINK
1751 if (option (Opt_cursorBlink)) 1741 if (option (Opt_cursorBlink))
… …
2054 csrO = scrollBar.bot - scrollBar.top; 2044 csrO = scrollBar.bot - scrollBar.top;
2055 break; 2045 break;
2056 } 2046 }
2057 2047
2058 if (scrollBar.style == R_SB_XTERM 2048 if (scrollBar.style == R_SB_XTERM
2059 || scrollbar_above_slider (ev.y) 2049 || scrollBar.above_slider (ev.y)
2060 || scrollbar_below_slider (ev.y)) 2050 || scrollBar.below_slider (ev.y))
2061 scr_move_to (scrollbar_position (ev.y) - csrO, scrollBar.size ()); 2051 scr_move_to (scrollBar.position (ev.y) - csrO, scrollBar.size ());
2062 2052
2063 scrollBar.state = STATE_MOTION; 2053 scrollBar.state = STATE_MOTION;
2064 break; 2054 break;
2065 2055
2066 case Button1: 2056 case Button1:
… …
2069 /* FALLTHROUGH */ 2059 /* FALLTHROUGH */
2070 2060
2071 case Button3: 2061 case Button3:
2072 if (scrollBar.style != R_SB_XTERM) 2062 if (scrollBar.style != R_SB_XTERM)
2073 { 2063 {
2074 if (scrollbar_above_slider (ev.y)) 2064 if (scrollBar.above_slider (ev.y))
2075# ifdef RXVT_SCROLL_FULL 2065# ifdef RXVT_SCROLL_FULL
2076 scr_page (UP, nrow - 1); 2066 scr_page (UP, nrow - 1);
2077# else 2067# else
2078 scr_page (UP, nrow / 4); 2068 scr_page (UP, nrow / 4);
2079# endif 2069# endif
2080 else if (scrollbar_below_slider (ev.y)) 2070 else if (scrollBar.below_slider (ev.y))
2081# ifdef RXVT_SCROLL_FULL 2071# ifdef RXVT_SCROLL_FULL
2082 scr_page (DN, nrow - 1); 2072 scr_page (DN, nrow - 1);
2083# else 2073# else
2084 scr_page (DN, nrow / 4); 2074 scr_page (DN, nrow / 4);
2085# endif 2075# endif
… …
2088 } 2078 }
2089 else 2079 else
2090 { 2080 {
2091 scr_page ((ev.button == Button1 ? DN : UP), 2081 scr_page ((ev.button == Button1 ? DN : UP),
2092 (nrow 2082 (nrow
2093 * scrollbar_position (ev.y) 2083 * scrollBar.position (ev.y)
2094 / scrollBar.size ())); 2084 / scrollBar.size ()));
2095 } 2085 }
2096 2086
2097 break; 2087 break;
2098 } 2088 }
… …
2224 wchar_t ch = NOCHAR; 2214 wchar_t ch = NOCHAR;
2225 char *seq_begin; // remember start of esc-sequence here 2215 char *seq_begin; // remember start of esc-sequence here
2226 2216
2227 for (;;) 2217 for (;;)
2228 { 2218 {
2229 if (expect_false (ch == NOCHAR)) 2219 if (ecb_unlikely (ch == NOCHAR))
2230 { 2220 {
2231 seq_begin = cmdbuf_ptr; 2221 seq_begin = cmdbuf_ptr;
2232 ch = next_char (); 2222 ch = next_char ();
2233 2223
2234 if (ch == NOCHAR) 2224 if (ch == NOCHAR)
2235 break; 2225 break;
2236 } 2226 }
2237 2227
2238 if (expect_true (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT)) 2228 if (ecb_likely (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT))
2239 { 2229 {
2240 if (expect_false (!seen_input)) 2230 if (ecb_unlikely (!seen_input))
2241 { 2231 {
2242 seen_input = 1; 2232 seen_input = 1;
2243 // many badly-written programs (e.g. jed) contain a race condition: 2233 // many badly-written programs (e.g. jed) contain a race condition:
2244 // they first read the screensize and then install a SIGWINCH handler. 2234 // they first read the screensize and then install a SIGWINCH handler.
2245 // some window managers resize the window early, and these programs 2235 // some window managers resize the window early, and these programs
… …
2258 wchar_t *str = buf; 2248 wchar_t *str = buf;
2259 wchar_t *eol = str + min (ncol, UBUFSIZ); 2249 wchar_t *eol = str + min (ncol, UBUFSIZ);
2260 2250
2261 for (;;) 2251 for (;;)
2262 { 2252 {
2263 if (expect_false (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))) 2253 if (ecb_unlikely (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)))
2264 break; 2254 break;
2265 2255
2266 *str++ = ch; 2256 *str++ = ch;
2267 2257
2268 if (expect_false (ch == C0_LF || str >= eol)) 2258 if (ecb_unlikely (ch == C0_LF || str >= eol))
2269 { 2259 {
2270 if (ch == C0_LF) 2260 if (ch == C0_LF)
2271 nlines++; 2261 nlines++;
2272 2262
2273 refresh_count++; 2263 refresh_count++;
… …
2351rxvt_term::next_char () NOTHROW 2341rxvt_term::next_char () NOTHROW
2352{ 2342{
2353 while (cmdbuf_ptr < cmdbuf_endp) 2343 while (cmdbuf_ptr < cmdbuf_endp)
2354 { 2344 {
2355 // assume 7-bit to be ascii ALWAYS 2345 // assume 7-bit to be ascii ALWAYS
2356 if (expect_true ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)) 2346 if (ecb_likely ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b))
2357 return *cmdbuf_ptr++; 2347 return *cmdbuf_ptr++;
2358 2348
2359 wchar_t wc; 2349 wchar_t wc;
2360 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate); 2350 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2361 2351
… …
2389 : NOCHAR; 2379 : NOCHAR;
2390} 2380}
2391 2381
2392static class out_of_input out_of_input; 2382static class out_of_input out_of_input;
2393 2383
2394/* rxvt_cmd_getc () - Return next input character */
2395/*
2396 * Return the next input character after first passing any keyboard input
2397 * to the command.
2398 */
2399wchar_t 2384wchar_t
2400rxvt_term::cmd_getc () THROW ((class out_of_input)) 2385rxvt_term::cmd_getc () THROW ((class out_of_input))
2401{ 2386{
2402 wchar_t c = next_char (); 2387 wchar_t c = next_char ();
2403 2388
… …
2496 pclose_printer (fd); 2481 pclose_printer (fd);
2497} 2482}
2498#endif /* PRINTPIPE */ 2483#endif /* PRINTPIPE */
2499/*}}} */ 2484/*}}} */
2500 2485
2501/* *INDENT-OFF* */
2502enum { 2486enum {
2503 C1_40 = 0x40, 2487 C1_40 = 0x40,
2504 C1_41 , C1_BPH, C1_NBH, C1_44 , C1_NEL, C1_SSA, C1_ESA, 2488 C1_41 , C1_BPH, C1_NBH, C1_44 , C1_NEL, C1_SSA, C1_ESA,
2505 C1_HTS, C1_HTJ, C1_VTS, C1_PLD, C1_PLU, C1_RI , C1_SS2, C1_SS3, 2489 C1_HTS, C1_HTJ, C1_VTS, C1_PLD, C1_PLU, C1_RI , C1_SS2, C1_SS3,
2506 C1_DCS, C1_PU1, C1_PU2, C1_STS, C1_CCH, C1_MW , C1_SPA, C1_EPA, 2490 C1_DCS, C1_PU1, C1_PU2, C1_STS, C1_CCH, C1_MW , C1_SPA, C1_EPA,
2507 C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC, 2491 C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC,
2508}; 2492};
2509/* *INDENT-ON* */
2510 2493
2511/*{{{ process non-printing single characters */ 2494/*{{{ process non-printing single characters */
2512void 2495void
2513rxvt_term::process_nonprinting (unicode_t ch) 2496rxvt_term::process_nonprinting (unicode_t ch)
2514{ 2497{
… …
2607 break; 2590 break;
2608 case 'Z': /* identify the terminal type */ 2591 case 'Z': /* identify the terminal type */
2609 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */ 2592 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */
2610 break; 2593 break;
2611 case '<': /* turn off VT52 mode */ 2594 case '<': /* turn off VT52 mode */
2612 set_privmode (PrivMode_vt52, 0); 2595 priv_modes &= ~PrivMode_vt52;
2613 break; 2596 break;
2614 case 'F': /* use special graphics character set */ 2597 case 'F': /* use special graphics character set */
2615 case 'G': /* use regular character set */ 2598 case 'G': /* use regular character set */
2616 /* unimplemented */ 2599 /* unimplemented */
2617 break; 2600 break;
… …
2636 return; 2619 return;
2637 } 2620 }
2638 2621
2639 switch (ch) 2622 switch (ch)
2640 { 2623 {
2641 /* case 1: do_tek_mode (); break; */
2642 case '#': 2624 case '#':
2643 if (cmd_getc () == '8') 2625 if (cmd_getc () == '8')
2644 scr_E (); 2626 scr_E ();
2645 break; 2627 break;
2646 case '(': 2628 case '(':
… …
2669#if !ENABLE_MINIMAL 2651#if !ENABLE_MINIMAL
2670 case '9': 2652 case '9':
2671 scr_forwardindex (); 2653 scr_forwardindex ();
2672 break; 2654 break;
2673#endif 2655#endif
2656 // DECPAM/DECPNM
2674 case '=': 2657 case '=':
2658 priv_modes |= PrivMode_aplKP;
2659 break;
2675 case '>': 2660 case '>':
2676 set_privmode (PrivMode_aplKP, ch == '='); 2661 priv_modes &= ~PrivMode_aplKP;
2677 break; 2662 break;
2678 2663
2679 case C1_40: 2664 case C1_40:
2680 cmd_getc (); 2665 cmd_getc ();
2681 break; 2666 break;
… …
2685 2670
2686 /* 8.3.87: NEXT LINE */ 2671 /* 8.3.87: NEXT LINE */
2687 case C1_NEL: /* ESC E */ 2672 case C1_NEL: /* ESC E */
2688 { 2673 {
2689 wchar_t nlcr[] = { C0_LF, C0_CR }; 2674 wchar_t nlcr[] = { C0_LF, C0_CR };
2690 scr_add_lines (nlcr, ARRAY_LENGTH(nlcr), 1); 2675 scr_add_lines (nlcr, ecb_array_length (nlcr), 1);
2691 } 2676 }
2692 break; 2677 break;
2693 2678
2694 /* kidnapped escape sequence: Should be 8.3.48 */ 2679 /* kidnapped escape sequence: Should be 8.3.48 */
2695 case C1_ESA: /* ESC G */ 2680 case C1_ESA: /* ESC G */
2696 process_graphics (); 2681 // used by original rxvt for rob nations own graphics mode
2682 if (cmd_getc () == 'Q')
2683 tt_printf ("\033G0\012"); /* query graphics - no graphics */
2697 break; 2684 break;
2698 2685
2699 /* 8.3.63: CHARACTER TABULATION SET */ 2686 /* 8.3.63: CHARACTER TABULATION SET */
2700 case C1_HTS: /* ESC H */ 2687 case C1_HTS: /* ESC H */
2701 scr_set_tab (1); 2688 scr_set_tab (1);
… …
2705 case C1_RI: /* ESC M */ 2692 case C1_RI: /* ESC M */
2706 scr_index (DN); 2693 scr_index (DN);
2707 break; 2694 break;
2708 2695
2709 /* 8.3.142: SINGLE-SHIFT TWO */ 2696 /* 8.3.142: SINGLE-SHIFT TWO */
2710 /*case C1_SS2: scr_single_shift (2); break; */ 2697 /* case C1_SS2: break; */
2711 2698
2712 /* 8.3.143: SINGLE-SHIFT THREE */ 2699 /* 8.3.143: SINGLE-SHIFT THREE */
2713 /*case C1_SS3: scr_single_shift (3); break; */ 2700 /* case C1_SS3: break; */
2714 2701
2715 /* 8.3.27: DEVICE CONTROL STRING */ 2702 /* 8.3.27: DEVICE CONTROL STRING */
2716 case C1_DCS: /* ESC P */ 2703 case C1_DCS: /* ESC P */
2717 process_dcs_seq (); 2704 process_dcs_seq ();
2718 break; 2705 break;
… …
2751 } 2738 }
2752} 2739}
2753/*}}} */ 2740/*}}} */
2754 2741
2755/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */ 2742/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */
2756/* *INDENT-OFF* */
2757enum { 2743enum {
2758 CSI_ICH = 0x40, 2744 CSI_ICH = 0x40,
2759 CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA, 2745 CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA,
2760 CSI_CUP, CSI_CHT, CSI_ED , CSI_EL , CSI_IL , CSI_DL , CSI_EF , CSI_EA , 2746 CSI_CUP, CSI_CHT, CSI_ED , CSI_EL , CSI_IL , CSI_DL , CSI_EF , CSI_EA ,
2761 CSI_DCH, CSI_SEE, CSI_CPR, CSI_SU , CSI_SD , CSI_NP , CSI_PP , CSI_CTC, 2747 CSI_DCH, CSI_SEE, CSI_CPR, CSI_SU , CSI_SD , CSI_NP , CSI_PP , CSI_CTC,
… …
2781 make_byte (1,1,1,0,1,1,1,0), /* `, a, b, c, d, e, f, g, */ 2767 make_byte (1,1,1,0,1,1,1,0), /* `, a, b, c, d, e, f, g, */
2782 make_byte (0,0,1,1,0,0,0,0), /* h, i, j, k, l, m, n, o, */ 2768 make_byte (0,0,1,1,0,0,0,0), /* h, i, j, k, l, m, n, o, */
2783 make_byte (0,0,0,0,0,0,0,0), /* p, q, r, s, t, u, v, w, */ 2769 make_byte (0,0,0,0,0,0,0,0), /* p, q, r, s, t, u, v, w, */
2784 make_byte (0,0,0,0,0,0,0,0), /* x, y, z, {, |, }, ~, */ 2770 make_byte (0,0,0,0,0,0,0,0), /* x, y, z, {, |, }, ~, */
2785 }; 2771 };
2786/* *INDENT-ON* */
2787 2772
2788void 2773void
2789rxvt_term::process_csi_seq () 2774rxvt_term::process_csi_seq ()
2790{ 2775{
2791 unicode_t ch, priv, i; 2776 unicode_t ch, priv, i;
… …
2871 scr_soft_reset (); 2856 scr_soft_reset ();
2872 2857
2873 static const int pm_h[] = { 7, 25 }; 2858 static const int pm_h[] = { 7, 25 };
2874 static const int pm_l[] = { 1, 3, 4, 5, 6, 9, 66, 1000, 1001, 1005, 1015, 1049 }; 2859 static const int pm_l[] = { 1, 3, 4, 5, 6, 9, 66, 1000, 1001, 1005, 1015, 1049 };
2875 2860
2876 process_terminal_mode ('h', 0, ARRAY_LENGTH(pm_h), pm_h); 2861 process_terminal_mode ('h', 0, ecb_array_length (pm_h), pm_h);
2877 process_terminal_mode ('l', 0, ARRAY_LENGTH(pm_l), pm_l); 2862 process_terminal_mode ('l', 0, ecb_array_length (pm_l), pm_l);
2878 } 2863 }
2879 break; 2864 break;
2880 } 2865 }
2881 2866
2882 return; 2867 return;
… …
3101 } 3086 }
3102} 3087}
3103/*}}} */ 3088/*}}} */
3104 3089
3105#if !ENABLE_MINIMAL 3090#if !ENABLE_MINIMAL
3106/* ARGSUSED */
3107void 3091void
3108rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3092rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3109{ 3093{
3110 int x, y; 3094 int x, y;
3111 XWindowAttributes wattr; 3095 XWindowAttributes wattr;
… …
3120 { 3104 {
3121 /* 3105 /*
3122 * commands 3106 * commands
3123 */ 3107 */
3124 case 1: /* deiconify window */ 3108 case 1: /* deiconify window */
3125 XMapWindow (dpy, parent[0]); 3109 XMapWindow (dpy, parent);
3126 break; 3110 break;
3127 case 2: /* iconify window */ 3111 case 2: /* iconify window */
3128 XIconifyWindow (dpy, parent[0], display->screen); 3112 XIconifyWindow (dpy, parent, display->screen);
3129 break; 3113 break;
3130 case 3: /* set position (pixels) */ 3114 case 3: /* set position (pixels) */
3131 XMoveWindow (dpy, parent[0], args[1], args[2]); 3115 XMoveWindow (dpy, parent, args[1], args[2]);
3132 break; 3116 break;
3133 case 4: /* set size (pixels) */ 3117 case 4: /* set size (pixels) */
3134 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3118 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3135 break; 3119 break;
3136 case 5: /* raise window */ 3120 case 5: /* raise window */
3137 XRaiseWindow (dpy, parent[0]); 3121 XRaiseWindow (dpy, parent);
3138 break; 3122 break;
3139 case 6: /* lower window */ 3123 case 6: /* lower window */
3140 XLowerWindow (dpy, parent[0]); 3124 XLowerWindow (dpy, parent);
3141 break; 3125 break;
3142 case 7: /* refresh window */ 3126 case 7: /* refresh window */
3143 scr_touch (true); 3127 scr_touch (true);
3144 break; 3128 break;
3145 case 8: /* set size (chars) */ 3129 case 8: /* set size (chars) */
… …
3156 3140
3157 /* 3141 /*
3158 * reports - some output format copied from XTerm 3142 * reports - some output format copied from XTerm
3159 */ 3143 */
3160 case 11: /* report window state */ 3144 case 11: /* report window state */
3161 XGetWindowAttributes (dpy, parent[0], &wattr); 3145 XGetWindowAttributes (dpy, parent, &wattr);
3162 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3146 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3163 break; 3147 break;
3164 case 13: /* report window position */ 3148 case 13: /* report window position */
3165 XGetWindowAttributes (dpy, parent[0], &wattr); 3149 XGetWindowAttributes (dpy, parent, &wattr);
3166 XTranslateCoordinates (dpy, parent[0], wattr.root, 3150 XTranslateCoordinates (dpy, parent, wattr.root,
3167 -wattr.border_width, -wattr.border_width, 3151 -wattr.border_width, -wattr.border_width,
3168 &x, &y, &wdummy); 3152 &x, &y, &wdummy);
3169 tt_printf ("\033[3;%d;%dt", x, y); 3153 tt_printf ("\033[3;%d;%dt", x, y);
3170 break; 3154 break;
3171 case 14: /* report window size (pixels) */ 3155 case 14: /* report window size (pixels) */
3172 XGetWindowAttributes (dpy, parent[0], &wattr); 3156 XGetWindowAttributes (dpy, parent, &wattr);
3173 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3157 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3174 break; 3158 break;
3175 case 18: /* report text area size (chars) */ 3159 case 18: /* report text area size (chars) */
3176 tt_printf ("\033[8;%d;%dt", nrow, ncol); 3160 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3177 break; 3161 break;
… …
3179 tt_printf ("\033[9;%d;%dt", nrow, ncol); 3163 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3180 break; 3164 break;
3181 case 20: /* report icon label */ 3165 case 20: /* report icon label */
3182 { 3166 {
3183 char *s; 3167 char *s;
3184 XGetIconName (dpy, parent[0], &s); 3168 XGetIconName (dpy, parent, &s);
3185 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3169 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3186 XFree (s); 3170 XFree (s);
3187 } 3171 }
3188 break; 3172 break;
3189 case 21: /* report window title */ 3173 case 21: /* report window title */
3190 { 3174 {
3191 char *s; 3175 char *s;
3192 XFetchName (dpy, parent[0], &s); 3176 XFetchName (dpy, parent, &s);
3193 tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3177 tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3194 XFree (s); 3178 XFree (s);
3195 } 3179 }
3196 break; 3180 break;
3197 } 3181 }
… …
3351 unsigned long bytes_after; 3335 unsigned long bytes_after;
3352 unsigned char *value = 0; 3336 unsigned char *value = 0;
3353 const char *str = ""; 3337 const char *str = "";
3354 3338
3355 if (prop 3339 if (prop
3356 && XGetWindowProperty (dpy, parent[0], 3340 && XGetWindowProperty (dpy, parent,
3357 prop, 0, 1<<16, 0, AnyPropertyType, 3341 prop, 0, 1<<16, 0, AnyPropertyType,
3358 &actual_type, &actual_format, 3342 &actual_type, &actual_format,
3359 &nitems, &bytes_after, &value) == Success 3343 &nitems, &bytes_after, &value) == Success
3360 && actual_type != None 3344 && actual_type != None
3361 && actual_format == 8) 3345 && actual_format == 8)
… …
3373 { 3357 {
3374 *eq = 0; 3358 *eq = 0;
3375 set_utf8_property (display->atom (str), eq + 1); 3359 set_utf8_property (display->atom (str), eq + 1);
3376 } 3360 }
3377 else 3361 else
3378 XDeleteProperty (dpy, parent[0], 3362 XDeleteProperty (dpy, parent,
3379 display->atom (str)); 3363 display->atom (str));
3380 } 3364 }
3381 break; 3365 break;
3382 3366
3383 case XTerm_Color: 3367 case XTerm_Color:
… …
3466 min (h_align, 32767), min (v_align, 32767)); 3450 min (h_align, 32767), min (v_align, 32767));
3467 process_xterm_seq (XTerm_title, str, CHAR_ST); 3451 process_xterm_seq (XTerm_title, str, CHAR_ST);
3468 } 3452 }
3469 else 3453 else
3470 { 3454 {
3471 int changed = 0; 3455 bool changed = false;
3472 3456
3473 if (*str != ';') 3457 if (*str != ';')
3474 { 3458 {
3475 if (bg_set_file (str)) /* change pixmap */ 3459 if (bg_set_file (str)) /* change pixmap */
3476 {
3477 changed++; 3460 changed = true;
3478 str = strchr (str, ';');
3479 if (str == NULL)
3480 bg_set_default_geometry ();
3481 else
3482 bg_set_geometry (str+1);
3483 }
3484 } 3461 }
3485 else 3462 else
3486 { 3463 {
3487 str++; 3464 str++;
3488 if (bg_set_geometry (str, true)) 3465 if (bg_set_geometry (str, true))
3489 changed++; 3466 changed = true;
3490 } 3467 }
3491 3468
3492 if (changed) 3469 if (changed)
3493 { 3470 {
3494 if (bg_window_position_sensitive ()) 3471 if (bg_window_position_sensitive ())
… …
3610 if (mode == 'r') 3587 if (mode == 'r')
3611 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 3588 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3612 else 3589 else
3613 state = (mode == 't') ? ! (priv_modes & bit) : mode; 3590 state = (mode == 't') ? ! (priv_modes & bit) : mode;
3614 3591
3615 set_privmode (bit, state); 3592 if (state)
3593 priv_modes |= bit;
3594 else
3595 priv_modes &= ~bit;
3616 } 3596 }
3617 3597
3618 return state; 3598 return state;
3619} 3599}
3620 3600
3621/* we're not using priv _yet_ */ 3601/* we're not using priv _yet_ */
3622void 3602void
3623rxvt_term::process_terminal_mode (int mode, int priv UNUSED, unsigned int nargs, const int *arg) 3603rxvt_term::process_terminal_mode (int mode, int priv ecb_unused, unsigned int nargs, const int *arg)
3624{ 3604{
3625 unsigned int i, j; 3605 unsigned int i, j;
3626 int state; 3606 int state;
3627 3607
3628 static const struct 3608 static const struct
3629 { 3609 {
3630 const int argval; 3610 const int argval;
3631 const unsigned long bit; 3611 const unsigned long bit;
3632 } argtopriv[] = { 3612 } argtopriv[] = {
3633 { 1, PrivMode_aplCUR }, // DECCKM 3613 { 1, PrivMode_aplCUR }, // DECCKM
3634 { 2, PrivMode_vt52 }, 3614 { 2, PrivMode_vt52 }, // DECANM
3635 { 3, PrivMode_132 }, // DECCOLM 3615 { 3, PrivMode_132 }, // DECCOLM
3636 { 4, PrivMode_smoothScroll }, // DECSCLM 3616 { 4, PrivMode_smoothScroll }, // DECSCLM
3637 { 5, PrivMode_rVideo }, // DECSCNM 3617 { 5, PrivMode_rVideo }, // DECSCNM
3638 { 6, PrivMode_relOrigin }, // DECOM 3618 { 6, PrivMode_relOrigin }, // DECOM
3639 { 7, PrivMode_Autowrap }, // DECAWM 3619 { 7, PrivMode_Autowrap }, // DECAWM
3640 // 8, auto-repeat keys // DECARM 3620 // 8, auto-repeat keys // DECARM
3641 { 9, PrivMode_MouseX10 }, 3621 { 9, PrivMode_MouseX10 },
3642 // 18 end FF to printer after print screen 3622 // 18 end FF to printer after print screen
3643 // 19 Print screen prints full screen/scroll region 3623 // 19 Print screen prints full screen/scroll region
3644 { 25, PrivMode_VisibleCursor }, // cnorm/cvvis/civis 3624 { 25, PrivMode_VisibleCursor }, // DECTCEM cnorm/cvvis/civis
3645#ifdef scrollBar_esc 3625#ifdef scrollBar_esc
3646 { scrollBar_esc, PrivMode_scrollBar }, 3626 { scrollBar_esc, PrivMode_scrollBar },
3647#endif 3627#endif
3648 { 35, PrivMode_ShiftKeys }, // rxvt extension 3628 { 35, PrivMode_ShiftKeys }, // rxvt extension
3649 // 38, tektronix mode // DECTEK 3629 // 38, tektronix mode // DECTEK
3650 { 40, PrivMode_132OK }, 3630 { 40, PrivMode_132OK },
3651 // 41 xterm more fixes NYI 3631 // 41 xterm more fixes NYI
3652 // 45 margin bell NYI 3632 // 45 margin bell NYI
3653 // 46 start logging 3633 // 46 start logging
3654 { 47, PrivMode_Screen }, 3634 { 47, PrivMode_Screen },
3655 { 66, PrivMode_aplKP }, // DECPAM/DECPNM 3635 { 66, PrivMode_aplKP }, // DECNKM
3656#ifndef NO_BACKSPACE_KEY 3636#ifndef NO_BACKSPACE_KEY
3657 { 67, PrivMode_BackSpace }, // DECBKM 3637 { 67, PrivMode_BackSpace }, // DECBKM
3658#endif 3638#endif
3659 { 1000, PrivMode_MouseX11 }, 3639 { 1000, PrivMode_MouseX11 },
3660 { 1002, PrivMode_MouseBtnEvent }, 3640 { 1002, PrivMode_MouseBtnEvent },
… …
3689 for (i = 0; i < nargs; i++) 3669 for (i = 0; i < nargs; i++)
3690 { 3670 {
3691 state = -1; 3671 state = -1;
3692 3672
3693 /* basic handling */ 3673 /* basic handling */
3694 for (j = 0; j < ARRAY_LENGTH(argtopriv); j++) 3674 for (j = 0; j < ecb_array_length (argtopriv); j++)
3695 if (argtopriv[j].argval == arg[i]) 3675 if (argtopriv[j].argval == arg[i])
3696 { 3676 {
3697 state = privcases (mode, argtopriv[j].bit); 3677 state = privcases (mode, argtopriv[j].bit);
3698 break; 3678 break;
3699 } 3679 }
… …
3725 case 2: /* VT52 mode */ 3705 case 2: /* VT52 mode */
3726 /* oddball mode. should be set regardless of set/reset 3706 /* oddball mode. should be set regardless of set/reset
3727 * parameter. Return from VT52 mode with an ESC < from 3707 * parameter. Return from VT52 mode with an ESC < from
3728 * within VT52 mode 3708 * within VT52 mode
3729 */ 3709 */
3730 set_privmode (PrivMode_vt52, 1); 3710 priv_modes |= PrivMode_vt52;
3731 break; 3711 break;
3732 case 3: /* 80/132 */ 3712 case 3: /* 80/132 */
3733 if (priv_modes & PrivMode_132OK) 3713 if (priv_modes & PrivMode_132OK)
3734 set_widthheight ((state ? 132 : 80) * fwidth, 24 * fheight); 3714 set_widthheight ((state ? 132 : 80) * fwidth, 24 * fheight);
3735 break; 3715 break;
… …
3750 if (state) /* orthogonal */ 3730 if (state) /* orthogonal */
3751 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent); 3731 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
3752 break; 3732 break;
3753#ifdef scrollBar_esc 3733#ifdef scrollBar_esc
3754 case scrollBar_esc: 3734 case scrollBar_esc:
3755 if (scrollBar.map (state)) 3735 scrollBar.map (state);
3756 {
3757 resize_all_windows (0, 0, 0); 3736 resize_all_windows (0, 0, 0);
3758 scr_touch (true); 3737 scr_touch (true);
3759 }
3760 break; 3738 break;
3761#endif 3739#endif
3762 case 25: /* visible/invisible cursor */ 3740 case 25: /* visible/invisible cursor */
3763 scr_cursor_visible (state); 3741 scr_cursor_visible (state);
3764 break; 3742 break;
… …
3972 } 3950 }
3973 } 3951 }
3974} 3952}
3975/*}}} */ 3953/*}}} */
3976 3954
3977/*{{{ (do not) process Rob Nation's own graphics mode sequences */
3978void
3979rxvt_term::process_graphics ()
3980{
3981 unicode_t ch, cmd = cmd_getc ();
3982
3983 if (cmd == 'Q')
3984 {
3985 /* query graphics */
3986 tt_printf ("\033G0\012"); /* no graphics */
3987 return;
3988 }
3989 /* swallow other graphics sequences until terminating ':' */
3990 do
3991 ch = cmd_getc ();
3992 while (ch != ':');
3993}
3994/*}}} */
3995
3996/* ------------------------------------------------------------------------- */ 3955/* ------------------------------------------------------------------------- */
3997 3956
3998/* 3957/*
3999 * Send printf () formatted output to the command. 3958 * Send printf () formatted output to the command.
4000 * Only use for small amounts of data. 3959 * Only use for small amounts of data.
… …
4028 3987
4029 if (v_buflen == 0) 3988 if (v_buflen == 0)
4030 { 3989 {
4031 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE)); 3990 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE));
4032 3991
3992 max_it (written, 0);
3993
4033 if ((unsigned int)written == len) 3994 if (written == len)
4034 return; 3995 return;
4035 3996
4036 data += written; 3997 data += written;
4037 len -= written; 3998 len -= written;
4038 } 3999 }

Diff Legend

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