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.480 by sf-exg, Mon Mar 7 11:48:55 2011 UTC vs.
Revision 1.493 by sf-exg, Sun Aug 21 20:17:40 2011 UTC

… …
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;
1158
1159 if (!avail)
1160 {
1163 n = 0; // normally this indicates a "too long" command sequence - just drop the data we have 1161 // normally this indicates a "too long" command sequence - just drop the data we have
1164
1165 memmove (cmdbuf_base, cmdbuf_ptr, n);
1166 cmdbuf_ptr = cmdbuf_base; 1162 cmdbuf_ptr = cmdbuf_base;
1167 cmdbuf_endp = cmdbuf_ptr + n; 1163 cmdbuf_endp = cmdbuf_ptr;
1164 avail = CBUFSIZ;
1165 }
1168 1166
1169 ssize_t r = read (pty->pty, cmdbuf_endp, CBUFSIZ - n); 1167 ssize_t r = read (pty->pty, cmdbuf_endp, avail);
1170 1168
1171 if (r > 0) 1169 if (r > 0)
1172 { 1170 {
1173 cmdbuf_endp += r; 1171 cmdbuf_endp += r;
1174 return true; 1172 return true;
… …
1442 && ev.xfocus.mode != NotifyGrab) 1440 && ev.xfocus.mode != NotifyGrab)
1443 focus_out (); 1441 focus_out ();
1444 break; 1442 break;
1445 1443
1446 case ConfigureNotify: 1444 case ConfigureNotify:
1447 if (ev.xconfigure.window == parent[0]) 1445 if (ev.xconfigure.window == parent)
1448 { 1446 {
1449 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev)) 1447 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1450 ; 1448 ;
1451 1449
1452#ifdef HAVE_BG_PIXMAP 1450#ifdef HAVE_BG_PIXMAP
… …
1475 } 1473 }
1476 else 1474 else
1477 { 1475 {
1478#ifdef HAVE_BG_PIXMAP 1476#ifdef HAVE_BG_PIXMAP
1479 if (moved) 1477 if (moved)
1480 {
1481 if (mapped)
1482 update_background (); 1478 update_background ();
1483 else
1484 bg_invalidate ();
1485 }
1486#endif 1479#endif
1487 } 1480 }
1488 1481
1489 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END)); 1482 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1490 } 1483 }
… …
1718rxvt_term::set_urgency (bool enable) 1711rxvt_term::set_urgency (bool enable)
1719{ 1712{
1720 if (enable == urgency_hint) 1713 if (enable == urgency_hint)
1721 return; 1714 return;
1722 1715
1723 if (XWMHints *h = XGetWMHints (dpy, parent[0])) 1716 if (XWMHints *h = XGetWMHints (dpy, parent))
1724 { 1717 {
1725 h->flags = h->flags & ~XUrgencyHint | (enable ? XUrgencyHint : 0); 1718 h->flags = h->flags & ~XUrgencyHint | (enable ? XUrgencyHint : 0);
1726 XSetWMHints (dpy, parent[0], h); 1719 XSetWMHints (dpy, parent, h);
1727 urgency_hint = enable; 1720 urgency_hint = enable;
1728 } 1721 }
1729} 1722}
1730#endif 1723#endif
1731 1724
… …
1738 want_refresh = 1; 1731 want_refresh = 1;
1739 1732
1740#if USE_XIM 1733#if USE_XIM
1741 if (Input_Context != NULL) 1734 if (Input_Context != NULL)
1742 { 1735 {
1743 IMSetPosition (); 1736 im_set_position ();
1744 XSetICFocus (Input_Context); 1737 XSetICFocus (Input_Context);
1745 } 1738 }
1746#endif 1739#endif
1747#if CURSOR_BLINK 1740#if CURSOR_BLINK
1748 if (option (Opt_cursorBlink)) 1741 if (option (Opt_cursorBlink))
… …
2221 wchar_t ch = NOCHAR; 2214 wchar_t ch = NOCHAR;
2222 char *seq_begin; // remember start of esc-sequence here 2215 char *seq_begin; // remember start of esc-sequence here
2223 2216
2224 for (;;) 2217 for (;;)
2225 { 2218 {
2226 if (expect_false (ch == NOCHAR)) 2219 if (ecb_unlikely (ch == NOCHAR))
2227 { 2220 {
2228 seq_begin = cmdbuf_ptr; 2221 seq_begin = cmdbuf_ptr;
2229 ch = next_char (); 2222 ch = next_char ();
2230 2223
2231 if (ch == NOCHAR) 2224 if (ch == NOCHAR)
2232 break; 2225 break;
2233 } 2226 }
2234 2227
2235 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))
2236 { 2229 {
2237 if (expect_false (!seen_input)) 2230 if (ecb_unlikely (!seen_input))
2238 { 2231 {
2239 seen_input = 1; 2232 seen_input = 1;
2240 // many badly-written programs (e.g. jed) contain a race condition: 2233 // many badly-written programs (e.g. jed) contain a race condition:
2241 // they first read the screensize and then install a SIGWINCH handler. 2234 // they first read the screensize and then install a SIGWINCH handler.
2242 // some window managers resize the window early, and these programs 2235 // some window managers resize the window early, and these programs
… …
2255 wchar_t *str = buf; 2248 wchar_t *str = buf;
2256 wchar_t *eol = str + min (ncol, UBUFSIZ); 2249 wchar_t *eol = str + min (ncol, UBUFSIZ);
2257 2250
2258 for (;;) 2251 for (;;)
2259 { 2252 {
2260 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)))
2261 break; 2254 break;
2262 2255
2263 *str++ = ch; 2256 *str++ = ch;
2264 2257
2265 if (expect_false (ch == C0_LF || str >= eol)) 2258 if (ecb_unlikely (ch == C0_LF || str >= eol))
2266 { 2259 {
2267 if (ch == C0_LF) 2260 if (ch == C0_LF)
2268 nlines++; 2261 nlines++;
2269 2262
2270 refresh_count++; 2263 refresh_count++;
… …
2348rxvt_term::next_char () NOTHROW 2341rxvt_term::next_char () NOTHROW
2349{ 2342{
2350 while (cmdbuf_ptr < cmdbuf_endp) 2343 while (cmdbuf_ptr < cmdbuf_endp)
2351 { 2344 {
2352 // assume 7-bit to be ascii ALWAYS 2345 // assume 7-bit to be ascii ALWAYS
2353 if (expect_true ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)) 2346 if (ecb_likely ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b))
2354 return *cmdbuf_ptr++; 2347 return *cmdbuf_ptr++;
2355 2348
2356 wchar_t wc; 2349 wchar_t wc;
2357 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);
2358 2351
… …
2386 : NOCHAR; 2379 : NOCHAR;
2387} 2380}
2388 2381
2389static class out_of_input out_of_input; 2382static class out_of_input out_of_input;
2390 2383
2391/* rxvt_cmd_getc () - Return next input character */
2392/*
2393 * Return the next input character after first passing any keyboard input
2394 * to the command.
2395 */
2396wchar_t 2384wchar_t
2397rxvt_term::cmd_getc () THROW ((class out_of_input)) 2385rxvt_term::cmd_getc () THROW ((class out_of_input))
2398{ 2386{
2399 wchar_t c = next_char (); 2387 wchar_t c = next_char ();
2400 2388
… …
2493 pclose_printer (fd); 2481 pclose_printer (fd);
2494} 2482}
2495#endif /* PRINTPIPE */ 2483#endif /* PRINTPIPE */
2496/*}}} */ 2484/*}}} */
2497 2485
2498/* *INDENT-OFF* */
2499enum { 2486enum {
2500 C1_40 = 0x40, 2487 C1_40 = 0x40,
2501 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,
2502 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,
2503 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,
2504 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,
2505}; 2492};
2506/* *INDENT-ON* */
2507 2493
2508/*{{{ process non-printing single characters */ 2494/*{{{ process non-printing single characters */
2509void 2495void
2510rxvt_term::process_nonprinting (unicode_t ch) 2496rxvt_term::process_nonprinting (unicode_t ch)
2511{ 2497{
… …
2633 return; 2619 return;
2634 } 2620 }
2635 2621
2636 switch (ch) 2622 switch (ch)
2637 { 2623 {
2638 /* case 1: do_tek_mode (); break; */
2639 case '#': 2624 case '#':
2640 if (cmd_getc () == '8') 2625 if (cmd_getc () == '8')
2641 scr_E (); 2626 scr_E ();
2642 break; 2627 break;
2643 case '(': 2628 case '(':
… …
2666#if !ENABLE_MINIMAL 2651#if !ENABLE_MINIMAL
2667 case '9': 2652 case '9':
2668 scr_forwardindex (); 2653 scr_forwardindex ();
2669 break; 2654 break;
2670#endif 2655#endif
2656 // DECPAM/DECPNM
2671 case '=': 2657 case '=':
2672 case '>': 2658 case '>':
2673 set_privmode (PrivMode_aplKP, ch == '='); 2659 set_privmode (PrivMode_aplKP, ch == '=');
2674 break; 2660 break;
2675 2661
… …
2682 2668
2683 /* 8.3.87: NEXT LINE */ 2669 /* 8.3.87: NEXT LINE */
2684 case C1_NEL: /* ESC E */ 2670 case C1_NEL: /* ESC E */
2685 { 2671 {
2686 wchar_t nlcr[] = { C0_LF, C0_CR }; 2672 wchar_t nlcr[] = { C0_LF, C0_CR };
2687 scr_add_lines (nlcr, ARRAY_LENGTH(nlcr), 1); 2673 scr_add_lines (nlcr, ecb_array_length (nlcr), 1);
2688 } 2674 }
2689 break; 2675 break;
2690 2676
2691 /* kidnapped escape sequence: Should be 8.3.48 */ 2677 /* kidnapped escape sequence: Should be 8.3.48 */
2692 case C1_ESA: /* ESC G */ 2678 case C1_ESA: /* ESC G */
… …
2704 case C1_RI: /* ESC M */ 2690 case C1_RI: /* ESC M */
2705 scr_index (DN); 2691 scr_index (DN);
2706 break; 2692 break;
2707 2693
2708 /* 8.3.142: SINGLE-SHIFT TWO */ 2694 /* 8.3.142: SINGLE-SHIFT TWO */
2709 /*case C1_SS2: scr_single_shift (2); break; */ 2695 /* case C1_SS2: break; */
2710 2696
2711 /* 8.3.143: SINGLE-SHIFT THREE */ 2697 /* 8.3.143: SINGLE-SHIFT THREE */
2712 /*case C1_SS3: scr_single_shift (3); break; */ 2698 /* case C1_SS3: break; */
2713 2699
2714 /* 8.3.27: DEVICE CONTROL STRING */ 2700 /* 8.3.27: DEVICE CONTROL STRING */
2715 case C1_DCS: /* ESC P */ 2701 case C1_DCS: /* ESC P */
2716 process_dcs_seq (); 2702 process_dcs_seq ();
2717 break; 2703 break;
… …
2750 } 2736 }
2751} 2737}
2752/*}}} */ 2738/*}}} */
2753 2739
2754/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */ 2740/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */
2755/* *INDENT-OFF* */
2756enum { 2741enum {
2757 CSI_ICH = 0x40, 2742 CSI_ICH = 0x40,
2758 CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA, 2743 CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA,
2759 CSI_CUP, CSI_CHT, CSI_ED , CSI_EL , CSI_IL , CSI_DL , CSI_EF , CSI_EA , 2744 CSI_CUP, CSI_CHT, CSI_ED , CSI_EL , CSI_IL , CSI_DL , CSI_EF , CSI_EA ,
2760 CSI_DCH, CSI_SEE, CSI_CPR, CSI_SU , CSI_SD , CSI_NP , CSI_PP , CSI_CTC, 2745 CSI_DCH, CSI_SEE, CSI_CPR, CSI_SU , CSI_SD , CSI_NP , CSI_PP , CSI_CTC,
… …
2780 make_byte (1,1,1,0,1,1,1,0), /* `, a, b, c, d, e, f, g, */ 2765 make_byte (1,1,1,0,1,1,1,0), /* `, a, b, c, d, e, f, g, */
2781 make_byte (0,0,1,1,0,0,0,0), /* h, i, j, k, l, m, n, o, */ 2766 make_byte (0,0,1,1,0,0,0,0), /* h, i, j, k, l, m, n, o, */
2782 make_byte (0,0,0,0,0,0,0,0), /* p, q, r, s, t, u, v, w, */ 2767 make_byte (0,0,0,0,0,0,0,0), /* p, q, r, s, t, u, v, w, */
2783 make_byte (0,0,0,0,0,0,0,0), /* x, y, z, {, |, }, ~, */ 2768 make_byte (0,0,0,0,0,0,0,0), /* x, y, z, {, |, }, ~, */
2784 }; 2769 };
2785/* *INDENT-ON* */
2786 2770
2787void 2771void
2788rxvt_term::process_csi_seq () 2772rxvt_term::process_csi_seq ()
2789{ 2773{
2790 unicode_t ch, priv, i; 2774 unicode_t ch, priv, i;
… …
2870 scr_soft_reset (); 2854 scr_soft_reset ();
2871 2855
2872 static const int pm_h[] = { 7, 25 }; 2856 static const int pm_h[] = { 7, 25 };
2873 static const int pm_l[] = { 1, 3, 4, 5, 6, 9, 66, 1000, 1001, 1005, 1015, 1049 }; 2857 static const int pm_l[] = { 1, 3, 4, 5, 6, 9, 66, 1000, 1001, 1005, 1015, 1049 };
2874 2858
2875 process_terminal_mode ('h', 0, ARRAY_LENGTH(pm_h), pm_h); 2859 process_terminal_mode ('h', 0, ecb_array_length (pm_h), pm_h);
2876 process_terminal_mode ('l', 0, ARRAY_LENGTH(pm_l), pm_l); 2860 process_terminal_mode ('l', 0, ecb_array_length (pm_l), pm_l);
2877 } 2861 }
2878 break; 2862 break;
2879 } 2863 }
2880 2864
2881 return; 2865 return;
… …
3100 } 3084 }
3101} 3085}
3102/*}}} */ 3086/*}}} */
3103 3087
3104#if !ENABLE_MINIMAL 3088#if !ENABLE_MINIMAL
3105/* ARGSUSED */
3106void 3089void
3107rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3090rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3108{ 3091{
3109 int x, y; 3092 int x, y;
3110 XWindowAttributes wattr; 3093 XWindowAttributes wattr;
… …
3119 { 3102 {
3120 /* 3103 /*
3121 * commands 3104 * commands
3122 */ 3105 */
3123 case 1: /* deiconify window */ 3106 case 1: /* deiconify window */
3124 XMapWindow (dpy, parent[0]); 3107 XMapWindow (dpy, parent);
3125 break; 3108 break;
3126 case 2: /* iconify window */ 3109 case 2: /* iconify window */
3127 XIconifyWindow (dpy, parent[0], display->screen); 3110 XIconifyWindow (dpy, parent, display->screen);
3128 break; 3111 break;
3129 case 3: /* set position (pixels) */ 3112 case 3: /* set position (pixels) */
3130 XMoveWindow (dpy, parent[0], args[1], args[2]); 3113 XMoveWindow (dpy, parent, args[1], args[2]);
3131 break; 3114 break;
3132 case 4: /* set size (pixels) */ 3115 case 4: /* set size (pixels) */
3133 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3116 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3134 break; 3117 break;
3135 case 5: /* raise window */ 3118 case 5: /* raise window */
3136 XRaiseWindow (dpy, parent[0]); 3119 XRaiseWindow (dpy, parent);
3137 break; 3120 break;
3138 case 6: /* lower window */ 3121 case 6: /* lower window */
3139 XLowerWindow (dpy, parent[0]); 3122 XLowerWindow (dpy, parent);
3140 break; 3123 break;
3141 case 7: /* refresh window */ 3124 case 7: /* refresh window */
3142 scr_touch (true); 3125 scr_touch (true);
3143 break; 3126 break;
3144 case 8: /* set size (chars) */ 3127 case 8: /* set size (chars) */
… …
3155 3138
3156 /* 3139 /*
3157 * reports - some output format copied from XTerm 3140 * reports - some output format copied from XTerm
3158 */ 3141 */
3159 case 11: /* report window state */ 3142 case 11: /* report window state */
3160 XGetWindowAttributes (dpy, parent[0], &wattr); 3143 XGetWindowAttributes (dpy, parent, &wattr);
3161 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3144 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3162 break; 3145 break;
3163 case 13: /* report window position */ 3146 case 13: /* report window position */
3164 XGetWindowAttributes (dpy, parent[0], &wattr); 3147 XGetWindowAttributes (dpy, parent, &wattr);
3165 XTranslateCoordinates (dpy, parent[0], wattr.root, 3148 XTranslateCoordinates (dpy, parent, wattr.root,
3166 -wattr.border_width, -wattr.border_width, 3149 -wattr.border_width, -wattr.border_width,
3167 &x, &y, &wdummy); 3150 &x, &y, &wdummy);
3168 tt_printf ("\033[3;%d;%dt", x, y); 3151 tt_printf ("\033[3;%d;%dt", x, y);
3169 break; 3152 break;
3170 case 14: /* report window size (pixels) */ 3153 case 14: /* report window size (pixels) */
3171 XGetWindowAttributes (dpy, parent[0], &wattr); 3154 XGetWindowAttributes (dpy, parent, &wattr);
3172 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3155 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3173 break; 3156 break;
3174 case 18: /* report text area size (chars) */ 3157 case 18: /* report text area size (chars) */
3175 tt_printf ("\033[8;%d;%dt", nrow, ncol); 3158 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3176 break; 3159 break;
… …
3178 tt_printf ("\033[9;%d;%dt", nrow, ncol); 3161 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3179 break; 3162 break;
3180 case 20: /* report icon label */ 3163 case 20: /* report icon label */
3181 { 3164 {
3182 char *s; 3165 char *s;
3183 XGetIconName (dpy, parent[0], &s); 3166 XGetIconName (dpy, parent, &s);
3184 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3167 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3185 XFree (s); 3168 XFree (s);
3186 } 3169 }
3187 break; 3170 break;
3188 case 21: /* report window title */ 3171 case 21: /* report window title */
3189 { 3172 {
3190 char *s; 3173 char *s;
3191 XFetchName (dpy, parent[0], &s); 3174 XFetchName (dpy, parent, &s);
3192 tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3175 tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3193 XFree (s); 3176 XFree (s);
3194 } 3177 }
3195 break; 3178 break;
3196 } 3179 }
… …
3350 unsigned long bytes_after; 3333 unsigned long bytes_after;
3351 unsigned char *value = 0; 3334 unsigned char *value = 0;
3352 const char *str = ""; 3335 const char *str = "";
3353 3336
3354 if (prop 3337 if (prop
3355 && XGetWindowProperty (dpy, parent[0], 3338 && XGetWindowProperty (dpy, parent,
3356 prop, 0, 1<<16, 0, AnyPropertyType, 3339 prop, 0, 1<<16, 0, AnyPropertyType,
3357 &actual_type, &actual_format, 3340 &actual_type, &actual_format,
3358 &nitems, &bytes_after, &value) == Success 3341 &nitems, &bytes_after, &value) == Success
3359 && actual_type != None 3342 && actual_type != None
3360 && actual_format == 8) 3343 && actual_format == 8)
… …
3372 { 3355 {
3373 *eq = 0; 3356 *eq = 0;
3374 set_utf8_property (display->atom (str), eq + 1); 3357 set_utf8_property (display->atom (str), eq + 1);
3375 } 3358 }
3376 else 3359 else
3377 XDeleteProperty (dpy, parent[0], 3360 XDeleteProperty (dpy, parent,
3378 display->atom (str)); 3361 display->atom (str));
3379 } 3362 }
3380 break; 3363 break;
3381 3364
3382 case XTerm_Color: 3365 case XTerm_Color:
… …
3465 min (h_align, 32767), min (v_align, 32767)); 3448 min (h_align, 32767), min (v_align, 32767));
3466 process_xterm_seq (XTerm_title, str, CHAR_ST); 3449 process_xterm_seq (XTerm_title, str, CHAR_ST);
3467 } 3450 }
3468 else 3451 else
3469 { 3452 {
3470 int changed = 0; 3453 bool changed = false;
3471 3454
3472 if (*str != ';') 3455 if (*str != ';')
3473 { 3456 {
3474 if (bg_set_file (str)) /* change pixmap */ 3457 if (bg_set_file (str)) /* change pixmap */
3475 {
3476 changed++; 3458 changed = true;
3477 str = strchr (str, ';');
3478 if (str == NULL)
3479 bg_set_default_geometry ();
3480 else
3481 bg_set_geometry (str+1);
3482 }
3483 } 3459 }
3484 else 3460 else
3485 { 3461 {
3486 str++; 3462 str++;
3487 if (bg_set_geometry (str, true)) 3463 if (bg_set_geometry (str, true))
3488 changed++; 3464 changed = true;
3489 } 3465 }
3490 3466
3491 if (changed) 3467 if (changed)
3492 { 3468 {
3493 if (bg_window_position_sensitive ()) 3469 if (bg_window_position_sensitive ())
… …
3617 return state; 3593 return state;
3618} 3594}
3619 3595
3620/* we're not using priv _yet_ */ 3596/* we're not using priv _yet_ */
3621void 3597void
3622rxvt_term::process_terminal_mode (int mode, int priv UNUSED, unsigned int nargs, const int *arg) 3598rxvt_term::process_terminal_mode (int mode, int priv ecb_unused, unsigned int nargs, const int *arg)
3623{ 3599{
3624 unsigned int i, j; 3600 unsigned int i, j;
3625 int state; 3601 int state;
3626 3602
3627 static const struct 3603 static const struct
3628 { 3604 {
3629 const int argval; 3605 const int argval;
3630 const unsigned long bit; 3606 const unsigned long bit;
3631 } argtopriv[] = { 3607 } argtopriv[] = {
3632 { 1, PrivMode_aplCUR }, // DECCKM 3608 { 1, PrivMode_aplCUR }, // DECCKM
3633 { 2, PrivMode_vt52 }, 3609 { 2, PrivMode_vt52 }, // DECANM
3634 { 3, PrivMode_132 }, // DECCOLM 3610 { 3, PrivMode_132 }, // DECCOLM
3635 { 4, PrivMode_smoothScroll }, // DECSCLM 3611 { 4, PrivMode_smoothScroll }, // DECSCLM
3636 { 5, PrivMode_rVideo }, // DECSCNM 3612 { 5, PrivMode_rVideo }, // DECSCNM
3637 { 6, PrivMode_relOrigin }, // DECOM 3613 { 6, PrivMode_relOrigin }, // DECOM
3638 { 7, PrivMode_Autowrap }, // DECAWM 3614 { 7, PrivMode_Autowrap }, // DECAWM
3639 // 8, auto-repeat keys // DECARM 3615 // 8, auto-repeat keys // DECARM
3640 { 9, PrivMode_MouseX10 }, 3616 { 9, PrivMode_MouseX10 },
3641 // 18 end FF to printer after print screen 3617 // 18 end FF to printer after print screen
3642 // 19 Print screen prints full screen/scroll region 3618 // 19 Print screen prints full screen/scroll region
3643 { 25, PrivMode_VisibleCursor }, // cnorm/cvvis/civis 3619 { 25, PrivMode_VisibleCursor }, // DECTCEM cnorm/cvvis/civis
3644#ifdef scrollBar_esc 3620#ifdef scrollBar_esc
3645 { scrollBar_esc, PrivMode_scrollBar }, 3621 { scrollBar_esc, PrivMode_scrollBar },
3646#endif 3622#endif
3647 { 35, PrivMode_ShiftKeys }, // rxvt extension 3623 { 35, PrivMode_ShiftKeys }, // rxvt extension
3648 // 38, tektronix mode // DECTEK 3624 // 38, tektronix mode // DECTEK
3649 { 40, PrivMode_132OK }, 3625 { 40, PrivMode_132OK },
3650 // 41 xterm more fixes NYI 3626 // 41 xterm more fixes NYI
3651 // 45 margin bell NYI 3627 // 45 margin bell NYI
3652 // 46 start logging 3628 // 46 start logging
3653 { 47, PrivMode_Screen }, 3629 { 47, PrivMode_Screen },
3654 { 66, PrivMode_aplKP }, // DECPAM/DECPNM 3630 { 66, PrivMode_aplKP }, // DECNKM
3655#ifndef NO_BACKSPACE_KEY 3631#ifndef NO_BACKSPACE_KEY
3656 { 67, PrivMode_BackSpace }, // DECBKM 3632 { 67, PrivMode_BackSpace }, // DECBKM
3657#endif 3633#endif
3658 { 1000, PrivMode_MouseX11 }, 3634 { 1000, PrivMode_MouseX11 },
3659 { 1002, PrivMode_MouseBtnEvent }, 3635 { 1002, PrivMode_MouseBtnEvent },
… …
3688 for (i = 0; i < nargs; i++) 3664 for (i = 0; i < nargs; i++)
3689 { 3665 {
3690 state = -1; 3666 state = -1;
3691 3667
3692 /* basic handling */ 3668 /* basic handling */
3693 for (j = 0; j < ARRAY_LENGTH(argtopriv); j++) 3669 for (j = 0; j < ecb_array_length (argtopriv); j++)
3694 if (argtopriv[j].argval == arg[i]) 3670 if (argtopriv[j].argval == arg[i])
3695 { 3671 {
3696 state = privcases (mode, argtopriv[j].bit); 3672 state = privcases (mode, argtopriv[j].bit);
3697 break; 3673 break;
3698 } 3674 }

Diff Legend

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