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.519 by root, Thu Jun 7 11:27:08 2012 UTC vs.
Revision 1.528 by sf-exg, Sat Dec 29 15:59:51 2012 UTC

… …
4 * 4 *
5 * All portions of code are copyright by their respective author/s. 5 * All portions of code are copyright by their respective author/s.
6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk> 6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk>
7 * - original version 7 * - original version
8 * Copyright (c) 1994 Robert Nation <nation@rocket.sanders.lockheed.com> 8 * Copyright (c) 1994 Robert Nation <nation@rocket.sanders.lockheed.com>
9 * - extensive modifications 9 * - extensive modifications
10 * Copyright (c) 1995 Garrett D'Amore <garrett@netcom.com> 10 * Copyright (c) 1995 Garrett D'Amore <garrett@netcom.com>
11 * - vt100 printing 11 * - vt100 printing
12 * Copyright (c) 1995 Steven Hirsch <hirsch@emba.uvm.edu> 12 * Copyright (c) 1995 Steven Hirsch <hirsch@emba.uvm.edu>
13 * - X11 mouse report mode and support for 13 * - X11 mouse report mode and support for
14 * DEC "private mode" save/restore functions. 14 * DEC "private mode" save/restore functions.
… …
20 * Copyright (c) 1997 Raul Garcia Garcia <rgg@tid.es> 20 * Copyright (c) 1997 Raul Garcia Garcia <rgg@tid.es>
21 * - modification and cleanups for Solaris 2.x 21 * - modification and cleanups for Solaris 2.x
22 * and Linux 1.2.x 22 * and Linux 1.2.x
23 * Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de> 23 * Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de>
24 * Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com> 24 * Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com>
25 * - extensive modifications 25 * - extensive modifications
26 * Copyright (c) 1998 Alfredo K. Kojima <kojima@windowmaker.org> 26 * Copyright (c) 1998 Alfredo K. Kojima <kojima@windowmaker.org>
27 * Copyright (c) 2001 Marius Gedminas 27 * Copyright (c) 2001 Marius Gedminas
28 * - Ctrl/Mod4+Tab works like Meta+Tab (options) 28 * - Ctrl/Mod4+Tab works like Meta+Tab (options)
29 * Copyright (c) 2003 Rob McMullen <robm@flipturn.org> 29 * Copyright (c) 2003 Rob McMullen <robm@flipturn.org>
30 * Copyright (c) 2003-2011 Marc Lehmann <schmorp@schmorp.de> 30 * Copyright (c) 2003-2011 Marc Lehmann <schmorp@schmorp.de>
… …
941void 941void
942rxvt_term::flush () 942rxvt_term::flush ()
943{ 943{
944 flush_ev.stop (); 944 flush_ev.stop ();
945 945
946#ifdef HAVE_BG_PIXMAP 946#ifdef HAVE_IMG
947 if (bg_flags & BG_NEEDS_REFRESH) 947 if (bg_flags & BG_NEEDS_REFRESH)
948 { 948 {
949 bg_flags &= ~BG_NEEDS_REFRESH; 949 bg_flags &= ~BG_NEEDS_REFRESH;
950 scr_touch (false); 950 scr_touch (false);
951 } 951 }
… …
1467 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev)) 1467 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1468 ; 1468 ;
1469 1469
1470 bool want_position_change = SHOULD_INVOKE (HOOK_POSITION_CHANGE); 1470 bool want_position_change = SHOULD_INVOKE (HOOK_POSITION_CHANGE);
1471 1471
1472 bool moved = false;
1472#ifdef HAVE_BG_PIXMAP 1473#ifdef HAVE_BG_PIXMAP
1473 if (bg_window_position_sensitive ()) 1474 if (bg_window_position_sensitive ())
1475 {
1474 want_position_change = true; 1476 want_position_change = true;
1477 if (!(bg_flags & BG_IS_VALID))
1478 moved = true;
1479 }
1475#endif 1480#endif
1476
1477 bool moved = false;
1478 1481
1479 if (want_position_change) 1482 if (want_position_change)
1480 { 1483 {
1481 int x, y; 1484 int x, y;
1482 1485
… …
1491 if (x != parent_x || y != parent_y) 1494 if (x != parent_x || y != parent_y)
1492 { 1495 {
1493 parent_x = x; 1496 parent_x = x;
1494 parent_y = y; 1497 parent_y = y;
1495 HOOK_INVOKE ((this, HOOK_POSITION_CHANGE, DT_INT, x, DT_INT, y, DT_END)); 1498 HOOK_INVOKE ((this, HOOK_POSITION_CHANGE, DT_INT, x, DT_INT, y, DT_END));
1499 moved = true;
1496 } 1500 }
1497
1498 if (bg_set_position (x, y)
1499 || !(bg_flags & BG_IS_VALID))
1500 moved = true;
1501 } 1501 }
1502 1502
1503 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1503 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1504 { 1504 {
1505 seen_resize = 1; 1505 seen_resize = 1;
… …
1838 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c); 1838 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);
1839 } 1839 }
1840#endif 1840#endif
1841} 1841}
1842 1842
1843#if ENABLE_TRANSPARENCY || ENABLE_PERL 1843#if BG_IMAGE_FROM_ROOT || ENABLE_PERL
1844void ecb_hot 1844void ecb_hot
1845rxvt_term::rootwin_cb (XEvent &ev) 1845rxvt_term::rootwin_cb (XEvent &ev)
1846{ 1846{
1847 make_current (); 1847 make_current ();
1848 1848
… …
1858 * use the property to determine the pixmap. We use it later on. 1858 * use the property to determine the pixmap. We use it later on.
1859 */ 1859 */
1860 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID] 1860 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1861 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID]) 1861 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1862 { 1862 {
1863# if ENABLE_TRANSPARENCY 1863#if BG_IMAGE_FROM_ROOT
1864 bg_set_root_pixmap (); 1864 bg_set_root_pixmap ();
1865 update_background (); 1865 update_background ();
1866#endif 1866#endif
1867#if ENABLE_PERL 1867#if ENABLE_PERL
1868 HOOK_INVOKE ((this, HOOK_ROOTPMAP_CHANGE, DT_END)); 1868 HOOK_INVOKE ((this, HOOK_ROOTPMAP_CHANGE, DT_END));
… …
2387 } 2387 }
2388 2388
2389 if (len == (size_t)-1) 2389 if (len == (size_t)-1)
2390 { 2390 {
2391 mbstate.reset (); // reset now undefined conversion state 2391 mbstate.reset (); // reset now undefined conversion state
2392 // a -1 might indicate that a previous incomplete char is invalid (previous return -2)
2393 // in which case we "erroneously" return the next byte which might be valid.
2392 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 2394 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2393 } 2395 }
2394 2396
2395 // assume wchar == unicode 2397 // assume wchar == unicode
2396 cmdbuf_ptr += len; 2398 cmdbuf_ptr += len;
… …
3451 break; 3453 break;
3452#endif 3454#endif
3453 case URxvt_Color_border: 3455 case URxvt_Color_border:
3454 process_color_seq (op, Color_border, str, resp); 3456 process_color_seq (op, Color_border, str, resp);
3455 break; 3457 break;
3456#if ENABLE_TRANSPARENCY 3458
3459#if BG_IMAGE_FROM_ROOT
3457 case URxvt_Color_tint: 3460 case URxvt_Color_tint:
3458 process_color_seq (op, Color_tint, str, resp); 3461 process_color_seq (op, Color_tint, str, resp);
3459 { 3462 {
3460 bool changed = false; 3463 bool changed = false;
3461 3464
… …
3488 { 3491 {
3489 bool changed = false; 3492 bool changed = false;
3490 3493
3491 if (*str != ';') 3494 if (*str != ';')
3492 { 3495 {
3496 try
3497 {
3493 if (fimage.set_file_geometry (str)) 3498 fimage.set_file_geometry (this, str);
3494 changed = true; 3499 changed = true;
3500 }
3501 catch (const class rxvt_failure_exception &e)
3502 {
3503 }
3495 } 3504 }
3496 else 3505 else
3497 { 3506 {
3498 str++; 3507 str++;
3499 if (fimage.set_geometry (str, true)) 3508 if (fimage.set_geometry (str, true))
… …
3504 { 3513 {
3505 if (bg_window_position_sensitive ()) 3514 if (bg_window_position_sensitive ())
3506 { 3515 {
3507 int x, y; 3516 int x, y;
3508 get_window_origin (x, y); 3517 get_window_origin (x, y);
3509 bg_set_position (x, y); 3518 parent_x = x;
3519 parent_y = y;
3510 } 3520 }
3511 update_background (); 3521 update_background ();
3512 } 3522 }
3513 } 3523 }
3514 break; 3524 break;

Diff Legend

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