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.48 by root, Thu Feb 2 12:51:22 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
… …
177bool 174bool
178rxvt_xim::ref_init () 175rxvt_xim::ref_init ()
179{ 176{
180 display = GET_R->display; //HACK: TODO 177 display = GET_R->display; //HACK: TODO
181 178
182 xim = XOpenIM (display->display, NULL, NULL, NULL); 179 xim = XOpenIM (display->dpy, 0, 0, 0);
183 180
184 if (!xim) 181 if (!xim)
185 return false; 182 return false;
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, NULL); 188 XSetIMValues (xim, XNDestroyCallback, &ximcallback, 0);
192 189
193 return true; 190 return true;
194} 191}
195 192
196rxvt_xim::~rxvt_xim () 193rxvt_xim::~rxvt_xim ()
… …
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 xdisp = disp->display; 257 dpy = disp->dpy;
211 258
212 Screen *screen = ScreenOfDisplay (xdisp, disp->screen); 259 Screen *screen = ScreenOfDisplay (dpy, disp->screen);
213 260
214 depth = DefaultDepthOfScreen (screen); 261 depth = DefaultDepthOfScreen (screen);
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 (xdisp, 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 (xdisp, 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 (xdisp, display->screen))) 292 if (cmap != DefaultColormapOfScreen (ScreenOfDisplay (dpy, display->screen)))
240 XFreeColormap (xdisp, 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)
… …
248, selection_owner (0) 301, selection_owner (0)
249{ 302{
250} 303}
251 304
252XrmDatabase 305XrmDatabase
253rxvt_display::get_resources () 306rxvt_display::get_resources (bool refresh)
254{ 307{
255 char *homedir = (char *)getenv ("HOME"); 308 char *homedir = (char *)getenv ("HOME");
256 char fname[1024]; 309 char fname[1024];
257 310
258 /* 311 /*
259 * get resources using the X library function 312 * get resources using the X library function
260 */ 313 */
261 char *displayResource, *xe; 314 char *displayResource, *xe;
262 XrmDatabase database, rdb1; 315 XrmDatabase rdb1, database = 0;
263
264 database = NULL;
265 316
266 // 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
267 319
268 // 6. System wide per application default file. 320 // 6. System wide per application default file.
269 321
270 /* Add in $XAPPLRESDIR/Rxvt only; not bothering with XUSERFILESEARCHPATH */ 322 /* Add in $XAPPLRESDIR/Rxvt only; not bothering with XUSERFILESEARCHPATH */
271 if ((xe = (char *)getenv ("XAPPLRESDIR"))) 323 if ((xe = (char *)getenv ("XAPPLRESDIR")))
… …
278 330
279 // 5. User's per application default file. 331 // 5. User's per application default file.
280 // none 332 // none
281 333
282 // 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
283 /* Get any Xserver defaults */ 343 /* Get any Xserver defaults */
344 if (refresh)
345 {
346 // fucking xlib keeps a copy of the rm string
347 Atom actual_type;
348 int actual_format;
349 unsigned long nitems, nremaining;
350 char *val = 0;
351
352#if XLIB_ILLEGAL_ACCESS
353 if (dpy->xdefaults)
354 XFree (dpy->xdefaults);
355#endif
356
357 if (XGetWindowProperty (dpy, RootWindow (dpy, 0), XA_RESOURCE_MANAGER,
358 0L, 100000000L, False,
359 XA_STRING, &actual_type, &actual_format,
360 &nitems, &nremaining,
361 (unsigned char **)&val) == Success
362 && actual_type == XA_STRING
363 && actual_format == 8)
364 displayResource = val;
365 else
366 {
367 displayResource = 0;
368
369 if (val)
370 XFree(val);
371 }
372
373#if XLIB_ILLEGAL_ACCESS
374 dpy->xdefaults = displayResource;
375#endif
376 }
377 else
284 displayResource = XResourceManagerString (display); 378 displayResource = XResourceManagerString (dpy);
285 379
286 if (displayResource != NULL) 380 if (displayResource)
287 { 381 {
288 if ((rdb1 = XrmGetStringDatabase (displayResource))) 382 if ((rdb1 = XrmGetStringDatabase (displayResource)))
289 XrmMergeDatabases (rdb1, &database); 383 XrmMergeDatabases (rdb1, &database);
290 } 384 }
291 else if (homedir)
292 {
293 snprintf (fname, sizeof (fname), "%s/.Xdefaults", homedir);
294 385
295 if ((rdb1 = XrmGetFileDatabase (fname))) 386#if !XLIB_ILLEGAL_ACCESS
296 XrmMergeDatabases (rdb1, &database); 387 if (refresh && displayResource)
297 } 388 XFree (displayResource);
389#endif
298 390
299 /* Get screen specific resources */ 391 /* Get screen specific resources */
300 displayResource = XScreenResourceString (ScreenOfDisplay (display, screen)); 392 displayResource = XScreenResourceString (ScreenOfDisplay (dpy, screen));
301 393
302 if (displayResource != NULL) 394 if (displayResource)
303 { 395 {
304 if ((rdb1 = XrmGetStringDatabase (displayResource))) 396 if ((rdb1 = XrmGetStringDatabase (displayResource)))
305 /* Merge with screen-independent resources */ 397 /* Merge with screen-independent resources */
306 XrmMergeDatabases (rdb1, &database); 398 XrmMergeDatabases (rdb1, &database);
307 399
… …
335 if (id[0] == ':') 427 if (id[0] == ':')
336 { 428 {
337 val = rxvt_malloc (5 + strlen (id) + 1); 429 val = rxvt_malloc (5 + strlen (id) + 1);
338 strcpy (val, "unix/"); 430 strcpy (val, "unix/");
339 strcat (val, id); 431 strcat (val, id);
340 display = XOpenDisplay (val); 432 dpy = XOpenDisplay (val);
341 free (val); 433 free (val);
342 } 434 }
343 else 435 else
344#endif 436#endif
345 display = 0; 437 dpy = 0;
346 438
347 if (!display) 439 if (!dpy)
348 display = XOpenDisplay (id); 440 dpy = XOpenDisplay (id);
349 441
350 if (!display) 442 if (!dpy)
351 return false; 443 return false;
352 444
353 screen = DefaultScreen (display); 445 screen = DefaultScreen (dpy);
354 root = DefaultRootWindow (display); 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
355 452
356 assert (sizeof (xa_names) / sizeof (char *) == NUM_XA); 453 assert (sizeof (xa_names) / sizeof (char *) == NUM_XA);
357 XInternAtoms (display, (char **)xa_names, NUM_XA, False, xa); 454 XInternAtoms (dpy, (char **)xa_names, NUM_XA, False, xa);
358 455
359 XrmSetDatabase (display, get_resources ()); 456 XrmSetDatabase (dpy, get_resources (false));
360 457
361#ifdef POINTER_BLANK 458#ifdef POINTER_BLANK
362 XColor blackcolour; 459 XColor blackcolour;
363 blackcolour.red = 0; 460 blackcolour.red = 0;
364 blackcolour.green = 0; 461 blackcolour.green = 0;
365 blackcolour.blue = 0; 462 blackcolour.blue = 0;
366 Font f = XLoadFont (display, "fixed"); 463 Font f = XLoadFont (dpy, "fixed");
367 blank_cursor = XCreateGlyphCursor (display, f, f, ' ', ' ', 464 blank_cursor = XCreateGlyphCursor (dpy, f, f, ' ', ' ',
368 &blackcolour, &blackcolour); 465 &blackcolour, &blackcolour);
369 XUnloadFont (display, f); 466 XUnloadFont (dpy, f);
370#endif 467#endif
371 468
372 int fd = XConnectionNumber (display); 469 int fd = XConnectionNumber (dpy);
373 470
374#ifndef NO_SLOW_LINK_SUPPORT
375 // try to detect wether we have a local connection. 471 // try to detect wether we have a local connection.
376 // assume unix domains socket == local, everything else not 472 // assume unix domains socket == local, everything else not
377 // TODO: might want to check for inet/127.0.0.1 473 // TODO: might want to check for inet/127.0.0.1
378 is_local = 0; 474 is_local = 0;
379 sockaddr_un sa; 475 sockaddr_un sa;
380 socklen_t sl = sizeof (sa); 476 socklen_t sl = sizeof (sa);
381 477
382 if (!getsockname (fd, (sockaddr *)&sa, &sl)) 478 if (!getsockname (fd, (sockaddr *)&sa, &sl))
383 is_local = sa.sun_family == AF_LOCAL; 479 is_local = sa.sun_family == AF_LOCAL;
384#endif
385 480
386 x_ev.start (fd, EVENT_READ); 481 x_ev.start (fd, EVENT_READ);
387 fcntl (fd, F_SETFD, FD_CLOEXEC); 482 fcntl (fd, F_SETFD, FD_CLOEXEC);
388 483
389 XSelectInput (display, root, PropertyChangeMask); 484 XSelectInput (dpy, root, PropertyChangeMask);
390 485
391 flush (); 486 flush ();
392 487
393 return true; 488 return true;
394} 489}
… …
396void 491void
397rxvt_display::ref_next () 492rxvt_display::ref_next ()
398{ 493{
399 // TODO: somehow check wether the database files/resources changed 494 // TODO: somehow check wether the database files/resources changed
400 // before affording re-loading/parsing 495 // before affording re-loading/parsing
401 XrmDestroyDatabase (XrmGetDatabase (display)); 496 XrmDestroyDatabase (XrmGetDatabase (dpy));
402 XrmSetDatabase (display, get_resources ()); 497 XrmSetDatabase (dpy, get_resources (true));
403} 498}
404 499
405rxvt_display::~rxvt_display () 500rxvt_display::~rxvt_display ()
406{ 501{
407 if (!display) 502 if (!dpy)
408 return; 503 return;
409 504
410#ifdef POINTER_BLANK 505#ifdef POINTER_BLANK
411 XFreeCursor (display, blank_cursor); 506 XFreeCursor (dpy, blank_cursor);
412#endif 507#endif
413 x_ev.stop (); 508 x_ev.stop ();
414#ifdef USE_XIM 509#ifdef USE_XIM
415 xims.clear (); 510 xims.clear ();
416#endif 511#endif
417 XCloseDisplay (display); 512 XCloseDisplay (dpy);
418} 513}
419 514
420#ifdef USE_XIM 515#ifdef USE_XIM
421void rxvt_display::im_change_cb () 516void rxvt_display::im_change_cb ()
422{ 517{
… …
430 // registers, as xlib crashes due to a race otherwise. 525 // registers, as xlib crashes due to a race otherwise.
431 Atom actual_type, *atoms; 526 Atom actual_type, *atoms;
432 int actual_format; 527 int actual_format;
433 unsigned long nitems, bytes_after; 528 unsigned long nitems, bytes_after;
434 529
435 if (XGetWindowProperty (display, root, xa[XA_XIM_SERVERS], 0L, 1000000L, 530 if (XGetWindowProperty (dpy, root, xa[XA_XIM_SERVERS], 0L, 1000000L,
436 False, XA_ATOM, &actual_type, &actual_format, 531 False, XA_ATOM, &actual_type, &actual_format,
437 &nitems, &bytes_after, (unsigned char **)&atoms) 532 &nitems, &bytes_after, (unsigned char **)&atoms)
438 != Success ) 533 != Success )
439 return; 534 return;
440 535
441 if (actual_type == XA_ATOM && actual_format == 32) 536 if (actual_type == XA_ATOM && actual_format == 32)
442 for (int i = 0; i < nitems; i++) 537 for (int i = 0; i < nitems; i++)
443 if (XGetSelectionOwner (display, atoms[i])) 538 if (XGetSelectionOwner (dpy, atoms[i]))
444 { 539 {
445 im_change_cb (); 540 im_change_cb ();
446 break; 541 break;
447 } 542 }
448 543
… …
453void rxvt_display::x_cb (io_watcher &w, short revents) 548void rxvt_display::x_cb (io_watcher &w, short revents)
454{ 549{
455 do 550 do
456 { 551 {
457 XEvent xev; 552 XEvent xev;
458 XNextEvent (display, &xev); 553 XNextEvent (dpy, &xev);
459 554
460#ifdef USE_XIM 555#ifdef USE_XIM
461 if (!XFilterEvent (&xev, None)) 556 if (!XFilterEvent (&xev, None))
462 { 557 {
463 if (xev.type == PropertyNotify 558 if (xev.type == PropertyNotify
… …
474 } 569 }
475#ifdef USE_XIM 570#ifdef USE_XIM
476 } 571 }
477#endif 572#endif
478 } 573 }
479 while (XEventsQueued (display, QueuedAlready)); 574 while (XEventsQueued (dpy, QueuedAlready));
480 575
481 XFlush (display); 576 XFlush (dpy);
482} 577}
483 578
484void rxvt_display::flush () 579void rxvt_display::flush ()
485{ 580{
486 if (XEventsQueued (display, QueuedAlready)) 581 if (XEventsQueued (dpy, QueuedAlready))
487 x_cb (x_ev, EVENT_READ); 582 x_cb (x_ev, EVENT_READ);
488 583
489 XFlush (display); 584 XFlush (dpy);
490} 585}
491 586
492void rxvt_display::reg (xevent_watcher *w) 587void rxvt_display::reg (xevent_watcher *w)
493{ 588{
589 if (!w->active)
590 {
494 xw.push_back (w); 591 xw.push_back (w);
495 w->active = xw.size (); 592 w->active = xw.size ();
593 }
496} 594}
497 595
498void rxvt_display::unreg (xevent_watcher *w) 596void rxvt_display::unreg (xevent_watcher *w)
499{ 597{
500 if (w->active) 598 if (w->active)
599 {
501 xw[w->active - 1] = 0; 600 xw[w->active - 1] = 0;
601 w->active = 0;
602 }
502} 603}
503 604
504void rxvt_display::set_selection_owner (rxvt_term *owner) 605void rxvt_display::set_selection_owner (rxvt_term *owner)
505{ 606{
506 if (selection_owner && selection_owner != owner) 607 if (selection_owner && selection_owner != owner)
… …
551 652
552#endif 653#endif
553 654
554Atom rxvt_display::atom (const char *name) 655Atom rxvt_display::atom (const char *name)
555{ 656{
556 return XInternAtom (display, name, False); 657 return XInternAtom (dpy, name, False);
557} 658}
558 659
559///////////////////////////////////////////////////////////////////////////// 660/////////////////////////////////////////////////////////////////////////////
560 661
561template class refcache<rxvt_display>; 662template class refcache<rxvt_display>;
562refcache<rxvt_display> displays; 663refcache<rxvt_display> displays;
563 664
564///////////////////////////////////////////////////////////////////////////// 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}
565 673
566bool 674bool
567rxvt_color::alloc (rxvt_screen *screen, const rgba &color) 675rxvt_color::alloc (rxvt_screen *screen, const rgba &color)
568{ 676{
569#if XFT 677#if XFT
… …
571 679
572 // FUCKING Xft gets it wrong, of course, so work around it. 680 // FUCKING Xft gets it wrong, of course, so work around it.
573 // Transparency users should eat shit and die, and then 681 // Transparency users should eat shit and die, and then
574 // XRenderQueryPictIndexValues themselves plenty. 682 // XRenderQueryPictIndexValues themselves plenty.
575 if ((screen->visual->c_class == TrueColor) 683 if ((screen->visual->c_class == TrueColor)
576 && (format = XRenderFindVisualFormat (screen->xdisp, screen->visual))) 684 && (format = XRenderFindVisualFormat (screen->dpy, screen->visual)))
577 { 685 {
578 // the fun lies in doing everything manually... 686 // the fun lies in doing everything manually...
579 c.color.red = color.r; 687 c.color.red = color.r;
580 c.color.green = color.g; 688 c.color.green = color.g;
581 c.color.blue = color.b; 689 c.color.blue = color.b;
582 c.color.alpha = color.a; 690 c.color.alpha = color.a;
583 691
584 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 )
585 | ((color.g * format->direct.greenMask / rgba::MAX_CC) << format->direct.green) 693 | insert_component (color.g, format->direct.greenMask, format->direct.green)
586 | ((color.b * format->direct.blueMask / rgba::MAX_CC) << format->direct.blue ) 694 | insert_component (color.b, format->direct.blueMask , format->direct.blue )
587 | ((color.a * format->direct.alphaMask / rgba::MAX_CC) << format->direct.alpha); 695 | insert_component (color.a, format->direct.alphaMask, format->direct.alpha);
588 696
589 return true; 697 return true;
590 } 698 }
591 else 699 else
592 { 700 {
… …
595 d.red = color.r; 703 d.red = color.r;
596 d.green = color.g; 704 d.green = color.g;
597 d.blue = color.b; 705 d.blue = color.b;
598 d.alpha = color.a; 706 d.alpha = color.a;
599 707
600 return XftColorAllocValue (screen->xdisp, screen->visual, screen->cmap, &d, &c); 708 return XftColorAllocValue (screen->dpy, screen->visual, screen->cmap, &d, &c);
601 } 709 }
602#else 710#else
603 c.red = color.r; 711 c.red = color.r;
604 c.green = color.g; 712 c.green = color.g;
605 c.blue = color.b; 713 c.blue = color.b;
606 714
607 if (screen->visual->c_class == TrueColor) 715 if (screen->visual->c_class == TrueColor)
608 { 716 {
609 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 ))
610 / rgba::MAX_CC) << ctz (screen->visual->red_mask ) 718 | (color.g >> (16 - popcount (screen->visual->green_mask)) << ctz (screen->visual->green_mask))
611 | (color.g * (screen->visual->green_mask >> ctz (screen->visual->green_mask))
612 / rgba::MAX_CC) << ctz (screen->visual->green_mask)
613 | (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 ));
614 / rgba::MAX_CC) << ctz (screen->visual->blue_mask );
615 720
616 return true; 721 return true;
617 } 722 }
618 else if (XAllocColor (screen->xdisp, screen->cmap, &c)) 723 else if (XAllocColor (screen->dpy, screen->cmap, &c))
619 return true; 724 return true;
620 else 725 else
621 c.pixel = (color.r + color.g + color.b) > 128*3 726 c.pixel = (color.r + color.g + color.b) > 128*3
622 ? WhitePixelOfScreen (DefaultScreenOfDisplay (screen->xdisp)) 727 ? WhitePixelOfScreen (DefaultScreenOfDisplay (screen->dpy))
623 : BlackPixelOfScreen (DefaultScreenOfDisplay (screen->xdisp)); 728 : BlackPixelOfScreen (DefaultScreenOfDisplay (screen->dpy));
624#endif 729#endif
625 730
626 return false; 731 return false;
627} 732}
628 733
… …
645 // parse the non-standard "rgba:rrrr/gggg/bbbb/aaaa" format 750 // parse the non-standard "rgba:rrrr/gggg/bbbb/aaaa" format
646 if (strlen (name) != 4+5*4 || 4 != sscanf (name, "rgba:%4hx/%4hx/%4hx/%4hx%c", &c.r, &c.g, &c.b, &c.a, &eos)) 751 if (strlen (name) != 4+5*4 || 4 != sscanf (name, "rgba:%4hx/%4hx/%4hx/%4hx%c", &c.r, &c.g, &c.b, &c.a, &eos))
647 { 752 {
648 XColor xc, xc_exact; 753 XColor xc, xc_exact;
649 754
650 if (XParseColor (screen->xdisp, screen->cmap, name, &xc)) 755 if (XParseColor (screen->dpy, screen->cmap, name, &xc))
651 { 756 {
652 c.r = xc.red; 757 c.r = xc.red;
653 c.g = xc.green; 758 c.g = xc.green;
654 c.b = xc.blue; 759 c.b = xc.blue;
655 } 760 }
… …
683 for (int i = 0; i < cmap_size; i++) 788 for (int i = 0; i < cmap_size; i++)
684 colors [i].pixel = i; 789 colors [i].pixel = i;
685 790
686 // many kilobytes transfer per colour, but pseudocolor isn't worth 791 // many kilobytes transfer per colour, but pseudocolor isn't worth
687 // many extra optimisations. 792 // many extra optimisations.
688 XQueryColors (screen->xdisp, screen->cmap, colors, cmap_size); 793 XQueryColors (screen->dpy, screen->cmap, colors, cmap_size);
689 794
690 int diff = 0x7fffffffUL; 795 int diff = 0x7fffffffUL;
691 XColor *best = colors; 796 XColor *best = colors;
692 797
693 for (int i = 0; i < cmap_size; i++) 798 for (int i = 0; i < cmap_size; i++)
… …
706 //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",
707 // 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);
708 813
709 got = alloc (screen, rgba (best->red, best->green, best->blue)); 814 got = alloc (screen, rgba (best->red, best->green, best->blue));
710 815
711 delete colors; 816 delete [] colors;
712 } 817 }
713#endif 818#endif
714 819
715 return got; 820 return got;
716} 821}
… …
744} 849}
745 850
746void 851void
747rxvt_color::free (rxvt_screen *screen) 852rxvt_color::free (rxvt_screen *screen)
748{ 853{
854 if (screen->visual->c_class == TrueColor)
855 return; // nothing to do
856
749#if XFT 857#if XFT
750 XftColorFree (screen->xdisp, screen->visual, screen->cmap, &c); 858 XftColorFree (screen->dpy, screen->visual, screen->cmap, &c);
751#else 859#else
752 XFreeColors (screen->xdisp, screen->cmap, &c.pixel, 1, AllPlanes); 860 XFreeColors (screen->dpy, screen->cmap, &c.pixel, 1, AllPlanes);
753#endif 861#endif
754} 862}
755 863
756void 864void
757rxvt_color::fade (rxvt_screen *screen, int percent, rxvt_color &result, const rgba &to) 865rxvt_color::fade (rxvt_screen *screen, int percent, rxvt_color &result, const rgba &to)

Diff Legend

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