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

Diff Legend

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