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.77 by sasha, Wed Nov 14 22:25:42 2007 UTC vs.
Revision 1.81 by root, Fri Dec 14 02:22:24 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.
… …
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} 303}
304 304
305XrmDatabase 305XrmDatabase
306rxvt_display::get_resources (bool refresh) 306rxvt_display::get_resources (bool refresh)
307{ 307{
308 char *homedir = (char *)getenv ("HOME"); 308 char *homedir = getenv ("HOME");
309 char fname[1024]; 309 char fname[1024];
310 310
311 /* 311 /*
312 * get resources using the X library function 312 * get resources using the X library function
313 */ 313 */
… …
318 // as opposed to "standard practise", we always read in ~/.Xdefaults 318 // as opposed to "standard practise", we always read in ~/.Xdefaults
319 319
320 // 6. System wide per application default file. 320 // 6. System wide per application default file.
321 321
322 /* Add in $XAPPLRESDIR/Rxvt only; not bothering with XUSERFILESEARCHPATH */ 322 /* Add in $XAPPLRESDIR/Rxvt only; not bothering with XUSERFILESEARCHPATH */
323 if ((xe = (char *)getenv ("XAPPLRESDIR"))) 323 if ((xe = getenv ("XAPPLRESDIR")))
324 { 324 {
325 snprintf (fname, sizeof (fname), "%s/%s", xe, RESCLASS); 325 snprintf (fname, sizeof (fname), "%s/%s", xe, RESCLASS);
326 326
327 if ((rdb1 = XrmGetFileDatabase (fname))) 327 if ((rdb1 = XrmGetFileDatabase (fname)))
328 XrmMergeDatabases (rdb1, &database); 328 XrmMergeDatabases (rdb1, &database);
… …
400 XFree (displayResource); 400 XFree (displayResource);
401 } 401 }
402 402
403 // 3. User's per host defaults file 403 // 3. User's per host defaults file
404 /* Add in XENVIRONMENT file */ 404 /* Add in XENVIRONMENT file */
405 if ((xe = (char *)getenv ("XENVIRONMENT")) 405 if ((xe = getenv ("XENVIRONMENT"))
406 && (rdb1 = XrmGetFileDatabase (xe))) 406 && (rdb1 = XrmGetFileDatabase (xe)))
407 XrmMergeDatabases (rdb1, &database); 407 XrmMergeDatabases (rdb1, &database);
408 else if (homedir) 408 else if (homedir)
409 { 409 {
410 struct utsname un; 410 struct utsname un;
… …
540} 540}
541#endif 541#endif
542 542
543void rxvt_display::x_cb (ev::io &w, int revents) 543void rxvt_display::x_cb (ev::io &w, int revents)
544{ 544{
545 do 545 while (XEventsQueued (dpy, QueuedAfterReading))
546 { 546 {
547 XEvent xev; 547 XEvent xev;
548 XNextEvent (dpy, &xev); 548 XNextEvent (dpy, &xev);
549 549
550#ifdef USE_XIM 550#ifdef USE_XIM
… …
567 } 567 }
568#ifdef USE_XIM 568#ifdef USE_XIM
569 } 569 }
570#endif 570#endif
571 } 571 }
572 while (XEventsQueued (dpy, QueuedAlready));
573 572
574 XFlush (dpy); 573 XFlush (dpy);
575} 574}
576 575
577void rxvt_display::flush () 576void rxvt_display::flush ()
578{ 577{
579 if (XEventsQueued (dpy, QueuedAlready))
580 x_cb (x_ev, ev::READ); 578 x_cb (x_ev, ev::READ);
581
582 XFlush (dpy);
583} 579}
584 580
585void rxvt_display::reg (xevent_watcher *w) 581void rxvt_display::reg (xevent_watcher *w)
586{ 582{
587 if (!w->active) 583 if (!w->active)

Diff Legend

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