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.458 by sf-exg, Thu Nov 18 17:28:12 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 {
… …
967rxvt_term::flush () 975rxvt_term::flush ()
968{ 976{
969 flush_ev.stop (); 977 flush_ev.stop ();
970 978
971#ifdef HAVE_BG_PIXMAP 979#ifdef HAVE_BG_PIXMAP
972 if (bgPixmap.check_clearChanged ()) 980 if (bgPixmap.flags & bgPixmap_t::hasChanged)
973 { 981 {
982 bgPixmap.flags &= ~bgPixmap_t::hasChanged;
974// scr_clear (true); This needs to be researched further! 983// scr_clear (true); This needs to be researched further!
975 scr_touch (false); 984 scr_touch (false);
976 } 985 }
977#endif 986#endif
978 987
… …
1024 } 1033 }
1025 1034
1026 display->flush (); 1035 display->flush ();
1027} 1036}
1028 1037
1029/* checks wether a refresh is requested and starts the refresh timer */ 1038/* checks whether a refresh is requested and starts the refresh timer */
1030void 1039void
1031rxvt_term::refresh_check () 1040rxvt_term::refresh_check ()
1032{ 1041{
1033 if (want_refresh && !flush_ev.is_active ()) 1042 if (want_refresh && !flush_ev.is_active ())
1034 flush_ev.start (1. / 60.); // refresh at max. 60 Hz normally 1043 flush_ev.start (1. / 60.); // refresh at max. 60 Hz normally
… …
1128 // this should really be sched_yield(), but the linux guys thought 1137 // this should really be sched_yield(), but the linux guys thought
1129 // that giving a process calling sched_yield () less cpu time than 1138 // 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 1139 // ones with high nice levels is a useful thing to do. It surely is is
1131 // allowed by the sus... as is returning ENOSYS. 1140 // allowed by the sus... as is returning ENOSYS.
1132 // since the linux guys additionally thought that breaking the only 1141 // since the linux guys additionally thought that breaking the only
1133 // known workaroudn against their unusable sched_yield hack is cool, 1142 // known workaround against their unusable sched_yield hack is cool,
1134 // we just nanosleep a bit and hope for the best. 1143 // we just nanosleep a bit and hope for the best.
1135 1144
1136 struct timespec ts = { 0, 1000 }; 1145 struct timespec ts = { 0, 1000 };
1137 nanosleep (&ts, 0); 1146 nanosleep (&ts, 0);
1138 1147
… …
1422 && ev.xfocus.mode != NotifyGrab) 1431 && ev.xfocus.mode != NotifyGrab)
1423 focus_out (); 1432 focus_out ();
1424 break; 1433 break;
1425 1434
1426 case ConfigureNotify: 1435 case ConfigureNotify:
1427 /*fprintf (stderr, "ConfigureNotify for %X, parent is %X, geom is %dx%d%+d%+d, old geom was %dx%d\n",
1428 ev.xconfigure.window, parent[0], ev.xconfigure.width, ev.xconfigure.height, ev.xconfigure.x, ev.xconfigure.y,
1429 szHint.width, szHint.height);*/
1430 if (ev.xconfigure.window == parent[0]) 1436 if (ev.xconfigure.window == parent[0])
1431 { 1437 {
1432 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev)) 1438 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1433 ; 1439 ;
1434 1440
… …
1461 selection_property (ev.xproperty.window, ev.xproperty.atom); 1467 selection_property (ev.xproperty.window, ev.xproperty.atom);
1462 1468
1463 break; 1469 break;
1464 1470
1465 case SelectionClear: 1471 case SelectionClear:
1466 selection_clear (); 1472 selection_clear (ev.xselectionclear.selection == xa[XA_CLIPBOARD]);
1467 break; 1473 break;
1468 1474
1469 case SelectionNotify: 1475 case SelectionNotify:
1470 if (selection_wait == Sel_normal) 1476 if (selection_wait == Sel_normal)
1471 selection_paste (ev.xselection.requestor, ev.xselection.property, true); 1477 selection_paste (ev.xselection.requestor, ev.xselection.property, true);
… …
1475 selection_send (ev.xselectionrequest); 1481 selection_send (ev.xselectionrequest);
1476 break; 1482 break;
1477 1483
1478 case MapNotify: 1484 case MapNotify:
1479#ifdef HAVE_BG_PIXMAP 1485#ifdef HAVE_BG_PIXMAP
1480 /* This is needed spcifically to fix the case of no window manager or a 1486 /* 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 1487 * non-reparenting window manager. In those cases we never get first
1482 * ConfigureNotify. Also that speeds startup under normal WM, by taking 1488 * ConfigureNotify. Also that speeds startup under normal WM, by taking
1483 * care of multiplicity of ConfigureNotify events arriwing while WM does 1489 * care of multiplicity of ConfigureNotify events arriving while WM does
1484 * reparenting. 1490 * reparenting.
1485 * We should not render background immidiately, as there could be several 1491 * 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 1492 * 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 1493 * by scheduling background redraw as soon as we can, but giving a short
1488 * bit of time for ConfigureNotifies to arrive. 1494 * bit of time for ConfigureNotifies to arrive.
1489 * We should render background PRIOR to drawing any text, but AFTER all 1495 * We should render background PRIOR to drawing any text, but AFTER all
1490 * of ConfigureNotifys for the best results. 1496 * of ConfigureNotifys for the best results.
… …
1684#endif 1690#endif
1685 1691
1686 refresh_check (); 1692 refresh_check ();
1687} 1693}
1688 1694
1695#if ENABLE_FRILLS
1689void 1696void
1690rxvt_term::set_urgency (bool enable) 1697rxvt_term::set_urgency (bool enable)
1691{ 1698{
1692 if (enable == urgency_hint) 1699 if (enable == urgency_hint)
1693 return; 1700 return;
… …
1697 h->flags = h->flags & ~XUrgencyHint | (enable ? XUrgencyHint : 0); 1704 h->flags = h->flags & ~XUrgencyHint | (enable ? XUrgencyHint : 0);
1698 XSetWMHints (dpy, parent[0], h); 1705 XSetWMHints (dpy, parent[0], h);
1699 urgency_hint = enable; 1706 urgency_hint = enable;
1700 } 1707 }
1701} 1708}
1709#endif
1702 1710
1703void 1711void
1704rxvt_term::focus_in () 1712rxvt_term::focus_in ()
1705{ 1713{
1706 if (!focus) 1714 if (!focus)
… …
1859 /* save the xbutton state (for ButtonRelease) */ 1867 /* save the xbutton state (for ButtonRelease) */
1860 MEvent.state = ev.state; 1868 MEvent.state = ev.state;
1861#ifdef MOUSE_REPORT_DOUBLECLICK 1869#ifdef MOUSE_REPORT_DOUBLECLICK
1862 if (ev.button == MEvent.button && clickintime) 1870 if (ev.button == MEvent.button && clickintime)
1863 { 1871 {
1864 /* same button, within alloted time */ 1872 /* same button, within allowed time */
1865 MEvent.clicks++; 1873 MEvent.clicks++;
1866 1874
1867 if (MEvent.clicks > 1) 1875 if (MEvent.clicks > 1)
1868 { 1876 {
1869 /* only report double clicks */ 1877 /* only report double clicks */
… …
2140 selection_make (ev.time); 2148 selection_make (ev.time);
2141 break; 2149 break;
2142 2150
2143 case Button2: 2151 case Button2:
2144 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window? 2152 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); 2153 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2146 break; 2154 break;
2147 2155
2148#ifdef MOUSE_WHEEL 2156#ifdef MOUSE_WHEEL
2149 case Button4: 2157 case Button4:
2150 case Button5: 2158 case Button5:
… …
2334 break; 2342 break;
2335 } 2343 }
2336 2344
2337 if (len == (size_t)-1) 2345 if (len == (size_t)-1)
2338 { 2346 {
2339 mbrtowc (0, 0, 0, mbstate); // reset now undefined conversion state 2347 mbstate.reset (); // reset now undefined conversion state
2340 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 2348 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2341 } 2349 }
2342 2350
2343 // assume wchar == unicode 2351 // assume wchar == unicode
2344 cmdbuf_ptr += len; 2352 cmdbuf_ptr += len;
… …
2688 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 2696 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
2689 case C1_SCI: /* ESC Z */ 2697 case C1_SCI: /* ESC Z */
2690 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1); 2698 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
2691 break; /* steal obsolete ESC [ c */ 2699 break; /* steal obsolete ESC [ c */
2692 2700
2693 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 2701 /* 8.3.16: CONTROL SEQUENCE INTRODUCER (CSI) */
2694 case C1_CSI: /* ESC [ */ 2702 case C1_CSI: /* ESC [ */
2695 process_csi_seq (); 2703 process_csi_seq ();
2696 break; 2704 break;
2697 2705
2698 /* 8.3.90: OPERATING SYSTEM COMMAND */ 2706 /* 8.3.90: OPERATING SYSTEM COMMAND (OSC) */
2699 case C1_OSC: /* ESC ] */ 2707 case C1_OSC: /* ESC ] */
2700 process_osc_seq (); 2708 process_osc_seq ();
2701 break; 2709 break;
2702 2710
2703 /* 8.3.106: RESET TO INITIAL STATE */ 2711 /* 8.3.106: RESET TO INITIAL STATE (RIS) */
2704 case 'c': 2712 case 'c':
2705 mbstate.reset (); 2713 mbstate.reset ();
2706 scr_poweron (); 2714 scr_poweron ();
2707 scrollBar.show (1); 2715 scrollBar.show (1);
2708 break; 2716 break;
… …
2763 2771
2764 nargs = 0; 2772 nargs = 0;
2765 2773
2766 priv = 0; 2774 priv = 0;
2767 ch = cmd_getc (); 2775 ch = cmd_getc ();
2768 if (ch >= '<' && ch <= '?') 2776 if ((ch >= '<' && ch <= '?') || ch == '!')
2769 { 2777 {
2770 /* '<' '=' '>' '?' */ 2778 /* '<' '=' '>' '?' '!' */
2771 priv = ch; 2779 priv = ch;
2772 ch = cmd_getc (); 2780 ch = cmd_getc ();
2773 } 2781 }
2774 2782
2775 /* read any numerical arguments */ 2783 /* read any numerical arguments */
… …
2829 2837
2830 case '?': 2838 case '?':
2831 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2839 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
2832 process_terminal_mode (ch, priv, nargs, arg); 2840 process_terminal_mode (ch, priv, nargs, arg);
2833 break; 2841 break;
2842
2843 case '!':
2844 if (ch == CSI_70)
2845 {
2846 /* DECSTR: soft terminal reset, used by our terminfo since 9.06 */
2847 scr_soft_reset ();
2848
2849 static const int pm_h[] = { 7, 25 };
2850 static const int pm_l[] = { 1, 3, 4, 5, 6, 9, 66, 1000, 1001, 1049 };
2851
2852 process_terminal_mode ('h', 0, sizeof (pm_h) / sizeof (pm_h[0]), pm_h);
2853 process_terminal_mode ('l', 0, sizeof (pm_l) / sizeof (pm_l[0]), pm_l);
2834 } 2854 }
2855 break;
2856 }
2857
2835 return; 2858 return;
2836 } 2859 }
2837 2860
2838 switch (ch) 2861 switch (ch)
2839 { 2862 {
… …
3206 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 3229 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
3207 */ 3230 */
3208void 3231void
3209rxvt_term::process_dcs_seq () 3232rxvt_term::process_dcs_seq ()
3210{ 3233{
3211 char *s;
3212 unicode_t eh;
3213
3214 /* 3234 /*
3215 * Not handled yet 3235 * Not handled yet
3216 */ 3236 */
3237
3238 unicode_t eh;
3217 s = get_to_st (eh); 3239 char *s = get_to_st (eh);
3218 if (s) 3240 if (s)
3219 free (s); 3241 free (s);
3220 3242
3221 return; 3243 return;
3222} 3244}
… …
3226 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)' 3248 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)'
3227 */ 3249 */
3228void 3250void
3229rxvt_term::process_osc_seq () 3251rxvt_term::process_osc_seq ()
3230{ 3252{
3231 unicode_t ch, eh;
3232 int arg; 3253 int arg;
3233 3254
3234 ch = cmd_getc (); 3255 unicode_t ch = cmd_getc ();
3235 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3256 for (arg = 0; isdigit (ch); ch = cmd_getc ())
3236 arg = arg * 10 + (ch - '0'); 3257 arg = arg * 10 + (ch - '0');
3237 3258
3238 if (ch == ';') 3259 if (ch == ';')
3239 { 3260 {
3261 unicode_t eh;
3240 char *s = get_to_st (eh); 3262 char *s = get_to_st (eh);
3241 3263
3242 if (s) 3264 if (s)
3243 { 3265 {
3244 process_xterm_seq (arg, s, eh); 3266 process_xterm_seq (arg, s, eh);
… …
3268 3290
3269/* 3291/*
3270 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3292 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3271 */ 3293 */
3272void 3294void
3273rxvt_term::process_xterm_seq (int op, const char *str, char resp) 3295rxvt_term::process_xterm_seq (int op, char *str, char resp)
3274{ 3296{
3275 int color; 3297 int color;
3276 char *buf, *name; 3298 char *buf, *name;
3277 bool query = str[0] == '?' && !str[1]; 3299 bool query = str[0] == '?' && !str[1];
3278 int saveop = op; 3300 int saveop = op;
… …
3319 3341
3320 XFree (value); 3342 XFree (value);
3321 } 3343 }
3322 else 3344 else
3323 { 3345 {
3324 char *eq = strchr (str, '='); // constness lost, but verified to be ok 3346 char *eq = strchr (str, '=');
3325 3347
3326 if (eq) 3348 if (eq)
3327 { 3349 {
3328 *eq = 0; 3350 *eq = 0;
3329 set_utf8_property (display->atom (str), eq + 1); 3351 set_utf8_property (display->atom (str), eq + 1);
… …
3369 process_color_seq (op, Color_pointer_fg, str, resp); 3391 process_color_seq (op, Color_pointer_fg, str, resp);
3370 break; 3392 break;
3371 case XTerm_Color_pointer_bg: 3393 case XTerm_Color_pointer_bg:
3372 process_color_seq (op, Color_pointer_bg, str, resp); 3394 process_color_seq (op, Color_pointer_bg, str, resp);
3373 break; 3395 break;
3396#ifdef OPTION_HC
3397 case XTerm_Color_HC:
3398 process_color_seq (op, Color_HC, str, resp);
3399 break;
3400 case XTerm_Color_HTC:
3401 process_color_seq (op, Color_HTC, str, resp);
3402 break;
3403#endif
3374#ifndef NO_BOLD_UNDERLINE_REVERSE 3404#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: 3405 case URxvt_Color_BD:
3380 process_color_seq (op, Color_BD, str, resp); 3406 process_color_seq (op, Color_BD, str, resp);
3381 break; 3407 break;
3382 case Rxvt_Color_UL:
3383 case URxvt_Color_UL: 3408 case URxvt_Color_UL:
3384 process_color_seq (op, Color_UL, str, resp); 3409 process_color_seq (op, Color_UL, str, resp);
3385 break; 3410 break;
3386 case URxvt_Color_IT: 3411 case URxvt_Color_IT:
3387 process_color_seq (op, Color_IT, str, resp); 3412 process_color_seq (op, Color_IT, str, resp);
3388 break; 3413 break;
3389#endif 3414#endif
3415 case URxvt_Color_border:
3416 process_color_seq (op, Color_border, str, resp);
3417 break;
3390#if ENABLE_TRANSPARENCY 3418#if ENABLE_TRANSPARENCY
3391 case URxvt_Color_tint: 3419 case URxvt_Color_tint:
3392 process_color_seq (op, Color_tint, str, resp); 3420 process_color_seq (op, Color_tint, str, resp);
3393 { 3421 {
3394 bool changed = false; 3422 bool changed = false;
… …
3409 case Rxvt_Pixmap: 3437 case Rxvt_Pixmap:
3410 if (!strcmp (str, "?")) 3438 if (!strcmp (str, "?"))
3411 { 3439 {
3412 char str[256]; 3440 char str[256];
3413 3441
3414 sprintf (str, "[%dx%d+%d+%d]", /* can't presume snprintf () ! */ 3442 sprintf (str, "[%dx%d+%d+%d]",
3415 min (bgPixmap.h_scale, 32767), min (bgPixmap.v_scale, 32767), 3443 min (bgPixmap.h_scale, 32767), min (bgPixmap.v_scale, 32767),
3416 min (bgPixmap.h_align, 32767), min (bgPixmap.v_align, 32767)); 3444 min (bgPixmap.h_align, 32767), min (bgPixmap.v_align, 32767));
3417 process_xterm_seq (XTerm_title, str, CHAR_ST); 3445 process_xterm_seq (XTerm_title, str, CHAR_ST);
3418 } 3446 }
3419 else 3447 else
3420 { 3448 {
3421 int changed = 0; 3449 int changed = 0;
3422 3450
3423 if (*str != ';') 3451 if (*str != ';')
3424 { 3452 {
3425 /* reset to default scaling :*/
3426 bgPixmap.unset_geometry ();
3427 if (bgPixmap.set_file (str)) /* change pixmap */ 3453 if (bgPixmap.set_file (str)) /* change pixmap */
3428 changed++; 3454 changed++;
3429 str = strchr (str, ';'); 3455 str = strchr (str, ';');
3430 if (str == NULL) 3456 if (str == NULL)
3431 bgPixmap.set_defaultGeometry (); 3457 bgPixmap.set_defaultGeometry ();
3458 else
3459 bgPixmap.set_geometry (str+1);
3432 } 3460 }
3433 3461 else
3434 while (str)
3435 { 3462 {
3436 str++; 3463 str++;
3437 if (bgPixmap.set_geometry (str)) 3464 if (bgPixmap.set_geometry (str, true))
3438 changed++; 3465 changed++;
3439 str = strchr (str, ';');
3440 } 3466 }
3441 3467
3442 if (changed) 3468 if (changed)
3443 update_background (); 3469 update_background ();
3444 } 3470 }
… …
3551 { 3577 {
3552 if (mode == 'r') 3578 if (mode == 'r')
3553 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 3579 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3554 else 3580 else
3555 state = (mode == 't') ? ! (priv_modes & bit) : mode; 3581 state = (mode == 't') ? ! (priv_modes & bit) : mode;
3582
3556 set_privmode (bit, state); 3583 set_privmode (bit, state);
3557 } 3584 }
3558 3585
3559 return state; 3586 return state;
3560} 3587}
… …
3569 static const struct 3596 static const struct
3570 { 3597 {
3571 const int argval; 3598 const int argval;
3572 const unsigned long bit; 3599 const unsigned long bit;
3573 } argtopriv[] = { 3600 } argtopriv[] = {
3574 { 1, PrivMode_aplCUR }, 3601 { 1, PrivMode_aplCUR }, // DECCKM
3575 { 2, PrivMode_vt52 }, 3602 { 2, PrivMode_vt52 },
3576 { 3, PrivMode_132 }, 3603 { 3, PrivMode_132 }, // DECCOLM
3577 { 4, PrivMode_smoothScroll }, 3604 { 4, PrivMode_smoothScroll }, // DECSCLM
3578 { 5, PrivMode_rVideo }, 3605 { 5, PrivMode_rVideo }, // DECSCNM
3579 { 6, PrivMode_relOrigin }, 3606 { 6, PrivMode_relOrigin }, // DECOM
3580 { 7, PrivMode_Autowrap }, 3607 { 7, PrivMode_Autowrap }, // DECAWM
3581 // 8, bi-directional support mode 3608 // 8, auto-repeat keys // DECARM
3582 { 9, PrivMode_MouseX10 }, 3609 { 9, PrivMode_MouseX10 },
3583 // 18, 19 printing-related 3610 // 18 end FF to printer after print screen
3611 // 19 Print screen prints full screen/scroll region
3584 { 25, PrivMode_VisibleCursor }, 3612 { 25, PrivMode_VisibleCursor }, // cnorm/cvvis/civis
3585#ifdef scrollBar_esc 3613#ifdef scrollBar_esc
3586 { scrollBar_esc, PrivMode_scrollBar }, 3614 { scrollBar_esc, PrivMode_scrollBar },
3587#endif 3615#endif
3588 { 35, PrivMode_ShiftKeys }, // rxvt extension 3616 { 35, PrivMode_ShiftKeys }, // rxvt extension
3617 // 38, tektronix mode // DECTEK
3589 { 40, PrivMode_132OK }, 3618 { 40, PrivMode_132OK },
3590 // 41 xterm more fixes NYI 3619 // 41 xterm more fixes NYI
3591 // 45 margin bell NYI 3620 // 45 margin bell NYI
3592 // 46 start logging 3621 // 46 start logging
3593 { 47, PrivMode_Screen }, 3622 { 47, PrivMode_Screen },
3594 { 66, PrivMode_aplKP }, 3623 { 66, PrivMode_aplKP }, // DECPAM/DECPNM
3595#ifndef NO_BACKSPACE_KEY 3624#ifndef NO_BACKSPACE_KEY
3596 { 67, PrivMode_BackSpace }, 3625 { 67, PrivMode_BackSpace }, // DECBKM
3597#endif 3626#endif
3598 { 1000, PrivMode_MouseX11 }, 3627 { 1000, PrivMode_MouseX11 },
3599 { 1002, PrivMode_MouseBtnEvent }, 3628 { 1002, PrivMode_MouseBtnEvent },
3600 { 1003, PrivMode_MouseAnyEvent }, 3629 { 1003, PrivMode_MouseAnyEvent },
3601 { 1010, PrivMode_TtyOutputInh }, // rxvt extension 3630 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
… …
3640 3669
3641 scr_touch (true); 3670 scr_touch (true);
3642 break; 3671 break;
3643#endif 3672#endif
3644 case 1048: /* alternative cursor save */ 3673 case 1048: /* alternative cursor save */
3645 case 1049:
3646 if (option (Opt_secondaryScreen)) 3674 if (option (Opt_secondaryScreen))
3647 if (mode == 0) 3675 if (mode == 0)
3648 scr_cursor (RESTORE); 3676 scr_cursor (RESTORE);
3649 else if (mode == 1) 3677 else if (mode == 1)
3650 scr_cursor (SAVE); 3678 scr_cursor (SAVE);
… …
3663 */ 3691 */
3664 set_privmode (PrivMode_vt52, 1); 3692 set_privmode (PrivMode_vt52, 1);
3665 break; 3693 break;
3666 case 3: /* 80/132 */ 3694 case 3: /* 80/132 */
3667 if (priv_modes & PrivMode_132OK) 3695 if (priv_modes & PrivMode_132OK)
3668 {
3669 scr_poweron ();
3670 set_widthheight (((state ? 132 : 80) * fwidth), 24 * fheight); 3696 set_widthheight ((state ? 132 : 80) * fwidth, 24 * fheight);
3671 }
3672 break; 3697 break;
3673 case 4: /* smooth scrolling */ 3698 case 4: /* smooth scrolling */
3674 set_option (Opt_jumpScroll, !state); 3699 set_option (Opt_jumpScroll, !state);
3675 break; 3700 break;
3676 case 5: /* reverse video */ 3701 case 5: /* reverse video */
… …
3718 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent; 3743 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent;
3719 vt_emask_mouse = PointerMotionMask; 3744 vt_emask_mouse = PointerMotionMask;
3720 } 3745 }
3721 else 3746 else
3722 vt_emask_mouse = NoEventMask; 3747 vt_emask_mouse = NoEventMask;
3748
3723 vt_select_input (); 3749 vt_select_input ();
3724 break; 3750 break;
3725 case 1010: /* scroll to bottom on TTY output inhibit */ 3751 case 1010: /* scroll to bottom on TTY output inhibit */
3726 set_option (Opt_scrollTtyOutput, !state); 3752 set_option (Opt_scrollTtyOutput, !state);
3727 break; 3753 break;
3728 case 1011: /* scroll to bottom on key press */ 3754 case 1011: /* scroll to bottom on key press */
3729 set_option (Opt_scrollTtyKeypress, state); 3755 set_option (Opt_scrollTtyKeypress, state);
3730 break; 3756 break;
3731 case 1047: /* secondary screen w/ clearing last */ 3757 case 1047: /* secondary screen w/ clearing last */
3732 if (option (Opt_secondaryScreen)) 3758 if (option (Opt_secondaryScreen))
3733 if (current_screen != PRIMARY) 3759 if (!state)
3734 scr_erase_screen (2); 3760 scr_erase_screen (2);
3761
3735 scr_change_screen (state); 3762 scr_change_screen (state);
3736 break; 3763 break;
3737 case 1049: /* secondary screen w/ clearing first */ 3764 case 1049: /* secondary screen w/ clearing first */
3765 if (option (Opt_secondaryScreen))
3766 if (state)
3767 scr_cursor (SAVE);
3768
3738 scr_change_screen (state); 3769 scr_change_screen (state);
3770
3739 if (option (Opt_secondaryScreen)) 3771 if (option (Opt_secondaryScreen))
3740 if (current_screen != PRIMARY) 3772 if (state)
3741 scr_erase_screen (2); 3773 scr_erase_screen (2);
3774 else
3775 scr_cursor (RESTORE);
3742 break; 3776 break;
3743 default: 3777 default:
3744 break; 3778 break;
3745 } 3779 }
3746 } 3780 }

Diff Legend

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