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.48 by root, Thu Feb 2 12:51:22 2006 UTC vs.
Revision 1.113 by sf-exg, Fri Jan 14 11:09:54 2011 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
41const char *const xa_names[] = 38static const char *const xa_names[] =
42{ 39{
43 "TEXT", 40 "TEXT",
44 "COMPOUND_TEXT", 41 "COMPOUND_TEXT",
45 "UTF8_STRING", 42 "UTF8_STRING",
46 "MULTIPLE", 43 "MULTIPLE",
… …
62#if ENABLE_EWMH 59#if ENABLE_EWMH
63 "_NET_WM_PID", 60 "_NET_WM_PID",
64 "_NET_WM_NAME", 61 "_NET_WM_NAME",
65 "_NET_WM_ICON_NAME", 62 "_NET_WM_ICON_NAME",
66 "_NET_WM_PING", 63 "_NET_WM_PING",
64 "_NET_WM_ICON",
67#endif 65#endif
68#if USE_XIM 66#if USE_XIM
69 "WM_LOCALE_NAME", 67 "WM_LOCALE_NAME",
70 "XIM_SERVERS", 68 "XIM_SERVERS",
71#endif 69#endif
72#ifdef TRANSPARENT 70#ifdef ENABLE_TRANSPARENCY
73 "_XROOTPMAP_ID", 71 "_XROOTPMAP_ID",
74 "ESETROOT_PMAP_ID", 72 "ESETROOT_PMAP_ID",
75#endif 73#endif
76#if ENABLE_XEMBED 74#if ENABLE_XEMBED
77 "_XEMBED", 75 "_XEMBED",
… …
177bool 175bool
178rxvt_xim::ref_init () 176rxvt_xim::ref_init ()
179{ 177{
180 display = GET_R->display; //HACK: TODO 178 display = GET_R->display; //HACK: TODO
181 179
182 xim = XOpenIM (display->display, NULL, NULL, NULL); 180 xim = XOpenIM (display->dpy, 0, 0, 0);
183 181
184 if (!xim) 182 if (!xim)
185 return false; 183 return false;
186 184
187 XIMCallback ximcallback; 185 XIMCallback ximcallback;
188 ximcallback.client_data = (XPointer)this; 186 ximcallback.client_data = (XPointer)this;
189 ximcallback.callback = im_destroy_cb; 187 ximcallback.callback = im_destroy_cb;
190 188
191 XSetIMValues (xim, XNDestroyCallback, &ximcallback, NULL); 189 XSetIMValues (xim, XNDestroyCallback, &ximcallback, (char *)0);
192 190
193 return true; 191 return true;
194} 192}
195 193
196rxvt_xim::~rxvt_xim () 194rxvt_xim::~rxvt_xim ()
… …
201 199
202#endif 200#endif
203 201
204///////////////////////////////////////////////////////////////////////////// 202/////////////////////////////////////////////////////////////////////////////
205 203
204#if XFT
205rxvt_drawable::~rxvt_drawable ()
206{
207 if (xftdrawable)
208 XftDrawDestroy (xftdrawable);
209}
210
211rxvt_drawable::operator XftDraw *()
212{
213 if (!xftdrawable)
214 xftdrawable = XftDrawCreate (screen->dpy, drawable, screen->visual, screen->cmap);
215
216 return xftdrawable;
217}
218#endif
219
220/////////////////////////////////////////////////////////////////////////////
221
222#if XFT
223
224// not strictly necessary as it is only used with superclass of zero_initialised
225rxvt_screen::rxvt_screen ()
226: scratch_area (0)
227{
228}
229
230rxvt_drawable &rxvt_screen::scratch_drawable (int w, int h)
231{
232 if (!scratch_area || w > scratch_w || h > scratch_h)
233 {
234 if (scratch_area)
235 {
236 XFreePixmap (dpy, scratch_area->drawable);
237 delete scratch_area;
238 }
239
240 Pixmap pm = XCreatePixmap (dpy, RootWindowOfScreen (ScreenOfDisplay (dpy, display->screen)),
241 scratch_w = w, scratch_h = h, depth);
242
243 scratch_area = new rxvt_drawable (this, pm);
244 }
245
246 return *scratch_area;
247}
248
249#endif
250
206void 251void
207rxvt_screen::set (rxvt_display *disp) 252rxvt_screen::set (rxvt_display *disp)
208{ 253{
209 display = disp; 254 display = disp;
210 xdisp = disp->display; 255 dpy = disp->dpy;
211 256
212 Screen *screen = ScreenOfDisplay (xdisp, disp->screen); 257 Screen *screen = ScreenOfDisplay (dpy, disp->screen);
213 258
214 depth = DefaultDepthOfScreen (screen); 259 depth = DefaultDepthOfScreen (screen);
215 visual = DefaultVisualOfScreen (screen); 260 visual = DefaultVisualOfScreen (screen);
216 cmap = DefaultColormapOfScreen (screen); 261 cmap = DefaultColormapOfScreen (screen);
217} 262}
218 263
219void 264void
220rxvt_screen::set (rxvt_display *disp, int bitdepth) 265rxvt_screen::select_visual (int bitdepth)
221{ 266{
222 set (disp);
223
224#if XFT 267#if XFT
225 XVisualInfo vinfo; 268 XVisualInfo vinfo;
226 269
227 if (XMatchVisualInfo (xdisp, display->screen, bitdepth, TrueColor, &vinfo)) 270 if (XMatchVisualInfo (dpy, display->screen, bitdepth, TrueColor, &vinfo))
228 { 271 {
229 depth = bitdepth; 272 depth = bitdepth;
230 visual = vinfo.visual; 273 visual = vinfo.visual;
231 cmap = XCreateColormap (xdisp, disp->root, visual, AllocNone); 274 cmap = XCreateColormap (dpy, display->root, visual, AllocNone);
232 } 275 }
233#endif 276#endif
234} 277}
235 278
236void 279void
237rxvt_screen::clear () 280rxvt_screen::clear ()
238{ 281{
282#if XFT
283 if (scratch_area)
284 {
285 XFreePixmap (dpy, scratch_area->drawable);
286 delete scratch_area;
287 }
288#endif
289
239 if (cmap != DefaultColormapOfScreen (ScreenOfDisplay (xdisp, display->screen))) 290 if (cmap != DefaultColormapOfScreen (ScreenOfDisplay (dpy, display->screen)))
240 XFreeColormap (xdisp, cmap); 291 XFreeColormap (dpy, cmap);
241} 292}
242 293
243///////////////////////////////////////////////////////////////////////////// 294/////////////////////////////////////////////////////////////////////////////
244 295
245rxvt_display::rxvt_display (const char *id) 296rxvt_display::rxvt_display (const char *id)
246: refcounted (id) 297: refcounted (id)
247, x_ev (this, &rxvt_display::x_cb)
248, selection_owner (0) 298, selection_owner (0)
299, clipboard_owner (0)
249{ 300{
301 x_ev .set<rxvt_display, &rxvt_display::x_cb > (this);
302 flush_ev.set<rxvt_display, &rxvt_display::flush_cb> (this);
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 = 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 = getenv ("XAPPLRESDIR")))
272 { 324 {
273 snprintf (fname, sizeof (fname), "%s/%s", xe, RESCLASS); 325 snprintf (fname, sizeof (fname), "%s/%s", xe, RESCLASS);
274 326
275 if ((rdb1 = XrmGetFileDatabase (fname))) 327 if ((rdb1 = XrmGetFileDatabase (fname)))
276 XrmMergeDatabases (rdb1, &database); 328 XrmMergeDatabases (rdb1, &database);
… …
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
308 XFree (displayResource); 400 XFree (displayResource);
309 } 401 }
310 402
311 // 3. User's per host defaults file 403 // 3. User's per host defaults file
312 /* Add in XENVIRONMENT file */ 404 /* Add in XENVIRONMENT file */
313 if ((xe = (char *)getenv ("XENVIRONMENT")) 405 if ((xe = getenv ("XENVIRONMENT"))
314 && (rdb1 = XrmGetFileDatabase (xe))) 406 && (rdb1 = XrmGetFileDatabase (xe)))
315 XrmMergeDatabases (rdb1, &database); 407 XrmMergeDatabases (rdb1, &database);
316 else if (homedir) 408 else if (homedir)
317 { 409 {
318 struct utsname un; 410 struct utsname un;
… …
332bool rxvt_display::ref_init () 424bool rxvt_display::ref_init ()
333{ 425{
334#ifdef LOCAL_X_IS_UNIX 426#ifdef LOCAL_X_IS_UNIX
335 if (id[0] == ':') 427 if (id[0] == ':')
336 { 428 {
337 val = rxvt_malloc (5 + strlen (id) + 1); 429 if (!(val = rxvt_temp_buf<char> (5 + strlen (id) + 1)))
430 return false;
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);
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 (ARRAY_LENGTH(xa_names) == 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 whether 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
476 flush_ev.start ();
386 x_ev.start (fd, EVENT_READ); 477 x_ev.start (fd, ev::READ);
387 fcntl (fd, F_SETFD, FD_CLOEXEC); 478 fcntl (fd, F_SETFD, FD_CLOEXEC);
388 479
389 XSelectInput (display, root, PropertyChangeMask); 480 XSelectInput (dpy, root, PropertyChangeMask);
390 481
391 flush (); 482 flush ();
392 483
393 return true; 484 return true;
394} 485}
395 486
396void 487void
397rxvt_display::ref_next () 488rxvt_display::ref_next ()
398{ 489{
399 // TODO: somehow check wether the database files/resources changed 490 // TODO: somehow check whether the database files/resources changed
400 // before affording re-loading/parsing 491 // before affording re-loading/parsing
401 XrmDestroyDatabase (XrmGetDatabase (display)); 492 XrmDestroyDatabase (XrmGetDatabase (dpy));
402 XrmSetDatabase (display, get_resources ()); 493 XrmSetDatabase (dpy, get_resources (true));
403} 494}
404 495
405rxvt_display::~rxvt_display () 496rxvt_display::~rxvt_display ()
406{ 497{
407 if (!display) 498 if (!dpy)
408 return; 499 return;
409 500
410#ifdef POINTER_BLANK 501#ifdef POINTER_BLANK
411 XFreeCursor (display, blank_cursor); 502 XFreeCursor (dpy, blank_cursor);
412#endif 503#endif
413 x_ev.stop (); 504 x_ev.stop ();
505 flush_ev.stop ();
414#ifdef USE_XIM 506#ifdef USE_XIM
415 xims.clear (); 507 xims.clear ();
416#endif 508#endif
509 XrmDestroyDatabase (XrmGetDatabase (dpy));
417 XCloseDisplay (display); 510 XCloseDisplay (dpy);
418} 511}
419 512
420#ifdef USE_XIM 513#ifdef USE_XIM
421void rxvt_display::im_change_cb () 514void rxvt_display::im_change_cb ()
422{ 515{
… …
430 // registers, as xlib crashes due to a race otherwise. 523 // registers, as xlib crashes due to a race otherwise.
431 Atom actual_type, *atoms; 524 Atom actual_type, *atoms;
432 int actual_format; 525 int actual_format;
433 unsigned long nitems, bytes_after; 526 unsigned long nitems, bytes_after;
434 527
435 if (XGetWindowProperty (display, root, xa[XA_XIM_SERVERS], 0L, 1000000L, 528 if (XGetWindowProperty (dpy, root, xa[XA_XIM_SERVERS], 0L, 1000000L,
436 False, XA_ATOM, &actual_type, &actual_format, 529 False, XA_ATOM, &actual_type, &actual_format,
437 &nitems, &bytes_after, (unsigned char **)&atoms) 530 &nitems, &bytes_after, (unsigned char **)&atoms)
438 != Success ) 531 != Success)
439 return; 532 return;
440 533
441 if (actual_type == XA_ATOM && actual_format == 32) 534 if (actual_type == XA_ATOM && actual_format == 32)
442 for (int i = 0; i < nitems; i++) 535 for (int i = 0; i < nitems; i++)
443 if (XGetSelectionOwner (display, atoms[i])) 536 if (XGetSelectionOwner (dpy, atoms[i]))
444 { 537 {
445 im_change_cb (); 538 im_change_cb ();
446 break; 539 break;
447 } 540 }
448 541
449 XFree (atoms); 542 XFree (atoms);
450} 543}
451#endif 544#endif
452 545
453void rxvt_display::x_cb (io_watcher &w, short revents) 546void rxvt_display::x_cb (ev::io &w, int revents)
454{ 547{
548 flush_ev.start ();
549}
550
551void rxvt_display::flush_cb (ev::prepare &w, int revents)
552{
553 while (XEventsQueued (dpy, QueuedAfterFlush))
455 do 554 do
456 { 555 {
457 XEvent xev; 556 XEvent xev;
458 XNextEvent (display, &xev); 557 XNextEvent (dpy, &xev);
459 558
460#ifdef USE_XIM 559#ifdef USE_XIM
461 if (!XFilterEvent (&xev, None)) 560 if (!XFilterEvent (&xev, None))
462 { 561 {
463 if (xev.type == PropertyNotify 562 if (xev.type == PropertyNotify
464 && xev.xany.window == root 563 && xev.xany.window == root
465 && xev.xproperty.atom == xa[XA_XIM_SERVERS]) 564 && xev.xproperty.atom == xa[XA_XIM_SERVERS])
466 im_change_check (); 565 im_change_check ();
467#endif 566#endif
567 if (xev.type == MappingNotify)
568 XRefreshKeyboardMapping (&xev.xmapping);
569
468 for (int i = xw.size (); i--; ) 570 for (int i = xw.size (); i--; )
469 { 571 {
470 if (!xw[i]) 572 if (!xw[i])
471 xw.erase_unordered (i); 573 xw.erase_unordered (i);
472 else if (xw[i]->window == xev.xany.window) 574 else if (xw[i]->window == xev.xany.window)
473 xw[i]->call (xev); 575 xw[i]->call (xev);
474 } 576 }
475#ifdef USE_XIM 577#ifdef USE_XIM
476 } 578 }
477#endif 579#endif
478 } 580 }
479 while (XEventsQueued (display, QueuedAlready)); 581 while (XEventsQueued (dpy, QueuedAlready));
480 582
481 XFlush (display); 583 w.stop ();
482}
483
484void rxvt_display::flush ()
485{
486 if (XEventsQueued (display, QueuedAlready))
487 x_cb (x_ev, EVENT_READ);
488
489 XFlush (display);
490} 584}
491 585
492void rxvt_display::reg (xevent_watcher *w) 586void rxvt_display::reg (xevent_watcher *w)
493{ 587{
588 if (!w->active)
589 {
494 xw.push_back (w); 590 xw.push_back (w);
495 w->active = xw.size (); 591 w->active = xw.size ();
592 }
496} 593}
497 594
498void rxvt_display::unreg (xevent_watcher *w) 595void rxvt_display::unreg (xevent_watcher *w)
499{ 596{
500 if (w->active) 597 if (w->active)
598 {
501 xw[w->active - 1] = 0; 599 xw[w->active - 1] = 0;
600 w->active = 0;
601 }
502} 602}
503 603
504void rxvt_display::set_selection_owner (rxvt_term *owner) 604void rxvt_display::set_selection_owner (rxvt_term *owner, bool clipboard)
505{ 605{
606 rxvt_term * &cur_owner = !clipboard ? selection_owner : clipboard_owner;
607
506 if (selection_owner && selection_owner != owner) 608 if (cur_owner && cur_owner != owner)
507 selection_owner->selection_clear (); 609 {
610 rxvt_term *term = cur_owner;
611 term->selection_clear (clipboard);
612 term->flush ();
613 }
508 614
509 selection_owner = owner; 615 cur_owner = owner;
510} 616}
511 617
512#ifdef USE_XIM 618#ifdef USE_XIM
513 619
514void rxvt_display::reg (im_watcher *w) 620void rxvt_display::reg (im_watcher *w)
… …
527 int l, m; 633 int l, m;
528 634
529 l = strlen (locale); 635 l = strlen (locale);
530 m = strlen (modifiers); 636 m = strlen (modifiers);
531 637
532 if (!(id = (char *)malloc (l + m + 2))) 638 if (!(id = rxvt_temp_buf<char> (l + m + 2)))
533 return 0; 639 return 0;
534 640
535 memcpy (id, locale, l); id[l] = '\n'; 641 memcpy (id, locale, l); id[l] = '\n';
536 memcpy (id + l + 1, modifiers, m); id[l + m + 1] = 0; 642 memcpy (id + l + 1, modifiers, m); id[l + m + 1] = 0;
537 643
538 rxvt_xim *xim = xims.get (id); 644 rxvt_xim *xim = xims.get (id);
539
540 free (id);
541 645
542 return xim; 646 return xim;
543} 647}
544 648
545void rxvt_display::put_xim (rxvt_xim *xim) 649void rxvt_display::put_xim (rxvt_xim *xim)
… …
551 655
552#endif 656#endif
553 657
554Atom rxvt_display::atom (const char *name) 658Atom rxvt_display::atom (const char *name)
555{ 659{
556 return XInternAtom (display, name, False); 660 return XInternAtom (dpy, name, False);
557} 661}
558 662
559///////////////////////////////////////////////////////////////////////////// 663/////////////////////////////////////////////////////////////////////////////
560 664
561template class refcache<rxvt_display>; 665template class refcache<rxvt_display>;
562refcache<rxvt_display> displays; 666refcache<rxvt_display> displays;
563 667
564///////////////////////////////////////////////////////////////////////////// 668/////////////////////////////////////////////////////////////////////////////
565 669//
670
671static unsigned int
672insert_component (unsigned int value, unsigned int mask, unsigned int shift)
673{
674 return (value * (mask + 1) >> 16) << shift;
675}
676
566bool 677bool
567rxvt_color::alloc (rxvt_screen *screen, const rgba &color) 678rxvt_color::alloc (rxvt_screen *screen, const rgba &color)
568{ 679{
680 //TODO: only supports 24 bit
681 int alpha = color.a >= 0xff00 ? 0xffff : color.a;
682
569#if XFT 683#if XFT
570 XRenderPictFormat *format; 684 XRenderPictFormat *format;
571 685
572 // FUCKING Xft gets it wrong, of course, so work around it. 686 // FUCKING Xft gets it wrong, of course, so work around it.
573 // Transparency users should eat shit and die, and then 687 // Transparency users should eat shit and die, and then
574 // XRenderQueryPictIndexValues themselves plenty. 688 // XRenderQueryPictIndexValues themselves plenty.
575 if ((screen->visual->c_class == TrueColor) 689 if ((screen->visual->c_class == TrueColor)
576 && (format = XRenderFindVisualFormat (screen->xdisp, screen->visual))) 690 && (format = XRenderFindVisualFormat (screen->dpy, screen->visual)))
577 { 691 {
578 // the fun lies in doing everything manually... 692 // the fun lies in doing everything manually...
579 c.color.red = color.r; 693 c.color.red = color.r;
580 c.color.green = color.g; 694 c.color.green = color.g;
581 c.color.blue = color.b; 695 c.color.blue = color.b;
582 c.color.alpha = color.a; 696 c.color.alpha = alpha;
583 697
584 c.pixel = ((color.r * format->direct.redMask / rgba::MAX_CC) << format->direct.red ) 698 c.pixel = insert_component (color.r, format->direct.redMask , format->direct.red )
585 | ((color.g * format->direct.greenMask / rgba::MAX_CC) << format->direct.green) 699 | insert_component (color.g, format->direct.greenMask, format->direct.green)
586 | ((color.b * format->direct.blueMask / rgba::MAX_CC) << format->direct.blue ) 700 | insert_component (color.b, format->direct.blueMask , format->direct.blue )
587 | ((color.a * format->direct.alphaMask / rgba::MAX_CC) << format->direct.alpha); 701 | insert_component (alpha , format->direct.alphaMask, format->direct.alpha);
588 702
589 return true; 703 return true;
590 } 704 }
591 else 705 else
592 { 706 {
593 XRenderColor d; 707 XRenderColor d;
594 708
595 d.red = color.r; 709 d.red = color.r;
596 d.green = color.g; 710 d.green = color.g;
597 d.blue = color.b; 711 d.blue = color.b;
598 d.alpha = color.a; 712 d.alpha = alpha;
599 713
600 return XftColorAllocValue (screen->xdisp, screen->visual, screen->cmap, &d, &c); 714 return XftColorAllocValue (screen->dpy, screen->visual, screen->cmap, &d, &c);
601 } 715 }
602#else 716#else
603 c.red = color.r; 717 c.red = color.r;
604 c.green = color.g; 718 c.green = color.g;
605 c.blue = color.b; 719 c.blue = color.b;
606 720
607 if (screen->visual->c_class == TrueColor) 721 if (screen->visual->c_class == TrueColor)
608 { 722 {
609 c.pixel = (color.r * (screen->visual->red_mask >> ctz (screen->visual->red_mask )) 723 c.pixel = (color.r >> (16 - rxvt_popcount (screen->visual->red_mask )) << rxvt_ctz (screen->visual->red_mask ))
610 / rgba::MAX_CC) << ctz (screen->visual->red_mask ) 724 | (color.g >> (16 - rxvt_popcount (screen->visual->green_mask)) << rxvt_ctz (screen->visual->green_mask))
611 | (color.g * (screen->visual->green_mask >> ctz (screen->visual->green_mask))
612 / rgba::MAX_CC) << ctz (screen->visual->green_mask)
613 | (color.b * (screen->visual->blue_mask >> ctz (screen->visual->blue_mask )) 725 | (color.b >> (16 - rxvt_popcount (screen->visual->blue_mask )) << rxvt_ctz (screen->visual->blue_mask ));
614 / rgba::MAX_CC) << ctz (screen->visual->blue_mask );
615 726
616 return true; 727 return true;
617 } 728 }
618 else if (XAllocColor (screen->xdisp, screen->cmap, &c)) 729 else if (XAllocColor (screen->dpy, screen->cmap, &c))
619 return true; 730 return true;
620 else 731 else
621 c.pixel = (color.r + color.g + color.b) > 128*3 732 c.pixel = (color.r + color.g + color.b) > 128*3
622 ? WhitePixelOfScreen (DefaultScreenOfDisplay (screen->xdisp)) 733 ? WhitePixelOfScreen (DefaultScreenOfDisplay (screen->dpy))
623 : BlackPixelOfScreen (DefaultScreenOfDisplay (screen->xdisp)); 734 : BlackPixelOfScreen (DefaultScreenOfDisplay (screen->dpy));
624#endif 735#endif
625 736
626 return false; 737 return false;
627} 738}
628 739
… …
631{ 742{
632 rgba c; 743 rgba c;
633 char eos; 744 char eos;
634 int skip; 745 int skip;
635 746
747 c.a = rgba::MAX_CC;
748
636 // parse the nonstandard "[alphapercent]" prefix 749 // parse the nonstandard "[alphapercent]" prefix
637 if (1 <= sscanf (name, "[%hd]%n", &c.a, &skip)) 750 if (1 <= sscanf (name, "[%hd]%n", &c.a, &skip))
638 { 751 {
639 c.a = lerp<int, int, int> (0, rgba::MAX_CC, c.a); 752 c.a = lerp<int, int, int> (0, rgba::MAX_CC, c.a);
640 name += skip; 753 name += skip;
641 } 754 }
642 else
643 c.a = rgba::MAX_CC;
644 755
645 // parse the non-standard "rgba:rrrr/gggg/bbbb/aaaa" format 756 // parse the non-standard "rgba:rrrr/gggg/bbbb/aaaa" format
646 if (strlen (name) != 4+5*4 || 4 != sscanf (name, "rgba:%4hx/%4hx/%4hx/%4hx%c", &c.r, &c.g, &c.b, &c.a, &eos)) 757 if (strlen (name) != 4+5*4 || 4 != sscanf (name, "rgba:%4hx/%4hx/%4hx/%4hx%c", &c.r, &c.g, &c.b, &c.a, &eos))
647 { 758 {
648 XColor xc, xc_exact; 759 XColor xc;
649 760
650 if (XParseColor (screen->xdisp, screen->cmap, name, &xc)) 761 if (XParseColor (screen->dpy, screen->cmap, name, &xc))
651 { 762 {
652 c.r = xc.red; 763 c.r = xc.red;
653 c.g = xc.green; 764 c.g = xc.green;
654 c.b = xc.blue; 765 c.b = xc.blue;
655 } 766 }
… …
680 { 791 {
681 XColor *colors = new XColor [screen->visual->map_entries]; 792 XColor *colors = new XColor [screen->visual->map_entries];
682 793
683 for (int i = 0; i < cmap_size; i++) 794 for (int i = 0; i < cmap_size; i++)
684 colors [i].pixel = i; 795 colors [i].pixel = i;
685 796
686 // many kilobytes transfer per colour, but pseudocolor isn't worth 797 // many kilobytes transfer per colour, but pseudocolor isn't worth
687 // many extra optimisations. 798 // many extra optimisations.
688 XQueryColors (screen->xdisp, screen->cmap, colors, cmap_size); 799 XQueryColors (screen->dpy, screen->cmap, colors, cmap_size);
689 800
690 int diff = 0x7fffffffUL; 801 int diff = 0x7fffffffUL;
691 XColor *best = colors; 802 XColor *best = colors;
692 803
693 for (int i = 0; i < cmap_size; i++) 804 for (int i = 0; i < cmap_size; i++)
… …
703 } 814 }
704 } 815 }
705 816
706 //rxvt_warn ("could not allocate %04x %04x %04x, getting %04x %04x %04x instead (%d)\n", 817 //rxvt_warn ("could not allocate %04x %04x %04x, getting %04x %04x %04x instead (%d)\n",
707 // color.r, color.g, color.b, best->red, best->green, best->blue, diff); 818 // color.r, color.g, color.b, best->red, best->green, best->blue, diff);
708 819
709 got = alloc (screen, rgba (best->red, best->green, best->blue)); 820 got = alloc (screen, rgba (best->red, best->green, best->blue));
710 821
711 delete colors; 822 delete [] colors;
712 } 823 }
713#endif 824#endif
714 825
715 return got; 826 return got;
716} 827}
… …
741 color.green = c.g; 852 color.green = c.g;
742 color.blue = c.b; 853 color.blue = c.b;
743 color.pixel = (Pixel)*this; 854 color.pixel = (Pixel)*this;
744} 855}
745 856
746void 857void
747rxvt_color::free (rxvt_screen *screen) 858rxvt_color::free (rxvt_screen *screen)
748{ 859{
860 if (screen->visual->c_class == TrueColor)
861 return; // nothing to do
862
749#if XFT 863#if XFT
750 XftColorFree (screen->xdisp, screen->visual, screen->cmap, &c); 864 XftColorFree (screen->dpy, screen->visual, screen->cmap, &c);
751#else 865#else
752 XFreeColors (screen->xdisp, screen->cmap, &c.pixel, 1, AllPlanes); 866 XFreeColors (screen->dpy, screen->cmap, &c.pixel, 1, AllPlanes);
753#endif 867#endif
754} 868}
755 869
756void 870void
757rxvt_color::fade (rxvt_screen *screen, int percent, rxvt_color &result, const rgba &to) 871rxvt_color::fade (rxvt_screen *screen, int percent, rxvt_color &result, const rgba &to)

Diff Legend

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