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

Comparing rxvt-unicode/src/rxvtcolor.C (file contents):
Revision 1.15 by root, Sun May 30 19:12:42 2004 UTC vs.
Revision 1.16 by root, Thu Jul 29 14:05:27 2004 UTC

… …
102 put (*this->begin ()); 102 put (*this->begin ());
103} 103}
104 104
105///////////////////////////////////////////////////////////////////////////// 105/////////////////////////////////////////////////////////////////////////////
106 106
107#ifdef USE_XIM
107static void 108static void
108im_destroy_cb (XIM unused1, XPointer client_data, XPointer unused3) 109im_destroy_cb (XIM unused1, XPointer client_data, XPointer unused3)
109{ 110{
110 rxvt_xim *xim = (rxvt_xim *)client_data; 111 rxvt_xim *xim = (rxvt_xim *)client_data;
111 rxvt_display *display = xim->display; 112 rxvt_display *display = xim->display;
… …
136rxvt_xim::~rxvt_xim () 137rxvt_xim::~rxvt_xim ()
137{ 138{
138 if (xim) 139 if (xim)
139 XCloseIM (xim); 140 XCloseIM (xim);
140} 141}
142#endif
141 143
142///////////////////////////////////////////////////////////////////////////// 144/////////////////////////////////////////////////////////////////////////////
143 145
144rxvt_display::rxvt_display (const char *id) 146rxvt_display::rxvt_display (const char *id)
145: refcounted (id) 147: refcounted (id)
… …
183 int fd = XConnectionNumber (display); 185 int fd = XConnectionNumber (display);
184 x_ev.start (fd, EVENT_READ); 186 x_ev.start (fd, EVENT_READ);
185 fcntl (fd, F_SETFD, FD_CLOEXEC); 187 fcntl (fd, F_SETFD, FD_CLOEXEC);
186 188
187 XSelectInput (display, root, PropertyChangeMask); 189 XSelectInput (display, root, PropertyChangeMask);
190#ifdef USE_XIM
188 xa_xim_servers = XInternAtom (display, "XIM_SERVERS", 0); 191 xa_xim_servers = XInternAtom (display, "XIM_SERVERS", 0);
192#endif
189 193
190 flush (); 194 flush ();
191 195
192 return true; 196 return true;
193} 197}
… …
198 202
199 if (display) 203 if (display)
200 XCloseDisplay (display); 204 XCloseDisplay (display);
201} 205}
202 206
207#ifdef USE_XIM
203void rxvt_display::im_change_cb () 208void rxvt_display::im_change_cb ()
204{ 209{
205 for (im_watcher **i = imw.begin (); i != imw.end (); ++i) 210 for (im_watcher **i = imw.begin (); i != imw.end (); ++i)
206 (*i)->call (); 211 (*i)->call ();
207} 212}
213#endif
208 214
209void rxvt_display::x_cb (io_watcher &w, short revents) 215void rxvt_display::x_cb (io_watcher &w, short revents)
210{ 216{
211 do 217 do
212 { 218 {
213 XEvent xev; 219 XEvent xev;
214 XNextEvent (display, &xev); 220 XNextEvent (display, &xev);
215 221
216 //printf ("T %d w %lx\n", xev.type, xev.xany.window);//D 222 //printf ("T %d w %lx\n", xev.type, xev.xany.window);//D
217 223
224#ifdef USE_XIM
218 if (xev.type == PropertyNotify 225 if (xev.type == PropertyNotify
219 && xev.xany.window == root 226 && xev.xany.window == root
220 && xev.xproperty.atom == xa_xim_servers) 227 && xev.xproperty.atom == xa_xim_servers)
221 im_change_cb (); 228 im_change_cb ();
229#endif
222 230
223 for (int i = xw.size (); i--; ) 231 for (int i = xw.size (); i--; )
224 { 232 {
225 if (!xw[i]) 233 if (!xw[i])
226 xw.erase_unordered (i); 234 xw.erase_unordered (i);
… …
256{ 264{
257 if (w->active) 265 if (w->active)
258 xw[w->active - 1] = 0; 266 xw[w->active - 1] = 0;
259} 267}
260 268
261void rxvt_display::reg (im_watcher *w)
262{
263 imw.push_back (w);
264}
265
266void rxvt_display::unreg (im_watcher *w)
267{
268 imw.erase (find (imw.begin (), imw.end (), w));
269}
270
271void rxvt_display::set_selection_owner (rxvt_term *owner) 269void rxvt_display::set_selection_owner (rxvt_term *owner)
272{ 270{
273 if (selection_owner && selection_owner != owner) 271 if (selection_owner && selection_owner != owner)
274 selection_owner->selection_clear (); 272 selection_owner->selection_clear ();
275 273
276 selection_owner = owner; 274 selection_owner = owner;
277} 275}
278 276
277#ifdef USE_XIM
278void rxvt_display::reg (im_watcher *w)
279{
280 imw.push_back (w);
281}
282
283void rxvt_display::unreg (im_watcher *w)
284{
285 imw.erase (find (imw.begin (), imw.end (), w));
286}
287
279rxvt_xim *rxvt_display::get_xim (const char *locale, const char *modifiers) 288rxvt_xim *rxvt_display::get_xim (const char *locale, const char *modifiers)
280{ 289{
281 char *id; 290 char *id;
282 int l, m; 291 int l, m;
283 292
… …
299 308
300void rxvt_display::put_xim (rxvt_xim *xim) 309void rxvt_display::put_xim (rxvt_xim *xim)
301{ 310{
302 xims.put (xim); 311 xims.put (xim);
303} 312}
313#endif
304 314
305Atom rxvt_display::atom (const char *name) 315Atom rxvt_display::atom (const char *name)
306{ 316{
307 return XInternAtom (display, name, False); 317 return XInternAtom (display, name, False);
308} 318}

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines