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

Diff Legend

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