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.453 by sf-exg, Wed Aug 18 17:45:42 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 {
… …
763 771
764 default: 772 default:
765 { 773 {
766 int param = map_function_key (keysym); 774 int param = map_function_key (keysym);
767 if (param > 0) 775 if (param > 0)
776 {
768 sprintf (kbuf,"\033[%d~", param); 777 int n = sprintf (kbuf,"\033[%d~", param);
778 /*
779 * pass Shift/Control indicators for function keys ending with `~'
780 *
781 * eg,
782 * Prior = "ESC[5~"
783 * Shift+Prior = "ESC[5$"
784 * Ctrl+Prior = "ESC[5^"
785 * Ctrl+Shift+Prior = "ESC[5@"
786 */
787 kbuf[n-1] = (shft ? (ctrl ? '@' : '$') : (ctrl ? '^' : '~'));
788 }
769 else 789 else
770 newlen = 0; 790 newlen = 0;
771 } 791 }
772 break; 792 break;
773 } 793 }
… …
824 view_start = 0; 844 view_start = 0;
825 want_refresh = 1; 845 want_refresh = 1;
826 } 846 }
827 847
828 /* 848 /*
829 * these modifications only affect the static keybuffer
830 * pass Shift/Control indicators for function keys ending with `~'
831 *
832 * eg,
833 * Prior = "ESC[5~"
834 * Shift+Prior = "ESC[5$"
835 * Ctrl+Prior = "ESC[5^"
836 * Ctrl+Shift+Prior = "ESC[5@"
837 * Meta adds an Escape prefix (with META8_OPTION, if meta == <escape>). 849 * Meta adds an Escape prefix (with META8_OPTION, if meta == <escape>).
838 */ 850 */
839 if (kbuf[0] == C0_ESC && kbuf[1] == '[' && kbuf[len - 1] == '~')
840 kbuf[len - 1] = (shft ? (ctrl ? '@' : '$') : (ctrl ? '^' : '~'));
841 851
842 /* escape prefix */ 852 /* escape prefix */
843 if (meta 853 if (meta
844#ifdef META8_OPTION 854#ifdef META8_OPTION
845 && meta_char == C0_ESC 855 && meta_char == C0_ESC
… …
1024 } 1034 }
1025 1035
1026 display->flush (); 1036 display->flush ();
1027} 1037}
1028 1038
1029/* checks wether a refresh is requested and starts the refresh timer */ 1039/* checks whether a refresh is requested and starts the refresh timer */
1030void 1040void
1031rxvt_term::refresh_check () 1041rxvt_term::refresh_check ()
1032{ 1042{
1033 if (want_refresh && !flush_ev.is_active ()) 1043 if (want_refresh && !flush_ev.is_active ())
1034 flush_ev.start (1. / 60.); // refresh at max. 60 Hz normally 1044 flush_ev.start (1. / 60.); // refresh at max. 60 Hz normally
… …
1128 // this should really be sched_yield(), but the linux guys thought 1138 // this should really be sched_yield(), but the linux guys thought
1129 // that giving a process calling sched_yield () less cpu time than 1139 // 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 1140 // ones with high nice levels is a useful thing to do. It surely is is
1131 // allowed by the sus... as is returning ENOSYS. 1141 // allowed by the sus... as is returning ENOSYS.
1132 // since the linux guys additionally thought that breaking the only 1142 // since the linux guys additionally thought that breaking the only
1133 // known workaroudn against their unusable sched_yield hack is cool, 1143 // known workaround against their unusable sched_yield hack is cool,
1134 // we just nanosleep a bit and hope for the best. 1144 // we just nanosleep a bit and hope for the best.
1135 1145
1136 struct timespec ts = { 0, 1000 }; 1146 struct timespec ts = { 0, 1000 };
1137 nanosleep (&ts, 0); 1147 nanosleep (&ts, 0);
1138 1148
… …
1461 selection_property (ev.xproperty.window, ev.xproperty.atom); 1471 selection_property (ev.xproperty.window, ev.xproperty.atom);
1462 1472
1463 break; 1473 break;
1464 1474
1465 case SelectionClear: 1475 case SelectionClear:
1466 selection_clear (); 1476 selection_clear (ev.xselectionclear.selection == xa[XA_CLIPBOARD]);
1467 break; 1477 break;
1468 1478
1469 case SelectionNotify: 1479 case SelectionNotify:
1470 if (selection_wait == Sel_normal) 1480 if (selection_wait == Sel_normal)
1471 selection_paste (ev.xselection.requestor, ev.xselection.property, true); 1481 selection_paste (ev.xselection.requestor, ev.xselection.property, true);
… …
1475 selection_send (ev.xselectionrequest); 1485 selection_send (ev.xselectionrequest);
1476 break; 1486 break;
1477 1487
1478 case MapNotify: 1488 case MapNotify:
1479#ifdef HAVE_BG_PIXMAP 1489#ifdef HAVE_BG_PIXMAP
1480 /* This is needed spcifically to fix the case of no window manager or a 1490 /* 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 1491 * non-reparenting window manager. In those cases we never get first
1482 * ConfigureNotify. Also that speeds startup under normal WM, by taking 1492 * ConfigureNotify. Also that speeds startup under normal WM, by taking
1483 * care of multiplicity of ConfigureNotify events arriwing while WM does 1493 * care of multiplicity of ConfigureNotify events arriving while WM does
1484 * reparenting. 1494 * reparenting.
1485 * We should not render background immidiately, as there could be several 1495 * 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 1496 * 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 1497 * by scheduling background redraw as soon as we can, but giving a short
1488 * bit of time for ConfigureNotifies to arrive. 1498 * bit of time for ConfigureNotifies to arrive.
1489 * We should render background PRIOR to drawing any text, but AFTER all 1499 * We should render background PRIOR to drawing any text, but AFTER all
1490 * of ConfigureNotifys for the best results. 1500 * of ConfigureNotifys for the best results.
… …
1684#endif 1694#endif
1685 1695
1686 refresh_check (); 1696 refresh_check ();
1687} 1697}
1688 1698
1699#if ENABLE_FRILLS
1689void 1700void
1690rxvt_term::set_urgency (bool enable) 1701rxvt_term::set_urgency (bool enable)
1691{ 1702{
1692 if (enable == urgency_hint) 1703 if (enable == urgency_hint)
1693 return; 1704 return;
… …
1697 h->flags = h->flags & ~XUrgencyHint | (enable ? XUrgencyHint : 0); 1708 h->flags = h->flags & ~XUrgencyHint | (enable ? XUrgencyHint : 0);
1698 XSetWMHints (dpy, parent[0], h); 1709 XSetWMHints (dpy, parent[0], h);
1699 urgency_hint = enable; 1710 urgency_hint = enable;
1700 } 1711 }
1701} 1712}
1713#endif
1702 1714
1703void 1715void
1704rxvt_term::focus_in () 1716rxvt_term::focus_in ()
1705{ 1717{
1706 if (!focus) 1718 if (!focus)
… …
1859 /* save the xbutton state (for ButtonRelease) */ 1871 /* save the xbutton state (for ButtonRelease) */
1860 MEvent.state = ev.state; 1872 MEvent.state = ev.state;
1861#ifdef MOUSE_REPORT_DOUBLECLICK 1873#ifdef MOUSE_REPORT_DOUBLECLICK
1862 if (ev.button == MEvent.button && clickintime) 1874 if (ev.button == MEvent.button && clickintime)
1863 { 1875 {
1864 /* same button, within alloted time */ 1876 /* same button, within allowed time */
1865 MEvent.clicks++; 1877 MEvent.clicks++;
1866 1878
1867 if (MEvent.clicks > 1) 1879 if (MEvent.clicks > 1)
1868 { 1880 {
1869 /* only report double clicks */ 1881 /* only report double clicks */
… …
2140 selection_make (ev.time); 2152 selection_make (ev.time);
2141 break; 2153 break;
2142 2154
2143 case Button2: 2155 case Button2:
2144 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window? 2156 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); 2157 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2146 break; 2158 break;
2147 2159
2148#ifdef MOUSE_WHEEL 2160#ifdef MOUSE_WHEEL
2149 case Button4: 2161 case Button4:
2150 case Button5: 2162 case Button5:
… …
2334 break; 2346 break;
2335 } 2347 }
2336 2348
2337 if (len == (size_t)-1) 2349 if (len == (size_t)-1)
2338 { 2350 {
2339 mbrtowc (0, 0, 0, mbstate); // reset now undefined conversion state 2351 mbstate.reset (); // reset now undefined conversion state
2340 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 2352 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2341 } 2353 }
2342 2354
2343 // assume wchar == unicode 2355 // assume wchar == unicode
2344 cmdbuf_ptr += len; 2356 cmdbuf_ptr += len;
… …
2688 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 2700 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
2689 case C1_SCI: /* ESC Z */ 2701 case C1_SCI: /* ESC Z */
2690 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1); 2702 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
2691 break; /* steal obsolete ESC [ c */ 2703 break; /* steal obsolete ESC [ c */
2692 2704
2693 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 2705 /* 8.3.16: CONTROL SEQUENCE INTRODUCER (CSI) */
2694 case C1_CSI: /* ESC [ */ 2706 case C1_CSI: /* ESC [ */
2695 process_csi_seq (); 2707 process_csi_seq ();
2696 break; 2708 break;
2697 2709
2698 /* 8.3.90: OPERATING SYSTEM COMMAND */ 2710 /* 8.3.90: OPERATING SYSTEM COMMAND (OSC) */
2699 case C1_OSC: /* ESC ] */ 2711 case C1_OSC: /* ESC ] */
2700 process_osc_seq (); 2712 process_osc_seq ();
2701 break; 2713 break;
2702 2714
2703 /* 8.3.106: RESET TO INITIAL STATE */ 2715 /* 8.3.106: RESET TO INITIAL STATE (RIS) */
2704 case 'c': 2716 case 'c':
2705 mbstate.reset (); 2717 mbstate.reset ();
2706 scr_poweron (); 2718 scr_poweron ();
2707 scrollBar.show (1); 2719 scrollBar.show (1);
2708 break; 2720 break;
… …
2763 2775
2764 nargs = 0; 2776 nargs = 0;
2765 2777
2766 priv = 0; 2778 priv = 0;
2767 ch = cmd_getc (); 2779 ch = cmd_getc ();
2768 if (ch >= '<' && ch <= '?') 2780 if ((ch >= '<' && ch <= '?') || ch == '!')
2769 { 2781 {
2770 /* '<' '=' '>' '?' */ 2782 /* '<' '=' '>' '?' '!' */
2771 priv = ch; 2783 priv = ch;
2772 ch = cmd_getc (); 2784 ch = cmd_getc ();
2773 } 2785 }
2774 2786
2775 /* read any numerical arguments */ 2787 /* read any numerical arguments */
… …
2829 2841
2830 case '?': 2842 case '?':
2831 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2843 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
2832 process_terminal_mode (ch, priv, nargs, arg); 2844 process_terminal_mode (ch, priv, nargs, arg);
2833 break; 2845 break;
2846
2847 case '!':
2848 if (ch == CSI_70)
2849 {
2850 /* DECSTR: soft terminal reset, used by our terminfo since 9.06 */
2851 scr_soft_reset ();
2852
2853 static const int pm_h[] = { 7, 25 };
2854 static const int pm_l[] = { 1, 3, 4, 5, 6, 9, 66, 1000, 1001, 1049 };
2855
2856 process_terminal_mode ('h', 0, sizeof (pm_h) / sizeof (pm_h[0]), pm_h);
2857 process_terminal_mode ('l', 0, sizeof (pm_l) / sizeof (pm_l[0]), pm_l);
2834 } 2858 }
2859 break;
2860 }
2861
2835 return; 2862 return;
2836 } 2863 }
2837 2864
2838 switch (ch) 2865 switch (ch)
2839 { 2866 {
… …
3206 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 3233 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
3207 */ 3234 */
3208void 3235void
3209rxvt_term::process_dcs_seq () 3236rxvt_term::process_dcs_seq ()
3210{ 3237{
3211 char *s;
3212 unicode_t eh;
3213
3214 /* 3238 /*
3215 * Not handled yet 3239 * Not handled yet
3216 */ 3240 */
3241
3242 unicode_t eh;
3217 s = get_to_st (eh); 3243 char *s = get_to_st (eh);
3218 if (s) 3244 if (s)
3219 free (s); 3245 free (s);
3220 3246
3221 return; 3247 return;
3222} 3248}
… …
3226 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)' 3252 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)'
3227 */ 3253 */
3228void 3254void
3229rxvt_term::process_osc_seq () 3255rxvt_term::process_osc_seq ()
3230{ 3256{
3231 unicode_t ch, eh;
3232 int arg; 3257 int arg;
3233 3258
3234 ch = cmd_getc (); 3259 unicode_t ch = cmd_getc ();
3235 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3260 for (arg = 0; isdigit (ch); ch = cmd_getc ())
3236 arg = arg * 10 + (ch - '0'); 3261 arg = arg * 10 + (ch - '0');
3237 3262
3238 if (ch == ';') 3263 if (ch == ';')
3239 { 3264 {
3265 unicode_t eh;
3240 char *s = get_to_st (eh); 3266 char *s = get_to_st (eh);
3241 3267
3242 if (s) 3268 if (s)
3243 { 3269 {
3244 process_xterm_seq (arg, s, eh); 3270 process_xterm_seq (arg, s, eh);
… …
3268 3294
3269/* 3295/*
3270 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3296 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3271 */ 3297 */
3272void 3298void
3273rxvt_term::process_xterm_seq (int op, const char *str, char resp) 3299rxvt_term::process_xterm_seq (int op, char *str, char resp)
3274{ 3300{
3275 int color; 3301 int color;
3276 char *buf, *name; 3302 char *buf, *name;
3277 bool query = str[0] == '?' && !str[1]; 3303 bool query = str[0] == '?' && !str[1];
3278 int saveop = op; 3304 int saveop = op;
… …
3319 3345
3320 XFree (value); 3346 XFree (value);
3321 } 3347 }
3322 else 3348 else
3323 { 3349 {
3324 char *eq = strchr (str, '='); // constness lost, but verified to be ok 3350 char *eq = strchr (str, '=');
3325 3351
3326 if (eq) 3352 if (eq)
3327 { 3353 {
3328 *eq = 0; 3354 *eq = 0;
3329 set_utf8_property (display->atom (str), eq + 1); 3355 set_utf8_property (display->atom (str), eq + 1);
… …
3369 process_color_seq (op, Color_pointer_fg, str, resp); 3395 process_color_seq (op, Color_pointer_fg, str, resp);
3370 break; 3396 break;
3371 case XTerm_Color_pointer_bg: 3397 case XTerm_Color_pointer_bg:
3372 process_color_seq (op, Color_pointer_bg, str, resp); 3398 process_color_seq (op, Color_pointer_bg, str, resp);
3373 break; 3399 break;
3400#ifdef OPTION_HC
3401 case XTerm_Color_HC:
3402 process_color_seq (op, Color_HC, str, resp);
3403 break;
3404 case XTerm_Color_HTC:
3405 process_color_seq (op, Color_HTC, str, resp);
3406 break;
3407#endif
3374#ifndef NO_BOLD_UNDERLINE_REVERSE 3408#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: 3409 case URxvt_Color_BD:
3380 process_color_seq (op, Color_BD, str, resp); 3410 process_color_seq (op, Color_BD, str, resp);
3381 break; 3411 break;
3382 case Rxvt_Color_UL:
3383 case URxvt_Color_UL: 3412 case URxvt_Color_UL:
3384 process_color_seq (op, Color_UL, str, resp); 3413 process_color_seq (op, Color_UL, str, resp);
3385 break; 3414 break;
3386 case URxvt_Color_IT: 3415 case URxvt_Color_IT:
3387 process_color_seq (op, Color_IT, str, resp); 3416 process_color_seq (op, Color_IT, str, resp);
3388 break; 3417 break;
3389#endif 3418#endif
3419 case URxvt_Color_border:
3420 process_color_seq (op, Color_border, str, resp);
3421 break;
3390#if ENABLE_TRANSPARENCY 3422#if ENABLE_TRANSPARENCY
3391 case URxvt_Color_tint: 3423 case URxvt_Color_tint:
3392 process_color_seq (op, Color_tint, str, resp); 3424 process_color_seq (op, Color_tint, str, resp);
3393 { 3425 {
3394 bool changed = false; 3426 bool changed = false;
… …
3409 case Rxvt_Pixmap: 3441 case Rxvt_Pixmap:
3410 if (!strcmp (str, "?")) 3442 if (!strcmp (str, "?"))
3411 { 3443 {
3412 char str[256]; 3444 char str[256];
3413 3445
3414 sprintf (str, "[%dx%d+%d+%d]", /* can't presume snprintf () ! */ 3446 sprintf (str, "[%dx%d+%d+%d]",
3415 min (bgPixmap.h_scale, 32767), min (bgPixmap.v_scale, 32767), 3447 min (bgPixmap.h_scale, 32767), min (bgPixmap.v_scale, 32767),
3416 min (bgPixmap.h_align, 32767), min (bgPixmap.v_align, 32767)); 3448 min (bgPixmap.h_align, 32767), min (bgPixmap.v_align, 32767));
3417 process_xterm_seq (XTerm_title, str, CHAR_ST); 3449 process_xterm_seq (XTerm_title, str, CHAR_ST);
3418 } 3450 }
3419 else 3451 else
… …
3551 { 3583 {
3552 if (mode == 'r') 3584 if (mode == 'r')
3553 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 3585 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3554 else 3586 else
3555 state = (mode == 't') ? ! (priv_modes & bit) : mode; 3587 state = (mode == 't') ? ! (priv_modes & bit) : mode;
3588
3556 set_privmode (bit, state); 3589 set_privmode (bit, state);
3557 } 3590 }
3558 3591
3559 return state; 3592 return state;
3560} 3593}
… …
3569 static const struct 3602 static const struct
3570 { 3603 {
3571 const int argval; 3604 const int argval;
3572 const unsigned long bit; 3605 const unsigned long bit;
3573 } argtopriv[] = { 3606 } argtopriv[] = {
3574 { 1, PrivMode_aplCUR }, 3607 { 1, PrivMode_aplCUR }, // DECCKM
3575 { 2, PrivMode_vt52 }, 3608 { 2, PrivMode_vt52 },
3576 { 3, PrivMode_132 }, 3609 { 3, PrivMode_132 }, // DECCOLM
3577 { 4, PrivMode_smoothScroll }, 3610 { 4, PrivMode_smoothScroll }, // DECSCLM
3578 { 5, PrivMode_rVideo }, 3611 { 5, PrivMode_rVideo }, // DECSCNM
3579 { 6, PrivMode_relOrigin }, 3612 { 6, PrivMode_relOrigin }, // DECOM
3580 { 7, PrivMode_Autowrap }, 3613 { 7, PrivMode_Autowrap }, // DECAWM
3581 // 8, bi-directional support mode 3614 // 8, auto-repeat keys // DECARM
3582 { 9, PrivMode_MouseX10 }, 3615 { 9, PrivMode_MouseX10 },
3583 // 18, 19 printing-related 3616 // 18 end FF to printer after print screen
3617 // 19 Print screen prints full screen/scorll region
3584 { 25, PrivMode_VisibleCursor }, 3618 { 25, PrivMode_VisibleCursor }, // cnorm/cvvis/civis
3585#ifdef scrollBar_esc 3619#ifdef scrollBar_esc
3586 { scrollBar_esc, PrivMode_scrollBar }, 3620 { scrollBar_esc, PrivMode_scrollBar },
3587#endif 3621#endif
3588 { 35, PrivMode_ShiftKeys }, // rxvt extension 3622 { 35, PrivMode_ShiftKeys }, // rxvt extension
3623 // 38, tektronix mode // DECTEK
3589 { 40, PrivMode_132OK }, 3624 { 40, PrivMode_132OK },
3590 // 41 xterm more fixes NYI 3625 // 41 xterm more fixes NYI
3591 // 45 margin bell NYI 3626 // 45 margin bell NYI
3592 // 46 start logging 3627 // 46 start logging
3593 { 47, PrivMode_Screen }, 3628 { 47, PrivMode_Screen },
3594 { 66, PrivMode_aplKP }, 3629 { 66, PrivMode_aplKP }, // DECPAM/DECPNM
3595#ifndef NO_BACKSPACE_KEY 3630#ifndef NO_BACKSPACE_KEY
3596 { 67, PrivMode_BackSpace }, 3631 { 67, PrivMode_BackSpace }, // DECBKM
3597#endif 3632#endif
3598 { 1000, PrivMode_MouseX11 }, 3633 { 1000, PrivMode_MouseX11 },
3599 { 1002, PrivMode_MouseBtnEvent }, 3634 { 1002, PrivMode_MouseBtnEvent },
3600 { 1003, PrivMode_MouseAnyEvent }, 3635 { 1003, PrivMode_MouseAnyEvent },
3601 { 1010, PrivMode_TtyOutputInh }, // rxvt extension 3636 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
… …
3640 3675
3641 scr_touch (true); 3676 scr_touch (true);
3642 break; 3677 break;
3643#endif 3678#endif
3644 case 1048: /* alternative cursor save */ 3679 case 1048: /* alternative cursor save */
3645 case 1049:
3646 if (option (Opt_secondaryScreen)) 3680 if (option (Opt_secondaryScreen))
3647 if (mode == 0) 3681 if (mode == 0)
3648 scr_cursor (RESTORE); 3682 scr_cursor (RESTORE);
3649 else if (mode == 1) 3683 else if (mode == 1)
3650 scr_cursor (SAVE); 3684 scr_cursor (SAVE);
… …
3663 */ 3697 */
3664 set_privmode (PrivMode_vt52, 1); 3698 set_privmode (PrivMode_vt52, 1);
3665 break; 3699 break;
3666 case 3: /* 80/132 */ 3700 case 3: /* 80/132 */
3667 if (priv_modes & PrivMode_132OK) 3701 if (priv_modes & PrivMode_132OK)
3668 {
3669 scr_poweron ();
3670 set_widthheight (((state ? 132 : 80) * fwidth), 24 * fheight); 3702 set_widthheight ((state ? 132 : 80) * fwidth, 24 * fheight);
3671 }
3672 break; 3703 break;
3673 case 4: /* smooth scrolling */ 3704 case 4: /* smooth scrolling */
3674 set_option (Opt_jumpScroll, !state); 3705 set_option (Opt_jumpScroll, !state);
3675 break; 3706 break;
3676 case 5: /* reverse video */ 3707 case 5: /* reverse video */
… …
3718 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent; 3749 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent;
3719 vt_emask_mouse = PointerMotionMask; 3750 vt_emask_mouse = PointerMotionMask;
3720 } 3751 }
3721 else 3752 else
3722 vt_emask_mouse = NoEventMask; 3753 vt_emask_mouse = NoEventMask;
3754
3723 vt_select_input (); 3755 vt_select_input ();
3724 break; 3756 break;
3725 case 1010: /* scroll to bottom on TTY output inhibit */ 3757 case 1010: /* scroll to bottom on TTY output inhibit */
3726 set_option (Opt_scrollTtyOutput, !state); 3758 set_option (Opt_scrollTtyOutput, !state);
3727 break; 3759 break;
3728 case 1011: /* scroll to bottom on key press */ 3760 case 1011: /* scroll to bottom on key press */
3729 set_option (Opt_scrollTtyKeypress, state); 3761 set_option (Opt_scrollTtyKeypress, state);
3730 break; 3762 break;
3731 case 1047: /* secondary screen w/ clearing last */ 3763 case 1047: /* secondary screen w/ clearing last */
3732 if (option (Opt_secondaryScreen)) 3764 if (option (Opt_secondaryScreen))
3733 if (current_screen != PRIMARY) 3765 if (!state)
3734 scr_erase_screen (2); 3766 scr_erase_screen (2);
3767
3735 scr_change_screen (state); 3768 scr_change_screen (state);
3736 break; 3769 break;
3737 case 1049: /* secondary screen w/ clearing first */ 3770 case 1049: /* secondary screen w/ clearing first */
3771 if (option (Opt_secondaryScreen))
3772 if (state)
3773 scr_cursor (SAVE);
3774
3738 scr_change_screen (state); 3775 scr_change_screen (state);
3776
3739 if (option (Opt_secondaryScreen)) 3777 if (option (Opt_secondaryScreen))
3740 if (current_screen != PRIMARY) 3778 if (state)
3741 scr_erase_screen (2); 3779 scr_erase_screen (2);
3780 else
3781 scr_cursor (RESTORE);
3742 break; 3782 break;
3743 default: 3783 default:
3744 break; 3784 break;
3745 } 3785 }
3746 } 3786 }

Diff Legend

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