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

Diff Legend

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