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

Comparing rxvt-unicode/src/rxvttoolkit.C (file contents):
Revision 1.73 by ayin, Wed Oct 31 09:55:24 2007 UTC vs.
Revision 1.84 by root, Fri Dec 14 06:17:27 2007 UTC

1/*----------------------------------------------------------------------* 1/*----------------------------------------------------------------------*
2 * File: rxvttoolkit.C 2 * File: rxvttoolkit.C
3 *----------------------------------------------------------------------* 3 *----------------------------------------------------------------------*
4 * 4 *
5 * All portions of code are copyright by their respective author/s. 5 * All portions of code are copyright by their respective author/s.
6 * Copyright (c) 2003-2006 Marc Lehmann <pcg@goof.com> 6 * Copyright (c) 2003-2007 Marc Lehmann <pcg@goof.com>
7 * 7 *
8 * This program is free software; you can redistribute it and/or modify 8 * This program is free software; you can redistribute it and/or modify
9 * it under the terms of the GNU General Public License as published by 9 * it under the terms of the GNU General Public License as published by
10 * the Free Software Foundation; either version 2 of the License, or 10 * the Free Software Foundation; either version 2 of the License, or
11 * (at your option) any later version. 11 * (at your option) any later version.
… …
183 183
184 XIMCallback ximcallback; 184 XIMCallback ximcallback;
185 ximcallback.client_data = (XPointer)this; 185 ximcallback.client_data = (XPointer)this;
186 ximcallback.callback = im_destroy_cb; 186 ximcallback.callback = im_destroy_cb;
187 187
188 XSetIMValues (xim, XNDestroyCallback, &ximcallback, 0); 188 XSetIMValues (xim, XNDestroyCallback, &ximcallback, (char *)0);
189 189
190 return true; 190 return true;
191} 191}
192 192
193rxvt_xim::~rxvt_xim () 193rxvt_xim::~rxvt_xim ()
… …
295 295
296///////////////////////////////////////////////////////////////////////////// 296/////////////////////////////////////////////////////////////////////////////
297 297
298rxvt_display::rxvt_display (const char *id) 298rxvt_display::rxvt_display (const char *id)
299: refcounted (id) 299: refcounted (id)
300, x_ev (this, &rxvt_display::x_cb)
301, selection_owner (0) 300, selection_owner (0)
302{ 301{
302 x_ev .set<rxvt_display, &rxvt_display::x_cb > (this);
303 flush_ev.set<rxvt_display, &rxvt_display::flush_cb> (this);
303} 304}
304 305
305XrmDatabase 306XrmDatabase
306rxvt_display::get_resources (bool refresh) 307rxvt_display::get_resources (bool refresh)
307{ 308{
308 char *homedir = (char *)getenv ("HOME"); 309 char *homedir = getenv ("HOME");
309 char fname[1024]; 310 char fname[1024];
310 311
311 /* 312 /*
312 * get resources using the X library function 313 * get resources using the X library function
313 */ 314 */
… …
318 // as opposed to "standard practise", we always read in ~/.Xdefaults 319 // as opposed to "standard practise", we always read in ~/.Xdefaults
319 320
320 // 6. System wide per application default file. 321 // 6. System wide per application default file.
321 322
322 /* Add in $XAPPLRESDIR/Rxvt only; not bothering with XUSERFILESEARCHPATH */ 323 /* Add in $XAPPLRESDIR/Rxvt only; not bothering with XUSERFILESEARCHPATH */
323 if ((xe = (char *)getenv ("XAPPLRESDIR"))) 324 if ((xe = getenv ("XAPPLRESDIR")))
324 { 325 {
325 snprintf (fname, sizeof (fname), "%s/%s", xe, RESCLASS); 326 snprintf (fname, sizeof (fname), "%s/%s", xe, RESCLASS);
326 327
327 if ((rdb1 = XrmGetFileDatabase (fname))) 328 if ((rdb1 = XrmGetFileDatabase (fname)))
328 XrmMergeDatabases (rdb1, &database); 329 XrmMergeDatabases (rdb1, &database);
… …
400 XFree (displayResource); 401 XFree (displayResource);
401 } 402 }
402 403
403 // 3. User's per host defaults file 404 // 3. User's per host defaults file
404 /* Add in XENVIRONMENT file */ 405 /* Add in XENVIRONMENT file */
405 if ((xe = (char *)getenv ("XENVIRONMENT")) 406 if ((xe = getenv ("XENVIRONMENT"))
406 && (rdb1 = XrmGetFileDatabase (xe))) 407 && (rdb1 = XrmGetFileDatabase (xe)))
407 XrmMergeDatabases (rdb1, &database); 408 XrmMergeDatabases (rdb1, &database);
408 else if (homedir) 409 else if (homedir)
409 { 410 {
410 struct utsname un; 411 struct utsname un;
… …
462#endif 463#endif
463 464
464 int fd = XConnectionNumber (dpy); 465 int fd = XConnectionNumber (dpy);
465 466
466 // try to detect wether we have a local connection. 467 // try to detect wether we have a local connection.
467 // assume unix domains socket == local, everything else not 468 // assume unix domain socket == local, everything else not
468 // TODO: might want to check for inet/127.0.0.1 469 // TODO: might want to check for inet/127.0.0.1
469 is_local = 0; 470 is_local = 0;
470 sockaddr_un sa; 471 sockaddr_un sa;
471 socklen_t sl = sizeof (sa); 472 socklen_t sl = sizeof (sa);
472 473
473 if (!getsockname (fd, (sockaddr *)&sa, &sl)) 474 if (!getsockname (fd, (sockaddr *)&sa, &sl))
474 is_local = sa.sun_family == AF_UNIX; 475 is_local = sa.sun_family == AF_UNIX;
475 476
477 flush_ev.start ();
476 x_ev.start (fd, EVENT_READ); 478 x_ev.start (fd, ev::READ);
477 fcntl (fd, F_SETFD, FD_CLOEXEC); 479 fcntl (fd, F_SETFD, FD_CLOEXEC);
478 480
479 XSelectInput (dpy, root, PropertyChangeMask); 481 XSelectInput (dpy, root, PropertyChangeMask);
480 482
481 flush (); 483 flush ();
… …
538 540
539 XFree (atoms); 541 XFree (atoms);
540} 542}
541#endif 543#endif
542 544
543void rxvt_display::x_cb (io_watcher &w, short revents) 545void rxvt_display::x_cb (ev::io &w, int revents)
544{ 546{
545 do 547 while (XEventsQueued (dpy, QueuedAfterReading))
546 { 548 {
547 XEvent xev; 549 XEvent xev;
548 XNextEvent (dpy, &xev); 550 XNextEvent (dpy, &xev);
549 551
550#ifdef USE_XIM 552#ifdef USE_XIM
… …
567 } 569 }
568#ifdef USE_XIM 570#ifdef USE_XIM
569 } 571 }
570#endif 572#endif
571 } 573 }
572 while (XEventsQueued (dpy, QueuedAlready));
573
574 XFlush (dpy);
575} 574}
576 575
577void rxvt_display::flush () 576void rxvt_display::flush_cb (ev::prepare &w, int revents)
578{ 577{
579 if (XEventsQueued (dpy, QueuedAlready)) 578 w.stop ();
580 x_cb (x_ev, EVENT_READ);
581
582 XFlush (dpy); 579 XFlush (dpy);
583} 580}
584 581
585void rxvt_display::reg (xevent_watcher *w) 582void rxvt_display::reg (xevent_watcher *w)
586{ 583{
… …
886 lerp (c.a, to.a, percent) 883 lerp (c.a, to.a, percent)
887 ) 884 )
888 ); 885 );
889} 886}
890 887
888#if TRACE_PIXMAPS
889# undef XCreatePixmap
890# undef XFreePixmap
891Pixmap trace_XCreatePixmap (const char *file, int line, Display *dpy, Window r, unsigned int w, unsigned int h, unsigned int d)
892{
893 Pixmap res = XCreatePixmap (dpy, r, w, h, d);
894 fprintf (stderr, "%s:%d: XCreatePixmap (%p,%lX,%u,%u,%u) returned %lX\n", file, line, dpy, r, w, h, d, res);
895 return res;
896}
897
898void trace_XFreePixmap (const char *file, int line, Display *dpy, Pixmap p)
899{
900 fprintf (stderr, "%s:%d: XFreePixmap (%p,%lX)\n", file, line, dpy, p);
901 XFreePixmap (dpy,p);
902}
903#endif

Diff Legend

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