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.107 by sf-exg, Wed Mar 31 13:14:51 2010 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
… …
62#if ENABLE_EWMH 59#if ENABLE_EWMH
63 "_NET_WM_PID", 60 "_NET_WM_PID",
64 "_NET_WM_NAME", 61 "_NET_WM_NAME",
65 "_NET_WM_ICON_NAME", 62 "_NET_WM_ICON_NAME",
66 "_NET_WM_PING", 63 "_NET_WM_PING",
64 "_NET_WM_ICON",
67#endif 65#endif
68#if USE_XIM 66#if USE_XIM
69 "WM_LOCALE_NAME", 67 "WM_LOCALE_NAME",
70 "XIM_SERVERS", 68 "XIM_SERVERS",
71#endif 69#endif
72#ifdef TRANSPARENT 70#ifdef ENABLE_TRANSPARENCY
73 "_XROOTPMAP_ID", 71 "_XROOTPMAP_ID",
74 "ESETROOT_PMAP_ID", 72 "ESETROOT_PMAP_ID",
75#endif 73#endif
76#if ENABLE_XEMBED 74#if ENABLE_XEMBED
77 "_XEMBED", 75 "_XEMBED",
… …
186 184
187 XIMCallback ximcallback; 185 XIMCallback ximcallback;
188 ximcallback.client_data = (XPointer)this; 186 ximcallback.client_data = (XPointer)this;
189 ximcallback.callback = im_destroy_cb; 187 ximcallback.callback = im_destroy_cb;
190 188
191 XSetIMValues (xim, XNDestroyCallback, &ximcallback, 0); 189 XSetIMValues (xim, XNDestroyCallback, &ximcallback, (char *)0);
192 190
193 return true; 191 return true;
194} 192}
195 193
196rxvt_xim::~rxvt_xim () 194rxvt_xim::~rxvt_xim ()
… …
200} 198}
201 199
202#endif 200#endif
203 201
204///////////////////////////////////////////////////////////////////////////// 202/////////////////////////////////////////////////////////////////////////////
203
204#if XFT
205rxvt_drawable::~rxvt_drawable ()
206{
207 if (xftdrawable)
208 XftDrawDestroy (xftdrawable);
209}
210
211rxvt_drawable::operator XftDraw *()
212{
213 if (!xftdrawable)
214 xftdrawable = XftDrawCreate (screen->dpy, drawable, screen->visual, screen->cmap);
215
216 return xftdrawable;
217}
218#endif
219
220/////////////////////////////////////////////////////////////////////////////
221
222#if XFT
223
224// not strictly necessary as it is only used with superclass of zero_initialised
225rxvt_screen::rxvt_screen ()
226: scratch_area (0)
227{
228}
229
230rxvt_drawable &rxvt_screen::scratch_drawable (int w, int h)
231{
232 // it's actually faster to re-allocate every time. don't ask me
233 // why, but its likely no big deal there are no roundtrips
234 // (I think/hope).
235 if (!scratch_area || w > scratch_w || h > scratch_h || 1/*D*/)
236 {
237 if (scratch_area)
238 {
239 XFreePixmap (dpy, scratch_area->drawable);
240 delete scratch_area;
241 }
242
243 Pixmap pm = XCreatePixmap (dpy, RootWindowOfScreen (ScreenOfDisplay (dpy, display->screen)),
244 scratch_w = w, scratch_h = h, depth);
245
246 scratch_area = new rxvt_drawable (this, pm);
247 }
248
249 return *scratch_area;
250}
251
252#endif
205 253
206void 254void
207rxvt_screen::set (rxvt_display *disp) 255rxvt_screen::set (rxvt_display *disp)
208{ 256{
209 display = disp; 257 display = disp;
… …
215 visual = DefaultVisualOfScreen (screen); 263 visual = DefaultVisualOfScreen (screen);
216 cmap = DefaultColormapOfScreen (screen); 264 cmap = DefaultColormapOfScreen (screen);
217} 265}
218 266
219void 267void
220rxvt_screen::set (rxvt_display *disp, int bitdepth) 268rxvt_screen::select_visual (int bitdepth)
221{ 269{
222 set (disp);
223
224#if XFT 270#if XFT
225 XVisualInfo vinfo; 271 XVisualInfo vinfo;
226 272
227 if (XMatchVisualInfo (dpy, display->screen, bitdepth, TrueColor, &vinfo)) 273 if (XMatchVisualInfo (dpy, display->screen, bitdepth, TrueColor, &vinfo))
228 { 274 {
229 depth = bitdepth; 275 depth = bitdepth;
230 visual = vinfo.visual; 276 visual = vinfo.visual;
231 cmap = XCreateColormap (dpy, disp->root, visual, AllocNone); 277 cmap = XCreateColormap (dpy, display->root, visual, AllocNone);
232 } 278 }
233#endif 279#endif
234} 280}
235 281
236void 282void
237rxvt_screen::clear () 283rxvt_screen::clear ()
238{ 284{
285#if XFT
286 if (scratch_area)
287 {
288 XFreePixmap (dpy, scratch_area->drawable);
289 delete scratch_area;
290 }
291#endif
292
239 if (cmap != DefaultColormapOfScreen (ScreenOfDisplay (dpy, display->screen))) 293 if (cmap != DefaultColormapOfScreen (ScreenOfDisplay (dpy, display->screen)))
240 XFreeColormap (dpy, cmap); 294 XFreeColormap (dpy, cmap);
241} 295}
242 296
243///////////////////////////////////////////////////////////////////////////// 297/////////////////////////////////////////////////////////////////////////////
244 298
245rxvt_display::rxvt_display (const char *id) 299rxvt_display::rxvt_display (const char *id)
246: refcounted (id) 300: refcounted (id)
247, x_ev (this, &rxvt_display::x_cb)
248, selection_owner (0) 301, selection_owner (0)
302, clipboard_owner (0)
249{ 303{
304 x_ev .set<rxvt_display, &rxvt_display::x_cb > (this);
305 flush_ev.set<rxvt_display, &rxvt_display::flush_cb> (this);
250} 306}
251 307
252XrmDatabase 308XrmDatabase
253rxvt_display::get_resources (bool refresh) 309rxvt_display::get_resources (bool refresh)
254{ 310{
255 char *homedir = (char *)getenv ("HOME"); 311 char *homedir = getenv ("HOME");
256 char fname[1024]; 312 char fname[1024];
257 313
258 /* 314 /*
259 * get resources using the X library function 315 * get resources using the X library function
260 */ 316 */
261 char *displayResource, *xe; 317 char *displayResource, *xe;
262 XrmDatabase rdb1, database = 0; 318 XrmDatabase rdb1, database = 0;
263 319
264 // for ordering, see for example http://www.faqs.org/faqs/Xt-FAQ/ Subject: 20 320 // for ordering, see for example http://www.faqs.org/faqs/Xt-FAQ/ Subject: 20
321 // as opposed to "standard practise", we always read in ~/.Xdefaults
265 322
266 // 6. System wide per application default file. 323 // 6. System wide per application default file.
267 324
268 /* Add in $XAPPLRESDIR/Rxvt only; not bothering with XUSERFILESEARCHPATH */ 325 /* Add in $XAPPLRESDIR/Rxvt only; not bothering with XUSERFILESEARCHPATH */
269 if ((xe = (char *)getenv ("XAPPLRESDIR"))) 326 if ((xe = getenv ("XAPPLRESDIR")))
270 { 327 {
271 snprintf (fname, sizeof (fname), "%s/%s", xe, RESCLASS); 328 snprintf (fname, sizeof (fname), "%s/%s", xe, RESCLASS);
272 329
273 if ((rdb1 = XrmGetFileDatabase (fname))) 330 if ((rdb1 = XrmGetFileDatabase (fname)))
274 XrmMergeDatabases (rdb1, &database); 331 XrmMergeDatabases (rdb1, &database);
… …
276 333
277 // 5. User's per application default file. 334 // 5. User's per application default file.
278 // none 335 // none
279 336
280 // 4. User's defaults file. 337 // 4. User's defaults file.
338 if (homedir)
339 {
340 snprintf (fname, sizeof (fname), "%s/.Xdefaults", homedir);
341
342 if ((rdb1 = XrmGetFileDatabase (fname)))
343 XrmMergeDatabases (rdb1, &database);
344 }
345
281 /* Get any Xserver defaults */ 346 /* Get any Xserver defaults */
282 if (refresh) 347 if (refresh)
283 { 348 {
284 // fucking xlib keeps a copy of the rm string 349 // fucking xlib keeps a copy of the rm string
285 Atom actual_type; 350 Atom actual_type;
… …
290#if XLIB_ILLEGAL_ACCESS 355#if XLIB_ILLEGAL_ACCESS
291 if (dpy->xdefaults) 356 if (dpy->xdefaults)
292 XFree (dpy->xdefaults); 357 XFree (dpy->xdefaults);
293#endif 358#endif
294 359
295 if (XGetWindowProperty (dpy, root, XA_RESOURCE_MANAGER, 360 if (XGetWindowProperty (dpy, RootWindow (dpy, 0), XA_RESOURCE_MANAGER,
296 0L, 100000000L, False, 361 0L, 100000000L, False,
297 XA_STRING, &actual_type, &actual_format, 362 XA_STRING, &actual_type, &actual_format,
298 &nitems, &nremaining, 363 &nitems, &nremaining,
299 (unsigned char **)&val) == Success 364 (unsigned char **)&val) == Success
300 && actual_type == XA_STRING 365 && actual_type == XA_STRING
301 && actual_format == 8) 366 && actual_format == 8)
302 displayResource = val; 367 displayResource = val;
303 else 368 else
304 { 369 {
305 displayResource = 0; 370 displayResource = 0;
371
306 if (val) 372 if (val)
307 XFree(val); 373 XFree(val);
308 } 374 }
309 375
310#if XLIB_ILLEGAL_ACCESS 376#if XLIB_ILLEGAL_ACCESS
… …
317 if (displayResource) 383 if (displayResource)
318 { 384 {
319 if ((rdb1 = XrmGetStringDatabase (displayResource))) 385 if ((rdb1 = XrmGetStringDatabase (displayResource)))
320 XrmMergeDatabases (rdb1, &database); 386 XrmMergeDatabases (rdb1, &database);
321 } 387 }
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 388
330#if !XLIB_ILLEGAL_ACCESS 389#if !XLIB_ILLEGAL_ACCESS
331 if (refresh && displayResource) 390 if (refresh && displayResource)
332 XFree (displayResource); 391 XFree (displayResource);
333#endif 392#endif
… …
344 XFree (displayResource); 403 XFree (displayResource);
345 } 404 }
346 405
347 // 3. User's per host defaults file 406 // 3. User's per host defaults file
348 /* Add in XENVIRONMENT file */ 407 /* Add in XENVIRONMENT file */
349 if ((xe = (char *)getenv ("XENVIRONMENT")) 408 if ((xe = getenv ("XENVIRONMENT"))
350 && (rdb1 = XrmGetFileDatabase (xe))) 409 && (rdb1 = XrmGetFileDatabase (xe)))
351 XrmMergeDatabases (rdb1, &database); 410 XrmMergeDatabases (rdb1, &database);
352 else if (homedir) 411 else if (homedir)
353 { 412 {
354 struct utsname un; 413 struct utsname un;
… …
368bool rxvt_display::ref_init () 427bool rxvt_display::ref_init ()
369{ 428{
370#ifdef LOCAL_X_IS_UNIX 429#ifdef LOCAL_X_IS_UNIX
371 if (id[0] == ':') 430 if (id[0] == ':')
372 { 431 {
373 val = rxvt_malloc (5 + strlen (id) + 1); 432 if (!(val = rxvt_temp_buf<char> (5 + strlen (id) + 1)))
433 return false;
374 strcpy (val, "unix/"); 434 strcpy (val, "unix/");
375 strcat (val, id); 435 strcat (val, id);
376 dpy = XOpenDisplay (val); 436 dpy = XOpenDisplay (val);
377 free (val);
378 } 437 }
379 else 438 else
380#endif 439#endif
381 dpy = 0; 440 dpy = 0;
382 441
… …
405 XUnloadFont (dpy, f); 464 XUnloadFont (dpy, f);
406#endif 465#endif
407 466
408 int fd = XConnectionNumber (dpy); 467 int fd = XConnectionNumber (dpy);
409 468
410#ifndef NO_SLOW_LINK_SUPPORT
411 // try to detect wether we have a local connection. 469 // try to detect whether we have a local connection.
412 // assume unix domains socket == local, everything else not 470 // assume unix domain socket == local, everything else not
413 // TODO: might want to check for inet/127.0.0.1 471 // TODO: might want to check for inet/127.0.0.1
414 is_local = 0; 472 is_local = 0;
415 sockaddr_un sa; 473 sockaddr_un sa;
416 socklen_t sl = sizeof (sa); 474 socklen_t sl = sizeof (sa);
417 475
418 if (!getsockname (fd, (sockaddr *)&sa, &sl)) 476 if (!getsockname (fd, (sockaddr *)&sa, &sl))
419 is_local = sa.sun_family == AF_LOCAL; 477 is_local = sa.sun_family == AF_UNIX;
420#endif
421 478
479 flush_ev.start ();
422 x_ev.start (fd, EVENT_READ); 480 x_ev.start (fd, ev::READ);
423 fcntl (fd, F_SETFD, FD_CLOEXEC); 481 fcntl (fd, F_SETFD, FD_CLOEXEC);
424 482
425 XSelectInput (dpy, root, PropertyChangeMask); 483 XSelectInput (dpy, root, PropertyChangeMask);
426 484
427 flush (); 485 flush ();
… …
430} 488}
431 489
432void 490void
433rxvt_display::ref_next () 491rxvt_display::ref_next ()
434{ 492{
435 // TODO: somehow check wether the database files/resources changed 493 // TODO: somehow check whether the database files/resources changed
436 // before affording re-loading/parsing 494 // before affording re-loading/parsing
437 XrmDestroyDatabase (XrmGetDatabase (dpy)); 495 XrmDestroyDatabase (XrmGetDatabase (dpy));
438 XrmSetDatabase (dpy, get_resources (true)); 496 XrmSetDatabase (dpy, get_resources (true));
439} 497}
440 498
… …
445 503
446#ifdef POINTER_BLANK 504#ifdef POINTER_BLANK
447 XFreeCursor (dpy, blank_cursor); 505 XFreeCursor (dpy, blank_cursor);
448#endif 506#endif
449 x_ev.stop (); 507 x_ev.stop ();
508 flush_ev.stop ();
450#ifdef USE_XIM 509#ifdef USE_XIM
451 xims.clear (); 510 xims.clear ();
452#endif 511#endif
453 XCloseDisplay (dpy); 512 XCloseDisplay (dpy);
454} 513}
… …
484 543
485 XFree (atoms); 544 XFree (atoms);
486} 545}
487#endif 546#endif
488 547
489void rxvt_display::x_cb (io_watcher &w, short revents) 548void rxvt_display::x_cb (ev::io &w, int revents)
490{ 549{
550 flush_ev.start ();
551}
552
553void rxvt_display::flush_cb (ev::prepare &w, int revents)
554{
555 while (XEventsQueued (dpy, QueuedAfterFlush))
491 do 556 do
492 { 557 {
493 XEvent xev; 558 XEvent xev;
494 XNextEvent (dpy, &xev); 559 XNextEvent (dpy, &xev);
495 560
496#ifdef USE_XIM 561#ifdef USE_XIM
497 if (!XFilterEvent (&xev, None)) 562 if (!XFilterEvent (&xev, None))
498 { 563 {
499 if (xev.type == PropertyNotify 564 if (xev.type == PropertyNotify
500 && xev.xany.window == root 565 && xev.xany.window == root
501 && xev.xproperty.atom == xa[XA_XIM_SERVERS]) 566 && xev.xproperty.atom == xa[XA_XIM_SERVERS])
502 im_change_check (); 567 im_change_check ();
503#endif 568#endif
569 if (xev.type == MappingNotify)
570 XRefreshKeyboardMapping (&xev.xmapping);
571
504 for (int i = xw.size (); i--; ) 572 for (int i = xw.size (); i--; )
505 { 573 {
506 if (!xw[i]) 574 if (!xw[i])
507 xw.erase_unordered (i); 575 xw.erase_unordered (i);
508 else if (xw[i]->window == xev.xany.window) 576 else if (xw[i]->window == xev.xany.window)
509 xw[i]->call (xev); 577 xw[i]->call (xev);
510 } 578 }
511#ifdef USE_XIM 579#ifdef USE_XIM
512 } 580 }
513#endif 581#endif
514 } 582 }
515 while (XEventsQueued (dpy, QueuedAlready)); 583 while (XEventsQueued (dpy, QueuedAlready));
516 584
517 XFlush (dpy); 585 w.stop ();
518}
519
520void rxvt_display::flush ()
521{
522 if (XEventsQueued (dpy, QueuedAlready))
523 x_cb (x_ev, EVENT_READ);
524
525 XFlush (dpy);
526} 586}
527 587
528void rxvt_display::reg (xevent_watcher *w) 588void rxvt_display::reg (xevent_watcher *w)
529{ 589{
590 if (!w->active)
591 {
530 xw.push_back (w); 592 xw.push_back (w);
531 w->active = xw.size (); 593 w->active = xw.size ();
594 }
532} 595}
533 596
534void rxvt_display::unreg (xevent_watcher *w) 597void rxvt_display::unreg (xevent_watcher *w)
535{ 598{
536 if (w->active) 599 if (w->active)
600 {
537 xw[w->active - 1] = 0; 601 xw[w->active - 1] = 0;
602 w->active = 0;
603 }
538} 604}
539 605
540void rxvt_display::set_selection_owner (rxvt_term *owner) 606void rxvt_display::set_selection_owner (rxvt_term *owner, bool clipboard)
541{ 607{
608 rxvt_term * &cur_owner = !clipboard ? selection_owner : clipboard_owner;
609
542 if (selection_owner && selection_owner != owner) 610 if (cur_owner && cur_owner != owner)
543 selection_owner->selection_clear (); 611 {
612 rxvt_term *term = cur_owner;
613 term->selection_clear (clipboard);
614 term->flush ();
615 }
544 616
545 selection_owner = owner; 617 cur_owner = owner;
546} 618}
547 619
548#ifdef USE_XIM 620#ifdef USE_XIM
549 621
550void rxvt_display::reg (im_watcher *w) 622void rxvt_display::reg (im_watcher *w)
… …
563 int l, m; 635 int l, m;
564 636
565 l = strlen (locale); 637 l = strlen (locale);
566 m = strlen (modifiers); 638 m = strlen (modifiers);
567 639
568 if (!(id = (char *)malloc (l + m + 2))) 640 if (!(id = rxvt_temp_buf<char> (l + m + 2)))
569 return 0; 641 return 0;
570 642
571 memcpy (id, locale, l); id[l] = '\n'; 643 memcpy (id, locale, l); id[l] = '\n';
572 memcpy (id + l + 1, modifiers, m); id[l + m + 1] = 0; 644 memcpy (id + l + 1, modifiers, m); id[l + m + 1] = 0;
573 645
574 rxvt_xim *xim = xims.get (id); 646 rxvt_xim *xim = xims.get (id);
575
576 free (id);
577 647
578 return xim; 648 return xim;
579} 649}
580 650
581void rxvt_display::put_xim (rxvt_xim *xim) 651void rxvt_display::put_xim (rxvt_xim *xim)
… …
596 666
597template class refcache<rxvt_display>; 667template class refcache<rxvt_display>;
598refcache<rxvt_display> displays; 668refcache<rxvt_display> displays;
599 669
600///////////////////////////////////////////////////////////////////////////// 670/////////////////////////////////////////////////////////////////////////////
601 671//
672
673static unsigned int
674insert_component (unsigned int value, unsigned int mask, unsigned int shift)
675{
676 return (value * (mask + 1) >> 16) << shift;
677}
678
602bool 679bool
603rxvt_color::alloc (rxvt_screen *screen, const rgba &color) 680rxvt_color::alloc (rxvt_screen *screen, const rgba &color)
604{ 681{
682 //TODO: only supports 24 bit
683 int alpha = color.a >= 0xff00 ? 0xffff : color.a;
684
605#if XFT 685#if XFT
606 XRenderPictFormat *format; 686 XRenderPictFormat *format;
607 687
608 // FUCKING Xft gets it wrong, of course, so work around it. 688 // FUCKING Xft gets it wrong, of course, so work around it.
609 // Transparency users should eat shit and die, and then 689 // Transparency users should eat shit and die, and then
… …
613 { 693 {
614 // the fun lies in doing everything manually... 694 // the fun lies in doing everything manually...
615 c.color.red = color.r; 695 c.color.red = color.r;
616 c.color.green = color.g; 696 c.color.green = color.g;
617 c.color.blue = color.b; 697 c.color.blue = color.b;
618 c.color.alpha = color.a; 698 c.color.alpha = alpha;
619 699
620 c.pixel = ((color.r * format->direct.redMask / rgba::MAX_CC) << format->direct.red ) 700 c.pixel = insert_component (color.r, format->direct.redMask , format->direct.red )
621 | ((color.g * format->direct.greenMask / rgba::MAX_CC) << format->direct.green) 701 | insert_component (color.g, format->direct.greenMask, format->direct.green)
622 | ((color.b * format->direct.blueMask / rgba::MAX_CC) << format->direct.blue ) 702 | insert_component (color.b, format->direct.blueMask , format->direct.blue )
623 | ((color.a * format->direct.alphaMask / rgba::MAX_CC) << format->direct.alpha); 703 | insert_component (alpha , format->direct.alphaMask, format->direct.alpha);
624 704
625 return true; 705 return true;
626 } 706 }
627 else 707 else
628 { 708 {
629 XRenderColor d; 709 XRenderColor d;
630 710
631 d.red = color.r; 711 d.red = color.r;
632 d.green = color.g; 712 d.green = color.g;
633 d.blue = color.b; 713 d.blue = color.b;
634 d.alpha = color.a; 714 d.alpha = alpha;
635 715
636 return XftColorAllocValue (screen->dpy, screen->visual, screen->cmap, &d, &c); 716 return XftColorAllocValue (screen->dpy, screen->visual, screen->cmap, &d, &c);
637 } 717 }
638#else 718#else
639 c.red = color.r; 719 c.red = color.r;
640 c.green = color.g; 720 c.green = color.g;
641 c.blue = color.b; 721 c.blue = color.b;
642 722
643 if (screen->visual->c_class == TrueColor) 723 if (screen->visual->c_class == TrueColor)
644 { 724 {
645 c.pixel = (color.r * (screen->visual->red_mask >> ctz (screen->visual->red_mask )) 725 c.pixel = (color.r >> (16 - rxvt_popcount (screen->visual->red_mask )) << rxvt_ctz (screen->visual->red_mask ))
646 / rgba::MAX_CC) << ctz (screen->visual->red_mask ) 726 | (color.g >> (16 - rxvt_popcount (screen->visual->green_mask)) << rxvt_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 )) 727 | (color.b >> (16 - rxvt_popcount (screen->visual->blue_mask )) << rxvt_ctz (screen->visual->blue_mask ));
650 / rgba::MAX_CC) << ctz (screen->visual->blue_mask );
651 728
652 return true; 729 return true;
653 } 730 }
654 else if (XAllocColor (screen->dpy, screen->cmap, &c)) 731 else if (XAllocColor (screen->dpy, screen->cmap, &c))
655 return true; 732 return true;
… …
667{ 744{
668 rgba c; 745 rgba c;
669 char eos; 746 char eos;
670 int skip; 747 int skip;
671 748
749 c.a = rgba::MAX_CC;
750
672 // parse the nonstandard "[alphapercent]" prefix 751 // parse the nonstandard "[alphapercent]" prefix
673 if (1 <= sscanf (name, "[%hd]%n", &c.a, &skip)) 752 if (1 <= sscanf (name, "[%hd]%n", &c.a, &skip))
674 { 753 {
675 c.a = lerp<int, int, int> (0, rgba::MAX_CC, c.a); 754 c.a = lerp<int, int, int> (0, rgba::MAX_CC, c.a);
676 name += skip; 755 name += skip;
677 } 756 }
678 else
679 c.a = rgba::MAX_CC;
680 757
681 // parse the non-standard "rgba:rrrr/gggg/bbbb/aaaa" format 758 // 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)) 759 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 { 760 {
684 XColor xc, xc_exact; 761 XColor xc;
685 762
686 if (XParseColor (screen->dpy, screen->cmap, name, &xc)) 763 if (XParseColor (screen->dpy, screen->cmap, name, &xc))
687 { 764 {
688 c.r = xc.red; 765 c.r = xc.red;
689 c.g = xc.green; 766 c.g = xc.green;
… …
716 { 793 {
717 XColor *colors = new XColor [screen->visual->map_entries]; 794 XColor *colors = new XColor [screen->visual->map_entries];
718 795
719 for (int i = 0; i < cmap_size; i++) 796 for (int i = 0; i < cmap_size; i++)
720 colors [i].pixel = i; 797 colors [i].pixel = i;
721 798
722 // many kilobytes transfer per colour, but pseudocolor isn't worth 799 // many kilobytes transfer per colour, but pseudocolor isn't worth
723 // many extra optimisations. 800 // many extra optimisations.
724 XQueryColors (screen->dpy, screen->cmap, colors, cmap_size); 801 XQueryColors (screen->dpy, screen->cmap, colors, cmap_size);
725 802
726 int diff = 0x7fffffffUL; 803 int diff = 0x7fffffffUL;
… …
739 } 816 }
740 } 817 }
741 818
742 //rxvt_warn ("could not allocate %04x %04x %04x, getting %04x %04x %04x instead (%d)\n", 819 //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); 820 // color.r, color.g, color.b, best->red, best->green, best->blue, diff);
744 821
745 got = alloc (screen, rgba (best->red, best->green, best->blue)); 822 got = alloc (screen, rgba (best->red, best->green, best->blue));
746 823
747 delete colors; 824 delete [] colors;
748 } 825 }
749#endif 826#endif
750 827
751 return got; 828 return got;
752} 829}
… …
777 color.green = c.g; 854 color.green = c.g;
778 color.blue = c.b; 855 color.blue = c.b;
779 color.pixel = (Pixel)*this; 856 color.pixel = (Pixel)*this;
780} 857}
781 858
782void 859void
783rxvt_color::free (rxvt_screen *screen) 860rxvt_color::free (rxvt_screen *screen)
784{ 861{
862 if (screen->visual->c_class == TrueColor)
863 return; // nothing to do
864
785#if XFT 865#if XFT
786 XftColorFree (screen->dpy, screen->visual, screen->cmap, &c); 866 XftColorFree (screen->dpy, screen->visual, screen->cmap, &c);
787#else 867#else
788 XFreeColors (screen->dpy, screen->cmap, &c.pixel, 1, AllPlanes); 868 XFreeColors (screen->dpy, screen->cmap, &c.pixel, 1, AllPlanes);
789#endif 869#endif
… …
804 lerp (c.a, to.a, percent) 884 lerp (c.a, to.a, percent)
805 ) 885 )
806 ); 886 );
807} 887}
808 888
889#if TRACE_PIXMAPS
890# undef XCreatePixmap
891# undef XFreePixmap
892Pixmap trace_XCreatePixmap (const char *file, int line, Display *dpy, Window r, unsigned int w, unsigned int h, unsigned int d)
893{
894 Pixmap res = XCreatePixmap (dpy, r, w, h, d);
895 fprintf (stderr, "%s:%d: XCreatePixmap (%p,%lX,%u,%u,%u) returned %lX\n", file, line, dpy, r, w, h, d, res);
896 return res;
897}
898
899void trace_XFreePixmap (const char *file, int line, Display *dpy, Pixmap p)
900{
901 fprintf (stderr, "%s:%d: XFreePixmap (%p,%lX)\n", file, line, dpy, p);
902 XFreePixmap (dpy,p);
903}
904#endif

Diff Legend

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