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

Diff Legend

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