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.478 by root, Thu Feb 24 12:42:41 2011 UTC vs.
Revision 1.496 by sf-exg, Wed Aug 31 22:39:49 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 }
… …
1673 XQueryPointer (dpy, scrollBar.win, 1666 XQueryPointer (dpy, scrollBar.win,
1674 &unused_root, &unused_child, 1667 &unused_root, &unused_child,
1675 &unused_root_x, &unused_root_y, 1668 &unused_root_x, &unused_root_y,
1676 &ev.xbutton.x, &ev.xbutton.y, 1669 &ev.xbutton.x, &ev.xbutton.y,
1677 &unused_mask); 1670 &unused_mask);
1678 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1671 scr_move_to (scrollBar.position (ev.xbutton.y) - csrO,
1679 scrollBar.size ()); 1672 scrollBar.size ());
1680 want_refresh = 1; 1673 want_refresh = 1;
1681 scrollBar.show (1); 1674 scrollBar.show (1);
1682 } 1675 }
1683 break; 1676 break;
… …
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))
… …
2051 csrO = scrollBar.bot - scrollBar.top; 2044 csrO = scrollBar.bot - scrollBar.top;
2052 break; 2045 break;
2053 } 2046 }
2054 2047
2055 if (scrollBar.style == R_SB_XTERM 2048 if (scrollBar.style == R_SB_XTERM
2056 || scrollbar_above_slider (ev.y) 2049 || scrollBar.above_slider (ev.y)
2057 || scrollbar_below_slider (ev.y)) 2050 || scrollBar.below_slider (ev.y))
2058 scr_move_to (scrollbar_position (ev.y) - csrO, scrollBar.size ()); 2051 scr_move_to (scrollBar.position (ev.y) - csrO, scrollBar.size ());
2059 2052
2060 scrollBar.state = STATE_MOTION; 2053 scrollBar.state = STATE_MOTION;
2061 break; 2054 break;
2062 2055
2063 case Button1: 2056 case Button1:
… …
2066 /* FALLTHROUGH */ 2059 /* FALLTHROUGH */
2067 2060
2068 case Button3: 2061 case Button3:
2069 if (scrollBar.style != R_SB_XTERM) 2062 if (scrollBar.style != R_SB_XTERM)
2070 { 2063 {
2071 if (scrollbar_above_slider (ev.y)) 2064 if (scrollBar.above_slider (ev.y))
2072# ifdef RXVT_SCROLL_FULL 2065# ifdef RXVT_SCROLL_FULL
2073 scr_page (UP, nrow - 1); 2066 scr_page (UP, nrow - 1);
2074# else 2067# else
2075 scr_page (UP, nrow / 4); 2068 scr_page (UP, nrow / 4);
2076# endif 2069# endif
2077 else if (scrollbar_below_slider (ev.y)) 2070 else if (scrollBar.below_slider (ev.y))
2078# ifdef RXVT_SCROLL_FULL 2071# ifdef RXVT_SCROLL_FULL
2079 scr_page (DN, nrow - 1); 2072 scr_page (DN, nrow - 1);
2080# else 2073# else
2081 scr_page (DN, nrow / 4); 2074 scr_page (DN, nrow / 4);
2082# endif 2075# endif
… …
2085 } 2078 }
2086 else 2079 else
2087 { 2080 {
2088 scr_page ((ev.button == Button1 ? DN : UP), 2081 scr_page ((ev.button == Button1 ? DN : UP),
2089 (nrow 2082 (nrow
2090 * scrollbar_position (ev.y) 2083 * scrollBar.position (ev.y)
2091 / scrollBar.size ())); 2084 / scrollBar.size ()));
2092 } 2085 }
2093 2086
2094 break; 2087 break;
2095 } 2088 }
… …
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{
… …
2604 break; 2590 break;
2605 case 'Z': /* identify the terminal type */ 2591 case 'Z': /* identify the terminal type */
2606 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */ 2592 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */
2607 break; 2593 break;
2608 case '<': /* turn off VT52 mode */ 2594 case '<': /* turn off VT52 mode */
2609 set_privmode (PrivMode_vt52, 0); 2595 priv_modes &= ~PrivMode_vt52;
2610 break; 2596 break;
2611 case 'F': /* use special graphics character set */ 2597 case 'F': /* use special graphics character set */
2612 case 'G': /* use regular character set */ 2598 case 'G': /* use regular character set */
2613 /* unimplemented */ 2599 /* unimplemented */
2614 break; 2600 break;
… …
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 '=':
2658 priv_modes |= PrivMode_aplKP;
2659 break;
2672 case '>': 2660 case '>':
2673 set_privmode (PrivMode_aplKP, ch == '='); 2661 priv_modes &= ~PrivMode_aplKP;
2674 break; 2662 break;
2675 2663
2676 case C1_40: 2664 case C1_40:
2677 cmd_getc (); 2665 cmd_getc ();
2678 break; 2666 break;
… …
2682 2670
2683 /* 8.3.87: NEXT LINE */ 2671 /* 8.3.87: NEXT LINE */
2684 case C1_NEL: /* ESC E */ 2672 case C1_NEL: /* ESC E */
2685 { 2673 {
2686 wchar_t nlcr[] = { C0_LF, C0_CR }; 2674 wchar_t nlcr[] = { C0_LF, C0_CR };
2687 scr_add_lines (nlcr, ARRAY_LENGTH(nlcr), 1); 2675 scr_add_lines (nlcr, ecb_array_length (nlcr), 1);
2688 } 2676 }
2689 break; 2677 break;
2690 2678
2691 /* kidnapped escape sequence: Should be 8.3.48 */ 2679 /* kidnapped escape sequence: Should be 8.3.48 */
2692 case C1_ESA: /* ESC G */ 2680 case C1_ESA: /* ESC G */
2693 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 */
2694 break; 2684 break;
2695 2685
2696 /* 8.3.63: CHARACTER TABULATION SET */ 2686 /* 8.3.63: CHARACTER TABULATION SET */
2697 case C1_HTS: /* ESC H */ 2687 case C1_HTS: /* ESC H */
2698 scr_set_tab (1); 2688 scr_set_tab (1);
… …
2702 case C1_RI: /* ESC M */ 2692 case C1_RI: /* ESC M */
2703 scr_index (DN); 2693 scr_index (DN);
2704 break; 2694 break;
2705 2695
2706 /* 8.3.142: SINGLE-SHIFT TWO */ 2696 /* 8.3.142: SINGLE-SHIFT TWO */
2707 /*case C1_SS2: scr_single_shift (2); break; */ 2697 /* case C1_SS2: break; */
2708 2698
2709 /* 8.3.143: SINGLE-SHIFT THREE */ 2699 /* 8.3.143: SINGLE-SHIFT THREE */
2710 /*case C1_SS3: scr_single_shift (3); break; */ 2700 /* case C1_SS3: break; */
2711 2701
2712 /* 8.3.27: DEVICE CONTROL STRING */ 2702 /* 8.3.27: DEVICE CONTROL STRING */
2713 case C1_DCS: /* ESC P */ 2703 case C1_DCS: /* ESC P */
2714 process_dcs_seq (); 2704 process_dcs_seq ();
2715 break; 2705 break;
… …
2748 } 2738 }
2749} 2739}
2750/*}}} */ 2740/*}}} */
2751 2741
2752/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */ 2742/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */
2753/* *INDENT-OFF* */
2754enum { 2743enum {
2755 CSI_ICH = 0x40, 2744 CSI_ICH = 0x40,
2756 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,
2757 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 ,
2758 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,
… …
2778 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, */
2779 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, */
2780 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, */
2781 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, {, |, }, ~, */
2782 }; 2771 };
2783/* *INDENT-ON* */
2784 2772
2785void 2773void
2786rxvt_term::process_csi_seq () 2774rxvt_term::process_csi_seq ()
2787{ 2775{
2788 unicode_t ch, priv, i; 2776 unicode_t ch, priv, i;
… …
2868 scr_soft_reset (); 2856 scr_soft_reset ();
2869 2857
2870 static const int pm_h[] = { 7, 25 }; 2858 static const int pm_h[] = { 7, 25 };
2871 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 };
2872 2860
2873 process_terminal_mode ('h', 0, ARRAY_LENGTH(pm_h), pm_h); 2861 process_terminal_mode ('h', 0, ecb_array_length (pm_h), pm_h);
2874 process_terminal_mode ('l', 0, ARRAY_LENGTH(pm_l), pm_l); 2862 process_terminal_mode ('l', 0, ecb_array_length (pm_l), pm_l);
2875 } 2863 }
2876 break; 2864 break;
2877 } 2865 }
2878 2866
2879 return; 2867 return;
… …
3098 } 3086 }
3099} 3087}
3100/*}}} */ 3088/*}}} */
3101 3089
3102#if !ENABLE_MINIMAL 3090#if !ENABLE_MINIMAL
3103/* ARGSUSED */
3104void 3091void
3105rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3092rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3106{ 3093{
3107 int x, y; 3094 int x, y;
3108 XWindowAttributes wattr; 3095 XWindowAttributes wattr;
… …
3117 { 3104 {
3118 /* 3105 /*
3119 * commands 3106 * commands
3120 */ 3107 */
3121 case 1: /* deiconify window */ 3108 case 1: /* deiconify window */
3122 XMapWindow (dpy, parent[0]); 3109 XMapWindow (dpy, parent);
3123 break; 3110 break;
3124 case 2: /* iconify window */ 3111 case 2: /* iconify window */
3125 XIconifyWindow (dpy, parent[0], display->screen); 3112 XIconifyWindow (dpy, parent, display->screen);
3126 break; 3113 break;
3127 case 3: /* set position (pixels) */ 3114 case 3: /* set position (pixels) */
3128 XMoveWindow (dpy, parent[0], args[1], args[2]); 3115 XMoveWindow (dpy, parent, args[1], args[2]);
3129 break; 3116 break;
3130 case 4: /* set size (pixels) */ 3117 case 4: /* set size (pixels) */
3131 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3118 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3132 break; 3119 break;
3133 case 5: /* raise window */ 3120 case 5: /* raise window */
3134 XRaiseWindow (dpy, parent[0]); 3121 XRaiseWindow (dpy, parent);
3135 break; 3122 break;
3136 case 6: /* lower window */ 3123 case 6: /* lower window */
3137 XLowerWindow (dpy, parent[0]); 3124 XLowerWindow (dpy, parent);
3138 break; 3125 break;
3139 case 7: /* refresh window */ 3126 case 7: /* refresh window */
3140 scr_touch (true); 3127 scr_touch (true);
3141 break; 3128 break;
3142 case 8: /* set size (chars) */ 3129 case 8: /* set size (chars) */
… …
3153 3140
3154 /* 3141 /*
3155 * reports - some output format copied from XTerm 3142 * reports - some output format copied from XTerm
3156 */ 3143 */
3157 case 11: /* report window state */ 3144 case 11: /* report window state */
3158 XGetWindowAttributes (dpy, parent[0], &wattr); 3145 XGetWindowAttributes (dpy, parent, &wattr);
3159 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3146 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3160 break; 3147 break;
3161 case 13: /* report window position */ 3148 case 13: /* report window position */
3162 XGetWindowAttributes (dpy, parent[0], &wattr); 3149 XGetWindowAttributes (dpy, parent, &wattr);
3163 XTranslateCoordinates (dpy, parent[0], wattr.root, 3150 XTranslateCoordinates (dpy, parent, wattr.root,
3164 -wattr.border_width, -wattr.border_width, 3151 -wattr.border_width, -wattr.border_width,
3165 &x, &y, &wdummy); 3152 &x, &y, &wdummy);
3166 tt_printf ("\033[3;%d;%dt", x, y); 3153 tt_printf ("\033[3;%d;%dt", x, y);
3167 break; 3154 break;
3168 case 14: /* report window size (pixels) */ 3155 case 14: /* report window size (pixels) */
3169 XGetWindowAttributes (dpy, parent[0], &wattr); 3156 XGetWindowAttributes (dpy, parent, &wattr);
3170 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3157 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3171 break; 3158 break;
3172 case 18: /* report text area size (chars) */ 3159 case 18: /* report text area size (chars) */
3173 tt_printf ("\033[8;%d;%dt", nrow, ncol); 3160 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3174 break; 3161 break;
… …
3176 tt_printf ("\033[9;%d;%dt", nrow, ncol); 3163 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3177 break; 3164 break;
3178 case 20: /* report icon label */ 3165 case 20: /* report icon label */
3179 { 3166 {
3180 char *s; 3167 char *s;
3181 XGetIconName (dpy, parent[0], &s); 3168 XGetIconName (dpy, parent, &s);
3182 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 */
3183 XFree (s); 3170 XFree (s);
3184 } 3171 }
3185 break; 3172 break;
3186 case 21: /* report window title */ 3173 case 21: /* report window title */
3187 { 3174 {
3188 char *s; 3175 char *s;
3189 XFetchName (dpy, parent[0], &s); 3176 XFetchName (dpy, parent, &s);
3190 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 */
3191 XFree (s); 3178 XFree (s);
3192 } 3179 }
3193 break; 3180 break;
3194 } 3181 }
… …
3348 unsigned long bytes_after; 3335 unsigned long bytes_after;
3349 unsigned char *value = 0; 3336 unsigned char *value = 0;
3350 const char *str = ""; 3337 const char *str = "";
3351 3338
3352 if (prop 3339 if (prop
3353 && XGetWindowProperty (dpy, parent[0], 3340 && XGetWindowProperty (dpy, parent,
3354 prop, 0, 1<<16, 0, AnyPropertyType, 3341 prop, 0, 1<<16, 0, AnyPropertyType,
3355 &actual_type, &actual_format, 3342 &actual_type, &actual_format,
3356 &nitems, &bytes_after, &value) == Success 3343 &nitems, &bytes_after, &value) == Success
3357 && actual_type != None 3344 && actual_type != None
3358 && actual_format == 8) 3345 && actual_format == 8)
… …
3370 { 3357 {
3371 *eq = 0; 3358 *eq = 0;
3372 set_utf8_property (display->atom (str), eq + 1); 3359 set_utf8_property (display->atom (str), eq + 1);
3373 } 3360 }
3374 else 3361 else
3375 XDeleteProperty (dpy, parent[0], 3362 XDeleteProperty (dpy, parent,
3376 display->atom (str)); 3363 display->atom (str));
3377 } 3364 }
3378 break; 3365 break;
3379 3366
3380 case XTerm_Color: 3367 case XTerm_Color:
… …
3463 min (h_align, 32767), min (v_align, 32767)); 3450 min (h_align, 32767), min (v_align, 32767));
3464 process_xterm_seq (XTerm_title, str, CHAR_ST); 3451 process_xterm_seq (XTerm_title, str, CHAR_ST);
3465 } 3452 }
3466 else 3453 else
3467 { 3454 {
3468 int changed = 0; 3455 bool changed = false;
3469 3456
3470 if (*str != ';') 3457 if (*str != ';')
3471 { 3458 {
3472 if (bg_set_file (str)) /* change pixmap */ 3459 if (bg_set_file (str)) /* change pixmap */
3473 {
3474 changed++; 3460 changed = true;
3475 str = strchr (str, ';');
3476 if (str == NULL)
3477 bg_set_default_geometry ();
3478 else
3479 bg_set_geometry (str+1);
3480 }
3481 } 3461 }
3482 else 3462 else
3483 { 3463 {
3484 str++; 3464 str++;
3485 if (bg_set_geometry (str, true)) 3465 if (bg_set_geometry (str, true))
3486 changed++; 3466 changed = true;
3487 } 3467 }
3488 3468
3489 if (changed) 3469 if (changed)
3490 { 3470 {
3491 if (bg_window_position_sensitive ()) 3471 if (bg_window_position_sensitive ())
… …
3607 if (mode == 'r') 3587 if (mode == 'r')
3608 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 3588 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3609 else 3589 else
3610 state = (mode == 't') ? ! (priv_modes & bit) : mode; 3590 state = (mode == 't') ? ! (priv_modes & bit) : mode;
3611 3591
3612 set_privmode (bit, state); 3592 if (state)
3593 priv_modes |= bit;
3594 else
3595 priv_modes &= ~bit;
3613 } 3596 }
3614 3597
3615 return state; 3598 return state;
3616} 3599}
3617 3600
3618/* we're not using priv _yet_ */ 3601/* we're not using priv _yet_ */
3619void 3602void
3620rxvt_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)
3621{ 3604{
3622 unsigned int i, j; 3605 unsigned int i, j;
3623 int state; 3606 int state;
3624 3607
3625 static const struct 3608 static const struct
3626 { 3609 {
3627 const int argval; 3610 const int argval;
3628 const unsigned long bit; 3611 const unsigned long bit;
3629 } argtopriv[] = { 3612 } argtopriv[] = {
3630 { 1, PrivMode_aplCUR }, // DECCKM 3613 { 1, PrivMode_aplCUR }, // DECCKM
3631 { 2, PrivMode_vt52 }, 3614 { 2, PrivMode_vt52 }, // DECANM
3632 { 3, PrivMode_132 }, // DECCOLM 3615 { 3, PrivMode_132 }, // DECCOLM
3633 { 4, PrivMode_smoothScroll }, // DECSCLM 3616 { 4, PrivMode_smoothScroll }, // DECSCLM
3634 { 5, PrivMode_rVideo }, // DECSCNM 3617 { 5, PrivMode_rVideo }, // DECSCNM
3635 { 6, PrivMode_relOrigin }, // DECOM 3618 { 6, PrivMode_relOrigin }, // DECOM
3636 { 7, PrivMode_Autowrap }, // DECAWM 3619 { 7, PrivMode_Autowrap }, // DECAWM
3637 // 8, auto-repeat keys // DECARM 3620 // 8, auto-repeat keys // DECARM
3638 { 9, PrivMode_MouseX10 }, 3621 { 9, PrivMode_MouseX10 },
3639 // 18 end FF to printer after print screen 3622 // 18 end FF to printer after print screen
3640 // 19 Print screen prints full screen/scroll region 3623 // 19 Print screen prints full screen/scroll region
3641 { 25, PrivMode_VisibleCursor }, // cnorm/cvvis/civis 3624 { 25, PrivMode_VisibleCursor }, // DECTCEM cnorm/cvvis/civis
3642#ifdef scrollBar_esc 3625#ifdef scrollBar_esc
3643 { scrollBar_esc, PrivMode_scrollBar }, 3626 { scrollBar_esc, PrivMode_scrollBar },
3644#endif 3627#endif
3645 { 35, PrivMode_ShiftKeys }, // rxvt extension 3628 { 35, PrivMode_ShiftKeys }, // rxvt extension
3646 // 38, tektronix mode // DECTEK 3629 // 38, tektronix mode // DECTEK
3647 { 40, PrivMode_132OK }, 3630 { 40, PrivMode_132OK },
3648 // 41 xterm more fixes NYI 3631 // 41 xterm more fixes NYI
3649 // 45 margin bell NYI 3632 // 45 margin bell NYI
3650 // 46 start logging 3633 // 46 start logging
3651 { 47, PrivMode_Screen }, 3634 { 47, PrivMode_Screen },
3652 { 66, PrivMode_aplKP }, // DECPAM/DECPNM 3635 { 66, PrivMode_aplKP }, // DECNKM
3653#ifndef NO_BACKSPACE_KEY 3636#ifndef NO_BACKSPACE_KEY
3654 { 67, PrivMode_BackSpace }, // DECBKM 3637 { 67, PrivMode_BackSpace }, // DECBKM
3655#endif 3638#endif
3656 { 1000, PrivMode_MouseX11 }, 3639 { 1000, PrivMode_MouseX11 },
3657 { 1002, PrivMode_MouseBtnEvent }, 3640 { 1002, PrivMode_MouseBtnEvent },
… …
3686 for (i = 0; i < nargs; i++) 3669 for (i = 0; i < nargs; i++)
3687 { 3670 {
3688 state = -1; 3671 state = -1;
3689 3672
3690 /* basic handling */ 3673 /* basic handling */
3691 for (j = 0; j < ARRAY_LENGTH(argtopriv); j++) 3674 for (j = 0; j < ecb_array_length (argtopriv); j++)
3692 if (argtopriv[j].argval == arg[i]) 3675 if (argtopriv[j].argval == arg[i])
3693 { 3676 {
3694 state = privcases (mode, argtopriv[j].bit); 3677 state = privcases (mode, argtopriv[j].bit);
3695 break; 3678 break;
3696 } 3679 }
… …
3722 case 2: /* VT52 mode */ 3705 case 2: /* VT52 mode */
3723 /* oddball mode. should be set regardless of set/reset 3706 /* oddball mode. should be set regardless of set/reset
3724 * parameter. Return from VT52 mode with an ESC < from 3707 * parameter. Return from VT52 mode with an ESC < from
3725 * within VT52 mode 3708 * within VT52 mode
3726 */ 3709 */
3727 set_privmode (PrivMode_vt52, 1); 3710 priv_modes |= PrivMode_vt52;
3728 break; 3711 break;
3729 case 3: /* 80/132 */ 3712 case 3: /* 80/132 */
3730 if (priv_modes & PrivMode_132OK) 3713 if (priv_modes & PrivMode_132OK)
3731 set_widthheight ((state ? 132 : 80) * fwidth, 24 * fheight); 3714 set_widthheight ((state ? 132 : 80) * fwidth, 24 * fheight);
3732 break; 3715 break;
… …
3747 if (state) /* orthogonal */ 3730 if (state) /* orthogonal */
3748 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent); 3731 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
3749 break; 3732 break;
3750#ifdef scrollBar_esc 3733#ifdef scrollBar_esc
3751 case scrollBar_esc: 3734 case scrollBar_esc:
3752 if (scrollBar.map (state)) 3735 scrollBar.map (state);
3753 {
3754 resize_all_windows (0, 0, 0); 3736 resize_all_windows (0, 0, 0);
3755 scr_touch (true); 3737 scr_touch (true);
3756 }
3757 break; 3738 break;
3758#endif 3739#endif
3759 case 25: /* visible/invisible cursor */ 3740 case 25: /* visible/invisible cursor */
3760 scr_cursor_visible (state); 3741 scr_cursor_visible (state);
3761 break; 3742 break;
… …
3969 } 3950 }
3970 } 3951 }
3971} 3952}
3972/*}}} */ 3953/*}}} */
3973 3954
3974/*{{{ (do not) process Rob Nation's own graphics mode sequences */
3975void
3976rxvt_term::process_graphics ()
3977{
3978 unicode_t ch, cmd = cmd_getc ();
3979
3980 if (cmd == 'Q')
3981 {
3982 /* query graphics */
3983 tt_printf ("\033G0\012"); /* no graphics */
3984 return;
3985 }
3986 /* swallow other graphics sequences until terminating ':' */
3987 do
3988 ch = cmd_getc ();
3989 while (ch != ':');
3990}
3991/*}}} */
3992
3993/* ------------------------------------------------------------------------- */ 3955/* ------------------------------------------------------------------------- */
3994 3956
3995/* 3957/*
3996 * Send printf () formatted output to the command. 3958 * Send printf () formatted output to the command.
3997 * Only use for small amounts of data. 3959 * Only use for small amounts of data.
… …
4025 3987
4026 if (v_buflen == 0) 3988 if (v_buflen == 0)
4027 { 3989 {
4028 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));
4029 3991
3992 max_it (written, 0);
3993
4030 if ((unsigned int)written == len) 3994 if (written == len)
4031 return; 3995 return;
4032 3996
4033 data += written; 3997 data += written;
4034 len -= written; 3998 len -= written;
4035 } 3999 }

Diff Legend

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