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.415 by root, Sat Apr 26 03:37:18 2008 UTC vs.
Revision 1.438 by root, Thu Feb 4 21:55:12 2010 UTC

505#ifdef PAGING_CONTEXT_LINES 505#ifdef PAGING_CONTEXT_LINES
506 lnsppg = nrow - PAGING_CONTEXT_LINES; 506 lnsppg = nrow - PAGING_CONTEXT_LINES;
507#else 507#else
508 lnsppg = nrow * 4 / 5; 508 lnsppg = nrow * 4 / 5;
509#endif 509#endif
510 max_it (lnsppg, 1);
511
510 if (keysym == XK_Prior) 512 if (keysym == XK_Prior)
511 { 513 {
512 scr_page (UP, lnsppg); 514 scr_page (UP, lnsppg);
513 return; 515 return;
514 } 516 }
579 } 581 }
580 } 582 }
581 583
582#if ENABLE_FRILLS || ISO_14755 584#if ENABLE_FRILLS || ISO_14755
583 // ISO 14755 support 585 // ISO 14755 support
584 if (shft && ctrl) 586 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_51))
585 { 587 {
586 int hv; 588 int hv;
587 589
588 if (iso14755buf & ISO_14755_51 590 if (iso14755buf & ISO_14755_51
589 && (keysym == XK_space || keysym == XK_KP_Space 591 && (keysym == XK_space || keysym == XK_KP_Space
619 scr_overlay_off (); 621 scr_overlay_off ();
620# endif 622# endif
621 iso14755buf = 0; 623 iso14755buf = 0;
622 } 624 }
623 } 625 }
626 else if (option (Opt_iso14755) &&
624 else if ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R)) 627 ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R))
625 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R))) 628 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R))))
626 if (!(iso14755buf & ISO_14755_STARTED)) 629 if (!(iso14755buf & ISO_14755_STARTED))
627 { 630 {
628 iso14755buf |= ISO_14755_STARTED; 631 iso14755buf |= ISO_14755_STARTED;
629# if ISO_14755 632# if ISO_14755
630 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1); 633 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1);
1127 { 1130 {
1128 // this should really be sched_yield(), but the linux guys thought 1131 // this should really be sched_yield(), but the linux guys thought
1129 // that giving a process calling sched_yield () less cpu time than 1132 // that giving a process calling sched_yield () less cpu time than
1130 // ones with high nice levels is a useful thing to do. It surely is is 1133 // ones with high nice levels is a useful thing to do. It surely is is
1131 // allowed by the sus... as is returning ENOSYS. 1134 // allowed by the sus... as is returning ENOSYS.
1135 // since the linux guys additionally thought that breaking the only
1136 // known workaroudn against their unusable sched_yield hack is cool,
1137 // we just nanosleep a bit and hope for the best.
1132 1138
1133 struct timespec ts = { 0, 0 }; 1139 struct timespec ts = { 0, 1000 };
1134 nanosleep (&ts, 0); 1140 nanosleep (&ts, 0);
1135 1141
1136 w.stop (); 1142 w.stop ();
1137 } 1143 }
1138 1144
1188{ 1194{
1189 make_current (); 1195 make_current ();
1190 1196
1191 if (revents & ev::READ) 1197 if (revents & ev::READ)
1192 // loop, but don't allow a single term to monopolize us 1198 // loop, but don't allow a single term to monopolize us
1193 while (pty_fill ()) 1199 for (int i = CBUFCNT; i-- && pty_fill (); )
1194 if (cmd_parse ()) 1200 cmd_parse ();
1195 break;
1196 1201
1197 if (revents & ev::WRITE) 1202 if (revents & ev::WRITE)
1198 pty_write (); 1203 pty_write ();
1199 1204
1200 refresh_check (); 1205 refresh_check ();
1459 selection_property (ev.xproperty.window, ev.xproperty.atom); 1464 selection_property (ev.xproperty.window, ev.xproperty.atom);
1460 1465
1461 break; 1466 break;
1462 1467
1463 case SelectionClear: 1468 case SelectionClear:
1464 selection_clear (); 1469 selection_clear (ev.xselectionclear.selection == xa[XA_CLIPBOARD]);
1465 break; 1470 break;
1466 1471
1467 case SelectionNotify: 1472 case SelectionNotify:
1468 if (selection_wait == Sel_normal) 1473 if (selection_wait == Sel_normal)
1469 selection_paste (ev.xselection.requestor, ev.xselection.property, true); 1474 selection_paste (ev.xselection.requestor, ev.xselection.property, true);
1682#endif 1687#endif
1683 1688
1684 refresh_check (); 1689 refresh_check ();
1685} 1690}
1686 1691
1692#if ENABLE_FRILLS
1693void
1694rxvt_term::set_urgency (bool enable)
1695{
1696 if (enable == urgency_hint)
1697 return;
1698
1699 if (XWMHints *h = XGetWMHints (dpy, parent[0]))
1700 {
1701 h->flags = h->flags & ~XUrgencyHint | (enable ? XUrgencyHint : 0);
1702 XSetWMHints (dpy, parent[0], h);
1703 urgency_hint = enable;
1704 }
1705}
1706#endif
1707
1687void 1708void
1688rxvt_term::focus_in () 1709rxvt_term::focus_in ()
1689{ 1710{
1690 if (!focus) 1711 if (!focus)
1691 { 1712 {
1692 focus = 1; 1713 focus = 1;
1693 want_refresh = 1; 1714 want_refresh = 1;
1694
1695 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1696 1715
1697#if USE_XIM 1716#if USE_XIM
1698 if (Input_Context != NULL) 1717 if (Input_Context != NULL)
1699 { 1718 {
1700 IMSetPosition (); 1719 IMSetPosition ();
1712 scr_recolour (); 1731 scr_recolour ();
1713 } 1732 }
1714#endif 1733#endif
1715#if ENABLE_FRILLS 1734#if ENABLE_FRILLS
1716 if (option (Opt_urgentOnBell)) 1735 if (option (Opt_urgentOnBell))
1717 { 1736 set_urgency (0);
1718 if (XWMHints *h = XGetWMHints(dpy, parent[0]))
1719 {
1720 h->flags &= ~XUrgencyHint;
1721 XSetWMHints (dpy, parent[0], h);
1722 }
1723 }
1724#endif 1737#endif
1738
1739 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1725 } 1740 }
1726} 1741}
1727 1742
1728void 1743void
1729rxvt_term::focus_out () 1744rxvt_term::focus_out ()
1731 if (focus) 1746 if (focus)
1732 { 1747 {
1733 focus = 0; 1748 focus = 0;
1734 want_refresh = 1; 1749 want_refresh = 1;
1735 1750
1736 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1751#if ENABLE_FRILLS
1737 1752 if (option (Opt_urgentOnBell))
1753 set_urgency (0);
1754#endif
1738#if ENABLE_FRILLS || ISO_14755 1755#if ENABLE_FRILLS || ISO_14755
1739 if (iso14755buf) 1756 if (iso14755buf)
1740 { 1757 {
1741 iso14755buf = 0; 1758 iso14755buf = 0;
1742# if ISO_14755 1759# if ISO_14755
1759 { 1776 {
1760 pix_colors = pix_colors_unfocused; 1777 pix_colors = pix_colors_unfocused;
1761 scr_recolour (); 1778 scr_recolour ();
1762 } 1779 }
1763#endif 1780#endif
1781
1782 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1764 } 1783 }
1765} 1784}
1766 1785
1767void 1786void
1768rxvt_term::update_fade_color (unsigned int idx) 1787rxvt_term::update_fade_color (unsigned int idx)
2170 } 2189 }
2171} 2190}
2172 2191
2173/*}}} */ 2192/*}}} */
2174 2193
2175bool 2194void
2176rxvt_term::cmd_parse () 2195rxvt_term::cmd_parse ()
2177{ 2196{
2178 bool flag = false;
2179 wchar_t ch = NOCHAR; 2197 wchar_t ch = NOCHAR;
2180 char *seq_begin; // remember start of esc-sequence here 2198 char *seq_begin; // remember start of esc-sequence here
2181 2199
2182 for (;;) 2200 for (;;)
2183 { 2201 {
2184 if (ch == NOCHAR) 2202 if (expect_false (ch == NOCHAR))
2185 { 2203 {
2186 seq_begin = cmdbuf_ptr; 2204 seq_begin = cmdbuf_ptr;
2187 ch = next_char (); 2205 ch = next_char ();
2188 2206
2189 if (ch == NOCHAR) 2207 if (ch == NOCHAR)
2190 break; 2208 break;
2191 } 2209 }
2192 2210
2193 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT) 2211 if (expect_true (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT))
2194 { 2212 {
2195 if (!seen_input) 2213 if (expect_false (!seen_input))
2196 { 2214 {
2197 seen_input = 1; 2215 seen_input = 1;
2198 // many badly-written programs (e.g. jed) contain a race condition: 2216 // many badly-written programs (e.g. jed) contain a race condition:
2199 // they first read the screensize and then install a SIGWINCH handler. 2217 // they first read the screensize and then install a SIGWINCH handler.
2200 // some window managers resize the window early, and these programs 2218 // some window managers resize the window early, and these programs
2213 wchar_t *str = buf; 2231 wchar_t *str = buf;
2214 wchar_t *eol = str + min (ncol, UBUFSIZ); 2232 wchar_t *eol = str + min (ncol, UBUFSIZ);
2215 2233
2216 for (;;) 2234 for (;;)
2217 { 2235 {
2218 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)) 2236 if (expect_false (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)))
2219 break; 2237 break;
2220 2238
2221 *str++ = ch; 2239 *str++ = ch;
2222 2240
2223 if (ch == C0_LF || str >= eol) 2241 if (expect_false (ch == C0_LF || str >= eol))
2224 { 2242 {
2225 if (ch == C0_LF) 2243 if (ch == C0_LF)
2226 nlines++; 2244 nlines++;
2227 2245
2228 refresh_count++; 2246 refresh_count++;
2277 * What the heck we'll cheat and only refresh less than every page-full. 2295 * What the heck we'll cheat and only refresh less than every page-full.
2278 * if skipScroll is enabled. 2296 * if skipScroll is enabled.
2279 */ 2297 */
2280 if (refreshnow) 2298 if (refreshnow)
2281 { 2299 {
2282 flag = true;
2283 scr_refresh (); 2300 scr_refresh ();
2284 want_refresh = 1; 2301 want_refresh = 1;
2285 } 2302 }
2286
2287 } 2303 }
2288 else 2304 else
2289 { 2305 {
2290 try 2306 try
2291 { 2307 {
2299 } 2315 }
2300 2316
2301 ch = NOCHAR; 2317 ch = NOCHAR;
2302 } 2318 }
2303 } 2319 }
2304
2305 return flag;
2306} 2320}
2307 2321
2308// read the next character 2322// read the next character
2309wchar_t 2323wchar_t
2310rxvt_term::next_char () NOTHROW 2324rxvt_term::next_char () NOTHROW
2311{ 2325{
2312 while (cmdbuf_ptr < cmdbuf_endp) 2326 while (cmdbuf_ptr < cmdbuf_endp)
2313 { 2327 {
2314 // assume 7-bit to be ascii ALWAYS 2328 // assume 7-bit to be ascii ALWAYS
2315 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2329 if (expect_true ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b))
2316 return *cmdbuf_ptr++; 2330 return *cmdbuf_ptr++;
2317 2331
2318 wchar_t wc; 2332 wchar_t wc;
2319 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate); 2333 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2320 2334
2325 break; 2339 break;
2326 } 2340 }
2327 2341
2328 if (len == (size_t)-1) 2342 if (len == (size_t)-1)
2329 { 2343 {
2330 mbrtowc (0, 0, 0, mbstate); // reset now undefined conversion state 2344 mbstate.reset (); // reset now undefined conversion state
2331 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 2345 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2332 } 2346 }
2333 2347
2334 // assume wchar == unicode 2348 // assume wchar == unicode
2335 cmdbuf_ptr += len; 2349 cmdbuf_ptr += len;
2381/*----------------------------------------------------------------------*/ 2395/*----------------------------------------------------------------------*/
2382#ifdef PRINTPIPE 2396#ifdef PRINTPIPE
2383FILE * 2397FILE *
2384rxvt_term::popen_printer () 2398rxvt_term::popen_printer ()
2385{ 2399{
2386 FILE *stream = popen (rs[Rs_print_pipe], "w"); 2400 FILE *stream = popen (rs[Rs_print_pipe] ? rs[Rs_print_pipe] : PRINTPIPE, "w");
2387 2401
2388 if (stream == NULL) 2402 if (stream == NULL)
2389 rxvt_warn ("can't open printer pipe, not printing.\n"); 2403 rxvt_warn ("can't open printer pipe, not printing.\n");
2390 2404
2391 return stream; 2405 return stream;
2402 * simulate attached vt100 printer 2416 * simulate attached vt100 printer
2403 */ 2417 */
2404void 2418void
2405rxvt_term::process_print_pipe () 2419rxvt_term::process_print_pipe ()
2406{ 2420{
2407 int done; 2421 FILE *fd = popen_printer ();
2408 FILE *fd;
2409 2422
2410 if ((fd = popen_printer ()) == NULL) 2423 if (!fd)
2411 return; 2424 return;
2412 2425
2413 /* 2426 /*
2414 * Send all input to the printer until either ESC[4i or ESC[?4i 2427 * Send all input to the printer until either ESC[4i or ESC[?4i
2415 * is received. 2428 * is received.
2416 */ 2429 */
2417 for (done = 0; !done;) 2430 for (int done = 0; !done; )
2418 { 2431 {
2419 unsigned char buf[8]; 2432 unsigned char buf[8];
2420 unicode_t ch; 2433 unicode_t ch;
2421 unsigned int i, len; 2434 unsigned int i, len;
2422 2435
2680 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 2693 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
2681 case C1_SCI: /* ESC Z */ 2694 case C1_SCI: /* ESC Z */
2682 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1); 2695 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
2683 break; /* steal obsolete ESC [ c */ 2696 break; /* steal obsolete ESC [ c */
2684 2697
2685 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 2698 /* 8.3.16: CONTROL SEQUENCE INTRODUCER (CSI) */
2686 case C1_CSI: /* ESC [ */ 2699 case C1_CSI: /* ESC [ */
2687 process_csi_seq (); 2700 process_csi_seq ();
2688 break; 2701 break;
2689 2702
2690 /* 8.3.90: OPERATING SYSTEM COMMAND */ 2703 /* 8.3.90: OPERATING SYSTEM COMMAND (OSC) */
2691 case C1_OSC: /* ESC ] */ 2704 case C1_OSC: /* ESC ] */
2692 process_osc_seq (); 2705 process_osc_seq ();
2693 break; 2706 break;
2694 2707
2695 /* 8.3.106: RESET TO INITIAL STATE */ 2708 /* 8.3.106: RESET TO INITIAL STATE (RIS) */
2696 case 'c': 2709 case 'c':
2697 mbstate.reset (); 2710 mbstate.reset ();
2698 scr_poweron (); 2711 scr_poweron ();
2699 scrollBar.show (1); 2712 scrollBar.show (1);
2700 break; 2713 break;
2755 2768
2756 nargs = 0; 2769 nargs = 0;
2757 2770
2758 priv = 0; 2771 priv = 0;
2759 ch = cmd_getc (); 2772 ch = cmd_getc ();
2760 if (ch >= '<' && ch <= '?') 2773 if ((ch >= '<' && ch <= '?') || ch == '!')
2761 { 2774 {
2762 /* '<' '=' '>' '?' */ 2775 /* '<' '=' '>' '?' '!' */
2763 priv = ch; 2776 priv = ch;
2764 ch = cmd_getc (); 2777 ch = cmd_getc ();
2765 } 2778 }
2766 2779
2767 /* read any numerical arguments */ 2780 /* read any numerical arguments */
2821 2834
2822 case '?': 2835 case '?':
2823 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2836 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
2824 process_terminal_mode (ch, priv, nargs, arg); 2837 process_terminal_mode (ch, priv, nargs, arg);
2825 break; 2838 break;
2839
2840 case '!':
2841 if (ch == CSI_70)
2842 {
2843 /* DECSTR: soft terminal reset, used by our terminfo since 9.06 */
2844 scr_soft_reset ();
2845
2846 static const int pm_h[] = { 7, 25 };
2847 static const int pm_l[] = { 1, 3, 4, 5, 6, 9, 66, 1000, 1001, 1049 };
2848
2849 process_terminal_mode ('h', 0, sizeof (pm_h) / sizeof (pm_h[0]), pm_h);
2850 process_terminal_mode ('l', 0, sizeof (pm_l) / sizeof (pm_l[0]), pm_l);
2826 } 2851 }
2852 break;
2853 }
2854
2827 return; 2855 return;
2828 } 2856 }
2829 2857
2830 switch (ch) 2858 switch (ch)
2831 { 2859 {
3260 3288
3261/* 3289/*
3262 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3290 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3263 */ 3291 */
3264void 3292void
3265rxvt_term::process_xterm_seq (int op, const char *str, char resp) 3293rxvt_term::process_xterm_seq (int op, char *str, char resp)
3266{ 3294{
3267 int color; 3295 int color;
3268 char *buf, *name; 3296 char *buf, *name;
3269 bool query = str[0] == '?' && !str[1]; 3297 bool query = str[0] == '?' && !str[1];
3270 int saveop = op; 3298 int saveop = op;
3311 3339
3312 XFree (value); 3340 XFree (value);
3313 } 3341 }
3314 else 3342 else
3315 { 3343 {
3316 char *eq = strchr (str, '='); // constness lost, but verified to be ok 3344 char *eq = strchr (str, '=');
3317 3345
3318 if (eq) 3346 if (eq)
3319 { 3347 {
3320 *eq = 0; 3348 *eq = 0;
3321 set_utf8_property (display->atom (str), eq + 1); 3349 set_utf8_property (display->atom (str), eq + 1);
3377 break; 3405 break;
3378 case URxvt_Color_IT: 3406 case URxvt_Color_IT:
3379 process_color_seq (op, Color_IT, str, resp); 3407 process_color_seq (op, Color_IT, str, resp);
3380 break; 3408 break;
3381#endif 3409#endif
3410 case URxvt_Color_border:
3411 process_color_seq (op, Color_border, str, resp);
3412 break;
3382#if ENABLE_TRANSPARENCY 3413#if ENABLE_TRANSPARENCY
3383 case URxvt_Color_tint: 3414 case URxvt_Color_tint:
3384 process_color_seq (op, Color_tint, str, resp); 3415 process_color_seq (op, Color_tint, str, resp);
3385 { 3416 {
3386 bool changed = false; 3417 bool changed = false;
3401 case Rxvt_Pixmap: 3432 case Rxvt_Pixmap:
3402 if (!strcmp (str, "?")) 3433 if (!strcmp (str, "?"))
3403 { 3434 {
3404 char str[256]; 3435 char str[256];
3405 3436
3406 sprintf (str, "[%dx%d+%d+%d]", /* can't presume snprintf () ! */ 3437 sprintf (str, "[%dx%d+%d+%d]",
3407 min (bgPixmap.h_scale, 32767), min (bgPixmap.v_scale, 32767), 3438 min (bgPixmap.h_scale, 32767), min (bgPixmap.v_scale, 32767),
3408 min (bgPixmap.h_align, 32767), min (bgPixmap.v_align, 32767)); 3439 min (bgPixmap.h_align, 32767), min (bgPixmap.v_align, 32767));
3409 process_xterm_seq (XTerm_title, str, CHAR_ST); 3440 process_xterm_seq (XTerm_title, str, CHAR_ST);
3410 } 3441 }
3411 else 3442 else
3510 break; 3541 break;
3511#endif 3542#endif
3512 3543
3513#if ENABLE_PERL 3544#if ENABLE_PERL
3514 case URxvt_perl: 3545 case URxvt_perl:
3515 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_END))) 3546 HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_STR_LEN, &resp, 1, DT_END));
3516 ; // no responses yet
3517 break; 3547 break;
3518#endif 3548#endif
3519 } 3549 }
3520} 3550}
3521/*----------------------------------------------------------------------*/ 3551/*----------------------------------------------------------------------*/
3562 static const struct 3592 static const struct
3563 { 3593 {
3564 const int argval; 3594 const int argval;
3565 const unsigned long bit; 3595 const unsigned long bit;
3566 } argtopriv[] = { 3596 } argtopriv[] = {
3567 { 1, PrivMode_aplCUR }, 3597 { 1, PrivMode_aplCUR }, // DECCKM
3568 { 2, PrivMode_vt52 }, 3598 { 2, PrivMode_vt52 },
3569 { 3, PrivMode_132 }, 3599 { 3, PrivMode_132 }, // DECCOLM
3570 { 4, PrivMode_smoothScroll }, 3600 { 4, PrivMode_smoothScroll }, // DECSCLM
3571 { 5, PrivMode_rVideo }, 3601 { 5, PrivMode_rVideo }, // DECSCNM
3572 { 6, PrivMode_relOrigin }, 3602 { 6, PrivMode_relOrigin }, // DECOM
3573 { 7, PrivMode_Autowrap }, 3603 { 7, PrivMode_Autowrap }, // DECAWM
3574 // 8, bi-directional support mode 3604 // 8, auto-repeat keys // DECARM
3575 { 9, PrivMode_MouseX10 }, 3605 { 9, PrivMode_MouseX10 },
3576 // 18, 19 printing-related 3606 // 18 end FF to printer after print screen
3607 // 19 Print screen prints full screen/scorll region
3577 { 25, PrivMode_VisibleCursor }, 3608 { 25, PrivMode_VisibleCursor }, // cnorm/cvvis/civis
3578#ifdef scrollBar_esc 3609#ifdef scrollBar_esc
3579 { scrollBar_esc, PrivMode_scrollBar }, 3610 { scrollBar_esc, PrivMode_scrollBar },
3580#endif 3611#endif
3581 { 35, PrivMode_ShiftKeys }, // rxvt extension 3612 { 35, PrivMode_ShiftKeys }, // rxvt extension
3613 // 38, tektronix mode // DECTEK
3582 { 40, PrivMode_132OK }, 3614 { 40, PrivMode_132OK },
3583 // 41 xterm more fixes NYI 3615 // 41 xterm more fixes NYI
3584 // 45 margin bell NYI 3616 // 45 margin bell NYI
3585 // 46 start logging 3617 // 46 start logging
3586 { 47, PrivMode_Screen }, 3618 { 47, PrivMode_Screen },
3587 { 66, PrivMode_aplKP }, 3619 { 66, PrivMode_aplKP }, // DECPAM/DECPNM
3588#ifndef NO_BACKSPACE_KEY 3620#ifndef NO_BACKSPACE_KEY
3589 { 67, PrivMode_BackSpace }, 3621 { 67, PrivMode_BackSpace }, // DECBKM
3590#endif 3622#endif
3591 { 1000, PrivMode_MouseX11 }, 3623 { 1000, PrivMode_MouseX11 },
3592 { 1002, PrivMode_MouseBtnEvent }, 3624 { 1002, PrivMode_MouseBtnEvent },
3593 { 1003, PrivMode_MouseAnyEvent }, 3625 { 1003, PrivMode_MouseAnyEvent },
3594 { 1010, PrivMode_TtyOutputInh }, // rxvt extension 3626 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
3633 3665
3634 scr_touch (true); 3666 scr_touch (true);
3635 break; 3667 break;
3636#endif 3668#endif
3637 case 1048: /* alternative cursor save */ 3669 case 1048: /* alternative cursor save */
3638 case 1049:
3639 if (option (Opt_secondaryScreen)) 3670 if (option (Opt_secondaryScreen))
3640 if (mode == 0) 3671 if (mode == 0)
3641 scr_cursor (RESTORE); 3672 scr_cursor (RESTORE);
3642 else if (mode == 1) 3673 else if (mode == 1)
3643 scr_cursor (SAVE); 3674 scr_cursor (SAVE);
3656 */ 3687 */
3657 set_privmode (PrivMode_vt52, 1); 3688 set_privmode (PrivMode_vt52, 1);
3658 break; 3689 break;
3659 case 3: /* 80/132 */ 3690 case 3: /* 80/132 */
3660 if (priv_modes & PrivMode_132OK) 3691 if (priv_modes & PrivMode_132OK)
3661 {
3662 scr_poweron ();
3663 set_widthheight (((state ? 132 : 80) * fwidth), 24 * fheight); 3692 set_widthheight ((state ? 132 : 80) * fwidth, 24 * fheight);
3664 }
3665 break; 3693 break;
3666 case 4: /* smooth scrolling */ 3694 case 4: /* smooth scrolling */
3667 set_option (Opt_jumpScroll, !state); 3695 set_option (Opt_jumpScroll, !state);
3668 break; 3696 break;
3669 case 5: /* reverse video */ 3697 case 5: /* reverse video */
3711 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent; 3739 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent;
3712 vt_emask_mouse = PointerMotionMask; 3740 vt_emask_mouse = PointerMotionMask;
3713 } 3741 }
3714 else 3742 else
3715 vt_emask_mouse = NoEventMask; 3743 vt_emask_mouse = NoEventMask;
3744
3716 vt_select_input (); 3745 vt_select_input ();
3717 break; 3746 break;
3718 case 1010: /* scroll to bottom on TTY output inhibit */ 3747 case 1010: /* scroll to bottom on TTY output inhibit */
3719 set_option (Opt_scrollTtyOutput, !state); 3748 set_option (Opt_scrollTtyOutput, !state);
3720 break; 3749 break;
3721 case 1011: /* scroll to bottom on key press */ 3750 case 1011: /* scroll to bottom on key press */
3722 set_option (Opt_scrollTtyKeypress, state); 3751 set_option (Opt_scrollTtyKeypress, state);
3723 break; 3752 break;
3724 case 1047: /* secondary screen w/ clearing last */ 3753 case 1047: /* secondary screen w/ clearing last */
3725 if (option (Opt_secondaryScreen)) 3754 if (option (Opt_secondaryScreen))
3726 if (current_screen != PRIMARY) 3755 if (!state)
3727 scr_erase_screen (2); 3756 scr_erase_screen (2);
3757
3728 scr_change_screen (state); 3758 scr_change_screen (state);
3729 break; 3759 break;
3730 case 1049: /* secondary screen w/ clearing first */ 3760 case 1049: /* secondary screen w/ clearing first */
3761 if (option (Opt_secondaryScreen))
3762 if (state)
3763 scr_cursor (SAVE);
3764
3731 scr_change_screen (state); 3765 scr_change_screen (state);
3766
3732 if (option (Opt_secondaryScreen)) 3767 if (option (Opt_secondaryScreen))
3733 if (current_screen != PRIMARY) 3768 if (state)
3734 scr_erase_screen (2); 3769 scr_erase_screen (2);
3770 else
3771 scr_cursor (RESTORE);
3735 break; 3772 break;
3736 default: 3773 default:
3737 break; 3774 break;
3738 } 3775 }
3739 } 3776 }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines