--- rxvt-unicode/src/rxvttoolkit.h 2006/01/11 00:59:58 1.9 +++ rxvt-unicode/src/rxvttoolkit.h 2006/05/31 00:35:56 1.28 @@ -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 @@ -17,6 +36,66 @@ #include "callback.h" +// see rxvttoolkit.C:xa_names, which must be kept in sync +enum { + XA_TEXT, + XA_COMPOUND_TEXT, + XA_UTF8_STRING, + XA_MULTIPLE, + XA_TARGETS, + XA_TIMESTAMP, + XA_VT_SELECTION, + XA_INCR, + XA_WM_PROTOCOLS, + XA_WM_DELETE_WINDOW, + XA_CLIPBOARD, + XA_AVERAGE_WIDTH, + XA_WEIGHT_NAME, + XA_SLANT, + XA_CHARSET_REGISTRY, + XA_CHARSET_ENCODING, +#if ENABLE_FRILLS + XA_MOTIF_WM_HINTS, +#endif +#if ENABLE_EWMH + XA_NET_WM_PID, + XA_NET_WM_NAME, + XA_NET_WM_ICON_NAME, + XA_NET_WM_PING, +#endif +#if USE_XIM + XA_WM_LOCALE_NAME, + XA_XIM_SERVERS, +#endif +#if TRANSPARENT + XA_XROOTPMAP_ID, + XA_ESETROOT_PMAP_ID, +#endif +#if ENABLE_XEMBED + XA_XEMBED, + XA_XEMBED_INFO, +#endif +#if !ENABLE_MINIMAL + // these are usually allocated by other subsystens, but we do it + // here to avoid a server roundtrip. + XA_SCREEN_RESOURCES, + XA_XDCCC_LINEAR_RGB_CORRECTION, + XA_XDCCC_LINEAR_RGB_MATRICES, + XA_WM_COLORMAP_WINDOWS, + XA_WM_STATE, + XA_cursor, +# if USE_XIM + // various selection targets used by XIM + XA_TRANSPORT, + XA_LOCALES, + XA__XIM_PROTOCOL, + XA__XIM_XCONNECT, + XA__XIM_MOREDATA, +# endif +#endif + NUM_XA +}; + struct rxvt_term; struct rxvt_display; @@ -47,6 +126,33 @@ ///////////////////////////////////////////////////////////////////////////// +struct rxvt_screen; + +struct rxvt_drawable { + rxvt_screen *screen; + Drawable drawable; + operator Drawable() { return drawable; } + +#if XFT + XftDraw *xftdrawable; + operator XftDraw *(); +#endif + + rxvt_drawable (rxvt_screen *screen, Drawable drawable) + : screen(screen), +#if XFT + xftdrawable(0), +#endif + drawable(drawable) + { } + +#if XFT + ~rxvt_drawable (); +#endif +}; + +///////////////////////////////////////////////////////////////////////////// + #ifdef USE_XIM struct rxvt_xim : refcounted { void destroy (); @@ -61,9 +167,29 @@ }; #endif -struct rxvt_display : refcounted { - Atom xa_xim_servers; +struct rxvt_screen { + rxvt_display *display; + Display *dpy; + int depth; + Visual *visual; + Colormap cmap; + +#if XFT + // scratch pixmap + rxvt_drawable *scratch_area; + int scratch_w, scratch_h; + + rxvt_drawable &scratch_drawable (int w, int h); + + rxvt_screen (); +#endif + void set (rxvt_display *disp); + void set (rxvt_display *disp, int bitdepth); + void clear (); +}; + +struct rxvt_display : refcounted { io_manager_vec xw; io_watcher x_ev; void x_cb (io_watcher &w, short revents); @@ -77,28 +203,22 @@ #endif //public - Display *display; - int depth; + Display *dpy; int screen; - Visual *visual; - Colormap cmap; Window root; rxvt_term *selection_owner; -#ifndef NO_SLOW_LINK_SUPPORT + Atom xa[NUM_XA]; bool is_local; -#endif #ifdef POINTER_BLANK Cursor blank_cursor; #endif rxvt_display (const char *id); - XrmDatabase get_resources (); + XrmDatabase get_resources (bool refresh); bool ref_init (); void ref_next (); ~rxvt_display (); - operator Display *() const { return display; } - void flush (); Atom atom (const char *name); void set_selection_owner (rxvt_term *owner); @@ -116,10 +236,10 @@ }; #ifdef USE_XIM -struct im_watcher : watcher, callback0 { - template - im_watcher (O1 *object, void (O2::*method) ()) - : callback0 (object,method) +struct im_watcher : watcher, callback { + template + im_watcher (O object, M method) + : callback (object, method) { } void start (rxvt_display *display) @@ -133,12 +253,12 @@ }; #endif -struct xevent_watcher : watcher, callback1 { +struct xevent_watcher : watcher, callback { Window window; - template - xevent_watcher (O1 *object, void (O2::*method) (XEvent &)) - : callback1 (object,method) + template + xevent_watcher (O object, M method) + : callback (object, method) { } void start (rxvt_display *display, Window window) @@ -158,28 +278,41 @@ typedef unsigned long Pixel; +struct rgba { + unsigned short r, g, b, a; + + enum { MIN_CC = 0x0000, MAX_CC = 0xffff }; + + rgba () + { } + + rgba (unsigned short r, unsigned short g, unsigned short b, unsigned short a = MAX_CC) + : r(r), g(g), b(b), a(a) + { } +}; + struct rxvt_color { #if XFT XftColor c; - operator Pixel () const { return c.pixel; } #else - Pixel p; - operator Pixel () const { return p; } + XColor c; #endif + operator Pixel () const { return c.pixel; } + bool operator == (const rxvt_color &b) const { return Pixel (*this) == Pixel (b); } bool operator != (const rxvt_color &b) const { return Pixel (*this) != Pixel (b); } - void get (rxvt_display *display, unsigned short &cr, unsigned short &cg, unsigned short &cb); - - bool set (rxvt_display *display, Pixel p); - bool set (rxvt_display *display, const char *name); - bool set (rxvt_display *display, unsigned short cr, unsigned short cg, unsigned short cb); + bool alloc (rxvt_screen *screen, const rgba &color); + void free (rxvt_screen *screen); - rxvt_color fade (rxvt_display *, int percent); // fades to black - rxvt_color fade (rxvt_display *, int percent, rxvt_color &fadeto); + 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 free (rxvt_display *display); + void fade (rxvt_screen *screen, int percent, rxvt_color &result, const rgba &to = rgba (0, 0, 0)); }; #endif