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.422 by root, Tue Oct 28 04:45:59 2008 UTC vs.
Revision 1.452 by sf-exg, Mon Jul 26 09:57:53 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);
… …
1475 selection_send (ev.xselectionrequest); 1483 selection_send (ev.xselectionrequest);
1476 break; 1484 break;
1477 1485
1478 case MapNotify: 1486 case MapNotify:
1479#ifdef HAVE_BG_PIXMAP 1487#ifdef HAVE_BG_PIXMAP
1480 /* This is needed spcifically to fix the case of no window manager or a 1488 /* This is needed specifically to fix the case of no window manager or a
1481 * non-reparenting window manager. In those cases we never get first 1489 * non-reparenting window manager. In those cases we never get first
1482 * ConfigureNotify. Also that speeds startup under normal WM, by taking 1490 * ConfigureNotify. Also that speeds startup under normal WM, by taking
1483 * care of multiplicity of ConfigureNotify events arriwing while WM does 1491 * care of multiplicity of ConfigureNotify events arriving while WM does
1484 * reparenting. 1492 * reparenting.
1485 * We should not render background immidiately, as there could be several 1493 * We should not render background immediately, as there could be several
1486 * ConfigureNotify's to follow. Lets take care of all of them in one scoop 1494 * ConfigureNotify's to follow. Lets take care of all of them in one scoop
1487 * by scheduling background redraw as soon as we can, but giving a short 1495 * by scheduling background redraw as soon as we can, but giving a short
1488 * bit of time for ConfigureNotifies to arrive. 1496 * bit of time for ConfigureNotifies to arrive.
1489 * We should render background PRIOR to drawing any text, but AFTER all 1497 * We should render background PRIOR to drawing any text, but AFTER all
1490 * of ConfigureNotifys for the best results. 1498 * of ConfigureNotifys for the best results.
… …
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)
… …
1859 /* save the xbutton state (for ButtonRelease) */ 1869 /* save the xbutton state (for ButtonRelease) */
1860 MEvent.state = ev.state; 1870 MEvent.state = ev.state;
1861#ifdef MOUSE_REPORT_DOUBLECLICK 1871#ifdef MOUSE_REPORT_DOUBLECLICK
1862 if (ev.button == MEvent.button && clickintime) 1872 if (ev.button == MEvent.button && clickintime)
1863 { 1873 {
1864 /* same button, within alloted time */ 1874 /* same button, within allowed time */
1865 MEvent.clicks++; 1875 MEvent.clicks++;
1866 1876
1867 if (MEvent.clicks > 1) 1877 if (MEvent.clicks > 1)
1868 { 1878 {
1869 /* only report double clicks */ 1879 /* only report double clicks */
… …
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;
… …
2688 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 2698 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
2689 case C1_SCI: /* ESC Z */ 2699 case C1_SCI: /* ESC Z */
2690 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1); 2700 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
2691 break; /* steal obsolete ESC [ c */ 2701 break; /* steal obsolete ESC [ c */
2692 2702
2693 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 2703 /* 8.3.16: CONTROL SEQUENCE INTRODUCER (CSI) */
2694 case C1_CSI: /* ESC [ */ 2704 case C1_CSI: /* ESC [ */
2695 process_csi_seq (); 2705 process_csi_seq ();
2696 break; 2706 break;
2697 2707
2698 /* 8.3.90: OPERATING SYSTEM COMMAND */ 2708 /* 8.3.90: OPERATING SYSTEM COMMAND (OSC) */
2699 case C1_OSC: /* ESC ] */ 2709 case C1_OSC: /* ESC ] */
2700 process_osc_seq (); 2710 process_osc_seq ();
2701 break; 2711 break;
2702 2712
2703 /* 8.3.106: RESET TO INITIAL STATE */ 2713 /* 8.3.106: RESET TO INITIAL STATE (RIS) */
2704 case 'c': 2714 case 'c':
2705 mbstate.reset (); 2715 mbstate.reset ();
2706 scr_poweron (); 2716 scr_poweron ();
2707 scrollBar.show (1); 2717 scrollBar.show (1);
2708 break; 2718 break;
… …
2763 2773
2764 nargs = 0; 2774 nargs = 0;
2765 2775
2766 priv = 0; 2776 priv = 0;
2767 ch = cmd_getc (); 2777 ch = cmd_getc ();
2768 if (ch >= '<' && ch <= '?') 2778 if ((ch >= '<' && ch <= '?') || ch == '!')
2769 { 2779 {
2770 /* '<' '=' '>' '?' */ 2780 /* '<' '=' '>' '?' '!' */
2771 priv = ch; 2781 priv = ch;
2772 ch = cmd_getc (); 2782 ch = cmd_getc ();
2773 } 2783 }
2774 2784
2775 /* read any numerical arguments */ 2785 /* read any numerical arguments */
… …
2829 2839
2830 case '?': 2840 case '?':
2831 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2841 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
2832 process_terminal_mode (ch, priv, nargs, arg); 2842 process_terminal_mode (ch, priv, nargs, arg);
2833 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);
2834 } 2856 }
2857 break;
2858 }
2859
2835 return; 2860 return;
2836 } 2861 }
2837 2862
2838 switch (ch) 2863 switch (ch)
2839 { 2864 {
… …
3206 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 3231 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
3207 */ 3232 */
3208void 3233void
3209rxvt_term::process_dcs_seq () 3234rxvt_term::process_dcs_seq ()
3210{ 3235{
3211 char *s;
3212 unicode_t eh;
3213
3214 /* 3236 /*
3215 * Not handled yet 3237 * Not handled yet
3216 */ 3238 */
3239
3240 unicode_t eh;
3217 s = get_to_st (eh); 3241 char *s = get_to_st (eh);
3218 if (s) 3242 if (s)
3219 free (s); 3243 free (s);
3220 3244
3221 return; 3245 return;
3222} 3246}
… …
3226 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)' 3250 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)'
3227 */ 3251 */
3228void 3252void
3229rxvt_term::process_osc_seq () 3253rxvt_term::process_osc_seq ()
3230{ 3254{
3231 unicode_t ch, eh;
3232 int arg; 3255 int arg;
3233 3256
3234 ch = cmd_getc (); 3257 unicode_t ch = cmd_getc ();
3235 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3258 for (arg = 0; isdigit (ch); ch = cmd_getc ())
3236 arg = arg * 10 + (ch - '0'); 3259 arg = arg * 10 + (ch - '0');
3237 3260
3238 if (ch == ';') 3261 if (ch == ';')
3239 { 3262 {
3263 unicode_t eh;
3240 char *s = get_to_st (eh); 3264 char *s = get_to_st (eh);
3241 3265
3242 if (s) 3266 if (s)
3243 { 3267 {
3244 process_xterm_seq (arg, s, eh); 3268 process_xterm_seq (arg, s, eh);
… …
3268 3292
3269/* 3293/*
3270 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3294 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3271 */ 3295 */
3272void 3296void
3273rxvt_term::process_xterm_seq (int op, const char *str, char resp) 3297rxvt_term::process_xterm_seq (int op, char *str, char resp)
3274{ 3298{
3275 int color; 3299 int color;
3276 char *buf, *name; 3300 char *buf, *name;
3277 bool query = str[0] == '?' && !str[1]; 3301 bool query = str[0] == '?' && !str[1];
3278 int saveop = op; 3302 int saveop = op;
… …
3319 3343
3320 XFree (value); 3344 XFree (value);
3321 } 3345 }
3322 else 3346 else
3323 { 3347 {
3324 char *eq = strchr (str, '='); // constness lost, but verified to be ok 3348 char *eq = strchr (str, '=');
3325 3349
3326 if (eq) 3350 if (eq)
3327 { 3351 {
3328 *eq = 0; 3352 *eq = 0;
3329 set_utf8_property (display->atom (str), eq + 1); 3353 set_utf8_property (display->atom (str), eq + 1);
… …
3369 process_color_seq (op, Color_pointer_fg, str, resp); 3393 process_color_seq (op, Color_pointer_fg, str, resp);
3370 break; 3394 break;
3371 case XTerm_Color_pointer_bg: 3395 case XTerm_Color_pointer_bg:
3372 process_color_seq (op, Color_pointer_bg, str, resp); 3396 process_color_seq (op, Color_pointer_bg, str, resp);
3373 break; 3397 break;
3398#ifdef OPTION_HC
3399 case XTerm_Color_HC:
3400 process_color_seq (op, Color_HC, str, resp);
3401 break;
3402 case XTerm_Color_HTC:
3403 process_color_seq (op, Color_HTC, str, resp);
3404 break;
3405#endif
3374#ifndef NO_BOLD_UNDERLINE_REVERSE 3406#ifndef NO_BOLD_UNDERLINE_REVERSE
3375 case XTerm_Color_RV:
3376 process_color_seq (op, Color_RV, str, resp);
3377 break;
3378 case Rxvt_Color_BD:
3379 case URxvt_Color_BD: 3407 case URxvt_Color_BD:
3380 process_color_seq (op, Color_BD, str, resp); 3408 process_color_seq (op, Color_BD, str, resp);
3381 break; 3409 break;
3382 case Rxvt_Color_UL:
3383 case URxvt_Color_UL: 3410 case URxvt_Color_UL:
3384 process_color_seq (op, Color_UL, str, resp); 3411 process_color_seq (op, Color_UL, str, resp);
3385 break; 3412 break;
3386 case URxvt_Color_IT: 3413 case URxvt_Color_IT:
3387 process_color_seq (op, Color_IT, str, resp); 3414 process_color_seq (op, Color_IT, str, resp);
3388 break; 3415 break;
3389#endif 3416#endif
3417 case URxvt_Color_border:
3418 process_color_seq (op, Color_border, str, resp);
3419 break;
3390#if ENABLE_TRANSPARENCY 3420#if ENABLE_TRANSPARENCY
3391 case URxvt_Color_tint: 3421 case URxvt_Color_tint:
3392 process_color_seq (op, Color_tint, str, resp); 3422 process_color_seq (op, Color_tint, str, resp);
3393 { 3423 {
3394 bool changed = false; 3424 bool changed = false;
… …
3409 case Rxvt_Pixmap: 3439 case Rxvt_Pixmap:
3410 if (!strcmp (str, "?")) 3440 if (!strcmp (str, "?"))
3411 { 3441 {
3412 char str[256]; 3442 char str[256];
3413 3443
3414 sprintf (str, "[%dx%d+%d+%d]", /* can't presume snprintf () ! */ 3444 sprintf (str, "[%dx%d+%d+%d]",
3415 min (bgPixmap.h_scale, 32767), min (bgPixmap.v_scale, 32767), 3445 min (bgPixmap.h_scale, 32767), min (bgPixmap.v_scale, 32767),
3416 min (bgPixmap.h_align, 32767), min (bgPixmap.v_align, 32767)); 3446 min (bgPixmap.h_align, 32767), min (bgPixmap.v_align, 32767));
3417 process_xterm_seq (XTerm_title, str, CHAR_ST); 3447 process_xterm_seq (XTerm_title, str, CHAR_ST);
3418 } 3448 }
3419 else 3449 else
… …
3551 { 3581 {
3552 if (mode == 'r') 3582 if (mode == 'r')
3553 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 3583 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3554 else 3584 else
3555 state = (mode == 't') ? ! (priv_modes & bit) : mode; 3585 state = (mode == 't') ? ! (priv_modes & bit) : mode;
3586
3556 set_privmode (bit, state); 3587 set_privmode (bit, state);
3557 } 3588 }
3558 3589
3559 return state; 3590 return state;
3560} 3591}
… …
3569 static const struct 3600 static const struct
3570 { 3601 {
3571 const int argval; 3602 const int argval;
3572 const unsigned long bit; 3603 const unsigned long bit;
3573 } argtopriv[] = { 3604 } argtopriv[] = {
3574 { 1, PrivMode_aplCUR }, 3605 { 1, PrivMode_aplCUR }, // DECCKM
3575 { 2, PrivMode_vt52 }, 3606 { 2, PrivMode_vt52 },
3576 { 3, PrivMode_132 }, 3607 { 3, PrivMode_132 }, // DECCOLM
3577 { 4, PrivMode_smoothScroll }, 3608 { 4, PrivMode_smoothScroll }, // DECSCLM
3578 { 5, PrivMode_rVideo }, 3609 { 5, PrivMode_rVideo }, // DECSCNM
3579 { 6, PrivMode_relOrigin }, 3610 { 6, PrivMode_relOrigin }, // DECOM
3580 { 7, PrivMode_Autowrap }, 3611 { 7, PrivMode_Autowrap }, // DECAWM
3581 // 8, bi-directional support mode 3612 // 8, auto-repeat keys // DECARM
3582 { 9, PrivMode_MouseX10 }, 3613 { 9, PrivMode_MouseX10 },
3583 // 18, 19 printing-related 3614 // 18 end FF to printer after print screen
3615 // 19 Print screen prints full screen/scorll region
3584 { 25, PrivMode_VisibleCursor }, 3616 { 25, PrivMode_VisibleCursor }, // cnorm/cvvis/civis
3585#ifdef scrollBar_esc 3617#ifdef scrollBar_esc
3586 { scrollBar_esc, PrivMode_scrollBar }, 3618 { scrollBar_esc, PrivMode_scrollBar },
3587#endif 3619#endif
3588 { 35, PrivMode_ShiftKeys }, // rxvt extension 3620 { 35, PrivMode_ShiftKeys }, // rxvt extension
3621 // 38, tektronix mode // DECTEK
3589 { 40, PrivMode_132OK }, 3622 { 40, PrivMode_132OK },
3590 // 41 xterm more fixes NYI 3623 // 41 xterm more fixes NYI
3591 // 45 margin bell NYI 3624 // 45 margin bell NYI
3592 // 46 start logging 3625 // 46 start logging
3593 { 47, PrivMode_Screen }, 3626 { 47, PrivMode_Screen },
3594 { 66, PrivMode_aplKP }, 3627 { 66, PrivMode_aplKP }, // DECPAM/DECPNM
3595#ifndef NO_BACKSPACE_KEY 3628#ifndef NO_BACKSPACE_KEY
3596 { 67, PrivMode_BackSpace }, 3629 { 67, PrivMode_BackSpace }, // DECBKM
3597#endif 3630#endif
3598 { 1000, PrivMode_MouseX11 }, 3631 { 1000, PrivMode_MouseX11 },
3599 { 1002, PrivMode_MouseBtnEvent }, 3632 { 1002, PrivMode_MouseBtnEvent },
3600 { 1003, PrivMode_MouseAnyEvent }, 3633 { 1003, PrivMode_MouseAnyEvent },
3601 { 1010, PrivMode_TtyOutputInh }, // rxvt extension 3634 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
… …
3640 3673
3641 scr_touch (true); 3674 scr_touch (true);
3642 break; 3675 break;
3643#endif 3676#endif
3644 case 1048: /* alternative cursor save */ 3677 case 1048: /* alternative cursor save */
3645 case 1049:
3646 if (option (Opt_secondaryScreen)) 3678 if (option (Opt_secondaryScreen))
3647 if (mode == 0) 3679 if (mode == 0)
3648 scr_cursor (RESTORE); 3680 scr_cursor (RESTORE);
3649 else if (mode == 1) 3681 else if (mode == 1)
3650 scr_cursor (SAVE); 3682 scr_cursor (SAVE);
… …
3663 */ 3695 */
3664 set_privmode (PrivMode_vt52, 1); 3696 set_privmode (PrivMode_vt52, 1);
3665 break; 3697 break;
3666 case 3: /* 80/132 */ 3698 case 3: /* 80/132 */
3667 if (priv_modes & PrivMode_132OK) 3699 if (priv_modes & PrivMode_132OK)
3668 {
3669 scr_poweron ();
3670 set_widthheight (((state ? 132 : 80) * fwidth), 24 * fheight); 3700 set_widthheight ((state ? 132 : 80) * fwidth, 24 * fheight);
3671 }
3672 break; 3701 break;
3673 case 4: /* smooth scrolling */ 3702 case 4: /* smooth scrolling */
3674 set_option (Opt_jumpScroll, !state); 3703 set_option (Opt_jumpScroll, !state);
3675 break; 3704 break;
3676 case 5: /* reverse video */ 3705 case 5: /* reverse video */
… …
3718 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent; 3747 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent;
3719 vt_emask_mouse = PointerMotionMask; 3748 vt_emask_mouse = PointerMotionMask;
3720 } 3749 }
3721 else 3750 else
3722 vt_emask_mouse = NoEventMask; 3751 vt_emask_mouse = NoEventMask;
3752
3723 vt_select_input (); 3753 vt_select_input ();
3724 break; 3754 break;
3725 case 1010: /* scroll to bottom on TTY output inhibit */ 3755 case 1010: /* scroll to bottom on TTY output inhibit */
3726 set_option (Opt_scrollTtyOutput, !state); 3756 set_option (Opt_scrollTtyOutput, !state);
3727 break; 3757 break;
3728 case 1011: /* scroll to bottom on key press */ 3758 case 1011: /* scroll to bottom on key press */
3729 set_option (Opt_scrollTtyKeypress, state); 3759 set_option (Opt_scrollTtyKeypress, state);
3730 break; 3760 break;
3731 case 1047: /* secondary screen w/ clearing last */ 3761 case 1047: /* secondary screen w/ clearing last */
3732 if (option (Opt_secondaryScreen)) 3762 if (option (Opt_secondaryScreen))
3733 if (current_screen != PRIMARY) 3763 if (!state)
3734 scr_erase_screen (2); 3764 scr_erase_screen (2);
3765
3735 scr_change_screen (state); 3766 scr_change_screen (state);
3736 break; 3767 break;
3737 case 1049: /* secondary screen w/ clearing first */ 3768 case 1049: /* secondary screen w/ clearing first */
3769 if (option (Opt_secondaryScreen))
3770 if (state)
3771 scr_cursor (SAVE);
3772
3738 scr_change_screen (state); 3773 scr_change_screen (state);
3774
3739 if (option (Opt_secondaryScreen)) 3775 if (option (Opt_secondaryScreen))
3740 if (current_screen != PRIMARY) 3776 if (state)
3741 scr_erase_screen (2); 3777 scr_erase_screen (2);
3778 else
3779 scr_cursor (RESTORE);
3742 break; 3780 break;
3743 default: 3781 default:
3744 break; 3782 break;
3745 } 3783 }
3746 } 3784 }

Diff Legend

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