--- rxvt-unicode/src/main.C 2007/12/16 19:44:48 1.286 +++ rxvt-unicode/src/main.C 2008/01/25 16:04:57 1.302 @@ -13,7 +13,7 @@ * Copyright (c) 1997,1998 Oezguer Kesim * Copyright (c) 1998-2001 Geoff Wing * - extensive modifications - * Copyright (c) 2003-2007 Marc Lehmann + * Copyright (c) 2003-2008 Marc Lehmann * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -172,7 +172,7 @@ slip_wheel_ev.set (this); #endif #if ENABLE_TRANSPARENCY || ENABLE_PERL - rootwin_ev.set (this), + rootwin_ev.set (this), #endif #ifdef HAVE_SCROLLBARS scrollbar_ev.set (this), @@ -228,6 +228,10 @@ #endif delete fontset[0]; +#ifdef HAVE_BG_PIXMAP + bgPixmap.destroy (); +#endif + if (display) { selection_clear (); @@ -276,18 +280,10 @@ } clear (); - } - delete [] pix_colors_focused; -#if OFF_FOCUS_FADING - delete [] pix_colors_unfocused; -#endif - -#ifdef HAVE_BG_PIXMAP - bgPixmap.destroy (); -#endif - display->flush (); /* ideally .put should do this */ - displays.put (display); + display->flush (); /* ideally .put should do this */ + displays.put (display); + } scr_release (); @@ -474,120 +470,6 @@ _exit (EXIT_FAILURE); } -/*----------------------------------------------------------------------*/ -void -rxvt_term::init (int argc, const char *const *argv, stringvec *envv) -{ - this->envv = envv; - - SET_R (this); - set_locale (""); - set_environ (envv); // few things in X do not call setlocale :( - - init_vars (); - - init_secondary (); - - const char **cmd_argv = init_resources (argc, argv); - -#ifdef KEYSYM_RESOURCE - keyboard->register_done (); -#endif - -#ifdef HAVE_SCROLLBARS - if (option (Opt_scrollBar)) - scrollBar.setIdle (); /* set existence for size calculations */ -#endif - - pty = ptytty::create (); - - create_windows (argc, argv); - - init_xlocale (); - - scr_reset (); // initialize screen - -#if 0 - XSynchronize (dpy, True); -#endif - -#ifdef HAVE_SCROLLBARS - if (option (Opt_scrollBar)) - resize_scrollbar (); /* create and map scrollbar */ -#endif -#ifdef HAVE_BG_PIXMAP - { - bgPixmap.set_target (this); - -#ifdef ENABLE_TRANSPARENCY - if (option (Opt_transparent)) - { - bgPixmap.set_transparent (); -#ifdef HAVE_AFTERIMAGE - if (rs [Rs_blurradius]) - bgPixmap.set_blur_radius (rs [Rs_blurradius]); -#endif - if (ISSET_PIXCOLOR (Color_tint)) - bgPixmap.set_tint (pix_colors_focused [Color_tint]); - if (rs [Rs_shade]) - bgPixmap.set_shade (rs [Rs_shade]); - - bgPixmap.set_root_pixmap (); - XSelectInput (dpy, display->root, PropertyChangeMask); - rootwin_ev.start (display, display->root); - } -#endif - -#ifdef BG_IMAGE_FROM_FILE - if (rs[Rs_backgroundPixmap] != NULL) - { - const char *p = rs[Rs_backgroundPixmap]; - - if ((p = strchr (p, ';')) != NULL) - { - p++; - bgPixmap.set_geometry (p); - } - else - bgPixmap.set_defaultGeometry (); - - if (bgPixmap.set_file (rs[Rs_backgroundPixmap])) - if (!bgPixmap.window_position_sensitive ()) - update_background (); - } -#endif - } -#endif - -#if ENABLE_PERL - rootwin_ev.start (display, display->root); -#endif - - set_colorfgbg (); - - init_command (cmd_argv); - - free (cmd_argv); - - if (pty->pty >= 0) - pty_ev.start (pty->pty, ev::READ); - - HOOK_INVOKE ((this, HOOK_START, DT_END)); - -#if ENABLE_XEMBED - if (rs[Rs_embed]) - { - long info[2] = { 0, XEMBED_MAPPED }; - - XChangeProperty (dpy, parent[0], xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO], - 32, PropModeReplace, (unsigned char *)&info, 2); - } -#endif - - XMapWindow (dpy, vt); - XMapWindow (dpy, parent[0]); -} - static struct sig_handlers { ev::sig sw_term, sw_int; @@ -640,42 +522,6 @@ XrmInitialize (); } -/* ------------------------------------------------------------------------- * - * MEMORY ALLOCATION WRAPPERS * - * ------------------------------------------------------------------------- */ -void * -rxvt_malloc (size_t size) -{ - void *p = malloc (size); - - if (!p) - rxvt_fatal ("memory allocation failure. aborting.\n"); - - return p; -} - -void * -rxvt_calloc (size_t number, size_t size) -{ - void *p = calloc (number, size); - - if (!p) - rxvt_fatal ("memory allocation failure. aborting.\n"); - - return p; -} - -void * -rxvt_realloc (void *ptr, size_t size) -{ - void *p = realloc (ptr, size); - - if (!p) - rxvt_fatal ("memory allocation failure. aborting.\n"); - - return p; -} - /*----------------------------------------------------------------------*/ /* * window size/position calculations for XSizeHint and other storage. @@ -1715,7 +1561,7 @@ { Window cr; XTranslateCoordinates (dpy, parent[0], display->root, 0, 0, &x, &y, &cr); -/* fprintf( stderr, "origin is %+d%+d\n", x, y);*/ +/* fprintf (stderr, "origin is %+d%+d\n", x, y);*/ } Pixmap @@ -1732,50 +1578,45 @@ 0L, 1L, False, XA_PIXMAP, &atype, &aformat, &nitems, &bytes_after, &prop); if (result == Success && prop && atype == XA_PIXMAP) - { - return *(Pixmap *)prop; - } + return *(Pixmap *)prop; } + return None; } #ifdef HAVE_BG_PIXMAP # if TRACE_PIXMAPS # undef update_background -int rxvt_term::trace_update_background (const char *file, int line) +void +rxvt_term::trace_update_background (const char *file, int line) { fprintf (stderr, "%s:%d:update_background()\n", file, line); update_background (); } # endif -int +void rxvt_term::update_background () { + if (update_background_ev.is_active ()) + return; + bgPixmap.invalidate (); - /* no chance of real time refresh if we are blurring! */ - if (bgPixmap.invalid_since + 0.5 < ev::now () && !(bgPixmap.flags & bgPixmap_t::blurNeeded)) + ev_tstamp to_wait = 0.5 - (ev::now () - bgPixmap.valid_since); + + if (to_wait <= 0.) bgPixmap.render (); else - { - update_background_ev.stop (); - - if (!bgPixmap.need_client_side_rendering ()) - update_background_ev.start (.05); - else if (bgPixmap.flags & bgPixmap_t::blurNeeded) - update_background_ev.start (.20); /* very slow !!! */ - else - update_background_ev.start (.07); - } - - return 0; + update_background_ev.start (to_wait); } void rxvt_term::update_background_cb (ev::timer &w, int revents) { make_current (); + + update_background_ev.stop (); bgPixmap.render (); refresh_check (); }