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.46 by root, Wed Feb 1 18:36:48 2006 UTC vs.
Revision 1.88 by root, Wed Jan 23 09:14:58 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}
… …
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 affording 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 printf ("next\n");//D
404} 495}
405 496
406rxvt_display::~rxvt_display () 497rxvt_display::~rxvt_display ()
407{ 498{
408 if (!display) 499 if (!dpy)
409 return; 500 return;
410 501
411#ifdef POINTER_BLANK 502#ifdef POINTER_BLANK
412 XFreeCursor (display, blank_cursor); 503 XFreeCursor (dpy, blank_cursor);
413#endif 504#endif
414 x_ev.stop (); 505 x_ev.stop ();
506 flush_ev.stop ();
415#ifdef USE_XIM 507#ifdef USE_XIM
416 xims.clear (); 508 xims.clear ();
417#endif 509#endif
418 XCloseDisplay (display); 510 XCloseDisplay (dpy);
419} 511}
420 512
421#ifdef USE_XIM 513#ifdef USE_XIM
422void rxvt_display::im_change_cb () 514void rxvt_display::im_change_cb ()
423{ 515{
… …
431 // registers, as xlib crashes due to a race otherwise. 523 // registers, as xlib crashes due to a race otherwise.
432 Atom actual_type, *atoms; 524 Atom actual_type, *atoms;
433 int actual_format; 525 int actual_format;
434 unsigned long nitems, bytes_after; 526 unsigned long nitems, bytes_after;
435 527
436 if (XGetWindowProperty (display, root, xa[XA_XIM_SERVERS], 0L, 1000000L, 528 if (XGetWindowProperty (dpy, root, xa[XA_XIM_SERVERS], 0L, 1000000L,
437 False, XA_ATOM, &actual_type, &actual_format, 529 False, XA_ATOM, &actual_type, &actual_format,
438 &nitems, &bytes_after, (unsigned char **)&atoms) 530 &nitems, &bytes_after, (unsigned char **)&atoms)
439 != Success ) 531 != Success )
440 return; 532 return;
441 533
442 if (actual_type == XA_ATOM && actual_format == 32) 534 if (actual_type == XA_ATOM && actual_format == 32)
443 for (int i = 0; i < nitems; i++) 535 for (int i = 0; i < nitems; i++)
444 if (XGetSelectionOwner (display, atoms[i])) 536 if (XGetSelectionOwner (dpy, atoms[i]))
445 { 537 {
446 im_change_cb (); 538 im_change_cb ();
447 break; 539 break;
448 } 540 }
449 541
450 XFree (atoms); 542 XFree (atoms);
451} 543}
452#endif 544#endif
453 545
454void rxvt_display::x_cb (io_watcher &w, short revents) 546void rxvt_display::x_cb (ev::io &w, int revents)
455{ 547{
456 do 548 while (XEventsQueued (dpy, QueuedAfterReading))
457 { 549 {
458 XEvent xev; 550 XEvent xev;
459 XNextEvent (display, &xev); 551 XNextEvent (dpy, &xev);
460 552
461#ifdef USE_XIM 553#ifdef USE_XIM
462 if (!XFilterEvent (&xev, None)) 554 if (!XFilterEvent (&xev, None))
463 { 555 {
464 if (xev.type == PropertyNotify 556 if (xev.type == PropertyNotify
465 && xev.xany.window == root 557 && xev.xany.window == root
466 && xev.xproperty.atom == xa[XA_XIM_SERVERS]) 558 && xev.xproperty.atom == xa[XA_XIM_SERVERS])
467 im_change_check (); 559 im_change_check ();
468#endif 560#endif
561 if (xev.type == MappingNotify)
562 XRefreshKeyboardMapping (&xev.xmapping);
563
469 for (int i = xw.size (); i--; ) 564 for (int i = xw.size (); i--; )
470 { 565 {
471 if (!xw[i]) 566 if (!xw[i])
472 xw.erase_unordered (i); 567 xw.erase_unordered (i);
473 else if (xw[i]->window == xev.xany.window) 568 else if (xw[i]->window == xev.xany.window)
… …
475 } 570 }
476#ifdef USE_XIM 571#ifdef USE_XIM
477 } 572 }
478#endif 573#endif
479 } 574 }
480 while (XEventsQueued (display, QueuedAlready)); 575}
481 576
577void rxvt_display::flush_cb (ev::prepare &w, int revents)
578{
579 w.stop ();
482 XFlush (display); 580 XFlush (dpy);
483}
484
485void rxvt_display::flush ()
486{
487 if (XEventsQueued (display, QueuedAlready))
488 x_cb (x_ev, EVENT_READ);
489
490 XFlush (display);
491} 581}
492 582
493void rxvt_display::reg (xevent_watcher *w) 583void rxvt_display::reg (xevent_watcher *w)
494{ 584{
585 if (!w->active)
586 {
495 xw.push_back (w); 587 xw.push_back (w);
496 w->active = xw.size (); 588 w->active = xw.size ();
589 }
497} 590}
498 591
499void rxvt_display::unreg (xevent_watcher *w) 592void rxvt_display::unreg (xevent_watcher *w)
500{ 593{
501 if (w->active) 594 if (w->active)
595 {
502 xw[w->active - 1] = 0; 596 xw[w->active - 1] = 0;
597 w->active = 0;
598 }
503} 599}
504 600
505void rxvt_display::set_selection_owner (rxvt_term *owner) 601void rxvt_display::set_selection_owner (rxvt_term *owner)
506{ 602{
507 if (selection_owner && selection_owner != owner) 603 if (selection_owner && selection_owner != owner)
604 {
605 rxvt_term *owner = selection_owner;
606
508 selection_owner->selection_clear (); 607 owner->selection_clear ();
608 owner->flush ();
609 }
509 610
510 selection_owner = owner; 611 selection_owner = owner;
511} 612}
512 613
513#ifdef USE_XIM 614#ifdef USE_XIM
… …
552 653
553#endif 654#endif
554 655
555Atom rxvt_display::atom (const char *name) 656Atom rxvt_display::atom (const char *name)
556{ 657{
557 return XInternAtom (display, name, False); 658 return XInternAtom (dpy, name, False);
558} 659}
559 660
560///////////////////////////////////////////////////////////////////////////// 661/////////////////////////////////////////////////////////////////////////////
561 662
562template class refcache<rxvt_display>; 663template class refcache<rxvt_display>;
563refcache<rxvt_display> displays; 664refcache<rxvt_display> displays;
564 665
565///////////////////////////////////////////////////////////////////////////// 666/////////////////////////////////////////////////////////////////////////////
566 667//
668
669static unsigned int
670insert_component (unsigned int value, unsigned int mask, unsigned int shift)
671{
672 return (value * (mask + 1) >> 16) << shift;
673}
674
567bool 675bool
568rxvt_color::alloc (rxvt_screen *screen, const rgba &color) 676rxvt_color::alloc (rxvt_screen *screen, const rgba &color)
569{ 677{
678 //TODO: only supports 24 bit truecolour
679 int alpha = color.a >= 0xff00 ? 0xffff : color.a;
680
570#if XFT 681#if XFT
571 XRenderPictFormat *format; 682 XRenderPictFormat *format;
572 683
573 // FUCKING Xft gets it wrong, of course, so work around it 684 // FUCKING Xft gets it wrong, of course, so work around it.
574 // transparency users should eat shit and die, and then 685 // Transparency users should eat shit and die, and then
575 // XRenderQueryPictIndexValues themselves plenty. 686 // XRenderQueryPictIndexValues themselves plenty.
576 if ((screen->visual->c_class == TrueColor || screen->visual->c_class == DirectColor) 687 if ((screen->visual->c_class == TrueColor)
577 && (format = XRenderFindVisualFormat (screen->xdisp, screen->visual))) 688 && (format = XRenderFindVisualFormat (screen->dpy, screen->visual)))
578 { 689 {
579 // the fun lies in doing everything manually... 690 // the fun lies in doing everything manually...
580 c.color.red = color.r; 691 c.color.red = color.r;
581 c.color.green = color.g; 692 c.color.green = color.g;
582 c.color.blue = color.b; 693 c.color.blue = color.b;
583 c.color.alpha = color.a; 694 c.color.alpha = alpha;
584 695
585 c.pixel = ((color.r * format->direct.redMask / rgba::MAX_CC) << format->direct.red ) 696 c.pixel = insert_component (color.r, format->direct.redMask , format->direct.red )
586 | ((color.g * format->direct.greenMask / rgba::MAX_CC) << format->direct.green) 697 | insert_component (color.g, format->direct.greenMask, format->direct.green)
587 | ((color.b * format->direct.blueMask / rgba::MAX_CC) << format->direct.blue ) 698 | insert_component (color.b, format->direct.blueMask , format->direct.blue )
588 | ((color.a * format->direct.alphaMask / rgba::MAX_CC) << format->direct.alpha); 699 | insert_component (alpha , format->direct.alphaMask, format->direct.alpha);
589 700
590 return true; 701 return true;
591 } 702 }
592 else 703 else
593 { 704 {
594 XRenderColor d; 705 XRenderColor d;
595 706
596 d.red = color.r; 707 d.red = color.r;
597 d.green = color.g; 708 d.green = color.g;
598 d.blue = color.b; 709 d.blue = color.b;
599 d.alpha = color.a; 710 d.alpha = alpha;
600 711
601 return XftColorAllocValue (screen->xdisp, screen->visual, screen->cmap, &d, &c); 712 return XftColorAllocValue (screen->dpy, screen->visual, screen->cmap, &d, &c);
602 } 713 }
603#else 714#else
604 c.red = color.r; 715 c.red = color.r;
605 c.green = color.g; 716 c.green = color.g;
606 c.blue = color.b; 717 c.blue = color.b;
607 718
608 if (screen->visual->c_class == TrueColor || screen->visual->c_class == DirectColor) 719 if (screen->visual->c_class == TrueColor)
609 { 720 {
610 c.pixel = (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 ))
611 / rgba::MAX_CC) << ctz (screen->visual->red_mask ) 722 | (color.g >> (16 - popcount (screen->visual->green_mask)) << ctz (screen->visual->green_mask))
612 | (color.g * (screen->visual->green_mask >> ctz (screen->visual->green_mask))
613 / rgba::MAX_CC) << ctz (screen->visual->green_mask)
614 | (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 ));
615 / rgba::MAX_CC) << ctz (screen->visual->blue_mask );
616 724
617 return true; 725 return true;
618 } 726 }
619 else if (XAllocColor (screen->xdisp, screen->cmap, &c)) 727 else if (XAllocColor (screen->dpy, screen->cmap, &c))
620 return true; 728 return true;
621 else 729 else
622 c.pixel = (color.r + color.g + color.b) > 128*3 730 c.pixel = (color.r + color.g + color.b) > 128*3
623 ? WhitePixelOfScreen (DefaultScreenOfDisplay (screen->xdisp)) 731 ? WhitePixelOfScreen (DefaultScreenOfDisplay (screen->dpy))
624 : BlackPixelOfScreen (DefaultScreenOfDisplay (screen->xdisp)); 732 : BlackPixelOfScreen (DefaultScreenOfDisplay (screen->dpy));
625#endif 733#endif
626 734
627 return false; 735 return false;
628} 736}
629 737
… …
641 name += skip; 749 name += skip;
642 } 750 }
643 else 751 else
644 c.a = rgba::MAX_CC; 752 c.a = rgba::MAX_CC;
645 753
754 // parse the non-standard "#aarrggbb" format
755 if (name[0] == '#' && strlen (name) == 1+2+2+2+2 && 4 == sscanf (name+1, "%2hx%2hx%2hx%2hx%c", &c.a, &c.r, &c.g, &c.b, &eos))
756 {
757 c.r <<= 8;
758 c.g <<= 8;
759 c.b <<= 8;
760 c.a <<= 8;
761 }
646 // parse the non-standard "rgba:rrrr/gggg/bbbb/aaaa" format 762 // parse the non-standard "rgba:rrrr/gggg/bbbb/aaaa" format
647 if (strlen (name) != 4+5*4 || 4 != sscanf (name, "rgba:%4hx/%4hx/%4hx/%4hx%c", &c.r, &c.g, &c.b, &c.a, &eos)) 763 else if (strlen (name) != 4+5*4 || 4 != sscanf (name, "rgba:%4hx/%4hx/%4hx/%4hx%c", &c.r, &c.g, &c.b, &c.a, &eos))
648 { 764 {
649 XColor xc, xc_exact; 765 XColor xc;
650 766
651 if (XParseColor (screen->xdisp, screen->cmap, name, &xc)) 767 if (XParseColor (screen->dpy, screen->cmap, name, &xc))
652 { 768 {
653 c.r = xc.red; 769 c.r = xc.red;
654 c.g = xc.green; 770 c.g = xc.green;
655 c.b = xc.blue; 771 c.b = xc.blue;
656 } 772 }
… …
681 { 797 {
682 XColor *colors = new XColor [screen->visual->map_entries]; 798 XColor *colors = new XColor [screen->visual->map_entries];
683 799
684 for (int i = 0; i < cmap_size; i++) 800 for (int i = 0; i < cmap_size; i++)
685 colors [i].pixel = i; 801 colors [i].pixel = i;
686 802
687 // many kilobytes transfer per colour, but pseudocolor isn't worth 803 // many kilobytes transfer per colour, but pseudocolor isn't worth
688 // many extra optimisations. 804 // many extra optimisations.
689 XQueryColors (screen->xdisp, screen->cmap, colors, cmap_size); 805 XQueryColors (screen->dpy, screen->cmap, colors, cmap_size);
690 806
691 int diff = 0x7fffffffUL; 807 int diff = 0x7fffffffUL;
692 XColor *best = colors; 808 XColor *best = colors;
693 809
694 for (int i = 0; i < cmap_size; i++) 810 for (int i = 0; i < cmap_size; i++)
… …
704 } 820 }
705 } 821 }
706 822
707 //rxvt_warn ("could not allocate %04x %04x %04x, getting %04x %04x %04x instead (%d)\n", 823 //rxvt_warn ("could not allocate %04x %04x %04x, getting %04x %04x %04x instead (%d)\n",
708 // color.r, color.g, color.b, best->red, best->green, best->blue, diff); 824 // color.r, color.g, color.b, best->red, best->green, best->blue, diff);
709 825
710 got = alloc (screen, rgba (best->red, best->green, best->blue)); 826 got = alloc (screen, rgba (best->red, best->green, best->blue));
711 827
712 delete colors; 828 delete [] colors;
713 } 829 }
714#endif 830#endif
715 831
716 return got; 832 return got;
717} 833}
… …
742 color.green = c.g; 858 color.green = c.g;
743 color.blue = c.b; 859 color.blue = c.b;
744 color.pixel = (Pixel)*this; 860 color.pixel = (Pixel)*this;
745} 861}
746 862
747void 863void
748rxvt_color::free (rxvt_screen *screen) 864rxvt_color::free (rxvt_screen *screen)
749{ 865{
866 if (screen->visual->c_class == TrueColor)
867 return; // nothing to do
868
750#if XFT 869#if XFT
751 XftColorFree (screen->xdisp, screen->visual, screen->cmap, &c); 870 XftColorFree (screen->dpy, screen->visual, screen->cmap, &c);
752#else 871#else
753 XFreeColors (screen->xdisp, screen->cmap, &c.pixel, 1, AllPlanes); 872 XFreeColors (screen->dpy, screen->cmap, &c.pixel, 1, AllPlanes);
754#endif 873#endif
755} 874}
756 875
757void 876void
758rxvt_color::fade (rxvt_screen *screen, int percent, rxvt_color &result, const rgba &to) 877rxvt_color::fade (rxvt_screen *screen, int percent, rxvt_color &result, const rgba &to)
… …
769 lerp (c.a, to.a, percent) 888 lerp (c.a, to.a, percent)
770 ) 889 )
771 ); 890 );
772} 891}
773 892
893#if TRACE_PIXMAPS
894# undef XCreatePixmap
895# undef XFreePixmap
896Pixmap trace_XCreatePixmap (const char *file, int line, Display *dpy, Window r, unsigned int w, unsigned int h, unsigned int d)
897{
898 Pixmap res = XCreatePixmap (dpy, r, w, h, d);
899 fprintf (stderr, "%s:%d: XCreatePixmap (%p,%lX,%u,%u,%u) returned %lX\n", file, line, dpy, r, w, h, d, res);
900 return res;
901}
902
903void trace_XFreePixmap (const char *file, int line, Display *dpy, Pixmap p)
904{
905 fprintf (stderr, "%s:%d: XFreePixmap (%p,%lX)\n", file, line, dpy, p);
906 XFreePixmap (dpy,p);
907}
908#endif

Diff Legend

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