ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/rxvt-unicode/src/init.C
(Generate patch)

Comparing rxvt-unicode/src/init.C (file contents):
Revision 1.245 by ayin, Sun Jan 27 16:52:13 2008 UTC vs.
Revision 1.297 by sf-exg, Mon Aug 15 11:01:54 2011 UTC

… …
10 * Copyright (c) 1996 Chuck Blake <cblake@BBN.COM> 10 * Copyright (c) 1996 Chuck Blake <cblake@BBN.COM>
11 * Copyright (c) 1997 mj olesen <olesen@me.queensu.ca> 11 * Copyright (c) 1997 mj olesen <olesen@me.queensu.ca>
12 * Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de> 12 * Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de>
13 * Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com> 13 * Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com>
14 * - extensive modifications 14 * - extensive modifications
15 * Copyright (c) 2003-2008 Marc Lehmann <pcg@goof.com> 15 * Copyright (c) 2003-2008 Marc Lehmann <schmorp@schmorp.de>
16 * 16 *
17 * This program is free software; you can redistribute it and/or modify 17 * This program is free software; you can redistribute it and/or modify
18 * it under the terms of the GNU General Public License as published by 18 * it under the terms of the GNU General Public License as published by
19 * the Free Software Foundation; either version 2 of the License, or 19 * the Free Software Foundation; either version 2 of the License, or
20 * (at your option) any later version. 20 * (at your option) any later version.
… …
143 143
144 return rval; 144 return rval;
145} 145}
146#endif 146#endif
147 147
148const char *const def_colorName[] = 148static const char *const def_colorName[] =
149 { 149 {
150 COLOR_FOREGROUND, 150 COLOR_FOREGROUND,
151 COLOR_BACKGROUND, 151 COLOR_BACKGROUND,
152 /* low-intensity colors */ 152 /* low-intensity colors */
153 "rgb:00/00/00", // 0: black (Black) 153 "rgb:00/00/00", // 0: black (Black)
… …
174 "rgb:00/00/ff", // 4/12: bright blue (Blue) 174 "rgb:00/00/ff", // 4/12: bright blue (Blue)
175 "rgb:ff/00/ff", // 5/13: bright magenta (Magenta) 175 "rgb:ff/00/ff", // 5/13: bright magenta (Magenta)
176 "rgb:00/ff/ff", // 6/14: bright cyan (Cyan) 176 "rgb:00/ff/ff", // 6/14: bright cyan (Cyan)
177 "rgb:ff/ff/ff", // 7/15: bright white (White) 177 "rgb:ff/ff/ff", // 7/15: bright white (White)
178 178
179#if !USE_256_COLORS
179 // 88 xterm colours 180 // 88 xterm colours
180 "rgb:00/00/00", 181 "rgb:00/00/00",
181 "rgb:00/00/8b", 182 "rgb:00/00/8b",
182 "rgb:00/00/cd", 183 "rgb:00/00/cd",
183 "rgb:00/00/ff", 184 "rgb:00/00/ff",
… …
247 "rgb:8b/8b/8b", 248 "rgb:8b/8b/8b",
248 "rgb:a2/a2/a2", 249 "rgb:a2/a2/a2",
249 "rgb:b9/b9/b9", 250 "rgb:b9/b9/b9",
250 "rgb:d0/d0/d0", 251 "rgb:d0/d0/d0",
251 "rgb:e7/e7/e7", 252 "rgb:e7/e7/e7",
253#else
254 // 256 xterm colours
255 "rgb:00/00/00",
256 "rgb:00/00/5f",
257 "rgb:00/00/87",
258 "rgb:00/00/af",
259 "rgb:00/00/d7",
260 "rgb:00/00/ff",
261 "rgb:00/5f/00",
262 "rgb:00/5f/5f",
263 "rgb:00/5f/87",
264 "rgb:00/5f/af",
265 "rgb:00/5f/d7",
266 "rgb:00/5f/ff",
267 "rgb:00/87/00",
268 "rgb:00/87/5f",
269 "rgb:00/87/87",
270 "rgb:00/87/af",
271 "rgb:00/87/d7",
272 "rgb:00/87/ff",
273 "rgb:00/af/00",
274 "rgb:00/af/5f",
275 "rgb:00/af/87",
276 "rgb:00/af/af",
277 "rgb:00/af/d7",
278 "rgb:00/af/ff",
279 "rgb:00/d7/00",
280 "rgb:00/d7/5f",
281 "rgb:00/d7/87",
282 "rgb:00/d7/af",
283 "rgb:00/d7/d7",
284 "rgb:00/d7/ff",
285 "rgb:00/ff/00",
286 "rgb:00/ff/5f",
287 "rgb:00/ff/87",
288 "rgb:00/ff/af",
289 "rgb:00/ff/d7",
290 "rgb:00/ff/ff",
291 "rgb:5f/00/00",
292 "rgb:5f/00/5f",
293 "rgb:5f/00/87",
294 "rgb:5f/00/af",
295 "rgb:5f/00/d7",
296 "rgb:5f/00/ff",
297 "rgb:5f/5f/00",
298 "rgb:5f/5f/5f",
299 "rgb:5f/5f/87",
300 "rgb:5f/5f/af",
301 "rgb:5f/5f/d7",
302 "rgb:5f/5f/ff",
303 "rgb:5f/87/00",
304 "rgb:5f/87/5f",
305 "rgb:5f/87/87",
306 "rgb:5f/87/af",
307 "rgb:5f/87/d7",
308 "rgb:5f/87/ff",
309 "rgb:5f/af/00",
310 "rgb:5f/af/5f",
311 "rgb:5f/af/87",
312 "rgb:5f/af/af",
313 "rgb:5f/af/d7",
314 "rgb:5f/af/ff",
315 "rgb:5f/d7/00",
316 "rgb:5f/d7/5f",
317 "rgb:5f/d7/87",
318 "rgb:5f/d7/af",
319 "rgb:5f/d7/d7",
320 "rgb:5f/d7/ff",
321 "rgb:5f/ff/00",
322 "rgb:5f/ff/5f",
323 "rgb:5f/ff/87",
324 "rgb:5f/ff/af",
325 "rgb:5f/ff/d7",
326 "rgb:5f/ff/ff",
327 "rgb:87/00/00",
328 "rgb:87/00/5f",
329 "rgb:87/00/87",
330 "rgb:87/00/af",
331 "rgb:87/00/d7",
332 "rgb:87/00/ff",
333 "rgb:87/5f/00",
334 "rgb:87/5f/5f",
335 "rgb:87/5f/87",
336 "rgb:87/5f/af",
337 "rgb:87/5f/d7",
338 "rgb:87/5f/ff",
339 "rgb:87/87/00",
340 "rgb:87/87/5f",
341 "rgb:87/87/87",
342 "rgb:87/87/af",
343 "rgb:87/87/d7",
344 "rgb:87/87/ff",
345 "rgb:87/af/00",
346 "rgb:87/af/5f",
347 "rgb:87/af/87",
348 "rgb:87/af/af",
349 "rgb:87/af/d7",
350 "rgb:87/af/ff",
351 "rgb:87/d7/00",
352 "rgb:87/d7/5f",
353 "rgb:87/d7/87",
354 "rgb:87/d7/af",
355 "rgb:87/d7/d7",
356 "rgb:87/d7/ff",
357 "rgb:87/ff/00",
358 "rgb:87/ff/5f",
359 "rgb:87/ff/87",
360 "rgb:87/ff/af",
361 "rgb:87/ff/d7",
362 "rgb:87/ff/ff",
363 "rgb:af/00/00",
364 "rgb:af/00/5f",
365 "rgb:af/00/87",
366 "rgb:af/00/af",
367 "rgb:af/00/d7",
368 "rgb:af/00/ff",
369 "rgb:af/5f/00",
370 "rgb:af/5f/5f",
371 "rgb:af/5f/87",
372 "rgb:af/5f/af",
373 "rgb:af/5f/d7",
374 "rgb:af/5f/ff",
375 "rgb:af/87/00",
376 "rgb:af/87/5f",
377 "rgb:af/87/87",
378 "rgb:af/87/af",
379 "rgb:af/87/d7",
380 "rgb:af/87/ff",
381 "rgb:af/af/00",
382 "rgb:af/af/5f",
383 "rgb:af/af/87",
384 "rgb:af/af/af",
385 "rgb:af/af/d7",
386 "rgb:af/af/ff",
387 "rgb:af/d7/00",
388 "rgb:af/d7/5f",
389 "rgb:af/d7/87",
390 "rgb:af/d7/af",
391 "rgb:af/d7/d7",
392 "rgb:af/d7/ff",
393 "rgb:af/ff/00",
394 "rgb:af/ff/5f",
395 "rgb:af/ff/87",
396 "rgb:af/ff/af",
397 "rgb:af/ff/d7",
398 "rgb:af/ff/ff",
399 "rgb:d7/00/00",
400 "rgb:d7/00/5f",
401 "rgb:d7/00/87",
402 "rgb:d7/00/af",
403 "rgb:d7/00/d7",
404 "rgb:d7/00/ff",
405 "rgb:d7/5f/00",
406 "rgb:d7/5f/5f",
407 "rgb:d7/5f/87",
408 "rgb:d7/5f/af",
409 "rgb:d7/5f/d7",
410 "rgb:d7/5f/ff",
411 "rgb:d7/87/00",
412 "rgb:d7/87/5f",
413 "rgb:d7/87/87",
414 "rgb:d7/87/af",
415 "rgb:d7/87/d7",
416 "rgb:d7/87/ff",
417 "rgb:d7/af/00",
418 "rgb:d7/af/5f",
419 "rgb:d7/af/87",
420 "rgb:d7/af/af",
421 "rgb:d7/af/d7",
422 "rgb:d7/af/ff",
423 "rgb:d7/d7/00",
424 "rgb:d7/d7/5f",
425 "rgb:d7/d7/87",
426 "rgb:d7/d7/af",
427 "rgb:d7/d7/d7",
428 "rgb:d7/d7/ff",
429 "rgb:d7/ff/00",
430 "rgb:d7/ff/5f",
431 "rgb:d7/ff/87",
432 "rgb:d7/ff/af",
433 "rgb:d7/ff/d7",
434 "rgb:d7/ff/ff",
435 "rgb:ff/00/00",
436 "rgb:ff/00/5f",
437 "rgb:ff/00/87",
438 "rgb:ff/00/af",
439 "rgb:ff/00/d7",
440 "rgb:ff/00/ff",
441 "rgb:ff/5f/00",
442 "rgb:ff/5f/5f",
443 "rgb:ff/5f/87",
444 "rgb:ff/5f/af",
445 "rgb:ff/5f/d7",
446 "rgb:ff/5f/ff",
447 "rgb:ff/87/00",
448 "rgb:ff/87/5f",
449 "rgb:ff/87/87",
450 "rgb:ff/87/af",
451 "rgb:ff/87/d7",
452 "rgb:ff/87/ff",
453 "rgb:ff/af/00",
454 "rgb:ff/af/5f",
455 "rgb:ff/af/87",
456 "rgb:ff/af/af",
457 "rgb:ff/af/d7",
458 "rgb:ff/af/ff",
459 "rgb:ff/d7/00",
460 "rgb:ff/d7/5f",
461 "rgb:ff/d7/87",
462 "rgb:ff/d7/af",
463 "rgb:ff/d7/d7",
464 "rgb:ff/d7/ff",
465 "rgb:ff/ff/00",
466 "rgb:ff/ff/5f",
467 "rgb:ff/ff/87",
468 "rgb:ff/ff/af",
469 "rgb:ff/ff/d7",
470 "rgb:ff/ff/ff",
471 "rgb:08/08/08",
472 "rgb:12/12/12",
473 "rgb:1c/1c/1c",
474 "rgb:26/26/26",
475 "rgb:30/30/30",
476 "rgb:3a/3a/3a",
477 "rgb:44/44/44",
478 "rgb:4e/4e/4e",
479 "rgb:58/58/58",
480 "rgb:62/62/62",
481 "rgb:6c/6c/6c",
482 "rgb:76/76/76",
483 "rgb:80/80/80",
484 "rgb:8a/8a/8a",
485 "rgb:94/94/94",
486 "rgb:9e/9e/9e",
487 "rgb:a8/a8/a8",
488 "rgb:b2/b2/b2",
489 "rgb:bc/bc/bc",
490 "rgb:c6/c6/c6",
491 "rgb:d0/d0/d0",
492 "rgb:da/da/da",
493 "rgb:e4/e4/e4",
494 "rgb:ee/ee/ee",
495#endif
252 496
253#ifndef NO_CURSORCOLOR 497#ifndef NO_CURSORCOLOR
254 COLOR_CURSOR_BACKGROUND, 498 COLOR_CURSOR_BACKGROUND,
255 COLOR_CURSOR_FOREGROUND, 499 COLOR_CURSOR_FOREGROUND,
256#endif /* ! NO_CURSORCOLOR */ 500#endif /* ! NO_CURSORCOLOR */
… …
266#if ENABLE_FRILLS 510#if ENABLE_FRILLS
267 NULL, // Color_underline 511 NULL, // Color_underline
268#endif 512#endif
269#ifdef OPTION_HC 513#ifdef OPTION_HC
270 NULL, 514 NULL,
515 NULL,
271#endif 516#endif
272#ifdef HAVE_SCROLLBARS
273 COLOR_SCROLLBAR, 517 COLOR_SCROLLBAR,
274#endif
275#ifdef RXVT_SCROLLBAR 518#ifdef RXVT_SCROLLBAR
276 COLOR_SCROLLTROUGH, 519 COLOR_SCROLLTROUGH,
277#endif 520#endif
278#if ENABLE_TRANSPARENCY 521#if ENABLE_TRANSPARENCY
279 NULL, 522 NULL,
… …
295 ncol = 80; 538 ncol = 80;
296 nrow = 24; 539 nrow = 24;
297 int_bwidth = INTERNALBORDERWIDTH; 540 int_bwidth = INTERNALBORDERWIDTH;
298 ext_bwidth = EXTERNALBORDERWIDTH; 541 ext_bwidth = EXTERNALBORDERWIDTH;
299 lineSpace = LINESPACE; 542 lineSpace = LINESPACE;
543 letterSpace = LETTERSPACE;
300 saveLines = SAVELINES; 544 saveLines = SAVELINES;
301 545
302 refresh_type = SLOW_REFRESH; 546 refresh_type = SLOW_REFRESH;
303 547
304 oldcursor.row = oldcursor.col = -1; 548 oldcursor.row = oldcursor.col = -1;
… …
309 set_option (Opt_skipScroll); 553 set_option (Opt_skipScroll);
310 set_option (Opt_secondaryScreen); 554 set_option (Opt_secondaryScreen);
311 set_option (Opt_secondaryScroll); 555 set_option (Opt_secondaryScroll);
312 set_option (Opt_pastableTabs); 556 set_option (Opt_pastableTabs);
313 set_option (Opt_intensityStyles); 557 set_option (Opt_intensityStyles);
558 set_option (Opt_iso14755);
314 set_option (Opt_iso14755_52); 559 set_option (Opt_iso14755_52);
315 set_option (Opt_buffered); 560 set_option (Opt_buffered);
316}
317
318static void
319init_secondary ()
320{
321 int i;
322
323 if ((i = open ("/dev/null", O_RDONLY)) < 0)
324 {
325 dup2 (STDERR_FILENO, STDIN_FILENO);
326 }
327 else if (i != STDIN_FILENO)
328 {
329 dup2 (i, STDIN_FILENO);
330 close (i);
331 }
332
333 dup2 (STDERR_FILENO, STDOUT_FILENO);
334} 561}
335 562
336/*----------------------------------------------------------------------*/ 563/*----------------------------------------------------------------------*/
337const char ** 564const char **
338rxvt_term::init_resources (int argc, const char *const *argv) 565rxvt_term::init_resources (int argc, const char *const *argv)
… …
394#if XFT 621#if XFT
395 if (rs[Rs_depth]) 622 if (rs[Rs_depth])
396 select_visual (strtol (rs[Rs_depth], 0, 0)); 623 select_visual (strtol (rs[Rs_depth], 0, 0));
397#endif 624#endif
398 625
399#ifdef HAVE_AFTERIMAGE
400 set_application_name ((char*)rs[Rs_name]);
401 set_output_threshold (OUTPUT_LEVEL_WARNING);
402 asv = create_asvisual_for_id (dpy, display->screen, depth, XVisualIDFromVisual (visual), cmap, NULL);
403#endif
404 free (r_argv); 626 free (r_argv);
405 627
406 for (int i = NUM_RESOURCES; i--; ) 628 for (int i = NUM_RESOURCES; i--; )
407 if (rs [i] == resval_undef) 629 if (rs [i] == resval_undef)
408 rs [i] = 0; 630 rs [i] = 0;
… …
425 */ 647 */
426 if (cmd_argv && cmd_argv[0]) 648 if (cmd_argv && cmd_argv[0])
427 { 649 {
428 if (!rs[Rs_title]) 650 if (!rs[Rs_title])
429 rs[Rs_title] = rxvt_basename (cmd_argv[0]); 651 rs[Rs_title] = rxvt_basename (cmd_argv[0]);
652
430 if (!rs[Rs_iconName]) 653 if (!rs[Rs_iconName])
431 rs[Rs_iconName] = rs[Rs_title]; 654 rs[Rs_iconName] = rs[Rs_title];
432 } 655 }
433 else 656 else
434 { 657 {
435 if (!rs[Rs_title]) 658 if (!rs[Rs_title])
436 rs[Rs_title] = rs[Rs_name]; 659 rs[Rs_title] = rs[Rs_name];
660
437 if (!rs[Rs_iconName]) 661 if (!rs[Rs_iconName])
438 rs[Rs_iconName] = rs[Rs_name]; 662 rs[Rs_iconName] = rs[Rs_name];
439 } 663 }
440 664
441 if (rs[Rs_saveLines] && (i = atoi (rs[Rs_saveLines])) >= 0) 665 if (rs[Rs_saveLines] && (i = atoi (rs[Rs_saveLines])) >= 0)
… …
448 if (rs[Rs_ext_bwidth] && (i = atoi (rs[Rs_ext_bwidth])) >= 0) 672 if (rs[Rs_ext_bwidth] && (i = atoi (rs[Rs_ext_bwidth])) >= 0)
449 ext_bwidth = min (i, std::numeric_limits<int16_t>::max ()); 673 ext_bwidth = min (i, std::numeric_limits<int16_t>::max ());
450 674
451 if (rs[Rs_lineSpace] && (i = atoi (rs[Rs_lineSpace])) >= 0) 675 if (rs[Rs_lineSpace] && (i = atoi (rs[Rs_lineSpace])) >= 0)
452 lineSpace = min (i, std::numeric_limits<int16_t>::max ()); 676 lineSpace = min (i, std::numeric_limits<int16_t>::max ());
677
678 if (rs[Rs_letterSpace])
679 letterSpace = atoi (rs[Rs_letterSpace]);
453#endif 680#endif
454 681
455#ifdef POINTER_BLANK 682#ifdef POINTER_BLANK
456 if (rs[Rs_pointerBlankDelay] && (i = atoi (rs[Rs_pointerBlankDelay])) >= 0) 683 if (rs[Rs_pointerBlankDelay] && (i = atoi (rs[Rs_pointerBlankDelay])) >= 0)
457 pointerBlankDelay = i; 684 pointerBlankDelay = i;
… …
460#endif 687#endif
461 688
462 /* no point having a scrollbar without having any scrollback! */ 689 /* no point having a scrollbar without having any scrollback! */
463 if (!saveLines) 690 if (!saveLines)
464 set_option (Opt_scrollBar, 0); 691 set_option (Opt_scrollBar, 0);
465
466#ifdef PRINTPIPE
467 if (!rs[Rs_print_pipe])
468 rs[Rs_print_pipe] = PRINTPIPE;
469#endif
470 692
471 if (!rs[Rs_cutchars]) 693 if (!rs[Rs_cutchars])
472 rs[Rs_cutchars] = CUTCHARS; 694 rs[Rs_cutchars] = CUTCHARS;
473 695
474#ifndef NO_BACKSPACE_KEY 696#ifndef NO_BACKSPACE_KEY
… …
487# else 709# else
488 rs[Rs_delete_key] = "\033[3~"; 710 rs[Rs_delete_key] = "\033[3~";
489# endif 711# endif
490#endif 712#endif
491 713
492#ifdef HAVE_SCROLLBARS 714 scrollBar.setup (this);
493 setup_scrollbar (rs[Rs_scrollBar_align], rs[Rs_scrollstyle], rs[Rs_scrollBar_thickness]);
494#endif
495 715
496#ifdef XTERM_REVERSE_VIDEO 716#ifdef XTERM_REVERSE_VIDEO
497 /* this is how xterm implements reverseVideo */ 717 /* this is how xterm implements reverseVideo */
498 if (option (Opt_reverseVideo)) 718 if (option (Opt_reverseVideo))
499 { 719 {
… …
543{ 763{
544 this->envv = envv; 764 this->envv = envv;
545 765
546 SET_R (this); 766 SET_R (this);
547 set_locale (""); 767 set_locale ("");
548 set_environ (envv); // few things in X do not call setlocale :( 768 set_environ (envv); // a few things in X do not call setlocale :(
549 769
550 init_vars (); 770 init_vars ();
551
552 init_secondary ();
553 771
554 const char **cmd_argv = init_resources (argc, argv); 772 const char **cmd_argv = init_resources (argc, argv);
555 773
556#ifdef KEYSYM_RESOURCE 774#ifdef KEYSYM_RESOURCE
557 keyboard->register_done (); 775 keyboard->register_done ();
558#endif 776#endif
559 777
560#ifdef HAVE_SCROLLBARS 778 if (const char *path = rs[Rs_chdir])
779 if (*path) // ignored if empty
780 {
781 if (*path != '/')
782 rxvt_fatal ("specified shell working directory must start with a slash, aborting.\n");
783
784 if (chdir (path))
785 rxvt_fatal ("unable to change into specified shell working directory, aborting.\n");
786 }
787
561 if (option (Opt_scrollBar)) 788 if (option (Opt_scrollBar))
562 scrollBar.setIdle (); /* set existence for size calculations */ 789 scrollBar.state = STATE_IDLE; /* set existence for size calculations */
563#endif
564 790
565 pty = ptytty::create (); 791 pty = ptytty::create ();
566 792
567 create_windows (argc, argv); 793 create_windows (argc, argv);
568 794
569 init_xlocale (); 795 init_xlocale ();
570 796
571 scr_reset (); // initialize screen 797 scr_poweron (); // initialize screen
572 798
573#if 0 799#if 0
574 XSynchronize (dpy, True); 800 XSynchronize (dpy, True);
575#endif 801#endif
576 802
577#ifdef HAVE_SCROLLBARS
578 if (option (Opt_scrollBar)) 803 if (option (Opt_scrollBar))
579 resize_scrollbar (); /* create and map scrollbar */ 804 scrollBar.resize (); /* create and map scrollbar */
580#endif
581#ifdef HAVE_BG_PIXMAP 805#ifdef HAVE_BG_PIXMAP
582 { 806 {
583 bgPixmap.set_target (this); 807 bg_init ();
584 bgPixmap.invalidate ();
585 808
586#ifdef ENABLE_TRANSPARENCY 809#ifdef ENABLE_TRANSPARENCY
587 if (option (Opt_transparent)) 810 if (option (Opt_transparent))
588 { 811 {
589 bgPixmap.set_transparent (); 812 bg_set_transparent ();
590 813
591#ifdef HAVE_AFTERIMAGE
592 if (rs [Rs_blurradius]) 814 if (rs [Rs_blurradius])
593 bgPixmap.set_blur_radius (rs [Rs_blurradius]); 815 bg_set_blur (rs [Rs_blurradius]);
594#endif 816
595 if (ISSET_PIXCOLOR (Color_tint)) 817 if (ISSET_PIXCOLOR (Color_tint))
596 bgPixmap.set_tint (pix_colors_focused [Color_tint]); 818 bg_set_tint (pix_colors_focused [Color_tint]);
597 819
598 if (rs [Rs_shade]) 820 if (rs [Rs_shade])
599 bgPixmap.set_shade (rs [Rs_shade]); 821 bg_set_shade (rs [Rs_shade]);
600 822
601 bgPixmap.set_root_pixmap (); 823 bg_set_root_pixmap ();
602 XSelectInput (dpy, display->root, PropertyChangeMask); 824 XSelectInput (dpy, display->root, PropertyChangeMask);
603 rootwin_ev.start (display, display->root); 825 rootwin_ev.start (display, display->root);
604 } 826 }
605#endif 827#endif
606 828
… …
610 const char *p = rs[Rs_backgroundPixmap]; 832 const char *p = rs[Rs_backgroundPixmap];
611 833
612 if ((p = strchr (p, ';')) != 0) 834 if ((p = strchr (p, ';')) != 0)
613 { 835 {
614 p++; 836 p++;
615 bgPixmap.set_geometry (p); 837 bg_set_geometry (p);
616 } 838 }
617 else 839 else
618 bgPixmap.set_defaultGeometry (); 840 bg_set_default_geometry ();
619 841
620 if (bgPixmap.set_file (rs[Rs_backgroundPixmap])) 842 if (bg_set_file (rs[Rs_backgroundPixmap]))
621 if (!bgPixmap.window_position_sensitive ()) 843 if (!bg_window_position_sensitive ())
622 update_background (); 844 update_background ();
623 } 845 }
624#endif 846#endif
625 } 847 }
626#endif 848#endif
… …
643#if ENABLE_XEMBED 865#if ENABLE_XEMBED
644 if (rs[Rs_embed]) 866 if (rs[Rs_embed])
645 { 867 {
646 long info[2] = { 0, XEMBED_MAPPED }; 868 long info[2] = { 0, XEMBED_MAPPED };
647 869
648 XChangeProperty (dpy, parent[0], xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO], 870 XChangeProperty (dpy, parent, xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
649 32, PropModeReplace, (unsigned char *)&info, 2); 871 32, PropModeReplace, (unsigned char *)&info, 2);
650 } 872 }
651#endif 873#endif
652 874
653 XMapWindow (dpy, vt); 875 XMapWindow (dpy, vt);
654 XMapWindow (dpy, parent[0]); 876 XMapWindow (dpy, parent);
655 877
656 refresh_check (); 878 refresh_check ();
657} 879}
658 880
659/*----------------------------------------------------------------------*/ 881/*----------------------------------------------------------------------*/
660void 882void
661rxvt_term::init_env () 883rxvt_term::init_env ()
662{ 884{
663 int i;
664 char *val; 885 char *val;
665 886
666#ifdef DISPLAY_IS_IP 887#ifdef DISPLAY_IS_IP
667 /* Fixup display_name for export over pty to any interested terminal 888 /* Fixup display_name for export over pty to any interested terminal
668 * clients via "ESC[7n" (e.g. shells). Note we use the pure IP number 889 * clients via "ESC[7n" (e.g. shells). Note we use the pure IP number
… …
682 val = XDisplayString (dpy); 903 val = XDisplayString (dpy);
683 904
684 if (rs[Rs_display_name] == NULL) 905 if (rs[Rs_display_name] == NULL)
685 rs[Rs_display_name] = val; /* use broken `:0' value */ 906 rs[Rs_display_name] = val; /* use broken `:0' value */
686 907
687 i = strlen (val);
688 env_display = (char *)rxvt_malloc (i + 9); 908 env_display = (char *)rxvt_malloc (strlen (val) + 9);
689 909
690 sprintf (env_display, "DISPLAY=%s", val); 910 sprintf (env_display, "DISPLAY=%s", val);
691 911
692 sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent[0]); 912 sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent);
693 913
694 /* add entries to the environment: 914 /* add entries to the environment:
695 * @ DISPLAY: in case we started with -display 915 * @ DISPLAY: in case we started with -display
696 * @ WINDOWID: X window id number of the window 916 * @ WINDOWID: X window id number of the window
697 * @ COLORTERM: terminal sub-name and also indicates its color 917 * @ COLORTERM: terminal sub-name and also indicates its color
… …
840 run_command (argv); 1060 run_command (argv);
841} 1061}
842 1062
843/*----------------------------------------------------------------------*/ 1063/*----------------------------------------------------------------------*/
844void 1064void
845rxvt_term::Get_Colours () 1065rxvt_term::get_colours ()
846{ 1066{
847 int i; 1067 int i;
848 1068
849#ifdef OFF_FOCUS_FADING 1069#ifdef OFF_FOCUS_FADING
850 pix_colors = pix_colors_focused; 1070 pix_colors = pix_colors_focused;
… …
1050 1270
1051 if (i) 1271 if (i)
1052 ModMetaMask = modmasks[i - 1]; 1272 ModMetaMask = modmasks[i - 1];
1053} 1273}
1054 1274
1275void
1276rxvt_term::set_icon (const char *file)
1277{
1278#ifdef HAVE_AFTERIMAGE
1279 init_asv ();
1280
1281 ASImage *im = file2ASImage (file, 0xFFFFFFFF, SCREEN_GAMMA, 0, NULL);
1282 if (!im)
1283 {
1284 rxvt_warn ("Loading image icon failed, continuing without.\n");
1285 return;
1286 }
1287
1288 unsigned int w = im->width;
1289 unsigned int h = im->height;
1290
1291 if (!IN_RANGE_INC (w, 1, 16383) || !IN_RANGE_INC (h, 1, 16383))
1292 {
1293 rxvt_warn ("Icon image too big, continuing without.\n");
1294 destroy_asimage (&im);
1295 return;
1296 }
1297
1298 ASImage *result = scale_asimage (asv, im,
1299 w, h, ASA_ARGB32,
1300 100, ASIMAGE_QUALITY_DEFAULT);
1301 destroy_asimage (&im);
1302
1303 if (!result)
1304 {
1305 rxvt_warn ("Icon image transformation to ARGB failed, continuing without.\n");
1306 return;
1307 }
1308
1309 long *buffer = (long *)malloc ((2 + w * h) * sizeof (long));
1310 if (buffer)
1311 {
1312 ARGB32 *asbuf = result->alt.argb32;
1313 buffer [0] = w;
1314 buffer [1] = h;
1315
1316 for (unsigned int i = 0; i < w * h; ++i)
1317 buffer [i + 2] = asbuf [i];
1318
1319 XChangeProperty (dpy, parent, xa[XA_NET_WM_ICON], XA_CARDINAL, 32,
1320 PropModeReplace, (const unsigned char *) buffer, 2 + w * h);
1321 free (buffer);
1322 }
1323 else
1324 rxvt_warn ("Memory allocation for icon hint failed, continuing without.\n");
1325
1326 destroy_asimage (&result);
1327#endif
1328
1329#ifdef HAVE_PIXBUF
1330 GdkPixbuf *pixbuf = gdk_pixbuf_new_from_file (file, NULL);
1331 if (!pixbuf)
1332 {
1333 rxvt_warn ("Loading image icon failed, continuing without.\n");
1334 return;
1335 }
1336
1337 unsigned int w = gdk_pixbuf_get_width (pixbuf);
1338 unsigned int h = gdk_pixbuf_get_height (pixbuf);
1339
1340 if (!IN_RANGE_INC (w, 1, 16383) || !IN_RANGE_INC (h, 1, 16383))
1341 {
1342 rxvt_warn ("Icon image too big, continuing without.\n");
1343 g_object_unref (pixbuf);
1344 return;
1345 }
1346
1347 if (long *buffer = (long *)malloc ((2 + w * h) * sizeof (long)))
1348 {
1349 int rowstride = gdk_pixbuf_get_rowstride (pixbuf);
1350 unsigned char *row = gdk_pixbuf_get_pixels (pixbuf);
1351 int channels = gdk_pixbuf_get_n_channels (pixbuf);
1352
1353 buffer [0] = w;
1354 buffer [1] = h;
1355 for (int i = 0; i < h; i++)
1356 {
1357 for (int j = 0; j < w; j++)
1358 {
1359 unsigned char *pixel = row + j * channels;
1360 long value;
1361
1362 if (channels == 4)
1363 value = pixel[3];
1364 else
1365 value = (unsigned char)0x00ff;
1366
1367 value = (value << 8) + pixel[0];
1368 value = (value << 8) + pixel[1];
1369 value = (value << 8) + pixel[2];
1370 buffer[(i * w + j) + 2] = value;
1371 }
1372
1373 row += rowstride;
1374 }
1375
1376 XChangeProperty (dpy, parent, xa[XA_NET_WM_ICON], XA_CARDINAL, 32,
1377 PropModeReplace, (const unsigned char *) buffer, 2 + w * h);
1378 free (buffer);
1379 }
1380 else
1381 rxvt_warn ("Memory allocation for icon hint failed, continuing without.\n");
1382
1383 g_object_unref (pixbuf);
1384#endif
1385}
1386
1055/*----------------------------------------------------------------------*/ 1387/*----------------------------------------------------------------------*/
1056/* rxvt_Create_Windows () - Open and map the window */ 1388/* Open and map the window */
1057void 1389void
1058rxvt_term::create_windows (int argc, const char *const *argv) 1390rxvt_term::create_windows (int argc, const char *const *argv)
1059{ 1391{
1060 XClassHint classHint; 1392 XClassHint classHint;
1061 XWMHints wmHint; 1393 XWMHints wmHint;
… …
1067 Window top, parent; 1399 Window top, parent;
1068 1400
1069 dLocal (Display *, dpy); 1401 dLocal (Display *, dpy);
1070 1402
1071 /* grab colors before netscape does */ 1403 /* grab colors before netscape does */
1072 Get_Colours (); 1404 get_colours ();
1073 1405
1074 if (!set_fonts ()) 1406 if (!set_fonts ())
1075 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n"); 1407 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n");
1076 1408
1077 parent = display->root; 1409 parent = display->root;
… …
1107 } 1439 }
1108#endif 1440#endif
1109 1441
1110 window_calc (0, 0); 1442 window_calc (0, 0);
1111 1443
1112 /* sub-window placement & size in rxvt_resize_subwindows () */ 1444 /* sub-window placement & size in rxvt_term::resize_all_windows () */
1113 attributes.background_pixel = pix_colors_focused [Color_border]; 1445 attributes.background_pixel = pix_colors_focused [Color_border];
1114 attributes.border_pixel = pix_colors_focused [Color_border]; 1446 attributes.border_pixel = pix_colors_focused [Color_border];
1115 attributes.colormap = cmap; 1447 attributes.colormap = cmap;
1116 1448
1117 top = XCreateWindow (dpy, parent, 1449 top = XCreateWindow (dpy, parent,
… …
1120 ext_bwidth, 1452 ext_bwidth,
1121 depth, InputOutput, visual, 1453 depth, InputOutput, visual,
1122 CWColormap | CWBackPixel | CWBorderPixel | CWOverrideRedirect, 1454 CWColormap | CWBackPixel | CWBorderPixel | CWOverrideRedirect,
1123 &attributes); 1455 &attributes);
1124 1456
1125 this->parent[0] = top; 1457 this->parent = top;
1126 1458
1127 old_width = szHint.width; 1459 old_width = szHint.width;
1128 old_height = szHint.height; 1460 old_height = szHint.height;
1129 1461
1130 process_xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST); 1462 set_title (rs [Rs_title]);
1131 process_xterm_seq (XTerm_iconName, rs[Rs_iconName], CHAR_ST); 1463 set_icon_name (rs [Rs_iconName]);
1132 1464
1133 classHint.res_name = (char *)rs[Rs_name]; 1465 classHint.res_name = (char *)rs[Rs_name];
1134 classHint.res_class = (char *)RESCLASS; 1466 classHint.res_class = (char *)RESCLASS;
1135 1467
1136 wmHint.flags = InputHint | StateHint | WindowGroupHint; 1468 wmHint.flags = InputHint | StateHint | WindowGroupHint;
… …
1138 wmHint.initial_state = option (Opt_iconic) ? IconicState : NormalState; 1470 wmHint.initial_state = option (Opt_iconic) ? IconicState : NormalState;
1139 wmHint.window_group = top; 1471 wmHint.window_group = top;
1140 1472
1141 XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc, 1473 XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc,
1142 &szHint, &wmHint, &classHint); 1474 &szHint, &wmHint, &classHint);
1475#if ENABLE_EWMH
1476 /*
1477 * set up icon hint
1478 * rs [Rs_iconfile] is path to icon
1479 */
1480
1481 if (rs [Rs_iconfile])
1482 {
1483 set_icon (rs [Rs_iconfile]);
1484 }
1485#endif
1143 1486
1144#if ENABLE_FRILLS 1487#if ENABLE_FRILLS
1145 if (mwmhints.flags) 1488 if (mwmhints.flags)
1146 XChangeProperty (dpy, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32, 1489 XChangeProperty (dpy, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32,
1147 PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS); 1490 PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS);
… …
1152#if ENABLE_EWMH 1495#if ENABLE_EWMH
1153 xa[XA_NET_WM_PING], 1496 xa[XA_NET_WM_PING],
1154#endif 1497#endif
1155 }; 1498 };
1156 1499
1157 XSetWMProtocols (dpy, top, protocols, sizeof (protocols) / sizeof (protocols[0])); 1500 XSetWMProtocols (dpy, top, protocols, ecb_array_length (protocols));
1158 1501
1159#if ENABLE_FRILLS 1502#if ENABLE_FRILLS
1160 if (rs[Rs_transient_for]) 1503 if (rs[Rs_transient_for])
1161 XSetTransientForHint (dpy, top, (Window)strtol (rs[Rs_transient_for], 0, 0)); 1504 XSetTransientForHint (dpy, top, (Window)strtol (rs[Rs_transient_for], 0, 0));
1162#endif 1505#endif
… …
1223 pix_colors = pix_colors_unfocused; 1566 pix_colors = pix_colors_unfocused;
1224#endif 1567#endif
1225 1568
1226 pointer_unblank (); 1569 pointer_unblank ();
1227 scr_recolour (); 1570 scr_recolour ();
1228}
1229
1230/* ------------------------------------------------------------------------- *
1231 * GET TTY CURRENT STATE *
1232 * ------------------------------------------------------------------------- */
1233void
1234rxvt_get_ttymode (struct termios *tio, int erase)
1235{
1236 /*
1237 * standard System V termios interface
1238 */
1239 if (tcgetattr (STDIN_FILENO, tio) < 0)
1240 {
1241 // return error - use system defaults,
1242 // where possible, and zero elsewhere
1243 memset (tio, 0, sizeof (struct termios));
1244
1245 tio->c_cc[VINTR] = CINTR;
1246 tio->c_cc[VQUIT] = CQUIT;
1247 tio->c_cc[VERASE] = CERASE;
1248#ifdef VERASE2
1249 tio->c_cc[VERASE2] = CERASE2;
1250#endif
1251 tio->c_cc[VKILL] = CKILL;
1252 tio->c_cc[VSTART] = CSTART;
1253 tio->c_cc[VSTOP] = CSTOP;
1254 tio->c_cc[VSUSP] = CSUSP;
1255# ifdef VDSUSP
1256 tio->c_cc[VDSUSP] = CDSUSP;
1257# endif
1258# ifdef VREPRINT
1259 tio->c_cc[VREPRINT] = CRPRNT;
1260# endif
1261# ifdef VDISCRD
1262 tio->c_cc[VDISCRD] = CFLUSH;
1263# endif
1264# ifdef VWERSE
1265 tio->c_cc[VWERSE] = CWERASE;
1266# endif
1267# ifdef VLNEXT
1268 tio->c_cc[VLNEXT] = CLNEXT;
1269# endif
1270 }
1271
1272 tio->c_cc[VEOF] = CEOF;
1273 tio->c_cc[VEOL] = VDISABLE;
1274# ifdef VEOL2
1275 tio->c_cc[VEOL2] = VDISABLE;
1276# endif
1277# ifdef VSWTC
1278 tio->c_cc[VSWTC] = VDISABLE;
1279# endif
1280# ifdef VSWTCH
1281 tio->c_cc[VSWTCH] = VDISABLE;
1282# endif
1283# if VMIN != VEOF
1284 tio->c_cc[VMIN] = 1;
1285# endif
1286# if VTIME != VEOL
1287 tio->c_cc[VTIME] = 0;
1288# endif
1289
1290 if (erase != -1)
1291 tio->c_cc[VERASE] = (char)erase;
1292
1293 /* input modes */
1294 tio->c_iflag = (BRKINT | IGNPAR | ICRNL
1295# ifdef IMAXBEL
1296 | IMAXBEL
1297# endif
1298 | IXON);
1299
1300 /* output modes */
1301 tio->c_oflag = (OPOST | ONLCR);
1302
1303 /* control modes */
1304 tio->c_cflag = (CS8 | CREAD);
1305
1306 /* line discipline modes */
1307 tio->c_lflag = (ISIG | ICANON | IEXTEN | ECHO
1308# if defined (ECHOCTL) && defined (ECHOKE)
1309 | ECHOCTL | ECHOKE
1310# endif
1311 | ECHOE | ECHOK);
1312
1313 /*
1314 * Debugging
1315 */
1316#ifdef DEBUG_TTYMODE
1317 /* c_iflag bits */
1318 fprintf (stderr, "Input flags\n");
1319
1320 /* cpp token stringize doesn't work on all machines <sigh> */
1321# define FOO(flag,name) \
1322 if ((tio->c_iflag) & flag) \
1323 fprintf (stderr, "%s ", name)
1324
1325 /* c_iflag bits */
1326 FOO (IGNBRK, "IGNBRK");
1327 FOO (BRKINT, "BRKINT");
1328 FOO (IGNPAR, "IGNPAR");
1329 FOO (PARMRK, "PARMRK");
1330 FOO (INPCK, "INPCK");
1331 FOO (ISTRIP, "ISTRIP");
1332 FOO (INLCR, "INLCR");
1333 FOO (IGNCR, "IGNCR");
1334 FOO (ICRNL, "ICRNL");
1335 FOO (IXON, "IXON");
1336 FOO (IXOFF, "IXOFF");
1337# ifdef IUCLC
1338 FOO (IUCLC, "IUCLC");
1339# endif
1340# ifdef IXANY
1341 FOO (IXANY, "IXANY");
1342# endif
1343# ifdef IMAXBEL
1344 FOO (IMAXBEL, "IMAXBEL");
1345# endif
1346
1347 fprintf (stderr, "\n");
1348
1349# undef FOO
1350# define FOO(entry, name) \
1351 fprintf (stderr, "%-8s = %#04o\n", name, tio->c_cc [entry])
1352
1353 FOO (VINTR, "VINTR");
1354 FOO (VQUIT, "VQUIT");
1355 FOO (VERASE, "VERASE");
1356 FOO (VKILL, "VKILL");
1357 FOO (VEOF, "VEOF");
1358 FOO (VEOL, "VEOL");
1359# ifdef VEOL2
1360 FOO (VEOL2, "VEOL2");
1361# endif
1362# ifdef VSWTC
1363 FOO (VSWTC, "VSWTC");
1364# endif
1365# ifdef VSWTCH
1366 FOO (VSWTCH, "VSWTCH");
1367# endif
1368 FOO (VSTART, "VSTART");
1369 FOO (VSTOP, "VSTOP");
1370 FOO (VSUSP, "VSUSP");
1371# ifdef VDSUSP
1372 FOO (VDSUSP, "VDSUSP");
1373# endif
1374# ifdef VREPRINT
1375 FOO (VREPRINT, "VREPRINT");
1376# endif
1377# ifdef VDISCRD
1378 FOO (VDISCRD, "VDISCRD");
1379# endif
1380# ifdef VWERSE
1381 FOO (VWERSE, "VWERSE");
1382# endif
1383# ifdef VLNEXT
1384 FOO (VLNEXT, "VLNEXT");
1385# endif
1386
1387 fprintf (stderr, "\n");
1388# undef FOO
1389#endif /* DEBUG_TTYMODE */
1390} 1571}
1391 1572
1392/*----------------------------------------------------------------------*/ 1573/*----------------------------------------------------------------------*/
1393/* 1574/*
1394 * Run the command in a subprocess and return a file descriptor for the 1575 * Run the command in a subprocess and return a file descriptor for the
… …
1415 else 1596 else
1416#endif 1597#endif
1417 if (!pty->get ()) 1598 if (!pty->get ())
1418 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n"); 1599 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");
1419 1600
1420 int er; 1601 struct termios tio = def_tio;
1421 1602
1422#ifndef NO_BACKSPACE_KEY 1603#ifndef NO_BACKSPACE_KEY
1423 if (rs[Rs_backspace_key][0] && !rs[Rs_backspace_key][1]) 1604 if (rs[Rs_backspace_key][0] && !rs[Rs_backspace_key][1])
1424 er = rs[Rs_backspace_key][0]; 1605 tio.c_cc[VERASE] = rs[Rs_backspace_key][0];
1425 else if (strcmp (rs[Rs_backspace_key], "DEC") == 0) 1606 else if (strcmp (rs[Rs_backspace_key], "DEC") == 0)
1426 er = '\177'; /* the initial state anyway */ 1607 tio.c_cc[VERASE] = '\177'; /* the initial state anyway */
1427 else
1428#endif 1608#endif
1429 er = -1;
1430 1609
1431 rxvt_get_ttymode (&tio, er);
1432 /* init terminal attributes */ 1610 /* init terminal attributes */
1433 cfsetospeed (&tio, BAUDRATE); 1611 cfsetospeed (&tio, BAUDRATE);
1434 cfsetispeed (&tio, BAUDRATE); 1612 cfsetispeed (&tio, BAUDRATE);
1435 tcsetattr (pty->tty, TCSANOW, &tio); 1613 tcsetattr (pty->tty, TCSANOW, &tio);
1436 pty->set_utf8_mode (enc_utf8); 1614 pty->set_utf8_mode (enc_utf8);
… …
1523 signal (SIGQUIT, SIG_DFL); 1701 signal (SIGQUIT, SIG_DFL);
1524 signal (SIGCHLD, SIG_DFL); 1702 signal (SIGCHLD, SIG_DFL);
1525 signal (SIGHUP, SIG_DFL); 1703 signal (SIGHUP, SIG_DFL);
1526 signal (SIGPIPE, SIG_DFL); 1704 signal (SIGPIPE, SIG_DFL);
1527 /* 1705 /*
1528 * mimick login's behavior by disabling the job control signals 1706 * mimic login's behavior by disabling the job control signals
1529 * a shell that wants them can turn them back on 1707 * a shell that wants them can turn them back on
1530 */ 1708 */
1531#ifdef SIGTSTP 1709#ifdef SIGTSTP
1532 signal (SIGTSTP, SIG_IGN); 1710 signal (SIGTSTP, SIG_IGN);
1533 signal (SIGTTIN, SIG_IGN); 1711 signal (SIGTTIN, SIG_IGN);
1534 signal (SIGTTOU, SIG_IGN); 1712 signal (SIGTTOU, SIG_IGN);
1535#endif /* SIGTSTP */ 1713#endif /* SIGTSTP */
1536 1714
1537 // unblock signals (signals are blocked by iom.C
1538 sigset_t ss;
1539 sigemptyset (&ss);
1540 sigprocmask (SIG_SETMASK, &ss, 0);
1541
1542 /* command interpreter path */ 1715 /* command interpreter path */
1543 if (argv) 1716 if (argv)
1544 { 1717 {
1545# ifdef DEBUG_CMD 1718# ifdef DEBUG_CMD
1546 int i; 1719 int i;
… …
1557 const char *argv0, *shell; 1730 const char *argv0, *shell;
1558 1731
1559 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0') 1732 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0')
1560 shell = "/bin/sh"; 1733 shell = "/bin/sh";
1561 1734
1562 argv0 = (const char *)rxvt_basename (shell); 1735 argv0 = rxvt_basename (shell);
1563 1736
1564 if (option (Opt_loginShell)) 1737 if (option (Opt_loginShell))
1565 { 1738 {
1566 login = (char *)rxvt_malloc (strlen (argv0) + 2); 1739 login = (char *)rxvt_malloc (strlen (argv0) + 2);
1567 1740

Diff Legend

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