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.47 by root, Thu Feb 2 00:31:47 2006 UTC vs.
Revision 1.111 by sf-exg, Sat Dec 18 18:17:39 2010 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 // it's actually faster to re-allocate every time. don't ask me
233 // why, but its likely no big deal there are no roundtrips
234 // (I think/hope).
235 if (!scratch_area || w > scratch_w || h > scratch_h || 1/*D*/)
236 {
237 if (scratch_area)
238 {
239 XFreePixmap (dpy, scratch_area->drawable);
240 delete scratch_area;
241 }
242
243 Pixmap pm = XCreatePixmap (dpy, RootWindowOfScreen (ScreenOfDisplay (dpy, display->screen)),
244 scratch_w = w, scratch_h = h, depth);
245
246 scratch_area = new rxvt_drawable (this, pm);
247 }
248
249 return *scratch_area;
250}
251
252#endif
253
206void 254void
207rxvt_screen::set (rxvt_display *disp) 255rxvt_screen::set (rxvt_display *disp)
208{ 256{
209 display = disp; 257 display = disp;
210 xdisp = disp->display; 258 dpy = disp->dpy;
211 259
212 Screen *screen = ScreenOfDisplay (xdisp, disp->screen); 260 Screen *screen = ScreenOfDisplay (dpy, disp->screen);
213 261
214 depth = DefaultDepthOfScreen (screen); 262 depth = DefaultDepthOfScreen (screen);
215 visual = DefaultVisualOfScreen (screen); 263 visual = DefaultVisualOfScreen (screen);
216 cmap = DefaultColormapOfScreen (screen); 264 cmap = DefaultColormapOfScreen (screen);
217} 265}
218 266
219void 267void
220rxvt_screen::set (rxvt_display *disp, int bitdepth) 268rxvt_screen::select_visual (int bitdepth)
221{ 269{
222 set (disp);
223
224#if XFT 270#if XFT
225 XVisualInfo vinfo; 271 XVisualInfo vinfo;
226 272
227 if (XMatchVisualInfo (xdisp, display->screen, bitdepth, TrueColor, &vinfo)) 273 if (XMatchVisualInfo (dpy, display->screen, bitdepth, TrueColor, &vinfo))
228 { 274 {
229 depth = bitdepth; 275 depth = bitdepth;
230 visual = vinfo.visual; 276 visual = vinfo.visual;
231 cmap = XCreateColormap (xdisp, disp->root, visual, AllocNone); 277 cmap = XCreateColormap (dpy, display->root, visual, AllocNone);
232 } 278 }
233#endif 279#endif
234} 280}
235 281
236void 282void
237rxvt_screen::clear () 283rxvt_screen::clear ()
238{ 284{
285#if XFT
286 if (scratch_area)
287 {
288 XFreePixmap (dpy, scratch_area->drawable);
289 delete scratch_area;
290 }
291#endif
292
239 if (cmap != DefaultColormapOfScreen (ScreenOfDisplay (xdisp, display->screen))) 293 if (cmap != DefaultColormapOfScreen (ScreenOfDisplay (dpy, display->screen)))
240 XFreeColormap (xdisp, cmap); 294 XFreeColormap (dpy, cmap);
241} 295}
242 296
243///////////////////////////////////////////////////////////////////////////// 297/////////////////////////////////////////////////////////////////////////////
244 298
245rxvt_display::rxvt_display (const char *id) 299rxvt_display::rxvt_display (const char *id)
246: refcounted (id) 300: refcounted (id)
247, x_ev (this, &rxvt_display::x_cb)
248, selection_owner (0) 301, selection_owner (0)
302, clipboard_owner (0)
249{ 303{
304 x_ev .set<rxvt_display, &rxvt_display::x_cb > (this);
305 flush_ev.set<rxvt_display, &rxvt_display::flush_cb> (this);
250} 306}
251 307
252XrmDatabase 308XrmDatabase
253rxvt_display::get_resources () 309rxvt_display::get_resources (bool refresh)
254{ 310{
255 char *homedir = (char *)getenv ("HOME"); 311 char *homedir = getenv ("HOME");
256 char fname[1024]; 312 char fname[1024];
257 313
258 /* 314 /*
259 * get resources using the X library function 315 * get resources using the X library function
260 */ 316 */
261 char *displayResource, *xe; 317 char *displayResource, *xe;
262 XrmDatabase database, rdb1; 318 XrmDatabase rdb1, database = 0;
263
264 database = NULL;
265 319
266 // for ordering, see for example http://www.faqs.org/faqs/Xt-FAQ/ Subject: 20 320 // for ordering, see for example http://www.faqs.org/faqs/Xt-FAQ/ Subject: 20
321 // as opposed to "standard practise", we always read in ~/.Xdefaults
267 322
268 // 6. System wide per application default file. 323 // 6. System wide per application default file.
269 324
270 /* Add in $XAPPLRESDIR/Rxvt only; not bothering with XUSERFILESEARCHPATH */ 325 /* Add in $XAPPLRESDIR/Rxvt only; not bothering with XUSERFILESEARCHPATH */
271 if ((xe = (char *)getenv ("XAPPLRESDIR"))) 326 if ((xe = getenv ("XAPPLRESDIR")))
272 { 327 {
273 snprintf (fname, sizeof (fname), "%s/%s", xe, RESCLASS); 328 snprintf (fname, sizeof (fname), "%s/%s", xe, RESCLASS);
274 329
275 if ((rdb1 = XrmGetFileDatabase (fname))) 330 if ((rdb1 = XrmGetFileDatabase (fname)))
276 XrmMergeDatabases (rdb1, &database); 331 XrmMergeDatabases (rdb1, &database);
… …
278 333
279 // 5. User's per application default file. 334 // 5. User's per application default file.
280 // none 335 // none
281 336
282 // 4. User's defaults file. 337 // 4. User's defaults file.
338 if (homedir)
339 {
340 snprintf (fname, sizeof (fname), "%s/.Xdefaults", homedir);
341
342 if ((rdb1 = XrmGetFileDatabase (fname)))
343 XrmMergeDatabases (rdb1, &database);
344 }
345
283 /* Get any Xserver defaults */ 346 /* Get any Xserver defaults */
347 if (refresh)
348 {
349 // fucking xlib keeps a copy of the rm string
350 Atom actual_type;
351 int actual_format;
352 unsigned long nitems, nremaining;
353 char *val = 0;
354
355#if XLIB_ILLEGAL_ACCESS
356 if (dpy->xdefaults)
357 XFree (dpy->xdefaults);
358#endif
359
360 if (XGetWindowProperty (dpy, RootWindow (dpy, 0), XA_RESOURCE_MANAGER,
361 0L, 100000000L, False,
362 XA_STRING, &actual_type, &actual_format,
363 &nitems, &nremaining,
364 (unsigned char **)&val) == Success
365 && actual_type == XA_STRING
366 && actual_format == 8)
367 displayResource = val;
368 else
369 {
370 displayResource = 0;
371
372 if (val)
373 XFree (val);
374 }
375
376#if XLIB_ILLEGAL_ACCESS
377 dpy->xdefaults = displayResource;
378#endif
379 }
380 else
284 displayResource = XResourceManagerString (display); 381 displayResource = XResourceManagerString (dpy);
285 382
286 if (displayResource != NULL) 383 if (displayResource)
287 { 384 {
288 if ((rdb1 = XrmGetStringDatabase (displayResource))) 385 if ((rdb1 = XrmGetStringDatabase (displayResource)))
289 XrmMergeDatabases (rdb1, &database); 386 XrmMergeDatabases (rdb1, &database);
290 } 387 }
291 else if (homedir)
292 {
293 snprintf (fname, sizeof (fname), "%s/.Xdefaults", homedir);
294 388
295 if ((rdb1 = XrmGetFileDatabase (fname))) 389#if !XLIB_ILLEGAL_ACCESS
296 XrmMergeDatabases (rdb1, &database); 390 if (refresh && displayResource)
297 } 391 XFree (displayResource);
392#endif
298 393
299 /* Get screen specific resources */ 394 /* Get screen specific resources */
300 displayResource = XScreenResourceString (ScreenOfDisplay (display, screen)); 395 displayResource = XScreenResourceString (ScreenOfDisplay (dpy, screen));
301 396
302 if (displayResource != NULL) 397 if (displayResource)
303 { 398 {
304 if ((rdb1 = XrmGetStringDatabase (displayResource))) 399 if ((rdb1 = XrmGetStringDatabase (displayResource)))
305 /* Merge with screen-independent resources */ 400 /* Merge with screen-independent resources */
306 XrmMergeDatabases (rdb1, &database); 401 XrmMergeDatabases (rdb1, &database);
307 402
308 XFree (displayResource); 403 XFree (displayResource);
309 } 404 }
310 405
311 // 3. User's per host defaults file 406 // 3. User's per host defaults file
312 /* Add in XENVIRONMENT file */ 407 /* Add in XENVIRONMENT file */
313 if ((xe = (char *)getenv ("XENVIRONMENT")) 408 if ((xe = getenv ("XENVIRONMENT"))
314 && (rdb1 = XrmGetFileDatabase (xe))) 409 && (rdb1 = XrmGetFileDatabase (xe)))
315 XrmMergeDatabases (rdb1, &database); 410 XrmMergeDatabases (rdb1, &database);
316 else if (homedir) 411 else if (homedir)
317 { 412 {
318 struct utsname un; 413 struct utsname un;
… …
332bool rxvt_display::ref_init () 427bool rxvt_display::ref_init ()
333{ 428{
334#ifdef LOCAL_X_IS_UNIX 429#ifdef LOCAL_X_IS_UNIX
335 if (id[0] == ':') 430 if (id[0] == ':')
336 { 431 {
337 val = rxvt_malloc (5 + strlen (id) + 1); 432 if (!(val = rxvt_temp_buf<char> (5 + strlen (id) + 1)))
433 return false;
338 strcpy (val, "unix/"); 434 strcpy (val, "unix/");
339 strcat (val, id); 435 strcat (val, id);
340 display = XOpenDisplay (val); 436 dpy = XOpenDisplay (val);
341 free (val);
342 } 437 }
343 else 438 else
344#endif 439#endif
345 display = 0; 440 dpy = 0;
346 441
347 if (!display) 442 if (!dpy)
348 display = XOpenDisplay (id); 443 dpy = XOpenDisplay (id);
349 444
350 if (!display) 445 if (!dpy)
351 return false; 446 return false;
352 447
353 screen = DefaultScreen (display); 448 screen = DefaultScreen (dpy);
354 root = DefaultRootWindow (display); 449 root = DefaultRootWindow (dpy);
355 450
356 assert (sizeof (xa_names) / sizeof (char *) == NUM_XA); 451 assert (ARRAY_LENGTH(xa_names) == NUM_XA);
357 XInternAtoms (display, (char **)xa_names, NUM_XA, False, xa); 452 XInternAtoms (dpy, (char **)xa_names, NUM_XA, False, xa);
358 453
359 XrmSetDatabase (display, get_resources ()); 454 XrmSetDatabase (dpy, get_resources (false));
360 455
361#ifdef POINTER_BLANK 456#ifdef POINTER_BLANK
362 XColor blackcolour; 457 XColor blackcolour;
363 blackcolour.red = 0; 458 blackcolour.red = 0;
364 blackcolour.green = 0; 459 blackcolour.green = 0;
365 blackcolour.blue = 0; 460 blackcolour.blue = 0;
366 Font f = XLoadFont (display, "fixed"); 461 Font f = XLoadFont (dpy, "fixed");
367 blank_cursor = XCreateGlyphCursor (display, f, f, ' ', ' ', 462 blank_cursor = XCreateGlyphCursor (dpy, f, f, ' ', ' ',
368 &blackcolour, &blackcolour); 463 &blackcolour, &blackcolour);
369 XUnloadFont (display, f); 464 XUnloadFont (dpy, f);
370#endif 465#endif
371 466
372 int fd = XConnectionNumber (display); 467 int fd = XConnectionNumber (dpy);
373 468
374#ifndef NO_SLOW_LINK_SUPPORT
375 // try to detect wether we have a local connection. 469 // try to detect whether we have a local connection.
376 // assume unix domains socket == local, everything else not 470 // assume unix domain socket == local, everything else not
377 // TODO: might want to check for inet/127.0.0.1 471 // TODO: might want to check for inet/127.0.0.1
378 is_local = 0; 472 is_local = 0;
379 sockaddr_un sa; 473 sockaddr_un sa;
380 socklen_t sl = sizeof (sa); 474 socklen_t sl = sizeof (sa);
381 475
382 if (!getsockname (fd, (sockaddr *)&sa, &sl)) 476 if (!getsockname (fd, (sockaddr *)&sa, &sl))
383 is_local = sa.sun_family == AF_LOCAL; 477 is_local = sa.sun_family == AF_UNIX;
384#endif
385 478
479 flush_ev.start ();
386 x_ev.start (fd, EVENT_READ); 480 x_ev.start (fd, ev::READ);
387 fcntl (fd, F_SETFD, FD_CLOEXEC); 481 fcntl (fd, F_SETFD, FD_CLOEXEC);
388 482
389 XSelectInput (display, root, PropertyChangeMask); 483 XSelectInput (dpy, root, PropertyChangeMask);
390 484
391 flush (); 485 flush ();
392 486
393 return true; 487 return true;
394} 488}
395 489
396void 490void
397rxvt_display::ref_next () 491rxvt_display::ref_next ()
398{ 492{
399 // TODO: somehow check wether the database files/resources changed 493 // TODO: somehow check whether the database files/resources changed
400 // before affording re-loading/parsing 494 // before affording re-loading/parsing
401 XrmDestroyDatabase (XrmGetDatabase (display)); 495 XrmDestroyDatabase (XrmGetDatabase (dpy));
402 XrmSetDatabase (display, get_resources ()); 496 XrmSetDatabase (dpy, get_resources (true));
403} 497}
404 498
405rxvt_display::~rxvt_display () 499rxvt_display::~rxvt_display ()
406{ 500{
407 if (!display) 501 if (!dpy)
408 return; 502 return;
409 503
410#ifdef POINTER_BLANK 504#ifdef POINTER_BLANK
411 XFreeCursor (display, blank_cursor); 505 XFreeCursor (dpy, blank_cursor);
412#endif 506#endif
413 x_ev.stop (); 507 x_ev.stop ();
508 flush_ev.stop ();
414#ifdef USE_XIM 509#ifdef USE_XIM
415 xims.clear (); 510 xims.clear ();
416#endif 511#endif
417 XCloseDisplay (display); 512 XCloseDisplay (dpy);
418} 513}
419 514
420#ifdef USE_XIM 515#ifdef USE_XIM
421void rxvt_display::im_change_cb () 516void rxvt_display::im_change_cb ()
422{ 517{
… …
430 // registers, as xlib crashes due to a race otherwise. 525 // registers, as xlib crashes due to a race otherwise.
431 Atom actual_type, *atoms; 526 Atom actual_type, *atoms;
432 int actual_format; 527 int actual_format;
433 unsigned long nitems, bytes_after; 528 unsigned long nitems, bytes_after;
434 529
435 if (XGetWindowProperty (display, root, xa[XA_XIM_SERVERS], 0L, 1000000L, 530 if (XGetWindowProperty (dpy, root, xa[XA_XIM_SERVERS], 0L, 1000000L,
436 False, XA_ATOM, &actual_type, &actual_format, 531 False, XA_ATOM, &actual_type, &actual_format,
437 &nitems, &bytes_after, (unsigned char **)&atoms) 532 &nitems, &bytes_after, (unsigned char **)&atoms)
438 != Success ) 533 != Success)
439 return; 534 return;
440 535
441 if (actual_type == XA_ATOM && actual_format == 32) 536 if (actual_type == XA_ATOM && actual_format == 32)
442 for (int i = 0; i < nitems; i++) 537 for (int i = 0; i < nitems; i++)
443 if (XGetSelectionOwner (display, atoms[i])) 538 if (XGetSelectionOwner (dpy, atoms[i]))
444 { 539 {
445 im_change_cb (); 540 im_change_cb ();
446 break; 541 break;
447 } 542 }
448 543
449 XFree (atoms); 544 XFree (atoms);
450} 545}
451#endif 546#endif
452 547
453void rxvt_display::x_cb (io_watcher &w, short revents) 548void rxvt_display::x_cb (ev::io &w, int revents)
454{ 549{
550 flush_ev.start ();
551}
552
553void rxvt_display::flush_cb (ev::prepare &w, int revents)
554{
555 while (XEventsQueued (dpy, QueuedAfterFlush))
455 do 556 do
456 { 557 {
457 XEvent xev; 558 XEvent xev;
458 XNextEvent (display, &xev); 559 XNextEvent (dpy, &xev);
459 560
460#ifdef USE_XIM 561#ifdef USE_XIM
461 if (!XFilterEvent (&xev, None)) 562 if (!XFilterEvent (&xev, None))
462 { 563 {
463 if (xev.type == PropertyNotify 564 if (xev.type == PropertyNotify
464 && xev.xany.window == root 565 && xev.xany.window == root
465 && xev.xproperty.atom == xa[XA_XIM_SERVERS]) 566 && xev.xproperty.atom == xa[XA_XIM_SERVERS])
466 im_change_check (); 567 im_change_check ();
467#endif 568#endif
569 if (xev.type == MappingNotify)
570 XRefreshKeyboardMapping (&xev.xmapping);
571
468 for (int i = xw.size (); i--; ) 572 for (int i = xw.size (); i--; )
469 { 573 {
470 if (!xw[i]) 574 if (!xw[i])
471 xw.erase_unordered (i); 575 xw.erase_unordered (i);
472 else if (xw[i]->window == xev.xany.window) 576 else if (xw[i]->window == xev.xany.window)
473 xw[i]->call (xev); 577 xw[i]->call (xev);
474 } 578 }
475#ifdef USE_XIM 579#ifdef USE_XIM
476 } 580 }
477#endif 581#endif
478 } 582 }
479 while (XEventsQueued (display, QueuedAlready)); 583 while (XEventsQueued (dpy, QueuedAlready));
480 584
481 XFlush (display); 585 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} 586}
491 587
492void rxvt_display::reg (xevent_watcher *w) 588void rxvt_display::reg (xevent_watcher *w)
493{ 589{
590 if (!w->active)
591 {
494 xw.push_back (w); 592 xw.push_back (w);
495 w->active = xw.size (); 593 w->active = xw.size ();
594 }
496} 595}
497 596
498void rxvt_display::unreg (xevent_watcher *w) 597void rxvt_display::unreg (xevent_watcher *w)
499{ 598{
500 if (w->active) 599 if (w->active)
600 {
501 xw[w->active - 1] = 0; 601 xw[w->active - 1] = 0;
602 w->active = 0;
603 }
502} 604}
503 605
504void rxvt_display::set_selection_owner (rxvt_term *owner) 606void rxvt_display::set_selection_owner (rxvt_term *owner, bool clipboard)
505{ 607{
608 rxvt_term * &cur_owner = !clipboard ? selection_owner : clipboard_owner;
609
506 if (selection_owner && selection_owner != owner) 610 if (cur_owner && cur_owner != owner)
507 selection_owner->selection_clear (); 611 {
612 rxvt_term *term = cur_owner;
613 term->selection_clear (clipboard);
614 term->flush ();
615 }
508 616
509 selection_owner = owner; 617 cur_owner = owner;
510} 618}
511 619
512#ifdef USE_XIM 620#ifdef USE_XIM
513 621
514void rxvt_display::reg (im_watcher *w) 622void rxvt_display::reg (im_watcher *w)
… …
527 int l, m; 635 int l, m;
528 636
529 l = strlen (locale); 637 l = strlen (locale);
530 m = strlen (modifiers); 638 m = strlen (modifiers);
531 639
532 if (!(id = (char *)malloc (l + m + 2))) 640 if (!(id = rxvt_temp_buf<char> (l + m + 2)))
533 return 0; 641 return 0;
534 642
535 memcpy (id, locale, l); id[l] = '\n'; 643 memcpy (id, locale, l); id[l] = '\n';
536 memcpy (id + l + 1, modifiers, m); id[l + m + 1] = 0; 644 memcpy (id + l + 1, modifiers, m); id[l + m + 1] = 0;
537 645
538 rxvt_xim *xim = xims.get (id); 646 rxvt_xim *xim = xims.get (id);
539
540 free (id);
541 647
542 return xim; 648 return xim;
543} 649}
544 650
545void rxvt_display::put_xim (rxvt_xim *xim) 651void rxvt_display::put_xim (rxvt_xim *xim)
… …
551 657
552#endif 658#endif
553 659
554Atom rxvt_display::atom (const char *name) 660Atom rxvt_display::atom (const char *name)
555{ 661{
556 return XInternAtom (display, name, False); 662 return XInternAtom (dpy, name, False);
557} 663}
558 664
559///////////////////////////////////////////////////////////////////////////// 665/////////////////////////////////////////////////////////////////////////////
560 666
561template class refcache<rxvt_display>; 667template class refcache<rxvt_display>;
562refcache<rxvt_display> displays; 668refcache<rxvt_display> displays;
563 669
564///////////////////////////////////////////////////////////////////////////// 670/////////////////////////////////////////////////////////////////////////////
565 671//
672
673static unsigned int
674insert_component (unsigned int value, unsigned int mask, unsigned int shift)
675{
676 return (value * (mask + 1) >> 16) << shift;
677}
678
566bool 679bool
567rxvt_color::alloc (rxvt_screen *screen, const rgba &color) 680rxvt_color::alloc (rxvt_screen *screen, const rgba &color)
568{ 681{
682 //TODO: only supports 24 bit
683 int alpha = color.a >= 0xff00 ? 0xffff : color.a;
684
569#if XFT 685#if XFT
570 XRenderPictFormat *format; 686 XRenderPictFormat *format;
571 687
572 // FUCKING Xft gets it wrong, of course, so work around it 688 // FUCKING Xft gets it wrong, of course, so work around it.
573 // transparency users should eat shit and die, and then 689 // Transparency users should eat shit and die, and then
574 // XRenderQueryPictIndexValues themselves plenty. 690 // XRenderQueryPictIndexValues themselves plenty.
575 if ((screen->visual->c_class == TrueColor || screen->visual->c_class == DirectColor) 691 if ((screen->visual->c_class == TrueColor)
576 && (format = XRenderFindVisualFormat (screen->xdisp, screen->visual))) 692 && (format = XRenderFindVisualFormat (screen->dpy, screen->visual)))
577 { 693 {
578 // the fun lies in doing everything manually... 694 // the fun lies in doing everything manually...
579 c.color.red = color.r; 695 c.color.red = color.r;
580 c.color.green = color.g; 696 c.color.green = color.g;
581 c.color.blue = color.b; 697 c.color.blue = color.b;
582 c.color.alpha = color.a; 698 c.color.alpha = alpha;
583 699
584 c.pixel = ((color.r * format->direct.redMask / rgba::MAX_CC) << format->direct.red ) 700 c.pixel = insert_component (color.r, format->direct.redMask , format->direct.red )
585 | ((color.g * format->direct.greenMask / rgba::MAX_CC) << format->direct.green) 701 | insert_component (color.g, format->direct.greenMask, format->direct.green)
586 | ((color.b * format->direct.blueMask / rgba::MAX_CC) << format->direct.blue ) 702 | insert_component (color.b, format->direct.blueMask , format->direct.blue )
587 | ((color.a * format->direct.alphaMask / rgba::MAX_CC) << format->direct.alpha); 703 | insert_component (alpha , format->direct.alphaMask, format->direct.alpha);
588 704
589 return true; 705 return true;
590 } 706 }
591 else 707 else
592 { 708 {
593 XRenderColor d; 709 XRenderColor d;
594 710
595 d.red = color.r; 711 d.red = color.r;
596 d.green = color.g; 712 d.green = color.g;
597 d.blue = color.b; 713 d.blue = color.b;
598 d.alpha = color.a; 714 d.alpha = alpha;
599 715
600 return XftColorAllocValue (screen->xdisp, screen->visual, screen->cmap, &d, &c); 716 return XftColorAllocValue (screen->dpy, screen->visual, screen->cmap, &d, &c);
601 } 717 }
602#else 718#else
603 c.red = color.r; 719 c.red = color.r;
604 c.green = color.g; 720 c.green = color.g;
605 c.blue = color.b; 721 c.blue = color.b;
606 722
607 if (screen->visual->c_class == TrueColor || screen->visual->c_class == DirectColor) 723 if (screen->visual->c_class == TrueColor)
608 { 724 {
609 c.pixel = (color.r * (screen->visual->red_mask >> ctz (screen->visual->red_mask )) 725 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 ) 726 | (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 )) 727 | (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 728
616 return true; 729 return true;
617 } 730 }
618 else if (XAllocColor (screen->xdisp, screen->cmap, &c)) 731 else if (XAllocColor (screen->dpy, screen->cmap, &c))
619 return true; 732 return true;
620 else 733 else
621 c.pixel = (color.r + color.g + color.b) > 128*3 734 c.pixel = (color.r + color.g + color.b) > 128*3
622 ? WhitePixelOfScreen (DefaultScreenOfDisplay (screen->xdisp)) 735 ? WhitePixelOfScreen (DefaultScreenOfDisplay (screen->dpy))
623 : BlackPixelOfScreen (DefaultScreenOfDisplay (screen->xdisp)); 736 : BlackPixelOfScreen (DefaultScreenOfDisplay (screen->dpy));
624#endif 737#endif
625 738
626 return false; 739 return false;
627} 740}
628 741
… …
631{ 744{
632 rgba c; 745 rgba c;
633 char eos; 746 char eos;
634 int skip; 747 int skip;
635 748
749 c.a = rgba::MAX_CC;
750
636 // parse the nonstandard "[alphapercent]" prefix 751 // parse the nonstandard "[alphapercent]" prefix
637 if (1 <= sscanf (name, "[%hd]%n", &c.a, &skip)) 752 if (1 <= sscanf (name, "[%hd]%n", &c.a, &skip))
638 { 753 {
639 c.a = lerp<int, int, int> (0, rgba::MAX_CC, c.a); 754 c.a = lerp<int, int, int> (0, rgba::MAX_CC, c.a);
640 name += skip; 755 name += skip;
641 } 756 }
642 else
643 c.a = rgba::MAX_CC;
644 757
645 // parse the non-standard "rgba:rrrr/gggg/bbbb/aaaa" format 758 // 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)) 759 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 { 760 {
648 XColor xc, xc_exact; 761 XColor xc;
649 762
650 if (XParseColor (screen->xdisp, screen->cmap, name, &xc)) 763 if (XParseColor (screen->dpy, screen->cmap, name, &xc))
651 { 764 {
652 c.r = xc.red; 765 c.r = xc.red;
653 c.g = xc.green; 766 c.g = xc.green;
654 c.b = xc.blue; 767 c.b = xc.blue;
655 } 768 }
… …
680 { 793 {
681 XColor *colors = new XColor [screen->visual->map_entries]; 794 XColor *colors = new XColor [screen->visual->map_entries];
682 795
683 for (int i = 0; i < cmap_size; i++) 796 for (int i = 0; i < cmap_size; i++)
684 colors [i].pixel = i; 797 colors [i].pixel = i;
685 798
686 // many kilobytes transfer per colour, but pseudocolor isn't worth 799 // many kilobytes transfer per colour, but pseudocolor isn't worth
687 // many extra optimisations. 800 // many extra optimisations.
688 XQueryColors (screen->xdisp, screen->cmap, colors, cmap_size); 801 XQueryColors (screen->dpy, screen->cmap, colors, cmap_size);
689 802
690 int diff = 0x7fffffffUL; 803 int diff = 0x7fffffffUL;
691 XColor *best = colors; 804 XColor *best = colors;
692 805
693 for (int i = 0; i < cmap_size; i++) 806 for (int i = 0; i < cmap_size; i++)
… …
703 } 816 }
704 } 817 }
705 818
706 //rxvt_warn ("could not allocate %04x %04x %04x, getting %04x %04x %04x instead (%d)\n", 819 //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); 820 // color.r, color.g, color.b, best->red, best->green, best->blue, diff);
708 821
709 got = alloc (screen, rgba (best->red, best->green, best->blue)); 822 got = alloc (screen, rgba (best->red, best->green, best->blue));
710 823
711 delete colors; 824 delete [] colors;
712 } 825 }
713#endif 826#endif
714 827
715 return got; 828 return got;
716} 829}
… …
741 color.green = c.g; 854 color.green = c.g;
742 color.blue = c.b; 855 color.blue = c.b;
743 color.pixel = (Pixel)*this; 856 color.pixel = (Pixel)*this;
744} 857}
745 858
746void 859void
747rxvt_color::free (rxvt_screen *screen) 860rxvt_color::free (rxvt_screen *screen)
748{ 861{
862 if (screen->visual->c_class == TrueColor)
863 return; // nothing to do
864
749#if XFT 865#if XFT
750 XftColorFree (screen->xdisp, screen->visual, screen->cmap, &c); 866 XftColorFree (screen->dpy, screen->visual, screen->cmap, &c);
751#else 867#else
752 XFreeColors (screen->xdisp, screen->cmap, &c.pixel, 1, AllPlanes); 868 XFreeColors (screen->dpy, screen->cmap, &c.pixel, 1, AllPlanes);
753#endif 869#endif
754} 870}
755 871
756void 872void
757rxvt_color::fade (rxvt_screen *screen, int percent, rxvt_color &result, const rgba &to) 873rxvt_color::fade (rxvt_screen *screen, int percent, rxvt_color &result, const rgba &to)

Diff Legend

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