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.24 by root, Wed Jan 25 00:42:21 2006 UTC vs.
Revision 1.51 by root, Sat Feb 18 14:14:43 2006 UTC

… …
32#ifndef NO_SLOW_LINK_SUPPORT 32#ifndef NO_SLOW_LINK_SUPPORT
33# include <sys/socket.h> 33# include <sys/socket.h>
34# include <sys/un.h> 34# include <sys/un.h>
35#endif 35#endif
36 36
37#if XFT
38# include <X11/extensions/Xrender.h>
39#endif
40
41const char *const xa_names[] =
42{
43 "TEXT",
44 "COMPOUND_TEXT",
45 "UTF8_STRING",
46 "MULTIPLE",
47 "TARGETS",
48 "TIMESTAMP",
49 "VT_SELECTION",
50 "INCR",
51 "WM_PROTOCOLS",
52 "WM_DELETE_WINDOW",
53 "CLIPBOARD",
54 "AVERAGE_WIDTH",
55 "WEIGHT_NAME",
56 "SLANT",
57 "CHARSET_REGISTRY",
58 "CHARSET_ENCODING",
59#if ENABLE_FRILLS
60 "_MOTIF_WM_HINTS",
61#endif
62#if ENABLE_EWMH
63 "_NET_WM_PID",
64 "_NET_WM_NAME",
65 "_NET_WM_ICON_NAME",
66 "_NET_WM_PING",
67#endif
68#if USE_XIM
69 "WM_LOCALE_NAME",
70 "XIM_SERVERS",
71#endif
72#ifdef TRANSPARENT
73 "_XROOTPMAP_ID",
74 "ESETROOT_PMAP_ID",
75#endif
76#if ENABLE_XEMBED
77 "_XEMBED",
78 "_XEMBED_INFO",
79#endif
80#if !ENABLE_MINIMAL
81 "SCREEN_RESOURCES",
82 "XDCCC_LINEAR_RGB_CORRECTION",
83 "XDCCC_LINEAR_RGB_MATRICES",
84 "WM_COLORMAP_WINDOWS",
85 "WM_STATE",
86 "cursor",
87# if USE_XIM
88 "TRANSPORT",
89 "LOCALES",
90 "_XIM_PROTOCOL",
91 "_XIM_XCONNECT",
92 "_XIM_MOREDATA",
93# endif
94#endif
95};
96
97/////////////////////////////////////////////////////////////////////////////
98
37refcounted::refcounted (const char *id) 99refcounted::refcounted (const char *id)
38{ 100{
39 this->id = strdup (id); 101 this->id = strdup (id);
40} 102}
41 103
… …
115bool 177bool
116rxvt_xim::ref_init () 178rxvt_xim::ref_init ()
117{ 179{
118 display = GET_R->display; //HACK: TODO 180 display = GET_R->display; //HACK: TODO
119 181
120 xim = XOpenIM (display->display, NULL, NULL, NULL); 182 xim = XOpenIM (display->dpy, 0, 0, 0);
121 183
122 if (!xim) 184 if (!xim)
123 return false; 185 return false;
124 186
125 XIMCallback ximcallback; 187 XIMCallback ximcallback;
126 ximcallback.client_data = (XPointer)this; 188 ximcallback.client_data = (XPointer)this;
127 ximcallback.callback = im_destroy_cb; 189 ximcallback.callback = im_destroy_cb;
128 190
129 XSetIMValues (xim, XNDestroyCallback, &ximcallback, NULL); 191 XSetIMValues (xim, XNDestroyCallback, &ximcallback, 0);
130 192
131 return true; 193 return true;
132} 194}
133 195
134rxvt_xim::~rxvt_xim () 196rxvt_xim::~rxvt_xim ()
… …
136 if (xim) 198 if (xim)
137 XCloseIM (xim); 199 XCloseIM (xim);
138} 200}
139 201
140#endif 202#endif
203
204/////////////////////////////////////////////////////////////////////////////
205
206#if XFT
207rxvt_drawable::~rxvt_drawable ()
208{
209 if (xftdrawable)
210 XftDrawDestroy (xftdrawable);
211}
212
213rxvt_drawable::operator XftDraw *()
214{
215 if (!xftdrawable)
216 xftdrawable = XftDrawCreate (screen->dpy, drawable, screen->visual, screen->cmap);
217
218 return xftdrawable;
219}
220#endif
221
222/////////////////////////////////////////////////////////////////////////////
223
224#if XFT
225
226// not strictly necessary as it is only used with superclass of zero_initialised
227rxvt_screen::rxvt_screen ()
228: scratch_area (0)
229{
230}
231
232rxvt_drawable &rxvt_screen::scratch_drawable (int w, int h)
233{
234 // it's actually faster to re-allocate every time. don't ask me
235 // why, but its likely no big deal there are no roundtrips
236 // (I think/hope).
237 if (!scratch_area || w > scratch_w || h > scratch_h || 1/*D*/)
238 {
239 if (scratch_area)
240 {
241 XFreePixmap (dpy, scratch_area->drawable);
242 delete scratch_area;
243 }
244
245 Pixmap pm = XCreatePixmap (dpy, RootWindowOfScreen (ScreenOfDisplay (dpy, display->screen)),
246 scratch_w = w, scratch_h = h, depth);
247
248 scratch_area = new rxvt_drawable (this, pm);
249 }
250
251 return *scratch_area;
252}
253
254#endif
255
256void
257rxvt_screen::set (rxvt_display *disp)
258{
259 display = disp;
260 dpy = disp->dpy;
261
262 Screen *screen = ScreenOfDisplay (dpy, disp->screen);
263
264 depth = DefaultDepthOfScreen (screen);
265 visual = DefaultVisualOfScreen (screen);
266 cmap = DefaultColormapOfScreen (screen);
267}
268
269void
270rxvt_screen::set (rxvt_display *disp, int bitdepth)
271{
272 set (disp);
273
274#if XFT
275 XVisualInfo vinfo;
276
277 if (XMatchVisualInfo (dpy, display->screen, bitdepth, TrueColor, &vinfo))
278 {
279 depth = bitdepth;
280 visual = vinfo.visual;
281 cmap = XCreateColormap (dpy, disp->root, visual, AllocNone);
282 }
283#endif
284}
285
286void
287rxvt_screen::clear ()
288{
289#if XFT
290 if (scratch_area)
291 {
292 XFreePixmap (dpy, scratch_area->drawable);
293 delete scratch_area;
294 }
295#endif
296
297 if (cmap != DefaultColormapOfScreen (ScreenOfDisplay (dpy, display->screen)))
298 XFreeColormap (dpy, cmap);
299}
141 300
142///////////////////////////////////////////////////////////////////////////// 301/////////////////////////////////////////////////////////////////////////////
143 302
144rxvt_display::rxvt_display (const char *id) 303rxvt_display::rxvt_display (const char *id)
145: refcounted (id) 304: refcounted (id)
… …
147, selection_owner (0) 306, selection_owner (0)
148{ 307{
149} 308}
150 309
151XrmDatabase 310XrmDatabase
152rxvt_display::get_resources () 311rxvt_display::get_resources (bool refresh)
153{ 312{
154 char *homedir = (char *)getenv ("HOME"); 313 char *homedir = (char *)getenv ("HOME");
155 char fname[1024]; 314 char fname[1024];
156 315
157 /* 316 /*
158 * get resources using the X library function 317 * get resources using the X library function
159 */ 318 */
160 char *displayResource, *xe; 319 char *displayResource, *xe;
161 XrmDatabase database, rdb1; 320 XrmDatabase rdb1, database = 0;
162
163 database = NULL;
164 321
165 // for ordering, see for example http://www.faqs.org/faqs/Xt-FAQ/ Subject: 20 322 // for ordering, see for example http://www.faqs.org/faqs/Xt-FAQ/ Subject: 20
166 323
167 // 6. System wide per application default file. 324 // 6. System wide per application default file.
168 325
… …
178 // 5. User's per application default file. 335 // 5. User's per application default file.
179 // none 336 // none
180 337
181 // 4. User's defaults file. 338 // 4. User's defaults file.
182 /* Get any Xserver defaults */ 339 /* Get any Xserver defaults */
340 if (refresh)
341 {
342 // fucking xlib keeps a copy of the rm string
343 Atom actual_type;
344 int actual_format;
345 unsigned long nitems, nremaining;
346 char *val = 0;
347
348#if XLIB_ILLEGAL_ACCESS
349 if (dpy->xdefaults)
350 XFree (dpy->xdefaults);
351#endif
352
353 if (XGetWindowProperty (dpy, root, XA_RESOURCE_MANAGER,
354 0L, 100000000L, False,
355 XA_STRING, &actual_type, &actual_format,
356 &nitems, &nremaining,
357 (unsigned char **)&val) == Success
358 && actual_type == XA_STRING
359 && actual_format == 8)
360 displayResource = val;
361 else
362 {
363 displayResource = 0;
364 if (val)
365 XFree(val);
366 }
367
368#if XLIB_ILLEGAL_ACCESS
369 dpy->xdefaults = displayResource;
370#endif
371 }
372 else
183 displayResource = XResourceManagerString (display); 373 displayResource = XResourceManagerString (dpy);
184 374
185 if (displayResource != NULL) 375 if (displayResource)
186 { 376 {
187 if ((rdb1 = XrmGetStringDatabase (displayResource))) 377 if ((rdb1 = XrmGetStringDatabase (displayResource)))
188 XrmMergeDatabases (rdb1, &database); 378 XrmMergeDatabases (rdb1, &database);
189 } 379 }
190 else if (homedir) 380 else if (homedir)
… …
193 383
194 if ((rdb1 = XrmGetFileDatabase (fname))) 384 if ((rdb1 = XrmGetFileDatabase (fname)))
195 XrmMergeDatabases (rdb1, &database); 385 XrmMergeDatabases (rdb1, &database);
196 } 386 }
197 387
388#if !XLIB_ILLEGAL_ACCESS
389 if (refresh && displayResource)
390 XFree (displayResource);
391#endif
392
198 /* Get screen specific resources */ 393 /* Get screen specific resources */
199 displayResource = XScreenResourceString (ScreenOfDisplay (display, screen)); 394 displayResource = XScreenResourceString (ScreenOfDisplay (dpy, screen));
200 395
201 if (displayResource != NULL) 396 if (displayResource)
202 { 397 {
203 if ((rdb1 = XrmGetStringDatabase (displayResource))) 398 if ((rdb1 = XrmGetStringDatabase (displayResource)))
204 /* Merge with screen-independent resources */ 399 /* Merge with screen-independent resources */
205 XrmMergeDatabases (rdb1, &database); 400 XrmMergeDatabases (rdb1, &database);
206 401
… …
234 if (id[0] == ':') 429 if (id[0] == ':')
235 { 430 {
236 val = rxvt_malloc (5 + strlen (id) + 1); 431 val = rxvt_malloc (5 + strlen (id) + 1);
237 strcpy (val, "unix/"); 432 strcpy (val, "unix/");
238 strcat (val, id); 433 strcat (val, id);
239 display = XOpenDisplay (val); 434 dpy = XOpenDisplay (val);
240 free (val); 435 free (val);
241 } 436 }
242 else 437 else
243#endif 438#endif
244 display = 0; 439 dpy = 0;
245 440
246 if (!display) 441 if (!dpy)
247 display = XOpenDisplay (id); 442 dpy = XOpenDisplay (id);
248 443
249 if (!display) 444 if (!dpy)
250 return false; 445 return false;
251 446
252 screen = DefaultScreen (display); 447 screen = DefaultScreen (dpy);
253 root = DefaultRootWindow (display); 448 root = DefaultRootWindow (dpy);
254 visual = DefaultVisual (display, screen);
255 cmap = DefaultColormap (display, screen);
256 depth = DefaultDepth (display, screen);
257 449
450 assert (sizeof (xa_names) / sizeof (char *) == NUM_XA);
451 XInternAtoms (dpy, (char **)xa_names, NUM_XA, False, xa);
452
258 XrmSetDatabase (display, get_resources ()); 453 XrmSetDatabase (dpy, get_resources (false));
259 454
260#ifdef POINTER_BLANK 455#ifdef POINTER_BLANK
261 XColor blackcolour; 456 XColor blackcolour;
262 blackcolour.red = 0; 457 blackcolour.red = 0;
263 blackcolour.green = 0; 458 blackcolour.green = 0;
264 blackcolour.blue = 0; 459 blackcolour.blue = 0;
265 Font f = XLoadFont (display, "fixed"); 460 Font f = XLoadFont (dpy, "fixed");
266 blank_cursor = XCreateGlyphCursor (display, f, f, ' ', ' ', 461 blank_cursor = XCreateGlyphCursor (dpy, f, f, ' ', ' ',
267 &blackcolour, &blackcolour); 462 &blackcolour, &blackcolour);
268 XUnloadFont (display, f); 463 XUnloadFont (dpy, f);
269#endif 464#endif
270 465
271#ifdef PREFER_24BIT
272 /*
273 * If depth is not 24, look for a 24bit visual.
274 */
275 if (depth != 24)
276 {
277 XVisualInfo vinfo;
278
279 if (XMatchVisualInfo (display, screen, 24, TrueColor, &vinfo))
280 {
281 depth = 24;
282 visual = vinfo.visual;
283 cmap = XCreateColormap (display,
284 RootWindow (display, screen),
285 visual, AllocNone);
286 }
287 }
288#endif
289
290 int fd = XConnectionNumber (display); 466 int fd = XConnectionNumber (dpy);
291 467
292#ifndef NO_SLOW_LINK_SUPPORT 468#ifndef NO_SLOW_LINK_SUPPORT
293 // try to detect wether we have a local connection. 469 // try to detect wether we have a local connection.
294 // assume unix domains socket == local, everything else not 470 // assume unix domains socket == local, everything else not
295 // TODO: might want to check for inet/127.0.0.1 471 // TODO: might want to check for inet/127.0.0.1
… …
302#endif 478#endif
303 479
304 x_ev.start (fd, EVENT_READ); 480 x_ev.start (fd, EVENT_READ);
305 fcntl (fd, F_SETFD, FD_CLOEXEC); 481 fcntl (fd, F_SETFD, FD_CLOEXEC);
306 482
307 XSelectInput (display, root, PropertyChangeMask); 483 XSelectInput (dpy, root, PropertyChangeMask);
308#ifdef USE_XIM
309 xa_xim_servers = XInternAtom (display, "XIM_SERVERS", 0);
310#endif
311 484
312 flush (); 485 flush ();
313 486
314 return true; 487 return true;
315} 488}
316 489
317void 490void
318rxvt_display::ref_next () 491rxvt_display::ref_next ()
319{ 492{
320 // TODO: somehow check wether the database files/resources changed 493 // TODO: somehow check wether the database files/resources changed
321 // before re-loading/parsing 494 // before affording re-loading/parsing
322 XrmDestroyDatabase (XrmGetDatabase (display)); 495 XrmDestroyDatabase (XrmGetDatabase (dpy));
323 XrmSetDatabase (display, get_resources ()); 496 XrmSetDatabase (dpy, get_resources (true));
324} 497}
325 498
326rxvt_display::~rxvt_display () 499rxvt_display::~rxvt_display ()
327{ 500{
328 if (!display) 501 if (!dpy)
329 return; 502 return;
330 503
331#ifdef POINTER_BLANK 504#ifdef POINTER_BLANK
332 XFreeCursor (display, blank_cursor); 505 XFreeCursor (dpy, blank_cursor);
333#endif 506#endif
334 x_ev.stop (); 507 x_ev.stop ();
335#ifdef USE_XIM 508#ifdef USE_XIM
336 xims.clear (); 509 xims.clear ();
337#endif 510#endif
338 XCloseDisplay (display); 511 XCloseDisplay (dpy);
339} 512}
340 513
341#ifdef USE_XIM 514#ifdef USE_XIM
342void rxvt_display::im_change_cb () 515void rxvt_display::im_change_cb ()
343{ 516{
… …
351 // registers, as xlib crashes due to a race otherwise. 524 // registers, as xlib crashes due to a race otherwise.
352 Atom actual_type, *atoms; 525 Atom actual_type, *atoms;
353 int actual_format; 526 int actual_format;
354 unsigned long nitems, bytes_after; 527 unsigned long nitems, bytes_after;
355 528
356 if (XGetWindowProperty (display, root, xa_xim_servers, 0L, 1000000L, 529 if (XGetWindowProperty (dpy, root, xa[XA_XIM_SERVERS], 0L, 1000000L,
357 False, XA_ATOM, &actual_type, &actual_format, 530 False, XA_ATOM, &actual_type, &actual_format,
358 &nitems, &bytes_after, (unsigned char **)&atoms) 531 &nitems, &bytes_after, (unsigned char **)&atoms)
359 != Success ) 532 != Success )
360 return; 533 return;
361 534
362 if (actual_type == XA_ATOM && actual_format == 32) 535 if (actual_type == XA_ATOM && actual_format == 32)
363 for (int i = 0; i < nitems; i++) 536 for (int i = 0; i < nitems; i++)
364 if (XGetSelectionOwner (display, atoms[i])) 537 if (XGetSelectionOwner (dpy, atoms[i]))
365 { 538 {
366 im_change_cb (); 539 im_change_cb ();
367 break; 540 break;
368 } 541 }
369 542
… …
374void rxvt_display::x_cb (io_watcher &w, short revents) 547void rxvt_display::x_cb (io_watcher &w, short revents)
375{ 548{
376 do 549 do
377 { 550 {
378 XEvent xev; 551 XEvent xev;
379 XNextEvent (display, &xev); 552 XNextEvent (dpy, &xev);
380 553
381#ifdef USE_XIM 554#ifdef USE_XIM
382 if (!XFilterEvent (&xev, None)) 555 if (!XFilterEvent (&xev, None))
383 { 556 {
384 if (xev.type == PropertyNotify 557 if (xev.type == PropertyNotify
385 && xev.xany.window == root 558 && xev.xany.window == root
386 && xev.xproperty.atom == xa_xim_servers) 559 && xev.xproperty.atom == xa[XA_XIM_SERVERS])
387 im_change_check (); 560 im_change_check ();
388#endif 561#endif
389 for (int i = xw.size (); i--; ) 562 for (int i = xw.size (); i--; )
390 { 563 {
391 if (!xw[i]) 564 if (!xw[i])
… …
395 } 568 }
396#ifdef USE_XIM 569#ifdef USE_XIM
397 } 570 }
398#endif 571#endif
399 } 572 }
400 while (XEventsQueued (display, QueuedAlready)); 573 while (XEventsQueued (dpy, QueuedAlready));
401 574
402 XFlush (display); 575 XFlush (dpy);
403} 576}
404 577
405void rxvt_display::flush () 578void rxvt_display::flush ()
406{ 579{
407 if (XEventsQueued (display, QueuedAlready)) 580 if (XEventsQueued (dpy, QueuedAlready))
408 x_cb (x_ev, EVENT_READ); 581 x_cb (x_ev, EVENT_READ);
409 582
410 XFlush (display); 583 XFlush (dpy);
411} 584}
412 585
413void rxvt_display::reg (xevent_watcher *w) 586void rxvt_display::reg (xevent_watcher *w)
414{ 587{
415 xw.push_back (w); 588 xw.push_back (w);
… …
429 602
430 selection_owner = owner; 603 selection_owner = owner;
431} 604}
432 605
433#ifdef USE_XIM 606#ifdef USE_XIM
607
434void rxvt_display::reg (im_watcher *w) 608void rxvt_display::reg (im_watcher *w)
435{ 609{
436 imw.push_back (w); 610 imw.push_back (w);
437} 611}
438 612
… …
462 return xim; 636 return xim;
463} 637}
464 638
465void rxvt_display::put_xim (rxvt_xim *xim) 639void rxvt_display::put_xim (rxvt_xim *xim)
466{ 640{
467#if XLIB_IS_RACEFREE 641# if XLIB_IS_RACEFREE
468 xims.put (xim); 642 xims.put (xim);
469#endif 643# endif
470} 644}
645
471#endif 646#endif
472 647
473Atom rxvt_display::atom (const char *name) 648Atom rxvt_display::atom (const char *name)
474{ 649{
475 return XInternAtom (display, name, False); 650 return XInternAtom (dpy, name, False);
476} 651}
477 652
478///////////////////////////////////////////////////////////////////////////// 653/////////////////////////////////////////////////////////////////////////////
479 654
480template class refcache<rxvt_display>; 655template class refcache<rxvt_display>;
481refcache<rxvt_display> displays; 656refcache<rxvt_display> displays;
482 657
483///////////////////////////////////////////////////////////////////////////// 658/////////////////////////////////////////////////////////////////////////////
484 659
485bool 660bool
486rxvt_color::set (rxvt_display *display, Pixel p) 661rxvt_color::alloc (rxvt_screen *screen, const rgba &color)
487{ 662{
488#if XFT 663#if XFT
489 XColor xc; 664 XRenderPictFormat *format;
490 665
491 xc.pixel = p; 666 // FUCKING Xft gets it wrong, of course, so work around it.
492 if (!XQueryColor (display->display, display->cmap, &xc)) 667 // Transparency users should eat shit and die, and then
493 return false; 668 // XRenderQueryPictIndexValues themselves plenty.
669 if ((screen->visual->c_class == TrueColor)
670 && (format = XRenderFindVisualFormat (screen->dpy, screen->visual)))
671 {
672 // the fun lies in doing everything manually...
673 c.color.red = color.r;
674 c.color.green = color.g;
675 c.color.blue = color.b;
676 c.color.alpha = color.a;
494 677
678 c.pixel = ((color.r * format->direct.redMask / rgba::MAX_CC) << format->direct.red )
679 | ((color.g * format->direct.greenMask / rgba::MAX_CC) << format->direct.green)
680 | ((color.b * format->direct.blueMask / rgba::MAX_CC) << format->direct.blue )
681 | ((color.a * format->direct.alphaMask / rgba::MAX_CC) << format->direct.alpha);
682
683 return true;
684 }
685 else
686 {
495 XRenderColor d; 687 XRenderColor d;
496 688
497 d.red = xc.red; 689 d.red = color.r;
498 d.green = xc.green; 690 d.green = color.g;
499 d.blue = xc.blue; 691 d.blue = color.b;
500 d.alpha = 0xffff; 692 d.alpha = color.a;
501 693
502 return 694 return XftColorAllocValue (screen->dpy, screen->visual, screen->cmap, &d, &c);
503 XftColorAllocValue (display->display, 695 }
504 display->visual,
505 display->cmap,
506 &d, &c);
507#else 696#else
508 this->p = p; 697 c.red = color.r;
509#endif 698 c.green = color.g;
699 c.blue = color.b;
510 700
701 if (screen->visual->c_class == TrueColor)
702 {
703 c.pixel = (color.r * (screen->visual->red_mask >> ctz (screen->visual->red_mask ))
704 / rgba::MAX_CC) << ctz (screen->visual->red_mask )
705 | (color.g * (screen->visual->green_mask >> ctz (screen->visual->green_mask))
706 / rgba::MAX_CC) << ctz (screen->visual->green_mask)
707 | (color.b * (screen->visual->blue_mask >> ctz (screen->visual->blue_mask ))
708 / rgba::MAX_CC) << ctz (screen->visual->blue_mask );
709
710 return true;
711 }
712 else if (XAllocColor (screen->dpy, screen->cmap, &c))
511 return true; 713 return true;
714 else
715 c.pixel = (color.r + color.g + color.b) > 128*3
716 ? WhitePixelOfScreen (DefaultScreenOfDisplay (screen->dpy))
717 : BlackPixelOfScreen (DefaultScreenOfDisplay (screen->dpy));
718#endif
719
720 return false;
512} 721}
513 722
514bool 723bool
515rxvt_color::set (rxvt_display *display, const char *name) 724rxvt_color::set (rxvt_screen *screen, const char *name)
725{
726 rgba c;
727 char eos;
728 int skip;
729
730 // parse the nonstandard "[alphapercent]" prefix
731 if (1 <= sscanf (name, "[%hd]%n", &c.a, &skip))
732 {
733 c.a = lerp<int, int, int> (0, rgba::MAX_CC, c.a);
734 name += skip;
735 }
736 else
737 c.a = rgba::MAX_CC;
738
739 // parse the non-standard "rgba:rrrr/gggg/bbbb/aaaa" format
740 if (strlen (name) != 4+5*4 || 4 != sscanf (name, "rgba:%4hx/%4hx/%4hx/%4hx%c", &c.r, &c.g, &c.b, &c.a, &eos))
741 {
742 XColor xc, xc_exact;
743
744 if (XParseColor (screen->dpy, screen->cmap, name, &xc))
745 {
746 c.r = xc.red;
747 c.g = xc.green;
748 c.b = xc.blue;
749 }
750 else
751 {
752 c.r = 0xffff;
753 c.g = 0x6969;
754 c.b = 0xb4b4;
755
756 rxvt_warn ("unable to parse color '%s', using pink instead.\n", name);
757 }
758 }
759
760 return set (screen, c);
761}
762
763bool
764rxvt_color::set (rxvt_screen *screen, const rgba &color)
765{
766 bool got = alloc (screen, color);
767
768#if !ENABLE_MINIMAL
769 int cmap_size = screen->visual->map_entries;
770
771 if (!got
772 && screen->visual->c_class == PseudoColor
773 && cmap_size < 4096)
774 {
775 XColor *colors = new XColor [screen->visual->map_entries];
776
777 for (int i = 0; i < cmap_size; i++)
778 colors [i].pixel = i;
779
780 // many kilobytes transfer per colour, but pseudocolor isn't worth
781 // many extra optimisations.
782 XQueryColors (screen->dpy, screen->cmap, colors, cmap_size);
783
784 int diff = 0x7fffffffUL;
785 XColor *best = colors;
786
787 for (int i = 0; i < cmap_size; i++)
788 {
789 int d = (squared_diff<int> (color.r >> 2, colors [i].red >> 2))
790 + (squared_diff<int> (color.g >> 2, colors [i].green >> 2))
791 + (squared_diff<int> (color.b >> 2, colors [i].blue >> 2));
792
793 if (d < diff)
794 {
795 diff = d;
796 best = colors + i;
797 }
798 }
799
800 //rxvt_warn ("could not allocate %04x %04x %04x, getting %04x %04x %04x instead (%d)\n",
801 // color.r, color.g, color.b, best->red, best->green, best->blue, diff);
802
803 got = alloc (screen, rgba (best->red, best->green, best->blue));
804
805 delete colors;
806 }
807#endif
808
809 return got;
810}
811
812void
813rxvt_color::get (rgba &color)
516{ 814{
517#if XFT 815#if XFT
518 return XftColorAllocName (display->display, display->visual, display->cmap, 816 color.r = c.color.red;
519 name, &c); 817 color.g = c.color.green;
818 color.b = c.color.blue;
819 color.a = c.color.alpha;
520#else 820#else
521 XColor xc; 821 color.r = c.red;
522 822 color.g = c.green;
523 if (XParseColor (display->display, display->cmap, name, &xc)) 823 color.b = c.blue;
524 return set (display, xc.red, xc.green, xc.blue); 824 color.a = rgba::MAX_CC;
525
526 return false;
527#endif 825#endif
528} 826}
529 827
530bool 828void
531rxvt_color::set (rxvt_display *display, unsigned short cr, unsigned short cg, unsigned short cb) 829rxvt_color::get (XColor &color)
532{ 830{
533 XColor xc; 831 rgba c;
832 get (c);
534 833
535 xc.red = cr; 834 color.red = c.r;
536 xc.green = cg; 835 color.green = c.g;
537 xc.blue = cb; 836 color.blue = c.b;
538 xc.flags = DoRed | DoGreen | DoBlue; 837 color.pixel = (Pixel)*this;
539
540 if (XAllocColor (display->display, display->cmap, &xc))
541 return set (display, xc.pixel);
542
543 return false;
544} 838}
545 839
546void 840void
547rxvt_color::get (rxvt_display *display, unsigned short &cr, unsigned short &cg, unsigned short &cb) 841rxvt_color::free (rxvt_screen *screen)
548{ 842{
549#if XFT 843#if XFT
550 cr = c.color.red; 844 XftColorFree (screen->dpy, screen->visual, screen->cmap, &c);
551 cg = c.color.green;
552 cb = c.color.blue;
553#else 845#else
554 XColor c; 846 XFreeColors (screen->dpy, screen->cmap, &c.pixel, 1, AllPlanes);
555
556 c.pixel = p;
557 XQueryColor (display->display, display->cmap, &c);
558
559 cr = c.red;
560 cg = c.green;
561 cb = c.blue;
562#endif 847#endif
563} 848}
564 849
565void 850void
566rxvt_color::free (rxvt_display *display) 851rxvt_color::fade (rxvt_screen *screen, int percent, rxvt_color &result, const rgba &to)
567{ 852{
568#if XFT 853 rgba c;
569 XftColorFree (display->display, display->visual, display->cmap, &c); 854 get (c);
570#else
571 XFreeColors (display->display, display->cmap, &p, 1, AllPlanes);
572#endif
573}
574 855
575rxvt_color 856 result.set (
576rxvt_color::fade (rxvt_display *display, int percent) 857 screen,
577{ 858 rgba (
578 percent = 100 - percent; 859 lerp (c.r, to.r, percent),
579 860 lerp (c.g, to.g, percent),
580 unsigned short cr, cg, cb; 861 lerp (c.b, to.b, percent),
581 rxvt_color faded; 862 lerp (c.a, to.a, percent)
582 863 )
583 get (display, cr, cg, cb);
584
585 faded.set (
586 display,
587 cr * percent / 100,
588 cg * percent / 100,
589 cb * percent / 100
590 ); 864 );
591
592 return faded;
593} 865}
594 866
595#define LERP(a,b,p) (a * p + b * (100 - p)) / 100
596
597rxvt_color
598rxvt_color::fade (rxvt_display *display, int percent, rxvt_color &fadeto)
599{
600 percent = 100 - percent;
601
602 unsigned short cr, cg, cb;
603 unsigned short fcr, fcg, fcb;
604 rxvt_color faded;
605
606 get (display, cr, cg, cb);
607 fadeto.get(display, fcr, fcg, fcb);
608
609 faded.set (
610 display,
611 LERP (cr, fcr, percent),
612 LERP (cg, fcg, percent),
613 LERP (cb, fcb, percent)
614 );
615
616 return faded;
617}
618

Diff Legend

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