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.26 by root, Wed Jan 25 21:03:04 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
37const char *const xa_names[] = 41const char *const xa_names[] =
38 { 42{
39 "TEXT", 43 "TEXT",
40 "COMPOUND_TEXT", 44 "COMPOUND_TEXT",
41 "UTF8_STRING", 45 "UTF8_STRING",
42 "MULTIPLE", 46 "MULTIPLE",
43 "TARGETS", 47 "TARGETS",
44 "TIMESTAMP", 48 "TIMESTAMP",
45 "VT_SELECTION", 49 "VT_SELECTION",
46 "INCR", 50 "INCR",
47 "WM_PROTOCOLS", 51 "WM_PROTOCOLS",
48 "WM_DELETE_WINDOW", 52 "WM_DELETE_WINDOW",
49 "CLIPBOARD", 53 "CLIPBOARD",
54 "AVERAGE_WIDTH",
55 "WEIGHT_NAME",
56 "SLANT",
57 "CHARSET_REGISTRY",
58 "CHARSET_ENCODING",
50#if ENABLE_FRILLS 59#if ENABLE_FRILLS
51 "_MOTIF_WM_HINTS", 60 "_MOTIF_WM_HINTS",
52#endif 61#endif
53#if ENABLE_EWMH 62#if ENABLE_EWMH
54 "_NET_WM_PID", 63 "_NET_WM_PID",
55 "_NET_WM_NAME", 64 "_NET_WM_NAME",
56 "_NET_WM_ICON_NAME", 65 "_NET_WM_ICON_NAME",
57 "_NET_WM_PING", 66 "_NET_WM_PING",
58#endif 67#endif
59#if USE_XIM 68#if USE_XIM
60 "WM_LOCALE_NAME", 69 "WM_LOCALE_NAME",
61 "XIM_SERVERS", 70 "XIM_SERVERS",
62#endif 71#endif
63#ifdef TRANSPARENT 72#ifdef TRANSPARENT
64 "_XROOTPMAP_ID", 73 "_XROOTPMAP_ID",
65 "ESETROOT_PMAP_ID", 74 "ESETROOT_PMAP_ID",
66#endif 75#endif
67#if ENABLE_XEMBED 76#if ENABLE_XEMBED
68 "_XEMBED", 77 "_XEMBED",
69 "_XEMBED_INFO", 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",
70#endif 93# endif
71 }; 94#endif
95};
72 96
73///////////////////////////////////////////////////////////////////////////// 97/////////////////////////////////////////////////////////////////////////////
74 98
75refcounted::refcounted (const char *id) 99refcounted::refcounted (const char *id)
76{ 100{
… …
153bool 177bool
154rxvt_xim::ref_init () 178rxvt_xim::ref_init ()
155{ 179{
156 display = GET_R->display; //HACK: TODO 180 display = GET_R->display; //HACK: TODO
157 181
158 xim = XOpenIM (display->display, NULL, NULL, NULL); 182 xim = XOpenIM (display->dpy, 0, 0, 0);
159 183
160 if (!xim) 184 if (!xim)
161 return false; 185 return false;
162 186
163 XIMCallback ximcallback; 187 XIMCallback ximcallback;
164 ximcallback.client_data = (XPointer)this; 188 ximcallback.client_data = (XPointer)this;
165 ximcallback.callback = im_destroy_cb; 189 ximcallback.callback = im_destroy_cb;
166 190
167 XSetIMValues (xim, XNDestroyCallback, &ximcallback, NULL); 191 XSetIMValues (xim, XNDestroyCallback, &ximcallback, 0);
168 192
169 return true; 193 return true;
170} 194}
171 195
172rxvt_xim::~rxvt_xim () 196rxvt_xim::~rxvt_xim ()
… …
177 201
178#endif 202#endif
179 203
180///////////////////////////////////////////////////////////////////////////// 204/////////////////////////////////////////////////////////////////////////////
181 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
182void 256void
183rxvt_screen::set (rxvt_display *disp) 257rxvt_screen::set (rxvt_display *disp)
184{ 258{
185 display = disp; 259 display = disp;
186
187 xdisp = disp->display; 260 dpy = disp->dpy;
188 261
189 Screen *screen = ScreenOfDisplay (xdisp, disp->screen); 262 Screen *screen = ScreenOfDisplay (dpy, disp->screen);
190 263
191 depth = DefaultDepthOfScreen (screen); 264 depth = DefaultDepthOfScreen (screen);
192 visual = DefaultVisualOfScreen (screen); 265 visual = DefaultVisualOfScreen (screen);
193 cmap = DefaultColormapOfScreen (screen); 266 cmap = DefaultColormapOfScreen (screen);
194} 267}
195 268
196void 269void
197rxvt_screen::set (rxvt_display *disp, int depth) 270rxvt_screen::set (rxvt_display *disp, int bitdepth)
198{ 271{
199 set (disp); 272 set (disp);
200 273
274#if XFT
201 XVisualInfo vinfo; 275 XVisualInfo vinfo;
202 276
203 if (XMatchVisualInfo (xdisp, display->screen, depth, TrueColor, &vinfo)) 277 if (XMatchVisualInfo (dpy, display->screen, bitdepth, TrueColor, &vinfo))
204 { 278 {
205 this->depth = depth; 279 depth = bitdepth;
206 this->visual = vinfo.visual; 280 visual = vinfo.visual;
207 this->cmap = XCreateColormap (xdisp, disp->root, visual, AllocNone); 281 cmap = XCreateColormap (dpy, disp->root, visual, AllocNone);
208 } 282 }
283#endif
209} 284}
210 285
211void 286void
212rxvt_screen::clear () 287rxvt_screen::clear ()
213{ 288{
289#if XFT
290 if (scratch_area)
291 {
292 XFreePixmap (dpy, scratch_area->drawable);
293 delete scratch_area;
294 }
295#endif
296
214 if (cmap != DefaultColormapOfScreen (ScreenOfDisplay (xdisp, display->screen))) 297 if (cmap != DefaultColormapOfScreen (ScreenOfDisplay (dpy, display->screen)))
215 XFreeColormap (xdisp, cmap); 298 XFreeColormap (dpy, cmap);
216} 299}
217 300
218///////////////////////////////////////////////////////////////////////////// 301/////////////////////////////////////////////////////////////////////////////
219 302
220rxvt_display::rxvt_display (const char *id) 303rxvt_display::rxvt_display (const char *id)
… …
223, selection_owner (0) 306, selection_owner (0)
224{ 307{
225} 308}
226 309
227XrmDatabase 310XrmDatabase
228rxvt_display::get_resources () 311rxvt_display::get_resources (bool refresh)
229{ 312{
230 char *homedir = (char *)getenv ("HOME"); 313 char *homedir = (char *)getenv ("HOME");
231 char fname[1024]; 314 char fname[1024];
232 315
233 /* 316 /*
234 * get resources using the X library function 317 * get resources using the X library function
235 */ 318 */
236 char *displayResource, *xe; 319 char *displayResource, *xe;
237 XrmDatabase database, rdb1; 320 XrmDatabase rdb1, database = 0;
238
239 database = NULL;
240 321
241 // 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
242 323
243 // 6. System wide per application default file. 324 // 6. System wide per application default file.
244 325
… …
254 // 5. User's per application default file. 335 // 5. User's per application default file.
255 // none 336 // none
256 337
257 // 4. User's defaults file. 338 // 4. User's defaults file.
258 /* 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
259 displayResource = XResourceManagerString (display); 373 displayResource = XResourceManagerString (dpy);
260 374
261 if (displayResource != NULL) 375 if (displayResource)
262 { 376 {
263 if ((rdb1 = XrmGetStringDatabase (displayResource))) 377 if ((rdb1 = XrmGetStringDatabase (displayResource)))
264 XrmMergeDatabases (rdb1, &database); 378 XrmMergeDatabases (rdb1, &database);
265 } 379 }
266 else if (homedir) 380 else if (homedir)
… …
269 383
270 if ((rdb1 = XrmGetFileDatabase (fname))) 384 if ((rdb1 = XrmGetFileDatabase (fname)))
271 XrmMergeDatabases (rdb1, &database); 385 XrmMergeDatabases (rdb1, &database);
272 } 386 }
273 387
388#if !XLIB_ILLEGAL_ACCESS
389 if (refresh && displayResource)
390 XFree (displayResource);
391#endif
392
274 /* Get screen specific resources */ 393 /* Get screen specific resources */
275 displayResource = XScreenResourceString (ScreenOfDisplay (display, screen)); 394 displayResource = XScreenResourceString (ScreenOfDisplay (dpy, screen));
276 395
277 if (displayResource != NULL) 396 if (displayResource)
278 { 397 {
279 if ((rdb1 = XrmGetStringDatabase (displayResource))) 398 if ((rdb1 = XrmGetStringDatabase (displayResource)))
280 /* Merge with screen-independent resources */ 399 /* Merge with screen-independent resources */
281 XrmMergeDatabases (rdb1, &database); 400 XrmMergeDatabases (rdb1, &database);
282 401
… …
310 if (id[0] == ':') 429 if (id[0] == ':')
311 { 430 {
312 val = rxvt_malloc (5 + strlen (id) + 1); 431 val = rxvt_malloc (5 + strlen (id) + 1);
313 strcpy (val, "unix/"); 432 strcpy (val, "unix/");
314 strcat (val, id); 433 strcat (val, id);
315 display = XOpenDisplay (val); 434 dpy = XOpenDisplay (val);
316 free (val); 435 free (val);
317 } 436 }
318 else 437 else
319#endif 438#endif
320 display = 0; 439 dpy = 0;
321 440
322 if (!display) 441 if (!dpy)
323 display = XOpenDisplay (id); 442 dpy = XOpenDisplay (id);
324 443
325 if (!display) 444 if (!dpy)
326 return false; 445 return false;
327 446
328 screen = DefaultScreen (display); 447 screen = DefaultScreen (dpy);
329 root = DefaultRootWindow (display); 448 root = DefaultRootWindow (dpy);
330 449
331 assert (sizeof (xa_names) / sizeof (char *) == NUM_XA); 450 assert (sizeof (xa_names) / sizeof (char *) == NUM_XA);
332 XInternAtoms (display, (char **)xa_names, NUM_XA, False, xa); 451 XInternAtoms (dpy, (char **)xa_names, NUM_XA, False, xa);
333 452
334 XrmSetDatabase (display, get_resources ()); 453 XrmSetDatabase (dpy, get_resources (false));
335 454
336#ifdef POINTER_BLANK 455#ifdef POINTER_BLANK
337 XColor blackcolour; 456 XColor blackcolour;
338 blackcolour.red = 0; 457 blackcolour.red = 0;
339 blackcolour.green = 0; 458 blackcolour.green = 0;
340 blackcolour.blue = 0; 459 blackcolour.blue = 0;
341 Font f = XLoadFont (display, "fixed"); 460 Font f = XLoadFont (dpy, "fixed");
342 blank_cursor = XCreateGlyphCursor (display, f, f, ' ', ' ', 461 blank_cursor = XCreateGlyphCursor (dpy, f, f, ' ', ' ',
343 &blackcolour, &blackcolour); 462 &blackcolour, &blackcolour);
344 XUnloadFont (display, f); 463 XUnloadFont (dpy, f);
345#endif 464#endif
346 465
347 int fd = XConnectionNumber (display); 466 int fd = XConnectionNumber (dpy);
348 467
349#ifndef NO_SLOW_LINK_SUPPORT 468#ifndef NO_SLOW_LINK_SUPPORT
350 // try to detect wether we have a local connection. 469 // try to detect wether we have a local connection.
351 // assume unix domains socket == local, everything else not 470 // assume unix domains socket == local, everything else not
352 // TODO: might want to check for inet/127.0.0.1 471 // TODO: might want to check for inet/127.0.0.1
… …
359#endif 478#endif
360 479
361 x_ev.start (fd, EVENT_READ); 480 x_ev.start (fd, EVENT_READ);
362 fcntl (fd, F_SETFD, FD_CLOEXEC); 481 fcntl (fd, F_SETFD, FD_CLOEXEC);
363 482
364 XSelectInput (display, root, PropertyChangeMask); 483 XSelectInput (dpy, root, PropertyChangeMask);
365 484
366 flush (); 485 flush ();
367 486
368 return true; 487 return true;
369} 488}
370 489
371void 490void
372rxvt_display::ref_next () 491rxvt_display::ref_next ()
373{ 492{
374 // TODO: somehow check wether the database files/resources changed 493 // TODO: somehow check wether the database files/resources changed
375 // before re-loading/parsing 494 // before affording re-loading/parsing
376 XrmDestroyDatabase (XrmGetDatabase (display)); 495 XrmDestroyDatabase (XrmGetDatabase (dpy));
377 XrmSetDatabase (display, get_resources ()); 496 XrmSetDatabase (dpy, get_resources (true));
378} 497}
379 498
380rxvt_display::~rxvt_display () 499rxvt_display::~rxvt_display ()
381{ 500{
382 if (!display) 501 if (!dpy)
383 return; 502 return;
384 503
385#ifdef POINTER_BLANK 504#ifdef POINTER_BLANK
386 XFreeCursor (display, blank_cursor); 505 XFreeCursor (dpy, blank_cursor);
387#endif 506#endif
388 x_ev.stop (); 507 x_ev.stop ();
389#ifdef USE_XIM 508#ifdef USE_XIM
390 xims.clear (); 509 xims.clear ();
391#endif 510#endif
392 XCloseDisplay (display); 511 XCloseDisplay (dpy);
393} 512}
394 513
395#ifdef USE_XIM 514#ifdef USE_XIM
396void rxvt_display::im_change_cb () 515void rxvt_display::im_change_cb ()
397{ 516{
… …
405 // registers, as xlib crashes due to a race otherwise. 524 // registers, as xlib crashes due to a race otherwise.
406 Atom actual_type, *atoms; 525 Atom actual_type, *atoms;
407 int actual_format; 526 int actual_format;
408 unsigned long nitems, bytes_after; 527 unsigned long nitems, bytes_after;
409 528
410 if (XGetWindowProperty (display, root, xa[XA_XIM_SERVERS], 0L, 1000000L, 529 if (XGetWindowProperty (dpy, root, xa[XA_XIM_SERVERS], 0L, 1000000L,
411 False, XA_ATOM, &actual_type, &actual_format, 530 False, XA_ATOM, &actual_type, &actual_format,
412 &nitems, &bytes_after, (unsigned char **)&atoms) 531 &nitems, &bytes_after, (unsigned char **)&atoms)
413 != Success ) 532 != Success )
414 return; 533 return;
415 534
416 if (actual_type == XA_ATOM && actual_format == 32) 535 if (actual_type == XA_ATOM && actual_format == 32)
417 for (int i = 0; i < nitems; i++) 536 for (int i = 0; i < nitems; i++)
418 if (XGetSelectionOwner (display, atoms[i])) 537 if (XGetSelectionOwner (dpy, atoms[i]))
419 { 538 {
420 im_change_cb (); 539 im_change_cb ();
421 break; 540 break;
422 } 541 }
423 542
… …
428void rxvt_display::x_cb (io_watcher &w, short revents) 547void rxvt_display::x_cb (io_watcher &w, short revents)
429{ 548{
430 do 549 do
431 { 550 {
432 XEvent xev; 551 XEvent xev;
433 XNextEvent (display, &xev); 552 XNextEvent (dpy, &xev);
434 553
435#ifdef USE_XIM 554#ifdef USE_XIM
436 if (!XFilterEvent (&xev, None)) 555 if (!XFilterEvent (&xev, None))
437 { 556 {
438 if (xev.type == PropertyNotify 557 if (xev.type == PropertyNotify
… …
449 } 568 }
450#ifdef USE_XIM 569#ifdef USE_XIM
451 } 570 }
452#endif 571#endif
453 } 572 }
454 while (XEventsQueued (display, QueuedAlready)); 573 while (XEventsQueued (dpy, QueuedAlready));
455 574
456 XFlush (display); 575 XFlush (dpy);
457} 576}
458 577
459void rxvt_display::flush () 578void rxvt_display::flush ()
460{ 579{
461 if (XEventsQueued (display, QueuedAlready)) 580 if (XEventsQueued (dpy, QueuedAlready))
462 x_cb (x_ev, EVENT_READ); 581 x_cb (x_ev, EVENT_READ);
463 582
464 XFlush (display); 583 XFlush (dpy);
465} 584}
466 585
467void rxvt_display::reg (xevent_watcher *w) 586void rxvt_display::reg (xevent_watcher *w)
468{ 587{
469 xw.push_back (w); 588 xw.push_back (w);
… …
483 602
484 selection_owner = owner; 603 selection_owner = owner;
485} 604}
486 605
487#ifdef USE_XIM 606#ifdef USE_XIM
607
488void rxvt_display::reg (im_watcher *w) 608void rxvt_display::reg (im_watcher *w)
489{ 609{
490 imw.push_back (w); 610 imw.push_back (w);
491} 611}
492 612
… …
516 return xim; 636 return xim;
517} 637}
518 638
519void rxvt_display::put_xim (rxvt_xim *xim) 639void rxvt_display::put_xim (rxvt_xim *xim)
520{ 640{
521#if XLIB_IS_RACEFREE 641# if XLIB_IS_RACEFREE
522 xims.put (xim); 642 xims.put (xim);
523#endif 643# endif
524} 644}
645
525#endif 646#endif
526 647
527Atom rxvt_display::atom (const char *name) 648Atom rxvt_display::atom (const char *name)
528{ 649{
529 return XInternAtom (display, name, False); 650 return XInternAtom (dpy, name, False);
530} 651}
531 652
532///////////////////////////////////////////////////////////////////////////// 653/////////////////////////////////////////////////////////////////////////////
533 654
534template class refcache<rxvt_display>; 655template class refcache<rxvt_display>;
535refcache<rxvt_display> displays; 656refcache<rxvt_display> displays;
536 657
537///////////////////////////////////////////////////////////////////////////// 658/////////////////////////////////////////////////////////////////////////////
538 659
539bool 660bool
540rxvt_color::set (rxvt_screen *screen, Pixel p) 661rxvt_color::alloc (rxvt_screen *screen, const rgba &color)
541{ 662{
542#if XFT 663#if XFT
543 XColor xc; 664 XRenderPictFormat *format;
544 665
545 xc.pixel = p; 666 // FUCKING Xft gets it wrong, of course, so work around it.
546 if (!XQueryColor (screen->xdisp, screen->cmap, &xc)) 667 // Transparency users should eat shit and die, and then
547 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;
548 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 {
549 XRenderColor d; 687 XRenderColor d;
550 688
551 d.red = xc.red; 689 d.red = color.r;
552 d.green = xc.green; 690 d.green = color.g;
553 d.blue = xc.blue; 691 d.blue = color.b;
554 d.alpha = 0xffff; 692 d.alpha = color.a;
555 693
556 return 694 return XftColorAllocValue (screen->dpy, screen->visual, screen->cmap, &d, &c);
557 XftColorAllocValue (screen->xdisp, 695 }
558 screen->visual,
559 screen->cmap,
560 &d, &c);
561#else 696#else
562 this->p = p; 697 c.red = color.r;
563#endif 698 c.green = color.g;
699 c.blue = color.b;
564 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))
565 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;
566} 721}
567 722
568bool 723bool
569rxvt_color::set (rxvt_screen *screen, const char *name) 724rxvt_color::set (rxvt_screen *screen, const char *name)
570{ 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)
814{
571#if XFT 815#if XFT
572 return XftColorAllocName (screen->xdisp, screen->visual, screen->cmap, name, &c); 816 color.r = c.color.red;
817 color.g = c.color.green;
818 color.b = c.color.blue;
819 color.a = c.color.alpha;
573#else 820#else
574 XColor xc; 821 color.r = c.red;
575 822 color.g = c.green;
576 if (XParseColor (screen->xdisp, screen->cmap, name, &xc)) 823 color.b = c.blue;
577 return set (screen, xc.red, xc.green, xc.blue); 824 color.a = rgba::MAX_CC;
578
579 return false;
580#endif 825#endif
581} 826}
582 827
583bool
584rxvt_color::set (rxvt_screen *screen, unsigned short cr, unsigned short cg, unsigned short cb)
585{
586 XColor xc;
587
588 xc.red = cr;
589 xc.green = cg;
590 xc.blue = cb;
591 xc.flags = DoRed | DoGreen | DoBlue;
592
593 if (XAllocColor (screen->xdisp, screen->cmap, &xc))
594 return set (screen, xc.pixel);
595
596 return false;
597}
598
599void 828void
600rxvt_color::get (rxvt_screen *screen, unsigned short &cr, unsigned short &cg, unsigned short &cb) 829rxvt_color::get (XColor &color)
601{ 830{
602#if XFT 831 rgba c;
603 cr = c.color.red; 832 get (c);
604 cg = c.color.green;
605 cb = c.color.blue;
606#else
607 XColor c;
608 833
609 c.pixel = p; 834 color.red = c.r;
610 XQueryColor (screen->xdisp, screen->cmap, &c); 835 color.green = c.g;
611 836 color.blue = c.b;
612 cr = c.red; 837 color.pixel = (Pixel)*this;
613 cg = c.green;
614 cb = c.blue;
615#endif
616} 838}
617 839
618void 840void
619rxvt_color::free (rxvt_screen *screen) 841rxvt_color::free (rxvt_screen *screen)
620{ 842{
621#if XFT 843#if XFT
622 XftColorFree (screen->xdisp, screen->visual, screen->cmap, &c); 844 XftColorFree (screen->dpy, screen->visual, screen->cmap, &c);
623#else 845#else
624 XFreeColors (screen->xdisp, screen->cmap, &p, 1, AllPlanes); 846 XFreeColors (screen->dpy, screen->cmap, &c.pixel, 1, AllPlanes);
625#endif 847#endif
626} 848}
627 849
628rxvt_color 850void
629rxvt_color::fade (rxvt_screen *screen, int percent) 851rxvt_color::fade (rxvt_screen *screen, int percent, rxvt_color &result, const rgba &to)
630{ 852{
631 percent = 100 - percent; 853 rgba c;
854 get (c);
632 855
633 unsigned short cr, cg, cb; 856 result.set (
634 rxvt_color faded;
635
636 get (screen, cr, cg, cb);
637
638 faded.set (
639 screen, 857 screen,
640 cr * percent / 100, 858 rgba (
641 cg * percent / 100, 859 lerp (c.r, to.r, percent),
642 cb * percent / 100 860 lerp (c.g, to.g, percent),
861 lerp (c.b, to.b, percent),
862 lerp (c.a, to.a, percent)
863 )
643 ); 864 );
644
645 return faded;
646} 865}
647 866
648#define LERP(a,b,p) (a * p + b * (100 - p)) / 100
649
650rxvt_color
651rxvt_color::fade (rxvt_screen *screen, int percent, rxvt_color &fadeto)
652{
653 percent = 100 - percent;
654
655 unsigned short cr, cg, cb;
656 unsigned short fcr, fcg, fcb;
657 rxvt_color faded;
658
659 get (screen, cr, cg, cb);
660 fadeto.get (screen, fcr, fcg, fcb);
661
662 faded.set (
663 screen,
664 LERP (cr, fcr, percent),
665 LERP (cg, fcg, percent),
666 LERP (cb, fcb, percent)
667 );
668
669 return faded;
670}
671

Diff Legend

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