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.90 by root, Wed Jan 23 14:09:21 2008 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-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.
… …
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
… …
67#endif 64#endif
68#if USE_XIM 65#if USE_XIM
69 "WM_LOCALE_NAME", 66 "WM_LOCALE_NAME",
70 "XIM_SERVERS", 67 "XIM_SERVERS",
71#endif 68#endif
72#ifdef TRANSPARENT 69#ifdef ENABLE_TRANSPARENCY
73 "_XROOTPMAP_ID", 70 "_XROOTPMAP_ID",
74 "ESETROOT_PMAP_ID", 71 "ESETROOT_PMAP_ID",
75#endif 72#endif
76#if ENABLE_XEMBED 73#if ENABLE_XEMBED
77 "_XEMBED", 74 "_XEMBED",
… …
186 183
187 XIMCallback ximcallback; 184 XIMCallback ximcallback;
188 ximcallback.client_data = (XPointer)this; 185 ximcallback.client_data = (XPointer)this;
189 ximcallback.callback = im_destroy_cb; 186 ximcallback.callback = im_destroy_cb;
190 187
191 XSetIMValues (xim, XNDestroyCallback, &ximcallback, 0); 188 XSetIMValues (xim, XNDestroyCallback, &ximcallback, (char *)0);
192 189
193 return true; 190 return true;
194} 191}
195 192
196rxvt_xim::~rxvt_xim () 193rxvt_xim::~rxvt_xim ()
… …
200} 197}
201 198
202#endif 199#endif
203 200
204///////////////////////////////////////////////////////////////////////////// 201/////////////////////////////////////////////////////////////////////////////
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
205 252
206void 253void
207rxvt_screen::set (rxvt_display *disp) 254rxvt_screen::set (rxvt_display *disp)
208{ 255{
209 display = disp; 256 display = disp;
… …
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/////////////////////////////////////////////////////////////////////////////
244 297
245rxvt_display::rxvt_display (const char *id) 298rxvt_display::rxvt_display (const char *id)
246: refcounted (id) 299: refcounted (id)
247, x_ev (this, &rxvt_display::x_cb)
248, selection_owner (0) 300, selection_owner (0)
249{ 301{
302 x_ev .set<rxvt_display, &rxvt_display::x_cb > (this);
303 flush_ev.set<rxvt_display, &rxvt_display::flush_cb> (this);
250} 304}
251 305
252XrmDatabase 306XrmDatabase
253rxvt_display::get_resources (bool refresh) 307rxvt_display::get_resources (bool refresh)
254{ 308{
255 char *homedir = (char *)getenv ("HOME"); 309 char *homedir = getenv ("HOME");
256 char fname[1024]; 310 char fname[1024];
257 311
258 /* 312 /*
259 * get resources using the X library function 313 * get resources using the X library function
260 */ 314 */
261 char *displayResource, *xe; 315 char *displayResource, *xe;
262 XrmDatabase rdb1, database = 0; 316 XrmDatabase rdb1, database = 0;
263 317
264 // for ordering, see for example http://www.faqs.org/faqs/Xt-FAQ/ Subject: 20 318 // for ordering, see for example http://www.faqs.org/faqs/Xt-FAQ/ Subject: 20
319 // as opposed to "standard practise", we always read in ~/.Xdefaults
265 320
266 // 6. System wide per application default file. 321 // 6. System wide per application default file.
267 322
268 /* Add in $XAPPLRESDIR/Rxvt only; not bothering with XUSERFILESEARCHPATH */ 323 /* Add in $XAPPLRESDIR/Rxvt only; not bothering with XUSERFILESEARCHPATH */
269 if ((xe = (char *)getenv ("XAPPLRESDIR"))) 324 if ((xe = getenv ("XAPPLRESDIR")))
270 { 325 {
271 snprintf (fname, sizeof (fname), "%s/%s", xe, RESCLASS); 326 snprintf (fname, sizeof (fname), "%s/%s", xe, RESCLASS);
272 327
273 if ((rdb1 = XrmGetFileDatabase (fname))) 328 if ((rdb1 = XrmGetFileDatabase (fname)))
274 XrmMergeDatabases (rdb1, &database); 329 XrmMergeDatabases (rdb1, &database);
… …
276 331
277 // 5. User's per application default file. 332 // 5. User's per application default file.
278 // none 333 // none
279 334
280 // 4. User's defaults file. 335 // 4. User's defaults file.
336 if (homedir)
337 {
338 snprintf (fname, sizeof (fname), "%s/.Xdefaults", homedir);
339
340 if ((rdb1 = XrmGetFileDatabase (fname)))
341 XrmMergeDatabases (rdb1, &database);
342 }
343
281 /* Get any Xserver defaults */ 344 /* Get any Xserver defaults */
282 if (refresh) 345 if (refresh)
283 { 346 {
284 // fucking xlib keeps a copy of the rm string 347 // fucking xlib keeps a copy of the rm string
285 Atom actual_type; 348 Atom actual_type;
… …
290#if XLIB_ILLEGAL_ACCESS 353#if XLIB_ILLEGAL_ACCESS
291 if (dpy->xdefaults) 354 if (dpy->xdefaults)
292 XFree (dpy->xdefaults); 355 XFree (dpy->xdefaults);
293#endif 356#endif
294 357
295 if (XGetWindowProperty (dpy, root, XA_RESOURCE_MANAGER, 358 if (XGetWindowProperty (dpy, RootWindow (dpy, 0), XA_RESOURCE_MANAGER,
296 0L, 100000000L, False, 359 0L, 100000000L, False,
297 XA_STRING, &actual_type, &actual_format, 360 XA_STRING, &actual_type, &actual_format,
298 &nitems, &nremaining, 361 &nitems, &nremaining,
299 (unsigned char **)&val) == Success 362 (unsigned char **)&val) == Success
300 && actual_type == XA_STRING 363 && actual_type == XA_STRING
301 && actual_format == 8) 364 && actual_format == 8)
302 displayResource = val; 365 displayResource = val;
303 else 366 else
304 { 367 {
305 displayResource = 0; 368 displayResource = 0;
369
306 if (val) 370 if (val)
307 XFree(val); 371 XFree(val);
308 } 372 }
309 373
310#if XLIB_ILLEGAL_ACCESS 374#if XLIB_ILLEGAL_ACCESS
… …
317 if (displayResource) 381 if (displayResource)
318 { 382 {
319 if ((rdb1 = XrmGetStringDatabase (displayResource))) 383 if ((rdb1 = XrmGetStringDatabase (displayResource)))
320 XrmMergeDatabases (rdb1, &database); 384 XrmMergeDatabases (rdb1, &database);
321 } 385 }
322 else if (homedir)
323 {
324 snprintf (fname, sizeof (fname), "%s/.Xdefaults", homedir);
325
326 if ((rdb1 = XrmGetFileDatabase (fname)))
327 XrmMergeDatabases (rdb1, &database);
328 }
329 386
330#if !XLIB_ILLEGAL_ACCESS 387#if !XLIB_ILLEGAL_ACCESS
331 if (refresh && displayResource) 388 if (refresh && displayResource)
332 XFree (displayResource); 389 XFree (displayResource);
333#endif 390#endif
… …
344 XFree (displayResource); 401 XFree (displayResource);
345 } 402 }
346 403
347 // 3. User's per host defaults file 404 // 3. User's per host defaults file
348 /* Add in XENVIRONMENT file */ 405 /* Add in XENVIRONMENT file */
349 if ((xe = (char *)getenv ("XENVIRONMENT")) 406 if ((xe = getenv ("XENVIRONMENT"))
350 && (rdb1 = XrmGetFileDatabase (xe))) 407 && (rdb1 = XrmGetFileDatabase (xe)))
351 XrmMergeDatabases (rdb1, &database); 408 XrmMergeDatabases (rdb1, &database);
352 else if (homedir) 409 else if (homedir)
353 { 410 {
354 struct utsname un; 411 struct utsname un;
… …
405 XUnloadFont (dpy, f); 462 XUnloadFont (dpy, f);
406#endif 463#endif
407 464
408 int fd = XConnectionNumber (dpy); 465 int fd = XConnectionNumber (dpy);
409 466
410#ifndef NO_SLOW_LINK_SUPPORT
411 // try to detect wether we have a local connection. 467 // try to detect wether we have a local connection.
412 // assume unix domains socket == local, everything else not 468 // assume unix domain socket == local, everything else not
413 // TODO: might want to check for inet/127.0.0.1 469 // TODO: might want to check for inet/127.0.0.1
414 is_local = 0; 470 is_local = 0;
415 sockaddr_un sa; 471 sockaddr_un sa;
416 socklen_t sl = sizeof (sa); 472 socklen_t sl = sizeof (sa);
417 473
418 if (!getsockname (fd, (sockaddr *)&sa, &sl)) 474 if (!getsockname (fd, (sockaddr *)&sa, &sl))
419 is_local = sa.sun_family == AF_LOCAL; 475 is_local = sa.sun_family == AF_UNIX;
420#endif
421 476
477 flush_ev.start ();
422 x_ev.start (fd, EVENT_READ); 478 x_ev.start (fd, ev::READ);
423 fcntl (fd, F_SETFD, FD_CLOEXEC); 479 fcntl (fd, F_SETFD, FD_CLOEXEC);
424 480
425 XSelectInput (dpy, root, PropertyChangeMask); 481 XSelectInput (dpy, root, PropertyChangeMask);
426 482
427 flush (); 483 flush ();
… …
445 501
446#ifdef POINTER_BLANK 502#ifdef POINTER_BLANK
447 XFreeCursor (dpy, blank_cursor); 503 XFreeCursor (dpy, blank_cursor);
448#endif 504#endif
449 x_ev.stop (); 505 x_ev.stop ();
506 flush_ev.stop ();
450#ifdef USE_XIM 507#ifdef USE_XIM
451 xims.clear (); 508 xims.clear ();
452#endif 509#endif
453 XCloseDisplay (dpy); 510 XCloseDisplay (dpy);
454} 511}
… …
484 541
485 XFree (atoms); 542 XFree (atoms);
486} 543}
487#endif 544#endif
488 545
489void rxvt_display::x_cb (io_watcher &w, short revents) 546void rxvt_display::x_cb (ev::io &w, int revents)
490{ 547{
491 do 548 while (XEventsQueued (dpy, QueuedAfterReading))
492 { 549 {
493 XEvent xev; 550 XEvent xev;
494 XNextEvent (dpy, &xev); 551 XNextEvent (dpy, &xev);
495 552
496#ifdef USE_XIM 553#ifdef USE_XIM
… …
499 if (xev.type == PropertyNotify 556 if (xev.type == PropertyNotify
500 && xev.xany.window == root 557 && xev.xany.window == root
501 && xev.xproperty.atom == xa[XA_XIM_SERVERS]) 558 && xev.xproperty.atom == xa[XA_XIM_SERVERS])
502 im_change_check (); 559 im_change_check ();
503#endif 560#endif
561 if (xev.type == MappingNotify)
562 XRefreshKeyboardMapping (&xev.xmapping);
563
504 for (int i = xw.size (); i--; ) 564 for (int i = xw.size (); i--; )
505 { 565 {
506 if (!xw[i]) 566 if (!xw[i])
507 xw.erase_unordered (i); 567 xw.erase_unordered (i);
508 else if (xw[i]->window == xev.xany.window) 568 else if (xw[i]->window == xev.xany.window)
… …
510 } 570 }
511#ifdef USE_XIM 571#ifdef USE_XIM
512 } 572 }
513#endif 573#endif
514 } 574 }
515 while (XEventsQueued (dpy, QueuedAlready)); 575}
516 576
577void rxvt_display::flush_cb (ev::prepare &w, int revents)
578{
579 w.stop ();
517 XFlush (dpy); 580 XFlush (dpy);
518} 581}
519 582
520void rxvt_display::flush ()
521{
522 if (XEventsQueued (dpy, QueuedAlready))
523 x_cb (x_ev, EVENT_READ);
524
525 XFlush (dpy);
526}
527
528void rxvt_display::reg (xevent_watcher *w) 583void rxvt_display::reg (xevent_watcher *w)
529{ 584{
585 if (!w->active)
586 {
530 xw.push_back (w); 587 xw.push_back (w);
531 w->active = xw.size (); 588 w->active = xw.size ();
589 }
532} 590}
533 591
534void rxvt_display::unreg (xevent_watcher *w) 592void rxvt_display::unreg (xevent_watcher *w)
535{ 593{
536 if (w->active) 594 if (w->active)
595 {
537 xw[w->active - 1] = 0; 596 xw[w->active - 1] = 0;
597 w->active = 0;
598 }
538} 599}
539 600
540void rxvt_display::set_selection_owner (rxvt_term *owner) 601void rxvt_display::set_selection_owner (rxvt_term *owner)
541{ 602{
542 if (selection_owner && selection_owner != owner) 603 if (selection_owner && selection_owner != owner)
604 {
605 rxvt_term *owner = selection_owner;
606
543 selection_owner->selection_clear (); 607 owner->selection_clear ();
608 owner->flush ();
609 }
544 610
545 selection_owner = owner; 611 selection_owner = owner;
546} 612}
547 613
548#ifdef USE_XIM 614#ifdef USE_XIM
… …
596 662
597template class refcache<rxvt_display>; 663template class refcache<rxvt_display>;
598refcache<rxvt_display> displays; 664refcache<rxvt_display> displays;
599 665
600///////////////////////////////////////////////////////////////////////////// 666/////////////////////////////////////////////////////////////////////////////
601 667//
668
669static unsigned int
670insert_component (unsigned int value, unsigned int mask, unsigned int shift)
671{
672 return (value * (mask + 1) >> 16) << shift;
673}
674
602bool 675bool
603rxvt_color::alloc (rxvt_screen *screen, const rgba &color) 676rxvt_color::alloc (rxvt_screen *screen, const rgba &color)
604{ 677{
678 //TODO: only supports 24 bit
679 int alpha = color.a >= 0xff00 ? 0xffff : color.a;
680
605#if XFT 681#if XFT
606 XRenderPictFormat *format; 682 XRenderPictFormat *format;
607 683
608 // FUCKING Xft gets it wrong, of course, so work around it. 684 // FUCKING Xft gets it wrong, of course, so work around it.
609 // Transparency users should eat shit and die, and then 685 // Transparency users should eat shit and die, and then
… …
613 { 689 {
614 // the fun lies in doing everything manually... 690 // the fun lies in doing everything manually...
615 c.color.red = color.r; 691 c.color.red = color.r;
616 c.color.green = color.g; 692 c.color.green = color.g;
617 c.color.blue = color.b; 693 c.color.blue = color.b;
618 c.color.alpha = color.a; 694 c.color.alpha = alpha;
619 695
620 c.pixel = ((color.r * format->direct.redMask / rgba::MAX_CC) << format->direct.red ) 696 c.pixel = insert_component (color.r, format->direct.redMask , format->direct.red )
621 | ((color.g * format->direct.greenMask / rgba::MAX_CC) << format->direct.green) 697 | insert_component (color.g, format->direct.greenMask, format->direct.green)
622 | ((color.b * format->direct.blueMask / rgba::MAX_CC) << format->direct.blue ) 698 | insert_component (color.b, format->direct.blueMask , format->direct.blue )
623 | ((color.a * format->direct.alphaMask / rgba::MAX_CC) << format->direct.alpha); 699 | insert_component (alpha , format->direct.alphaMask, format->direct.alpha);
624 700
625 return true; 701 return true;
626 } 702 }
627 else 703 else
628 { 704 {
629 XRenderColor d; 705 XRenderColor d;
630 706
631 d.red = color.r; 707 d.red = color.r;
632 d.green = color.g; 708 d.green = color.g;
633 d.blue = color.b; 709 d.blue = color.b;
634 d.alpha = color.a; 710 d.alpha = alpha;
635 711
636 return XftColorAllocValue (screen->dpy, screen->visual, screen->cmap, &d, &c); 712 return XftColorAllocValue (screen->dpy, screen->visual, screen->cmap, &d, &c);
637 } 713 }
638#else 714#else
639 c.red = color.r; 715 c.red = color.r;
640 c.green = color.g; 716 c.green = color.g;
641 c.blue = color.b; 717 c.blue = color.b;
642 718
643 if (screen->visual->c_class == TrueColor) 719 if (screen->visual->c_class == TrueColor)
644 { 720 {
645 c.pixel = (color.r * (screen->visual->red_mask >> ctz (screen->visual->red_mask )) 721 c.pixel = (color.r >> (16 - popcount (screen->visual->red_mask )) << ctz (screen->visual->red_mask ))
646 / rgba::MAX_CC) << ctz (screen->visual->red_mask ) 722 | (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 )) 723 | (color.b >> (16 - popcount (screen->visual->blue_mask )) << ctz (screen->visual->blue_mask ));
650 / rgba::MAX_CC) << ctz (screen->visual->blue_mask );
651 724
652 return true; 725 return true;
653 } 726 }
654 else if (XAllocColor (screen->dpy, screen->cmap, &c)) 727 else if (XAllocColor (screen->dpy, screen->cmap, &c))
655 return true; 728 return true;
… …
667{ 740{
668 rgba c; 741 rgba c;
669 char eos; 742 char eos;
670 int skip; 743 int skip;
671 744
745 c.a = rgba::MAX_CC;
746
672 // parse the nonstandard "[alphapercent]" prefix 747 // parse the nonstandard "[alphapercent]" prefix
673 if (1 <= sscanf (name, "[%hd]%n", &c.a, &skip)) 748 if (1 <= sscanf (name, "[%hd]%n", &c.a, &skip))
674 { 749 {
675 c.a = lerp<int, int, int> (0, rgba::MAX_CC, c.a); 750 c.a = lerp<int, int, int> (0, rgba::MAX_CC, c.a);
676 name += skip; 751 name += skip;
677 } 752 }
678 else
679 c.a = rgba::MAX_CC;
680 753
681 // parse the non-standard "rgba:rrrr/gggg/bbbb/aaaa" format 754 // parse the non-standard "rgba:rrrr/gggg/bbbb/aaaa" format
682 if (strlen (name) != 4+5*4 || 4 != sscanf (name, "rgba:%4hx/%4hx/%4hx/%4hx%c", &c.r, &c.g, &c.b, &c.a, &eos)) 755 if (strlen (name) != 4+5*4 || 4 != sscanf (name, "rgba:%4hx/%4hx/%4hx/%4hx%c", &c.r, &c.g, &c.b, &c.a, &eos))
683 { 756 {
684 XColor xc, xc_exact; 757 XColor xc;
685 758
686 if (XParseColor (screen->dpy, screen->cmap, name, &xc)) 759 if (XParseColor (screen->dpy, screen->cmap, name, &xc))
687 { 760 {
688 c.r = xc.red; 761 c.r = xc.red;
689 c.g = xc.green; 762 c.g = xc.green;
… …
716 { 789 {
717 XColor *colors = new XColor [screen->visual->map_entries]; 790 XColor *colors = new XColor [screen->visual->map_entries];
718 791
719 for (int i = 0; i < cmap_size; i++) 792 for (int i = 0; i < cmap_size; i++)
720 colors [i].pixel = i; 793 colors [i].pixel = i;
721 794
722 // many kilobytes transfer per colour, but pseudocolor isn't worth 795 // many kilobytes transfer per colour, but pseudocolor isn't worth
723 // many extra optimisations. 796 // many extra optimisations.
724 XQueryColors (screen->dpy, screen->cmap, colors, cmap_size); 797 XQueryColors (screen->dpy, screen->cmap, colors, cmap_size);
725 798
726 int diff = 0x7fffffffUL; 799 int diff = 0x7fffffffUL;
… …
739 } 812 }
740 } 813 }
741 814
742 //rxvt_warn ("could not allocate %04x %04x %04x, getting %04x %04x %04x instead (%d)\n", 815 //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); 816 // color.r, color.g, color.b, best->red, best->green, best->blue, diff);
744 817
745 got = alloc (screen, rgba (best->red, best->green, best->blue)); 818 got = alloc (screen, rgba (best->red, best->green, best->blue));
746 819
747 delete colors; 820 delete [] colors;
748 } 821 }
749#endif 822#endif
750 823
751 return got; 824 return got;
752} 825}
… …
777 color.green = c.g; 850 color.green = c.g;
778 color.blue = c.b; 851 color.blue = c.b;
779 color.pixel = (Pixel)*this; 852 color.pixel = (Pixel)*this;
780} 853}
781 854
782void 855void
783rxvt_color::free (rxvt_screen *screen) 856rxvt_color::free (rxvt_screen *screen)
784{ 857{
858 if (screen->visual->c_class == TrueColor)
859 return; // nothing to do
860
785#if XFT 861#if XFT
786 XftColorFree (screen->dpy, screen->visual, screen->cmap, &c); 862 XftColorFree (screen->dpy, screen->visual, screen->cmap, &c);
787#else 863#else
788 XFreeColors (screen->dpy, screen->cmap, &c.pixel, 1, AllPlanes); 864 XFreeColors (screen->dpy, screen->cmap, &c.pixel, 1, AllPlanes);
789#endif 865#endif
… …
804 lerp (c.a, to.a, percent) 880 lerp (c.a, to.a, percent)
805 ) 881 )
806 ); 882 );
807} 883}
808 884
885#if TRACE_PIXMAPS
886# undef XCreatePixmap
887# undef XFreePixmap
888Pixmap trace_XCreatePixmap (const char *file, int line, Display *dpy, Window r, unsigned int w, unsigned int h, unsigned int d)
889{
890 Pixmap res = XCreatePixmap (dpy, r, w, h, d);
891 fprintf (stderr, "%s:%d: XCreatePixmap (%p,%lX,%u,%u,%u) returned %lX\n", file, line, dpy, r, w, h, d, res);
892 return res;
893}
894
895void trace_XFreePixmap (const char *file, int line, Display *dpy, Pixmap p)
896{
897 fprintf (stderr, "%s:%d: XFreePixmap (%p,%lX)\n", file, line, dpy, p);
898 XFreePixmap (dpy,p);
899}
900#endif

Diff Legend

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