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.50 by root, Thu Feb 2 18:04:46 2006 UTC vs.
Revision 1.65 by sasha, Fri Jun 8 20:04:12 2007 UTC

1/*--------------------------------*-C-*---------------------------------* 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-2004 Marc Lehmann <pcg@goof.com> 6 * Copyright (c) 2003-2006 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.
… …
26 26
27#include <unistd.h> 27#include <unistd.h>
28#include <fcntl.h> 28#include <fcntl.h>
29 29
30#include <sys/utsname.h> 30#include <sys/utsname.h>
31
32#ifndef NO_SLOW_LINK_SUPPORT
33# include <sys/socket.h> 31#include <sys/socket.h>
34# include <sys/un.h> 32#include <sys/un.h>
35#endif
36 33
37#if XFT 34#if XFT
38# include <X11/extensions/Xrender.h> 35# include <X11/extensions/Xrender.h>
39#endif 36#endif
40 37
… …
201 198
202#endif 199#endif
203 200
204///////////////////////////////////////////////////////////////////////////// 201/////////////////////////////////////////////////////////////////////////////
205 202
203#if XFT
204rxvt_drawable::~rxvt_drawable ()
205{
206 if (xftdrawable)
207 XftDrawDestroy (xftdrawable);
208}
209
210rxvt_drawable::operator XftDraw *()
211{
212 if (!xftdrawable)
213 xftdrawable = XftDrawCreate (screen->dpy, drawable, screen->visual, screen->cmap);
214
215 return xftdrawable;
216}
217#endif
218
219/////////////////////////////////////////////////////////////////////////////
220
221#if XFT
222
223// not strictly necessary as it is only used with superclass of zero_initialised
224rxvt_screen::rxvt_screen ()
225: scratch_area (0)
226{
227}
228
229rxvt_drawable &rxvt_screen::scratch_drawable (int w, int h)
230{
231 // it's actually faster to re-allocate every time. don't ask me
232 // why, but its likely no big deal there are no roundtrips
233 // (I think/hope).
234 if (!scratch_area || w > scratch_w || h > scratch_h || 1/*D*/)
235 {
236 if (scratch_area)
237 {
238 XFreePixmap (dpy, scratch_area->drawable);
239 delete scratch_area;
240 }
241
242 Pixmap pm = XCreatePixmap (dpy, RootWindowOfScreen (ScreenOfDisplay (dpy, display->screen)),
243 scratch_w = w, scratch_h = h, depth);
244
245 scratch_area = new rxvt_drawable (this, pm);
246 }
247
248 return *scratch_area;
249}
250
251#endif
252
206void 253void
207rxvt_screen::set (rxvt_display *disp) 254rxvt_screen::set (rxvt_display *disp)
208{ 255{
209 display = disp; 256 display = disp;
210 dpy = disp->dpy; 257 dpy = disp->dpy;
… …
215 visual = DefaultVisualOfScreen (screen); 262 visual = DefaultVisualOfScreen (screen);
216 cmap = DefaultColormapOfScreen (screen); 263 cmap = DefaultColormapOfScreen (screen);
217} 264}
218 265
219void 266void
220rxvt_screen::set (rxvt_display *disp, int bitdepth) 267rxvt_screen::select_visual (int bitdepth)
221{ 268{
222 set (disp);
223
224#if XFT 269#if XFT
225 XVisualInfo vinfo; 270 XVisualInfo vinfo;
226 271
227 if (XMatchVisualInfo (dpy, display->screen, bitdepth, TrueColor, &vinfo)) 272 if (XMatchVisualInfo (dpy, display->screen, bitdepth, TrueColor, &vinfo))
228 { 273 {
229 depth = bitdepth; 274 depth = bitdepth;
230 visual = vinfo.visual; 275 visual = vinfo.visual;
231 cmap = XCreateColormap (dpy, disp->root, visual, AllocNone); 276 cmap = XCreateColormap (dpy, display->root, visual, AllocNone);
232 } 277 }
233#endif 278#endif
234} 279}
235 280
236void 281void
237rxvt_screen::clear () 282rxvt_screen::clear ()
238{ 283{
284#if XFT
285 if (scratch_area)
286 {
287 XFreePixmap (dpy, scratch_area->drawable);
288 delete scratch_area;
289 }
290#endif
291
239 if (cmap != DefaultColormapOfScreen (ScreenOfDisplay (dpy, display->screen))) 292 if (cmap != DefaultColormapOfScreen (ScreenOfDisplay (dpy, display->screen)))
240 XFreeColormap (dpy, cmap); 293 XFreeColormap (dpy, cmap);
241} 294}
242 295
243///////////////////////////////////////////////////////////////////////////// 296/////////////////////////////////////////////////////////////////////////////
… …
260 */ 313 */
261 char *displayResource, *xe; 314 char *displayResource, *xe;
262 XrmDatabase rdb1, database = 0; 315 XrmDatabase rdb1, database = 0;
263 316
264 // for ordering, see for example http://www.faqs.org/faqs/Xt-FAQ/ Subject: 20 317 // for ordering, see for example http://www.faqs.org/faqs/Xt-FAQ/ Subject: 20
318 // as opposed to "standard practise", we always read in ~/.Xdefaults
265 319
266 // 6. System wide per application default file. 320 // 6. System wide per application default file.
267 321
268 /* Add in $XAPPLRESDIR/Rxvt only; not bothering with XUSERFILESEARCHPATH */ 322 /* Add in $XAPPLRESDIR/Rxvt only; not bothering with XUSERFILESEARCHPATH */
269 if ((xe = (char *)getenv ("XAPPLRESDIR"))) 323 if ((xe = (char *)getenv ("XAPPLRESDIR")))
… …
276 330
277 // 5. User's per application default file. 331 // 5. User's per application default file.
278 // none 332 // none
279 333
280 // 4. User's defaults file. 334 // 4. User's defaults file.
335 if (homedir)
336 {
337 snprintf (fname, sizeof (fname), "%s/.Xdefaults", homedir);
338
339 if ((rdb1 = XrmGetFileDatabase (fname)))
340 XrmMergeDatabases (rdb1, &database);
341 }
342
281 /* Get any Xserver defaults */ 343 /* Get any Xserver defaults */
282 if (refresh) 344 if (refresh)
283 { 345 {
284 // fucking xlib keeps a copy of the rm string 346 // fucking xlib keeps a copy of the rm string
285 Atom actual_type; 347 Atom actual_type;
… …
290#if XLIB_ILLEGAL_ACCESS 352#if XLIB_ILLEGAL_ACCESS
291 if (dpy->xdefaults) 353 if (dpy->xdefaults)
292 XFree (dpy->xdefaults); 354 XFree (dpy->xdefaults);
293#endif 355#endif
294 356
295 if (XGetWindowProperty (dpy, root, XA_RESOURCE_MANAGER, 357 if (XGetWindowProperty (dpy, RootWindow (dpy, 0), XA_RESOURCE_MANAGER,
296 0L, 100000000L, False, 358 0L, 100000000L, False,
297 XA_STRING, &actual_type, &actual_format, 359 XA_STRING, &actual_type, &actual_format,
298 &nitems, &nremaining, 360 &nitems, &nremaining,
299 (unsigned char **)&val) == Success 361 (unsigned char **)&val) == Success
300 && actual_type == XA_STRING 362 && actual_type == XA_STRING
301 && actual_format == 8) 363 && actual_format == 8)
302 displayResource = val; 364 displayResource = val;
303 else 365 else
304 { 366 {
305 displayResource = 0; 367 displayResource = 0;
368
306 if (val) 369 if (val)
307 XFree(val); 370 XFree(val);
308 } 371 }
309 372
310#if XLIB_ILLEGAL_ACCESS 373#if XLIB_ILLEGAL_ACCESS
… …
315 displayResource = XResourceManagerString (dpy); 378 displayResource = XResourceManagerString (dpy);
316 379
317 if (displayResource) 380 if (displayResource)
318 { 381 {
319 if ((rdb1 = XrmGetStringDatabase (displayResource))) 382 if ((rdb1 = XrmGetStringDatabase (displayResource)))
320 XrmMergeDatabases (rdb1, &database);
321 }
322 else if (homedir)
323 {
324 snprintf (fname, sizeof (fname), "%s/.Xdefaults", homedir);
325
326 if ((rdb1 = XrmGetFileDatabase (fname)))
327 XrmMergeDatabases (rdb1, &database); 383 XrmMergeDatabases (rdb1, &database);
328 } 384 }
329 385
330#if !XLIB_ILLEGAL_ACCESS 386#if !XLIB_ILLEGAL_ACCESS
331 if (refresh && displayResource) 387 if (refresh && displayResource)
… …
386 if (!dpy) 442 if (!dpy)
387 return false; 443 return false;
388 444
389 screen = DefaultScreen (dpy); 445 screen = DefaultScreen (dpy);
390 root = DefaultRootWindow (dpy); 446 root = DefaultRootWindow (dpy);
447
448#ifdef HAVE_AFTERIMAGE
449 ::dpy = dpy; /* init global var from libAfter... */
450 asv = create_asvisual_for_id( dpy, screen, DefaultDepth(dpy,screen), XVisualIDFromVisual(DefaultVisual(dpy,screen)), None, NULL );
451#endif
391 452
392 assert (sizeof (xa_names) / sizeof (char *) == NUM_XA); 453 assert (sizeof (xa_names) / sizeof (char *) == NUM_XA);
393 XInternAtoms (dpy, (char **)xa_names, NUM_XA, False, xa); 454 XInternAtoms (dpy, (char **)xa_names, NUM_XA, False, xa);
394 455
395 XrmSetDatabase (dpy, get_resources (false)); 456 XrmSetDatabase (dpy, get_resources (false));
… …
405 XUnloadFont (dpy, f); 466 XUnloadFont (dpy, f);
406#endif 467#endif
407 468
408 int fd = XConnectionNumber (dpy); 469 int fd = XConnectionNumber (dpy);
409 470
410#ifndef NO_SLOW_LINK_SUPPORT
411 // try to detect wether we have a local connection. 471 // try to detect wether we have a local connection.
412 // assume unix domains socket == local, everything else not 472 // assume unix domains socket == local, everything else not
413 // TODO: might want to check for inet/127.0.0.1 473 // TODO: might want to check for inet/127.0.0.1
414 is_local = 0; 474 is_local = 0;
415 sockaddr_un sa; 475 sockaddr_un sa;
416 socklen_t sl = sizeof (sa); 476 socklen_t sl = sizeof (sa);
417 477
418 if (!getsockname (fd, (sockaddr *)&sa, &sl)) 478 if (!getsockname (fd, (sockaddr *)&sa, &sl))
419 is_local = sa.sun_family == AF_LOCAL; 479 is_local = sa.sun_family == AF_LOCAL;
420#endif
421 480
422 x_ev.start (fd, EVENT_READ); 481 x_ev.start (fd, EVENT_READ);
423 fcntl (fd, F_SETFD, FD_CLOEXEC); 482 fcntl (fd, F_SETFD, FD_CLOEXEC);
424 483
425 XSelectInput (dpy, root, PropertyChangeMask); 484 XSelectInput (dpy, root, PropertyChangeMask);
… …
525 XFlush (dpy); 584 XFlush (dpy);
526} 585}
527 586
528void rxvt_display::reg (xevent_watcher *w) 587void rxvt_display::reg (xevent_watcher *w)
529{ 588{
589 if (!w->active)
590 {
530 xw.push_back (w); 591 xw.push_back (w);
531 w->active = xw.size (); 592 w->active = xw.size ();
593 }
532} 594}
533 595
534void rxvt_display::unreg (xevent_watcher *w) 596void rxvt_display::unreg (xevent_watcher *w)
535{ 597{
536 if (w->active) 598 if (w->active)
599 {
537 xw[w->active - 1] = 0; 600 xw[w->active - 1] = 0;
601 w->active = 0;
602 }
538} 603}
539 604
540void rxvt_display::set_selection_owner (rxvt_term *owner) 605void rxvt_display::set_selection_owner (rxvt_term *owner)
541{ 606{
542 if (selection_owner && selection_owner != owner) 607 if (selection_owner && selection_owner != owner)
… …
596 661
597template class refcache<rxvt_display>; 662template class refcache<rxvt_display>;
598refcache<rxvt_display> displays; 663refcache<rxvt_display> displays;
599 664
600///////////////////////////////////////////////////////////////////////////// 665/////////////////////////////////////////////////////////////////////////////
666//
667
668static unsigned int
669insert_component (unsigned int value, unsigned int mask, unsigned int shift)
670{
671 return (value * (mask + 1) >> 16) << shift;
672}
601 673
602bool 674bool
603rxvt_color::alloc (rxvt_screen *screen, const rgba &color) 675rxvt_color::alloc (rxvt_screen *screen, const rgba &color)
604{ 676{
605#if XFT 677#if XFT
… …
615 c.color.red = color.r; 687 c.color.red = color.r;
616 c.color.green = color.g; 688 c.color.green = color.g;
617 c.color.blue = color.b; 689 c.color.blue = color.b;
618 c.color.alpha = color.a; 690 c.color.alpha = color.a;
619 691
620 c.pixel = ((color.r * format->direct.redMask / rgba::MAX_CC) << format->direct.red ) 692 c.pixel = insert_component (color.r, format->direct.redMask , format->direct.red )
621 | ((color.g * format->direct.greenMask / rgba::MAX_CC) << format->direct.green) 693 | insert_component (color.g, format->direct.greenMask, format->direct.green)
622 | ((color.b * format->direct.blueMask / rgba::MAX_CC) << format->direct.blue ) 694 | insert_component (color.b, format->direct.blueMask , format->direct.blue )
623 | ((color.a * format->direct.alphaMask / rgba::MAX_CC) << format->direct.alpha); 695 | insert_component (color.a, format->direct.alphaMask, format->direct.alpha);
624 696
625 return true; 697 return true;
626 } 698 }
627 else 699 else
628 { 700 {
… …
640 c.green = color.g; 712 c.green = color.g;
641 c.blue = color.b; 713 c.blue = color.b;
642 714
643 if (screen->visual->c_class == TrueColor) 715 if (screen->visual->c_class == TrueColor)
644 { 716 {
645 c.pixel = (color.r * (screen->visual->red_mask >> ctz (screen->visual->red_mask )) 717 c.pixel = (color.r >> (16 - popcount (screen->visual->red_mask )) << ctz (screen->visual->red_mask ))
646 / rgba::MAX_CC) << ctz (screen->visual->red_mask ) 718 | (color.g >> (16 - popcount (screen->visual->green_mask)) << ctz (screen->visual->green_mask))
647 | (color.g * (screen->visual->green_mask >> ctz (screen->visual->green_mask))
648 / rgba::MAX_CC) << ctz (screen->visual->green_mask)
649 | (color.b * (screen->visual->blue_mask >> ctz (screen->visual->blue_mask )) 719 | (color.b >> (16 - popcount (screen->visual->blue_mask )) << ctz (screen->visual->blue_mask ));
650 / rgba::MAX_CC) << ctz (screen->visual->blue_mask );
651 720
652 return true; 721 return true;
653 } 722 }
654 else if (XAllocColor (screen->dpy, screen->cmap, &c)) 723 else if (XAllocColor (screen->dpy, screen->cmap, &c))
655 return true; 724 return true;
… …
742 //rxvt_warn ("could not allocate %04x %04x %04x, getting %04x %04x %04x instead (%d)\n", 811 //rxvt_warn ("could not allocate %04x %04x %04x, getting %04x %04x %04x instead (%d)\n",
743 // color.r, color.g, color.b, best->red, best->green, best->blue, diff); 812 // color.r, color.g, color.b, best->red, best->green, best->blue, diff);
744 813
745 got = alloc (screen, rgba (best->red, best->green, best->blue)); 814 got = alloc (screen, rgba (best->red, best->green, best->blue));
746 815
747 delete colors; 816 delete [] colors;
748 } 817 }
749#endif 818#endif
750 819
751 return got; 820 return got;
752} 821}
… …
780} 849}
781 850
782void 851void
783rxvt_color::free (rxvt_screen *screen) 852rxvt_color::free (rxvt_screen *screen)
784{ 853{
854 if (screen->visual->c_class == TrueColor)
855 return; // nothing to do
856
785#if XFT 857#if XFT
786 XftColorFree (screen->dpy, screen->visual, screen->cmap, &c); 858 XftColorFree (screen->dpy, screen->visual, screen->cmap, &c);
787#else 859#else
788 XFreeColors (screen->dpy, screen->cmap, &c.pixel, 1, AllPlanes); 860 XFreeColors (screen->dpy, screen->cmap, &c.pixel, 1, AllPlanes);
789#endif 861#endif

Diff Legend

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