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.40 by root, Tue Jan 31 16:19:16 2006 UTC vs.
Revision 1.92 by root, Sat Jan 26 10:15:20 2008 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
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, (char *)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)
246: refcounted (id) 299: refcounted (id)
247, x_ev (this, &rxvt_display::x_cb)
248, selection_owner (0) 300, selection_owner (0)
249{ 301{
302 x_ev .set<rxvt_display, &rxvt_display::x_cb > (this);
303 flush_ev.set<rxvt_display, &rxvt_display::flush_cb> (this);
250} 304}
251 305
252XrmDatabase 306XrmDatabase
253rxvt_display::get_resources () 307rxvt_display::get_resources (bool refresh)
254{ 308{
255 char *homedir = (char *)getenv ("HOME"); 309 char *homedir = getenv ("HOME");
256 char fname[1024]; 310 char fname[1024];
257 311
258 /* 312 /*
259 * get resources using the X library function 313 * get resources using the X library function
260 */ 314 */
261 char *displayResource, *xe; 315 char *displayResource, *xe;
262 XrmDatabase database, rdb1; 316 XrmDatabase rdb1, database = 0;
263
264 database = NULL;
265 317
266 // for ordering, see for example http://www.faqs.org/faqs/Xt-FAQ/ Subject: 20 318 // for ordering, see for example http://www.faqs.org/faqs/Xt-FAQ/ Subject: 20
319 // as opposed to "standard practise", we always read in ~/.Xdefaults
267 320
268 // 6. System wide per application default file. 321 // 6. System wide per application default file.
269 322
270 /* Add in $XAPPLRESDIR/Rxvt only; not bothering with XUSERFILESEARCHPATH */ 323 /* Add in $XAPPLRESDIR/Rxvt only; not bothering with XUSERFILESEARCHPATH */
271 if ((xe = (char *)getenv ("XAPPLRESDIR"))) 324 if ((xe = getenv ("XAPPLRESDIR")))
272 { 325 {
273 snprintf (fname, sizeof (fname), "%s/%s", xe, RESCLASS); 326 snprintf (fname, sizeof (fname), "%s/%s", xe, RESCLASS);
274 327
275 if ((rdb1 = XrmGetFileDatabase (fname))) 328 if ((rdb1 = XrmGetFileDatabase (fname)))
276 XrmMergeDatabases (rdb1, &database); 329 XrmMergeDatabases (rdb1, &database);
278 331
279 // 5. User's per application default file. 332 // 5. User's per application default file.
280 // none 333 // none
281 334
282 // 4. User's defaults file. 335 // 4. User's defaults file.
336 if (homedir)
337 {
338 snprintf (fname, sizeof (fname), "%s/.Xdefaults", homedir);
339
340 if ((rdb1 = XrmGetFileDatabase (fname)))
341 XrmMergeDatabases (rdb1, &database);
342 }
343
283 /* Get any Xserver defaults */ 344 /* Get any Xserver defaults */
345 if (refresh)
346 {
347 // fucking xlib keeps a copy of the rm string
348 Atom actual_type;
349 int actual_format;
350 unsigned long nitems, nremaining;
351 char *val = 0;
352
353#if XLIB_ILLEGAL_ACCESS
354 if (dpy->xdefaults)
355 XFree (dpy->xdefaults);
356#endif
357
358 if (XGetWindowProperty (dpy, RootWindow (dpy, 0), XA_RESOURCE_MANAGER,
359 0L, 100000000L, False,
360 XA_STRING, &actual_type, &actual_format,
361 &nitems, &nremaining,
362 (unsigned char **)&val) == Success
363 && actual_type == XA_STRING
364 && actual_format == 8)
365 displayResource = val;
366 else
367 {
368 displayResource = 0;
369
370 if (val)
371 XFree(val);
372 }
373
374#if XLIB_ILLEGAL_ACCESS
375 dpy->xdefaults = displayResource;
376#endif
377 }
378 else
284 displayResource = XResourceManagerString (display); 379 displayResource = XResourceManagerString (dpy);
285 380
286 if (displayResource != NULL) 381 if (displayResource)
287 { 382 {
288 if ((rdb1 = XrmGetStringDatabase (displayResource))) 383 if ((rdb1 = XrmGetStringDatabase (displayResource)))
289 XrmMergeDatabases (rdb1, &database); 384 XrmMergeDatabases (rdb1, &database);
290 } 385 }
291 else if (homedir)
292 {
293 snprintf (fname, sizeof (fname), "%s/.Xdefaults", homedir);
294 386
295 if ((rdb1 = XrmGetFileDatabase (fname))) 387#if !XLIB_ILLEGAL_ACCESS
296 XrmMergeDatabases (rdb1, &database); 388 if (refresh && displayResource)
297 } 389 XFree (displayResource);
390#endif
298 391
299 /* Get screen specific resources */ 392 /* Get screen specific resources */
300 displayResource = XScreenResourceString (ScreenOfDisplay (display, screen)); 393 displayResource = XScreenResourceString (ScreenOfDisplay (dpy, screen));
301 394
302 if (displayResource != NULL) 395 if (displayResource)
303 { 396 {
304 if ((rdb1 = XrmGetStringDatabase (displayResource))) 397 if ((rdb1 = XrmGetStringDatabase (displayResource)))
305 /* Merge with screen-independent resources */ 398 /* Merge with screen-independent resources */
306 XrmMergeDatabases (rdb1, &database); 399 XrmMergeDatabases (rdb1, &database);
307 400
308 XFree (displayResource); 401 XFree (displayResource);
309 } 402 }
310 403
311 // 3. User's per host defaults file 404 // 3. User's per host defaults file
312 /* Add in XENVIRONMENT file */ 405 /* Add in XENVIRONMENT file */
313 if ((xe = (char *)getenv ("XENVIRONMENT")) 406 if ((xe = getenv ("XENVIRONMENT"))
314 && (rdb1 = XrmGetFileDatabase (xe))) 407 && (rdb1 = XrmGetFileDatabase (xe)))
315 XrmMergeDatabases (rdb1, &database); 408 XrmMergeDatabases (rdb1, &database);
316 else if (homedir) 409 else if (homedir)
317 { 410 {
318 struct utsname un; 411 struct utsname un;
335 if (id[0] == ':') 428 if (id[0] == ':')
336 { 429 {
337 val = rxvt_malloc (5 + strlen (id) + 1); 430 val = rxvt_malloc (5 + strlen (id) + 1);
338 strcpy (val, "unix/"); 431 strcpy (val, "unix/");
339 strcat (val, id); 432 strcat (val, id);
340 display = XOpenDisplay (val); 433 dpy = XOpenDisplay (val);
341 free (val); 434 free (val);
342 } 435 }
343 else 436 else
344#endif 437#endif
345 display = 0; 438 dpy = 0;
346 439
347 if (!display) 440 if (!dpy)
348 display = XOpenDisplay (id); 441 dpy = XOpenDisplay (id);
349 442
350 if (!display) 443 if (!dpy)
351 return false; 444 return false;
352 445
353 screen = DefaultScreen (display); 446 screen = DefaultScreen (dpy);
354 root = DefaultRootWindow (display); 447 root = DefaultRootWindow (dpy);
355 448
356 assert (sizeof (xa_names) / sizeof (char *) == NUM_XA); 449 assert (sizeof (xa_names) / sizeof (char *) == NUM_XA);
357 XInternAtoms (display, (char **)xa_names, NUM_XA, False, xa); 450 XInternAtoms (dpy, (char **)xa_names, NUM_XA, False, xa);
358 451
359 XrmSetDatabase (display, get_resources ()); 452 XrmSetDatabase (dpy, get_resources (false));
360 453
361#ifdef POINTER_BLANK 454#ifdef POINTER_BLANK
362 XColor blackcolour; 455 XColor blackcolour;
363 blackcolour.red = 0; 456 blackcolour.red = 0;
364 blackcolour.green = 0; 457 blackcolour.green = 0;
365 blackcolour.blue = 0; 458 blackcolour.blue = 0;
366 Font f = XLoadFont (display, "fixed"); 459 Font f = XLoadFont (dpy, "fixed");
367 blank_cursor = XCreateGlyphCursor (display, f, f, ' ', ' ', 460 blank_cursor = XCreateGlyphCursor (dpy, f, f, ' ', ' ',
368 &blackcolour, &blackcolour); 461 &blackcolour, &blackcolour);
369 XUnloadFont (display, f); 462 XUnloadFont (dpy, f);
370#endif 463#endif
371 464
372 int fd = XConnectionNumber (display); 465 int fd = XConnectionNumber (dpy);
373 466
374#ifndef NO_SLOW_LINK_SUPPORT
375 // try to detect wether we have a local connection. 467 // try to detect wether we have a local connection.
376 // assume unix domains socket == local, everything else not 468 // assume unix domain socket == local, everything else not
377 // TODO: might want to check for inet/127.0.0.1 469 // TODO: might want to check for inet/127.0.0.1
378 is_local = 0; 470 is_local = 0;
379 sockaddr_un sa; 471 sockaddr_un sa;
380 socklen_t sl = sizeof (sa); 472 socklen_t sl = sizeof (sa);
381 473
382 if (!getsockname (fd, (sockaddr *)&sa, &sl)) 474 if (!getsockname (fd, (sockaddr *)&sa, &sl))
383 is_local = sa.sun_family == AF_LOCAL; 475 is_local = sa.sun_family == AF_UNIX;
384#endif
385 476
477 flush_ev.start ();
386 x_ev.start (fd, EVENT_READ); 478 x_ev.start (fd, ev::READ);
387 fcntl (fd, F_SETFD, FD_CLOEXEC); 479 fcntl (fd, F_SETFD, FD_CLOEXEC);
388 480
389 XSelectInput (display, root, PropertyChangeMask); 481 XSelectInput (dpy, root, PropertyChangeMask);
390 482
391 flush (); 483 flush ();
392 484
393 return true; 485 return true;
394} 486}
395 487
396void 488void
397rxvt_display::ref_next () 489rxvt_display::ref_next ()
398{ 490{
399 // TODO: somehow check wether the database files/resources changed 491 // TODO: somehow check wether the database files/resources changed
400 // before re-loading/parsing 492 // before affording re-loading/parsing
401 XrmDestroyDatabase (XrmGetDatabase (display)); 493 XrmDestroyDatabase (XrmGetDatabase (dpy));
402 XrmSetDatabase (display, get_resources ()); 494 XrmSetDatabase (dpy, get_resources (true));
403} 495}
404 496
405rxvt_display::~rxvt_display () 497rxvt_display::~rxvt_display ()
406{ 498{
407 if (!display) 499 if (!dpy)
408 return; 500 return;
409 501
410#ifdef POINTER_BLANK 502#ifdef POINTER_BLANK
411 XFreeCursor (display, blank_cursor); 503 XFreeCursor (dpy, blank_cursor);
412#endif 504#endif
413 x_ev.stop (); 505 x_ev.stop ();
506 flush_ev.stop ();
414#ifdef USE_XIM 507#ifdef USE_XIM
415 xims.clear (); 508 xims.clear ();
416#endif 509#endif
417 XCloseDisplay (display); 510 XCloseDisplay (dpy);
418} 511}
419 512
420#ifdef USE_XIM 513#ifdef USE_XIM
421void rxvt_display::im_change_cb () 514void rxvt_display::im_change_cb ()
422{ 515{
430 // registers, as xlib crashes due to a race otherwise. 523 // registers, as xlib crashes due to a race otherwise.
431 Atom actual_type, *atoms; 524 Atom actual_type, *atoms;
432 int actual_format; 525 int actual_format;
433 unsigned long nitems, bytes_after; 526 unsigned long nitems, bytes_after;
434 527
435 if (XGetWindowProperty (display, root, xa[XA_XIM_SERVERS], 0L, 1000000L, 528 if (XGetWindowProperty (dpy, root, xa[XA_XIM_SERVERS], 0L, 1000000L,
436 False, XA_ATOM, &actual_type, &actual_format, 529 False, XA_ATOM, &actual_type, &actual_format,
437 &nitems, &bytes_after, (unsigned char **)&atoms) 530 &nitems, &bytes_after, (unsigned char **)&atoms)
438 != Success ) 531 != Success )
439 return; 532 return;
440 533
441 if (actual_type == XA_ATOM && actual_format == 32) 534 if (actual_type == XA_ATOM && actual_format == 32)
442 for (int i = 0; i < nitems; i++) 535 for (int i = 0; i < nitems; i++)
443 if (XGetSelectionOwner (display, atoms[i])) 536 if (XGetSelectionOwner (dpy, atoms[i]))
444 { 537 {
445 im_change_cb (); 538 im_change_cb ();
446 break; 539 break;
447 } 540 }
448 541
449 XFree (atoms); 542 XFree (atoms);
450} 543}
451#endif 544#endif
452 545
453void rxvt_display::x_cb (io_watcher &w, short revents) 546void rxvt_display::x_cb (ev::io &w, int revents)
454{ 547{
455 do 548 while (XEventsQueued (dpy, QueuedAfterReading))
456 { 549 {
457 XEvent xev; 550 XEvent xev;
458 XNextEvent (display, &xev); 551 XNextEvent (dpy, &xev);
552
553 flush_ev.start ();
459 554
460#ifdef USE_XIM 555#ifdef USE_XIM
461 if (!XFilterEvent (&xev, None)) 556 if (!XFilterEvent (&xev, None))
557#endif
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 if (xev.type == MappingNotify)
564 XRefreshKeyboardMapping (&xev.xmapping);
565
468 for (int i = xw.size (); i--; ) 566 for (int i = xw.size (); i--; )
469 { 567 {
470 if (!xw[i]) 568 if (!xw[i])
471 xw.erase_unordered (i); 569 xw.erase_unordered (i);
472 else if (xw[i]->window == xev.xany.window) 570 else if (xw[i]->window == xev.xany.window)
473 xw[i]->call (xev); 571 xw[i]->call (xev);
474 } 572 }
573 }
574 }
575
576 XFlush (dpy);
577}
578
579void rxvt_display::flush_cb (ev::idle &w, int revents)
580{
581 w.stop ();
582 XFlush (dpy);
583}
584
585void rxvt_display::reg (xevent_watcher *w)
586{
587 if (!w->active)
588 {
589 xw.push_back (w);
590 w->active = xw.size ();
591 }
592}
593
594void rxvt_display::unreg (xevent_watcher *w)
595{
596 if (w->active)
597 {
598 xw[w->active - 1] = 0;
599 w->active = 0;
600 }
601}
602
603void rxvt_display::set_selection_owner (rxvt_term *owner)
604{
605 if (selection_owner && selection_owner != owner)
606 {
607 rxvt_term *owner = selection_owner;
608
609 owner->selection_clear ();
610 owner->flush ();
611 }
612
613 selection_owner = owner;
614}
615
475#ifdef USE_XIM 616#ifdef USE_XIM
476 }
477#endif
478 }
479 while (XEventsQueued (display, QueuedAlready));
480 617
481 XFlush (display);
482}
483
484void rxvt_display::flush ()
485{
486 if (XEventsQueued (display, QueuedAlready))
487 x_cb (x_ev, EVENT_READ);
488
489 XFlush (display);
490}
491
492void rxvt_display::reg (xevent_watcher *w)
493{
494 xw.push_back (w);
495 w->active = xw.size ();
496}
497
498void rxvt_display::unreg (xevent_watcher *w)
499{
500 if (w->active)
501 xw[w->active - 1] = 0;
502}
503
504void rxvt_display::set_selection_owner (rxvt_term *owner)
505{
506 if (selection_owner && selection_owner != owner)
507 selection_owner->selection_clear ();
508
509 selection_owner = owner;
510}
511
512#ifdef USE_XIM
513void rxvt_display::reg (im_watcher *w) 618void rxvt_display::reg (im_watcher *w)
514{ 619{
515 imw.push_back (w); 620 imw.push_back (w);
516} 621}
517 622
541 return xim; 646 return xim;
542} 647}
543 648
544void rxvt_display::put_xim (rxvt_xim *xim) 649void rxvt_display::put_xim (rxvt_xim *xim)
545{ 650{
546#if XLIB_IS_RACEFREE 651# if XLIB_IS_RACEFREE
547 xims.put (xim); 652 xims.put (xim);
548#endif 653# endif
549} 654}
655
550#endif 656#endif
551 657
552Atom rxvt_display::atom (const char *name) 658Atom rxvt_display::atom (const char *name)
553{ 659{
554 return XInternAtom (display, name, False); 660 return XInternAtom (dpy, name, False);
555} 661}
556 662
557///////////////////////////////////////////////////////////////////////////// 663/////////////////////////////////////////////////////////////////////////////
558 664
559template class refcache<rxvt_display>; 665template class refcache<rxvt_display>;
560refcache<rxvt_display> displays; 666refcache<rxvt_display> displays;
561 667
562///////////////////////////////////////////////////////////////////////////// 668/////////////////////////////////////////////////////////////////////////////
563 669//
670
671static unsigned int
672insert_component (unsigned int value, unsigned int mask, unsigned int shift)
673{
674 return (value * (mask + 1) >> 16) << shift;
675}
676
564bool 677bool
565rxvt_color::alloc (rxvt_screen *screen, const rxvt_rgba &color) 678rxvt_color::alloc (rxvt_screen *screen, const rgba &color)
566{ 679{
680 //TODO: only supports 24 bit
681 int alpha = color.a >= 0xff00 ? 0xffff : color.a;
682
567#if XFT 683#if XFT
568 XRenderPictFormat *format; 684 XRenderPictFormat *format;
569 685
570 // FUCKING Xft gets it wrong, of course, so work around it 686 // FUCKING Xft gets it wrong, of course, so work around it.
571 // transparency users should eat shit and die, and then 687 // Transparency users should eat shit and die, and then
572 // XRenderQueryPictIndexValues themselves plenty. 688 // XRenderQueryPictIndexValues themselves plenty.
573 if ((screen->visual->c_class == TrueColor || screen->visual->c_class == DirectColor) 689 if ((screen->visual->c_class == TrueColor)
574 && (format = XRenderFindVisualFormat (screen->xdisp, screen->visual))) 690 && (format = XRenderFindVisualFormat (screen->dpy, screen->visual)))
575 { 691 {
576 // the fun lies in doing everything manually... 692 // the fun lies in doing everything manually...
577 c.color.red = color.r; 693 c.color.red = color.r;
578 c.color.green = color.g; 694 c.color.green = color.g;
579 c.color.blue = color.b; 695 c.color.blue = color.b;
580 c.color.alpha = color.a; 696 c.color.alpha = alpha;
581 697
582 c.pixel = ((color.r * format->direct.redMask / rxvt_rgba::MAX_CC) << format->direct.red ) 698 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) 699 | insert_component (color.g, format->direct.greenMask, format->direct.green)
584 | ((color.b * format->direct.blueMask / rxvt_rgba::MAX_CC) << format->direct.blue ) 700 | insert_component (color.b, format->direct.blueMask , format->direct.blue )
585 | ((color.a * format->direct.alphaMask / rxvt_rgba::MAX_CC) << format->direct.alpha); 701 | insert_component (alpha , format->direct.alphaMask, format->direct.alpha);
586 702
587 return true; 703 return true;
588 } 704 }
589 else 705 else
590 { 706 {
591 XRenderColor d; 707 XRenderColor d;
592 708
593 d.red = color.r; 709 d.red = color.r;
594 d.green = color.g; 710 d.green = color.g;
595 d.blue = color.b; 711 d.blue = color.b;
596 d.alpha = color.a; 712 d.alpha = alpha;
597 713
598 return XftColorAllocValue (screen->xdisp, screen->visual, screen->cmap, &d, &c); 714 return XftColorAllocValue (screen->dpy, screen->visual, screen->cmap, &d, &c);
599 } 715 }
600#else 716#else
601 if (screen->visual->c_class == TrueColor || screen->visual->c_class == DirectColor) 717 c.red = color.r;
718 c.green = color.g;
719 c.blue = color.b;
720
721 if (screen->visual->c_class == TrueColor)
602 { 722 {
603 p = (color.r * (screen->visual->red_mask >> ctz (screen->visual->red_mask )) 723 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 ) 724 | (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 )) 725 | (color.b >> (16 - popcount (screen->visual->blue_mask )) << ctz (screen->visual->blue_mask ));
608 / rxvt_rgba::MAX_CC) << ctz (screen->visual->blue_mask );
609 726
610 return true; 727 return true;
611 } 728 }
729 else if (XAllocColor (screen->dpy, screen->cmap, &c))
730 return true;
612 else 731 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 732 c.pixel = (color.r + color.g + color.b) > 128*3
627 ? WhitePixelOfScreen (DefaultScreenOfDisplay (screen->xdisp)) 733 ? WhitePixelOfScreen (DefaultScreenOfDisplay (screen->dpy))
628 : BlackPixelOfScreen (DefaultScreenOfDisplay (screen->xdisp)); 734 : BlackPixelOfScreen (DefaultScreenOfDisplay (screen->dpy));
629 }
630#endif 735#endif
631 736
632 return false; 737 return false;
633} 738}
634 739
635bool 740bool
636rxvt_color::set (rxvt_screen *screen, const char *name) 741rxvt_color::set (rxvt_screen *screen, const char *name)
637{ 742{
638 rxvt_rgba c; 743 rgba c;
639 char eos; 744 char eos;
640 int skip; 745 int skip;
641 746
747 c.a = rgba::MAX_CC;
748
749 // parse the nonstandard "[alphapercent]" prefix
642 if (1 <= sscanf (name, "[%hx]%n", &c.a, &skip)) 750 if (1 <= sscanf (name, "[%hd]%n", &c.a, &skip))
643 { 751 {
644 switch (skip) 752 c.a = lerp<int, int, int> (0, rgba::MAX_CC, c.a);
645 {
646 case 2 + 1: c.a *= rxvt_rgba::MAX_CC / 0x000f; break;
647 case 2 + 2: c.a *= rxvt_rgba::MAX_CC / 0x00ff; break;
648 case 2 + 3: c.a *= rxvt_rgba::MAX_CC / 0x0fff; break;
649 case 2 + 4: c.a *= rxvt_rgba::MAX_CC / 0xffff; break;
650 }
651
652 name += skip; 753 name += skip;
653 } 754 }
654 else
655 c.a = rxvt_rgba::MAX_CC;
656 755
657 // parse the non-standard rgba format 756 // parse the non-standard "rgba:rrrr/gggg/bbbb/aaaa" format
658 if (strlen (name) != 4+5*4 || 4 != sscanf (name, "rgba:%hx/%hx/%hx/%hx%c", &c.r, &c.g, &c.b, &c.a, &eos)) 757 if (strlen (name) != 4+5*4 || 4 != sscanf (name, "rgba:%4hx/%4hx/%4hx/%4hx%c", &c.r, &c.g, &c.b, &c.a, &eos))
659 { 758 {
660 XColor xc, xc_exact; 759 XColor xc;
661 760
662 if (XParseColor (screen->xdisp, screen->cmap, name, &xc)) 761 if (XParseColor (screen->dpy, screen->cmap, name, &xc))
663 { 762 {
664 c.r = xc.red; 763 c.r = xc.red;
665 c.g = xc.green; 764 c.g = xc.green;
666 c.b = xc.blue; 765 c.b = xc.blue;
667 } 766 }
677 776
678 return set (screen, c); 777 return set (screen, c);
679} 778}
680 779
681bool 780bool
682rxvt_color::set (rxvt_screen *screen, const rxvt_rgba &color) 781rxvt_color::set (rxvt_screen *screen, const rgba &color)
683{ 782{
684 bool got = alloc (screen, color); 783 bool got = alloc (screen, color);
685 784
686#if !ENABLE_MINIMAL 785#if !ENABLE_MINIMAL
687 int cmap_size = screen->visual->map_entries; 786 int cmap_size = screen->visual->map_entries;
692 { 791 {
693 XColor *colors = new XColor [screen->visual->map_entries]; 792 XColor *colors = new XColor [screen->visual->map_entries];
694 793
695 for (int i = 0; i < cmap_size; i++) 794 for (int i = 0; i < cmap_size; i++)
696 colors [i].pixel = i; 795 colors [i].pixel = i;
697 796
797 // many kilobytes transfer per colour, but pseudocolor isn't worth
798 // many extra optimisations.
698 XQueryColors (screen->xdisp, screen->cmap, colors, cmap_size); 799 XQueryColors (screen->dpy, screen->cmap, colors, cmap_size);
699 800
700 int diff = 0x7fffffffUL; 801 int diff = 0x7fffffffUL;
701 XColor *best = colors; 802 XColor *best = colors;
702 803
703 for (int i = 0; i < cmap_size; i++) 804 for (int i = 0; i < cmap_size; i++)
713 } 814 }
714 } 815 }
715 816
716 //rxvt_warn ("could not allocate %04x %04x %04x, getting %04x %04x %04x instead (%d)\n", 817 //rxvt_warn ("could not allocate %04x %04x %04x, getting %04x %04x %04x instead (%d)\n",
717 // color.r, color.g, color.b, best->red, best->green, best->blue, diff); 818 // color.r, color.g, color.b, best->red, best->green, best->blue, diff);
718 819
719 got = alloc (screen, rxvt_rgba (best->red, best->green, best->blue)); 820 got = alloc (screen, rgba (best->red, best->green, best->blue));
720 821
721 delete colors; 822 delete [] colors;
722 } 823 }
723#endif 824#endif
724 825
725 return got; 826 return got;
726} 827}
727 828
728void 829void
729rxvt_color::get (rxvt_screen *screen, rxvt_rgba &color) 830rxvt_color::get (rgba &color)
730{ 831{
731#if XFT 832#if XFT
732 color.r = c.color.red; 833 color.r = c.color.red;
733 color.g = c.color.green; 834 color.g = c.color.green;
734 color.b = c.color.blue; 835 color.b = c.color.blue;
735 color.a = c.color.alpha; 836 color.a = c.color.alpha;
736#else 837#else
737 XColor c;
738
739 c.pixel = p;
740 XQueryColor (screen->xdisp, screen->cmap, &c);
741
742 color.r = c.red; 838 color.r = c.red;
743 color.g = c.green; 839 color.g = c.green;
744 color.b = c.blue; 840 color.b = c.blue;
745 color.a = rxvt_rgba::MAX_CC; 841 color.a = rgba::MAX_CC;
746#endif 842#endif
747} 843}
748 844
749void 845void
846rxvt_color::get (XColor &color)
847{
848 rgba c;
849 get (c);
850
851 color.red = c.r;
852 color.green = c.g;
853 color.blue = c.b;
854 color.pixel = (Pixel)*this;
855}
856
857void
750rxvt_color::free (rxvt_screen *screen) 858rxvt_color::free (rxvt_screen *screen)
751{ 859{
860 if (screen->visual->c_class == TrueColor)
861 return; // nothing to do
862
752#if XFT 863#if XFT
753 XftColorFree (screen->xdisp, screen->visual, screen->cmap, &c); 864 XftColorFree (screen->dpy, screen->visual, screen->cmap, &c);
754#else 865#else
755 XFreeColors (screen->xdisp, screen->cmap, &p, 1, AllPlanes); 866 XFreeColors (screen->dpy, screen->cmap, &c.pixel, 1, AllPlanes);
756#endif 867#endif
757} 868}
758 869
759rxvt_color 870void
760rxvt_color::fade (rxvt_screen *screen, int percent, const rxvt_rgba &to) 871rxvt_color::fade (rxvt_screen *screen, int percent, rxvt_color &result, const rgba &to)
761{ 872{
762 rxvt_rgba c; 873 rgba c;
763 get (screen, c); 874 get (c);
764 875
765 rxvt_color faded; 876 result.set (
766 faded.set (
767 screen, 877 screen,
768 rxvt_rgba ( 878 rgba (
769 lerp (to.r, c.r, percent), 879 lerp (c.r, to.r, percent),
770 lerp (to.g, c.g, percent), 880 lerp (c.g, to.g, percent),
771 lerp (to.b, c.b, percent), 881 lerp (c.b, to.b, percent),
772 lerp (to.a, c.a, percent) 882 lerp (c.a, to.a, percent)
773 ) 883 )
774 ); 884 );
885}
775 886
887#if TRACE_PIXMAPS
888# undef XCreatePixmap
889# undef XFreePixmap
890Pixmap trace_XCreatePixmap (const char *file, int line, Display *dpy, Window r, unsigned int w, unsigned int h, unsigned int d)
891{
892 Pixmap res = XCreatePixmap (dpy, r, w, h, d);
893 fprintf (stderr, "%s:%d: XCreatePixmap (%p,%lX,%u,%u,%u) returned %lX\n", file, line, dpy, r, w, h, d, res);
776 return faded; 894 return res;
777} 895}
778 896
897void trace_XFreePixmap (const char *file, int line, Display *dpy, Pixmap p)
898{
899 fprintf (stderr, "%s:%d: XFreePixmap (%p,%lX)\n", file, line, dpy, p);
900 XFreePixmap (dpy,p);
901}
902#endif

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines