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.472 by sf-exg, Sun Jan 23 12:28:47 2011 UTC vs.
Revision 1.473 by sf-exg, Thu Jan 27 17:37:19 2011 UTC

… …
975rxvt_term::flush () 975rxvt_term::flush ()
976{ 976{
977 flush_ev.stop (); 977 flush_ev.stop ();
978 978
979#ifdef HAVE_BG_PIXMAP 979#ifdef HAVE_BG_PIXMAP
980 if (bgPixmap.flags & bgPixmap_t::hasChanged) 980 if (bg_flags & hasChanged)
981 { 981 {
982 bgPixmap.flags &= ~bgPixmap_t::hasChanged; 982 bg_flags &= ~hasChanged;
983 scr_touch (false); 983 scr_touch (false);
984 } 984 }
985#endif 985#endif
986 986
987 if (want_refresh) 987 if (want_refresh)
… …
1452 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev)) 1452 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1453 ; 1453 ;
1454 1454
1455#ifdef HAVE_BG_PIXMAP 1455#ifdef HAVE_BG_PIXMAP
1456 bool moved = false; 1456 bool moved = false;
1457 if (bgPixmap.window_position_sensitive ()) 1457 if (bg_window_position_sensitive ())
1458 { 1458 {
1459 int x, y; 1459 int x, y;
1460 if (ev.xconfigure.send_event) 1460 if (ev.xconfigure.send_event)
1461 { 1461 {
1462 x = ev.xconfigure.x; 1462 x = ev.xconfigure.x;
1463 y = ev.xconfigure.y; 1463 y = ev.xconfigure.y;
1464 } 1464 }
1465 else 1465 else
1466 get_window_origin (x, y); 1466 get_window_origin (x, y);
1467 1467
1468 if (bgPixmap.set_position (x, y) 1468 if (bg_set_position (x, y)
1469 || !(bgPixmap.flags & bgPixmap_t::isValid)) 1469 || !(bg_flags & isValid))
1470 moved = true; 1470 moved = true;
1471 } 1471 }
1472#endif 1472#endif
1473 1473
1474 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1474 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
… …
1482 if (moved) 1482 if (moved)
1483 { 1483 {
1484 if (mapped) 1484 if (mapped)
1485 update_background (); 1485 update_background ();
1486 else 1486 else
1487 bgPixmap.invalidate (); 1487 bg_invalidate ();
1488 } 1488 }
1489#endif 1489#endif
1490 } 1490 }
1491 1491
1492 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END)); 1492 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
… …
1526 * by scheduling background redraw as soon as we can, but giving a short 1526 * by scheduling background redraw as soon as we can, but giving a short
1527 * bit of time for ConfigureNotifies to arrive. 1527 * bit of time for ConfigureNotifies to arrive.
1528 * We should render background PRIOR to drawing any text, but AFTER all 1528 * We should render background PRIOR to drawing any text, but AFTER all
1529 * of ConfigureNotifys for the best results. 1529 * of ConfigureNotifys for the best results.
1530 */ 1530 */
1531 if (!(bgPixmap.flags & bgPixmap_t::isValid)) 1531 if (!(bg_flags & isValid))
1532 update_background_ev.start (0.025); 1532 update_background_ev.start (0.025);
1533#endif 1533#endif
1534 mapped = 1; 1534 mapped = 1;
1535#ifdef TEXT_BLINK 1535#ifdef TEXT_BLINK
1536 text_blink_ev.start (); 1536 text_blink_ev.start ();
… …
1851 * use the property to determine the pixmap. We use it later on. 1851 * use the property to determine the pixmap. We use it later on.
1852 */ 1852 */
1853 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID] 1853 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1854 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID]) 1854 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1855 { 1855 {
1856 bgPixmap.set_root_pixmap (); 1856 bg_set_root_pixmap ();
1857 update_background (); 1857 update_background ();
1858 } 1858 }
1859 1859
1860 break; 1860 break;
1861 } 1861 }
… …
3453 process_color_seq (op, Color_tint, str, resp); 3453 process_color_seq (op, Color_tint, str, resp);
3454 { 3454 {
3455 bool changed = false; 3455 bool changed = false;
3456 3456
3457 if (ISSET_PIXCOLOR (Color_tint)) 3457 if (ISSET_PIXCOLOR (Color_tint))
3458 changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]); 3458 changed = bg_set_tint (pix_colors_focused [Color_tint]);
3459 3459
3460 if (changed) 3460 if (changed)
3461 update_background (); 3461 update_background ();
3462 } 3462 }
3463 3463
… …
3469 if (!strcmp (str, "?")) 3469 if (!strcmp (str, "?"))
3470 { 3470 {
3471 char str[256]; 3471 char str[256];
3472 3472
3473 sprintf (str, "[%dx%d+%d+%d]", 3473 sprintf (str, "[%dx%d+%d+%d]",
3474 min (bgPixmap.h_scale, 32767), min (bgPixmap.v_scale, 32767), 3474 min (h_scale, 32767), min (v_scale, 32767),
3475 min (bgPixmap.h_align, 32767), min (bgPixmap.v_align, 32767)); 3475 min (h_align, 32767), min (v_align, 32767));
3476 process_xterm_seq (XTerm_title, str, CHAR_ST); 3476 process_xterm_seq (XTerm_title, str, CHAR_ST);
3477 } 3477 }
3478 else 3478 else
3479 { 3479 {
3480 int changed = 0; 3480 int changed = 0;
3481 3481
3482 if (*str != ';') 3482 if (*str != ';')
3483 { 3483 {
3484 if (bgPixmap.set_file (str)) /* change pixmap */ 3484 if (bg_set_file (str)) /* change pixmap */
3485 { 3485 {
3486 changed++; 3486 changed++;
3487 str = strchr (str, ';'); 3487 str = strchr (str, ';');
3488 if (str == NULL) 3488 if (str == NULL)
3489 bgPixmap.set_defaultGeometry (); 3489 bg_set_default_geometry ();
3490 else 3490 else
3491 bgPixmap.set_geometry (str+1); 3491 bg_set_geometry (str+1);
3492 } 3492 }
3493 } 3493 }
3494 else 3494 else
3495 { 3495 {
3496 str++; 3496 str++;
3497 if (bgPixmap.set_geometry (str, true)) 3497 if (bg_set_geometry (str, true))
3498 changed++; 3498 changed++;
3499 } 3499 }
3500 3500
3501 if (changed) 3501 if (changed)
3502 { 3502 {
3503 if (bgPixmap.window_position_sensitive ()) 3503 if (bg_window_position_sensitive ())
3504 { 3504 {
3505 int x, y; 3505 int x, y;
3506 get_window_origin (x, y); 3506 get_window_origin (x, y);
3507 bgPixmap.set_position (x, y); 3507 bg_set_position (x, y);
3508 } 3508 }
3509 update_background (); 3509 update_background ();
3510 } 3510 }
3511 } 3511 }
3512 break; 3512 break;

Diff Legend

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