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

Diff Legend

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