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.50 by root, Thu Feb 2 18:04:46 2006 UTC vs.
Revision 1.114 by root, Thu Jan 27 02:03:30 2011 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-2007 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
41const char *const xa_names[] = 38static const char *const xa_names[] =
42{ 39{
43 "TEXT", 40 "TEXT",
44 "COMPOUND_TEXT", 41 "COMPOUND_TEXT",
45 "UTF8_STRING", 42 "UTF8_STRING",
46 "MULTIPLE", 43 "MULTIPLE",
62#if ENABLE_EWMH 59#if ENABLE_EWMH
63 "_NET_WM_PID", 60 "_NET_WM_PID",
64 "_NET_WM_NAME", 61 "_NET_WM_NAME",
65 "_NET_WM_ICON_NAME", 62 "_NET_WM_ICON_NAME",
66 "_NET_WM_PING", 63 "_NET_WM_PING",
64 "_NET_WM_ICON",
67#endif 65#endif
68#if USE_XIM 66#if USE_XIM
69 "WM_LOCALE_NAME", 67 "WM_LOCALE_NAME",
70 "XIM_SERVERS", 68 "XIM_SERVERS",
71#endif 69#endif
72#ifdef TRANSPARENT 70#ifdef ENABLE_TRANSPARENCY
73 "_XROOTPMAP_ID", 71 "_XROOTPMAP_ID",
74 "ESETROOT_PMAP_ID", 72 "ESETROOT_PMAP_ID",
75#endif 73#endif
76#if ENABLE_XEMBED 74#if ENABLE_XEMBED
77 "_XEMBED", 75 "_XEMBED",
186 184
187 XIMCallback ximcallback; 185 XIMCallback ximcallback;
188 ximcallback.client_data = (XPointer)this; 186 ximcallback.client_data = (XPointer)this;
189 ximcallback.callback = im_destroy_cb; 187 ximcallback.callback = im_destroy_cb;
190 188
191 XSetIMValues (xim, XNDestroyCallback, &ximcallback, 0); 189 XSetIMValues (xim, XNDestroyCallback, &ximcallback, (char *)0);
192 190
193 return true; 191 return true;
194} 192}
195 193
196rxvt_xim::~rxvt_xim () 194rxvt_xim::~rxvt_xim ()
200} 198}
201 199
202#endif 200#endif
203 201
204///////////////////////////////////////////////////////////////////////////// 202/////////////////////////////////////////////////////////////////////////////
203
204#if XFT
205rxvt_drawable::~rxvt_drawable ()
206{
207 if (xftdrawable)
208 XftDrawDestroy (xftdrawable);
209}
210
211rxvt_drawable::operator XftDraw *()
212{
213 if (!xftdrawable)
214 xftdrawable = XftDrawCreate (screen->dpy, drawable, screen->visual, screen->cmap);
215
216 return xftdrawable;
217}
218#endif
219
220/////////////////////////////////////////////////////////////////////////////
221
222#if XFT
223
224// not strictly necessary as it is only used with superclass of zero_initialised
225rxvt_screen::rxvt_screen ()
226: scratch_area (0)
227{
228}
229
230rxvt_drawable &rxvt_screen::scratch_drawable (int w, int h)
231{
232 if (!scratch_area || w > scratch_w || h > scratch_h)
233 {
234 if (scratch_area)
235 {
236 XFreePixmap (dpy, scratch_area->drawable);
237 delete scratch_area;
238 }
239
240 Pixmap pm = XCreatePixmap (dpy, RootWindowOfScreen (ScreenOfDisplay (dpy, display->screen)),
241 scratch_w = w, scratch_h = h, depth);
242
243 scratch_area = new rxvt_drawable (this, pm);
244 }
245
246 return *scratch_area;
247}
248
249#endif
205 250
206void 251void
207rxvt_screen::set (rxvt_display *disp) 252rxvt_screen::set (rxvt_display *disp)
208{ 253{
209 display = disp; 254 display = disp;
215 visual = DefaultVisualOfScreen (screen); 260 visual = DefaultVisualOfScreen (screen);
216 cmap = DefaultColormapOfScreen (screen); 261 cmap = DefaultColormapOfScreen (screen);
217} 262}
218 263
219void 264void
220rxvt_screen::set (rxvt_display *disp, int bitdepth) 265rxvt_screen::select_visual (int bitdepth)
221{ 266{
222 set (disp);
223
224#if XFT 267#if XFT
225 XVisualInfo vinfo; 268 XVisualInfo vinfo;
226 269
227 if (XMatchVisualInfo (dpy, display->screen, bitdepth, TrueColor, &vinfo)) 270 if (XMatchVisualInfo (dpy, display->screen, bitdepth, TrueColor, &vinfo))
228 { 271 {
229 depth = bitdepth; 272 depth = bitdepth;
230 visual = vinfo.visual; 273 visual = vinfo.visual;
231 cmap = XCreateColormap (dpy, disp->root, visual, AllocNone); 274 cmap = XCreateColormap (dpy, display->root, visual, AllocNone);
232 } 275 }
233#endif 276#endif
234} 277}
235 278
236void 279void
237rxvt_screen::clear () 280rxvt_screen::clear ()
238{ 281{
282#if XFT
283 if (scratch_area)
284 {
285 XFreePixmap (dpy, scratch_area->drawable);
286 delete scratch_area;
287 }
288#endif
289
239 if (cmap != DefaultColormapOfScreen (ScreenOfDisplay (dpy, display->screen))) 290 if (cmap != DefaultColormapOfScreen (ScreenOfDisplay (dpy, display->screen)))
240 XFreeColormap (dpy, cmap); 291 XFreeColormap (dpy, cmap);
241} 292}
242 293
243///////////////////////////////////////////////////////////////////////////// 294/////////////////////////////////////////////////////////////////////////////
244 295
245rxvt_display::rxvt_display (const char *id) 296rxvt_display::rxvt_display (const char *id)
246: refcounted (id) 297: refcounted (id)
247, x_ev (this, &rxvt_display::x_cb)
248, selection_owner (0) 298, selection_owner (0)
299, clipboard_owner (0)
249{ 300{
301 x_ev .set<rxvt_display, &rxvt_display::x_cb > (this);
302 flush_ev.set<rxvt_display, &rxvt_display::flush_cb> (this);
250} 303}
251 304
252XrmDatabase 305XrmDatabase
253rxvt_display::get_resources (bool refresh) 306rxvt_display::get_resources (bool refresh)
254{ 307{
255 char *homedir = (char *)getenv ("HOME"); 308 char *homedir = 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 rdb1, database = 0; 315 XrmDatabase rdb1, database = 0;
263 316
317#if !XLIB_ILLEGAL_ACCESS
318 /* work around a bug in XrmSetDatabase where it frees the db, see ref_next */
319 database = XrmGetStringDatabase ("");
320#endif
321
264 // 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
323 // as opposed to "standard practise", we always read in ~/.Xdefaults
265 324
266 // 6. System wide per application default file. 325 // 6. System wide per application default file.
267 326
268 /* Add in $XAPPLRESDIR/Rxvt only; not bothering with XUSERFILESEARCHPATH */ 327 /* Add in $XAPPLRESDIR/Rxvt only; not bothering with XUSERFILESEARCHPATH */
269 if ((xe = (char *)getenv ("XAPPLRESDIR"))) 328 if ((xe = getenv ("XAPPLRESDIR")))
270 { 329 {
271 snprintf (fname, sizeof (fname), "%s/%s", xe, RESCLASS); 330 snprintf (fname, sizeof (fname), "%s/%s", xe, RESCLASS);
272 331
273 if ((rdb1 = XrmGetFileDatabase (fname))) 332 if ((rdb1 = XrmGetFileDatabase (fname)))
274 XrmMergeDatabases (rdb1, &database); 333 XrmMergeDatabases (rdb1, &database);
276 335
277 // 5. User's per application default file. 336 // 5. User's per application default file.
278 // none 337 // none
279 338
280 // 4. User's defaults file. 339 // 4. User's defaults file.
340 if (homedir)
341 {
342 snprintf (fname, sizeof (fname), "%s/.Xdefaults", homedir);
343
344 if ((rdb1 = XrmGetFileDatabase (fname)))
345 XrmMergeDatabases (rdb1, &database);
346 }
347
281 /* Get any Xserver defaults */ 348 /* Get any Xserver defaults */
282 if (refresh) 349 if (refresh)
283 { 350 {
284 // fucking xlib keeps a copy of the rm string 351 // fucking xlib keeps a copy of the rm string
285 Atom actual_type; 352 Atom actual_type;
290#if XLIB_ILLEGAL_ACCESS 357#if XLIB_ILLEGAL_ACCESS
291 if (dpy->xdefaults) 358 if (dpy->xdefaults)
292 XFree (dpy->xdefaults); 359 XFree (dpy->xdefaults);
293#endif 360#endif
294 361
295 if (XGetWindowProperty (dpy, root, XA_RESOURCE_MANAGER, 362 if (XGetWindowProperty (dpy, RootWindow (dpy, 0), XA_RESOURCE_MANAGER,
296 0L, 100000000L, False, 363 0L, 100000000L, False,
297 XA_STRING, &actual_type, &actual_format, 364 XA_STRING, &actual_type, &actual_format,
298 &nitems, &nremaining, 365 &nitems, &nremaining,
299 (unsigned char **)&val) == Success 366 (unsigned char **)&val) == Success
300 && actual_type == XA_STRING 367 && actual_type == XA_STRING
301 && actual_format == 8) 368 && actual_format == 8)
302 displayResource = val; 369 displayResource = val;
303 else 370 else
304 { 371 {
305 displayResource = 0; 372 displayResource = 0;
373
306 if (val) 374 if (val)
307 XFree(val); 375 XFree (val);
308 } 376 }
309 377
310#if XLIB_ILLEGAL_ACCESS 378#if XLIB_ILLEGAL_ACCESS
311 dpy->xdefaults = displayResource; 379 dpy->xdefaults = displayResource;
312#endif 380#endif
313 } 381 }
315 displayResource = XResourceManagerString (dpy); 383 displayResource = XResourceManagerString (dpy);
316 384
317 if (displayResource) 385 if (displayResource)
318 { 386 {
319 if ((rdb1 = XrmGetStringDatabase (displayResource))) 387 if ((rdb1 = XrmGetStringDatabase (displayResource)))
320 XrmMergeDatabases (rdb1, &database);
321 }
322 else if (homedir)
323 {
324 snprintf (fname, sizeof (fname), "%s/.Xdefaults", homedir);
325
326 if ((rdb1 = XrmGetFileDatabase (fname)))
327 XrmMergeDatabases (rdb1, &database); 388 XrmMergeDatabases (rdb1, &database);
328 } 389 }
329 390
330#if !XLIB_ILLEGAL_ACCESS 391#if !XLIB_ILLEGAL_ACCESS
331 if (refresh && displayResource) 392 if (refresh && displayResource)
344 XFree (displayResource); 405 XFree (displayResource);
345 } 406 }
346 407
347 // 3. User's per host defaults file 408 // 3. User's per host defaults file
348 /* Add in XENVIRONMENT file */ 409 /* Add in XENVIRONMENT file */
349 if ((xe = (char *)getenv ("XENVIRONMENT")) 410 if ((xe = getenv ("XENVIRONMENT"))
350 && (rdb1 = XrmGetFileDatabase (xe))) 411 && (rdb1 = XrmGetFileDatabase (xe)))
351 XrmMergeDatabases (rdb1, &database); 412 XrmMergeDatabases (rdb1, &database);
352 else if (homedir) 413 else if (homedir)
353 { 414 {
354 struct utsname un; 415 struct utsname un;
368bool rxvt_display::ref_init () 429bool rxvt_display::ref_init ()
369{ 430{
370#ifdef LOCAL_X_IS_UNIX 431#ifdef LOCAL_X_IS_UNIX
371 if (id[0] == ':') 432 if (id[0] == ':')
372 { 433 {
373 val = rxvt_malloc (5 + strlen (id) + 1); 434 if (!(val = rxvt_temp_buf<char> (5 + strlen (id) + 1)))
435 return false;
374 strcpy (val, "unix/"); 436 strcpy (val, "unix/");
375 strcat (val, id); 437 strcat (val, id);
376 dpy = XOpenDisplay (val); 438 dpy = XOpenDisplay (val);
377 free (val);
378 } 439 }
379 else 440 else
380#endif 441#endif
381 dpy = 0; 442 dpy = 0;
382 443
387 return false; 448 return false;
388 449
389 screen = DefaultScreen (dpy); 450 screen = DefaultScreen (dpy);
390 root = DefaultRootWindow (dpy); 451 root = DefaultRootWindow (dpy);
391 452
392 assert (sizeof (xa_names) / sizeof (char *) == NUM_XA); 453 assert (ARRAY_LENGTH(xa_names) == NUM_XA);
393 XInternAtoms (dpy, (char **)xa_names, NUM_XA, False, xa); 454 XInternAtoms (dpy, (char **)xa_names, NUM_XA, False, xa);
394 455
395 XrmSetDatabase (dpy, get_resources (false)); 456 XrmSetDatabase (dpy, get_resources (false));
396 457
397#ifdef POINTER_BLANK 458#ifdef POINTER_BLANK
405 XUnloadFont (dpy, f); 466 XUnloadFont (dpy, f);
406#endif 467#endif
407 468
408 int fd = XConnectionNumber (dpy); 469 int fd = XConnectionNumber (dpy);
409 470
410#ifndef NO_SLOW_LINK_SUPPORT
411 // try to detect wether we have a local connection. 471 // try to detect whether we have a local connection.
412 // assume unix domains socket == local, everything else not 472 // assume unix domain socket == local, everything else not
413 // TODO: might want to check for inet/127.0.0.1 473 // TODO: might want to check for inet/127.0.0.1
414 is_local = 0; 474 is_local = 0;
415 sockaddr_un sa; 475 sockaddr_un sa;
416 socklen_t sl = sizeof (sa); 476 socklen_t sl = sizeof (sa);
417 477
418 if (!getsockname (fd, (sockaddr *)&sa, &sl)) 478 if (!getsockname (fd, (sockaddr *)&sa, &sl))
419 is_local = sa.sun_family == AF_LOCAL; 479 is_local = sa.sun_family == AF_UNIX;
420#endif
421 480
481 flush_ev.start ();
422 x_ev.start (fd, EVENT_READ); 482 x_ev.start (fd, ev::READ);
423 fcntl (fd, F_SETFD, FD_CLOEXEC); 483 fcntl (fd, F_SETFD, FD_CLOEXEC);
424 484
425 XSelectInput (dpy, root, PropertyChangeMask); 485 XSelectInput (dpy, root, PropertyChangeMask);
426 486
427 flush (); 487 flush ();
430} 490}
431 491
432void 492void
433rxvt_display::ref_next () 493rxvt_display::ref_next ()
434{ 494{
435 // TODO: somehow check wether the database files/resources changed 495 // TODO: somehow check whether the database files/resources changed
436 // before affording re-loading/parsing 496 // before affording re-loading/parsing
437 XrmDestroyDatabase (XrmGetDatabase (dpy)); 497 XrmDestroyDatabase (XrmGetDatabase (dpy));
498#if XLIB_ILLEGAL_ACCESS
499 /* work around a bug in XrmSetDatabase where it frees the db */
500 dpy->db = 0;
501#endif
438 XrmSetDatabase (dpy, get_resources (true)); 502 XrmSetDatabase (dpy, get_resources (true));
439} 503}
440 504
441rxvt_display::~rxvt_display () 505rxvt_display::~rxvt_display ()
442{ 506{
445 509
446#ifdef POINTER_BLANK 510#ifdef POINTER_BLANK
447 XFreeCursor (dpy, blank_cursor); 511 XFreeCursor (dpy, blank_cursor);
448#endif 512#endif
449 x_ev.stop (); 513 x_ev.stop ();
514 flush_ev.stop ();
450#ifdef USE_XIM 515#ifdef USE_XIM
451 xims.clear (); 516 xims.clear ();
452#endif 517#endif
518 XrmDestroyDatabase (XrmGetDatabase (dpy));
453 XCloseDisplay (dpy); 519 XCloseDisplay (dpy);
454} 520}
455 521
456#ifdef USE_XIM 522#ifdef USE_XIM
457void rxvt_display::im_change_cb () 523void rxvt_display::im_change_cb ()
469 unsigned long nitems, bytes_after; 535 unsigned long nitems, bytes_after;
470 536
471 if (XGetWindowProperty (dpy, root, xa[XA_XIM_SERVERS], 0L, 1000000L, 537 if (XGetWindowProperty (dpy, root, xa[XA_XIM_SERVERS], 0L, 1000000L,
472 False, XA_ATOM, &actual_type, &actual_format, 538 False, XA_ATOM, &actual_type, &actual_format,
473 &nitems, &bytes_after, (unsigned char **)&atoms) 539 &nitems, &bytes_after, (unsigned char **)&atoms)
474 != Success ) 540 != Success)
475 return; 541 return;
476 542
477 if (actual_type == XA_ATOM && actual_format == 32) 543 if (actual_type == XA_ATOM && actual_format == 32)
478 for (int i = 0; i < nitems; i++) 544 for (int i = 0; i < nitems; i++)
479 if (XGetSelectionOwner (dpy, atoms[i])) 545 if (XGetSelectionOwner (dpy, atoms[i]))
480 { 546 {
481 im_change_cb (); 547 im_change_cb ();
482 break; 548 break;
484 550
485 XFree (atoms); 551 XFree (atoms);
486} 552}
487#endif 553#endif
488 554
489void rxvt_display::x_cb (io_watcher &w, short revents) 555void rxvt_display::x_cb (ev::io &w, int revents)
490{ 556{
557 flush_ev.start ();
558}
559
560void rxvt_display::flush_cb (ev::prepare &w, int revents)
561{
562 while (XEventsQueued (dpy, QueuedAfterFlush))
491 do 563 do
492 { 564 {
493 XEvent xev; 565 XEvent xev;
494 XNextEvent (dpy, &xev); 566 XNextEvent (dpy, &xev);
495 567
496#ifdef USE_XIM 568#ifdef USE_XIM
497 if (!XFilterEvent (&xev, None)) 569 if (!XFilterEvent (&xev, None))
498 { 570 {
499 if (xev.type == PropertyNotify 571 if (xev.type == PropertyNotify
500 && xev.xany.window == root 572 && xev.xany.window == root
501 && xev.xproperty.atom == xa[XA_XIM_SERVERS]) 573 && xev.xproperty.atom == xa[XA_XIM_SERVERS])
502 im_change_check (); 574 im_change_check ();
503#endif 575#endif
576 if (xev.type == MappingNotify)
577 XRefreshKeyboardMapping (&xev.xmapping);
578
504 for (int i = xw.size (); i--; ) 579 for (int i = xw.size (); i--; )
505 { 580 {
506 if (!xw[i]) 581 if (!xw[i])
507 xw.erase_unordered (i); 582 xw.erase_unordered (i);
508 else if (xw[i]->window == xev.xany.window) 583 else if (xw[i]->window == xev.xany.window)
509 xw[i]->call (xev); 584 xw[i]->call (xev);
510 } 585 }
511#ifdef USE_XIM 586#ifdef USE_XIM
512 } 587 }
513#endif 588#endif
514 } 589 }
515 while (XEventsQueued (dpy, QueuedAlready)); 590 while (XEventsQueued (dpy, QueuedAlready));
516 591
517 XFlush (dpy); 592 w.stop ();
518}
519
520void rxvt_display::flush ()
521{
522 if (XEventsQueued (dpy, QueuedAlready))
523 x_cb (x_ev, EVENT_READ);
524
525 XFlush (dpy);
526} 593}
527 594
528void rxvt_display::reg (xevent_watcher *w) 595void rxvt_display::reg (xevent_watcher *w)
529{ 596{
597 if (!w->active)
598 {
530 xw.push_back (w); 599 xw.push_back (w);
531 w->active = xw.size (); 600 w->active = xw.size ();
601 }
532} 602}
533 603
534void rxvt_display::unreg (xevent_watcher *w) 604void rxvt_display::unreg (xevent_watcher *w)
535{ 605{
536 if (w->active) 606 if (w->active)
607 {
537 xw[w->active - 1] = 0; 608 xw[w->active - 1] = 0;
609 w->active = 0;
610 }
538} 611}
539 612
540void rxvt_display::set_selection_owner (rxvt_term *owner) 613void rxvt_display::set_selection_owner (rxvt_term *owner, bool clipboard)
541{ 614{
615 rxvt_term * &cur_owner = !clipboard ? selection_owner : clipboard_owner;
616
542 if (selection_owner && selection_owner != owner) 617 if (cur_owner && cur_owner != owner)
543 selection_owner->selection_clear (); 618 {
619 rxvt_term *term = cur_owner;
620 term->selection_clear (clipboard);
621 term->flush ();
622 }
544 623
545 selection_owner = owner; 624 cur_owner = owner;
546} 625}
547 626
548#ifdef USE_XIM 627#ifdef USE_XIM
549 628
550void rxvt_display::reg (im_watcher *w) 629void rxvt_display::reg (im_watcher *w)
563 int l, m; 642 int l, m;
564 643
565 l = strlen (locale); 644 l = strlen (locale);
566 m = strlen (modifiers); 645 m = strlen (modifiers);
567 646
568 if (!(id = (char *)malloc (l + m + 2))) 647 if (!(id = rxvt_temp_buf<char> (l + m + 2)))
569 return 0; 648 return 0;
570 649
571 memcpy (id, locale, l); id[l] = '\n'; 650 memcpy (id, locale, l); id[l] = '\n';
572 memcpy (id + l + 1, modifiers, m); id[l + m + 1] = 0; 651 memcpy (id + l + 1, modifiers, m); id[l + m + 1] = 0;
573 652
574 rxvt_xim *xim = xims.get (id); 653 rxvt_xim *xim = xims.get (id);
575
576 free (id);
577 654
578 return xim; 655 return xim;
579} 656}
580 657
581void rxvt_display::put_xim (rxvt_xim *xim) 658void rxvt_display::put_xim (rxvt_xim *xim)
596 673
597template class refcache<rxvt_display>; 674template class refcache<rxvt_display>;
598refcache<rxvt_display> displays; 675refcache<rxvt_display> displays;
599 676
600///////////////////////////////////////////////////////////////////////////// 677/////////////////////////////////////////////////////////////////////////////
601 678//
679
680static unsigned int
681insert_component (unsigned int value, unsigned int mask, unsigned int shift)
682{
683 return (value * (mask + 1) >> 16) << shift;
684}
685
602bool 686bool
603rxvt_color::alloc (rxvt_screen *screen, const rgba &color) 687rxvt_color::alloc (rxvt_screen *screen, const rgba &color)
604{ 688{
689 //TODO: only supports 24 bit
690 int alpha = color.a >= 0xff00 ? 0xffff : color.a;
691
605#if XFT 692#if XFT
606 XRenderPictFormat *format; 693 XRenderPictFormat *format;
607 694
608 // FUCKING Xft gets it wrong, of course, so work around it. 695 // FUCKING Xft gets it wrong, of course, so work around it.
609 // Transparency users should eat shit and die, and then 696 // Transparency users should eat shit and die, and then
613 { 700 {
614 // the fun lies in doing everything manually... 701 // the fun lies in doing everything manually...
615 c.color.red = color.r; 702 c.color.red = color.r;
616 c.color.green = color.g; 703 c.color.green = color.g;
617 c.color.blue = color.b; 704 c.color.blue = color.b;
618 c.color.alpha = color.a; 705 c.color.alpha = alpha;
619 706
620 c.pixel = ((color.r * format->direct.redMask / rgba::MAX_CC) << format->direct.red ) 707 c.pixel = insert_component (color.r, format->direct.redMask , format->direct.red )
621 | ((color.g * format->direct.greenMask / rgba::MAX_CC) << format->direct.green) 708 | insert_component (color.g, format->direct.greenMask, format->direct.green)
622 | ((color.b * format->direct.blueMask / rgba::MAX_CC) << format->direct.blue ) 709 | insert_component (color.b, format->direct.blueMask , format->direct.blue )
623 | ((color.a * format->direct.alphaMask / rgba::MAX_CC) << format->direct.alpha); 710 | insert_component (alpha , format->direct.alphaMask, format->direct.alpha);
624 711
625 return true; 712 return true;
626 } 713 }
627 else 714 else
628 { 715 {
629 XRenderColor d; 716 XRenderColor d;
630 717
631 d.red = color.r; 718 d.red = color.r;
632 d.green = color.g; 719 d.green = color.g;
633 d.blue = color.b; 720 d.blue = color.b;
634 d.alpha = color.a; 721 d.alpha = alpha;
635 722
636 return XftColorAllocValue (screen->dpy, screen->visual, screen->cmap, &d, &c); 723 return XftColorAllocValue (screen->dpy, screen->visual, screen->cmap, &d, &c);
637 } 724 }
638#else 725#else
639 c.red = color.r; 726 c.red = color.r;
640 c.green = color.g; 727 c.green = color.g;
641 c.blue = color.b; 728 c.blue = color.b;
642 729
643 if (screen->visual->c_class == TrueColor) 730 if (screen->visual->c_class == TrueColor)
644 { 731 {
645 c.pixel = (color.r * (screen->visual->red_mask >> ctz (screen->visual->red_mask )) 732 c.pixel = (color.r >> (16 - rxvt_popcount (screen->visual->red_mask )) << rxvt_ctz (screen->visual->red_mask ))
646 / rgba::MAX_CC) << ctz (screen->visual->red_mask ) 733 | (color.g >> (16 - rxvt_popcount (screen->visual->green_mask)) << rxvt_ctz (screen->visual->green_mask))
647 | (color.g * (screen->visual->green_mask >> ctz (screen->visual->green_mask))
648 / rgba::MAX_CC) << ctz (screen->visual->green_mask)
649 | (color.b * (screen->visual->blue_mask >> ctz (screen->visual->blue_mask )) 734 | (color.b >> (16 - rxvt_popcount (screen->visual->blue_mask )) << rxvt_ctz (screen->visual->blue_mask ));
650 / rgba::MAX_CC) << ctz (screen->visual->blue_mask );
651 735
652 return true; 736 return true;
653 } 737 }
654 else if (XAllocColor (screen->dpy, screen->cmap, &c)) 738 else if (XAllocColor (screen->dpy, screen->cmap, &c))
655 return true; 739 return true;
667{ 751{
668 rgba c; 752 rgba c;
669 char eos; 753 char eos;
670 int skip; 754 int skip;
671 755
756 c.a = rgba::MAX_CC;
757
672 // parse the nonstandard "[alphapercent]" prefix 758 // parse the nonstandard "[alphapercent]" prefix
673 if (1 <= sscanf (name, "[%hd]%n", &c.a, &skip)) 759 if (1 <= sscanf (name, "[%hd]%n", &c.a, &skip))
674 { 760 {
675 c.a = lerp<int, int, int> (0, rgba::MAX_CC, c.a); 761 c.a = lerp<int, int, int> (0, rgba::MAX_CC, c.a);
676 name += skip; 762 name += skip;
677 } 763 }
678 else
679 c.a = rgba::MAX_CC;
680 764
681 // parse the non-standard "rgba:rrrr/gggg/bbbb/aaaa" format 765 // parse the non-standard "rgba:rrrr/gggg/bbbb/aaaa" format
682 if (strlen (name) != 4+5*4 || 4 != sscanf (name, "rgba:%4hx/%4hx/%4hx/%4hx%c", &c.r, &c.g, &c.b, &c.a, &eos)) 766 if (strlen (name) != 4+5*4 || 4 != sscanf (name, "rgba:%4hx/%4hx/%4hx/%4hx%c", &c.r, &c.g, &c.b, &c.a, &eos))
683 { 767 {
684 XColor xc, xc_exact; 768 XColor xc;
685 769
686 if (XParseColor (screen->dpy, screen->cmap, name, &xc)) 770 if (XParseColor (screen->dpy, screen->cmap, name, &xc))
687 { 771 {
688 c.r = xc.red; 772 c.r = xc.red;
689 c.g = xc.green; 773 c.g = xc.green;
716 { 800 {
717 XColor *colors = new XColor [screen->visual->map_entries]; 801 XColor *colors = new XColor [screen->visual->map_entries];
718 802
719 for (int i = 0; i < cmap_size; i++) 803 for (int i = 0; i < cmap_size; i++)
720 colors [i].pixel = i; 804 colors [i].pixel = i;
721 805
722 // many kilobytes transfer per colour, but pseudocolor isn't worth 806 // many kilobytes transfer per colour, but pseudocolor isn't worth
723 // many extra optimisations. 807 // many extra optimisations.
724 XQueryColors (screen->dpy, screen->cmap, colors, cmap_size); 808 XQueryColors (screen->dpy, screen->cmap, colors, cmap_size);
725 809
726 int diff = 0x7fffffffUL; 810 int diff = 0x7fffffffUL;
739 } 823 }
740 } 824 }
741 825
742 //rxvt_warn ("could not allocate %04x %04x %04x, getting %04x %04x %04x instead (%d)\n", 826 //rxvt_warn ("could not allocate %04x %04x %04x, getting %04x %04x %04x instead (%d)\n",
743 // color.r, color.g, color.b, best->red, best->green, best->blue, diff); 827 // color.r, color.g, color.b, best->red, best->green, best->blue, diff);
744 828
745 got = alloc (screen, rgba (best->red, best->green, best->blue)); 829 got = alloc (screen, rgba (best->red, best->green, best->blue));
746 830
747 delete colors; 831 delete [] colors;
748 } 832 }
749#endif 833#endif
750 834
751 return got; 835 return got;
752} 836}
777 color.green = c.g; 861 color.green = c.g;
778 color.blue = c.b; 862 color.blue = c.b;
779 color.pixel = (Pixel)*this; 863 color.pixel = (Pixel)*this;
780} 864}
781 865
782void 866void
783rxvt_color::free (rxvt_screen *screen) 867rxvt_color::free (rxvt_screen *screen)
784{ 868{
869 if (screen->visual->c_class == TrueColor)
870 return; // nothing to do
871
785#if XFT 872#if XFT
786 XftColorFree (screen->dpy, screen->visual, screen->cmap, &c); 873 XftColorFree (screen->dpy, screen->visual, screen->cmap, &c);
787#else 874#else
788 XFreeColors (screen->dpy, screen->cmap, &c.pixel, 1, AllPlanes); 875 XFreeColors (screen->dpy, screen->cmap, &c.pixel, 1, AllPlanes);
789#endif 876#endif

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines