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.70 by sasha, Thu Jul 12 22:33:16 2007 UTC

1/*--------------------------------*-C-*---------------------------------* 1/*----------------------------------------------------------------------*
2 * File: rxvttoolkit.C 2 * File: rxvttoolkit.C
3 *----------------------------------------------------------------------* 3 *----------------------------------------------------------------------*
4 * 4 *
5 * All portions of code are copyright by their respective author/s. 5 * All portions of code are copyright by their respective author/s.
6 * Copyright (c) 2003-2004 Marc Lehmann <pcg@goof.com> 6 * Copyright (c) 2003-2006 Marc Lehmann <pcg@goof.com>
7 * 7 *
8 * This program is free software; you can redistribute it and/or modify 8 * This program is free software; you can redistribute it and/or modify
9 * it under the terms of the GNU General Public License as published by 9 * it under the terms of the GNU General Public License as published by
10 * the Free Software Foundation; either version 2 of the License, or 10 * the Free Software Foundation; either version 2 of the License, or
11 * (at your option) any later version. 11 * (at your option) any later version.
… …
26 26
27#include <unistd.h> 27#include <unistd.h>
28#include <fcntl.h> 28#include <fcntl.h>
29 29
30#include <sys/utsname.h> 30#include <sys/utsname.h>
31
32#ifndef NO_SLOW_LINK_SUPPORT
33# include <sys/socket.h> 31#include <sys/socket.h>
34# include <sys/un.h> 32#include <sys/un.h>
35#endif
36 33
37#if XFT 34#if XFT
38# include <X11/extensions/Xrender.h> 35# include <X11/extensions/Xrender.h>
39#endif 36#endif
40 37
… …
67#endif 64#endif
68#if USE_XIM 65#if USE_XIM
69 "WM_LOCALE_NAME", 66 "WM_LOCALE_NAME",
70 "XIM_SERVERS", 67 "XIM_SERVERS",
71#endif 68#endif
72#ifdef TRANSPARENT 69#ifdef ENABLE_TRANSPARENCY
73 "_XROOTPMAP_ID", 70 "_XROOTPMAP_ID",
74 "ESETROOT_PMAP_ID", 71 "ESETROOT_PMAP_ID",
75#endif 72#endif
76#if ENABLE_XEMBED 73#if ENABLE_XEMBED
77 "_XEMBED", 74 "_XEMBED",
… …
177bool 174bool
178rxvt_xim::ref_init () 175rxvt_xim::ref_init ()
179{ 176{
180 display = GET_R->display; //HACK: TODO 177 display = GET_R->display; //HACK: TODO
181 178
182 xim = XOpenIM (display->display, 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;
… …
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)
… …
260 */ 313 */
261 char *displayResource, *xe; 314 char *displayResource, *xe;
262 XrmDatabase rdb1, database = 0; 315 XrmDatabase rdb1, database = 0;
263 316
264 // for ordering, see for example http://www.faqs.org/faqs/Xt-FAQ/ Subject: 20 317 // for ordering, see for example http://www.faqs.org/faqs/Xt-FAQ/ Subject: 20
318 // as opposed to "standard practise", we always read in ~/.Xdefaults
265 319
266 // 6. System wide per application default file. 320 // 6. System wide per application default file.
267 321
268 /* Add in $XAPPLRESDIR/Rxvt only; not bothering with XUSERFILESEARCHPATH */ 322 /* Add in $XAPPLRESDIR/Rxvt only; not bothering with XUSERFILESEARCHPATH */
269 if ((xe = (char *)getenv ("XAPPLRESDIR"))) 323 if ((xe = (char *)getenv ("XAPPLRESDIR")))
… …
276 330
277 // 5. User's per application default file. 331 // 5. User's per application default file.
278 // none 332 // none
279 333
280 // 4. User's defaults file. 334 // 4. User's defaults file.
335 if (homedir)
336 {
337 snprintf (fname, sizeof (fname), "%s/.Xdefaults", homedir);
338
339 if ((rdb1 = XrmGetFileDatabase (fname)))
340 XrmMergeDatabases (rdb1, &database);
341 }
342
281 /* Get any Xserver defaults */ 343 /* Get any Xserver defaults */
282 if (refresh) 344 if (refresh)
283 { 345 {
284 // fucking xlib keeps a copy of the rm string 346 // fucking xlib keeps a copy of the rm string
285 Atom actual_type; 347 Atom actual_type;
286 int actual_format; 348 int actual_format;
287 unsigned long nitems, nremaining; 349 unsigned long nitems, nremaining;
288 char *val = 0; 350 char *val = 0;
289 351
290#if XLIB_ILLEGAL_ACCESS 352#if XLIB_ILLEGAL_ACCESS
291 if (display->xdefaults) 353 if (dpy->xdefaults)
292 XFree (display->xdefaults); 354 XFree (dpy->xdefaults);
293#endif 355#endif
294 356
295 if (XGetWindowProperty (display, root, XA_RESOURCE_MANAGER, 357 if (XGetWindowProperty (dpy, RootWindow (dpy, 0), XA_RESOURCE_MANAGER,
296 0L, 100000000L, False, 358 0L, 100000000L, False,
297 XA_STRING, &actual_type, &actual_format, 359 XA_STRING, &actual_type, &actual_format,
298 &nitems, &nremaining, 360 &nitems, &nremaining,
299 (unsigned char **)&val) == Success 361 (unsigned char **)&val) == Success
300 && actual_type == XA_STRING 362 && actual_type == XA_STRING
301 && actual_format == 8) 363 && actual_format == 8)
302 displayResource = val; 364 displayResource = val;
303 else 365 else
304 { 366 {
305 displayResource = 0; 367 displayResource = 0;
368
306 if (val) 369 if (val)
307 XFree(val); 370 XFree(val);
308 } 371 }
309 372
310#if XLIB_ILLEGAL_ACCESS 373#if XLIB_ILLEGAL_ACCESS
311 display->xdefaults = displayResource; 374 dpy->xdefaults = displayResource;
312#endif 375#endif
313 } 376 }
314 else 377 else
315 displayResource = XResourceManagerString (display); 378 displayResource = XResourceManagerString (dpy);
316 379
317 if (displayResource) 380 if (displayResource)
318 { 381 {
319 if ((rdb1 = XrmGetStringDatabase (displayResource))) 382 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); 383 XrmMergeDatabases (rdb1, &database);
328 } 384 }
329 385
330#if !XLIB_ILLEGAL_ACCESS 386#if !XLIB_ILLEGAL_ACCESS
331 if (refresh && displayResource) 387 if (refresh && displayResource)
332 XFree (displayResource); 388 XFree (displayResource);
333#endif 389#endif
334 390
335 /* Get screen specific resources */ 391 /* Get screen specific resources */
336 displayResource = XScreenResourceString (ScreenOfDisplay (display, screen)); 392 displayResource = XScreenResourceString (ScreenOfDisplay (dpy, screen));
337 393
338 if (displayResource) 394 if (displayResource)
339 { 395 {
340 if ((rdb1 = XrmGetStringDatabase (displayResource))) 396 if ((rdb1 = XrmGetStringDatabase (displayResource)))
341 /* Merge with screen-independent resources */ 397 /* Merge with screen-independent resources */
… …
371 if (id[0] == ':') 427 if (id[0] == ':')
372 { 428 {
373 val = rxvt_malloc (5 + strlen (id) + 1); 429 val = rxvt_malloc (5 + strlen (id) + 1);
374 strcpy (val, "unix/"); 430 strcpy (val, "unix/");
375 strcat (val, id); 431 strcat (val, id);
376 display = XOpenDisplay (val); 432 dpy = XOpenDisplay (val);
377 free (val); 433 free (val);
378 } 434 }
379 else 435 else
380#endif 436#endif
381 display = 0; 437 dpy = 0;
382 438
383 if (!display) 439 if (!dpy)
384 display = XOpenDisplay (id); 440 dpy = XOpenDisplay (id);
385 441
386 if (!display) 442 if (!dpy)
387 return false; 443 return false;
388 444
389 screen = DefaultScreen (display); 445 screen = DefaultScreen (dpy);
390 root = DefaultRootWindow (display); 446 root = DefaultRootWindow (dpy);
391 447
392 assert (sizeof (xa_names) / sizeof (char *) == NUM_XA); 448 assert (sizeof (xa_names) / sizeof (char *) == NUM_XA);
393 XInternAtoms (display, (char **)xa_names, NUM_XA, False, xa); 449 XInternAtoms (dpy, (char **)xa_names, NUM_XA, False, xa);
394 450
395 XrmSetDatabase (display, get_resources (false)); 451 XrmSetDatabase (dpy, get_resources (false));
396 452
397#ifdef POINTER_BLANK 453#ifdef POINTER_BLANK
398 XColor blackcolour; 454 XColor blackcolour;
399 blackcolour.red = 0; 455 blackcolour.red = 0;
400 blackcolour.green = 0; 456 blackcolour.green = 0;
401 blackcolour.blue = 0; 457 blackcolour.blue = 0;
402 Font f = XLoadFont (display, "fixed"); 458 Font f = XLoadFont (dpy, "fixed");
403 blank_cursor = XCreateGlyphCursor (display, f, f, ' ', ' ', 459 blank_cursor = XCreateGlyphCursor (dpy, f, f, ' ', ' ',
404 &blackcolour, &blackcolour); 460 &blackcolour, &blackcolour);
405 XUnloadFont (display, f); 461 XUnloadFont (dpy, f);
406#endif 462#endif
407 463
408 int fd = XConnectionNumber (display); 464 int fd = XConnectionNumber (dpy);
409 465
410#ifndef NO_SLOW_LINK_SUPPORT
411 // try to detect wether we have a local connection. 466 // try to detect wether we have a local connection.
412 // assume unix domains socket == local, everything else not 467 // assume unix domains socket == local, everything else not
413 // TODO: might want to check for inet/127.0.0.1 468 // TODO: might want to check for inet/127.0.0.1
414 is_local = 0; 469 is_local = 0;
415 sockaddr_un sa; 470 sockaddr_un sa;
416 socklen_t sl = sizeof (sa); 471 socklen_t sl = sizeof (sa);
417 472
418 if (!getsockname (fd, (sockaddr *)&sa, &sl)) 473 if (!getsockname (fd, (sockaddr *)&sa, &sl))
419 is_local = sa.sun_family == AF_LOCAL; 474 is_local = sa.sun_family == AF_UNIX;
420#endif
421 475
422 x_ev.start (fd, EVENT_READ); 476 x_ev.start (fd, EVENT_READ);
423 fcntl (fd, F_SETFD, FD_CLOEXEC); 477 fcntl (fd, F_SETFD, FD_CLOEXEC);
424 478
425 XSelectInput (display, root, PropertyChangeMask); 479 XSelectInput (dpy, root, PropertyChangeMask);
426 480
427 flush (); 481 flush ();
428 482
429 return true; 483 return true;
430} 484}
… …
432void 486void
433rxvt_display::ref_next () 487rxvt_display::ref_next ()
434{ 488{
435 // TODO: somehow check wether the database files/resources changed 489 // TODO: somehow check wether the database files/resources changed
436 // before affording re-loading/parsing 490 // before affording re-loading/parsing
437 XrmDestroyDatabase (XrmGetDatabase (display)); 491 XrmDestroyDatabase (XrmGetDatabase (dpy));
438 XrmSetDatabase (display, get_resources (true)); 492 XrmSetDatabase (dpy, get_resources (true));
439} 493}
440 494
441rxvt_display::~rxvt_display () 495rxvt_display::~rxvt_display ()
442{ 496{
443 if (!display) 497 if (!dpy)
444 return; 498 return;
445 499
446#ifdef POINTER_BLANK 500#ifdef POINTER_BLANK
447 XFreeCursor (display, blank_cursor); 501 XFreeCursor (dpy, blank_cursor);
448#endif 502#endif
449 x_ev.stop (); 503 x_ev.stop ();
450#ifdef USE_XIM 504#ifdef USE_XIM
451 xims.clear (); 505 xims.clear ();
452#endif 506#endif
453 XCloseDisplay (display); 507 XCloseDisplay (dpy);
454} 508}
455 509
456#ifdef USE_XIM 510#ifdef USE_XIM
457void rxvt_display::im_change_cb () 511void rxvt_display::im_change_cb ()
458{ 512{
… …
466 // registers, as xlib crashes due to a race otherwise. 520 // registers, as xlib crashes due to a race otherwise.
467 Atom actual_type, *atoms; 521 Atom actual_type, *atoms;
468 int actual_format; 522 int actual_format;
469 unsigned long nitems, bytes_after; 523 unsigned long nitems, bytes_after;
470 524
471 if (XGetWindowProperty (display, root, xa[XA_XIM_SERVERS], 0L, 1000000L, 525 if (XGetWindowProperty (dpy, root, xa[XA_XIM_SERVERS], 0L, 1000000L,
472 False, XA_ATOM, &actual_type, &actual_format, 526 False, XA_ATOM, &actual_type, &actual_format,
473 &nitems, &bytes_after, (unsigned char **)&atoms) 527 &nitems, &bytes_after, (unsigned char **)&atoms)
474 != Success ) 528 != Success )
475 return; 529 return;
476 530
477 if (actual_type == XA_ATOM && actual_format == 32) 531 if (actual_type == XA_ATOM && actual_format == 32)
478 for (int i = 0; i < nitems; i++) 532 for (int i = 0; i < nitems; i++)
479 if (XGetSelectionOwner (display, atoms[i])) 533 if (XGetSelectionOwner (dpy, atoms[i]))
480 { 534 {
481 im_change_cb (); 535 im_change_cb ();
482 break; 536 break;
483 } 537 }
484 538
… …
489void rxvt_display::x_cb (io_watcher &w, short revents) 543void rxvt_display::x_cb (io_watcher &w, short revents)
490{ 544{
491 do 545 do
492 { 546 {
493 XEvent xev; 547 XEvent xev;
494 XNextEvent (display, &xev); 548 XNextEvent (dpy, &xev);
495 549
496#ifdef USE_XIM 550#ifdef USE_XIM
497 if (!XFilterEvent (&xev, None)) 551 if (!XFilterEvent (&xev, None))
498 { 552 {
499 if (xev.type == PropertyNotify 553 if (xev.type == PropertyNotify
500 && xev.xany.window == root 554 && xev.xany.window == root
501 && xev.xproperty.atom == xa[XA_XIM_SERVERS]) 555 && xev.xproperty.atom == xa[XA_XIM_SERVERS])
502 im_change_check (); 556 im_change_check ();
503#endif 557#endif
558 if (xev.type == MappingNotify)
559 XRefreshKeyboardMapping (&xev.xmapping);
560
504 for (int i = xw.size (); i--; ) 561 for (int i = xw.size (); i--; )
505 { 562 {
506 if (!xw[i]) 563 if (!xw[i])
507 xw.erase_unordered (i); 564 xw.erase_unordered (i);
508 else if (xw[i]->window == xev.xany.window) 565 else if (xw[i]->window == xev.xany.window)
… …
510 } 567 }
511#ifdef USE_XIM 568#ifdef USE_XIM
512 } 569 }
513#endif 570#endif
514 } 571 }
515 while (XEventsQueued (display, QueuedAlready)); 572 while (XEventsQueued (dpy, QueuedAlready));
516 573
517 XFlush (display); 574 XFlush (dpy);
518} 575}
519 576
520void rxvt_display::flush () 577void rxvt_display::flush ()
521{ 578{
522 if (XEventsQueued (display, QueuedAlready)) 579 if (XEventsQueued (dpy, QueuedAlready))
523 x_cb (x_ev, EVENT_READ); 580 x_cb (x_ev, EVENT_READ);
524 581
525 XFlush (display); 582 XFlush (dpy);
526} 583}
527 584
528void rxvt_display::reg (xevent_watcher *w) 585void rxvt_display::reg (xevent_watcher *w)
529{ 586{
587 if (!w->active)
588 {
530 xw.push_back (w); 589 xw.push_back (w);
531 w->active = xw.size (); 590 w->active = xw.size ();
591 }
532} 592}
533 593
534void rxvt_display::unreg (xevent_watcher *w) 594void rxvt_display::unreg (xevent_watcher *w)
535{ 595{
536 if (w->active) 596 if (w->active)
597 {
537 xw[w->active - 1] = 0; 598 xw[w->active - 1] = 0;
599 w->active = 0;
600 }
538} 601}
539 602
540void rxvt_display::set_selection_owner (rxvt_term *owner) 603void rxvt_display::set_selection_owner (rxvt_term *owner)
541{ 604{
542 if (selection_owner && selection_owner != owner) 605 if (selection_owner && selection_owner != owner)
… …
587 650
588#endif 651#endif
589 652
590Atom rxvt_display::atom (const char *name) 653Atom rxvt_display::atom (const char *name)
591{ 654{
592 return XInternAtom (display, name, False); 655 return XInternAtom (dpy, name, False);
593} 656}
594 657
595///////////////////////////////////////////////////////////////////////////// 658/////////////////////////////////////////////////////////////////////////////
596 659
597template class refcache<rxvt_display>; 660template class refcache<rxvt_display>;
598refcache<rxvt_display> displays; 661refcache<rxvt_display> displays;
599 662
600///////////////////////////////////////////////////////////////////////////// 663/////////////////////////////////////////////////////////////////////////////
664//
665
666static unsigned int
667insert_component (unsigned int value, unsigned int mask, unsigned int shift)
668{
669 return (value * (mask + 1) >> 16) << shift;
670}
601 671
602bool 672bool
603rxvt_color::alloc (rxvt_screen *screen, const rgba &color) 673rxvt_color::alloc (rxvt_screen *screen, const rgba &color)
604{ 674{
605#if XFT 675#if XFT
… …
607 677
608 // FUCKING Xft gets it wrong, of course, so work around it. 678 // FUCKING Xft gets it wrong, of course, so work around it.
609 // Transparency users should eat shit and die, and then 679 // Transparency users should eat shit and die, and then
610 // XRenderQueryPictIndexValues themselves plenty. 680 // XRenderQueryPictIndexValues themselves plenty.
611 if ((screen->visual->c_class == TrueColor) 681 if ((screen->visual->c_class == TrueColor)
612 && (format = XRenderFindVisualFormat (screen->xdisp, screen->visual))) 682 && (format = XRenderFindVisualFormat (screen->dpy, screen->visual)))
613 { 683 {
614 // the fun lies in doing everything manually... 684 // the fun lies in doing everything manually...
615 c.color.red = color.r; 685 c.color.red = color.r;
616 c.color.green = color.g; 686 c.color.green = color.g;
617 c.color.blue = color.b; 687 c.color.blue = color.b;
618 c.color.alpha = color.a; 688 c.color.alpha = color.a;
619 689
620 c.pixel = ((color.r * format->direct.redMask / rgba::MAX_CC) << format->direct.red ) 690 c.pixel = insert_component (color.r, format->direct.redMask , format->direct.red )
621 | ((color.g * format->direct.greenMask / rgba::MAX_CC) << format->direct.green) 691 | insert_component (color.g, format->direct.greenMask, format->direct.green)
622 | ((color.b * format->direct.blueMask / rgba::MAX_CC) << format->direct.blue ) 692 | insert_component (color.b, format->direct.blueMask , format->direct.blue )
623 | ((color.a * format->direct.alphaMask / rgba::MAX_CC) << format->direct.alpha); 693 | insert_component (color.a, format->direct.alphaMask, format->direct.alpha);
624 694
625 return true; 695 return true;
626 } 696 }
627 else 697 else
628 { 698 {
… …
631 d.red = color.r; 701 d.red = color.r;
632 d.green = color.g; 702 d.green = color.g;
633 d.blue = color.b; 703 d.blue = color.b;
634 d.alpha = color.a; 704 d.alpha = color.a;
635 705
636 return XftColorAllocValue (screen->xdisp, screen->visual, screen->cmap, &d, &c); 706 return XftColorAllocValue (screen->dpy, screen->visual, screen->cmap, &d, &c);
637 } 707 }
638#else 708#else
639 c.red = color.r; 709 c.red = color.r;
640 c.green = color.g; 710 c.green = color.g;
641 c.blue = color.b; 711 c.blue = color.b;
642 712
643 if (screen->visual->c_class == TrueColor) 713 if (screen->visual->c_class == TrueColor)
644 { 714 {
645 c.pixel = (color.r * (screen->visual->red_mask >> ctz (screen->visual->red_mask )) 715 c.pixel = (color.r >> (16 - popcount (screen->visual->red_mask )) << ctz (screen->visual->red_mask ))
646 / rgba::MAX_CC) << ctz (screen->visual->red_mask ) 716 | (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 )) 717 | (color.b >> (16 - popcount (screen->visual->blue_mask )) << ctz (screen->visual->blue_mask ));
650 / rgba::MAX_CC) << ctz (screen->visual->blue_mask );
651 718
652 return true; 719 return true;
653 } 720 }
654 else if (XAllocColor (screen->xdisp, screen->cmap, &c)) 721 else if (XAllocColor (screen->dpy, screen->cmap, &c))
655 return true; 722 return true;
656 else 723 else
657 c.pixel = (color.r + color.g + color.b) > 128*3 724 c.pixel = (color.r + color.g + color.b) > 128*3
658 ? WhitePixelOfScreen (DefaultScreenOfDisplay (screen->xdisp)) 725 ? WhitePixelOfScreen (DefaultScreenOfDisplay (screen->dpy))
659 : BlackPixelOfScreen (DefaultScreenOfDisplay (screen->xdisp)); 726 : BlackPixelOfScreen (DefaultScreenOfDisplay (screen->dpy));
660#endif 727#endif
661 728
662 return false; 729 return false;
663} 730}
664 731
… …
681 // parse the non-standard "rgba:rrrr/gggg/bbbb/aaaa" format 748 // 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)) 749 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 { 750 {
684 XColor xc, xc_exact; 751 XColor xc, xc_exact;
685 752
686 if (XParseColor (screen->xdisp, screen->cmap, name, &xc)) 753 if (XParseColor (screen->dpy, screen->cmap, name, &xc))
687 { 754 {
688 c.r = xc.red; 755 c.r = xc.red;
689 c.g = xc.green; 756 c.g = xc.green;
690 c.b = xc.blue; 757 c.b = xc.blue;
691 } 758 }
… …
719 for (int i = 0; i < cmap_size; i++) 786 for (int i = 0; i < cmap_size; i++)
720 colors [i].pixel = i; 787 colors [i].pixel = i;
721 788
722 // many kilobytes transfer per colour, but pseudocolor isn't worth 789 // many kilobytes transfer per colour, but pseudocolor isn't worth
723 // many extra optimisations. 790 // many extra optimisations.
724 XQueryColors (screen->xdisp, screen->cmap, colors, cmap_size); 791 XQueryColors (screen->dpy, screen->cmap, colors, cmap_size);
725 792
726 int diff = 0x7fffffffUL; 793 int diff = 0x7fffffffUL;
727 XColor *best = colors; 794 XColor *best = colors;
728 795
729 for (int i = 0; i < cmap_size; i++) 796 for (int i = 0; i < cmap_size; i++)
… …
742 //rxvt_warn ("could not allocate %04x %04x %04x, getting %04x %04x %04x instead (%d)\n", 809 //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); 810 // color.r, color.g, color.b, best->red, best->green, best->blue, diff);
744 811
745 got = alloc (screen, rgba (best->red, best->green, best->blue)); 812 got = alloc (screen, rgba (best->red, best->green, best->blue));
746 813
747 delete colors; 814 delete [] colors;
748 } 815 }
749#endif 816#endif
750 817
751 return got; 818 return got;
752} 819}
… …
780} 847}
781 848
782void 849void
783rxvt_color::free (rxvt_screen *screen) 850rxvt_color::free (rxvt_screen *screen)
784{ 851{
852 if (screen->visual->c_class == TrueColor)
853 return; // nothing to do
854
785#if XFT 855#if XFT
786 XftColorFree (screen->xdisp, screen->visual, screen->cmap, &c); 856 XftColorFree (screen->dpy, screen->visual, screen->cmap, &c);
787#else 857#else
788 XFreeColors (screen->xdisp, screen->cmap, &c.pixel, 1, AllPlanes); 858 XFreeColors (screen->dpy, screen->cmap, &c.pixel, 1, AllPlanes);
789#endif 859#endif
790} 860}
791 861
792void 862void
793rxvt_color::fade (rxvt_screen *screen, int percent, rxvt_color &result, const rgba &to) 863rxvt_color::fade (rxvt_screen *screen, int percent, rxvt_color &result, const rgba &to)

Diff Legend

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