--- rxvt-unicode/src/rxvttoolkit.h 2007/06/26 00:40:19 1.31 +++ rxvt-unicode/src/rxvttoolkit.h 2012/06/14 17:16:05 1.67 @@ -3,7 +3,8 @@ *----------------------------------------------------------------------* * * All portions of code are copyright by their respective author/s. - * Copyright (c) 2003-2006 Marc Lehmann + * Copyright (c) 2003-2011 Marc Lehmann + * Copyright (c) 2011 Emanuele Giaquinta * * 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 @@ -29,9 +30,8 @@ # include #endif -#include "iom.h" +#include "ev_cpp.h" -#include "rxvtlib.h" #include "rxvtutil.h" #include "callback.h" @@ -62,6 +62,7 @@ XA_NET_WM_NAME, XA_NET_WM_ICON_NAME, XA_NET_WM_PING, + XA_NET_WM_ICON, #endif #if USE_XIM XA_WM_LOCALE_NAME, @@ -76,7 +77,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, @@ -102,7 +103,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; @@ -113,7 +138,8 @@ }; template -struct refcache : vector { +struct refcache : vector +{ T *get (const char *id); void put (T *obj); void clear (); @@ -128,7 +154,8 @@ struct rxvt_screen; -struct rxvt_drawable { +struct rxvt_drawable +{ rxvt_screen *screen; Drawable drawable; operator Drawable() { return drawable; } @@ -153,8 +180,9 @@ ///////////////////////////////////////////////////////////////////////////// -#ifdef USE_XIM -struct rxvt_xim : refcounted { +#if USE_XIM +struct rxvt_xim : refcounted +{ void destroy (); rxvt_display *display; @@ -167,7 +195,8 @@ }; #endif -struct rxvt_screen { +struct rxvt_screen +{ rxvt_display *display; Display *dpy; int depth; @@ -185,20 +214,25 @@ #endif void set (rxvt_display *disp); - void select_visual (int bitdepth); + void select_visual (int id); + void select_depth (int bitdepth); // select visual by depth void clear (); }; -#ifdef HAVE_AFTERIMAGE -struct ASVisual; -#endif +enum +{ + DISPLAY_HAS_RENDER = 1 << 0, + DISPLAY_HAS_RENDER_CONV = 1 << 1, +}; -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::prepare flush_ev; void flush_cb (ev::prepare &w, int revents); + ev::io x_ev ; void x_cb (ev::io &w, int revents); -#ifdef USE_XIM +#if USE_XIM refcache xims; vector imw; @@ -210,15 +244,14 @@ Display *dpy; int screen; Window root; -#ifdef HAVE_AFTERIMAGE - struct ASVisual *asv; -#endif rxvt_term *selection_owner; + rxvt_term *clipboard_owner; Atom xa[NUM_XA]; bool is_local; #ifdef POINTER_BLANK Cursor blank_cursor; #endif + uint8_t flags; rxvt_display (const char *id); XrmDatabase get_resources (bool refresh); @@ -226,14 +259,19 @@ void ref_next (); ~rxvt_display (); - void flush (); + void flush () + { + flush_ev.start (); + } + Atom atom (const char *name); - void set_selection_owner (rxvt_term *owner); + Pixmap get_pixmap_property (Atom property); + void set_selection_owner (rxvt_term *owner, bool clipboard); void reg (xevent_watcher *w); void unreg (xevent_watcher *w); -#ifdef USE_XIM +#if USE_XIM void reg (im_watcher *w); void unreg (im_watcher *w); @@ -242,17 +280,14 @@ #endif }; -#ifdef USE_XIM -struct im_watcher : watcher, callback { - template - im_watcher (O object, M method) - : callback (object, method) - { } - +#if USE_XIM +struct im_watcher : rxvt_watcher, callback +{ void start (rxvt_display *display) { display->reg (this); } + void stop (rxvt_display *display) { display->unreg (this); @@ -260,19 +295,16 @@ }; #endif -struct xevent_watcher : watcher, callback { +struct xevent_watcher : rxvt_watcher, callback +{ Window window; - template - xevent_watcher (O object, M method) - : callback (object, method) - { } - void start (rxvt_display *display, Window window) { this->window = window; display->reg (this); } + void stop (rxvt_display *display) { display->unreg (this); @@ -285,20 +317,22 @@ typedef unsigned long Pixel; -struct rgba { - unsigned short r, g, b, a; +struct rgba +{ + uint16_t 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) + rgba (uint16_t r, uint16_t g, uint16_t b, uint16_t a = MAX_CC) : r(r), g(g), b(b), a(a) { } }; -struct rxvt_color { +struct rxvt_color +{ #if XFT XftColor c; #else @@ -310,17 +344,71 @@ 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); - + operator rgba () const + { + rgba c; + get (c); + return c; + } + void get (rgba &color) const; + void get (XColor &color) const; + 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)); }; +#define Sel_normal 0x01 /* normal selection */ +#define Sel_incr 0x02 /* incremental selection */ +#define Sel_Primary 0x01 +#define Sel_Secondary 0x02 +#define Sel_Clipboard 0x03 +#define Sel_whereMask 0x0f +#define Sel_CompoundText 0x10 /* last request was COMPOUND_TEXT */ +#define Sel_UTF8String 0x20 /* last request was UTF8_STRING */ + +struct rxvt_selection +{ + rxvt_selection (rxvt_display *disp, int selnum, Time tm, Window win, Atom prop, rxvt_term *term); + void run (); + ~rxvt_selection (); + + rxvt_term *term; // terminal to paste to, may be 0 + void *cb_sv; // managed by perl + + rxvt_display *display; + Time request_time; + Window request_win; + Atom request_prop; + +private: + unsigned char selection_wait; + unsigned char selection_type; + + char *incr_buf; + size_t incr_buf_size, incr_buf_fill; + + void timer_cb (ev::timer &w, int revents); ev::timer timer_ev; + void x_cb (XEvent &xev); xevent_watcher x_ev; + + void finish (char *data = 0, unsigned int len = 0); + void stop (); + bool request (Atom target, int selnum); + void handle_selection (Window win, Atom prop, bool delete_prop); +}; + #endif