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.423 by root, Tue Nov 4 22:44:09 2008 UTC vs.
Revision 1.449 by sf-exg, Sun Apr 18 11:06:46 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)[fs->find_font_idx (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
… …
282} 288}
283 289
284static int 290static int
285hex_keyval (XKeyEvent &ev) 291hex_keyval (XKeyEvent &ev)
286{ 292{
287 // check wether this event corresponds to a hex digit 293 // check whether this event corresponds to a hex digit
288 // if the modifiers had not been pressed. 294 // if the modifiers had not been pressed.
289 for (int index = 0; index < 8; index++) 295 for (int index = 0; index < 8; index++)
290 { 296 {
291 KeySym k = XLookupKeysym (&ev, index); 297 KeySym k = XLookupKeysym (&ev, index);
292 298
… …
416 */ 422 */
417 shft = ev.state & ShiftMask; 423 shft = ev.state & ShiftMask;
418 ctrl = ev.state & ControlMask; 424 ctrl = ev.state & ControlMask;
419 meta = ev.state & ModMetaMask; 425 meta = ev.state & ModMetaMask;
420 426
421 if (numlock_state || (ev.state & ModNumLockMask))
422 {
423 numlock_state = (ev.state & ModNumLockMask);
424 set_privmode (PrivMode_aplKP, !numlock_state);
425 }
426
427 kbuf[0] = 0; 427 kbuf[0] = 0;
428 428
429#ifdef USE_XIM 429#ifdef USE_XIM
430 if (Input_Context) 430 if (Input_Context)
431 { 431 {
… …
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);
… …
644 if (keysym >= 0xFF00 && keysym <= 0xFFFF) 647 if (keysym >= 0xFF00 && keysym <= 0xFFFF)
645 { 648 {
646 bool kp = priv_modes & PrivMode_aplKP ? !shft : shft; 649 bool kp = priv_modes & PrivMode_aplKP ? !shft : shft;
647 unsigned int newlen = 1; 650 unsigned int newlen = 1;
648 651
652 if (ev.state & ModNumLockMask)
653 kp = false;
654
649 switch (translate_keypad (keysym, kp)) 655 keysym = translate_keypad (keysym, kp);
656
657 switch (keysym)
650 { 658 {
651#ifndef NO_BACKSPACE_KEY 659#ifndef NO_BACKSPACE_KEY
652 case XK_BackSpace: 660 case XK_BackSpace:
653 if (priv_modes & PrivMode_HaveBackSpace) 661 if (priv_modes & PrivMode_HaveBackSpace)
654 { 662 {
… …
1024 } 1032 }
1025 1033
1026 display->flush (); 1034 display->flush ();
1027} 1035}
1028 1036
1029/* checks wether a refresh is requested and starts the refresh timer */ 1037/* checks whether a refresh is requested and starts the refresh timer */
1030void 1038void
1031rxvt_term::refresh_check () 1039rxvt_term::refresh_check ()
1032{ 1040{
1033 if (want_refresh && !flush_ev.is_active ()) 1041 if (want_refresh && !flush_ev.is_active ())
1034 flush_ev.start (1. / 60.); // refresh at max. 60 Hz normally 1042 flush_ev.start (1. / 60.); // refresh at max. 60 Hz normally
… …
1128 // this should really be sched_yield(), but the linux guys thought 1136 // this should really be sched_yield(), but the linux guys thought
1129 // that giving a process calling sched_yield () less cpu time than 1137 // 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 1138 // ones with high nice levels is a useful thing to do. It surely is is
1131 // allowed by the sus... as is returning ENOSYS. 1139 // allowed by the sus... as is returning ENOSYS.
1132 // since the linux guys additionally thought that breaking the only 1140 // since the linux guys additionally thought that breaking the only
1133 // known workaroudn against their unusable sched_yield hack is cool, 1141 // known workaround against their unusable sched_yield hack is cool,
1134 // we just nanosleep a bit and hope for the best. 1142 // we just nanosleep a bit and hope for the best.
1135 1143
1136 struct timespec ts = { 0, 1000 }; 1144 struct timespec ts = { 0, 1000 };
1137 nanosleep (&ts, 0); 1145 nanosleep (&ts, 0);
1138 1146
… …
1461 selection_property (ev.xproperty.window, ev.xproperty.atom); 1469 selection_property (ev.xproperty.window, ev.xproperty.atom);
1462 1470
1463 break; 1471 break;
1464 1472
1465 case SelectionClear: 1473 case SelectionClear:
1466 selection_clear (); 1474 selection_clear (ev.xselectionclear.selection == xa[XA_CLIPBOARD]);
1467 break; 1475 break;
1468 1476
1469 case SelectionNotify: 1477 case SelectionNotify:
1470 if (selection_wait == Sel_normal) 1478 if (selection_wait == Sel_normal)
1471 selection_paste (ev.xselection.requestor, ev.xselection.property, true); 1479 selection_paste (ev.xselection.requestor, ev.xselection.property, true);
… …
1684#endif 1692#endif
1685 1693
1686 refresh_check (); 1694 refresh_check ();
1687} 1695}
1688 1696
1697#if ENABLE_FRILLS
1689void 1698void
1690rxvt_term::set_urgency (bool enable) 1699rxvt_term::set_urgency (bool enable)
1691{ 1700{
1692 if (enable == urgency_hint) 1701 if (enable == urgency_hint)
1693 return; 1702 return;
… …
1697 h->flags = h->flags & ~XUrgencyHint | (enable ? XUrgencyHint : 0); 1706 h->flags = h->flags & ~XUrgencyHint | (enable ? XUrgencyHint : 0);
1698 XSetWMHints (dpy, parent[0], h); 1707 XSetWMHints (dpy, parent[0], h);
1699 urgency_hint = enable; 1708 urgency_hint = enable;
1700 } 1709 }
1701} 1710}
1711#endif
1702 1712
1703void 1713void
1704rxvt_term::focus_in () 1714rxvt_term::focus_in ()
1705{ 1715{
1706 if (!focus) 1716 if (!focus)
… …
2140 selection_make (ev.time); 2150 selection_make (ev.time);
2141 break; 2151 break;
2142 2152
2143 case Button2: 2153 case Button2:
2144 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window? 2154 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window?
2145 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary); 2155 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2146 break; 2156 break;
2147 2157
2148#ifdef MOUSE_WHEEL 2158#ifdef MOUSE_WHEEL
2149 case Button4: 2159 case Button4:
2150 case Button5: 2160 case Button5:
… …
2334 break; 2344 break;
2335 } 2345 }
2336 2346
2337 if (len == (size_t)-1) 2347 if (len == (size_t)-1)
2338 { 2348 {
2339 mbrtowc (0, 0, 0, mbstate); // reset now undefined conversion state 2349 mbstate.reset (); // reset now undefined conversion state
2340 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 2350 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2341 } 2351 }
2342 2352
2343 // assume wchar == unicode 2353 // assume wchar == unicode
2344 cmdbuf_ptr += len; 2354 cmdbuf_ptr += len;
… …
2837 { 2847 {
2838 /* DECSTR: soft terminal reset, used by our terminfo since 9.06 */ 2848 /* DECSTR: soft terminal reset, used by our terminfo since 9.06 */
2839 scr_soft_reset (); 2849 scr_soft_reset ();
2840 2850
2841 static const int pm_h[] = { 7, 25 }; 2851 static const int pm_h[] = { 7, 25 };
2842 static const int pm_l[] = { 1, 3, 4, 5, 6, 7, 9, 66, 1000, 1001, 1049 }; 2852 static const int pm_l[] = { 1, 3, 4, 5, 6, 9, 66, 1000, 1001, 1049 };
2843 2853
2844 process_terminal_mode ('h', 0, sizeof (pm_h) / sizeof (pm_h[0]), pm_h); 2854 process_terminal_mode ('h', 0, sizeof (pm_h) / sizeof (pm_h[0]), pm_h);
2845 process_terminal_mode ('l', 0, sizeof (pm_l) / sizeof (pm_l[0]), pm_l); 2855 process_terminal_mode ('l', 0, sizeof (pm_l) / sizeof (pm_l[0]), pm_l);
2846 } 2856 }
2847 break; 2857 break;
… …
3283 3293
3284/* 3294/*
3285 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3295 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3286 */ 3296 */
3287void 3297void
3288rxvt_term::process_xterm_seq (int op, const char *str, char resp) 3298rxvt_term::process_xterm_seq (int op, char *str, char resp)
3289{ 3299{
3290 int color; 3300 int color;
3291 char *buf, *name; 3301 char *buf, *name;
3292 bool query = str[0] == '?' && !str[1]; 3302 bool query = str[0] == '?' && !str[1];
3293 int saveop = op; 3303 int saveop = op;
… …
3334 3344
3335 XFree (value); 3345 XFree (value);
3336 } 3346 }
3337 else 3347 else
3338 { 3348 {
3339 char *eq = strchr (str, '='); // constness lost, but verified to be ok 3349 char *eq = strchr (str, '=');
3340 3350
3341 if (eq) 3351 if (eq)
3342 { 3352 {
3343 *eq = 0; 3353 *eq = 0;
3344 set_utf8_property (display->atom (str), eq + 1); 3354 set_utf8_property (display->atom (str), eq + 1);
… …
3384 process_color_seq (op, Color_pointer_fg, str, resp); 3394 process_color_seq (op, Color_pointer_fg, str, resp);
3385 break; 3395 break;
3386 case XTerm_Color_pointer_bg: 3396 case XTerm_Color_pointer_bg:
3387 process_color_seq (op, Color_pointer_bg, str, resp); 3397 process_color_seq (op, Color_pointer_bg, str, resp);
3388 break; 3398 break;
3399#ifdef OPTION_HC
3400 case XTerm_Color_HC:
3401 process_color_seq (op, Color_HC, str, resp);
3402 break;
3403#endif
3389#ifndef NO_BOLD_UNDERLINE_REVERSE 3404#ifndef NO_BOLD_UNDERLINE_REVERSE
3390 case XTerm_Color_RV:
3391 process_color_seq (op, Color_RV, str, resp);
3392 break;
3393 case Rxvt_Color_BD:
3394 case URxvt_Color_BD: 3405 case URxvt_Color_BD:
3395 process_color_seq (op, Color_BD, str, resp); 3406 process_color_seq (op, Color_BD, str, resp);
3396 break; 3407 break;
3397 case Rxvt_Color_UL:
3398 case URxvt_Color_UL: 3408 case URxvt_Color_UL:
3399 process_color_seq (op, Color_UL, str, resp); 3409 process_color_seq (op, Color_UL, str, resp);
3400 break; 3410 break;
3401 case URxvt_Color_IT: 3411 case URxvt_Color_IT:
3402 process_color_seq (op, Color_IT, str, resp); 3412 process_color_seq (op, Color_IT, str, resp);
3403 break; 3413 break;
3404#endif 3414#endif
3415 case URxvt_Color_border:
3416 process_color_seq (op, Color_border, str, resp);
3417 break;
3405#if ENABLE_TRANSPARENCY 3418#if ENABLE_TRANSPARENCY
3406 case URxvt_Color_tint: 3419 case URxvt_Color_tint:
3407 process_color_seq (op, Color_tint, str, resp); 3420 process_color_seq (op, Color_tint, str, resp);
3408 { 3421 {
3409 bool changed = false; 3422 bool changed = false;
… …
3424 case Rxvt_Pixmap: 3437 case Rxvt_Pixmap:
3425 if (!strcmp (str, "?")) 3438 if (!strcmp (str, "?"))
3426 { 3439 {
3427 char str[256]; 3440 char str[256];
3428 3441
3429 sprintf (str, "[%dx%d+%d+%d]", /* can't presume snprintf () ! */ 3442 sprintf (str, "[%dx%d+%d+%d]",
3430 min (bgPixmap.h_scale, 32767), min (bgPixmap.v_scale, 32767), 3443 min (bgPixmap.h_scale, 32767), min (bgPixmap.v_scale, 32767),
3431 min (bgPixmap.h_align, 32767), min (bgPixmap.v_align, 32767)); 3444 min (bgPixmap.h_align, 32767), min (bgPixmap.v_align, 32767));
3432 process_xterm_seq (XTerm_title, str, CHAR_ST); 3445 process_xterm_seq (XTerm_title, str, CHAR_ST);
3433 } 3446 }
3434 else 3447 else
… …
3584 static const struct 3597 static const struct
3585 { 3598 {
3586 const int argval; 3599 const int argval;
3587 const unsigned long bit; 3600 const unsigned long bit;
3588 } argtopriv[] = { 3601 } argtopriv[] = {
3589 { 1, PrivMode_aplCUR }, 3602 { 1, PrivMode_aplCUR }, // DECCKM
3590 { 2, PrivMode_vt52 }, 3603 { 2, PrivMode_vt52 },
3591 { 3, PrivMode_132 }, 3604 { 3, PrivMode_132 }, // DECCOLM
3592 { 4, PrivMode_smoothScroll }, 3605 { 4, PrivMode_smoothScroll }, // DECSCLM
3593 { 5, PrivMode_rVideo }, 3606 { 5, PrivMode_rVideo }, // DECSCNM
3594 { 6, PrivMode_relOrigin }, 3607 { 6, PrivMode_relOrigin }, // DECOM
3595 { 7, PrivMode_Autowrap }, 3608 { 7, PrivMode_Autowrap }, // DECAWM
3596 // 8, bi-directional support mode 3609 // 8, auto-repeat keys // DECARM
3597 { 9, PrivMode_MouseX10 }, 3610 { 9, PrivMode_MouseX10 },
3598 // 18, 19 printing-related 3611 // 18 end FF to printer after print screen
3612 // 19 Print screen prints full screen/scorll region
3599 { 25, PrivMode_VisibleCursor }, 3613 { 25, PrivMode_VisibleCursor }, // cnorm/cvvis/civis
3600#ifdef scrollBar_esc 3614#ifdef scrollBar_esc
3601 { scrollBar_esc, PrivMode_scrollBar }, 3615 { scrollBar_esc, PrivMode_scrollBar },
3602#endif 3616#endif
3603 { 35, PrivMode_ShiftKeys }, // rxvt extension 3617 { 35, PrivMode_ShiftKeys }, // rxvt extension
3618 // 38, tektronix mode // DECTEK
3604 { 40, PrivMode_132OK }, 3619 { 40, PrivMode_132OK },
3605 // 41 xterm more fixes NYI 3620 // 41 xterm more fixes NYI
3606 // 45 margin bell NYI 3621 // 45 margin bell NYI
3607 // 46 start logging 3622 // 46 start logging
3608 { 47, PrivMode_Screen }, 3623 { 47, PrivMode_Screen },
3609 { 66, PrivMode_aplKP }, 3624 { 66, PrivMode_aplKP }, // DECPAM/DECPNM
3610#ifndef NO_BACKSPACE_KEY 3625#ifndef NO_BACKSPACE_KEY
3611 { 67, PrivMode_BackSpace }, 3626 { 67, PrivMode_BackSpace }, // DECBKM
3612#endif 3627#endif
3613 { 1000, PrivMode_MouseX11 }, 3628 { 1000, PrivMode_MouseX11 },
3614 { 1002, PrivMode_MouseBtnEvent }, 3629 { 1002, PrivMode_MouseBtnEvent },
3615 { 1003, PrivMode_MouseAnyEvent }, 3630 { 1003, PrivMode_MouseAnyEvent },
3616 { 1010, PrivMode_TtyOutputInh }, // rxvt extension 3631 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
… …
3655 3670
3656 scr_touch (true); 3671 scr_touch (true);
3657 break; 3672 break;
3658#endif 3673#endif
3659 case 1048: /* alternative cursor save */ 3674 case 1048: /* alternative cursor save */
3660 case 1049:
3661 if (option (Opt_secondaryScreen)) 3675 if (option (Opt_secondaryScreen))
3662 if (mode == 0) 3676 if (mode == 0)
3663 scr_cursor (RESTORE); 3677 scr_cursor (RESTORE);
3664 else if (mode == 1) 3678 else if (mode == 1)
3665 scr_cursor (SAVE); 3679 scr_cursor (SAVE);
… …
3678 */ 3692 */
3679 set_privmode (PrivMode_vt52, 1); 3693 set_privmode (PrivMode_vt52, 1);
3680 break; 3694 break;
3681 case 3: /* 80/132 */ 3695 case 3: /* 80/132 */
3682 if (priv_modes & PrivMode_132OK) 3696 if (priv_modes & PrivMode_132OK)
3683 {
3684 scr_poweron ();
3685 set_widthheight (((state ? 132 : 80) * fwidth), 24 * fheight); 3697 set_widthheight ((state ? 132 : 80) * fwidth, 24 * fheight);
3686 }
3687 break; 3698 break;
3688 case 4: /* smooth scrolling */ 3699 case 4: /* smooth scrolling */
3689 set_option (Opt_jumpScroll, !state); 3700 set_option (Opt_jumpScroll, !state);
3690 break; 3701 break;
3691 case 5: /* reverse video */ 3702 case 5: /* reverse video */
… …
3733 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent; 3744 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent;
3734 vt_emask_mouse = PointerMotionMask; 3745 vt_emask_mouse = PointerMotionMask;
3735 } 3746 }
3736 else 3747 else
3737 vt_emask_mouse = NoEventMask; 3748 vt_emask_mouse = NoEventMask;
3749
3738 vt_select_input (); 3750 vt_select_input ();
3739 break; 3751 break;
3740 case 1010: /* scroll to bottom on TTY output inhibit */ 3752 case 1010: /* scroll to bottom on TTY output inhibit */
3741 set_option (Opt_scrollTtyOutput, !state); 3753 set_option (Opt_scrollTtyOutput, !state);
3742 break; 3754 break;
3743 case 1011: /* scroll to bottom on key press */ 3755 case 1011: /* scroll to bottom on key press */
3744 set_option (Opt_scrollTtyKeypress, state); 3756 set_option (Opt_scrollTtyKeypress, state);
3745 break; 3757 break;
3746 case 1047: /* secondary screen w/ clearing last */ 3758 case 1047: /* secondary screen w/ clearing last */
3747 if (option (Opt_secondaryScreen)) 3759 if (option (Opt_secondaryScreen))
3748 if (current_screen != PRIMARY) 3760 if (!state)
3749 scr_erase_screen (2); 3761 scr_erase_screen (2);
3762
3750 scr_change_screen (state); 3763 scr_change_screen (state);
3751 break; 3764 break;
3752 case 1049: /* secondary screen w/ clearing first */ 3765 case 1049: /* secondary screen w/ clearing first */
3766 if (option (Opt_secondaryScreen))
3767 if (state)
3768 scr_cursor (SAVE);
3769
3753 scr_change_screen (state); 3770 scr_change_screen (state);
3771
3754 if (option (Opt_secondaryScreen)) 3772 if (option (Opt_secondaryScreen))
3755 if (current_screen != PRIMARY) 3773 if (state)
3756 scr_erase_screen (2); 3774 scr_erase_screen (2);
3775 else
3776 scr_cursor (RESTORE);
3757 break; 3777 break;
3758 default: 3778 default:
3759 break; 3779 break;
3760 } 3780 }
3761 } 3781 }

Diff Legend

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