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

Diff Legend

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