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.26 by root, Wed Jan 25 21:03:04 2006 UTC vs.
Revision 1.138 by root, Sun Jun 10 15:01:14 2012 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-2011 Marc Lehmann <schmorp@schmorp.de>
7 * Copyright (c) 2011 Emanuele Giaquinta <e.giaquinta@glauco.it>
7 * 8 *
8 * This program is free software; you can redistribute it and/or modify 9 * 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 10 * 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 11 * the Free Software Foundation; either version 2 of the License, or
11 * (at your option) any later version. 12 * (at your option) any later version.
… …
26 27
27#include <unistd.h> 28#include <unistd.h>
28#include <fcntl.h> 29#include <fcntl.h>
29 30
30#include <sys/utsname.h> 31#include <sys/utsname.h>
31
32#ifndef NO_SLOW_LINK_SUPPORT
33# include <sys/socket.h> 32#include <sys/socket.h>
34# include <sys/un.h> 33#include <sys/un.h>
35#endif
36 34
35#if XFT
36# include <X11/extensions/Xrender.h>
37#endif
38
37const char *const xa_names[] = 39static const char *const xa_names[] =
38 { 40{
39 "TEXT", 41 "TEXT",
40 "COMPOUND_TEXT", 42 "COMPOUND_TEXT",
41 "UTF8_STRING", 43 "UTF8_STRING",
42 "MULTIPLE", 44 "MULTIPLE",
43 "TARGETS", 45 "TARGETS",
44 "TIMESTAMP", 46 "TIMESTAMP",
45 "VT_SELECTION", 47 "VT_SELECTION",
46 "INCR", 48 "INCR",
47 "WM_PROTOCOLS", 49 "WM_PROTOCOLS",
48 "WM_DELETE_WINDOW", 50 "WM_DELETE_WINDOW",
49 "CLIPBOARD", 51 "CLIPBOARD",
52 "AVERAGE_WIDTH",
53 "WEIGHT_NAME",
54 "SLANT",
55 "CHARSET_REGISTRY",
56 "CHARSET_ENCODING",
50#if ENABLE_FRILLS 57#if ENABLE_FRILLS
51 "_MOTIF_WM_HINTS", 58 "_MOTIF_WM_HINTS",
52#endif 59#endif
53#if ENABLE_EWMH 60#if ENABLE_EWMH
54 "_NET_WM_PID", 61 "_NET_WM_PID",
55 "_NET_WM_NAME", 62 "_NET_WM_NAME",
56 "_NET_WM_ICON_NAME", 63 "_NET_WM_ICON_NAME",
57 "_NET_WM_PING", 64 "_NET_WM_PING",
65 "_NET_WM_ICON",
58#endif 66#endif
59#if USE_XIM 67#if USE_XIM
60 "WM_LOCALE_NAME", 68 "WM_LOCALE_NAME",
61 "XIM_SERVERS", 69 "XIM_SERVERS",
62#endif 70#endif
63#ifdef TRANSPARENT 71#if ENABLE_TRANSPARENCY
64 "_XROOTPMAP_ID", 72 "_XROOTPMAP_ID",
65 "ESETROOT_PMAP_ID", 73 "ESETROOT_PMAP_ID",
66#endif 74#endif
67#if ENABLE_XEMBED 75#if ENABLE_XEMBED
68 "_XEMBED", 76 "_XEMBED",
69 "_XEMBED_INFO", 77 "_XEMBED_INFO",
78#endif
79#if !ENABLE_MINIMAL
80 "SCREEN_RESOURCES",
81 "XDCCC_LINEAR_RGB_CORRECTION",
82 "XDCCC_LINEAR_RGB_MATRICES",
83 "WM_COLORMAP_WINDOWS",
84 "WM_STATE",
85 "cursor",
86# if USE_XIM
87 "TRANSPORT",
88 "LOCALES",
89 "_XIM_PROTOCOL",
90 "_XIM_XCONNECT",
91 "_XIM_MOREDATA",
70#endif 92# endif
71 }; 93#endif
94};
72 95
73///////////////////////////////////////////////////////////////////////////// 96/////////////////////////////////////////////////////////////////////////////
74 97
75refcounted::refcounted (const char *id) 98refcounted::refcounted (const char *id)
76{ 99{
… …
130 put (*this->begin ()); 153 put (*this->begin ());
131} 154}
132 155
133///////////////////////////////////////////////////////////////////////////// 156/////////////////////////////////////////////////////////////////////////////
134 157
135#ifdef USE_XIM 158#if USE_XIM
136 159
137static void 160static void
138#if XIMCB_PROTO_BROKEN 161#if XIMCB_PROTO_BROKEN
139im_destroy_cb (XIC unused1, XPointer client_data, XPointer unused3) 162im_destroy_cb (XIC unused1, XPointer client_data, XPointer unused3)
140#else 163#else
… …
153bool 176bool
154rxvt_xim::ref_init () 177rxvt_xim::ref_init ()
155{ 178{
156 display = GET_R->display; //HACK: TODO 179 display = GET_R->display; //HACK: TODO
157 180
158 xim = XOpenIM (display->display, NULL, NULL, NULL); 181 xim = XOpenIM (display->dpy, 0, 0, 0);
159 182
160 if (!xim) 183 if (!xim)
161 return false; 184 return false;
162 185
163 XIMCallback ximcallback; 186 XIMCallback ximcallback;
164 ximcallback.client_data = (XPointer)this; 187 ximcallback.client_data = (XPointer)this;
165 ximcallback.callback = im_destroy_cb; 188 ximcallback.callback = im_destroy_cb;
166 189
167 XSetIMValues (xim, XNDestroyCallback, &ximcallback, NULL); 190 XSetIMValues (xim, XNDestroyCallback, &ximcallback, (char *)0);
168 191
169 return true; 192 return true;
170} 193}
171 194
172rxvt_xim::~rxvt_xim () 195rxvt_xim::~rxvt_xim ()
… …
177 200
178#endif 201#endif
179 202
180///////////////////////////////////////////////////////////////////////////// 203/////////////////////////////////////////////////////////////////////////////
181 204
205#if XFT
206rxvt_drawable::~rxvt_drawable ()
207{
208 if (xftdrawable)
209 XftDrawDestroy (xftdrawable);
210}
211
212rxvt_drawable::operator XftDraw *()
213{
214 if (!xftdrawable)
215 xftdrawable = XftDrawCreate (screen->dpy, drawable, screen->visual, screen->cmap);
216
217 return xftdrawable;
218}
219#endif
220
221/////////////////////////////////////////////////////////////////////////////
222
223#if XFT
224
225// not strictly necessary as it is only used with superclass of zero_initialised
226rxvt_screen::rxvt_screen ()
227: scratch_area (0)
228{
229}
230
231rxvt_drawable &rxvt_screen::scratch_drawable (int w, int h)
232{
233 if (!scratch_area || w > scratch_w || h > scratch_h)
234 {
235 if (scratch_area)
236 {
237 XFreePixmap (dpy, scratch_area->drawable);
238 delete scratch_area;
239 }
240
241 Pixmap pm = XCreatePixmap (dpy, RootWindowOfScreen (ScreenOfDisplay (dpy, display->screen)),
242 scratch_w = w, scratch_h = h, depth);
243
244 scratch_area = new rxvt_drawable (this, pm);
245 }
246
247 return *scratch_area;
248}
249
250#endif
251
182void 252void
183rxvt_screen::set (rxvt_display *disp) 253rxvt_screen::set (rxvt_display *disp)
184{ 254{
185 display = disp; 255 display = disp;
186
187 xdisp = disp->display; 256 dpy = disp->dpy;
188 257
189 Screen *screen = ScreenOfDisplay (xdisp, disp->screen); 258 Screen *screen = ScreenOfDisplay (dpy, disp->screen);
190 259
191 depth = DefaultDepthOfScreen (screen); 260 depth = DefaultDepthOfScreen (screen);
192 visual = DefaultVisualOfScreen (screen); 261 visual = DefaultVisualOfScreen (screen);
193 cmap = DefaultColormapOfScreen (screen); 262 cmap = DefaultColormapOfScreen (screen);
194} 263}
195 264
196void 265#if ENABLE_FRILLS
197rxvt_screen::set (rxvt_display *disp, int depth)
198{
199 set (disp);
200 266
267void
268rxvt_screen::select_visual (int id)
269{
201 XVisualInfo vinfo; 270 XVisualInfo vinfo;
271 vinfo.visualid = id;
272 int n;
202 273
274 if (XVisualInfo *vi = XGetVisualInfo (dpy, VisualIDMask, &vinfo, &n))
275 {
276 depth = vi->depth;
277 visual = vi->visual;
278
279 XFree (vi);
280
281 cmap = XCreateColormap (dpy, display->root, visual, AllocNone);
282 }
283 else
284 rxvt_warn ("cannot requested visual id 0x%02x, using default visual.\n", id);
285}
286
287void
288rxvt_screen::select_depth (int bitdepth)
289{
290 XVisualInfo vinfo;
291
203 if (XMatchVisualInfo (xdisp, display->screen, depth, TrueColor, &vinfo)) 292 if (XMatchVisualInfo (dpy, display->screen, bitdepth, TrueColor, &vinfo))
204 { 293 select_visual (vinfo.visualid);
205 this->depth = depth; 294 else
206 this->visual = vinfo.visual; 295 rxvt_warn ("no visual found for requested depth %d, using default visual.\n", bitdepth);
207 this->cmap = XCreateColormap (xdisp, disp->root, visual, AllocNone);
208 }
209} 296}
297
298#endif
210 299
211void 300void
212rxvt_screen::clear () 301rxvt_screen::clear ()
213{ 302{
303#if XFT
304 if (scratch_area)
305 {
306 XFreePixmap (dpy, scratch_area->drawable);
307 delete scratch_area;
308 }
309#endif
310
214 if (cmap != DefaultColormapOfScreen (ScreenOfDisplay (xdisp, display->screen))) 311 if (cmap != DefaultColormapOfScreen (ScreenOfDisplay (dpy, display->screen)))
215 XFreeColormap (xdisp, cmap); 312 XFreeColormap (dpy, cmap);
216} 313}
217 314
218///////////////////////////////////////////////////////////////////////////// 315/////////////////////////////////////////////////////////////////////////////
219 316
220rxvt_display::rxvt_display (const char *id) 317rxvt_display::rxvt_display (const char *id)
221: refcounted (id) 318: refcounted (id)
222, x_ev (this, &rxvt_display::x_cb)
223, selection_owner (0) 319, selection_owner (0)
320, clipboard_owner (0)
224{ 321{
322 x_ev .set<rxvt_display, &rxvt_display::x_cb > (this);
323 flush_ev.set<rxvt_display, &rxvt_display::flush_cb> (this);
225} 324}
226 325
227XrmDatabase 326XrmDatabase
228rxvt_display::get_resources () 327rxvt_display::get_resources (bool refresh)
229{ 328{
230 char *homedir = (char *)getenv ("HOME"); 329 char *homedir = getenv ("HOME");
231 char fname[1024]; 330 char fname[1024];
232 331
233 /* 332 /*
234 * get resources using the X library function 333 * get resources using the X library function
235 */ 334 */
236 char *displayResource, *xe; 335 char *displayResource, *xe;
237 XrmDatabase database, rdb1; 336 XrmDatabase rdb1, database = 0;
238 337
239 database = NULL; 338#if !XLIB_ILLEGAL_ACCESS
339 /* work around a bug in XrmSetDatabase where it frees the db, see ref_next */
340 database = XrmGetStringDatabase ("");
341#endif
240 342
241 // for ordering, see for example http://www.faqs.org/faqs/Xt-FAQ/ Subject: 20 343 // for ordering, see for example http://www.faqs.org/faqs/Xt-FAQ/ Subject: 20
344 // as opposed to "standard practise", we always read in ~/.Xdefaults
242 345
243 // 6. System wide per application default file. 346 // 6. System wide per application default file.
244 347
245 /* Add in $XAPPLRESDIR/Rxvt only; not bothering with XUSERFILESEARCHPATH */ 348 /* Add in $XAPPLRESDIR/Rxvt only; not bothering with XUSERFILESEARCHPATH */
246 if ((xe = (char *)getenv ("XAPPLRESDIR"))) 349 if ((xe = getenv ("XAPPLRESDIR")))
247 { 350 {
248 snprintf (fname, sizeof (fname), "%s/%s", xe, RESCLASS); 351 snprintf (fname, sizeof (fname), "%s/%s", xe, RESCLASS);
249 352
250 if ((rdb1 = XrmGetFileDatabase (fname))) 353 if ((rdb1 = XrmGetFileDatabase (fname)))
251 XrmMergeDatabases (rdb1, &database); 354 XrmMergeDatabases (rdb1, &database);
… …
253 356
254 // 5. User's per application default file. 357 // 5. User's per application default file.
255 // none 358 // none
256 359
257 // 4. User's defaults file. 360 // 4. User's defaults file.
361 if (homedir)
362 {
363 snprintf (fname, sizeof (fname), "%s/.Xdefaults", homedir);
364
365 if ((rdb1 = XrmGetFileDatabase (fname)))
366 XrmMergeDatabases (rdb1, &database);
367 }
368
258 /* Get any Xserver defaults */ 369 /* Get any Xserver defaults */
370 if (refresh)
371 {
372 // fucking xlib keeps a copy of the rm string
373 Atom actual_type;
374 int actual_format;
375 unsigned long nitems, nremaining;
376 char *val = 0;
377
378#if XLIB_ILLEGAL_ACCESS
379 if (dpy->xdefaults)
380 XFree (dpy->xdefaults);
381#endif
382
383 if (XGetWindowProperty (dpy, RootWindow (dpy, 0), XA_RESOURCE_MANAGER,
384 0L, 100000000L, False,
385 XA_STRING, &actual_type, &actual_format,
386 &nitems, &nremaining,
387 (unsigned char **)&val) == Success
388 && actual_type == XA_STRING
389 && actual_format == 8)
390 displayResource = val;
391 else
392 {
393 displayResource = 0;
394
395 if (val)
396 XFree (val);
397 }
398
399#if XLIB_ILLEGAL_ACCESS
400 dpy->xdefaults = displayResource;
401#endif
402 }
403 else
259 displayResource = XResourceManagerString (display); 404 displayResource = XResourceManagerString (dpy);
260 405
261 if (displayResource != NULL) 406 if (displayResource)
262 { 407 {
263 if ((rdb1 = XrmGetStringDatabase (displayResource))) 408 if ((rdb1 = XrmGetStringDatabase (displayResource)))
264 XrmMergeDatabases (rdb1, &database); 409 XrmMergeDatabases (rdb1, &database);
265 } 410 }
266 else if (homedir)
267 {
268 snprintf (fname, sizeof (fname), "%s/.Xdefaults", homedir);
269 411
270 if ((rdb1 = XrmGetFileDatabase (fname))) 412#if !XLIB_ILLEGAL_ACCESS
271 XrmMergeDatabases (rdb1, &database); 413 if (refresh && displayResource)
272 } 414 XFree (displayResource);
415#endif
273 416
274 /* Get screen specific resources */ 417 /* Get screen specific resources */
275 displayResource = XScreenResourceString (ScreenOfDisplay (display, screen)); 418 displayResource = XScreenResourceString (ScreenOfDisplay (dpy, screen));
276 419
277 if (displayResource != NULL) 420 if (displayResource)
278 { 421 {
279 if ((rdb1 = XrmGetStringDatabase (displayResource))) 422 if ((rdb1 = XrmGetStringDatabase (displayResource)))
280 /* Merge with screen-independent resources */ 423 /* Merge with screen-independent resources */
281 XrmMergeDatabases (rdb1, &database); 424 XrmMergeDatabases (rdb1, &database);
282 425
283 XFree (displayResource); 426 XFree (displayResource);
284 } 427 }
285 428
286 // 3. User's per host defaults file 429 // 3. User's per host defaults file
287 /* Add in XENVIRONMENT file */ 430 /* Add in XENVIRONMENT file */
288 if ((xe = (char *)getenv ("XENVIRONMENT")) 431 if ((xe = getenv ("XENVIRONMENT"))
289 && (rdb1 = XrmGetFileDatabase (xe))) 432 && (rdb1 = XrmGetFileDatabase (xe)))
290 XrmMergeDatabases (rdb1, &database); 433 XrmMergeDatabases (rdb1, &database);
291 else if (homedir) 434 else if (homedir)
292 { 435 {
293 struct utsname un; 436 struct utsname un;
… …
307bool rxvt_display::ref_init () 450bool rxvt_display::ref_init ()
308{ 451{
309#ifdef LOCAL_X_IS_UNIX 452#ifdef LOCAL_X_IS_UNIX
310 if (id[0] == ':') 453 if (id[0] == ':')
311 { 454 {
312 val = rxvt_malloc (5 + strlen (id) + 1); 455 char *val = rxvt_temp_buf<char> (5 + strlen (id) + 1);
456
313 strcpy (val, "unix/"); 457 strcpy (val, "unix/");
314 strcat (val, id); 458 strcat (val, id);
459
315 display = XOpenDisplay (val); 460 dpy = XOpenDisplay (val);
316 free (val);
317 } 461 }
318 else 462 else
319#endif 463#endif
320 display = 0; 464 dpy = 0;
321 465
322 if (!display) 466 if (!dpy)
323 display = XOpenDisplay (id); 467 dpy = XOpenDisplay (id);
324 468
325 if (!display) 469 if (!dpy)
326 return false; 470 return false;
327 471
328 screen = DefaultScreen (display); 472 screen = DefaultScreen (dpy);
329 root = DefaultRootWindow (display); 473 root = DefaultRootWindow (dpy);
330 474
331 assert (sizeof (xa_names) / sizeof (char *) == NUM_XA); 475 assert (ecb_array_length (xa_names) == NUM_XA);
332 XInternAtoms (display, (char **)xa_names, NUM_XA, False, xa); 476 XInternAtoms (dpy, (char **)xa_names, NUM_XA, False, xa);
333 477
334 XrmSetDatabase (display, get_resources ()); 478 XrmSetDatabase (dpy, get_resources (false));
335 479
336#ifdef POINTER_BLANK 480#ifdef POINTER_BLANK
337 XColor blackcolour; 481 XColor blackcolour;
338 blackcolour.red = 0; 482 blackcolour.red = 0;
339 blackcolour.green = 0; 483 blackcolour.green = 0;
340 blackcolour.blue = 0; 484 blackcolour.blue = 0;
341 Font f = XLoadFont (display, "fixed"); 485 Font f = XLoadFont (dpy, "fixed");
342 blank_cursor = XCreateGlyphCursor (display, f, f, ' ', ' ', 486 blank_cursor = XCreateGlyphCursor (dpy, f, f, ' ', ' ',
343 &blackcolour, &blackcolour); 487 &blackcolour, &blackcolour);
344 XUnloadFont (display, f); 488 XUnloadFont (dpy, f);
345#endif 489#endif
346 490
491 flags = 0;
492#if XRENDER
493 int major, minor;
494 if (XRenderQueryVersion (dpy, &major, &minor))
495 if (major > 0 || (major == 0 && minor >= 10))
496 {
497 flags |= DISPLAY_HAS_RENDER;
498
499#if 0
500 if (major > 0 || (major == 0 && minor >= 11))
501 flags |= DISPLAY_HAS_RENDER_MUL;
502#endif
503
504 if (XFilters *filters = XRenderQueryFilters (dpy, root))
505 {
506 for (int i = 0; i < filters->nfilter; i++)
507 if (!strcmp (filters->filter [i], FilterConvolution))
508 flags |= DISPLAY_HAS_RENDER_CONV;
509
510 XFree (filters);
511 }
512 }
513#endif
514
347 int fd = XConnectionNumber (display); 515 int fd = XConnectionNumber (dpy);
348 516
349#ifndef NO_SLOW_LINK_SUPPORT
350 // try to detect wether we have a local connection. 517 // try to detect whether we have a local connection.
351 // assume unix domains socket == local, everything else not 518 // assume unix domain socket == local, everything else not
352 // TODO: might want to check for inet/127.0.0.1 519 // TODO: might want to check for inet/127.0.0.1
353 is_local = 0; 520 is_local = 0;
354 sockaddr_un sa; 521 sockaddr_un sa;
355 socklen_t sl = sizeof (sa); 522 socklen_t sl = sizeof (sa);
356 523
357 if (!getsockname (fd, (sockaddr *)&sa, &sl)) 524 if (!getsockname (fd, (sockaddr *)&sa, &sl))
358 is_local = sa.sun_family == AF_LOCAL; 525 is_local = sa.sun_family == AF_UNIX;
359#endif
360 526
527 flush_ev.start ();
361 x_ev.start (fd, EVENT_READ); 528 x_ev.start (fd, ev::READ);
362 fcntl (fd, F_SETFD, FD_CLOEXEC); 529 fcntl (fd, F_SETFD, FD_CLOEXEC);
363 530
364 XSelectInput (display, root, PropertyChangeMask); 531 XSelectInput (dpy, root, PropertyChangeMask);
365 532
366 flush (); 533 flush ();
367 534
368 return true; 535 return true;
369} 536}
370 537
371void 538void
372rxvt_display::ref_next () 539rxvt_display::ref_next ()
373{ 540{
374 // TODO: somehow check wether the database files/resources changed 541 // TODO: somehow check whether the database files/resources changed
375 // before re-loading/parsing 542 // before affording re-loading/parsing
376 XrmDestroyDatabase (XrmGetDatabase (display)); 543 XrmDestroyDatabase (XrmGetDatabase (dpy));
544#if XLIB_ILLEGAL_ACCESS
545 /* work around a bug in XrmSetDatabase where it frees the db */
546 dpy->db = 0;
547#endif
377 XrmSetDatabase (display, get_resources ()); 548 XrmSetDatabase (dpy, get_resources (true));
378} 549}
379 550
380rxvt_display::~rxvt_display () 551rxvt_display::~rxvt_display ()
381{ 552{
382 if (!display) 553 if (!dpy)
383 return; 554 return;
384 555
385#ifdef POINTER_BLANK 556#ifdef POINTER_BLANK
386 XFreeCursor (display, blank_cursor); 557 XFreeCursor (dpy, blank_cursor);
387#endif 558#endif
388 x_ev.stop (); 559 x_ev.stop ();
560 flush_ev.stop ();
389#ifdef USE_XIM 561#if USE_XIM
390 xims.clear (); 562 xims.clear ();
391#endif 563#endif
564 XrmDestroyDatabase (XrmGetDatabase (dpy));
392 XCloseDisplay (display); 565 XCloseDisplay (dpy);
393} 566}
394 567
395#ifdef USE_XIM 568#if USE_XIM
396void rxvt_display::im_change_cb () 569void rxvt_display::im_change_cb ()
397{ 570{
398 for (im_watcher **i = imw.begin (); i != imw.end (); ++i) 571 for (im_watcher **i = imw.begin (); i != imw.end (); ++i)
399 (*i)->call (); 572 (*i)->call ();
400} 573}
… …
405 // registers, as xlib crashes due to a race otherwise. 578 // registers, as xlib crashes due to a race otherwise.
406 Atom actual_type, *atoms; 579 Atom actual_type, *atoms;
407 int actual_format; 580 int actual_format;
408 unsigned long nitems, bytes_after; 581 unsigned long nitems, bytes_after;
409 582
410 if (XGetWindowProperty (display, root, xa[XA_XIM_SERVERS], 0L, 1000000L, 583 if (XGetWindowProperty (dpy, root, xa[XA_XIM_SERVERS], 0L, 1000000L,
411 False, XA_ATOM, &actual_type, &actual_format, 584 False, XA_ATOM, &actual_type, &actual_format,
412 &nitems, &bytes_after, (unsigned char **)&atoms) 585 &nitems, &bytes_after, (unsigned char **)&atoms)
413 != Success ) 586 != Success)
414 return; 587 return;
415 588
416 if (actual_type == XA_ATOM && actual_format == 32) 589 if (actual_type == XA_ATOM && actual_format == 32)
417 for (int i = 0; i < nitems; i++) 590 for (int i = 0; i < nitems; i++)
418 if (XGetSelectionOwner (display, atoms[i])) 591 if (XGetSelectionOwner (dpy, atoms[i]))
419 { 592 {
420 im_change_cb (); 593 im_change_cb ();
421 break; 594 break;
422 } 595 }
423 596
424 XFree (atoms); 597 XFree (atoms);
425} 598}
426#endif 599#endif
427 600
428void rxvt_display::x_cb (io_watcher &w, short revents) 601void rxvt_display::x_cb (ev::io &w, int revents)
429{ 602{
603 flush_ev.start ();
604}
605
606void rxvt_display::flush_cb (ev::prepare &w, int revents)
607{
608 while (XEventsQueued (dpy, QueuedAfterFlush))
430 do 609 do
431 { 610 {
432 XEvent xev; 611 XEvent xev;
433 XNextEvent (display, &xev); 612 XNextEvent (dpy, &xev);
434 613
435#ifdef USE_XIM 614#if USE_XIM
436 if (!XFilterEvent (&xev, None)) 615 if (!XFilterEvent (&xev, None))
437 { 616 {
438 if (xev.type == PropertyNotify 617 if (xev.type == PropertyNotify
439 && xev.xany.window == root 618 && xev.xany.window == root
440 && xev.xproperty.atom == xa[XA_XIM_SERVERS]) 619 && xev.xproperty.atom == xa[XA_XIM_SERVERS])
441 im_change_check (); 620 im_change_check ();
442#endif 621#endif
622 if (xev.type == MappingNotify)
623 XRefreshKeyboardMapping (&xev.xmapping);
624
443 for (int i = xw.size (); i--; ) 625 for (int i = xw.size (); i--; )
444 { 626 {
445 if (!xw[i]) 627 if (!xw[i])
446 xw.erase_unordered (i); 628 xw.erase_unordered (i);
447 else if (xw[i]->window == xev.xany.window) 629 else if (xw[i]->window == xev.xany.window)
448 xw[i]->call (xev); 630 xw[i]->call (xev);
449 } 631 }
450#ifdef USE_XIM 632#if USE_XIM
451 } 633 }
452#endif 634#endif
453 } 635 }
454 while (XEventsQueued (display, QueuedAlready)); 636 while (XEventsQueued (dpy, QueuedAlready));
455 637
456 XFlush (display); 638 w.stop ();
457}
458
459void rxvt_display::flush ()
460{
461 if (XEventsQueued (display, QueuedAlready))
462 x_cb (x_ev, EVENT_READ);
463
464 XFlush (display);
465} 639}
466 640
467void rxvt_display::reg (xevent_watcher *w) 641void rxvt_display::reg (xevent_watcher *w)
468{ 642{
643 if (!w->active)
644 {
469 xw.push_back (w); 645 xw.push_back (w);
470 w->active = xw.size (); 646 w->active = xw.size ();
647 }
471} 648}
472 649
473void rxvt_display::unreg (xevent_watcher *w) 650void rxvt_display::unreg (xevent_watcher *w)
474{ 651{
475 if (w->active) 652 if (w->active)
653 {
476 xw[w->active - 1] = 0; 654 xw[w->active - 1] = 0;
655 w->active = 0;
656 }
477} 657}
478 658
479void rxvt_display::set_selection_owner (rxvt_term *owner) 659void rxvt_display::set_selection_owner (rxvt_term *owner, bool clipboard)
480{ 660{
661 rxvt_term * &cur_owner = !clipboard ? selection_owner : clipboard_owner;
662
481 if (selection_owner && selection_owner != owner) 663 if (cur_owner && cur_owner != owner)
482 selection_owner->selection_clear (); 664 {
665 rxvt_term *term = cur_owner;
666 term->selection_clear (clipboard);
667 term->flush ();
668 }
483 669
484 selection_owner = owner; 670 cur_owner = owner;
485} 671}
486 672
487#ifdef USE_XIM 673#if USE_XIM
674
488void rxvt_display::reg (im_watcher *w) 675void rxvt_display::reg (im_watcher *w)
489{ 676{
490 imw.push_back (w); 677 imw.push_back (w);
491} 678}
492 679
… …
501 int l, m; 688 int l, m;
502 689
503 l = strlen (locale); 690 l = strlen (locale);
504 m = strlen (modifiers); 691 m = strlen (modifiers);
505 692
506 if (!(id = (char *)malloc (l + m + 2))) 693 if (!(id = rxvt_temp_buf<char> (l + m + 2)))
507 return 0; 694 return 0;
508 695
509 memcpy (id, locale, l); id[l] = '\n'; 696 memcpy (id, locale, l); id[l] = '\n';
510 memcpy (id + l + 1, modifiers, m); id[l + m + 1] = 0; 697 memcpy (id + l + 1, modifiers, m); id[l + m + 1] = 0;
511 698
512 rxvt_xim *xim = xims.get (id); 699 rxvt_xim *xim = xims.get (id);
513 700
514 free (id);
515
516 return xim; 701 return xim;
517} 702}
518 703
519void rxvt_display::put_xim (rxvt_xim *xim) 704void rxvt_display::put_xim (rxvt_xim *xim)
520{ 705{
521#if XLIB_IS_RACEFREE 706# if XLIB_IS_RACEFREE
522 xims.put (xim); 707 xims.put (xim);
523#endif 708# endif
524} 709}
710
525#endif 711#endif
526 712
527Atom rxvt_display::atom (const char *name) 713Atom rxvt_display::atom (const char *name)
528{ 714{
529 return XInternAtom (display, name, False); 715 return XInternAtom (dpy, name, False);
716}
717
718Pixmap
719rxvt_display::get_pixmap_property (Atom property)
720{
721 Pixmap pixmap = None;
722
723 int aformat;
724 unsigned long nitems, bytes_after;
725 Atom atype;
726 unsigned char *prop;
727 int result = XGetWindowProperty (dpy, root, property,
728 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
729 &nitems, &bytes_after, &prop);
730 if (result == Success)
731 {
732 if (atype == XA_PIXMAP)
733 pixmap = *(Pixmap *)prop;
734 XFree (prop);
735 }
736
737 return pixmap;
530} 738}
531 739
532///////////////////////////////////////////////////////////////////////////// 740/////////////////////////////////////////////////////////////////////////////
533 741
534template class refcache<rxvt_display>; 742template class refcache<rxvt_display>;
535refcache<rxvt_display> displays; 743refcache<rxvt_display> displays;
536 744
537///////////////////////////////////////////////////////////////////////////// 745/////////////////////////////////////////////////////////////////////////////
538 746//
747
748static unsigned int
749insert_component (unsigned int value, unsigned int mask, unsigned int shift)
750{
751 return (value * (mask + 1) >> 16) << shift;
752}
753
539bool 754bool
540rxvt_color::set (rxvt_screen *screen, Pixel p) 755rxvt_color::alloc (rxvt_screen *screen, const rgba &color)
541{ 756{
757 //TODO: only supports 24 bit
758 unsigned int alpha = color.a >= 0xff00 ? 0xffff : color.a;
759
542#if XFT 760#if XFT
543 XColor xc; 761 XRenderPictFormat *format;
544 762
545 xc.pixel = p; 763 // FUCKING Xft gets it wrong, of course, so work around it.
546 if (!XQueryColor (screen->xdisp, screen->cmap, &xc)) 764 // Transparency users should eat shit and die, and then
547 return false; 765 // XRenderQueryPictIndexValues themselves plenty.
766 if ((screen->visual->c_class == TrueColor)
767 && (format = XRenderFindVisualFormat (screen->dpy, screen->visual)))
768 {
769 // the fun lies in doing everything manually...
770 c.color.red = color.r;
771 c.color.green = color.g;
772 c.color.blue = color.b;
773 c.color.alpha = alpha;
548 774
775 // Xft wants premultiplied alpha, but abuses the alpha channel
776 // as blend factor, and doesn't allow us to set the alpha channel
777 c.color.red = c.color.red * alpha / 0xffff;
778 c.color.green = c.color.green * alpha / 0xffff;
779 c.color.blue = c.color.blue * alpha / 0xffff;
780
781 c.pixel = insert_component (c.color.red , format->direct.redMask , format->direct.red )
782 | insert_component (c.color.green, format->direct.greenMask, format->direct.green)
783 | insert_component (c.color.blue , format->direct.blueMask , format->direct.blue )
784 | insert_component (alpha , format->direct.alphaMask, format->direct.alpha);
785
786 return true;
787 }
788 else
789 {
549 XRenderColor d; 790 XRenderColor d;
550 791
551 d.red = xc.red; 792 d.red = color.r;
552 d.green = xc.green; 793 d.green = color.g;
553 d.blue = xc.blue; 794 d.blue = color.b;
554 d.alpha = 0xffff; 795 d.alpha = alpha;
555 796
556 return 797 if (XftColorAllocValue (screen->dpy, screen->visual, screen->cmap, &d, &c))
557 XftColorAllocValue (screen->xdisp, 798 return true;
558 screen->visual, 799 }
559 screen->cmap,
560 &d, &c);
561#else 800#else
562 this->p = p; 801 c.red = color.r;
563#endif 802 c.green = color.g;
803 c.blue = color.b;
564 804
805 if (screen->visual->c_class == TrueColor)
806 {
807 c.pixel = (color.r >> (16 - ecb_popcount32 (screen->visual->red_mask )) << ecb_ctz32 (screen->visual->red_mask ))
808 | (color.g >> (16 - ecb_popcount32 (screen->visual->green_mask)) << ecb_ctz32 (screen->visual->green_mask))
809 | (color.b >> (16 - ecb_popcount32 (screen->visual->blue_mask )) << ecb_ctz32 (screen->visual->blue_mask ));
810
811 return true;
812 }
813 else if (XAllocColor (screen->dpy, screen->cmap, &c))
565 return true; 814 return true;
815#endif
816
817 c.pixel = (color.r + color.g + color.b) > 128*3
818 ? WhitePixelOfScreen (DefaultScreenOfDisplay (screen->dpy))
819 : BlackPixelOfScreen (DefaultScreenOfDisplay (screen->dpy));
820
821 return false;
566} 822}
567 823
568bool 824bool
569rxvt_color::set (rxvt_screen *screen, const char *name) 825rxvt_color::set (rxvt_screen *screen, const char *name)
570{ 826{
827 rgba c;
828 char eos;
829 int skip;
830
831 c.a = rgba::MAX_CC;
832
833 // parse the nonstandard "[alphapercent]" prefix
834 if (1 <= sscanf (name, "[%hd]%n", &c.a, &skip))
835 {
836 c.a = lerp<int, int, int> (0, rgba::MAX_CC, c.a);
837 name += skip;
838 }
839
840 // parse the non-standard "rgba:rrrr/gggg/bbbb/aaaa" format
841 if (strlen (name) != 4+5*4 || 4 != sscanf (name, "rgba:%4hx/%4hx/%4hx/%4hx%c", &c.r, &c.g, &c.b, &c.a, &eos))
842 {
843 XColor xc;
844
845 if (XParseColor (screen->dpy, screen->cmap, name, &xc))
846 {
847 c.r = xc.red;
848 c.g = xc.green;
849 c.b = xc.blue;
850 }
851 else
852 {
853 c.r = 0xffff;
854 c.g = 0x6969;
855 c.b = 0xb4b4;
856
857 rxvt_warn ("unable to parse color '%s', using pink instead.\n", name);
858 }
859 }
860
861 return set (screen, c);
862}
863
864bool
865rxvt_color::set (rxvt_screen *screen, const rgba &color)
866{
867 bool got = alloc (screen, color);
868
869#if !ENABLE_MINIMAL
870 int cmap_size = screen->visual->map_entries;
871
872 if (!got
873 && screen->visual->c_class == PseudoColor
874 && cmap_size < 4096)
875 {
876 XColor *colors = new XColor [screen->visual->map_entries];
877
878 for (int i = 0; i < cmap_size; i++)
879 colors [i].pixel = i;
880
881 // many kilobytes transfer per colour, but pseudocolor isn't worth
882 // many extra optimisations.
883 XQueryColors (screen->dpy, screen->cmap, colors, cmap_size);
884
885 int diff = 0x7fffffffUL;
886 XColor *best = colors;
887
888 for (int i = 0; i < cmap_size; i++)
889 {
890 int d = (squared_diff<int> (color.r >> 2, colors [i].red >> 2))
891 + (squared_diff<int> (color.g >> 2, colors [i].green >> 2))
892 + (squared_diff<int> (color.b >> 2, colors [i].blue >> 2));
893
894 if (d < diff)
895 {
896 diff = d;
897 best = colors + i;
898 }
899 }
900
901 //rxvt_warn ("could not allocate %04x %04x %04x, getting %04x %04x %04x instead (%d)\n",
902 // color.r, color.g, color.b, best->red, best->green, best->blue, diff);
903
904 got = alloc (screen, rgba (best->red, best->green, best->blue));
905
906 delete [] colors;
907 }
908#endif
909
910 return got;
911}
912
913void
914rxvt_color::get (rgba &color) const
915{
571#if XFT 916#if XFT
572 return XftColorAllocName (screen->xdisp, screen->visual, screen->cmap, name, &c); 917 color.r = c.color.red;
918 color.g = c.color.green;
919 color.b = c.color.blue;
920 color.a = c.color.alpha;
573#else 921#else
574 XColor xc; 922 color.r = c.red;
923 color.g = c.green;
924 color.b = c.blue;
925 color.a = rgba::MAX_CC;
926#endif
927}
575 928
576 if (XParseColor (screen->xdisp, screen->cmap, name, &xc)) 929void
577 return set (screen, xc.red, xc.green, xc.blue); 930rxvt_color::get (XColor &color) const
931{
932 rgba c;
933 get (c);
934
935 color.red = c.r;
936 color.green = c.g;
937 color.blue = c.b;
938 color.pixel = (Pixel)*this;
939}
940
941void
942rxvt_color::free (rxvt_screen *screen)
943{
944 if (screen->visual->c_class == TrueColor)
945 return; // nothing to do
946
947#if XFT
948 XftColorFree (screen->dpy, screen->visual, screen->cmap, &c);
949#else
950 XFreeColors (screen->dpy, screen->cmap, &c.pixel, 1, AllPlanes);
951#endif
952}
953
954void
955rxvt_color::fade (rxvt_screen *screen, int percent, rxvt_color &result, const rgba &to)
956{
957 rgba c;
958 get (c);
959
960 result.set (
961 screen,
962 rgba (
963 lerp (c.r, to.r, percent),
964 lerp (c.g, to.g, percent),
965 lerp (c.b, to.b, percent),
966 lerp (c.a, to.a, percent)
967 )
968 );
969}
970
971rxvt_selection::rxvt_selection (rxvt_display *disp, int selnum, Time tm, Window win, Atom prop, rxvt_term *term)
972: display (disp), request_time (tm), request_win (win), request_prop (prop), term (term)
973{
974 assert (selnum >= Sel_Primary && selnum <= Sel_Clipboard);
975
976 timer_ev.set<rxvt_selection, &rxvt_selection::timer_cb> (this);
977 timer_ev.repeat = 10.;
978 x_ev.set<rxvt_selection, &rxvt_selection::x_cb> (this);
979
980 incr_buf = 0;
981 incr_buf_size = incr_buf_fill = 0;
982 selection_wait = Sel_normal;
983 selection_type = selnum;
984 cb_sv = 0;
985}
986
987void
988rxvt_selection::stop ()
989{
990 free (incr_buf);
991 incr_buf = 0;
992 timer_ev.stop ();
993 x_ev.stop (display);
994}
995
996rxvt_selection::~rxvt_selection ()
997{
998 stop ();
999}
1000
1001void
1002rxvt_selection::run ()
1003{
1004 int selnum = selection_type;
1005
1006#if ENABLE_FRILLS
1007 if (selnum == Sel_Primary && display->selection_owner)
1008 {
1009 /* internal selection */
1010 char *str = rxvt_wcstombs (display->selection_owner->selection.text, display->selection_owner->selection.len);
1011 finish (str, strlen (str));
1012 free (str);
1013 return;
1014 }
1015#endif
1016
1017#if X_HAVE_UTF8_STRING
1018 selection_type = Sel_UTF8String;
1019 if (request (display->xa[XA_UTF8_STRING], selnum))
1020 return;
1021#else
1022 selection_type = Sel_CompoundText;
1023 if (request (display->xa[XA_COMPOUND_TEXT], selnum))
1024 return;
1025#endif
1026
1027 // fallback to CUT_BUFFER0 if the requested property has no owner
1028 handle_selection (display->root, XA_CUT_BUFFER0, false);
1029}
1030
1031void
1032rxvt_selection::finish (char *data, unsigned int len)
1033{
1034 if (!cb_sv)
1035 {
1036 if (data)
1037 term->paste (data, len);
1038
1039 term->selection_req = 0;
1040 delete this;
1041 }
1042#if ENABLE_PERL
1043 else
1044 {
1045 stop (); // we do not really trust perl callbacks
1046 rxvt_perl.selection_finish (this, data, len);
1047 }
1048#endif
1049}
1050
1051bool
1052rxvt_selection::request (Atom target, int selnum)
1053{
1054 Atom sel;
1055
1056 selection_type |= selnum;
1057
1058 if (selnum == Sel_Primary)
1059 sel = XA_PRIMARY;
1060 else if (selnum == Sel_Secondary)
1061 sel = XA_SECONDARY;
1062 else
1063 sel = display->xa[XA_CLIPBOARD];
1064
1065 if (XGetSelectionOwner (display->dpy, sel) != None)
1066 {
1067 XConvertSelection (display->dpy, sel, target, request_prop,
1068 request_win, request_time);
1069 x_ev.start (display, request_win);
1070 timer_ev.again ();
1071 return true;
1072 }
578 1073
579 return false; 1074 return false;
580#endif
581} 1075}
582 1076
583bool
584rxvt_color::set (rxvt_screen *screen, unsigned short cr, unsigned short cg, unsigned short cb)
585{
586 XColor xc;
587
588 xc.red = cr;
589 xc.green = cg;
590 xc.blue = cb;
591 xc.flags = DoRed | DoGreen | DoBlue;
592
593 if (XAllocColor (screen->xdisp, screen->cmap, &xc))
594 return set (screen, xc.pixel);
595
596 return false;
597}
598
599void 1077void
600rxvt_color::get (rxvt_screen *screen, unsigned short &cr, unsigned short &cg, unsigned short &cb) 1078rxvt_selection::handle_selection (Window win, Atom prop, bool delete_prop)
601{ 1079{
602#if XFT 1080 Display *dpy = display->dpy;
603 cr = c.color.red; 1081 char *data = 0;
604 cg = c.color.green; 1082 unsigned int data_len = 0;
605 cb = c.color.blue; 1083 unsigned long bytes_after;
606#else 1084 XTextProperty ct;
607 XColor c;
608 1085
609 c.pixel = p; 1086 // check for failed XConvertSelection
610 XQueryColor (screen->xdisp, screen->cmap, &c); 1087 if (prop == None)
1088 {
1089 bool error = true;
1090 int selnum = selection_type & Sel_whereMask;
611 1091
612 cr = c.red; 1092 if (selection_type & Sel_CompoundText)
613 cg = c.green; 1093 {
614 cb = c.blue; 1094 selection_type = 0;
615#endif 1095 error = !request (XA_STRING, selnum);
616} 1096 }
617 1097
1098 if (selection_type & Sel_UTF8String)
1099 {
1100 selection_type = Sel_CompoundText;
1101 error = !request (display->xa[XA_COMPOUND_TEXT], selnum);
1102 }
1103
1104 if (error)
1105 {
1106 ct.value = 0;
1107 goto bailout;
1108 }
1109
1110 return;
1111 }
1112
1113 // length == (2^31 - 1) / 4, as gdk
1114 if (XGetWindowProperty (dpy, win, prop,
1115 0, 0x1fffffff,
1116 delete_prop, AnyPropertyType,
1117 &ct.encoding, &ct.format,
1118 &ct.nitems, &bytes_after,
1119 &ct.value) != Success)
1120 {
1121 ct.value = 0;
1122 goto bailout;
1123 }
1124
1125 if (ct.encoding == None)
1126 goto bailout;
1127
1128 if (ct.value == 0)
1129 goto bailout;
1130
1131 if (ct.encoding == display->xa[XA_INCR])
1132 {
1133 // INCR selection, start handshake
1134 if (!delete_prop)
1135 XDeleteProperty (dpy, win, prop);
1136
1137 selection_wait = Sel_incr;
1138 timer_ev.again ();
1139
1140 goto bailout;
1141 }
1142
1143 if (ct.nitems == 0)
1144 {
1145 if (selection_wait == Sel_incr)
1146 {
1147 XFree (ct.value);
1148
1149 // finally complete, now paste the whole thing
1150 selection_wait = Sel_normal;
1151 ct.value = (unsigned char *)incr_buf;
1152 ct.nitems = incr_buf_fill;
1153 incr_buf = 0;
1154 timer_ev.stop ();
1155 }
1156 else
1157 {
1158 // avoid recursion
1159 if (win != display->root || prop != XA_CUT_BUFFER0)
1160 {
1161 XFree (ct.value);
1162
1163 // fallback to CUT_BUFFER0 if the requested property
1164 // has an owner but is empty
1165 handle_selection (display->root, XA_CUT_BUFFER0, False);
1166 return;
1167 }
1168
1169 goto bailout;
1170 }
1171 }
1172 else if (selection_wait == Sel_incr)
1173 {
1174 timer_ev.again ();
1175
1176 while (incr_buf_fill + ct.nitems > incr_buf_size)
1177 {
1178 incr_buf_size = incr_buf_size ? incr_buf_size * 2 : 128*1024;
1179 incr_buf = (char *)rxvt_realloc (incr_buf, incr_buf_size);
1180 }
1181
1182 memcpy (incr_buf + incr_buf_fill, ct.value, ct.nitems);
1183 incr_buf_fill += ct.nitems;
1184
1185 goto bailout;
1186 }
1187
1188 char **cl;
1189 int cr;
1190
1191 // we honour the first item only
1192
1193#if !ENABLE_MINIMAL
1194 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it
1195 // so recode it manually
1196 if (ct.encoding == display->xa[XA_UTF8_STRING])
1197 {
1198 wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems);
1199 data = rxvt_wcstombs (w);
1200 free (w);
1201 }
1202 else
1203#endif
1204 if (XmbTextPropertyToTextList (dpy, &ct, &cl, &cr) >= 0
1205 && cl)
1206 {
1207 data = strdup (cl[0]);
1208 XFreeStringList (cl);
1209 }
1210 else
1211 {
1212 // paste raw
1213 data = strdup ((const char *)ct.value);
1214 }
1215
1216 data_len = strlen (data);
1217
1218bailout:
1219 XFree (ct.value);
1220
1221 if (selection_wait == Sel_normal)
1222 {
1223 finish (data, data_len);
1224 free (data);
1225 }
1226}
1227
618void 1228void
619rxvt_color::free (rxvt_screen *screen) 1229rxvt_selection::timer_cb (ev::timer &w, int revents)
620{ 1230{
621#if XFT 1231 if (selection_wait == Sel_incr)
622 XftColorFree (screen->xdisp, screen->visual, screen->cmap, &c); 1232 rxvt_warn ("data loss: timeout on INCR selection paste, ignoring.\n");
623#else
624 XFreeColors (screen->xdisp, screen->cmap, &p, 1, AllPlanes);
625#endif
626}
627 1233
628rxvt_color 1234 finish ();
629rxvt_color::fade (rxvt_screen *screen, int percent)
630{
631 percent = 100 - percent;
632
633 unsigned short cr, cg, cb;
634 rxvt_color faded;
635
636 get (screen, cr, cg, cb);
637
638 faded.set (
639 screen,
640 cr * percent / 100,
641 cg * percent / 100,
642 cb * percent / 100
643 );
644
645 return faded;
646} 1235}
647 1236
648#define LERP(a,b,p) (a * p + b * (100 - p)) / 100 1237void
649 1238rxvt_selection::x_cb (XEvent &xev)
650rxvt_color
651rxvt_color::fade (rxvt_screen *screen, int percent, rxvt_color &fadeto)
652{ 1239{
653 percent = 100 - percent; 1240 switch (xev.type)
1241 {
1242 case PropertyNotify:
1243 if (selection_wait == Sel_incr
1244 && xev.xproperty.atom == request_prop
1245 && xev.xproperty.state == PropertyNewValue)
1246 handle_selection (xev.xproperty.window, xev.xproperty.atom, true);
1247 break;
654 1248
655 unsigned short cr, cg, cb; 1249 case SelectionNotify:
656 unsigned short fcr, fcg, fcb; 1250 if (selection_wait == Sel_normal
657 rxvt_color faded; 1251 && xev.xselection.time == request_time)
658 1252 {
659 get (screen, cr, cg, cb); 1253 timer_ev.stop ();
660 fadeto.get (screen, fcr, fcg, fcb); 1254 handle_selection (xev.xselection.requestor, xev.xselection.property, true);
661 1255 }
662 faded.set ( 1256 break;
663 screen, 1257 }
664 LERP (cr, fcr, percent),
665 LERP (cg, fcg, percent),
666 LERP (cb, fcb, percent)
667 );
668
669 return faded;
670} 1258}
671

Diff Legend

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