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.420 by root, Wed Oct 15 14:48:22 2008 UTC vs.
Revision 1.440 by root, Tue Mar 30 23:00:35 2010 UTC

… …
162 162
163void 163void
164rxvt_term::iso14755_51 (unicode_t ch, rend_t r, int x, int y) 164rxvt_term::iso14755_51 (unicode_t ch, rend_t r, int x, int y)
165{ 165{
166 rxvt_fontset *fs = FONTSET (r); 166 rxvt_fontset *fs = FONTSET (r);
167 rxvt_font *f = (*fs)[fs->find_font (ch)];
168 wchar_t *chr, *alloc, ch2, *fname; 167 wchar_t *chr, *alloc, ch2, **fname;
169 int len; 168 int len;
170
171 fname = rxvt_utf8towcs (f->name);
172 169
173# if ENABLE_COMBINING 170# if ENABLE_COMBINING
174 if (IS_COMPOSE (ch)) 171 if (IS_COMPOSE (ch))
175 { 172 {
176 len = rxvt_composite.expand (ch, 0); 173 len = rxvt_composite.expand (ch, 0);
… …
197 r & RS_Blink ? " blink" : "", 194 r & RS_Blink ? " blink" : "",
198 r & RS_RVid ? " rvid" : "", 195 r & RS_RVid ? " rvid" : "",
199 r & RS_Uline ? " uline" : "", 196 r & RS_Uline ? " uline" : "",
200 r & RS_Careful ? " careful" : ""); 197 r & RS_Careful ? " careful" : "");
201 198
199 int width = 0;
200 fname = rxvt_temp_buf<wchar_t *> (len);
201 for (int i = 0; i < len; i++)
202 {
203 rxvt_font *f = fs->get (chr[i]);
204 fname[i] = rxvt_utf8towcs (f->name);
202 int width = wcswidth (fname, wcslen (fname)); 205 max_it (width, wcswidth (fname[i], wcslen (fname[i])));
206 }
203 207
204 max_it (width, 8+5); // for char + hex 208 max_it (width, 8+5); // for char + hex
205 max_it (width, strlen (attr)); 209 max_it (width, strlen (attr));
206 210
207 if (y >= 0) 211 if (y >= 0)
208 { 212 {
209 y = (y >= nrow - len - 4 && x < width + 2) ? 0 : -1; 213 y = (y >= nrow - len - 4 && x < width + 2) ? 0 : -1;
210 x = 0; 214 x = 0;
211 } 215 }
212 216
213 scr_overlay_new (x, y, width, len + 2); 217 scr_overlay_new (x, y, width, len * 2 + 1);
214 218
215 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r)); 219 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r));
216 220
217 for (int y = 0; y < len; y++) 221 for (int y = 0; y < len; y++)
218 { 222 {
… …
237// char buf[4+4+3+1]; 241// char buf[4+4+3+1];
238// snprintf (buf, sizeof (buf), "(%.4d|%.4d)", x, y); 242// snprintf (buf, sizeof (buf), "(%.4d|%.4d)", x, y);
239// scr_overlay_set (0, 0, buf); 243// scr_overlay_set (0, 0, buf);
240// } 244// }
241 scr_overlay_set (0, len , attr); 245 scr_overlay_set (0, len , attr);
246 for (int i = 0; i < len; i++)
247 {
242 scr_overlay_set (0, len + 1, fname); 248 scr_overlay_set (0, len + 1 + i, fname[i]);
243
244 free (fname); 249 free (fname[i]);
250 }
245 251
246# if ENABLE_COMBINING 252# if ENABLE_COMBINING
247 if (alloc) 253 if (alloc)
248 delete [] alloc; 254 delete [] alloc;
249# endif 255# endif
… …
505#ifdef PAGING_CONTEXT_LINES 511#ifdef PAGING_CONTEXT_LINES
506 lnsppg = nrow - PAGING_CONTEXT_LINES; 512 lnsppg = nrow - PAGING_CONTEXT_LINES;
507#else 513#else
508 lnsppg = nrow * 4 / 5; 514 lnsppg = nrow * 4 / 5;
509#endif 515#endif
516 max_it (lnsppg, 1);
517
510 if (keysym == XK_Prior) 518 if (keysym == XK_Prior)
511 { 519 {
512 scr_page (UP, lnsppg); 520 scr_page (UP, lnsppg);
513 return; 521 return;
514 } 522 }
… …
579 } 587 }
580 } 588 }
581 589
582#if ENABLE_FRILLS || ISO_14755 590#if ENABLE_FRILLS || ISO_14755
583 // ISO 14755 support 591 // ISO 14755 support
584 if (shft && ctrl) 592 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_51))
585 { 593 {
586 int hv; 594 int hv;
587 595
588 if (iso14755buf & ISO_14755_51 596 if (iso14755buf & ISO_14755_51
589 && (keysym == XK_space || keysym == XK_KP_Space 597 && (keysym == XK_space || keysym == XK_KP_Space
… …
619 scr_overlay_off (); 627 scr_overlay_off ();
620# endif 628# endif
621 iso14755buf = 0; 629 iso14755buf = 0;
622 } 630 }
623 } 631 }
632 else if (option (Opt_iso14755) &&
624 else if ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R)) 633 ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R))
625 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R))) 634 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R))))
626 if (!(iso14755buf & ISO_14755_STARTED)) 635 if (!(iso14755buf & ISO_14755_STARTED))
627 { 636 {
628 iso14755buf |= ISO_14755_STARTED; 637 iso14755buf |= ISO_14755_STARTED;
629# if ISO_14755 638# if ISO_14755
630 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1); 639 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1);
… …
1127 { 1136 {
1128 // this should really be sched_yield(), but the linux guys thought 1137 // this should really be sched_yield(), but the linux guys thought
1129 // that giving a process calling sched_yield () less cpu time than 1138 // 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 1139 // ones with high nice levels is a useful thing to do. It surely is is
1131 // allowed by the sus... as is returning ENOSYS. 1140 // allowed by the sus... as is returning ENOSYS.
1141 // since the linux guys additionally thought that breaking the only
1142 // known workaroudn against their unusable sched_yield hack is cool,
1143 // we just nanosleep a bit and hope for the best.
1132 1144
1133 struct timespec ts = { 0, 0 }; 1145 struct timespec ts = { 0, 1000 };
1134 nanosleep (&ts, 0); 1146 nanosleep (&ts, 0);
1135 1147
1136 w.stop (); 1148 w.stop ();
1137 } 1149 }
1138 1150
… …
1188{ 1200{
1189 make_current (); 1201 make_current ();
1190 1202
1191 if (revents & ev::READ) 1203 if (revents & ev::READ)
1192 // loop, but don't allow a single term to monopolize us 1204 // loop, but don't allow a single term to monopolize us
1193 while (pty_fill ()) 1205 for (int i = CBUFCNT; i-- && pty_fill (); )
1194 if (cmd_parse ()) 1206 cmd_parse ();
1195 break;
1196 1207
1197 if (revents & ev::WRITE) 1208 if (revents & ev::WRITE)
1198 pty_write (); 1209 pty_write ();
1199 1210
1200 refresh_check (); 1211 refresh_check ();
… …
1459 selection_property (ev.xproperty.window, ev.xproperty.atom); 1470 selection_property (ev.xproperty.window, ev.xproperty.atom);
1460 1471
1461 break; 1472 break;
1462 1473
1463 case SelectionClear: 1474 case SelectionClear:
1464 selection_clear (); 1475 selection_clear (ev.xselectionclear.selection == xa[XA_CLIPBOARD]);
1465 break; 1476 break;
1466 1477
1467 case SelectionNotify: 1478 case SelectionNotify:
1468 if (selection_wait == Sel_normal) 1479 if (selection_wait == Sel_normal)
1469 selection_paste (ev.xselection.requestor, ev.xselection.property, true); 1480 selection_paste (ev.xselection.requestor, ev.xselection.property, true);
… …
1682#endif 1693#endif
1683 1694
1684 refresh_check (); 1695 refresh_check ();
1685} 1696}
1686 1697
1698#if ENABLE_FRILLS
1687void 1699void
1688rxvt_term::set_urgency (bool enable) 1700rxvt_term::set_urgency (bool enable)
1689{ 1701{
1690 if (enable == urgency_hint) 1702 if (enable == urgency_hint)
1691 return; 1703 return;
… …
1695 h->flags = h->flags & ~XUrgencyHint | (enable ? XUrgencyHint : 0); 1707 h->flags = h->flags & ~XUrgencyHint | (enable ? XUrgencyHint : 0);
1696 XSetWMHints (dpy, parent[0], h); 1708 XSetWMHints (dpy, parent[0], h);
1697 urgency_hint = enable; 1709 urgency_hint = enable;
1698 } 1710 }
1699} 1711}
1712#endif
1700 1713
1701void 1714void
1702rxvt_term::focus_in () 1715rxvt_term::focus_in ()
1703{ 1716{
1704 if (!focus) 1717 if (!focus)
… …
2182 } 2195 }
2183} 2196}
2184 2197
2185/*}}} */ 2198/*}}} */
2186 2199
2187bool 2200void
2188rxvt_term::cmd_parse () 2201rxvt_term::cmd_parse ()
2189{ 2202{
2190 bool flag = false;
2191 wchar_t ch = NOCHAR; 2203 wchar_t ch = NOCHAR;
2192 char *seq_begin; // remember start of esc-sequence here 2204 char *seq_begin; // remember start of esc-sequence here
2193 2205
2194 for (;;) 2206 for (;;)
2195 { 2207 {
… …
2289 * What the heck we'll cheat and only refresh less than every page-full. 2301 * What the heck we'll cheat and only refresh less than every page-full.
2290 * if skipScroll is enabled. 2302 * if skipScroll is enabled.
2291 */ 2303 */
2292 if (refreshnow) 2304 if (refreshnow)
2293 { 2305 {
2294 flag = true;
2295 scr_refresh (); 2306 scr_refresh ();
2296 want_refresh = 1; 2307 want_refresh = 1;
2297 } 2308 }
2298
2299 } 2309 }
2300 else 2310 else
2301 { 2311 {
2302 try 2312 try
2303 { 2313 {
… …
2311 } 2321 }
2312 2322
2313 ch = NOCHAR; 2323 ch = NOCHAR;
2314 } 2324 }
2315 } 2325 }
2316
2317 return flag;
2318} 2326}
2319 2327
2320// read the next character 2328// read the next character
2321wchar_t 2329wchar_t
2322rxvt_term::next_char () NOTHROW 2330rxvt_term::next_char () NOTHROW
… …
2337 break; 2345 break;
2338 } 2346 }
2339 2347
2340 if (len == (size_t)-1) 2348 if (len == (size_t)-1)
2341 { 2349 {
2342 mbrtowc (0, 0, 0, mbstate); // reset now undefined conversion state 2350 mbstate.reset (); // reset now undefined conversion state
2343 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 2351 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2344 } 2352 }
2345 2353
2346 // assume wchar == unicode 2354 // assume wchar == unicode
2347 cmdbuf_ptr += len; 2355 cmdbuf_ptr += len;
… …
2691 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 2699 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
2692 case C1_SCI: /* ESC Z */ 2700 case C1_SCI: /* ESC Z */
2693 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1); 2701 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
2694 break; /* steal obsolete ESC [ c */ 2702 break; /* steal obsolete ESC [ c */
2695 2703
2696 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 2704 /* 8.3.16: CONTROL SEQUENCE INTRODUCER (CSI) */
2697 case C1_CSI: /* ESC [ */ 2705 case C1_CSI: /* ESC [ */
2698 process_csi_seq (); 2706 process_csi_seq ();
2699 break; 2707 break;
2700 2708
2701 /* 8.3.90: OPERATING SYSTEM COMMAND */ 2709 /* 8.3.90: OPERATING SYSTEM COMMAND (OSC) */
2702 case C1_OSC: /* ESC ] */ 2710 case C1_OSC: /* ESC ] */
2703 process_osc_seq (); 2711 process_osc_seq ();
2704 break; 2712 break;
2705 2713
2706 /* 8.3.106: RESET TO INITIAL STATE */ 2714 /* 8.3.106: RESET TO INITIAL STATE (RIS) */
2707 case 'c': 2715 case 'c':
2708 mbstate.reset (); 2716 mbstate.reset ();
2709 scr_poweron (); 2717 scr_poweron ();
2710 scrollBar.show (1); 2718 scrollBar.show (1);
2711 break; 2719 break;
… …
2766 2774
2767 nargs = 0; 2775 nargs = 0;
2768 2776
2769 priv = 0; 2777 priv = 0;
2770 ch = cmd_getc (); 2778 ch = cmd_getc ();
2771 if (ch >= '<' && ch <= '?') 2779 if ((ch >= '<' && ch <= '?') || ch == '!')
2772 { 2780 {
2773 /* '<' '=' '>' '?' */ 2781 /* '<' '=' '>' '?' '!' */
2774 priv = ch; 2782 priv = ch;
2775 ch = cmd_getc (); 2783 ch = cmd_getc ();
2776 } 2784 }
2777 2785
2778 /* read any numerical arguments */ 2786 /* read any numerical arguments */
… …
2832 2840
2833 case '?': 2841 case '?':
2834 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2842 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
2835 process_terminal_mode (ch, priv, nargs, arg); 2843 process_terminal_mode (ch, priv, nargs, arg);
2836 break; 2844 break;
2845
2846 case '!':
2847 if (ch == CSI_70)
2848 {
2849 /* DECSTR: soft terminal reset, used by our terminfo since 9.06 */
2850 scr_soft_reset ();
2851
2852 static const int pm_h[] = { 7, 25 };
2853 static const int pm_l[] = { 1, 3, 4, 5, 6, 9, 66, 1000, 1001, 1049 };
2854
2855 process_terminal_mode ('h', 0, sizeof (pm_h) / sizeof (pm_h[0]), pm_h);
2856 process_terminal_mode ('l', 0, sizeof (pm_l) / sizeof (pm_l[0]), pm_l);
2837 } 2857 }
2858 break;
2859 }
2860
2838 return; 2861 return;
2839 } 2862 }
2840 2863
2841 switch (ch) 2864 switch (ch)
2842 { 2865 {
… …
3271 3294
3272/* 3295/*
3273 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3296 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3274 */ 3297 */
3275void 3298void
3276rxvt_term::process_xterm_seq (int op, const char *str, char resp) 3299rxvt_term::process_xterm_seq (int op, char *str, char resp)
3277{ 3300{
3278 int color; 3301 int color;
3279 char *buf, *name; 3302 char *buf, *name;
3280 bool query = str[0] == '?' && !str[1]; 3303 bool query = str[0] == '?' && !str[1];
3281 int saveop = op; 3304 int saveop = op;
… …
3322 3345
3323 XFree (value); 3346 XFree (value);
3324 } 3347 }
3325 else 3348 else
3326 { 3349 {
3327 char *eq = strchr (str, '='); // constness lost, but verified to be ok 3350 char *eq = strchr (str, '=');
3328 3351
3329 if (eq) 3352 if (eq)
3330 { 3353 {
3331 *eq = 0; 3354 *eq = 0;
3332 set_utf8_property (display->atom (str), eq + 1); 3355 set_utf8_property (display->atom (str), eq + 1);
… …
3388 break; 3411 break;
3389 case URxvt_Color_IT: 3412 case URxvt_Color_IT:
3390 process_color_seq (op, Color_IT, str, resp); 3413 process_color_seq (op, Color_IT, str, resp);
3391 break; 3414 break;
3392#endif 3415#endif
3416 case URxvt_Color_border:
3417 process_color_seq (op, Color_border, str, resp);
3418 break;
3393#if ENABLE_TRANSPARENCY 3419#if ENABLE_TRANSPARENCY
3394 case URxvt_Color_tint: 3420 case URxvt_Color_tint:
3395 process_color_seq (op, Color_tint, str, resp); 3421 process_color_seq (op, Color_tint, str, resp);
3396 { 3422 {
3397 bool changed = false; 3423 bool changed = false;
… …
3412 case Rxvt_Pixmap: 3438 case Rxvt_Pixmap:
3413 if (!strcmp (str, "?")) 3439 if (!strcmp (str, "?"))
3414 { 3440 {
3415 char str[256]; 3441 char str[256];
3416 3442
3417 sprintf (str, "[%dx%d+%d+%d]", /* can't presume snprintf () ! */ 3443 sprintf (str, "[%dx%d+%d+%d]",
3418 min (bgPixmap.h_scale, 32767), min (bgPixmap.v_scale, 32767), 3444 min (bgPixmap.h_scale, 32767), min (bgPixmap.v_scale, 32767),
3419 min (bgPixmap.h_align, 32767), min (bgPixmap.v_align, 32767)); 3445 min (bgPixmap.h_align, 32767), min (bgPixmap.v_align, 32767));
3420 process_xterm_seq (XTerm_title, str, CHAR_ST); 3446 process_xterm_seq (XTerm_title, str, CHAR_ST);
3421 } 3447 }
3422 else 3448 else
… …
3572 static const struct 3598 static const struct
3573 { 3599 {
3574 const int argval; 3600 const int argval;
3575 const unsigned long bit; 3601 const unsigned long bit;
3576 } argtopriv[] = { 3602 } argtopriv[] = {
3577 { 1, PrivMode_aplCUR }, 3603 { 1, PrivMode_aplCUR }, // DECCKM
3578 { 2, PrivMode_vt52 }, 3604 { 2, PrivMode_vt52 },
3579 { 3, PrivMode_132 }, 3605 { 3, PrivMode_132 }, // DECCOLM
3580 { 4, PrivMode_smoothScroll }, 3606 { 4, PrivMode_smoothScroll }, // DECSCLM
3581 { 5, PrivMode_rVideo }, 3607 { 5, PrivMode_rVideo }, // DECSCNM
3582 { 6, PrivMode_relOrigin }, 3608 { 6, PrivMode_relOrigin }, // DECOM
3583 { 7, PrivMode_Autowrap }, 3609 { 7, PrivMode_Autowrap }, // DECAWM
3584 // 8, bi-directional support mode 3610 // 8, auto-repeat keys // DECARM
3585 { 9, PrivMode_MouseX10 }, 3611 { 9, PrivMode_MouseX10 },
3586 // 18, 19 printing-related 3612 // 18 end FF to printer after print screen
3613 // 19 Print screen prints full screen/scorll region
3587 { 25, PrivMode_VisibleCursor }, 3614 { 25, PrivMode_VisibleCursor }, // cnorm/cvvis/civis
3588#ifdef scrollBar_esc 3615#ifdef scrollBar_esc
3589 { scrollBar_esc, PrivMode_scrollBar }, 3616 { scrollBar_esc, PrivMode_scrollBar },
3590#endif 3617#endif
3591 { 35, PrivMode_ShiftKeys }, // rxvt extension 3618 { 35, PrivMode_ShiftKeys }, // rxvt extension
3619 // 38, tektronix mode // DECTEK
3592 { 40, PrivMode_132OK }, 3620 { 40, PrivMode_132OK },
3593 // 41 xterm more fixes NYI 3621 // 41 xterm more fixes NYI
3594 // 45 margin bell NYI 3622 // 45 margin bell NYI
3595 // 46 start logging 3623 // 46 start logging
3596 { 47, PrivMode_Screen }, 3624 { 47, PrivMode_Screen },
3597 { 66, PrivMode_aplKP }, 3625 { 66, PrivMode_aplKP }, // DECPAM/DECPNM
3598#ifndef NO_BACKSPACE_KEY 3626#ifndef NO_BACKSPACE_KEY
3599 { 67, PrivMode_BackSpace }, 3627 { 67, PrivMode_BackSpace }, // DECBKM
3600#endif 3628#endif
3601 { 1000, PrivMode_MouseX11 }, 3629 { 1000, PrivMode_MouseX11 },
3602 { 1002, PrivMode_MouseBtnEvent }, 3630 { 1002, PrivMode_MouseBtnEvent },
3603 { 1003, PrivMode_MouseAnyEvent }, 3631 { 1003, PrivMode_MouseAnyEvent },
3604 { 1010, PrivMode_TtyOutputInh }, // rxvt extension 3632 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
… …
3643 3671
3644 scr_touch (true); 3672 scr_touch (true);
3645 break; 3673 break;
3646#endif 3674#endif
3647 case 1048: /* alternative cursor save */ 3675 case 1048: /* alternative cursor save */
3648 case 1049:
3649 if (option (Opt_secondaryScreen)) 3676 if (option (Opt_secondaryScreen))
3650 if (mode == 0) 3677 if (mode == 0)
3651 scr_cursor (RESTORE); 3678 scr_cursor (RESTORE);
3652 else if (mode == 1) 3679 else if (mode == 1)
3653 scr_cursor (SAVE); 3680 scr_cursor (SAVE);
… …
3666 */ 3693 */
3667 set_privmode (PrivMode_vt52, 1); 3694 set_privmode (PrivMode_vt52, 1);
3668 break; 3695 break;
3669 case 3: /* 80/132 */ 3696 case 3: /* 80/132 */
3670 if (priv_modes & PrivMode_132OK) 3697 if (priv_modes & PrivMode_132OK)
3671 {
3672 scr_poweron ();
3673 set_widthheight (((state ? 132 : 80) * fwidth), 24 * fheight); 3698 set_widthheight ((state ? 132 : 80) * fwidth, 24 * fheight);
3674 }
3675 break; 3699 break;
3676 case 4: /* smooth scrolling */ 3700 case 4: /* smooth scrolling */
3677 set_option (Opt_jumpScroll, !state); 3701 set_option (Opt_jumpScroll, !state);
3678 break; 3702 break;
3679 case 5: /* reverse video */ 3703 case 5: /* reverse video */
… …
3721 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent; 3745 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent;
3722 vt_emask_mouse = PointerMotionMask; 3746 vt_emask_mouse = PointerMotionMask;
3723 } 3747 }
3724 else 3748 else
3725 vt_emask_mouse = NoEventMask; 3749 vt_emask_mouse = NoEventMask;
3750
3726 vt_select_input (); 3751 vt_select_input ();
3727 break; 3752 break;
3728 case 1010: /* scroll to bottom on TTY output inhibit */ 3753 case 1010: /* scroll to bottom on TTY output inhibit */
3729 set_option (Opt_scrollTtyOutput, !state); 3754 set_option (Opt_scrollTtyOutput, !state);
3730 break; 3755 break;
3731 case 1011: /* scroll to bottom on key press */ 3756 case 1011: /* scroll to bottom on key press */
3732 set_option (Opt_scrollTtyKeypress, state); 3757 set_option (Opt_scrollTtyKeypress, state);
3733 break; 3758 break;
3734 case 1047: /* secondary screen w/ clearing last */ 3759 case 1047: /* secondary screen w/ clearing last */
3735 if (option (Opt_secondaryScreen)) 3760 if (option (Opt_secondaryScreen))
3736 if (current_screen != PRIMARY) 3761 if (!state)
3737 scr_erase_screen (2); 3762 scr_erase_screen (2);
3763
3738 scr_change_screen (state); 3764 scr_change_screen (state);
3739 break; 3765 break;
3740 case 1049: /* secondary screen w/ clearing first */ 3766 case 1049: /* secondary screen w/ clearing first */
3767 if (option (Opt_secondaryScreen))
3768 if (state)
3769 scr_cursor (SAVE);
3770
3741 scr_change_screen (state); 3771 scr_change_screen (state);
3772
3742 if (option (Opt_secondaryScreen)) 3773 if (option (Opt_secondaryScreen))
3743 if (current_screen != PRIMARY) 3774 if (state)
3744 scr_erase_screen (2); 3775 scr_erase_screen (2);
3776 else
3777 scr_cursor (RESTORE);
3745 break; 3778 break;
3746 default: 3779 default:
3747 break; 3780 break;
3748 } 3781 }
3749 } 3782 }

Diff Legend

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