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.30 by root, Sun Jan 29 21:54:33 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
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#ifdef 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{
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 xdisp = disp->display; 256 dpy = disp->dpy;
187 257
188 Screen *screen = ScreenOfDisplay (xdisp, disp->screen); 258 Screen *screen = ScreenOfDisplay (dpy, disp->screen);
189 259
190 depth = DefaultDepthOfScreen (screen); 260 depth = DefaultDepthOfScreen (screen);
191 visual = DefaultVisualOfScreen (screen); 261 visual = DefaultVisualOfScreen (screen);
192 cmap = DefaultColormapOfScreen (screen); 262 cmap = DefaultColormapOfScreen (screen);
193} 263}
194 264
195void 265void
196rxvt_screen::set (rxvt_display *disp, int bitdepth) 266rxvt_screen::select_visual (int bitdepth)
197{ 267{
198 set (disp); 268#if XFT
199
200 XVisualInfo vinfo; 269 XVisualInfo vinfo;
201 270
202 if (XMatchVisualInfo (xdisp, display->screen, bitdepth, TrueColor, &vinfo)) 271 if (XMatchVisualInfo (dpy, display->screen, bitdepth, TrueColor, &vinfo))
203 { 272 {
204 depth = bitdepth; 273 depth = bitdepth;
205 visual = vinfo.visual; 274 visual = vinfo.visual;
206 cmap = XCreateColormap (xdisp, disp->root, visual, AllocNone); 275 cmap = XCreateColormap (dpy, display->root, visual, AllocNone);
207 } 276 }
277#endif
208} 278}
209 279
210void 280void
211rxvt_screen::clear () 281rxvt_screen::clear ()
212{ 282{
283#if XFT
284 if (scratch_area)
285 {
286 XFreePixmap (dpy, scratch_area->drawable);
287 delete scratch_area;
288 }
289#endif
290
213 if (cmap != DefaultColormapOfScreen (ScreenOfDisplay (xdisp, display->screen))) 291 if (cmap != DefaultColormapOfScreen (ScreenOfDisplay (dpy, display->screen)))
214 XFreeColormap (xdisp, cmap); 292 XFreeColormap (dpy, cmap);
215} 293}
216 294
217///////////////////////////////////////////////////////////////////////////// 295/////////////////////////////////////////////////////////////////////////////
218 296
219rxvt_display::rxvt_display (const char *id) 297rxvt_display::rxvt_display (const char *id)
220: refcounted (id) 298: refcounted (id)
221, x_ev (this, &rxvt_display::x_cb)
222, selection_owner (0) 299, selection_owner (0)
300, clipboard_owner (0)
223{ 301{
302 x_ev .set<rxvt_display, &rxvt_display::x_cb > (this);
303 flush_ev.set<rxvt_display, &rxvt_display::flush_cb> (this);
224} 304}
225 305
226XrmDatabase 306XrmDatabase
227rxvt_display::get_resources () 307rxvt_display::get_resources (bool refresh)
228{ 308{
229 char *homedir = (char *)getenv ("HOME"); 309 char *homedir = getenv ("HOME");
230 char fname[1024]; 310 char fname[1024];
231 311
232 /* 312 /*
233 * get resources using the X library function 313 * get resources using the X library function
234 */ 314 */
235 char *displayResource, *xe; 315 char *displayResource, *xe;
236 XrmDatabase database, rdb1; 316 XrmDatabase rdb1, database = 0;
237 317
238 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
239 322
240 // 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
241 325
242 // 6. System wide per application default file. 326 // 6. System wide per application default file.
243 327
244 /* Add in $XAPPLRESDIR/Rxvt only; not bothering with XUSERFILESEARCHPATH */ 328 /* Add in $XAPPLRESDIR/Rxvt only; not bothering with XUSERFILESEARCHPATH */
245 if ((xe = (char *)getenv ("XAPPLRESDIR"))) 329 if ((xe = getenv ("XAPPLRESDIR")))
246 { 330 {
247 snprintf (fname, sizeof (fname), "%s/%s", xe, RESCLASS); 331 snprintf (fname, sizeof (fname), "%s/%s", xe, RESCLASS);
248 332
249 if ((rdb1 = XrmGetFileDatabase (fname))) 333 if ((rdb1 = XrmGetFileDatabase (fname)))
250 XrmMergeDatabases (rdb1, &database); 334 XrmMergeDatabases (rdb1, &database);
252 336
253 // 5. User's per application default file. 337 // 5. User's per application default file.
254 // none 338 // none
255 339
256 // 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
257 /* 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
258 displayResource = XResourceManagerString (display); 384 displayResource = XResourceManagerString (dpy);
259 385
260 if (displayResource != NULL) 386 if (displayResource)
261 { 387 {
262 if ((rdb1 = XrmGetStringDatabase (displayResource))) 388 if ((rdb1 = XrmGetStringDatabase (displayResource)))
263 XrmMergeDatabases (rdb1, &database); 389 XrmMergeDatabases (rdb1, &database);
264 } 390 }
265 else if (homedir)
266 {
267 snprintf (fname, sizeof (fname), "%s/.Xdefaults", homedir);
268 391
269 if ((rdb1 = XrmGetFileDatabase (fname))) 392#if !XLIB_ILLEGAL_ACCESS
270 XrmMergeDatabases (rdb1, &database); 393 if (refresh && displayResource)
271 } 394 XFree (displayResource);
395#endif
272 396
273 /* Get screen specific resources */ 397 /* Get screen specific resources */
274 displayResource = XScreenResourceString (ScreenOfDisplay (display, screen)); 398 displayResource = XScreenResourceString (ScreenOfDisplay (dpy, screen));
275 399
276 if (displayResource != NULL) 400 if (displayResource)
277 { 401 {
278 if ((rdb1 = XrmGetStringDatabase (displayResource))) 402 if ((rdb1 = XrmGetStringDatabase (displayResource)))
279 /* Merge with screen-independent resources */ 403 /* Merge with screen-independent resources */
280 XrmMergeDatabases (rdb1, &database); 404 XrmMergeDatabases (rdb1, &database);
281 405
282 XFree (displayResource); 406 XFree (displayResource);
283 } 407 }
284 408
285 // 3. User's per host defaults file 409 // 3. User's per host defaults file
286 /* Add in XENVIRONMENT file */ 410 /* Add in XENVIRONMENT file */
287 if ((xe = (char *)getenv ("XENVIRONMENT")) 411 if ((xe = getenv ("XENVIRONMENT"))
288 && (rdb1 = XrmGetFileDatabase (xe))) 412 && (rdb1 = XrmGetFileDatabase (xe)))
289 XrmMergeDatabases (rdb1, &database); 413 XrmMergeDatabases (rdb1, &database);
290 else if (homedir) 414 else if (homedir)
291 { 415 {
292 struct utsname un; 416 struct utsname un;
306bool rxvt_display::ref_init () 430bool rxvt_display::ref_init ()
307{ 431{
308#ifdef LOCAL_X_IS_UNIX 432#ifdef LOCAL_X_IS_UNIX
309 if (id[0] == ':') 433 if (id[0] == ':')
310 { 434 {
311 val = rxvt_malloc (5 + strlen (id) + 1); 435 char *val = rxvt_temp_buf<char> (5 + strlen (id) + 1);
436
312 strcpy (val, "unix/"); 437 strcpy (val, "unix/");
313 strcat (val, id); 438 strcat (val, id);
439
314 display = XOpenDisplay (val); 440 dpy = XOpenDisplay (val);
315 free (val);
316 } 441 }
317 else 442 else
318#endif 443#endif
319 display = 0; 444 dpy = 0;
320 445
321 if (!display) 446 if (!dpy)
322 display = XOpenDisplay (id); 447 dpy = XOpenDisplay (id);
323 448
324 if (!display) 449 if (!dpy)
325 return false; 450 return false;
326 451
327 screen = DefaultScreen (display); 452 screen = DefaultScreen (dpy);
328 root = DefaultRootWindow (display); 453 root = DefaultRootWindow (dpy);
329 454
330 assert (sizeof (xa_names) / sizeof (char *) == NUM_XA); 455 assert (ecb_array_length (xa_names) == NUM_XA);
331 XInternAtoms (display, (char **)xa_names, NUM_XA, False, xa); 456 XInternAtoms (dpy, (char **)xa_names, NUM_XA, False, xa);
332 457
333 XrmSetDatabase (display, get_resources ()); 458 XrmSetDatabase (dpy, get_resources (false));
334 459
335#ifdef POINTER_BLANK 460#ifdef POINTER_BLANK
336 XColor blackcolour; 461 XColor blackcolour;
337 blackcolour.red = 0; 462 blackcolour.red = 0;
338 blackcolour.green = 0; 463 blackcolour.green = 0;
339 blackcolour.blue = 0; 464 blackcolour.blue = 0;
340 Font f = XLoadFont (display, "fixed"); 465 Font f = XLoadFont (dpy, "fixed");
341 blank_cursor = XCreateGlyphCursor (display, f, f, ' ', ' ', 466 blank_cursor = XCreateGlyphCursor (dpy, f, f, ' ', ' ',
342 &blackcolour, &blackcolour); 467 &blackcolour, &blackcolour);
343 XUnloadFont (display, f); 468 XUnloadFont (dpy, f);
344#endif 469#endif
345 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
346 int fd = XConnectionNumber (display); 493 int fd = XConnectionNumber (dpy);
347 494
348#ifndef NO_SLOW_LINK_SUPPORT
349 // try to detect wether we have a local connection. 495 // try to detect whether we have a local connection.
350 // assume unix domains socket == local, everything else not 496 // assume unix domain socket == local, everything else not
351 // TODO: might want to check for inet/127.0.0.1 497 // TODO: might want to check for inet/127.0.0.1
352 is_local = 0; 498 is_local = 0;
353 sockaddr_un sa; 499 sockaddr_un sa;
354 socklen_t sl = sizeof (sa); 500 socklen_t sl = sizeof (sa);
355 501
356 if (!getsockname (fd, (sockaddr *)&sa, &sl)) 502 if (!getsockname (fd, (sockaddr *)&sa, &sl))
357 is_local = sa.sun_family == AF_LOCAL; 503 is_local = sa.sun_family == AF_UNIX;
358#endif
359 504
505 flush_ev.start ();
360 x_ev.start (fd, EVENT_READ); 506 x_ev.start (fd, ev::READ);
361 fcntl (fd, F_SETFD, FD_CLOEXEC); 507 fcntl (fd, F_SETFD, FD_CLOEXEC);
362 508
363 XSelectInput (display, root, PropertyChangeMask); 509 XSelectInput (dpy, root, PropertyChangeMask);
364 510
365 flush (); 511 flush ();
366 512
367 return true; 513 return true;
368} 514}
369 515
370void 516void
371rxvt_display::ref_next () 517rxvt_display::ref_next ()
372{ 518{
373 // TODO: somehow check wether the database files/resources changed 519 // TODO: somehow check whether the database files/resources changed
374 // before re-loading/parsing 520 // before affording re-loading/parsing
375 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
376 XrmSetDatabase (display, get_resources ()); 526 XrmSetDatabase (dpy, get_resources (true));
377} 527}
378 528
379rxvt_display::~rxvt_display () 529rxvt_display::~rxvt_display ()
380{ 530{
381 if (!display) 531 if (!dpy)
382 return; 532 return;
383 533
384#ifdef POINTER_BLANK 534#ifdef POINTER_BLANK
385 XFreeCursor (display, blank_cursor); 535 XFreeCursor (dpy, blank_cursor);
386#endif 536#endif
387 x_ev.stop (); 537 x_ev.stop ();
538 flush_ev.stop ();
388#ifdef USE_XIM 539#ifdef USE_XIM
389 xims.clear (); 540 xims.clear ();
390#endif 541#endif
542 XrmDestroyDatabase (XrmGetDatabase (dpy));
391 XCloseDisplay (display); 543 XCloseDisplay (dpy);
392} 544}
393 545
394#ifdef USE_XIM 546#ifdef USE_XIM
395void rxvt_display::im_change_cb () 547void rxvt_display::im_change_cb ()
396{ 548{
404 // registers, as xlib crashes due to a race otherwise. 556 // registers, as xlib crashes due to a race otherwise.
405 Atom actual_type, *atoms; 557 Atom actual_type, *atoms;
406 int actual_format; 558 int actual_format;
407 unsigned long nitems, bytes_after; 559 unsigned long nitems, bytes_after;
408 560
409 if (XGetWindowProperty (display, root, xa[XA_XIM_SERVERS], 0L, 1000000L, 561 if (XGetWindowProperty (dpy, root, xa[XA_XIM_SERVERS], 0L, 1000000L,
410 False, XA_ATOM, &actual_type, &actual_format, 562 False, XA_ATOM, &actual_type, &actual_format,
411 &nitems, &bytes_after, (unsigned char **)&atoms) 563 &nitems, &bytes_after, (unsigned char **)&atoms)
412 != Success ) 564 != Success)
413 return; 565 return;
414 566
415 if (actual_type == XA_ATOM && actual_format == 32) 567 if (actual_type == XA_ATOM && actual_format == 32)
416 for (int i = 0; i < nitems; i++) 568 for (int i = 0; i < nitems; i++)
417 if (XGetSelectionOwner (display, atoms[i])) 569 if (XGetSelectionOwner (dpy, atoms[i]))
418 { 570 {
419 im_change_cb (); 571 im_change_cb ();
420 break; 572 break;
421 } 573 }
422 574
423 XFree (atoms); 575 XFree (atoms);
424} 576}
425#endif 577#endif
426 578
427void rxvt_display::x_cb (io_watcher &w, short revents) 579void rxvt_display::x_cb (ev::io &w, int revents)
428{ 580{
581 flush_ev.start ();
582}
583
584void rxvt_display::flush_cb (ev::prepare &w, int revents)
585{
586 while (XEventsQueued (dpy, QueuedAfterFlush))
429 do 587 do
430 { 588 {
431 XEvent xev; 589 XEvent xev;
432 XNextEvent (display, &xev); 590 XNextEvent (dpy, &xev);
433 591
434#ifdef USE_XIM 592#ifdef USE_XIM
435 if (!XFilterEvent (&xev, None)) 593 if (!XFilterEvent (&xev, None))
436 { 594 {
437 if (xev.type == PropertyNotify 595 if (xev.type == PropertyNotify
438 && xev.xany.window == root 596 && xev.xany.window == root
439 && xev.xproperty.atom == xa[XA_XIM_SERVERS]) 597 && xev.xproperty.atom == xa[XA_XIM_SERVERS])
440 im_change_check (); 598 im_change_check ();
441#endif 599#endif
600 if (xev.type == MappingNotify)
601 XRefreshKeyboardMapping (&xev.xmapping);
602
442 for (int i = xw.size (); i--; ) 603 for (int i = xw.size (); i--; )
443 { 604 {
444 if (!xw[i]) 605 if (!xw[i])
445 xw.erase_unordered (i); 606 xw.erase_unordered (i);
446 else if (xw[i]->window == xev.xany.window) 607 else if (xw[i]->window == xev.xany.window)
447 xw[i]->call (xev); 608 xw[i]->call (xev);
448 } 609 }
449#ifdef USE_XIM 610#ifdef USE_XIM
450 } 611 }
451#endif 612#endif
452 } 613 }
453 while (XEventsQueued (display, QueuedAlready)); 614 while (XEventsQueued (dpy, QueuedAlready));
454 615
455 XFlush (display); 616 w.stop ();
456}
457
458void rxvt_display::flush ()
459{
460 if (XEventsQueued (display, QueuedAlready))
461 x_cb (x_ev, EVENT_READ);
462
463 XFlush (display);
464} 617}
465 618
466void rxvt_display::reg (xevent_watcher *w) 619void rxvt_display::reg (xevent_watcher *w)
467{ 620{
621 if (!w->active)
622 {
468 xw.push_back (w); 623 xw.push_back (w);
469 w->active = xw.size (); 624 w->active = xw.size ();
625 }
470} 626}
471 627
472void rxvt_display::unreg (xevent_watcher *w) 628void rxvt_display::unreg (xevent_watcher *w)
473{ 629{
474 if (w->active) 630 if (w->active)
631 {
475 xw[w->active - 1] = 0; 632 xw[w->active - 1] = 0;
633 w->active = 0;
634 }
476} 635}
477 636
478void rxvt_display::set_selection_owner (rxvt_term *owner) 637void rxvt_display::set_selection_owner (rxvt_term *owner, bool clipboard)
479{ 638{
639 rxvt_term * &cur_owner = !clipboard ? selection_owner : clipboard_owner;
640
480 if (selection_owner && selection_owner != owner) 641 if (cur_owner && cur_owner != owner)
481 selection_owner->selection_clear (); 642 {
643 rxvt_term *term = cur_owner;
644 term->selection_clear (clipboard);
645 term->flush ();
646 }
482 647
483 selection_owner = owner; 648 cur_owner = owner;
484} 649}
485 650
486#ifdef USE_XIM 651#ifdef USE_XIM
652
487void rxvt_display::reg (im_watcher *w) 653void rxvt_display::reg (im_watcher *w)
488{ 654{
489 imw.push_back (w); 655 imw.push_back (w);
490} 656}
491 657
500 int l, m; 666 int l, m;
501 667
502 l = strlen (locale); 668 l = strlen (locale);
503 m = strlen (modifiers); 669 m = strlen (modifiers);
504 670
505 if (!(id = (char *)malloc (l + m + 2))) 671 if (!(id = rxvt_temp_buf<char> (l + m + 2)))
506 return 0; 672 return 0;
507 673
508 memcpy (id, locale, l); id[l] = '\n'; 674 memcpy (id, locale, l); id[l] = '\n';
509 memcpy (id + l + 1, modifiers, m); id[l + m + 1] = 0; 675 memcpy (id + l + 1, modifiers, m); id[l + m + 1] = 0;
510 676
511 rxvt_xim *xim = xims.get (id); 677 rxvt_xim *xim = xims.get (id);
512 678
513 free (id);
514
515 return xim; 679 return xim;
516} 680}
517 681
518void rxvt_display::put_xim (rxvt_xim *xim) 682void rxvt_display::put_xim (rxvt_xim *xim)
519{ 683{
520#if XLIB_IS_RACEFREE 684# if XLIB_IS_RACEFREE
521 xims.put (xim); 685 xims.put (xim);
522#endif 686# endif
523} 687}
688
524#endif 689#endif
525 690
526Atom rxvt_display::atom (const char *name) 691Atom rxvt_display::atom (const char *name)
527{ 692{
528 return XInternAtom (display, name, False); 693 return XInternAtom (dpy, name, False);
529} 694}
530 695
531///////////////////////////////////////////////////////////////////////////// 696/////////////////////////////////////////////////////////////////////////////
532 697
533template class refcache<rxvt_display>; 698template class refcache<rxvt_display>;
534refcache<rxvt_display> displays; 699refcache<rxvt_display> displays;
535 700
536///////////////////////////////////////////////////////////////////////////// 701/////////////////////////////////////////////////////////////////////////////
537 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
538bool 780bool
539rxvt_color::set (rxvt_screen *screen, const char *name) 781rxvt_color::set (rxvt_screen *screen, const char *name)
540{ 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{
541#if XFT 872#if XFT
542 int l = strlen (name); 873 color.r = c.color.red;
543 rxvt_rgba r; 874 color.g = c.color.green;
544 char eos; 875 color.b = c.color.blue;
545 int mult; 876 color.a = c.color.alpha;
546
547 if ( l == 1+4*1 && 4 == sscanf (name, "#%1hx%1hx%1hx%1hx%c", &r.a, &r.r, &r.g, &r.b, &eos))
548 mult = rxvt_rgba::MAX_CC / 0x000f;
549 else if (l == 1+4*2 && 4 == sscanf (name, "#%2hx%2hx%2hx%2hx%c", &r.a, &r.r, &r.g, &r.b, &eos))
550 mult = rxvt_rgba::MAX_CC / 0x00ff;
551 else if (l == 1+4*4 && 4 == sscanf (name, "#%4hx%4hx%4hx%4hx%c", &r.a, &r.r, &r.g, &r.b, &eos))
552 mult = rxvt_rgba::MAX_CC / 0xffff;
553 else if (l == 4+5*4 && 4 == sscanf (name, "rgba:%hx/%hx/%hx/%hx%c", &r.r, &r.g, &r.b, &r.a, &eos))
554 mult = rxvt_rgba::MAX_CC / 0xffff;
555 else
556 return XftColorAllocName (screen->xdisp, screen->visual, screen->cmap, name, &c);
557
558 r.r *= mult; r.g *= mult; r.b *= mult; r.a *= mult;
559 return set (screen, r);
560#else 877#else
561 XColor xc; 878 color.r = c.red;
562 879 color.g = c.green;
563 if (XParseColor (screen->xdisp, screen->cmap, name, &xc)) 880 color.b = c.blue;
564 return set (screen, rxvt_rgba (xc.red, xc.green, xc.blue)); 881 color.a = rgba::MAX_CC;
565
566 return false;
567#endif 882#endif
568} 883}
569 884
570bool 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
571rxvt_color::set (rxvt_screen *screen, rxvt_rgba rgba) 898rxvt_color::free (rxvt_screen *screen)
572{ 899{
900 if (screen->visual->c_class == TrueColor)
901 return; // nothing to do
902
573#if XFT 903#if XFT
574 XRenderColor d;
575
576 d.red = rgba.r;
577 d.green = rgba.g;
578 d.blue = rgba.b;
579 d.alpha = rgba.a;
580
581 if (XftColorAllocValue (screen->xdisp, screen->visual, screen->cmap, &d, &c)) 904 XftColorFree (screen->dpy, screen->visual, screen->cmap, &c);
582 {
583 // FUCKING Xft gets it wrong, of course, fix it for the common case
584 // transparency users should eat shit and die, and then
585 // XRenderQueryPictIndexValues themselves plenty.
586 if (screen->depth == 32 && screen->visual->c_class == TrueColor)
587 if ((screen->visual->red_mask | screen->visual->green_mask | screen->visual->blue_mask) == 0x00ffffffUL)
588 c.pixel = c.pixel & 0x00ffffffUL | ((rgba.a >> 8) << 24);
589 else if ((screen->visual->red_mask | screen->visual->green_mask | screen->visual->blue_mask) == 0xffffff00UL)
590 c.pixel = c.pixel & 0xffffff00UL | (rgba.a >> 8);
591
592 return true;
593 }
594
595 return false;
596#else 905#else
597 XColor xc;
598
599 xc.red = rgba.r;
600 xc.green = rgba.g;
601 xc.blue = rgba.b;
602 xc.flags = DoRed | DoGreen | DoBlue;
603
604 if (XAllocColor (screen->xdisp, screen->cmap, &xc))
605 {
606 p = xc.pixel;
607 return true;
608 }
609
610 return false;
611#endif
612}
613
614void
615rxvt_color::get (rxvt_screen *screen, rxvt_rgba &rgba)
616{
617#if XFT
618 rgba.r = c.color.red;
619 rgba.g = c.color.green;
620 rgba.b = c.color.blue;
621 rgba.a = c.color.alpha;
622#else
623 XColor c;
624
625 c.pixel = p;
626 XQueryColor (screen->xdisp, screen->cmap, &c);
627
628 rgba.r = c.red;
629 rgba.g = c.green;
630 rgba.b = c.blue;
631 rgba.a = rxvt_rgba::MAX_CC;
632#endif
633}
634
635void
636rxvt_color::free (rxvt_screen *screen)
637{
638#if XFT
639 XftColorFree (screen->xdisp, screen->visual, screen->cmap, &c);
640#else
641 XFreeColors (screen->xdisp, screen->cmap, &p, 1, AllPlanes); 906 XFreeColors (screen->dpy, screen->cmap, &c.pixel, 1, AllPlanes);
642#endif 907#endif
643} 908}
644 909
645rxvt_color 910void
646rxvt_color::fade (rxvt_screen *screen, int percent)
647{
648 rxvt_color faded;
649
650 rxvt_rgba c;
651 get (screen, c);
652
653 c.r = lerp (0, c.r, percent);
654 c.g = lerp (0, c.g, percent);
655 c.b = lerp (0, c.b, percent);
656
657 faded.set (screen, c);
658
659 return faded;
660}
661
662rxvt_color
663rxvt_color::fade (rxvt_screen *screen, int percent, rxvt_color &fadeto) 911rxvt_color::fade (rxvt_screen *screen, int percent, rxvt_color &result, const rgba &to)
664{ 912{
665 rxvt_rgba c, fc; 913 rgba c;
666 rxvt_color faded; 914 get (c);
667
668 get (screen, c);
669 fadeto.get (screen, fc);
670 915
671 faded.set ( 916 result.set (
672 screen, 917 screen,
673 rxvt_rgba ( 918 rgba (
674 lerp (fc.r, c.r, percent), 919 lerp (c.r, to.r, percent),
675 lerp (fc.g, c.g, percent), 920 lerp (c.g, to.g, percent),
676 lerp (fc.b, c.b, percent), 921 lerp (c.b, to.b, percent),
677 lerp (fc.a, c.a, percent) 922 lerp (c.a, to.a, percent)
678 ) 923 )
679 ); 924 );
925}
680 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
681 return faded; 1030 return false;
682} 1031}
683 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