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.38 by root, Mon Jan 30 19:46:13 2006 UTC vs.
Revision 1.60 by root, Wed Jul 5 20:37:31 2006 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);
355 447
356 assert (sizeof (xa_names) / sizeof (char *) == NUM_XA); 448 assert (sizeof (xa_names) / sizeof (char *) == NUM_XA);
357 XInternAtoms (display, (char **)xa_names, NUM_XA, False, xa); 449 XInternAtoms (dpy, (char **)xa_names, NUM_XA, False, xa);
358 450
359 XrmSetDatabase (display, get_resources ()); 451 XrmSetDatabase (dpy, get_resources (false));
360 452
361#ifdef POINTER_BLANK 453#ifdef POINTER_BLANK
362 XColor blackcolour; 454 XColor blackcolour;
363 blackcolour.red = 0; 455 blackcolour.red = 0;
364 blackcolour.green = 0; 456 blackcolour.green = 0;
365 blackcolour.blue = 0; 457 blackcolour.blue = 0;
366 Font f = XLoadFont (display, "fixed"); 458 Font f = XLoadFont (dpy, "fixed");
367 blank_cursor = XCreateGlyphCursor (display, f, f, ' ', ' ', 459 blank_cursor = XCreateGlyphCursor (dpy, f, f, ' ', ' ',
368 &blackcolour, &blackcolour); 460 &blackcolour, &blackcolour);
369 XUnloadFont (display, f); 461 XUnloadFont (dpy, f);
370#endif 462#endif
371 463
372 int fd = XConnectionNumber (display); 464 int fd = XConnectionNumber (dpy);
373 465
374#ifndef NO_SLOW_LINK_SUPPORT
375 // try to detect wether we have a local connection. 466 // try to detect wether we have a local connection.
376 // assume unix domains socket == local, everything else not 467 // assume unix domains socket == local, everything else not
377 // TODO: might want to check for inet/127.0.0.1 468 // TODO: might want to check for inet/127.0.0.1
378 is_local = 0; 469 is_local = 0;
379 sockaddr_un sa; 470 sockaddr_un sa;
380 socklen_t sl = sizeof (sa); 471 socklen_t sl = sizeof (sa);
381 472
382 if (!getsockname (fd, (sockaddr *)&sa, &sl)) 473 if (!getsockname (fd, (sockaddr *)&sa, &sl))
383 is_local = sa.sun_family == AF_LOCAL; 474 is_local = sa.sun_family == AF_LOCAL;
384#endif
385 475
386 x_ev.start (fd, EVENT_READ); 476 x_ev.start (fd, EVENT_READ);
387 fcntl (fd, F_SETFD, FD_CLOEXEC); 477 fcntl (fd, F_SETFD, FD_CLOEXEC);
388 478
389 XSelectInput (display, root, PropertyChangeMask); 479 XSelectInput (dpy, root, PropertyChangeMask);
390 480
391 flush (); 481 flush ();
392 482
393 return true; 483 return true;
394} 484}
395 485
396void 486void
397rxvt_display::ref_next () 487rxvt_display::ref_next ()
398{ 488{
399 // TODO: somehow check wether the database files/resources changed 489 // TODO: somehow check wether the database files/resources changed
400 // before re-loading/parsing 490 // before affording re-loading/parsing
401 XrmDestroyDatabase (XrmGetDatabase (display)); 491 XrmDestroyDatabase (XrmGetDatabase (dpy));
402 XrmSetDatabase (display, get_resources ()); 492 XrmSetDatabase (dpy, get_resources (true));
403} 493}
404 494
405rxvt_display::~rxvt_display () 495rxvt_display::~rxvt_display ()
406{ 496{
407 if (!display) 497 if (!dpy)
408 return; 498 return;
409 499
410#ifdef POINTER_BLANK 500#ifdef POINTER_BLANK
411 XFreeCursor (display, blank_cursor); 501 XFreeCursor (dpy, blank_cursor);
412#endif 502#endif
413 x_ev.stop (); 503 x_ev.stop ();
414#ifdef USE_XIM 504#ifdef USE_XIM
415 xims.clear (); 505 xims.clear ();
416#endif 506#endif
417 XCloseDisplay (display); 507 XCloseDisplay (dpy);
418} 508}
419 509
420#ifdef USE_XIM 510#ifdef USE_XIM
421void rxvt_display::im_change_cb () 511void rxvt_display::im_change_cb ()
422{ 512{
… …
430 // registers, as xlib crashes due to a race otherwise. 520 // registers, as xlib crashes due to a race otherwise.
431 Atom actual_type, *atoms; 521 Atom actual_type, *atoms;
432 int actual_format; 522 int actual_format;
433 unsigned long nitems, bytes_after; 523 unsigned long nitems, bytes_after;
434 524
435 if (XGetWindowProperty (display, root, xa[XA_XIM_SERVERS], 0L, 1000000L, 525 if (XGetWindowProperty (dpy, root, xa[XA_XIM_SERVERS], 0L, 1000000L,
436 False, XA_ATOM, &actual_type, &actual_format, 526 False, XA_ATOM, &actual_type, &actual_format,
437 &nitems, &bytes_after, (unsigned char **)&atoms) 527 &nitems, &bytes_after, (unsigned char **)&atoms)
438 != Success ) 528 != Success )
439 return; 529 return;
440 530
441 if (actual_type == XA_ATOM && actual_format == 32) 531 if (actual_type == XA_ATOM && actual_format == 32)
442 for (int i = 0; i < nitems; i++) 532 for (int i = 0; i < nitems; i++)
443 if (XGetSelectionOwner (display, atoms[i])) 533 if (XGetSelectionOwner (dpy, atoms[i]))
444 { 534 {
445 im_change_cb (); 535 im_change_cb ();
446 break; 536 break;
447 } 537 }
448 538
… …
453void rxvt_display::x_cb (io_watcher &w, short revents) 543void rxvt_display::x_cb (io_watcher &w, short revents)
454{ 544{
455 do 545 do
456 { 546 {
457 XEvent xev; 547 XEvent xev;
458 XNextEvent (display, &xev); 548 XNextEvent (dpy, &xev);
459 549
460#ifdef USE_XIM 550#ifdef USE_XIM
461 if (!XFilterEvent (&xev, None)) 551 if (!XFilterEvent (&xev, None))
462 { 552 {
463 if (xev.type == PropertyNotify 553 if (xev.type == PropertyNotify
… …
474 } 564 }
475#ifdef USE_XIM 565#ifdef USE_XIM
476 } 566 }
477#endif 567#endif
478 } 568 }
479 while (XEventsQueued (display, QueuedAlready)); 569 while (XEventsQueued (dpy, QueuedAlready));
480 570
481 XFlush (display); 571 XFlush (dpy);
482} 572}
483 573
484void rxvt_display::flush () 574void rxvt_display::flush ()
485{ 575{
486 if (XEventsQueued (display, QueuedAlready)) 576 if (XEventsQueued (dpy, QueuedAlready))
487 x_cb (x_ev, EVENT_READ); 577 x_cb (x_ev, EVENT_READ);
488 578
489 XFlush (display); 579 XFlush (dpy);
490} 580}
491 581
492void rxvt_display::reg (xevent_watcher *w) 582void rxvt_display::reg (xevent_watcher *w)
493{ 583{
494 xw.push_back (w); 584 xw.push_back (w);
… …
508 598
509 selection_owner = owner; 599 selection_owner = owner;
510} 600}
511 601
512#ifdef USE_XIM 602#ifdef USE_XIM
603
513void rxvt_display::reg (im_watcher *w) 604void rxvt_display::reg (im_watcher *w)
514{ 605{
515 imw.push_back (w); 606 imw.push_back (w);
516} 607}
517 608
… …
541 return xim; 632 return xim;
542} 633}
543 634
544void rxvt_display::put_xim (rxvt_xim *xim) 635void rxvt_display::put_xim (rxvt_xim *xim)
545{ 636{
546#if XLIB_IS_RACEFREE 637# if XLIB_IS_RACEFREE
547 xims.put (xim); 638 xims.put (xim);
548#endif 639# endif
549} 640}
641
550#endif 642#endif
551 643
552Atom rxvt_display::atom (const char *name) 644Atom rxvt_display::atom (const char *name)
553{ 645{
554 return XInternAtom (display, name, False); 646 return XInternAtom (dpy, name, False);
555} 647}
556 648
557///////////////////////////////////////////////////////////////////////////// 649/////////////////////////////////////////////////////////////////////////////
558 650
559template class refcache<rxvt_display>; 651template class refcache<rxvt_display>;
560refcache<rxvt_display> displays; 652refcache<rxvt_display> displays;
561 653
562///////////////////////////////////////////////////////////////////////////// 654/////////////////////////////////////////////////////////////////////////////
655//
656
657static unsigned int
658insert_component (unsigned int value, unsigned int mask, unsigned int shift)
659{
660 return (value * (mask + 1) >> 16) << shift;
661}
563 662
564bool 663bool
565rxvt_color::alloc (rxvt_screen *screen, rxvt_rgba rgba) 664rxvt_color::alloc (rxvt_screen *screen, const rgba &color)
566{ 665{
567#if XFT 666#if XFT
568 XRenderPictFormat *format; 667 XRenderPictFormat *format;
569 668
570 // FUCKING Xft gets it wrong, of course, so work around it 669 // FUCKING Xft gets it wrong, of course, so work around it.
571 // transparency users should eat shit and die, and then 670 // Transparency users should eat shit and die, and then
572 // XRenderQueryPictIndexValues themselves plenty. 671 // XRenderQueryPictIndexValues themselves plenty.
573 if ((screen->visual->c_class == TrueColor || screen->visual->c_class == DirectColor) 672 if ((screen->visual->c_class == TrueColor)
574 && (format = XRenderFindVisualFormat (screen->xdisp, screen->visual))) 673 && (format = XRenderFindVisualFormat (screen->dpy, screen->visual)))
575 { 674 {
576 // the fun lies in doing everything manually... 675 // the fun lies in doing everything manually...
577 c.color.red = rgba.r; 676 c.color.red = color.r;
578 c.color.green = rgba.g; 677 c.color.green = color.g;
579 c.color.blue = rgba.b; 678 c.color.blue = color.b;
580 c.color.alpha = rgba.a; 679 c.color.alpha = color.a;
581 680
582 c.pixel = ((rgba.r * format->direct.redMask / rxvt_rgba::MAX_CC) << format->direct.red ) 681 c.pixel = insert_component (color.r, format->direct.redMask , format->direct.red )
583 | ((rgba.g * format->direct.greenMask / rxvt_rgba::MAX_CC) << format->direct.green) 682 | insert_component (color.g, format->direct.greenMask, format->direct.green)
584 | ((rgba.b * format->direct.blueMask / rxvt_rgba::MAX_CC) << format->direct.blue ) 683 | insert_component (color.b, format->direct.blueMask , format->direct.blue )
585 | ((rgba.a * format->direct.alphaMask / rxvt_rgba::MAX_CC) << format->direct.alpha); 684 | insert_component (color.a, format->direct.alphaMask, format->direct.alpha);
586 685
587 return true; 686 return true;
588 } 687 }
589 else 688 else
590 { 689 {
591 XRenderColor d; 690 XRenderColor d;
592 691
593 d.red = rgba.r; 692 d.red = color.r;
594 d.green = rgba.g; 693 d.green = color.g;
595 d.blue = rgba.b; 694 d.blue = color.b;
596 d.alpha = rgba.a; 695 d.alpha = color.a;
597 696
598 return XftColorAllocValue (screen->xdisp, screen->visual, screen->cmap, &d, &c); 697 return XftColorAllocValue (screen->dpy, screen->visual, screen->cmap, &d, &c);
599 } 698 }
600#else 699#else
601 if (screen->visual->c_class == TrueColor || screen->visual->c_class == DirectColor) 700 c.red = color.r;
701 c.green = color.g;
702 c.blue = color.b;
703
704 if (screen->visual->c_class == TrueColor)
602 { 705 {
603 p = (rgba.r * (screen->visual->red_mask >> ctz (screen->visual->red_mask )) 706 c.pixel = (color.r * (screen->visual->red_mask >> ctz (screen->visual->red_mask ))
604 / rxvt_rgba::MAX_CC) << ctz (screen->visual->red_mask ) 707 / rgba::MAX_CC) << ctz (screen->visual->red_mask )
605 | (rgba.g * (screen->visual->green_mask >> ctz (screen->visual->green_mask)) 708 | (color.g * (screen->visual->green_mask >> ctz (screen->visual->green_mask))
606 / rxvt_rgba::MAX_CC) << ctz (screen->visual->green_mask) 709 / rgba::MAX_CC) << ctz (screen->visual->green_mask)
607 | (rgba.b * (screen->visual->blue_mask >> ctz (screen->visual->blue_mask )) 710 | (color.b * (screen->visual->blue_mask >> ctz (screen->visual->blue_mask ))
608 / rxvt_rgba::MAX_CC) << ctz (screen->visual->blue_mask ); 711 / rgba::MAX_CC) << ctz (screen->visual->blue_mask );
609 712
610 return true; 713 return true;
611 } 714 }
715 else if (XAllocColor (screen->dpy, screen->cmap, &c))
716 return true;
612 else 717 else
613 { 718 c.pixel = (color.r + color.g + color.b) > 128*3
614 XColor xc;
615
616 xc.red = rgba.r;
617 xc.green = rgba.g;
618 xc.blue = rgba.b;
619
620 if (XAllocColor (screen->xdisp, screen->cmap, &xc))
621 {
622 p = xc.pixel;
623 return true;
624 }
625 else
626 p = (rgba.r + rgba.g + rgba.b) > 128*3
627 ? WhitePixelOfScreen (DefaultScreenOfDisplay (screen->xdisp)) 719 ? WhitePixelOfScreen (DefaultScreenOfDisplay (screen->dpy))
628 : BlackPixelOfScreen (DefaultScreenOfDisplay (screen->xdisp)); 720 : BlackPixelOfScreen (DefaultScreenOfDisplay (screen->dpy));
629 }
630#endif 721#endif
631 722
632 return false; 723 return false;
633} 724}
634 725
635bool 726bool
636rxvt_color::set (rxvt_screen *screen, const char *name) 727rxvt_color::set (rxvt_screen *screen, const char *name)
637{ 728{
638 int l = strlen (name); 729 rgba c;
639 rxvt_rgba r;
640 char eos; 730 char eos;
641 int mult; 731 int skip;
642 XColor xc, xc_exact;
643 732
644 // parse a number of non-standard ARGB colour specifications 733 // parse the nonstandard "[alphapercent]" prefix
645 if ( l == 1+4*1 && 4 == sscanf (name, "#%1hx%1hx%1hx%1hx%c", &r.a, &r.r, &r.g, &r.b, &eos)) 734 if (1 <= sscanf (name, "[%hd]%n", &c.a, &skip))
646 mult = rxvt_rgba::MAX_CC / 0x0010;
647 else if (l == 1+4*2 && 4 == sscanf (name, "#%2hx%2hx%2hx%2hx%c", &r.a, &r.r, &r.g, &r.b, &eos))
648 mult = rxvt_rgba::MAX_CC / 0x0100;
649 else if (l == 1+4*4 && 4 == sscanf (name, "#%4hx%4hx%4hx%4hx%c", &r.a, &r.r, &r.g, &r.b, &eos))
650 mult = rxvt_rgba::MAX_CC / 0x0100;
651 else if (l == 4+5*4 && 4 == sscanf (name, "rgba:%hx/%hx/%hx/%hx%c", &r.r, &r.g, &r.b, &r.a, &eos))
652 mult = rxvt_rgba::MAX_CC / 0xffff;
653 else if (XParseColor (screen->xdisp, screen->cmap, name, &xc))
654 { 735 {
655 r.r = xc.red; 736 c.a = lerp<int, int, int> (0, rgba::MAX_CC, c.a);
656 r.g = xc.green; 737 name += skip;
657 r.b = xc.blue;
658 mult = rxvt_rgba::MAX_CC / 0xffff;
659 } 738 }
660 else 739 else
740 c.a = rgba::MAX_CC;
741
742 // parse the non-standard "rgba:rrrr/gggg/bbbb/aaaa" format
743 if (strlen (name) != 4+5*4 || 4 != sscanf (name, "rgba:%4hx/%4hx/%4hx/%4hx%c", &c.r, &c.g, &c.b, &c.a, &eos))
661 { 744 {
745 XColor xc, xc_exact;
746
747 if (XParseColor (screen->dpy, screen->cmap, name, &xc))
748 {
749 c.r = xc.red;
750 c.g = xc.green;
751 c.b = xc.blue;
752 }
753 else
754 {
755 c.r = 0xffff;
756 c.g = 0x6969;
757 c.b = 0xb4b4;
758
662 rxvt_warn ("failed to allocate color '%s', using pink instead.\n", name); 759 rxvt_warn ("unable to parse color '%s', using pink instead.\n", name);
663 r.r = 255; 760 }
664 r.g = 105;
665 r.b = 180;
666 mult = rxvt_rgba::MAX_CC / 0x00ff;
667 } 761 }
668 762
669 r.r *= mult; r.g *= mult; r.b *= mult; r.a *= mult;
670
671 return set (screen, r); 763 return set (screen, c);
672} 764}
673 765
674bool 766bool
675rxvt_color::set (rxvt_screen *screen, rxvt_rgba rgba) 767rxvt_color::set (rxvt_screen *screen, const rgba &color)
676{ 768{
677 bool got = alloc (screen, rgba); 769 bool got = alloc (screen, color);
678 770
679#if !ENABLE_MINIMAL 771#if !ENABLE_MINIMAL
680 int cmap_size = screen->visual->map_entries; 772 int cmap_size = screen->visual->map_entries;
681 773
682 if (!got 774 if (!got
… …
686 XColor *colors = new XColor [screen->visual->map_entries]; 778 XColor *colors = new XColor [screen->visual->map_entries];
687 779
688 for (int i = 0; i < cmap_size; i++) 780 for (int i = 0; i < cmap_size; i++)
689 colors [i].pixel = i; 781 colors [i].pixel = i;
690 782
783 // many kilobytes transfer per colour, but pseudocolor isn't worth
784 // many extra optimisations.
691 XQueryColors (screen->xdisp, screen->cmap, colors, cmap_size); 785 XQueryColors (screen->dpy, screen->cmap, colors, cmap_size);
692 786
693 int diff = 0x7fffffffUL; 787 int diff = 0x7fffffffUL;
694 XColor *best = colors; 788 XColor *best = colors;
695 789
696 for (int i = 0; i < cmap_size; i++) 790 for (int i = 0; i < cmap_size; i++)
697 { 791 {
698 int d = (squared_diff<int> (rgba.r >> 2, colors [i].red >> 2)) 792 int d = (squared_diff<int> (color.r >> 2, colors [i].red >> 2))
699 + (squared_diff<int> (rgba.g >> 2, colors [i].green >> 2)) 793 + (squared_diff<int> (color.g >> 2, colors [i].green >> 2))
700 + (squared_diff<int> (rgba.b >> 2, colors [i].blue >> 2)); 794 + (squared_diff<int> (color.b >> 2, colors [i].blue >> 2));
701 795
702 if (d < diff) 796 if (d < diff)
703 { 797 {
704 diff = d; 798 diff = d;
705 best = colors + i; 799 best = colors + i;
706 } 800 }
707 } 801 }
708 802
709 //rxvt_warn ("could not allocate %04x %04x %04x, getting %04x %04x %04x instead (%d)\n", 803 //rxvt_warn ("could not allocate %04x %04x %04x, getting %04x %04x %04x instead (%d)\n",
710 // rgba.r, rgba.g, rgba.b, best->red, best->green, best->blue, diff); 804 // color.r, color.g, color.b, best->red, best->green, best->blue, diff);
711 805
712 got = alloc (screen, rxvt_rgba (best->red, best->green, best->blue)); 806 got = alloc (screen, rgba (best->red, best->green, best->blue));
713 807
714 delete colors; 808 delete colors;
715 } 809 }
716#endif 810#endif
717 811
718 return got; 812 return got;
719} 813}
720 814
721void 815void
722rxvt_color::get (rxvt_screen *screen, rxvt_rgba &rgba) 816rxvt_color::get (rgba &color)
723{ 817{
724#if XFT 818#if XFT
725 rgba.r = c.color.red; 819 color.r = c.color.red;
726 rgba.g = c.color.green; 820 color.g = c.color.green;
727 rgba.b = c.color.blue; 821 color.b = c.color.blue;
728 rgba.a = c.color.alpha; 822 color.a = c.color.alpha;
729#else 823#else
730 XColor c;
731
732 c.pixel = p;
733 XQueryColor (screen->xdisp, screen->cmap, &c);
734
735 rgba.r = c.red; 824 color.r = c.red;
736 rgba.g = c.green; 825 color.g = c.green;
737 rgba.b = c.blue; 826 color.b = c.blue;
738 rgba.a = rxvt_rgba::MAX_CC; 827 color.a = rgba::MAX_CC;
739#endif 828#endif
829}
830
831void
832rxvt_color::get (XColor &color)
833{
834 rgba c;
835 get (c);
836
837 color.red = c.r;
838 color.green = c.g;
839 color.blue = c.b;
840 color.pixel = (Pixel)*this;
740} 841}
741 842
742void 843void
743rxvt_color::free (rxvt_screen *screen) 844rxvt_color::free (rxvt_screen *screen)
744{ 845{
846 if (screen->visual->c_class == TrueColor)
847 return; // nothing to do
848
745#if XFT 849#if XFT
746 XftColorFree (screen->xdisp, screen->visual, screen->cmap, &c); 850 XftColorFree (screen->dpy, screen->visual, screen->cmap, &c);
747#else 851#else
748 XFreeColors (screen->xdisp, screen->cmap, &p, 1, AllPlanes); 852 XFreeColors (screen->dpy, screen->cmap, &c.pixel, 1, AllPlanes);
749#endif 853#endif
750} 854}
751 855
752rxvt_color 856void
753rxvt_color::fade (rxvt_screen *screen, int percent)
754{
755 rxvt_color faded;
756
757 rxvt_rgba c;
758 get (screen, c);
759
760 c.r = lerp (0, c.r, percent);
761 c.g = lerp (0, c.g, percent);
762 c.b = lerp (0, c.b, percent);
763
764 faded.set (screen, c);
765
766 return faded;
767}
768
769rxvt_color
770rxvt_color::fade (rxvt_screen *screen, int percent, rxvt_color &fadeto) 857rxvt_color::fade (rxvt_screen *screen, int percent, rxvt_color &result, const rgba &to)
771{ 858{
772 rxvt_rgba c, fc; 859 rgba c;
773 rxvt_color faded; 860 get (c);
774
775 get (screen, c);
776 fadeto.get (screen, fc);
777 861
778 faded.set ( 862 result.set (
779 screen, 863 screen,
780 rxvt_rgba ( 864 rgba (
781 lerp (fc.r, c.r, percent), 865 lerp (c.r, to.r, percent),
782 lerp (fc.g, c.g, percent), 866 lerp (c.g, to.g, percent),
783 lerp (fc.b, c.b, percent), 867 lerp (c.b, to.b, percent),
784 lerp (fc.a, c.a, percent) 868 lerp (c.a, to.a, percent)
785 ) 869 )
786 ); 870 );
787
788 return faded;
789} 871}
790 872

Diff Legend

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