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

Diff Legend

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