--- rxvt-unicode/src/rxvttoolkit.h 2006/02/18 14:14:43 1.24 +++ rxvt-unicode/src/rxvttoolkit.h 2008/01/26 10:15:20 1.44 @@ -1,6 +1,25 @@ -/* - * rxvttoolkit.h - provide toolkit-functionality for rxvt. - */ +/*----------------------------------------------------------------------* + * File: rxvttoolkit.h - provide toolkit-functionality for rxvt. + *----------------------------------------------------------------------* + * + * All portions of code are copyright by their respective author/s. + * Copyright (c) 2003-2006 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 + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + *----------------------------------------------------------------------*/ + #ifndef RXVT_TOOLKIT_H #define RXVT_TOOLKIT_H @@ -10,9 +29,8 @@ # include #endif -#include "iom.h" +#include "ev_cpp.h" -#include "rxvtlib.h" #include "rxvtutil.h" #include "callback.h" @@ -48,7 +66,7 @@ XA_WM_LOCALE_NAME, XA_XIM_SERVERS, #endif -#if TRANSPARENT +#if ENABLE_TRANSPARENCY XA_XROOTPMAP_ID, XA_ESETROOT_PMAP_ID, #endif @@ -57,7 +75,7 @@ XA_XEMBED_INFO, #endif #if !ENABLE_MINIMAL - // these are usually allocated by other subsystens, but we do it + // these are usually allocated by other subsystems, but we do it // here to avoid a server roundtrip. XA_SCREEN_RESOURCES, XA_XDCCC_LINEAR_RGB_CORRECTION, @@ -83,7 +101,31 @@ struct im_watcher; struct xevent_watcher; -struct refcounted { +template +struct event_vec : vector +{ + void erase_unordered (unsigned int pos) + { + watcher *w = (*this)[this->size () - 1]; + this->pop_back (); + + if (!this->empty ()) + if (((*this)[pos] = w)) // '=' is correct! + w->active = pos + 1; + } +}; + +struct rxvt_watcher +{ + int active; /* 0 == inactive, else index into respective vector */ + + bool is_active () { return active; } + + rxvt_watcher () : active (0) { } +}; + +struct refcounted +{ int referenced; char *id; @@ -94,7 +136,8 @@ }; template -struct refcache : vector { +struct refcache : vector +{ T *get (const char *id); void put (T *obj); void clear (); @@ -109,7 +152,8 @@ struct rxvt_screen; -struct rxvt_drawable { +struct rxvt_drawable +{ rxvt_screen *screen; Drawable drawable; operator Drawable() { return drawable; } @@ -135,7 +179,8 @@ ///////////////////////////////////////////////////////////////////////////// #ifdef USE_XIM -struct rxvt_xim : refcounted { +struct rxvt_xim : refcounted +{ void destroy (); rxvt_display *display; @@ -148,7 +193,8 @@ }; #endif -struct rxvt_screen { +struct rxvt_screen +{ rxvt_display *display; Display *dpy; int depth; @@ -166,14 +212,16 @@ #endif void set (rxvt_display *disp); - void set (rxvt_display *disp, int bitdepth); + void select_visual (int bitdepth); void clear (); }; -struct rxvt_display : refcounted { - io_manager_vec xw; +struct rxvt_display : refcounted +{ + event_vec xw; - io_watcher x_ev; void x_cb (io_watcher &w, short revents); + ev::idle flush_ev; void flush_cb (ev::idle &w, int revents); + ev::io x_ev ; void x_cb (ev::io &w, int revents); #ifdef USE_XIM refcache xims; @@ -189,9 +237,7 @@ Window root; rxvt_term *selection_owner; Atom xa[NUM_XA]; -#ifndef NO_SLOW_LINK_SUPPORT bool is_local; -#endif #ifdef POINTER_BLANK Cursor blank_cursor; #endif @@ -202,7 +248,11 @@ void ref_next (); ~rxvt_display (); - void flush (); + void flush () + { + flush_ev.start (); + } + Atom atom (const char *name); void set_selection_owner (rxvt_term *owner); @@ -219,16 +269,12 @@ }; #ifdef USE_XIM -struct im_watcher : watcher, callback0 { - template - im_watcher (O1 *object, void (O2::*method) ()) - : callback0 (object,method) - { } - +struct im_watcher : rxvt_watcher, callback { void start (rxvt_display *display) { display->reg (this); } + void stop (rxvt_display *display) { display->unreg (this); @@ -236,19 +282,16 @@ }; #endif -struct xevent_watcher : watcher, callback1 { +struct xevent_watcher : rxvt_watcher, callback +{ Window window; - template - xevent_watcher (O1 *object, void (O2::*method) (XEvent &)) - : callback1 (object,method) - { } - void start (rxvt_display *display, Window window) { this->window = window; display->reg (this); } + void stop (rxvt_display *display) { display->unreg (this); @@ -261,7 +304,8 @@ typedef unsigned long Pixel; -struct rgba { +struct rgba +{ unsigned short r, g, b, a; enum { MIN_CC = 0x0000, MAX_CC = 0xffff }; @@ -274,7 +318,8 @@ { } }; -struct rxvt_color { +struct rxvt_color +{ #if XFT XftColor c; #else @@ -286,17 +331,34 @@ bool operator == (const rxvt_color &b) const { return Pixel (*this) == Pixel (b); } bool operator != (const rxvt_color &b) const { return Pixel (*this) != Pixel (b); } + bool is_opaque () const + { +#if XFT + return c.color.alpha == rgba::MAX_CC; +#else + return 1; +#endif + } + bool alloc (rxvt_screen *screen, const rgba &color); void free (rxvt_screen *screen); void get (rgba &color); void get (XColor &color); - + bool set (rxvt_screen *screen, const char *name); bool set (rxvt_screen *screen, const rgba &color); void fade (rxvt_screen *screen, int percent, rxvt_color &result, const rgba &to = rgba (0, 0, 0)); }; +#if TRACE_PIXMAPS +Pixmap trace_XCreatePixmap (const char *file, int line, Display *dpy, Window r, unsigned int w, unsigned int h, unsigned int d); +void trace_XFreePixmap (const char *file, int line, Display *dpy, Pixmap p); + +# define XCreatePixmap(dpy,r,w,h,d) trace_XCreatePixmap (__FILE__,__LINE__,dpy,r,w,h,d) +# define XFreePixmap(dpy,p) trace_XFreePixmap (__FILE__,__LINE__,dpy,p) +#endif + #endif