ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/rxvt-unicode/src/rxvttoolkit.h
(Generate patch)

Comparing rxvt-unicode/src/rxvttoolkit.h (file contents):
Revision 1.1 by root, Sun Aug 15 00:37:04 2004 UTC vs.
Revision 1.5 by root, Wed Dec 15 00:53:23 2004 UTC

16#include "rxvtutil.h" 16#include "rxvtutil.h"
17 17
18#include "callback.h" 18#include "callback.h"
19 19
20struct rxvt_term; 20struct rxvt_term;
21struct rxvt_display;
21 22
22struct im_watcher; 23struct im_watcher;
23struct xevent_watcher; 24struct xevent_watcher;
24 25
25struct refcounted { 26struct refcounted {
64#ifdef USE_XIM 65#ifdef USE_XIM
65 refcache<rxvt_xim> xims; 66 refcache<rxvt_xim> xims;
66 vector<im_watcher *> imw; 67 vector<im_watcher *> imw;
67 68
68 void im_change_cb (); 69 void im_change_cb ();
70 void im_change_check ();
69#endif 71#endif
70 72
71//public 73//public
72 Display *display; 74 Display *display;
73 int depth; 75 int depth;
82 84
83 rxvt_display (const char *id); 85 rxvt_display (const char *id);
84 bool init (); 86 bool init ();
85 ~rxvt_display (); 87 ~rxvt_display ();
86 88
89 operator Display *() const { return display; }
90
87 void flush (); 91 void flush ();
88 92 Atom atom (const char *name);
89 void set_selection_owner (rxvt_term *owner); 93 void set_selection_owner (rxvt_term *owner);
90 94
91 void reg (xevent_watcher *w); 95 void reg (xevent_watcher *w);
92 void unreg (xevent_watcher *w); 96 void unreg (xevent_watcher *w);
93 97
96 void unreg (im_watcher *w); 100 void unreg (im_watcher *w);
97 101
98 rxvt_xim *get_xim (const char *locale, const char *modifiers); 102 rxvt_xim *get_xim (const char *locale, const char *modifiers);
99 void put_xim (rxvt_xim *xim); 103 void put_xim (rxvt_xim *xim);
100#endif 104#endif
101
102 Atom atom (const char *name);
103}; 105};
104 106
105#ifdef USE_XIM 107#ifdef USE_XIM
106struct im_watcher : watcher, callback0<void> { 108struct im_watcher : watcher, callback0<void> {
107 template<class O1, class O2> 109 template<class O1, class O2>

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines