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.426 by root, Wed Nov 5 13:49:36 2008 UTC vs.
Revision 1.460 by sf-exg, Fri Nov 19 23:29:30 2010 UTC

… …
162 162
163void 163void
164rxvt_term::iso14755_51 (unicode_t ch, rend_t r, int x, int y) 164rxvt_term::iso14755_51 (unicode_t ch, rend_t r, int x, int y)
165{ 165{
166 rxvt_fontset *fs = FONTSET (r); 166 rxvt_fontset *fs = FONTSET (r);
167 rxvt_font *f = (*fs)[fs->find_font (ch)];
168 wchar_t *chr, *alloc, ch2, *fname; 167 wchar_t *chr, *alloc, ch2, **fname;
169 int len; 168 int len;
170
171 fname = rxvt_utf8towcs (f->name);
172 169
173# if ENABLE_COMBINING 170# if ENABLE_COMBINING
174 if (IS_COMPOSE (ch)) 171 if (IS_COMPOSE (ch))
175 { 172 {
176 len = rxvt_composite.expand (ch, 0); 173 len = rxvt_composite.expand (ch, 0);
… …
197 r & RS_Blink ? " blink" : "", 194 r & RS_Blink ? " blink" : "",
198 r & RS_RVid ? " rvid" : "", 195 r & RS_RVid ? " rvid" : "",
199 r & RS_Uline ? " uline" : "", 196 r & RS_Uline ? " uline" : "",
200 r & RS_Careful ? " careful" : ""); 197 r & RS_Careful ? " careful" : "");
201 198
199 int width = 0;
200 fname = rxvt_temp_buf<wchar_t *> (len);
201 for (int i = 0; i < len; i++)
202 {
203 rxvt_font *f = (*fs)[fs->find_font_idx (chr[i])];
204 fname[i] = rxvt_utf8towcs (f->name);
202 int width = wcswidth (fname, wcslen (fname)); 205 max_it (width, wcswidth (fname[i], wcslen (fname[i])));
206 }
203 207
204 max_it (width, 8+5); // for char + hex 208 max_it (width, 8+5); // for char + hex
205 max_it (width, strlen (attr)); 209 max_it (width, strlen (attr));
206 210
207 if (y >= 0) 211 if (y >= 0)
208 { 212 {
209 y = (y >= nrow - len - 4 && x < width + 2) ? 0 : -1; 213 y = (y >= nrow - len - 4 && x < width + 2) ? 0 : -1;
210 x = 0; 214 x = 0;
211 } 215 }
212 216
213 scr_overlay_new (x, y, width, len + 2); 217 scr_overlay_new (x, y, width, len * 2 + 1);
214 218
215 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r)); 219 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r));
216 220
217 for (int y = 0; y < len; y++) 221 for (int y = 0; y < len; y++)
218 { 222 {
… …
237// char buf[4+4+3+1]; 241// char buf[4+4+3+1];
238// snprintf (buf, sizeof (buf), "(%.4d|%.4d)", x, y); 242// snprintf (buf, sizeof (buf), "(%.4d|%.4d)", x, y);
239// scr_overlay_set (0, 0, buf); 243// scr_overlay_set (0, 0, buf);
240// } 244// }
241 scr_overlay_set (0, len , attr); 245 scr_overlay_set (0, len , attr);
246 for (int i = 0; i < len; i++)
247 {
242 scr_overlay_set (0, len + 1, fname); 248 scr_overlay_set (0, len + 1 + i, fname[i]);
243
244 free (fname); 249 free (fname[i]);
250 }
245 251
246# if ENABLE_COMBINING 252# if ENABLE_COMBINING
247 if (alloc) 253 if (alloc)
248 delete [] alloc; 254 delete [] alloc;
249# endif 255# endif
… …
282} 288}
283 289
284static int 290static int
285hex_keyval (XKeyEvent &ev) 291hex_keyval (XKeyEvent &ev)
286{ 292{
287 // check wether this event corresponds to a hex digit 293 // check whether this event corresponds to a hex digit
288 // if the modifiers had not been pressed. 294 // if the modifiers had not been pressed.
289 for (int index = 0; index < 8; index++) 295 for (int index = 0; index < 8; index++)
290 { 296 {
291 KeySym k = XLookupKeysym (&ev, index); 297 KeySym k = XLookupKeysym (&ev, index);
292 298
… …
416 */ 422 */
417 shft = ev.state & ShiftMask; 423 shft = ev.state & ShiftMask;
418 ctrl = ev.state & ControlMask; 424 ctrl = ev.state & ControlMask;
419 meta = ev.state & ModMetaMask; 425 meta = ev.state & ModMetaMask;
420 426
421 if (numlock_state || (ev.state & ModNumLockMask))
422 {
423 numlock_state = (ev.state & ModNumLockMask);
424 set_privmode (PrivMode_aplKP, !numlock_state);
425 }
426
427 kbuf[0] = 0; 427 kbuf[0] = 0;
428 428
429#ifdef USE_XIM 429#ifdef USE_XIM
430 if (Input_Context) 430 if (Input_Context)
431 { 431 {
… …
505#ifdef PAGING_CONTEXT_LINES 505#ifdef PAGING_CONTEXT_LINES
506 lnsppg = nrow - PAGING_CONTEXT_LINES; 506 lnsppg = nrow - PAGING_CONTEXT_LINES;
507#else 507#else
508 lnsppg = nrow * 4 / 5; 508 lnsppg = nrow * 4 / 5;
509#endif 509#endif
510 max_it (lnsppg, 1);
511
510 if (keysym == XK_Prior) 512 if (keysym == XK_Prior)
511 { 513 {
512 scr_page (UP, lnsppg); 514 scr_page (UP, lnsppg);
513 return; 515 return;
514 } 516 }
… …
579 } 581 }
580 } 582 }
581 583
582#if ENABLE_FRILLS || ISO_14755 584#if ENABLE_FRILLS || ISO_14755
583 // ISO 14755 support 585 // ISO 14755 support
584 if (shft && ctrl) 586 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_51))
585 { 587 {
586 int hv; 588 int hv;
587 589
588 if (iso14755buf & ISO_14755_51 590 if (iso14755buf & ISO_14755_51
589 && (keysym == XK_space || keysym == XK_KP_Space 591 && (keysym == XK_space || keysym == XK_KP_Space
… …
619 scr_overlay_off (); 621 scr_overlay_off ();
620# endif 622# endif
621 iso14755buf = 0; 623 iso14755buf = 0;
622 } 624 }
623 } 625 }
626 else if (option (Opt_iso14755) &&
624 else if ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R)) 627 ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R))
625 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R))) 628 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R))))
626 if (!(iso14755buf & ISO_14755_STARTED)) 629 if (!(iso14755buf & ISO_14755_STARTED))
627 { 630 {
628 iso14755buf |= ISO_14755_STARTED; 631 iso14755buf |= ISO_14755_STARTED;
629# if ISO_14755 632# if ISO_14755
630 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1); 633 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1);
… …
644 if (keysym >= 0xFF00 && keysym <= 0xFFFF) 647 if (keysym >= 0xFF00 && keysym <= 0xFFFF)
645 { 648 {
646 bool kp = priv_modes & PrivMode_aplKP ? !shft : shft; 649 bool kp = priv_modes & PrivMode_aplKP ? !shft : shft;
647 unsigned int newlen = 1; 650 unsigned int newlen = 1;
648 651
652 if (ev.state & ModNumLockMask)
653 kp = false;
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 ;
1440
1441#ifdef HAVE_BG_PIXMAP
1442 bool moved = false;
1443 if (bgPixmap.window_position_sensitive ())
1444 {
1445 int x, y;
1446 if (ev.xconfigure.send_event)
1447 {
1448 x = ev.xconfigure.x;
1449 y = ev.xconfigure.y;
1450 }
1451 else
1452 get_window_origin (x, y);
1453
1454 if (bgPixmap.set_position (x, y)
1455 || (bgPixmap.flags & bgPixmap_t::isInvalid))
1456 moved = true;
1457 }
1458#endif
1434 1459
1435 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1460 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1436 { 1461 {
1437 seen_resize = 1; 1462 seen_resize = 1;
1438 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1463 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1439 } 1464 }
1440 else 1465 else
1441 { 1466 {
1442#ifdef HAVE_BG_PIXMAP 1467#ifdef HAVE_BG_PIXMAP
1443 if (bgPixmap.window_position_sensitive ()) 1468 if (moved)
1444 { 1469 {
1445 if (mapped) 1470 if (mapped)
1446 update_background (); 1471 update_background ();
1447 else 1472 else
1448 bgPixmap.invalidate (); 1473 bgPixmap.invalidate ();
… …
1461 selection_property (ev.xproperty.window, ev.xproperty.atom); 1486 selection_property (ev.xproperty.window, ev.xproperty.atom);
1462 1487
1463 break; 1488 break;
1464 1489
1465 case SelectionClear: 1490 case SelectionClear:
1466 selection_clear (); 1491 selection_clear (ev.xselectionclear.selection == xa[XA_CLIPBOARD]);
1467 break; 1492 break;
1468 1493
1469 case SelectionNotify: 1494 case SelectionNotify:
1470 if (selection_wait == Sel_normal) 1495 if (selection_wait == Sel_normal)
1471 selection_paste (ev.xselection.requestor, ev.xselection.property, true); 1496 selection_paste (ev.xselection.requestor, ev.xselection.property, true);
… …
1475 selection_send (ev.xselectionrequest); 1500 selection_send (ev.xselectionrequest);
1476 break; 1501 break;
1477 1502
1478 case MapNotify: 1503 case MapNotify:
1479#ifdef HAVE_BG_PIXMAP 1504#ifdef HAVE_BG_PIXMAP
1480 /* This is needed spcifically to fix the case of no window manager or a 1505 /* 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 1506 * non-reparenting window manager. In those cases we never get first
1482 * ConfigureNotify. Also that speeds startup under normal WM, by taking 1507 * ConfigureNotify. Also that speeds startup under normal WM, by taking
1483 * care of multiplicity of ConfigureNotify events arriwing while WM does 1508 * care of multiplicity of ConfigureNotify events arriving while WM does
1484 * reparenting. 1509 * reparenting.
1485 * We should not render background immidiately, as there could be several 1510 * 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 1511 * 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 1512 * by scheduling background redraw as soon as we can, but giving a short
1488 * bit of time for ConfigureNotifies to arrive. 1513 * bit of time for ConfigureNotifies to arrive.
1489 * We should render background PRIOR to drawing any text, but AFTER all 1514 * We should render background PRIOR to drawing any text, but AFTER all
1490 * of ConfigureNotifys for the best results. 1515 * of ConfigureNotifys for the best results.
… …
1684#endif 1709#endif
1685 1710
1686 refresh_check (); 1711 refresh_check ();
1687} 1712}
1688 1713
1714#if ENABLE_FRILLS
1689void 1715void
1690rxvt_term::set_urgency (bool enable) 1716rxvt_term::set_urgency (bool enable)
1691{ 1717{
1692 if (enable == urgency_hint) 1718 if (enable == urgency_hint)
1693 return; 1719 return;
… …
1697 h->flags = h->flags & ~XUrgencyHint | (enable ? XUrgencyHint : 0); 1723 h->flags = h->flags & ~XUrgencyHint | (enable ? XUrgencyHint : 0);
1698 XSetWMHints (dpy, parent[0], h); 1724 XSetWMHints (dpy, parent[0], h);
1699 urgency_hint = enable; 1725 urgency_hint = enable;
1700 } 1726 }
1701} 1727}
1728#endif
1702 1729
1703void 1730void
1704rxvt_term::focus_in () 1731rxvt_term::focus_in ()
1705{ 1732{
1706 if (!focus) 1733 if (!focus)
… …
1859 /* save the xbutton state (for ButtonRelease) */ 1886 /* save the xbutton state (for ButtonRelease) */
1860 MEvent.state = ev.state; 1887 MEvent.state = ev.state;
1861#ifdef MOUSE_REPORT_DOUBLECLICK 1888#ifdef MOUSE_REPORT_DOUBLECLICK
1862 if (ev.button == MEvent.button && clickintime) 1889 if (ev.button == MEvent.button && clickintime)
1863 { 1890 {
1864 /* same button, within alloted time */ 1891 /* same button, within allowed time */
1865 MEvent.clicks++; 1892 MEvent.clicks++;
1866 1893
1867 if (MEvent.clicks > 1) 1894 if (MEvent.clicks > 1)
1868 { 1895 {
1869 /* only report double clicks */ 1896 /* only report double clicks */
… …
2140 selection_make (ev.time); 2167 selection_make (ev.time);
2141 break; 2168 break;
2142 2169
2143 case Button2: 2170 case Button2:
2144 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window? 2171 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); 2172 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2146 break; 2173 break;
2147 2174
2148#ifdef MOUSE_WHEEL 2175#ifdef MOUSE_WHEEL
2149 case Button4: 2176 case Button4:
2150 case Button5: 2177 case Button5:
… …
2334 break; 2361 break;
2335 } 2362 }
2336 2363
2337 if (len == (size_t)-1) 2364 if (len == (size_t)-1)
2338 { 2365 {
2339 mbrtowc (0, 0, 0, mbstate); // reset now undefined conversion state 2366 mbstate.reset (); // reset now undefined conversion state
2340 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 2367 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2341 } 2368 }
2342 2369
2343 // assume wchar == unicode 2370 // assume wchar == unicode
2344 cmdbuf_ptr += len; 2371 cmdbuf_ptr += len;
… …
3221 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 3248 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
3222 */ 3249 */
3223void 3250void
3224rxvt_term::process_dcs_seq () 3251rxvt_term::process_dcs_seq ()
3225{ 3252{
3226 char *s;
3227 unicode_t eh;
3228
3229 /* 3253 /*
3230 * Not handled yet 3254 * Not handled yet
3231 */ 3255 */
3256
3257 unicode_t eh;
3232 s = get_to_st (eh); 3258 char *s = get_to_st (eh);
3233 if (s) 3259 if (s)
3234 free (s); 3260 free (s);
3235 3261
3236 return; 3262 return;
3237} 3263}
… …
3241 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)' 3267 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)'
3242 */ 3268 */
3243void 3269void
3244rxvt_term::process_osc_seq () 3270rxvt_term::process_osc_seq ()
3245{ 3271{
3246 unicode_t ch, eh;
3247 int arg; 3272 int arg;
3248 3273
3249 ch = cmd_getc (); 3274 unicode_t ch = cmd_getc ();
3250 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3275 for (arg = 0; isdigit (ch); ch = cmd_getc ())
3251 arg = arg * 10 + (ch - '0'); 3276 arg = arg * 10 + (ch - '0');
3252 3277
3253 if (ch == ';') 3278 if (ch == ';')
3254 { 3279 {
3280 unicode_t eh;
3255 char *s = get_to_st (eh); 3281 char *s = get_to_st (eh);
3256 3282
3257 if (s) 3283 if (s)
3258 { 3284 {
3259 process_xterm_seq (arg, s, eh); 3285 process_xterm_seq (arg, s, eh);
… …
3283 3309
3284/* 3310/*
3285 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3311 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3286 */ 3312 */
3287void 3313void
3288rxvt_term::process_xterm_seq (int op, const char *str, char resp) 3314rxvt_term::process_xterm_seq (int op, char *str, char resp)
3289{ 3315{
3290 int color; 3316 int color;
3291 char *buf, *name; 3317 char *buf, *name;
3292 bool query = str[0] == '?' && !str[1]; 3318 bool query = str[0] == '?' && !str[1];
3293 int saveop = op; 3319 int saveop = op;
… …
3334 3360
3335 XFree (value); 3361 XFree (value);
3336 } 3362 }
3337 else 3363 else
3338 { 3364 {
3339 char *eq = strchr (str, '='); // constness lost, but verified to be ok 3365 char *eq = strchr (str, '=');
3340 3366
3341 if (eq) 3367 if (eq)
3342 { 3368 {
3343 *eq = 0; 3369 *eq = 0;
3344 set_utf8_property (display->atom (str), eq + 1); 3370 set_utf8_property (display->atom (str), eq + 1);
… …
3384 process_color_seq (op, Color_pointer_fg, str, resp); 3410 process_color_seq (op, Color_pointer_fg, str, resp);
3385 break; 3411 break;
3386 case XTerm_Color_pointer_bg: 3412 case XTerm_Color_pointer_bg:
3387 process_color_seq (op, Color_pointer_bg, str, resp); 3413 process_color_seq (op, Color_pointer_bg, str, resp);
3388 break; 3414 break;
3415#ifdef OPTION_HC
3416 case XTerm_Color_HC:
3417 process_color_seq (op, Color_HC, str, resp);
3418 break;
3419 case XTerm_Color_HTC:
3420 process_color_seq (op, Color_HTC, str, resp);
3421 break;
3422#endif
3389#ifndef NO_BOLD_UNDERLINE_REVERSE 3423#ifndef NO_BOLD_UNDERLINE_REVERSE
3390 case XTerm_Color_RV:
3391 process_color_seq (op, Color_RV, str, resp);
3392 break;
3393 case Rxvt_Color_BD:
3394 case URxvt_Color_BD: 3424 case URxvt_Color_BD:
3395 process_color_seq (op, Color_BD, str, resp); 3425 process_color_seq (op, Color_BD, str, resp);
3396 break; 3426 break;
3397 case Rxvt_Color_UL:
3398 case URxvt_Color_UL: 3427 case URxvt_Color_UL:
3399 process_color_seq (op, Color_UL, str, resp); 3428 process_color_seq (op, Color_UL, str, resp);
3400 break; 3429 break;
3401 case URxvt_Color_IT: 3430 case URxvt_Color_IT:
3402 process_color_seq (op, Color_IT, str, resp); 3431 process_color_seq (op, Color_IT, str, resp);
3403 break; 3432 break;
3404#endif 3433#endif
3434 case URxvt_Color_border:
3435 process_color_seq (op, Color_border, str, resp);
3436 break;
3405#if ENABLE_TRANSPARENCY 3437#if ENABLE_TRANSPARENCY
3406 case URxvt_Color_tint: 3438 case URxvt_Color_tint:
3407 process_color_seq (op, Color_tint, str, resp); 3439 process_color_seq (op, Color_tint, str, resp);
3408 { 3440 {
3409 bool changed = false; 3441 bool changed = false;
… …
3424 case Rxvt_Pixmap: 3456 case Rxvt_Pixmap:
3425 if (!strcmp (str, "?")) 3457 if (!strcmp (str, "?"))
3426 { 3458 {
3427 char str[256]; 3459 char str[256];
3428 3460
3429 sprintf (str, "[%dx%d+%d+%d]", /* can't presume snprintf () ! */ 3461 sprintf (str, "[%dx%d+%d+%d]",
3430 min (bgPixmap.h_scale, 32767), min (bgPixmap.v_scale, 32767), 3462 min (bgPixmap.h_scale, 32767), min (bgPixmap.v_scale, 32767),
3431 min (bgPixmap.h_align, 32767), min (bgPixmap.v_align, 32767)); 3463 min (bgPixmap.h_align, 32767), min (bgPixmap.v_align, 32767));
3432 process_xterm_seq (XTerm_title, str, CHAR_ST); 3464 process_xterm_seq (XTerm_title, str, CHAR_ST);
3433 } 3465 }
3434 else 3466 else
3435 { 3467 {
3436 int changed = 0; 3468 int changed = 0;
3437 3469
3438 if (*str != ';') 3470 if (*str != ';')
3439 { 3471 {
3440 /* reset to default scaling :*/
3441 bgPixmap.unset_geometry ();
3442 if (bgPixmap.set_file (str)) /* change pixmap */ 3472 if (bgPixmap.set_file (str)) /* change pixmap */
3473 {
3443 changed++; 3474 changed++;
3444 str = strchr (str, ';'); 3475 str = strchr (str, ';');
3445 if (str == NULL) 3476 if (str == NULL)
3446 bgPixmap.set_defaultGeometry (); 3477 bgPixmap.set_defaultGeometry ();
3478 else
3479 bgPixmap.set_geometry (str+1);
3480 }
3447 } 3481 }
3448 3482 else
3449 while (str)
3450 { 3483 {
3451 str++; 3484 str++;
3452 if (bgPixmap.set_geometry (str)) 3485 if (bgPixmap.set_geometry (str, true))
3453 changed++; 3486 changed++;
3454 str = strchr (str, ';');
3455 } 3487 }
3456 3488
3457 if (changed) 3489 if (changed)
3490 {
3491 if (bgPixmap.window_position_sensitive ())
3492 {
3493 int x, y;
3494 get_window_origin (x, y);
3495 bgPixmap.set_position (x, y);
3496 }
3458 update_background (); 3497 update_background ();
3498 }
3459 } 3499 }
3460 break; 3500 break;
3461#endif 3501#endif
3462 3502
3463 case XTerm_logfile: 3503 case XTerm_logfile:
… …
3566 { 3606 {
3567 if (mode == 'r') 3607 if (mode == 'r')
3568 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 3608 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3569 else 3609 else
3570 state = (mode == 't') ? ! (priv_modes & bit) : mode; 3610 state = (mode == 't') ? ! (priv_modes & bit) : mode;
3611
3571 set_privmode (bit, state); 3612 set_privmode (bit, state);
3572 } 3613 }
3573 3614
3574 return state; 3615 return state;
3575} 3616}
… …
3594 { 6, PrivMode_relOrigin }, // DECOM 3635 { 6, PrivMode_relOrigin }, // DECOM
3595 { 7, PrivMode_Autowrap }, // DECAWM 3636 { 7, PrivMode_Autowrap }, // DECAWM
3596 // 8, auto-repeat keys // DECARM 3637 // 8, auto-repeat keys // DECARM
3597 { 9, PrivMode_MouseX10 }, 3638 { 9, PrivMode_MouseX10 },
3598 // 18 end FF to printer after print screen 3639 // 18 end FF to printer after print screen
3599 // 19 Print screen prints full screen/scorll region 3640 // 19 Print screen prints full screen/scroll region
3600 { 25, PrivMode_VisibleCursor }, // cnorm/cvvis/civis 3641 { 25, PrivMode_VisibleCursor }, // cnorm/cvvis/civis
3601#ifdef scrollBar_esc 3642#ifdef scrollBar_esc
3602 { scrollBar_esc, PrivMode_scrollBar }, 3643 { scrollBar_esc, PrivMode_scrollBar },
3603#endif 3644#endif
3604 { 35, PrivMode_ShiftKeys }, // rxvt extension 3645 { 35, PrivMode_ShiftKeys }, // rxvt extension
… …
3657 3698
3658 scr_touch (true); 3699 scr_touch (true);
3659 break; 3700 break;
3660#endif 3701#endif
3661 case 1048: /* alternative cursor save */ 3702 case 1048: /* alternative cursor save */
3662 case 1049:
3663 if (option (Opt_secondaryScreen)) 3703 if (option (Opt_secondaryScreen))
3664 if (mode == 0) 3704 if (mode == 0)
3665 scr_cursor (RESTORE); 3705 scr_cursor (RESTORE);
3666 else if (mode == 1) 3706 else if (mode == 1)
3667 scr_cursor (SAVE); 3707 scr_cursor (SAVE);
… …
3743 case 1011: /* scroll to bottom on key press */ 3783 case 1011: /* scroll to bottom on key press */
3744 set_option (Opt_scrollTtyKeypress, state); 3784 set_option (Opt_scrollTtyKeypress, state);
3745 break; 3785 break;
3746 case 1047: /* secondary screen w/ clearing last */ 3786 case 1047: /* secondary screen w/ clearing last */
3747 if (option (Opt_secondaryScreen)) 3787 if (option (Opt_secondaryScreen))
3748 if (current_screen != PRIMARY) 3788 if (!state)
3749 scr_erase_screen (2); 3789 scr_erase_screen (2);
3750 3790
3751 scr_change_screen (state); 3791 scr_change_screen (state);
3752 break; 3792 break;
3753 case 1049: /* secondary screen w/ clearing first */ 3793 case 1049: /* secondary screen w/ clearing first */
3794 if (option (Opt_secondaryScreen))
3795 if (state)
3796 scr_cursor (SAVE);
3797
3754 scr_change_screen (state); 3798 scr_change_screen (state);
3799
3755 if (option (Opt_secondaryScreen)) 3800 if (option (Opt_secondaryScreen))
3756 if (current_screen != PRIMARY) 3801 if (state)
3757 scr_erase_screen (2); 3802 scr_erase_screen (2);
3803 else
3804 scr_cursor (RESTORE);
3758 break; 3805 break;
3759 default: 3806 default:
3760 break; 3807 break;
3761 } 3808 }
3762 } 3809 }

Diff Legend

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