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.445 by sf-exg, Fri Apr 2 13:52:30 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;
649 switch (translate_keypad (keysym, kp)) 654 switch (translate_keypad (keysym, kp))
650 { 655 {
651#ifndef NO_BACKSPACE_KEY 656#ifndef NO_BACKSPACE_KEY
652 case XK_BackSpace: 657 case XK_BackSpace:
653 if (priv_modes & PrivMode_HaveBackSpace) 658 if (priv_modes & PrivMode_HaveBackSpace)
… …
1024 } 1029 }
1025 1030
1026 display->flush (); 1031 display->flush ();
1027} 1032}
1028 1033
1029/* checks wether a refresh is requested and starts the refresh timer */ 1034/* checks whether a refresh is requested and starts the refresh timer */
1030void 1035void
1031rxvt_term::refresh_check () 1036rxvt_term::refresh_check ()
1032{ 1037{
1033 if (want_refresh && !flush_ev.is_active ()) 1038 if (want_refresh && !flush_ev.is_active ())
1034 flush_ev.start (1. / 60.); // refresh at max. 60 Hz normally 1039 flush_ev.start (1. / 60.); // refresh at max. 60 Hz normally
… …
1127 { 1132 {
1128 // this should really be sched_yield(), but the linux guys thought 1133 // this should really be sched_yield(), but the linux guys thought
1129 // that giving a process calling sched_yield () less cpu time than 1134 // 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 1135 // ones with high nice levels is a useful thing to do. It surely is is
1131 // allowed by the sus... as is returning ENOSYS. 1136 // allowed by the sus... as is returning ENOSYS.
1137 // since the linux guys additionally thought that breaking the only
1138 // known workaround against their unusable sched_yield hack is cool,
1139 // we just nanosleep a bit and hope for the best.
1132 1140
1133 struct timespec ts = { 0, 0 }; 1141 struct timespec ts = { 0, 1000 };
1134 nanosleep (&ts, 0); 1142 nanosleep (&ts, 0);
1135 1143
1136 w.stop (); 1144 w.stop ();
1137 } 1145 }
1138 1146
… …
1188{ 1196{
1189 make_current (); 1197 make_current ();
1190 1198
1191 if (revents & ev::READ) 1199 if (revents & ev::READ)
1192 // loop, but don't allow a single term to monopolize us 1200 // loop, but don't allow a single term to monopolize us
1193 while (pty_fill ()) 1201 for (int i = CBUFCNT; i-- && pty_fill (); )
1194 if (cmd_parse ()) 1202 cmd_parse ();
1195 break;
1196 1203
1197 if (revents & ev::WRITE) 1204 if (revents & ev::WRITE)
1198 pty_write (); 1205 pty_write ();
1199 1206
1200 refresh_check (); 1207 refresh_check ();
… …
1459 selection_property (ev.xproperty.window, ev.xproperty.atom); 1466 selection_property (ev.xproperty.window, ev.xproperty.atom);
1460 1467
1461 break; 1468 break;
1462 1469
1463 case SelectionClear: 1470 case SelectionClear:
1464 selection_clear (); 1471 selection_clear (ev.xselectionclear.selection == xa[XA_CLIPBOARD]);
1465 break; 1472 break;
1466 1473
1467 case SelectionNotify: 1474 case SelectionNotify:
1468 if (selection_wait == Sel_normal) 1475 if (selection_wait == Sel_normal)
1469 selection_paste (ev.xselection.requestor, ev.xselection.property, true); 1476 selection_paste (ev.xselection.requestor, ev.xselection.property, true);
… …
1682#endif 1689#endif
1683 1690
1684 refresh_check (); 1691 refresh_check ();
1685} 1692}
1686 1693
1694#if ENABLE_FRILLS
1687void 1695void
1688rxvt_term::set_urgency (bool enable) 1696rxvt_term::set_urgency (bool enable)
1689{ 1697{
1690 if (enable == urgency_hint) 1698 if (enable == urgency_hint)
1691 return; 1699 return;
… …
1695 h->flags = h->flags & ~XUrgencyHint | (enable ? XUrgencyHint : 0); 1703 h->flags = h->flags & ~XUrgencyHint | (enable ? XUrgencyHint : 0);
1696 XSetWMHints (dpy, parent[0], h); 1704 XSetWMHints (dpy, parent[0], h);
1697 urgency_hint = enable; 1705 urgency_hint = enable;
1698 } 1706 }
1699} 1707}
1708#endif
1700 1709
1701void 1710void
1702rxvt_term::focus_in () 1711rxvt_term::focus_in ()
1703{ 1712{
1704 if (!focus) 1713 if (!focus)
… …
2182 } 2191 }
2183} 2192}
2184 2193
2185/*}}} */ 2194/*}}} */
2186 2195
2187bool 2196void
2188rxvt_term::cmd_parse () 2197rxvt_term::cmd_parse ()
2189{ 2198{
2190 bool flag = false;
2191 wchar_t ch = NOCHAR; 2199 wchar_t ch = NOCHAR;
2192 char *seq_begin; // remember start of esc-sequence here 2200 char *seq_begin; // remember start of esc-sequence here
2193 2201
2194 for (;;) 2202 for (;;)
2195 { 2203 {
… …
2289 * What the heck we'll cheat and only refresh less than every page-full. 2297 * What the heck we'll cheat and only refresh less than every page-full.
2290 * if skipScroll is enabled. 2298 * if skipScroll is enabled.
2291 */ 2299 */
2292 if (refreshnow) 2300 if (refreshnow)
2293 { 2301 {
2294 flag = true;
2295 scr_refresh (); 2302 scr_refresh ();
2296 want_refresh = 1; 2303 want_refresh = 1;
2297 } 2304 }
2298
2299 } 2305 }
2300 else 2306 else
2301 { 2307 {
2302 try 2308 try
2303 { 2309 {
… …
2311 } 2317 }
2312 2318
2313 ch = NOCHAR; 2319 ch = NOCHAR;
2314 } 2320 }
2315 } 2321 }
2316
2317 return flag;
2318} 2322}
2319 2323
2320// read the next character 2324// read the next character
2321wchar_t 2325wchar_t
2322rxvt_term::next_char () NOTHROW 2326rxvt_term::next_char () NOTHROW
… …
2337 break; 2341 break;
2338 } 2342 }
2339 2343
2340 if (len == (size_t)-1) 2344 if (len == (size_t)-1)
2341 { 2345 {
2342 mbrtowc (0, 0, 0, mbstate); // reset now undefined conversion state 2346 mbstate.reset (); // reset now undefined conversion state
2343 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 2347 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2344 } 2348 }
2345 2349
2346 // assume wchar == unicode 2350 // assume wchar == unicode
2347 cmdbuf_ptr += len; 2351 cmdbuf_ptr += len;
… …
2691 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 2695 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
2692 case C1_SCI: /* ESC Z */ 2696 case C1_SCI: /* ESC Z */
2693 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1); 2697 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
2694 break; /* steal obsolete ESC [ c */ 2698 break; /* steal obsolete ESC [ c */
2695 2699
2696 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 2700 /* 8.3.16: CONTROL SEQUENCE INTRODUCER (CSI) */
2697 case C1_CSI: /* ESC [ */ 2701 case C1_CSI: /* ESC [ */
2698 process_csi_seq (); 2702 process_csi_seq ();
2699 break; 2703 break;
2700 2704
2701 /* 8.3.90: OPERATING SYSTEM COMMAND */ 2705 /* 8.3.90: OPERATING SYSTEM COMMAND (OSC) */
2702 case C1_OSC: /* ESC ] */ 2706 case C1_OSC: /* ESC ] */
2703 process_osc_seq (); 2707 process_osc_seq ();
2704 break; 2708 break;
2705 2709
2706 /* 8.3.106: RESET TO INITIAL STATE */ 2710 /* 8.3.106: RESET TO INITIAL STATE (RIS) */
2707 case 'c': 2711 case 'c':
2708 mbstate.reset (); 2712 mbstate.reset ();
2709 scr_poweron (); 2713 scr_poweron ();
2710 scrollBar.show (1); 2714 scrollBar.show (1);
2711 break; 2715 break;
… …
2766 2770
2767 nargs = 0; 2771 nargs = 0;
2768 2772
2769 priv = 0; 2773 priv = 0;
2770 ch = cmd_getc (); 2774 ch = cmd_getc ();
2771 if (ch >= '<' && ch <= '?') 2775 if ((ch >= '<' && ch <= '?') || ch == '!')
2772 { 2776 {
2773 /* '<' '=' '>' '?' */ 2777 /* '<' '=' '>' '?' '!' */
2774 priv = ch; 2778 priv = ch;
2775 ch = cmd_getc (); 2779 ch = cmd_getc ();
2776 } 2780 }
2777 2781
2778 /* read any numerical arguments */ 2782 /* read any numerical arguments */
… …
2832 2836
2833 case '?': 2837 case '?':
2834 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2838 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
2835 process_terminal_mode (ch, priv, nargs, arg); 2839 process_terminal_mode (ch, priv, nargs, arg);
2836 break; 2840 break;
2841
2842 case '!':
2843 if (ch == CSI_70)
2844 {
2845 /* DECSTR: soft terminal reset, used by our terminfo since 9.06 */
2846 scr_soft_reset ();
2847
2848 static const int pm_h[] = { 7, 25 };
2849 static const int pm_l[] = { 1, 3, 4, 5, 6, 9, 66, 1000, 1001, 1049 };
2850
2851 process_terminal_mode ('h', 0, sizeof (pm_h) / sizeof (pm_h[0]), pm_h);
2852 process_terminal_mode ('l', 0, sizeof (pm_l) / sizeof (pm_l[0]), pm_l);
2837 } 2853 }
2854 break;
2855 }
2856
2838 return; 2857 return;
2839 } 2858 }
2840 2859
2841 switch (ch) 2860 switch (ch)
2842 { 2861 {
… …
3271 3290
3272/* 3291/*
3273 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3292 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3274 */ 3293 */
3275void 3294void
3276rxvt_term::process_xterm_seq (int op, const char *str, char resp) 3295rxvt_term::process_xterm_seq (int op, char *str, char resp)
3277{ 3296{
3278 int color; 3297 int color;
3279 char *buf, *name; 3298 char *buf, *name;
3280 bool query = str[0] == '?' && !str[1]; 3299 bool query = str[0] == '?' && !str[1];
3281 int saveop = op; 3300 int saveop = op;
… …
3322 3341
3323 XFree (value); 3342 XFree (value);
3324 } 3343 }
3325 else 3344 else
3326 { 3345 {
3327 char *eq = strchr (str, '='); // constness lost, but verified to be ok 3346 char *eq = strchr (str, '=');
3328 3347
3329 if (eq) 3348 if (eq)
3330 { 3349 {
3331 *eq = 0; 3350 *eq = 0;
3332 set_utf8_property (display->atom (str), eq + 1); 3351 set_utf8_property (display->atom (str), eq + 1);
… …
3388 break; 3407 break;
3389 case URxvt_Color_IT: 3408 case URxvt_Color_IT:
3390 process_color_seq (op, Color_IT, str, resp); 3409 process_color_seq (op, Color_IT, str, resp);
3391 break; 3410 break;
3392#endif 3411#endif
3412 case URxvt_Color_border:
3413 process_color_seq (op, Color_border, str, resp);
3414 break;
3393#if ENABLE_TRANSPARENCY 3415#if ENABLE_TRANSPARENCY
3394 case URxvt_Color_tint: 3416 case URxvt_Color_tint:
3395 process_color_seq (op, Color_tint, str, resp); 3417 process_color_seq (op, Color_tint, str, resp);
3396 { 3418 {
3397 bool changed = false; 3419 bool changed = false;
… …
3412 case Rxvt_Pixmap: 3434 case Rxvt_Pixmap:
3413 if (!strcmp (str, "?")) 3435 if (!strcmp (str, "?"))
3414 { 3436 {
3415 char str[256]; 3437 char str[256];
3416 3438
3417 sprintf (str, "[%dx%d+%d+%d]", /* can't presume snprintf () ! */ 3439 sprintf (str, "[%dx%d+%d+%d]",
3418 min (bgPixmap.h_scale, 32767), min (bgPixmap.v_scale, 32767), 3440 min (bgPixmap.h_scale, 32767), min (bgPixmap.v_scale, 32767),
3419 min (bgPixmap.h_align, 32767), min (bgPixmap.v_align, 32767)); 3441 min (bgPixmap.h_align, 32767), min (bgPixmap.v_align, 32767));
3420 process_xterm_seq (XTerm_title, str, CHAR_ST); 3442 process_xterm_seq (XTerm_title, str, CHAR_ST);
3421 } 3443 }
3422 else 3444 else
… …
3572 static const struct 3594 static const struct
3573 { 3595 {
3574 const int argval; 3596 const int argval;
3575 const unsigned long bit; 3597 const unsigned long bit;
3576 } argtopriv[] = { 3598 } argtopriv[] = {
3577 { 1, PrivMode_aplCUR }, 3599 { 1, PrivMode_aplCUR }, // DECCKM
3578 { 2, PrivMode_vt52 }, 3600 { 2, PrivMode_vt52 },
3579 { 3, PrivMode_132 }, 3601 { 3, PrivMode_132 }, // DECCOLM
3580 { 4, PrivMode_smoothScroll }, 3602 { 4, PrivMode_smoothScroll }, // DECSCLM
3581 { 5, PrivMode_rVideo }, 3603 { 5, PrivMode_rVideo }, // DECSCNM
3582 { 6, PrivMode_relOrigin }, 3604 { 6, PrivMode_relOrigin }, // DECOM
3583 { 7, PrivMode_Autowrap }, 3605 { 7, PrivMode_Autowrap }, // DECAWM
3584 // 8, bi-directional support mode 3606 // 8, auto-repeat keys // DECARM
3585 { 9, PrivMode_MouseX10 }, 3607 { 9, PrivMode_MouseX10 },
3586 // 18, 19 printing-related 3608 // 18 end FF to printer after print screen
3609 // 19 Print screen prints full screen/scorll region
3587 { 25, PrivMode_VisibleCursor }, 3610 { 25, PrivMode_VisibleCursor }, // cnorm/cvvis/civis
3588#ifdef scrollBar_esc 3611#ifdef scrollBar_esc
3589 { scrollBar_esc, PrivMode_scrollBar }, 3612 { scrollBar_esc, PrivMode_scrollBar },
3590#endif 3613#endif
3591 { 35, PrivMode_ShiftKeys }, // rxvt extension 3614 { 35, PrivMode_ShiftKeys }, // rxvt extension
3615 // 38, tektronix mode // DECTEK
3592 { 40, PrivMode_132OK }, 3616 { 40, PrivMode_132OK },
3593 // 41 xterm more fixes NYI 3617 // 41 xterm more fixes NYI
3594 // 45 margin bell NYI 3618 // 45 margin bell NYI
3595 // 46 start logging 3619 // 46 start logging
3596 { 47, PrivMode_Screen }, 3620 { 47, PrivMode_Screen },
3597 { 66, PrivMode_aplKP }, 3621 { 66, PrivMode_aplKP }, // DECPAM/DECPNM
3598#ifndef NO_BACKSPACE_KEY 3622#ifndef NO_BACKSPACE_KEY
3599 { 67, PrivMode_BackSpace }, 3623 { 67, PrivMode_BackSpace }, // DECBKM
3600#endif 3624#endif
3601 { 1000, PrivMode_MouseX11 }, 3625 { 1000, PrivMode_MouseX11 },
3602 { 1002, PrivMode_MouseBtnEvent }, 3626 { 1002, PrivMode_MouseBtnEvent },
3603 { 1003, PrivMode_MouseAnyEvent }, 3627 { 1003, PrivMode_MouseAnyEvent },
3604 { 1010, PrivMode_TtyOutputInh }, // rxvt extension 3628 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
… …
3643 3667
3644 scr_touch (true); 3668 scr_touch (true);
3645 break; 3669 break;
3646#endif 3670#endif
3647 case 1048: /* alternative cursor save */ 3671 case 1048: /* alternative cursor save */
3648 case 1049:
3649 if (option (Opt_secondaryScreen)) 3672 if (option (Opt_secondaryScreen))
3650 if (mode == 0) 3673 if (mode == 0)
3651 scr_cursor (RESTORE); 3674 scr_cursor (RESTORE);
3652 else if (mode == 1) 3675 else if (mode == 1)
3653 scr_cursor (SAVE); 3676 scr_cursor (SAVE);
… …
3666 */ 3689 */
3667 set_privmode (PrivMode_vt52, 1); 3690 set_privmode (PrivMode_vt52, 1);
3668 break; 3691 break;
3669 case 3: /* 80/132 */ 3692 case 3: /* 80/132 */
3670 if (priv_modes & PrivMode_132OK) 3693 if (priv_modes & PrivMode_132OK)
3671 {
3672 scr_poweron ();
3673 set_widthheight (((state ? 132 : 80) * fwidth), 24 * fheight); 3694 set_widthheight ((state ? 132 : 80) * fwidth, 24 * fheight);
3674 }
3675 break; 3695 break;
3676 case 4: /* smooth scrolling */ 3696 case 4: /* smooth scrolling */
3677 set_option (Opt_jumpScroll, !state); 3697 set_option (Opt_jumpScroll, !state);
3678 break; 3698 break;
3679 case 5: /* reverse video */ 3699 case 5: /* reverse video */
… …
3721 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent; 3741 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent;
3722 vt_emask_mouse = PointerMotionMask; 3742 vt_emask_mouse = PointerMotionMask;
3723 } 3743 }
3724 else 3744 else
3725 vt_emask_mouse = NoEventMask; 3745 vt_emask_mouse = NoEventMask;
3746
3726 vt_select_input (); 3747 vt_select_input ();
3727 break; 3748 break;
3728 case 1010: /* scroll to bottom on TTY output inhibit */ 3749 case 1010: /* scroll to bottom on TTY output inhibit */
3729 set_option (Opt_scrollTtyOutput, !state); 3750 set_option (Opt_scrollTtyOutput, !state);
3730 break; 3751 break;
3731 case 1011: /* scroll to bottom on key press */ 3752 case 1011: /* scroll to bottom on key press */
3732 set_option (Opt_scrollTtyKeypress, state); 3753 set_option (Opt_scrollTtyKeypress, state);
3733 break; 3754 break;
3734 case 1047: /* secondary screen w/ clearing last */ 3755 case 1047: /* secondary screen w/ clearing last */
3735 if (option (Opt_secondaryScreen)) 3756 if (option (Opt_secondaryScreen))
3736 if (current_screen != PRIMARY) 3757 if (!state)
3737 scr_erase_screen (2); 3758 scr_erase_screen (2);
3759
3738 scr_change_screen (state); 3760 scr_change_screen (state);
3739 break; 3761 break;
3740 case 1049: /* secondary screen w/ clearing first */ 3762 case 1049: /* secondary screen w/ clearing first */
3763 if (option (Opt_secondaryScreen))
3764 if (state)
3765 scr_cursor (SAVE);
3766
3741 scr_change_screen (state); 3767 scr_change_screen (state);
3768
3742 if (option (Opt_secondaryScreen)) 3769 if (option (Opt_secondaryScreen))
3743 if (current_screen != PRIMARY) 3770 if (state)
3744 scr_erase_screen (2); 3771 scr_erase_screen (2);
3772 else
3773 scr_cursor (RESTORE);
3745 break; 3774 break;
3746 default: 3775 default:
3747 break; 3776 break;
3748 } 3777 }
3749 } 3778 }

Diff Legend

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