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.122 by root, Sun Dec 18 00:59:42 2005 UTC vs.
Revision 1.153 by root, Wed Jan 25 02:42:06 2006 UTC

… …
9 * - extensive modifications 9 * - extensive modifications
10 * Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com> 10 * Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com>
11 * - extensive modifications 11 * - extensive modifications
12 * Copyright (c) 1999 D J Hawkey Jr <hawkeyd@visi.com> 12 * Copyright (c) 1999 D J Hawkey Jr <hawkeyd@visi.com>
13 * - QNX support 13 * - QNX support
14 * Copyright (c) 2003-2004 Marc Lehmann <pcg@goof.com> 14 * Copyright (c) 2003-2006 Marc Lehmann <pcg@goof.com>
15 * 15 *
16 * This program is free software; you can redistribute it and/or modify 16 * This program is free software; you can redistribute it and/or modify
17 * it under the terms of the GNU General Public License as published by 17 * it under the terms of the GNU General Public License as published by
18 * the Free Software Foundation; either version 2 of the License, or 18 * the Free Software Foundation; either version 2 of the License, or
19 * (at your option) any later version. 19 * (at your option) any later version.
… …
34#include "../config.h" /* NECESSARY */ 34#include "../config.h" /* NECESSARY */
35#include "rxvt.h" /* NECESSARY */ 35#include "rxvt.h" /* NECESSARY */
36#include "rxvtutil.h" 36#include "rxvtutil.h"
37#include "init.h" 37#include "init.h"
38 38
39#include <limits>
40
39#include <csignal> 41#include <csignal>
40 42
41const char *const def_colorName[] = 43const char *const def_colorName[] =
42 { 44 {
43 COLOR_FOREGROUND, 45 COLOR_FOREGROUND,
44 COLOR_BACKGROUND, 46 COLOR_BACKGROUND,
45 /* low-intensity colors */ 47 /* low-intensity colors */
46 "Black", /* 0: black (#000000) */ 48 "Black", /* 0: black (#000000) */
47#ifndef NO_BRIGHTCOLOR
48 "Red3", /* 1: red (#CD0000) */ 49 "Red3", /* 1: red (#CD0000) */
49 "Green3", /* 2: green (#00CD00) */ 50 "Green3", /* 2: green (#00CD00) */
50 "Yellow3", /* 3: yellow (#CDCD00) */ 51 "Yellow3", /* 3: yellow (#CDCD00) */
51 "Blue3", /* 4: blue (#0000CD) */ 52 "Blue3", /* 4: blue (#0000CD) */
52 "Magenta3", /* 5: magenta (#CD00CD) */ 53 "Magenta3", /* 5: magenta (#CD00CD) */
… …
60# ifdef XTERM_COLORS 61# ifdef XTERM_COLORS
61 "Grey30", /* 8: bright black (#4D4D4D) */ 62 "Grey30", /* 8: bright black (#4D4D4D) */
62# else 63# else
63 "Grey25", /* 8: bright black (#404040) */ 64 "Grey25", /* 8: bright black (#404040) */
64# endif 65# endif
65#endif /* NO_BRIGHTCOLOR */
66 "Red", /* 1/9: bright red (#FF0000) */ 66 "Red", /* 1/9: bright red (#FF0000) */
67 "Green", /* 2/10: bright green (#00FF00) */ 67 "Green", /* 2/10: bright green (#00FF00) */
68 "Yellow", /* 3/11: bright yellow (#FFFF00) */ 68 "Yellow", /* 3/11: bright yellow (#FFFF00) */
69 "Blue", /* 4/12: bright blue (#0000FF) */ 69 "Blue", /* 4/12: bright blue (#0000FF) */
70 "Magenta", /* 5/13: bright magenta (#FF00FF) */ 70 "Magenta", /* 5/13: bright magenta (#FF00FF) */
… …
174#if OFF_FOCUS_FADING 174#if OFF_FOCUS_FADING
175 "black", 175 "black",
176#endif 176#endif
177 }; 177 };
178 178
179const char *const xa_names[] =
180 {
181 "TEXT",
182 "COMPOUND_TEXT",
183 "UTF8_STRING",
184 "MULTIPLE",
185 "TARGETS",
186 "TIMESTAMP",
187 "VT_SELECTION",
188 "INCR",
189 "WM_PROTOCOLS",
190 "WM_DELETE_WINDOW",
191 "CLIPBOARD",
192#if ENABLE_FRILLS
193 "_MOTIF_WM_HINTS",
194#endif
195#if ENABLE_EWMH
196 "_NET_WM_PID",
197 "_NET_WM_NAME",
198 "_NET_WM_ICON_NAME",
199 "_NET_WM_PING",
200#endif
201#if USE_XIM
202 "WM_LOCALE_NAME",
203#endif
204#ifdef TRANSPARENT
205 "_XROOTPMAP_ID",
206 "ESETROOT_PMAP_ID",
207#endif
208#ifdef OFFIX_DND
209 "DndProtocol",
210 "DndSelection",
211#endif
212#if ENABLE_XEMBED
213 "_XEMBED",
214 "_XEMBED_INFO",
215#endif
216 };
217
218bool 179bool
219rxvt_term::init_vars () 180rxvt_term::init_vars ()
220{ 181{
221 pix_colors_focused = new rxvt_color [TOTAL_COLORS]; 182 pix_colors_focused = new rxvt_color [TOTAL_COLORS];
222#ifdef OFF_FOCUS_FADING 183#ifdef OFF_FOCUS_FADING
… …
256 bgPixmap.pixmap = None; 217 bgPixmap.pixmap = None;
257#endif 218#endif
258 219
259 last_bot = last_state = -1; 220 last_bot = last_state = -1;
260 221
261#ifdef MENUBAR
262 menu_readonly = 1;
263# if ! (MENUBAR_MAX > 1)
264 CurrentBar = &BarList;
265# endif /* (MENUBAR_MAX > 1) */
266#endif
267
268 return true; 222 return true;
269} 223}
270 224
271void 225void
272rxvt_term::init_secondary () 226rxvt_term::init_secondary ()
… …
339 rs[Rs_name] = rxvt_r_basename (argv[0]); 293 rs[Rs_name] = rxvt_r_basename (argv[0]);
340 294
341 /* 295 /*
342 * Open display, get options/resources and create the window 296 * Open display, get options/resources and create the window
343 */ 297 */
298
344 if ((rs[Rs_display_name] = getenv ("DISPLAY")) == NULL) 299 if ((rs[Rs_display_name] = getenv ("DISPLAY")) == NULL)
345 rs[Rs_display_name] = ":0"; 300 rs[Rs_display_name] = ":0";
346 301
347 get_options (r_argc, r_argv); 302 get_options (r_argc, r_argv);
348 303
349 if (!(display = displays.get (rs[Rs_display_name]))) 304 if (!(display = displays.get (rs[Rs_display_name])))
350 rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]); 305 rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]);
351 306
352 extract_resources (); 307 extract_resources ();
308
353 free (r_argv); 309 free (r_argv);
310
311#if ENABLE_PERL
312 if (!rs[Rs_perl_ext_1])
313 rs[Rs_perl_ext_1] = "default";
314
315 if ((rs[Rs_perl_ext_1] && *rs[Rs_perl_ext_1])
316 || (rs[Rs_perl_ext_2] && *rs[Rs_perl_ext_2])
317 || (rs[Rs_perl_eval] && *rs[Rs_perl_eval]))
318 {
319 rxvt_perl.init (this);
320 HOOK_INVOKE ((this, HOOK_INIT, DT_END));
321 }
322#endif
354 323
355 /* 324 /*
356 * set any defaults not already set 325 * set any defaults not already set
357 */ 326 */
358 if (cmd_argv && cmd_argv[0]) 327 if (cmd_argv && cmd_argv[0])
… …
369 if (!rs[Rs_iconName]) 338 if (!rs[Rs_iconName])
370 rs[Rs_iconName] = rs[Rs_name]; 339 rs[Rs_iconName] = rs[Rs_name];
371 } 340 }
372 341
373 if (rs[Rs_saveLines] && (i = atoi (rs[Rs_saveLines])) >= 0) 342 if (rs[Rs_saveLines] && (i = atoi (rs[Rs_saveLines])) >= 0)
374 saveLines = BOUND_POSITIVE_INT16 (i); 343 saveLines = min (i, MAX_SAVELINES);
375 344
376#if ENABLE_FRILLS 345#if ENABLE_FRILLS
377 if (rs[Rs_int_bwidth] && (i = atoi (rs[Rs_int_bwidth])) >= 0) 346 if (rs[Rs_int_bwidth] && (i = atoi (rs[Rs_int_bwidth])) >= 0)
378 int_bwidth = min (i, 100); /* arbitrary limit */ 347 int_bwidth = min (i, std::numeric_limits<int16_t>::max ());
348
379 if (rs[Rs_ext_bwidth] && (i = atoi (rs[Rs_ext_bwidth])) >= 0) 349 if (rs[Rs_ext_bwidth] && (i = atoi (rs[Rs_ext_bwidth])) >= 0)
380 ext_bwidth = min (i, 100); /* arbitrary limit */ 350 ext_bwidth = min (i, std::numeric_limits<int16_t>::max ());
351
381 if (rs[Rs_lineSpace] && (i = atoi (rs[Rs_lineSpace])) >= 0) 352 if (rs[Rs_lineSpace] && (i = atoi (rs[Rs_lineSpace])) >= 0)
382 lineSpace = min (i, 100); /* arbitrary limit */ 353 lineSpace = min (i, std::numeric_limits<int16_t>::max ());
383#endif 354#endif
384 355
385#ifdef POINTER_BLANK 356#ifdef POINTER_BLANK
386 if (rs[Rs_pointerBlankDelay] && (i = atoi (rs[Rs_pointerBlankDelay])) >= 0) 357 if (rs[Rs_pointerBlankDelay] && (i = atoi (rs[Rs_pointerBlankDelay])) >= 0)
387 pointerBlankDelay = i; 358 pointerBlankDelay = i;
… …
389 pointerBlankDelay = 2; 360 pointerBlankDelay = 2;
390#endif 361#endif
391 362
392 /* no point having a scrollbar without having any scrollback! */ 363 /* no point having a scrollbar without having any scrollback! */
393 if (!saveLines) 364 if (!saveLines)
394 options &= ~Opt_scrollBar; 365 set_option (Opt_scrollBar, 0);
395 366
396#ifdef PRINTPIPE 367#ifdef PRINTPIPE
397 if (!rs[Rs_print_pipe]) 368 if (!rs[Rs_print_pipe])
398 rs[Rs_print_pipe] = PRINTPIPE; 369 rs[Rs_print_pipe] = PRINTPIPE;
399#endif 370#endif
… …
442 setup_scrollbar (rs[Rs_scrollBar_align], rs[Rs_scrollstyle], rs[Rs_scrollBar_thickness]); 413 setup_scrollbar (rs[Rs_scrollBar_align], rs[Rs_scrollstyle], rs[Rs_scrollBar_thickness]);
443#endif 414#endif
444 415
445#ifdef XTERM_REVERSE_VIDEO 416#ifdef XTERM_REVERSE_VIDEO
446 /* this is how xterm implements reverseVideo */ 417 /* this is how xterm implements reverseVideo */
447 if (options & Opt_reverseVideo) 418 if (OPTION (Opt_reverseVideo))
448 { 419 {
449 if (!rs[Rs_color + Color_fg]) 420 if (!rs[Rs_color + Color_fg])
450 rs[Rs_color + Color_fg] = def_colorName[Color_bg]; 421 rs[Rs_color + Color_fg] = def_colorName[Color_bg];
451 if (!rs[Rs_color + Color_bg]) 422 if (!rs[Rs_color + Color_bg])
452 rs[Rs_color + Color_bg] = def_colorName[Color_fg]; 423 rs[Rs_color + Color_bg] = def_colorName[Color_fg];
… …
457 if (!rs[Rs_color + i]) 428 if (!rs[Rs_color + i])
458 rs[Rs_color + i] = def_colorName[i]; 429 rs[Rs_color + i] = def_colorName[i];
459 430
460#ifndef XTERM_REVERSE_VIDEO 431#ifndef XTERM_REVERSE_VIDEO
461 /* this is how we implement reverseVideo */ 432 /* this is how we implement reverseVideo */
462 if (options & Opt_reverseVideo) 433 if (OPTION (Opt_reverseVideo))
463 SWAP_IT (rs[Rs_color + Color_fg], rs[Rs_color + Color_bg], const char *); 434 ::swap (rs[Rs_color + Color_fg], rs[Rs_color + Color_bg]);
464#endif 435#endif
465 436
466 /* convenient aliases for setting fg/bg to colors */ 437 /* convenient aliases for setting fg/bg to colors */
467 color_aliases (Color_fg); 438 color_aliases (Color_fg);
468 color_aliases (Color_bg); 439 color_aliases (Color_bg);
… …
521 492
522 /* avoiding the math library: 493 /* avoiding the math library:
523 * i = (int) (ceil (log10 ((unsigned int)parent[0]))) */ 494 * i = (int) (ceil (log10 ((unsigned int)parent[0]))) */
524 for (i = 0, u = (unsigned int)parent[0]; u; u /= 10, i++) 495 for (i = 0, u = (unsigned int)parent[0]; u; u /= 10, i++)
525 ; 496 ;
526 MAX_IT (i, 1); 497 max_it (i, 1);
527 env_windowid = (char *)rxvt_malloc ((i + 10) * sizeof (char)); 498 env_windowid = (char *)rxvt_malloc ((i + 10) * sizeof (char));
528 499
529 sprintf (env_windowid, "WINDOWID=%u", 500 sprintf (env_windowid, "WINDOWID=%u",
530 (unsigned int)parent[0]); 501 (unsigned int)parent[0]);
531 502
… …
574 * This should support all European type languages. 545 * This should support all European type languages.
575 */ 546 */
576void 547void
577rxvt_term::set_locale (const char *locale) 548rxvt_term::set_locale (const char *locale)
578{ 549{
550 set_environ (envv);
551
579#if HAVE_XSETLOCALE || HAVE_SETLOCALE 552#if HAVE_XSETLOCALE || HAVE_SETLOCALE
580 free (this->locale); 553 free (this->locale);
581 this->locale = setlocale (LC_CTYPE, locale); 554 this->locale = setlocale (LC_CTYPE, locale);
582 555
583 if (!this->locale) 556 if (!this->locale)
584 { 557 {
585 if (*locale) 558 if (*locale)
586 { 559 {
587 rxvt_warn ("unable to set locale \"%s\", using default locale instead.\n", locale); 560 rxvt_warn ("unable to set locale \"%s\", using C locale instead.\n", locale);
588 setlocale (LC_CTYPE, ""); 561 setlocale (LC_CTYPE, "C");
589 } 562 }
590 else 563 else
591 rxvt_warn ("default locale unavailable, check LC_* and LANG variables. Continuing.\n"); 564 rxvt_warn ("default locale unavailable, check LC_* and LANG variables. Continuing.\n");
592 565
593 this->locale = ""; 566 this->locale = "C";
594 } 567 }
595 568
596 569
597 this->locale = rxvt_strdup (this->locale); 570 this->locale = rxvt_strdup (this->locale);
598 SET_LOCALE (this->locale); 571 SET_LOCALE (this->locale);
… …
613} 586}
614 587
615void 588void
616rxvt_term::init_xlocale () 589rxvt_term::init_xlocale ()
617{ 590{
591 set_environ (envv);
592
618#ifdef USE_XIM 593#ifdef USE_XIM
619 if (!locale) 594 if (!locale)
620 rxvt_warn ("setting locale failed, working without locale support.\n"); 595 rxvt_warn ("setting locale failed, working without locale support.\n");
621 else 596 else
622 { 597 {
… …
644 * Initialize the command connection. 619 * Initialize the command connection.
645 * This should be called after the X server connection is established. 620 * This should be called after the X server connection is established.
646 */ 621 */
647 622
648#ifdef META8_OPTION 623#ifdef META8_OPTION
649 meta_char = (options & Opt_meta8 ? 0x80 : C0_ESC); 624 meta_char = OPTION (Opt_meta8) ? 0x80 : C0_ESC;
650#endif 625#endif
651 626
652 get_ourmods (); 627 get_ourmods ();
653 628
654 if (!(options & Opt_scrollTtyOutput)) 629 if (!OPTION (Opt_scrollTtyOutput))
655 priv_modes |= PrivMode_TtyOutputInh; 630 priv_modes |= PrivMode_TtyOutputInh;
656 if (options & Opt_scrollTtyKeypress) 631 if (OPTION (Opt_scrollTtyKeypress))
657 priv_modes |= PrivMode_Keypress; 632 priv_modes |= PrivMode_Keypress;
658 if (!(options & Opt_jumpScroll)) 633 if (!OPTION (Opt_jumpScroll))
659 priv_modes |= PrivMode_smoothScroll; 634 priv_modes |= PrivMode_smoothScroll;
660 635
661#ifndef NO_BACKSPACE_KEY 636#ifndef NO_BACKSPACE_KEY
662 if (strcmp (key_backspace, "DEC") == 0) 637 if (strcmp (key_backspace, "DEC") == 0)
663 priv_modes |= PrivMode_HaveBackSpace; 638 priv_modes |= PrivMode_HaveBackSpace;
664#endif 639#endif
665 640
666 /* add value for scrollBar */ 641 /* add value for scrollBar */
667 if (scrollbar_visible ()) 642 if (scrollBar.state)
668 { 643 {
669 priv_modes |= PrivMode_scrollBar; 644 priv_modes |= PrivMode_scrollBar;
670 SavedModes |= PrivMode_scrollBar; 645 SavedModes |= PrivMode_scrollBar;
671 } 646 }
672
673 if (menubar_visible ())
674 {
675 priv_modes |= PrivMode_menuBar;
676 SavedModes |= PrivMode_menuBar;
677 }
678
679#ifdef CURSOR_BLINK
680 if (options & Opt_cursorBlink)
681 (void)gettimeofday (&lastcursorchange, NULL);
682#endif
683 647
684 run_command (argv); 648 run_command (argv);
685} 649}
686 650
687/*----------------------------------------------------------------------*/ 651/*----------------------------------------------------------------------*/
… …
702 continue; 666 continue;
703 667
704 if (!rXParseAllocColor (&xcol, rs[Rs_color + i])) 668 if (!rXParseAllocColor (&xcol, rs[Rs_color + i]))
705 { 669 {
706#ifndef XTERM_REVERSE_VIDEO 670#ifndef XTERM_REVERSE_VIDEO
707 if (i < 2 && (options & Opt_reverseVideo)) 671 if (i < 2 && OPTION (Opt_reverseVideo))
708 rs[Rs_color + i] = def_colorName[!i]; 672 rs[Rs_color + i] = def_colorName[!i];
709 else 673 else
710#endif 674#endif
711 rs[Rs_color + i] = def_colorName[i]; 675 rs[Rs_color + i] = def_colorName[i];
712 676
… …
754 if (!rs[Rs_color + Color_pointer_bg]) pix_colors[Color_pointer_bg] = pix_colors[Color_bg]; 718 if (!rs[Rs_color + Color_pointer_bg]) pix_colors[Color_pointer_bg] = pix_colors[Color_bg];
755 if (!rs[Rs_color + Color_border] ) pix_colors[Color_border] = pix_colors[Color_fg]; 719 if (!rs[Rs_color + Color_border] ) pix_colors[Color_border] = pix_colors[Color_fg];
756 } 720 }
757 721
758 /* 722 /*
759 * get scrollBar/menuBar shadow colors 723 * get scrollBar shadow colors
760 * 724 *
761 * The calculations of topShadow/bottomShadow values are adapted 725 * The calculations of topShadow/bottomShadow values are adapted
762 * from the fvwm window manager. 726 * from the fvwm window manager.
763 */ 727 */
764#ifdef KEEP_SCROLLCOLOR 728#ifdef KEEP_SCROLLCOLOR
… …
809 int i = atoi (rs[Rs_color + idx]); 773 int i = atoi (rs[Rs_color + idx]);
810 774
811 if (i >= 8 && i <= 15) 775 if (i >= 8 && i <= 15)
812 { /* bright colors */ 776 { /* bright colors */
813 i -= 8; 777 i -= 8;
814#ifndef NO_BRIGHTCOLOR
815 rs[Rs_color + idx] = rs[Rs_color + minBrightCOLOR + i]; 778 rs[Rs_color + idx] = rs[Rs_color + minBrightCOLOR + i];
816 return; 779 return;
817#endif
818 } 780 }
819 781
820 if (i >= 0 && i <= 7) /* normal colors */ 782 if (i >= 0 && i <= 7) /* normal colors */
821 rs[Rs_color + idx] = rs[Rs_color + minCOLOR + i]; 783 rs[Rs_color + idx] = rs[Rs_color + minCOLOR + i];
822 } 784 }
… …
917rxvt_term::create_windows (int argc, const char *const *argv) 879rxvt_term::create_windows (int argc, const char *const *argv)
918{ 880{
919 XClassHint classHint; 881 XClassHint classHint;
920 XWMHints wmHint; 882 XWMHints wmHint;
921#if ENABLE_FRILLS 883#if ENABLE_FRILLS
922 Atom prop = None;
923 MWMHints mwmhints; 884 MWMHints mwmhints;
924#endif 885#endif
925 XGCValues gcvalue; 886 XGCValues gcvalue;
926 long vt_emask;
927 XSetWindowAttributes attributes; 887 XSetWindowAttributes attributes;
928 XWindowAttributes gattr;
929 Window top, parent; 888 Window top, parent;
930 dDisp; 889 dDisp;
931 890
932#ifdef USING_W11LIB 891 xa = display->xa;
933 /* enable W11 callbacks */
934 W11AddEventHandler (disp, rxvt_W11_process_x_event);
935#endif
936 892
937 assert (sizeof (xa_names) / sizeof (char *) == NUM_XA); 893 /* grab colors before netscape does */
938 XInternAtoms (disp, (char **)xa_names, NUM_XA, False, xa); 894 Get_Colours ();
939 895
940 if (options & Opt_transparent) 896 if (!set_fonts ())
941 { 897 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n");
942 XGetWindowAttributes (disp, RootWindow (disp, display->screen), &gattr); 898
943 display->depth = gattr.depth; // doh //TODO, per-term not per-display? 899 parent = display->root;
944 } 900
901 attributes.override_redirect = !!OPTION (Opt_override_redirect);
945 902
946#if ENABLE_FRILLS 903#if ENABLE_FRILLS
947 if (options & Opt_borderLess) 904 if (OPTION (Opt_borderLess))
948 { 905 {
949 prop = XInternAtom(disp, "_MOTIF_WM_INFO", True); 906 if (XInternAtom (disp, "_MOTIF_WM_INFO", True) == None)
950
951 if (prop == None)
952 { 907 {
953 /* print_warning("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n");*/ 908 /* print_warning("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n");*/
954#ifdef PREFER_24BIT
955 attributes.override_redirect = TRUE; 909 attributes.override_redirect = TRUE;
956#endif
957 mwmhints.flags = 0; 910 mwmhints.flags = 0;
958 } 911 }
959 else 912 else
960 { 913 {
961 mwmhints.flags = MWM_HINTS_DECORATIONS; 914 mwmhints.flags = MWM_HINTS_DECORATIONS;
… …
964 } 917 }
965 else 918 else
966 mwmhints.flags = 0; 919 mwmhints.flags = 0;
967#endif 920#endif
968 921
969 /* grab colors before netscape does */
970 Get_Colours ();
971
972 if (!set_fonts ())
973 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n");
974
975 parent = DefaultRootWindow (disp);
976
977#if ENABLE_XEMBED 922#if ENABLE_XEMBED
978 if (rs[Rs_embed]) 923 if (rs[Rs_embed])
979 { 924 {
980 XWindowAttributes wattr; 925 XWindowAttributes wattr;
981 926
… …
989#endif 934#endif
990 935
991 window_calc (0, 0); 936 window_calc (0, 0);
992 937
993 /* sub-window placement & size in rxvt_resize_subwindows () */ 938 /* sub-window placement & size in rxvt_resize_subwindows () */
994#ifdef PREFER_24BIT
995 attributes.background_pixel = pix_colors_focused[Color_border]; 939 attributes.background_pixel = pix_colors_focused[Color_border];
996 attributes.border_pixel = pix_colors_focused[Color_border]; 940 attributes.border_pixel = pix_colors_focused[Color_border];
997 attributes.colormap = display->cmap; 941 attributes.colormap = display->cmap;
942
998 top = XCreateWindow (disp, parent, 943 top = XCreateWindow (disp, parent,
999 szHint.x, szHint.y, 944 szHint.x, szHint.y,
1000 szHint.width, szHint.height, 945 szHint.width, szHint.height,
1001 ext_bwidth, 946 ext_bwidth,
1002 display->depth, InputOutput, 947 display->depth, InputOutput,
1003 display->visual, 948 display->visual,
1004 CWColormap | CWBackPixel | CWBorderPixel, &attributes); 949 CWColormap | CWBackPixel | CWBorderPixel | CWOverrideRedirect,
1005#else 950 &attributes);
1006 top = XCreateSimpleWindow (disp, parent,
1007 szHint.x, szHint.y,
1008 szHint.width, szHint.height,
1009 ext_bwidth,
1010 pix_colors_focused[Color_border],
1011 pix_colors_focused[Color_border]);
1012#endif
1013 951
1014 this->parent[0] = top; 952 this->parent[0] = top;
1015 953
1016 old_width = szHint.width; 954 old_width = szHint.width;
1017 old_height = szHint.height; 955 old_height = szHint.height;
1018 956
1019 process_xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST); 957 process_xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST);
1020 process_xterm_seq (XTerm_iconName, rs[Rs_iconName], CHAR_ST); 958 process_xterm_seq (XTerm_iconName, rs[Rs_iconName], CHAR_ST);
1021 959
1022 classHint.res_name = (char *)rs[Rs_name]; 960 classHint.res_name = (char *)rs[Rs_name];
1023 classHint.res_class = (char *)RESCLASS; 961 classHint.res_class = (char *)RESCLASS;
1024 962
1025 wmHint.flags = InputHint | StateHint | WindowGroupHint; 963 wmHint.flags = InputHint | StateHint | WindowGroupHint;
1026 wmHint.input = True; 964 wmHint.input = True;
1027 wmHint.initial_state = options & Opt_iconic ? IconicState : NormalState; 965 wmHint.initial_state = OPTION (Opt_iconic) ? IconicState : NormalState;
1028 wmHint.window_group = top; 966 wmHint.window_group = top;
1029 967
1030 XmbSetWMProperties (disp, top, NULL, NULL, (char **)argv, argc, 968 XmbSetWMProperties (disp, top, NULL, NULL, (char **)argv, argc,
1031 &szHint, &wmHint, &classHint); 969 &szHint, &wmHint, &classHint);
970
971#if ENABLE_FRILLS
972 if (mwmhints.flags)
973 XChangeProperty (disp, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32,
974 PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS);
975#endif
1032 976
1033 Atom protocols[] = { 977 Atom protocols[] = {
1034 xa[XA_WM_DELETE_WINDOW], 978 xa[XA_WM_DELETE_WINDOW],
1035#if ENABLE_EWMH 979#if ENABLE_EWMH
1036 xa[XA_NET_WM_PING], 980 xa[XA_NET_WM_PING],
1037#endif 981#endif
1038 }; 982 };
1039 983
1040 XSetWMProtocols (disp, top, protocols, sizeof (protocols) / sizeof (protocols[0])); 984 XSetWMProtocols (disp, top, protocols, sizeof (protocols) / sizeof (protocols[0]));
1041 985
986#if ENABLE_FRILLS
987 if (rs[Rs_transient_for])
988 XSetTransientForHint (disp, top, (Window)strtol (rs[Rs_transient_for], 0, 0));
989#endif
990
1042#if ENABLE_EWMH 991#if ENABLE_EWMH
1043 long pid = getpid (); 992 long pid = getpid ();
1044 993
1045 XChangeProperty (disp, top, 994 XChangeProperty (disp, top,
1046 xa[XA_NET_WM_PID], XA_CARDINAL, 32, 995 xa[XA_NET_WM_PID], XA_CARDINAL, 32,
… …
1057 | FocusChangeMask | VisibilityChangeMask 1006 | FocusChangeMask | VisibilityChangeMask
1058 | ExposureMask | StructureNotifyMask); 1007 | ExposureMask | StructureNotifyMask);
1059 1008
1060 termwin_ev.start (display, top); 1009 termwin_ev.start (display, top);
1061 1010
1062#if ENABLE_FRILLS
1063 if (mwmhints.flags)
1064 XChangeProperty (disp, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32,
1065 PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS);
1066#endif
1067
1068 /* vt cursor: Black-on-White is standard, but this is more popular */ 1011 /* vt cursor: Black-on-White is standard, but this is more popular */
1069 TermWin_cursor = XCreateFontCursor (disp, XC_xterm); 1012 TermWin_cursor = XCreateFontCursor (disp, XC_xterm);
1070 1013
1071#if defined(HAVE_SCROLLBARS) || defined(MENUBAR) 1014#ifdef HAVE_SCROLLBARS
1072 /* cursor (menuBar/scrollBar): Black-on-White */ 1015 /* cursor scrollBar: Black-on-White */
1073 leftptr_cursor = XCreateFontCursor (disp, XC_left_ptr); 1016 leftptr_cursor = XCreateFontCursor (disp, XC_left_ptr);
1074#endif 1017#endif
1075 1018
1076 /* the vt window */ 1019 /* the vt window */
1077 vt = XCreateSimpleWindow (disp, top, 1020 vt = XCreateSimpleWindow (disp, top,
1078 window_vt_x,
1079 window_vt_y, 1021 window_vt_x, window_vt_y,
1080 TermWin_TotalWidth (), 1022 width, height,
1081 TermWin_TotalHeight (),
1082 0, 1023 0,
1083 pix_colors_focused[Color_fg], 1024 pix_colors_focused[Color_fg],
1084 pix_colors_focused[Color_bg]); 1025 pix_colors_focused[Color_bg]);
1085#ifdef DEBUG_X
1086 XStoreName (disp, vt, "vt window");
1087#endif
1088 1026
1089 attributes.bit_gravity = NorthWestGravity; 1027 attributes.bit_gravity = NorthWestGravity;
1090 XChangeWindowAttributes (disp, vt, CWBitGravity, &attributes); 1028 XChangeWindowAttributes (disp, vt, CWBitGravity, &attributes);
1091 1029
1092 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask; 1030 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask;
1093 1031
1094#ifdef POINTER_BLANK 1032 if (OPTION (Opt_pointerBlank))
1095 if (options & Opt_pointerBlank)
1096 vt_emask |= PointerMotionMask; 1033 vt_emask |= PointerMotionMask;
1097 else 1034 else
1098#endif
1099 vt_emask |= Button1MotionMask | Button3MotionMask; 1035 vt_emask |= Button1MotionMask | Button3MotionMask;
1100 1036
1101 XSelectInput (disp, vt, vt_emask); 1037 vt_select_input ();
1038
1102 vt_ev.start (display, vt); 1039 vt_ev.start (display, vt);
1103
1104#if defined(MENUBAR) && (MENUBAR_MAX > 1)
1105 if (menuBar_height ())
1106 {
1107 menuBar.win = XCreateSimpleWindow (disp, top,
1108 window_vt_x, 0,
1109 TermWin_TotalWidth (),
1110 menuBar_TotalHeight (),
1111 0,
1112 pix_colors_focused[Color_fg],
1113 pix_colors_focused[Color_scroll]);
1114
1115#ifdef DEBUG_X
1116 XStoreName (disp, menuBar.win, "menubar");
1117#endif
1118
1119 menuBar.drawable = new rxvt_drawable (display, menuBar.win);
1120
1121 XDefineCursor (disp, menuBar.win,
1122 XCreateFontCursor (disp, XC_left_ptr));
1123
1124 XSelectInput (disp, menuBar.win,
1125 (ExposureMask | ButtonPressMask | ButtonReleaseMask | Button1MotionMask));
1126 menubar_ev.start (display, menuBar.win);
1127 }
1128#endif
1129 1040
1130#ifdef XPM_BACKGROUND 1041#ifdef XPM_BACKGROUND
1131 if (rs[Rs_backgroundPixmap] != NULL 1042 if (rs[Rs_backgroundPixmap] != NULL
1132 && ! (options & Opt_transparent)) 1043 && ! OPTION (Opt_transparent))
1133 { 1044 {
1134 const char *p = rs[Rs_backgroundPixmap]; 1045 const char *p = rs[Rs_backgroundPixmap];
1135 1046
1136 if ((p = strchr (p, ';')) != NULL) 1047 if ((p = strchr (p, ';')) != NULL)
1137 { 1048 {
… …
1143 scr_touch (true); 1054 scr_touch (true);
1144 } 1055 }
1145#endif 1056#endif
1146 1057
1147 /* graphics context for the vt window */ 1058 /* graphics context for the vt window */
1148 gcvalue.foreground = pix_colors[Color_fg]; 1059 gcvalue.foreground = pix_colors[Color_fg];
1149 gcvalue.background = pix_colors[Color_bg]; 1060 gcvalue.background = pix_colors[Color_bg];
1150 gcvalue.graphics_exposures = 1; 1061 gcvalue.graphics_exposures = 1;
1062
1151 gc = XCreateGC (disp, vt, 1063 gc = XCreateGC (disp, vt,
1152 GCForeground | GCBackground | GCGraphicsExposures, 1064 GCForeground | GCBackground | GCGraphicsExposures,
1153 &gcvalue); 1065 &gcvalue);
1154 1066
1155 drawable = new rxvt_drawable (display, vt); 1067 drawable = new rxvt_drawable (display, vt);
1156 1068
1157#if defined(MENUBAR) || defined(RXVT_SCROLLBAR) 1069#ifdef RXVT_SCROLLBAR
1158 gcvalue.foreground = pix_colors[Color_topShadow]; 1070 gcvalue.foreground = pix_colors[Color_topShadow];
1159 topShadowGC = XCreateGC (disp, vt, GCForeground, &gcvalue); 1071 topShadowGC = XCreateGC (disp, vt, GCForeground, &gcvalue);
1160 gcvalue.foreground = pix_colors[Color_bottomShadow]; 1072 gcvalue.foreground = pix_colors[Color_bottomShadow];
1161 botShadowGC = XCreateGC (disp, vt, GCForeground, &gcvalue); 1073 botShadowGC = XCreateGC (disp, vt, GCForeground, &gcvalue);
1162 gcvalue.foreground = pix_colors[ (display->depth <= 2 ? Color_fg : Color_scroll)]; 1074 gcvalue.foreground = pix_colors[ (display->depth <= 2 ? Color_fg : Color_scroll)];
… …
1169 pix_colors = pix_colors_unfocused; 1081 pix_colors = pix_colors_unfocused;
1170#endif 1082#endif
1171 1083
1172 pointer_unblank (); 1084 pointer_unblank ();
1173 scr_recolour (); 1085 scr_recolour ();
1174
1175#if ENABLE_XEMBED
1176 if (rs[Rs_embed])
1177 {
1178 long info[2] = { 0, XEMBED_MAPPED };
1179
1180 XChangeProperty (disp, parent, xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
1181 32, PropModeReplace, (unsigned char *)&info, 2);
1182 }
1183#endif
1184} 1086}
1185 1087
1186/* ------------------------------------------------------------------------- * 1088/* ------------------------------------------------------------------------- *
1187 * GET TTY CURRENT STATE * 1089 * GET TTY CURRENT STATE *
1188 * ------------------------------------------------------------------------- */ 1090 * ------------------------------------------------------------------------- */
… …
1193 /* 1095 /*
1194 * standard System V termios interface 1096 * standard System V termios interface
1195 */ 1097 */
1196 if (GET_TERMIOS (STDIN_FILENO, tio) < 0) 1098 if (GET_TERMIOS (STDIN_FILENO, tio) < 0)
1197 { 1099 {
1198 /* return error - use system defaults */ 1100 // return error - use system defaults,
1101 // where possible, and zero elsewhere
1102 memset (tio, 0, sizeof (ttymode_t));
1103
1199 tio->c_cc[VINTR] = CINTR; 1104 tio->c_cc[VINTR] = CINTR;
1200 tio->c_cc[VQUIT] = CQUIT; 1105 tio->c_cc[VQUIT] = CQUIT;
1201 tio->c_cc[VERASE] = CERASE; 1106 tio->c_cc[VERASE] = CERASE;
1107#ifdef VERASE2
1108 tio->c_cc[VERASE2] = CERASE2;
1109#endif
1202 tio->c_cc[VKILL] = CKILL; 1110 tio->c_cc[VKILL] = CKILL;
1203 tio->c_cc[VSTART] = CSTART; 1111 tio->c_cc[VSTART] = CSTART;
1204 tio->c_cc[VSTOP] = CSTOP; 1112 tio->c_cc[VSTOP] = CSTOP;
1205 tio->c_cc[VSUSP] = CSUSP; 1113 tio->c_cc[VSUSP] = CSUSP;
1206# ifdef VDSUSP 1114# ifdef VDSUSP
… …
1399rxvt_term::run_command (const char *const *argv) 1307rxvt_term::run_command (const char *const *argv)
1400{ 1308{
1401#if ENABLE_FRILLS 1309#if ENABLE_FRILLS
1402 if (rs[Rs_pty_fd]) 1310 if (rs[Rs_pty_fd])
1403 { 1311 {
1404 pty.pty = atoi (rs[Rs_pty_fd]); 1312 pty->pty = atoi (rs[Rs_pty_fd]);
1405 fcntl (pty.pty, F_SETFL, O_NONBLOCK); 1313
1314 if (pty->pty >= 0)
1315 {
1316 if (getfd_hook)
1317 pty->pty = (*getfd_hook) (pty->pty);
1318
1319 if (pty->pty < 0 || fcntl (pty->pty, F_SETFL, O_NONBLOCK))
1320 rxvt_fatal ("unusable pty-fd filehandle, aborting.\n");
1321 }
1406 } 1322 }
1407 else 1323 else
1408#endif 1324#endif
1409 if (!pty.get ()) 1325 if (!pty->get ())
1410 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n"); 1326 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");
1411 1327
1412 pty.set_utf8_mode (enc_utf8); 1328 pty->set_utf8_mode (enc_utf8);
1413 1329
1414 /* set initial window size */ 1330 /* set initial window size */
1415 tt_winch (); 1331 tt_winch ();
1416 1332
1417 int er; 1333 int er;
… …
1430#if ENABLE_FRILLS 1346#if ENABLE_FRILLS
1431 if (rs[Rs_pty_fd]) 1347 if (rs[Rs_pty_fd])
1432 return; 1348 return;
1433#endif 1349#endif
1434 1350
1435#ifndef __QNX__
1436 /* spin off the command interpreter */ 1351 /* spin off the command interpreter */
1437 switch (cmd_pid = fork ()) 1352 switch (cmd_pid = fork ())
1438 { 1353 {
1439 case -1: 1354 case -1:
1440 { 1355 {
… …
1442 rxvt_fatal ("can't fork, aborting.\n"); 1357 rxvt_fatal ("can't fork, aborting.\n");
1443 } 1358 }
1444 case 0: 1359 case 0:
1445 init_env (); 1360 init_env ();
1446 1361
1447 if (!pty.make_controlling_tty ()) 1362 if (!pty->make_controlling_tty ())
1448 fprintf (stderr, "%s: could not obtain control of tty.", RESNAME); 1363 fprintf (stderr, "%s: could not obtain control of tty.", RESNAME);
1449 else 1364 else
1450 { 1365 {
1451 /* Reopen stdin, stdout and stderr over the tty file descriptor */ 1366 /* Reopen stdin, stdout and stderr over the tty file descriptor */
1452 dup2 (pty.tty, STDIN_FILENO); 1367 dup2 (pty->tty, STDIN_FILENO);
1453 dup2 (pty.tty, STDOUT_FILENO); 1368 dup2 (pty->tty, STDOUT_FILENO);
1454 dup2 (pty.tty, STDERR_FILENO); 1369 dup2 (pty->tty, STDERR_FILENO);
1455 1370
1456 // close all our file handles that we do no longer need 1371 // close all our file handles that we do no longer need
1457 for (rxvt_term **t = termlist.begin (); t < termlist.end (); t++) 1372 for (rxvt_term **t = termlist.begin (); t < termlist.end (); t++)
1458 { 1373 {
1459 if ((*t)->pty.pty > 2) close ((*t)->pty.pty); 1374 if ((*t)->pty->pty > 2) close ((*t)->pty->pty);
1460 if ((*t)->pty.tty > 2) close ((*t)->pty.tty); 1375 if ((*t)->pty->tty > 2) close ((*t)->pty->tty);
1461 } 1376 }
1462 1377
1463 run_child (argv); 1378 run_child (argv);
1464 fprintf (stderr, "%s: unable to exec child.", RESNAME); 1379 fprintf (stderr, "%s: unable to exec child.", RESNAME);
1465 } 1380 }
1466 1381
1467 _exit (EXIT_FAILURE); 1382 _exit (EXIT_FAILURE);
1468 1383
1469 default: 1384 default:
1470 { 1385 if (!OPTION (Opt_utmpInhibit))
1471#if defined(HAVE_STRUCT_UTMP) && defined(HAVE_TTYSLOT) 1386 pty->login (cmd_pid, OPTION (Opt_loginShell), rs[Rs_display_name]);
1472 int fdstdin;
1473 1387
1474 fdstdin = dup (STDIN_FILENO); 1388 pty->close_tty ();
1475 dup2 (pty.tty, STDIN_FILENO);
1476#endif
1477 1389
1478#ifdef UTMP_SUPPORT 1390 child_ev.start (cmd_pid);
1479 privileged_utmp (SAVE);
1480#endif
1481 1391
1482#if defined(HAVE_STRUCT_UTMP) && defined(HAVE_TTYSLOT) 1392 HOOK_INVOKE ((this, HOOK_CHILD_START, DT_INT, cmd_pid, DT_END));
1483
1484 dup2 (fdstdin, STDIN_FILENO);
1485 close (fdstdin);
1486#endif
1487 }
1488
1489 pty.close_tty (); /* keep STDERR_FILENO, pty.pty, display->fd () open */
1490 break; 1393 break;
1491 } 1394 }
1492#else /* __QNX__ uses qnxspawn () */
1493 fchmod (pty.tty, 0622);
1494 fcntl (pty.tty, F_SETFD, FD_CLOEXEC);
1495 fcntl (pty.pty, F_SETFD, FD_CLOEXEC);
1496
1497 if (run_child (argv) == -1)
1498 exit (EXIT_FAILURE);
1499#endif
1500} 1395}
1501 1396
1502/* ------------------------------------------------------------------------- * 1397/* ------------------------------------------------------------------------- *
1503 * CHILD PROCESS OPERATIONS * 1398 * CHILD PROCESS OPERATIONS *
1504 * ------------------------------------------------------------------------- */ 1399 * ------------------------------------------------------------------------- */
… …
1511{ 1406{
1512 char *login; 1407 char *login;
1513 1408
1514 SET_TTYMODE (STDIN_FILENO, &tio); /* init terminal attributes */ 1409 SET_TTYMODE (STDIN_FILENO, &tio); /* init terminal attributes */
1515 1410
1516 if (options & Opt_console) 1411 if (OPTION (Opt_console))
1517 { /* be virtual console, fail silently */ 1412 { /* be virtual console, fail silently */
1518#ifdef TIOCCONS 1413#ifdef TIOCCONS
1519 unsigned int on = 1; 1414 unsigned int on = 1;
1520 1415
1521 ioctl (STDIN_FILENO, TIOCCONS, &on); 1416 ioctl (STDIN_FILENO, TIOCCONS, &on);
… …
1548 // unblock signals (signals are blocked by iom.C 1443 // unblock signals (signals are blocked by iom.C
1549 sigset_t ss; 1444 sigset_t ss;
1550 sigemptyset (&ss); 1445 sigemptyset (&ss);
1551 sigprocmask (SIG_SETMASK, &ss, 0); 1446 sigprocmask (SIG_SETMASK, &ss, 0);
1552 1447
1553#ifndef __QNX__
1554 /* command interpreter path */ 1448 /* command interpreter path */
1555 if (argv != NULL) 1449 if (argv != NULL)
1556 { 1450 {
1557# ifdef DEBUG_CMD 1451# ifdef DEBUG_CMD
1558 int i; 1452 int i;
… …
1564 execvp (argv[0], (char *const *)argv); 1458 execvp (argv[0], (char *const *)argv);
1565 /* no error message: STDERR is closed! */ 1459 /* no error message: STDERR is closed! */
1566 } 1460 }
1567 else 1461 else
1568 { 1462 {
1569 const char *argv0, *shell; 1463 const char *argv0, *shell;
1570 1464
1571 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0') 1465 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0')
1572 shell = "/bin/sh"; 1466 shell = "/bin/sh";
1573 1467
1574 argv0 = (const char *)rxvt_r_basename (shell); 1468 argv0 = (const char *)rxvt_r_basename (shell);
1575 1469
1576 if (options & Opt_loginShell) 1470 if (OPTION (Opt_loginShell))
1577 { 1471 {
1578 login = (char *)rxvt_malloc ((strlen (argv0) + 2) * sizeof (char)); 1472 login = (char *)rxvt_malloc ((strlen (argv0) + 2) * sizeof (char));
1579 1473
1580 login[0] = '-'; 1474 login[0] = '-';
1581 strcpy (&login[1], argv0); 1475 strcpy (&login[1], argv0);
1582 argv0 = login; 1476 argv0 = login;
1583 } 1477 }
1478
1584 execlp (shell, argv0, NULL); 1479 execlp (shell, argv0, NULL);
1585 /* no error message: STDERR is closed! */ 1480 /* no error message: STDERR is closed! */
1586 } 1481 }
1587 1482
1588#else /* __QNX__ uses qnxspawn () */
1589
1590 char iov_a[10] = { -1, -1, -1, -1, -1, -1, -1, -1, -1, -1 };
1591 char *command = NULL, fullcommand[_MAX_PATH];
1592 char **arg_v, *arg_a[2] = { NULL, NULL };
1593
1594 if (argv != NULL)
1595 {
1596 if (access (argv[0], X_OK) == -1)
1597 {
1598 if (strchr (argv[0], '/') == NULL)
1599 {
1600 searchenv (argv[0], "PATH", fullcommand);
1601
1602 if (fullcommand[0] != '\0')
1603 command = fullcommand;
1604 }
1605
1606 if (access (command, X_OK) == -1)
1607 return -1;
1608 }
1609 else
1610 command = argv[0];
1611
1612 arg_v = argv;
1613 }
1614 else
1615 {
1616 if ((command = getenv ("SHELL")) == NULL || *command == '\0')
1617 command = "/bin/sh";
1618
1619 arg_a[0] = my_basename (command);
1620
1621 if (options & Opt_loginShell)
1622 {
1623 login = rxvt_malloc ((strlen (arg_a[0]) + 2) * sizeof (char));
1624
1625 login[0] = '-';
1626 strcpy (&login[1], arg_a[0]);
1627 arg_a[0] = login;
1628 }
1629
1630 arg_v = arg_a;
1631 }
1632
1633 iov_a[0] = iov_a[1] = iov_a[2] = pty.tty;
1634 cmd_pid = qnx_spawn (0, 0, 0, -1, -1,
1635 _SPAWN_SETSID | _SPAWN_TCSETPGRP,
1636 command, arg_v, environ, iov_a, 0);
1637 if (login)
1638 free (login);
1639
1640 pty.close_tty ();
1641 return pty.pty;
1642#endif
1643
1644 return -1; 1483 return -1;
1645} 1484}
1646 1485
1647/*----------------------- end-of-file (C source) -----------------------*/ 1486/*----------------------- end-of-file (C source) -----------------------*/

Diff Legend

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