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.491 by sf-exg, Fri Aug 19 17:42:09 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
… …
1721rxvt_term::set_urgency (bool enable) 1716rxvt_term::set_urgency (bool enable)
1722{ 1717{
1723 if (enable == urgency_hint) 1718 if (enable == urgency_hint)
1724 return; 1719 return;
1725 1720
1726 if (XWMHints *h = XGetWMHints (dpy, parent[0])) 1721 if (XWMHints *h = XGetWMHints (dpy, parent))
1727 { 1722 {
1728 h->flags = h->flags & ~XUrgencyHint | (enable ? XUrgencyHint : 0); 1723 h->flags = h->flags & ~XUrgencyHint | (enable ? XUrgencyHint : 0);
1729 XSetWMHints (dpy, parent[0], h); 1724 XSetWMHints (dpy, parent, h);
1730 urgency_hint = enable; 1725 urgency_hint = enable;
1731 } 1726 }
1732} 1727}
1733#endif 1728#endif
1734 1729
… …
1741 want_refresh = 1; 1736 want_refresh = 1;
1742 1737
1743#if USE_XIM 1738#if USE_XIM
1744 if (Input_Context != NULL) 1739 if (Input_Context != NULL)
1745 { 1740 {
1746 IMSetPosition (); 1741 im_set_position ();
1747 XSetICFocus (Input_Context); 1742 XSetICFocus (Input_Context);
1748 } 1743 }
1749#endif 1744#endif
1750#if CURSOR_BLINK 1745#if CURSOR_BLINK
1751 if (option (Opt_cursorBlink)) 1746 if (option (Opt_cursorBlink))
… …
2224 wchar_t ch = NOCHAR; 2219 wchar_t ch = NOCHAR;
2225 char *seq_begin; // remember start of esc-sequence here 2220 char *seq_begin; // remember start of esc-sequence here
2226 2221
2227 for (;;) 2222 for (;;)
2228 { 2223 {
2229 if (expect_false (ch == NOCHAR)) 2224 if (ecb_unlikely (ch == NOCHAR))
2230 { 2225 {
2231 seq_begin = cmdbuf_ptr; 2226 seq_begin = cmdbuf_ptr;
2232 ch = next_char (); 2227 ch = next_char ();
2233 2228
2234 if (ch == NOCHAR) 2229 if (ch == NOCHAR)
2235 break; 2230 break;
2236 } 2231 }
2237 2232
2238 if (expect_true (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT)) 2233 if (ecb_likely (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT))
2239 { 2234 {
2240 if (expect_false (!seen_input)) 2235 if (ecb_unlikely (!seen_input))
2241 { 2236 {
2242 seen_input = 1; 2237 seen_input = 1;
2243 // many badly-written programs (e.g. jed) contain a race condition: 2238 // many badly-written programs (e.g. jed) contain a race condition:
2244 // they first read the screensize and then install a SIGWINCH handler. 2239 // they first read the screensize and then install a SIGWINCH handler.
2245 // some window managers resize the window early, and these programs 2240 // some window managers resize the window early, and these programs
… …
2258 wchar_t *str = buf; 2253 wchar_t *str = buf;
2259 wchar_t *eol = str + min (ncol, UBUFSIZ); 2254 wchar_t *eol = str + min (ncol, UBUFSIZ);
2260 2255
2261 for (;;) 2256 for (;;)
2262 { 2257 {
2263 if (expect_false (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))) 2258 if (ecb_unlikely (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)))
2264 break; 2259 break;
2265 2260
2266 *str++ = ch; 2261 *str++ = ch;
2267 2262
2268 if (expect_false (ch == C0_LF || str >= eol)) 2263 if (ecb_unlikely (ch == C0_LF || str >= eol))
2269 { 2264 {
2270 if (ch == C0_LF) 2265 if (ch == C0_LF)
2271 nlines++; 2266 nlines++;
2272 2267
2273 refresh_count++; 2268 refresh_count++;
… …
2351rxvt_term::next_char () NOTHROW 2346rxvt_term::next_char () NOTHROW
2352{ 2347{
2353 while (cmdbuf_ptr < cmdbuf_endp) 2348 while (cmdbuf_ptr < cmdbuf_endp)
2354 { 2349 {
2355 // assume 7-bit to be ascii ALWAYS 2350 // assume 7-bit to be ascii ALWAYS
2356 if (expect_true ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)) 2351 if (ecb_likely ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b))
2357 return *cmdbuf_ptr++; 2352 return *cmdbuf_ptr++;
2358 2353
2359 wchar_t wc; 2354 wchar_t wc;
2360 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate); 2355 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2361 2356
… …
2389 : NOCHAR; 2384 : NOCHAR;
2390} 2385}
2391 2386
2392static class out_of_input out_of_input; 2387static class out_of_input out_of_input;
2393 2388
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 2389wchar_t
2400rxvt_term::cmd_getc () THROW ((class out_of_input)) 2390rxvt_term::cmd_getc () THROW ((class out_of_input))
2401{ 2391{
2402 wchar_t c = next_char (); 2392 wchar_t c = next_char ();
2403 2393
… …
2496 pclose_printer (fd); 2486 pclose_printer (fd);
2497} 2487}
2498#endif /* PRINTPIPE */ 2488#endif /* PRINTPIPE */
2499/*}}} */ 2489/*}}} */
2500 2490
2501/* *INDENT-OFF* */
2502enum { 2491enum {
2503 C1_40 = 0x40, 2492 C1_40 = 0x40,
2504 C1_41 , C1_BPH, C1_NBH, C1_44 , C1_NEL, C1_SSA, C1_ESA, 2493 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, 2494 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, 2495 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, 2496 C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC,
2508}; 2497};
2509/* *INDENT-ON* */
2510 2498
2511/*{{{ process non-printing single characters */ 2499/*{{{ process non-printing single characters */
2512void 2500void
2513rxvt_term::process_nonprinting (unicode_t ch) 2501rxvt_term::process_nonprinting (unicode_t ch)
2514{ 2502{
… …
2636 return; 2624 return;
2637 } 2625 }
2638 2626
2639 switch (ch) 2627 switch (ch)
2640 { 2628 {
2641 /* case 1: do_tek_mode (); break; */
2642 case '#': 2629 case '#':
2643 if (cmd_getc () == '8') 2630 if (cmd_getc () == '8')
2644 scr_E (); 2631 scr_E ();
2645 break; 2632 break;
2646 case '(': 2633 case '(':
… …
2669#if !ENABLE_MINIMAL 2656#if !ENABLE_MINIMAL
2670 case '9': 2657 case '9':
2671 scr_forwardindex (); 2658 scr_forwardindex ();
2672 break; 2659 break;
2673#endif 2660#endif
2661 // DECPAM/DECPNM
2674 case '=': 2662 case '=':
2675 case '>': 2663 case '>':
2676 set_privmode (PrivMode_aplKP, ch == '='); 2664 set_privmode (PrivMode_aplKP, ch == '=');
2677 break; 2665 break;
2678 2666
… …
2685 2673
2686 /* 8.3.87: NEXT LINE */ 2674 /* 8.3.87: NEXT LINE */
2687 case C1_NEL: /* ESC E */ 2675 case C1_NEL: /* ESC E */
2688 { 2676 {
2689 wchar_t nlcr[] = { C0_LF, C0_CR }; 2677 wchar_t nlcr[] = { C0_LF, C0_CR };
2690 scr_add_lines (nlcr, ARRAY_LENGTH(nlcr), 1); 2678 scr_add_lines (nlcr, ecb_array_length (nlcr), 1);
2691 } 2679 }
2692 break; 2680 break;
2693 2681
2694 /* kidnapped escape sequence: Should be 8.3.48 */ 2682 /* kidnapped escape sequence: Should be 8.3.48 */
2695 case C1_ESA: /* ESC G */ 2683 case C1_ESA: /* ESC G */
2696 process_graphics (); 2684 // used by original rxvt for rob nations own graphics mode
2685 if (cmd_getc () == 'Q')
2686 tt_printf ("\033G0\012"); /* query graphics - no graphics */
2697 break; 2687 break;
2698 2688
2699 /* 8.3.63: CHARACTER TABULATION SET */ 2689 /* 8.3.63: CHARACTER TABULATION SET */
2700 case C1_HTS: /* ESC H */ 2690 case C1_HTS: /* ESC H */
2701 scr_set_tab (1); 2691 scr_set_tab (1);
… …
2705 case C1_RI: /* ESC M */ 2695 case C1_RI: /* ESC M */
2706 scr_index (DN); 2696 scr_index (DN);
2707 break; 2697 break;
2708 2698
2709 /* 8.3.142: SINGLE-SHIFT TWO */ 2699 /* 8.3.142: SINGLE-SHIFT TWO */
2710 /*case C1_SS2: scr_single_shift (2); break; */ 2700 /* case C1_SS2: break; */
2711 2701
2712 /* 8.3.143: SINGLE-SHIFT THREE */ 2702 /* 8.3.143: SINGLE-SHIFT THREE */
2713 /*case C1_SS3: scr_single_shift (3); break; */ 2703 /* case C1_SS3: break; */
2714 2704
2715 /* 8.3.27: DEVICE CONTROL STRING */ 2705 /* 8.3.27: DEVICE CONTROL STRING */
2716 case C1_DCS: /* ESC P */ 2706 case C1_DCS: /* ESC P */
2717 process_dcs_seq (); 2707 process_dcs_seq ();
2718 break; 2708 break;
… …
2751 } 2741 }
2752} 2742}
2753/*}}} */ 2743/*}}} */
2754 2744
2755/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */ 2745/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */
2756/* *INDENT-OFF* */
2757enum { 2746enum {
2758 CSI_ICH = 0x40, 2747 CSI_ICH = 0x40,
2759 CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA, 2748 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 , 2749 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, 2750 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, */ 2770 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, */ 2771 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, */ 2772 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, {, |, }, ~, */ 2773 make_byte (0,0,0,0,0,0,0,0), /* x, y, z, {, |, }, ~, */
2785 }; 2774 };
2786/* *INDENT-ON* */
2787 2775
2788void 2776void
2789rxvt_term::process_csi_seq () 2777rxvt_term::process_csi_seq ()
2790{ 2778{
2791 unicode_t ch, priv, i; 2779 unicode_t ch, priv, i;
… …
2871 scr_soft_reset (); 2859 scr_soft_reset ();
2872 2860
2873 static const int pm_h[] = { 7, 25 }; 2861 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 }; 2862 static const int pm_l[] = { 1, 3, 4, 5, 6, 9, 66, 1000, 1001, 1005, 1015, 1049 };
2875 2863
2876 process_terminal_mode ('h', 0, ARRAY_LENGTH(pm_h), pm_h); 2864 process_terminal_mode ('h', 0, ecb_array_length (pm_h), pm_h);
2877 process_terminal_mode ('l', 0, ARRAY_LENGTH(pm_l), pm_l); 2865 process_terminal_mode ('l', 0, ecb_array_length (pm_l), pm_l);
2878 } 2866 }
2879 break; 2867 break;
2880 } 2868 }
2881 2869
2882 return; 2870 return;
… …
3101 } 3089 }
3102} 3090}
3103/*}}} */ 3091/*}}} */
3104 3092
3105#if !ENABLE_MINIMAL 3093#if !ENABLE_MINIMAL
3106/* ARGSUSED */
3107void 3094void
3108rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3095rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3109{ 3096{
3110 int x, y; 3097 int x, y;
3111 XWindowAttributes wattr; 3098 XWindowAttributes wattr;
… …
3120 { 3107 {
3121 /* 3108 /*
3122 * commands 3109 * commands
3123 */ 3110 */
3124 case 1: /* deiconify window */ 3111 case 1: /* deiconify window */
3125 XMapWindow (dpy, parent[0]); 3112 XMapWindow (dpy, parent);
3126 break; 3113 break;
3127 case 2: /* iconify window */ 3114 case 2: /* iconify window */
3128 XIconifyWindow (dpy, parent[0], display->screen); 3115 XIconifyWindow (dpy, parent, display->screen);
3129 break; 3116 break;
3130 case 3: /* set position (pixels) */ 3117 case 3: /* set position (pixels) */
3131 XMoveWindow (dpy, parent[0], args[1], args[2]); 3118 XMoveWindow (dpy, parent, args[1], args[2]);
3132 break; 3119 break;
3133 case 4: /* set size (pixels) */ 3120 case 4: /* set size (pixels) */
3134 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3121 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3135 break; 3122 break;
3136 case 5: /* raise window */ 3123 case 5: /* raise window */
3137 XRaiseWindow (dpy, parent[0]); 3124 XRaiseWindow (dpy, parent);
3138 break; 3125 break;
3139 case 6: /* lower window */ 3126 case 6: /* lower window */
3140 XLowerWindow (dpy, parent[0]); 3127 XLowerWindow (dpy, parent);
3141 break; 3128 break;
3142 case 7: /* refresh window */ 3129 case 7: /* refresh window */
3143 scr_touch (true); 3130 scr_touch (true);
3144 break; 3131 break;
3145 case 8: /* set size (chars) */ 3132 case 8: /* set size (chars) */
… …
3156 3143
3157 /* 3144 /*
3158 * reports - some output format copied from XTerm 3145 * reports - some output format copied from XTerm
3159 */ 3146 */
3160 case 11: /* report window state */ 3147 case 11: /* report window state */
3161 XGetWindowAttributes (dpy, parent[0], &wattr); 3148 XGetWindowAttributes (dpy, parent, &wattr);
3162 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3149 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3163 break; 3150 break;
3164 case 13: /* report window position */ 3151 case 13: /* report window position */
3165 XGetWindowAttributes (dpy, parent[0], &wattr); 3152 XGetWindowAttributes (dpy, parent, &wattr);
3166 XTranslateCoordinates (dpy, parent[0], wattr.root, 3153 XTranslateCoordinates (dpy, parent, wattr.root,
3167 -wattr.border_width, -wattr.border_width, 3154 -wattr.border_width, -wattr.border_width,
3168 &x, &y, &wdummy); 3155 &x, &y, &wdummy);
3169 tt_printf ("\033[3;%d;%dt", x, y); 3156 tt_printf ("\033[3;%d;%dt", x, y);
3170 break; 3157 break;
3171 case 14: /* report window size (pixels) */ 3158 case 14: /* report window size (pixels) */
3172 XGetWindowAttributes (dpy, parent[0], &wattr); 3159 XGetWindowAttributes (dpy, parent, &wattr);
3173 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3160 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3174 break; 3161 break;
3175 case 18: /* report text area size (chars) */ 3162 case 18: /* report text area size (chars) */
3176 tt_printf ("\033[8;%d;%dt", nrow, ncol); 3163 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3177 break; 3164 break;
… …
3179 tt_printf ("\033[9;%d;%dt", nrow, ncol); 3166 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3180 break; 3167 break;
3181 case 20: /* report icon label */ 3168 case 20: /* report icon label */
3182 { 3169 {
3183 char *s; 3170 char *s;
3184 XGetIconName (dpy, parent[0], &s); 3171 XGetIconName (dpy, parent, &s);
3185 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3172 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3186 XFree (s); 3173 XFree (s);
3187 } 3174 }
3188 break; 3175 break;
3189 case 21: /* report window title */ 3176 case 21: /* report window title */
3190 { 3177 {
3191 char *s; 3178 char *s;
3192 XFetchName (dpy, parent[0], &s); 3179 XFetchName (dpy, parent, &s);
3193 tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3180 tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3194 XFree (s); 3181 XFree (s);
3195 } 3182 }
3196 break; 3183 break;
3197 } 3184 }
… …
3351 unsigned long bytes_after; 3338 unsigned long bytes_after;
3352 unsigned char *value = 0; 3339 unsigned char *value = 0;
3353 const char *str = ""; 3340 const char *str = "";
3354 3341
3355 if (prop 3342 if (prop
3356 && XGetWindowProperty (dpy, parent[0], 3343 && XGetWindowProperty (dpy, parent,
3357 prop, 0, 1<<16, 0, AnyPropertyType, 3344 prop, 0, 1<<16, 0, AnyPropertyType,
3358 &actual_type, &actual_format, 3345 &actual_type, &actual_format,
3359 &nitems, &bytes_after, &value) == Success 3346 &nitems, &bytes_after, &value) == Success
3360 && actual_type != None 3347 && actual_type != None
3361 && actual_format == 8) 3348 && actual_format == 8)
… …
3373 { 3360 {
3374 *eq = 0; 3361 *eq = 0;
3375 set_utf8_property (display->atom (str), eq + 1); 3362 set_utf8_property (display->atom (str), eq + 1);
3376 } 3363 }
3377 else 3364 else
3378 XDeleteProperty (dpy, parent[0], 3365 XDeleteProperty (dpy, parent,
3379 display->atom (str)); 3366 display->atom (str));
3380 } 3367 }
3381 break; 3368 break;
3382 3369
3383 case XTerm_Color: 3370 case XTerm_Color:
… …
3473 if (*str != ';') 3460 if (*str != ';')
3474 { 3461 {
3475 if (bg_set_file (str)) /* change pixmap */ 3462 if (bg_set_file (str)) /* change pixmap */
3476 { 3463 {
3477 changed++; 3464 changed++;
3478 str = strchr (str, ';');
3479 if (str == NULL)
3480 bg_set_default_geometry ();
3481 else
3482 bg_set_geometry (str+1);
3483 } 3465 }
3484 } 3466 }
3485 else 3467 else
3486 { 3468 {
3487 str++; 3469 str++;
… …
3618 return state; 3600 return state;
3619} 3601}
3620 3602
3621/* we're not using priv _yet_ */ 3603/* we're not using priv _yet_ */
3622void 3604void
3623rxvt_term::process_terminal_mode (int mode, int priv UNUSED, unsigned int nargs, const int *arg) 3605rxvt_term::process_terminal_mode (int mode, int priv ecb_unused, unsigned int nargs, const int *arg)
3624{ 3606{
3625 unsigned int i, j; 3607 unsigned int i, j;
3626 int state; 3608 int state;
3627 3609
3628 static const struct 3610 static const struct
3629 { 3611 {
3630 const int argval; 3612 const int argval;
3631 const unsigned long bit; 3613 const unsigned long bit;
3632 } argtopriv[] = { 3614 } argtopriv[] = {
3633 { 1, PrivMode_aplCUR }, // DECCKM 3615 { 1, PrivMode_aplCUR }, // DECCKM
3634 { 2, PrivMode_vt52 }, 3616 { 2, PrivMode_vt52 }, // DECANM
3635 { 3, PrivMode_132 }, // DECCOLM 3617 { 3, PrivMode_132 }, // DECCOLM
3636 { 4, PrivMode_smoothScroll }, // DECSCLM 3618 { 4, PrivMode_smoothScroll }, // DECSCLM
3637 { 5, PrivMode_rVideo }, // DECSCNM 3619 { 5, PrivMode_rVideo }, // DECSCNM
3638 { 6, PrivMode_relOrigin }, // DECOM 3620 { 6, PrivMode_relOrigin }, // DECOM
3639 { 7, PrivMode_Autowrap }, // DECAWM 3621 { 7, PrivMode_Autowrap }, // DECAWM
3640 // 8, auto-repeat keys // DECARM 3622 // 8, auto-repeat keys // DECARM
3641 { 9, PrivMode_MouseX10 }, 3623 { 9, PrivMode_MouseX10 },
3642 // 18 end FF to printer after print screen 3624 // 18 end FF to printer after print screen
3643 // 19 Print screen prints full screen/scroll region 3625 // 19 Print screen prints full screen/scroll region
3644 { 25, PrivMode_VisibleCursor }, // cnorm/cvvis/civis 3626 { 25, PrivMode_VisibleCursor }, // DECTCEM cnorm/cvvis/civis
3645#ifdef scrollBar_esc 3627#ifdef scrollBar_esc
3646 { scrollBar_esc, PrivMode_scrollBar }, 3628 { scrollBar_esc, PrivMode_scrollBar },
3647#endif 3629#endif
3648 { 35, PrivMode_ShiftKeys }, // rxvt extension 3630 { 35, PrivMode_ShiftKeys }, // rxvt extension
3649 // 38, tektronix mode // DECTEK 3631 // 38, tektronix mode // DECTEK
3650 { 40, PrivMode_132OK }, 3632 { 40, PrivMode_132OK },
3651 // 41 xterm more fixes NYI 3633 // 41 xterm more fixes NYI
3652 // 45 margin bell NYI 3634 // 45 margin bell NYI
3653 // 46 start logging 3635 // 46 start logging
3654 { 47, PrivMode_Screen }, 3636 { 47, PrivMode_Screen },
3655 { 66, PrivMode_aplKP }, // DECPAM/DECPNM 3637 { 66, PrivMode_aplKP }, // DECNKM
3656#ifndef NO_BACKSPACE_KEY 3638#ifndef NO_BACKSPACE_KEY
3657 { 67, PrivMode_BackSpace }, // DECBKM 3639 { 67, PrivMode_BackSpace }, // DECBKM
3658#endif 3640#endif
3659 { 1000, PrivMode_MouseX11 }, 3641 { 1000, PrivMode_MouseX11 },
3660 { 1002, PrivMode_MouseBtnEvent }, 3642 { 1002, PrivMode_MouseBtnEvent },
… …
3689 for (i = 0; i < nargs; i++) 3671 for (i = 0; i < nargs; i++)
3690 { 3672 {
3691 state = -1; 3673 state = -1;
3692 3674
3693 /* basic handling */ 3675 /* basic handling */
3694 for (j = 0; j < ARRAY_LENGTH(argtopriv); j++) 3676 for (j = 0; j < ecb_array_length (argtopriv); j++)
3695 if (argtopriv[j].argval == arg[i]) 3677 if (argtopriv[j].argval == arg[i])
3696 { 3678 {
3697 state = privcases (mode, argtopriv[j].bit); 3679 state = privcases (mode, argtopriv[j].bit);
3698 break; 3680 break;
3699 } 3681 }
… …
3972 } 3954 }
3973 } 3955 }
3974} 3956}
3975/*}}} */ 3957/*}}} */
3976 3958
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/* ------------------------------------------------------------------------- */ 3959/* ------------------------------------------------------------------------- */
3997 3960
3998/* 3961/*
3999 * Send printf () formatted output to the command. 3962 * Send printf () formatted output to the command.
4000 * Only use for small amounts of data. 3963 * Only use for small amounts of data.
… …
4028 3991
4029 if (v_buflen == 0) 3992 if (v_buflen == 0)
4030 { 3993 {
4031 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE)); 3994 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE));
4032 3995
3996 max_it (written, 0);
3997
4033 if ((unsigned int)written == len) 3998 if (written == len)
4034 return; 3999 return;
4035 4000
4036 data += written; 4001 data += written;
4037 len -= written; 4002 len -= written;
4038 } 4003 }

Diff Legend

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