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.90 by root, Wed Aug 25 03:47:20 2004 UTC vs.
Revision 1.152 by root, Sat Jan 21 22:38:05 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.
… …
31 * Initialisation routines. 31 * Initialisation routines.
32 */ 32 */
33 33
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 "init.h" 37#include "init.h"
37 38
39#include <limits>
40
38#include <signal.h> 41#include <csignal>
39 42
40const char *const def_colorName[] = 43const char *const def_colorName[] =
41 { 44 {
42 COLOR_FOREGROUND, 45 COLOR_FOREGROUND,
43 COLOR_BACKGROUND, 46 COLOR_BACKGROUND,
44 /* low-intensity colors */ 47 /* low-intensity colors */
45 "Black", /* 0: black (#000000) */ 48 "Black", /* 0: black (#000000) */
46#ifndef NO_BRIGHTCOLOR
47 "Red3", /* 1: red (#CD0000) */ 49 "Red3", /* 1: red (#CD0000) */
48 "Green3", /* 2: green (#00CD00) */ 50 "Green3", /* 2: green (#00CD00) */
49 "Yellow3", /* 3: yellow (#CDCD00) */ 51 "Yellow3", /* 3: yellow (#CDCD00) */
50 "Blue3", /* 4: blue (#0000CD) */ 52 "Blue3", /* 4: blue (#0000CD) */
51 "Magenta3", /* 5: magenta (#CD00CD) */ 53 "Magenta3", /* 5: magenta (#CD00CD) */
… …
59# ifdef XTERM_COLORS 61# ifdef XTERM_COLORS
60 "Grey30", /* 8: bright black (#4D4D4D) */ 62 "Grey30", /* 8: bright black (#4D4D4D) */
61# else 63# else
62 "Grey25", /* 8: bright black (#404040) */ 64 "Grey25", /* 8: bright black (#404040) */
63# endif 65# endif
64#endif /* NO_BRIGHTCOLOR */
65 "Red", /* 1/9: bright red (#FF0000) */ 66 "Red", /* 1/9: bright red (#FF0000) */
66 "Green", /* 2/10: bright green (#00FF00) */ 67 "Green", /* 2/10: bright green (#00FF00) */
67 "Yellow", /* 3/11: bright yellow (#FFFF00) */ 68 "Yellow", /* 3/11: bright yellow (#FFFF00) */
68 "Blue", /* 4/12: bright blue (#0000FF) */ 69 "Blue", /* 4/12: bright blue (#0000FF) */
69 "Magenta", /* 5/13: bright magenta (#FF00FF) */ 70 "Magenta", /* 5/13: bright magenta (#FF00FF) */
… …
155 NULL, /* Color_BD */ 156 NULL, /* Color_BD */
156 NULL, /* Color_IT */ 157 NULL, /* Color_IT */
157 NULL, /* Color_UL */ 158 NULL, /* Color_UL */
158 NULL, /* Color_RV */ 159 NULL, /* Color_RV */
159#endif /* ! NO_BOLD_UNDERLINE_REVERSE */ 160#endif /* ! NO_BOLD_UNDERLINE_REVERSE */
161#if ENABLE_FRILLS
162 NULL, // Color_underline
163#endif
160#ifdef OPTION_HC 164#ifdef OPTION_HC
161 NULL, 165 NULL,
162#endif 166#endif
163#ifdef KEEP_SCROLLCOLOR 167#ifdef KEEP_SCROLLCOLOR
164 COLOR_SCROLLBAR, 168 COLOR_SCROLLBAR,
165 COLOR_SCROLLTROUGH, 169 COLOR_SCROLLTROUGH,
166#endif /* KEEP_SCROLLCOLOR */ 170#endif /* KEEP_SCROLLCOLOR */
167#if TINTING 171#if TINTING
168 NULL, 172 NULL,
169#endif 173#endif
174#if OFF_FOCUS_FADING
175 "black",
176#endif
170 }; 177 };
171 178
172const char *const xa_names[NUM_XA] = 179const char *const xa_names[] =
173 { 180 {
174 "TEXT", 181 "TEXT",
175 "COMPOUND_TEXT", 182 "COMPOUND_TEXT",
176 "UTF8_STRING", 183 "UTF8_STRING",
177 "MULTIPLE", 184 "MULTIPLE",
178 "TARGETS", 185 "TARGETS",
179 "TIMESTAMP", 186 "TIMESTAMP",
180 "VT_SELECTION", 187 "VT_SELECTION",
181 "INCR", 188 "INCR",
189 "WM_PROTOCOLS",
182 "WM_DELETE_WINDOW", 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
183#ifdef TRANSPARENT 204#ifdef TRANSPARENT
184 "_XROOTPMAP_ID", 205 "_XROOTPMAP_ID",
206 "ESETROOT_PMAP_ID",
185#endif 207#endif
186#ifdef OFFIX_DND 208#if ENABLE_XEMBED
187 "DndProtocol", 209 "_XEMBED",
188 "DndSelection", 210 "_XEMBED_INFO",
189#endif 211#endif
190 "CLIPBOARD"
191 }; 212 };
192 213
193bool 214bool
194rxvt_term::init_vars () 215rxvt_term::init_vars ()
195{ 216{
… …
201 222
202 if (pix_colors == NULL) 223 if (pix_colors == NULL)
203 return false; 224 return false;
204 225
205#if defined(XPM_BACKGROUND) || defined(TRANSPARENT) 226#if defined(XPM_BACKGROUND) || defined(TRANSPARENT)
206 TermWin.pixmap = None; 227 pixmap = None;
207#endif 228#endif
208 229
209 MEvent.time = CurrentTime; 230 MEvent.time = CurrentTime;
210 MEvent.button = AnyButton; 231 MEvent.button = AnyButton;
211 options = DEFAULT_OPTIONS; 232 options = DEFAULT_OPTIONS;
212 want_refresh = 1; 233 want_refresh = 1;
213 cmd_pid = -1;
214 pty.pty = pty.tty = -1;
215 priv_modes = SavedModes = PrivMode_Default; 234 priv_modes = SavedModes = PrivMode_Default;
216 TermWin.focus = 0; 235 focus = 0;
217 TermWin.ncol = 80; 236 ncol = 80;
218 TermWin.nrow = 24; 237 nrow = 24;
219 TermWin.int_bwidth = INTERNALBORDERWIDTH; 238 int_bwidth = INTERNALBORDERWIDTH;
220 TermWin.ext_bwidth = EXTERNALBORDERWIDTH; 239 ext_bwidth = EXTERNALBORDERWIDTH;
221 TermWin.lineSpace = LINESPACE; 240 lineSpace = LINESPACE;
222 TermWin.saveLines = SAVELINES; 241 saveLines = SAVELINES;
223 numpix_colors = TOTAL_COLORS; 242 numpix_colors = TOTAL_COLORS;
224 243
225 refresh_limit = 1; 244 refresh_limit = 1;
226 refresh_type = SLOW_REFRESH; 245 refresh_type = SLOW_REFRESH;
227 prev_nrow = prev_ncol = 0; 246 prev_nrow = prev_ncol = 0;
… …
232 bgPixmap.x = bgPixmap.y = 50; 251 bgPixmap.x = bgPixmap.y = 50;
233 bgPixmap.pixmap = None; 252 bgPixmap.pixmap = None;
234#endif 253#endif
235 254
236 last_bot = last_state = -1; 255 last_bot = last_state = -1;
237
238#ifdef MENUBAR
239 menu_readonly = 1;
240# if ! (MENUBAR_MAX > 1)
241 CurrentBar = & (BarList);
242# endif /* (MENUBAR_MAX > 1) */
243#endif
244 256
245 return true; 257 return true;
246} 258}
247 259
248void 260void
… …
316 rs[Rs_name] = rxvt_r_basename (argv[0]); 328 rs[Rs_name] = rxvt_r_basename (argv[0]);
317 329
318 /* 330 /*
319 * Open display, get options/resources and create the window 331 * Open display, get options/resources and create the window
320 */ 332 */
333
321 if ((rs[Rs_display_name] = getenv ("DISPLAY")) == NULL) 334 if ((rs[Rs_display_name] = getenv ("DISPLAY")) == NULL)
322 rs[Rs_display_name] = ":0"; 335 rs[Rs_display_name] = ":0";
323 336
324 get_options (r_argc, r_argv); 337 get_options (r_argc, r_argv);
338
339 if (!(display = displays.get (rs[Rs_display_name])))
340 rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]);
341
342 extract_resources ();
343
325 free (r_argv); 344 free (r_argv);
326 345
327#ifdef LOCAL_X_IS_UNIX 346#if ENABLE_PERL
328 if (rs[Rs_display_name][0] == ':') 347 if (!rs[Rs_perl_ext_1])
329 { 348 rs[Rs_perl_ext_1] = "default";
330 val = rxvt_malloc (5 + strlen (rs[Rs_display_name])); 349
331 strcpy (val, "unix"); 350 if ((rs[Rs_perl_ext_1] && *rs[Rs_perl_ext_1])
332 strcat (val, rs[Rs_display_name]); 351 || (rs[Rs_perl_ext_2] && *rs[Rs_perl_ext_2])
333 display = displays.get (val); 352 || (rs[Rs_perl_eval] && *rs[Rs_perl_eval]))
334 free (val);
335 } 353 {
354 rxvt_perl.init (this);
355 HOOK_INVOKE ((this, HOOK_INIT, DT_END));
356 }
336#endif 357#endif
337
338 if (!display
339 && ! (display = displays.get (rs[Rs_display_name])))
340 rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]);
341
342 extract_resources (display->display, rs[Rs_name]);
343 358
344 /* 359 /*
345 * set any defaults not already set 360 * set any defaults not already set
346 */ 361 */
347 if (cmd_argv && cmd_argv[0]) 362 if (cmd_argv && cmd_argv[0])
… …
358 if (!rs[Rs_iconName]) 373 if (!rs[Rs_iconName])
359 rs[Rs_iconName] = rs[Rs_name]; 374 rs[Rs_iconName] = rs[Rs_name];
360 } 375 }
361 376
362 if (rs[Rs_saveLines] && (i = atoi (rs[Rs_saveLines])) >= 0) 377 if (rs[Rs_saveLines] && (i = atoi (rs[Rs_saveLines])) >= 0)
363 TermWin.saveLines = BOUND_POSITIVE_INT16 (i); 378 saveLines = min (i, MAX_SAVELINES);
364 379
365#if ENABLE_FRILLS 380#if ENABLE_FRILLS
366 if (rs[Rs_int_bwidth] && (i = atoi (rs[Rs_int_bwidth])) >= 0) 381 if (rs[Rs_int_bwidth] && (i = atoi (rs[Rs_int_bwidth])) >= 0)
367 TermWin.int_bwidth = min (i, 100); /* arbitrary limit */ 382 int_bwidth = min (i, std::numeric_limits<int16_t>::max ());
383
368 if (rs[Rs_ext_bwidth] && (i = atoi (rs[Rs_ext_bwidth])) >= 0) 384 if (rs[Rs_ext_bwidth] && (i = atoi (rs[Rs_ext_bwidth])) >= 0)
369 TermWin.ext_bwidth = min (i, 100); /* arbitrary limit */ 385 ext_bwidth = min (i, std::numeric_limits<int16_t>::max ());
370#endif
371 386
372#ifndef NO_LINESPACE
373 if (rs[Rs_lineSpace] && (i = atoi (rs[Rs_lineSpace])) >= 0) 387 if (rs[Rs_lineSpace] && (i = atoi (rs[Rs_lineSpace])) >= 0)
374 TermWin.lineSpace = min (i, 100); /* arbitrary limit */ 388 lineSpace = min (i, std::numeric_limits<int16_t>::max ());
375#endif 389#endif
376 390
377#ifdef POINTER_BLANK 391#ifdef POINTER_BLANK
378 if (rs[Rs_pointerBlankDelay] && (i = atoi (rs[Rs_pointerBlankDelay])) >= 0) 392 if (rs[Rs_pointerBlankDelay] && (i = atoi (rs[Rs_pointerBlankDelay])) >= 0)
379 pointerBlankDelay = i; 393 pointerBlankDelay = i;
380 else 394 else
381 pointerBlankDelay = 2; 395 pointerBlankDelay = 2;
382#endif 396#endif
383 397
384 /* no point having a scrollbar without having any scrollback! */ 398 /* no point having a scrollbar without having any scrollback! */
385 if (!TermWin.saveLines) 399 if (!saveLines)
386 options &= ~Opt_scrollBar; 400 set_option (Opt_scrollBar, 0);
387 401
388#ifdef PRINTPIPE 402#ifdef PRINTPIPE
389 if (!rs[Rs_print_pipe]) 403 if (!rs[Rs_print_pipe])
390 rs[Rs_print_pipe] = PRINTPIPE; 404 rs[Rs_print_pipe] = PRINTPIPE;
391#endif 405#endif
… …
434 setup_scrollbar (rs[Rs_scrollBar_align], rs[Rs_scrollstyle], rs[Rs_scrollBar_thickness]); 448 setup_scrollbar (rs[Rs_scrollBar_align], rs[Rs_scrollstyle], rs[Rs_scrollBar_thickness]);
435#endif 449#endif
436 450
437#ifdef XTERM_REVERSE_VIDEO 451#ifdef XTERM_REVERSE_VIDEO
438 /* this is how xterm implements reverseVideo */ 452 /* this is how xterm implements reverseVideo */
439 if (options & Opt_reverseVideo) 453 if (OPTION (Opt_reverseVideo))
440 { 454 {
441 if (!rs[Rs_color + Color_fg]) 455 if (!rs[Rs_color + Color_fg])
442 rs[Rs_color + Color_fg] = def_colorName[Color_bg]; 456 rs[Rs_color + Color_fg] = def_colorName[Color_bg];
443 if (!rs[Rs_color + Color_bg]) 457 if (!rs[Rs_color + Color_bg])
444 rs[Rs_color + Color_bg] = def_colorName[Color_fg]; 458 rs[Rs_color + Color_bg] = def_colorName[Color_fg];
… …
449 if (!rs[Rs_color + i]) 463 if (!rs[Rs_color + i])
450 rs[Rs_color + i] = def_colorName[i]; 464 rs[Rs_color + i] = def_colorName[i];
451 465
452#ifndef XTERM_REVERSE_VIDEO 466#ifndef XTERM_REVERSE_VIDEO
453 /* this is how we implement reverseVideo */ 467 /* this is how we implement reverseVideo */
454 if (options & Opt_reverseVideo) 468 if (OPTION (Opt_reverseVideo))
455 SWAP_IT (rs[Rs_color + Color_fg], rs[Rs_color + Color_bg], const char *); 469 ::swap (rs[Rs_color + Color_fg], rs[Rs_color + Color_bg]);
456#endif 470#endif
457 471
458 /* convenient aliases for setting fg/bg to colors */ 472 /* convenient aliases for setting fg/bg to colors */
459 color_aliases (Color_fg); 473 color_aliases (Color_fg);
460 color_aliases (Color_bg); 474 color_aliases (Color_bg);
… …
510 env_display = (char *)rxvt_malloc ((i + 9) * sizeof (char)); 524 env_display = (char *)rxvt_malloc ((i + 9) * sizeof (char));
511 525
512 sprintf (env_display, "DISPLAY=%s", val); 526 sprintf (env_display, "DISPLAY=%s", val);
513 527
514 /* avoiding the math library: 528 /* avoiding the math library:
515 * i = (int) (ceil (log10 ((unsigned int)TermWin.parent[0]))) */ 529 * i = (int) (ceil (log10 ((unsigned int)parent[0]))) */
516 for (i = 0, u = (unsigned int)TermWin.parent[0]; u; u /= 10, i++) 530 for (i = 0, u = (unsigned int)parent[0]; u; u /= 10, i++)
517 ; 531 ;
518 MAX_IT (i, 1); 532 max_it (i, 1);
519 env_windowid = (char *)rxvt_malloc ((i + 10) * sizeof (char)); 533 env_windowid = (char *)rxvt_malloc ((i + 10) * sizeof (char));
520 534
521 sprintf (env_windowid, "WINDOWID=%u", 535 sprintf (env_windowid, "WINDOWID=%u",
522 (unsigned int)TermWin.parent[0]); 536 (unsigned int)parent[0]);
523 537
524 /* add entries to the environment: 538 /* add entries to the environment:
525 * @ DISPLAY: in case we started with -display 539 * @ DISPLAY: in case we started with -display
526 * @ WINDOWID: X window id number of the window 540 * @ WINDOWID: X window id number of the window
527 * @ COLORTERM: terminal sub-name and also indicates its color 541 * @ COLORTERM: terminal sub-name and also indicates its color
… …
566 * This should support all European type languages. 580 * This should support all European type languages.
567 */ 581 */
568void 582void
569rxvt_term::set_locale (const char *locale) 583rxvt_term::set_locale (const char *locale)
570{ 584{
585 set_environ (envv);
586
571#if HAVE_XSETLOCALE || HAVE_SETLOCALE 587#if HAVE_XSETLOCALE || HAVE_SETLOCALE
572 free (this->locale); 588 free (this->locale);
573 this->locale = setlocale (LC_CTYPE, locale); 589 this->locale = setlocale (LC_CTYPE, locale);
574 590
575 if (!this->locale) 591 if (!this->locale)
576 { 592 {
577 if (*locale) 593 if (*locale)
578 { 594 {
579 rxvt_warn ("unable to set locale \"%s\", using default locale instead.\n", locale); 595 rxvt_warn ("unable to set locale \"%s\", using C locale instead.\n", locale);
580 setlocale (LC_CTYPE, ""); 596 setlocale (LC_CTYPE, "C");
581 } 597 }
582 else 598 else
583 rxvt_warn ("default locale unavailable, check LC_* and LANG variables. Continuing.\n"); 599 rxvt_warn ("default locale unavailable, check LC_* and LANG variables. Continuing.\n");
584 600
585 this->locale = ""; 601 this->locale = "C";
586 } 602 }
587 603
588 604
589 this->locale = rxvt_strdup (this->locale); 605 this->locale = rxvt_strdup (this->locale);
590 SET_LOCALE (this->locale); 606 SET_LOCALE (this->locale);
591 mbstate.reset (); 607 mbstate.reset ();
592#endif 608#endif
593#if 0 609
594#if HAVE_NL_LANGINFO 610#if HAVE_NL_LANGINFO
611 char *codeset = strdup (nl_langinfo (CODESET));
612 // /^UTF.?8/i
613 enc_utf8 = (codeset[0] == 'U' || codeset[0] == 'u')
614 && (codeset[1] == 'T' || codeset[1] == 't')
615 && (codeset[2] == 'F' || codeset[2] == 'f')
616 && (codeset[3] == '8' || codeset[4] == '8');
595 free (codeset); 617 free (codeset);
596 codeset = strdup (nl_langinfo (CODESET));
597 enc_utf8 = !strcasecmp (codeset, "UTF-8")
598 || !strcasecmp (codeset, "UTF8");
599#else 618#else
600 enc_utf8 = 1; 619 enc_utf8 = 0;
601#endif
602#endif 620#endif
603} 621}
604 622
605void 623void
606rxvt_term::init_xlocale () 624rxvt_term::init_xlocale ()
607{ 625{
626 set_environ (envv);
627
608#ifdef USE_XIM 628#ifdef USE_XIM
609 if (!locale) 629 if (!locale)
610 rxvt_warn ("setting locale failed, working without locale support.\n"); 630 rxvt_warn ("setting locale failed, working without locale support.\n");
611 else 631 else
612 { 632 {
613 Atom wmlocale; 633 set_string_property (xa[XA_WM_LOCALE_NAME], locale);
614
615 wmlocale = XInternAtom (display->display, "WM_LOCALE_NAME", False);
616 XChangeProperty (display->display, TermWin.parent[0], wmlocale,
617 XA_STRING, 8, PropModeReplace,
618 (unsigned char *)locale, strlen (locale));
619 634
620 if (!XSupportsLocale ()) 635 if (!XSupportsLocale ())
621 { 636 {
622 rxvt_warn ("the locale is not supported by Xlib, working withotu locale support.\n"); 637 rxvt_warn ("the locale is not supported by Xlib, working without locale support.\n");
623 return; 638 return;
624 } 639 }
625 640
626 im_ev.start (display); 641 im_ev.start (display);
627 642
… …
637{ 652{
638 /* 653 /*
639 * Initialize the command connection. 654 * Initialize the command connection.
640 * This should be called after the X server connection is established. 655 * This should be called after the X server connection is established.
641 */ 656 */
642 int i;
643
644 for (i = 0; i < NUM_XA; i++)
645 xa[i] = XInternAtom (display->display, xa_names[i], False);
646
647 /* Enable delete window protocol */
648 XSetWMProtocols (display->display, TermWin.parent[0],
649 & (xa[XA_WMDELETEWINDOW]), 1);
650
651#ifdef USING_W11LIB
652 /* enable W11 callbacks */
653 W11AddEventHandler (display->display, rxvt_W11_process_x_event);
654#endif
655 657
656#ifdef META8_OPTION 658#ifdef META8_OPTION
657 meta_char = (options & Opt_meta8 ? 0x80 : C0_ESC); 659 meta_char = OPTION (Opt_meta8) ? 0x80 : C0_ESC;
658#endif 660#endif
659 661
660 get_ourmods (); 662 get_ourmods ();
661 663
662 if (!(options & Opt_scrollTtyOutput)) 664 if (!OPTION (Opt_scrollTtyOutput))
663 priv_modes |= PrivMode_TtyOutputInh; 665 priv_modes |= PrivMode_TtyOutputInh;
664 if (options & Opt_scrollTtyKeypress) 666 if (OPTION (Opt_scrollTtyKeypress))
665 priv_modes |= PrivMode_Keypress; 667 priv_modes |= PrivMode_Keypress;
666 if (!(options & Opt_jumpScroll)) 668 if (!OPTION (Opt_jumpScroll))
667 priv_modes |= PrivMode_smoothScroll; 669 priv_modes |= PrivMode_smoothScroll;
668 670
669#ifndef NO_BACKSPACE_KEY 671#ifndef NO_BACKSPACE_KEY
670 if (strcmp (key_backspace, "DEC") == 0) 672 if (strcmp (key_backspace, "DEC") == 0)
671 priv_modes |= PrivMode_HaveBackSpace; 673 priv_modes |= PrivMode_HaveBackSpace;
672#endif 674#endif
673 675
674 /* add value for scrollBar */ 676 /* add value for scrollBar */
675 if (scrollbar_visible ()) 677 if (scrollBar.state)
676 { 678 {
677 priv_modes |= PrivMode_scrollBar; 679 priv_modes |= PrivMode_scrollBar;
678 SavedModes |= PrivMode_scrollBar; 680 SavedModes |= PrivMode_scrollBar;
679 } 681 }
680 if (menubar_visible ())
681 {
682 priv_modes |= PrivMode_menuBar;
683 SavedModes |= PrivMode_menuBar;
684 }
685
686#ifdef CURSOR_BLINK
687 if (options & Opt_cursorBlink)
688 (void)gettimeofday (&lastcursorchange, NULL);
689#endif
690 682
691 run_command (argv); 683 run_command (argv);
692} 684}
693 685
694/*----------------------------------------------------------------------*/ 686/*----------------------------------------------------------------------*/
… …
709 continue; 701 continue;
710 702
711 if (!rXParseAllocColor (&xcol, rs[Rs_color + i])) 703 if (!rXParseAllocColor (&xcol, rs[Rs_color + i]))
712 { 704 {
713#ifndef XTERM_REVERSE_VIDEO 705#ifndef XTERM_REVERSE_VIDEO
714 if (i < 2 && (options & Opt_reverseVideo)) 706 if (i < 2 && OPTION (Opt_reverseVideo))
715 rs[Rs_color + i] = def_colorName[!i]; 707 rs[Rs_color + i] = def_colorName[!i];
716 else 708 else
717#endif 709#endif
718 rs[Rs_color + i] = def_colorName[i]; 710 rs[Rs_color + i] = def_colorName[i];
719 711
… …
744 } 736 }
745 } 737 }
746 } 738 }
747 739
748 pix_colors[i] = xcol; 740 pix_colors[i] = xcol;
741 SET_PIXCOLOR (i);
742 }
743
749#ifdef OFF_FOCUS_FADING 744#ifdef OFF_FOCUS_FADING
750 if (rs[Rs_fade]) 745 if (rs[Rs_fade])
746 for (i = 0; i < (display->depth <= 2 ? 2 : NRS_COLORS); i++)
751 pix_colors_unfocused[i] = xcol.fade (display, atoi (rs[Rs_fade])); 747 pix_colors_unfocused[i] = pix_colors_focused[i].fade (display, atoi (rs[Rs_fade]), pix_colors[Color_fade]);
752#endif 748#endif
753 SET_PIXCOLOR (i);
754 }
755 749
756 if (display->depth <= 2) 750 if (display->depth <= 2)
757 { 751 {
758 if (!rs[Rs_color + Color_pointer_fg]) pix_colors[Color_pointer_fg] = pix_colors[Color_fg]; 752 if (!rs[Rs_color + Color_pointer_fg]) pix_colors[Color_pointer_fg] = pix_colors[Color_fg];
759 if (!rs[Rs_color + Color_pointer_bg]) pix_colors[Color_pointer_bg] = pix_colors[Color_bg]; 753 if (!rs[Rs_color + Color_pointer_bg]) pix_colors[Color_pointer_bg] = pix_colors[Color_bg];
760 if (!rs[Rs_color + Color_border] ) pix_colors[Color_border] = pix_colors[Color_fg]; 754 if (!rs[Rs_color + Color_border] ) pix_colors[Color_border] = pix_colors[Color_fg];
761 } 755 }
762 756
763 /* 757 /*
764 * get scrollBar/menuBar shadow colors 758 * get scrollBar shadow colors
765 * 759 *
766 * The calculations of topShadow/bottomShadow values are adapted 760 * The calculations of topShadow/bottomShadow values are adapted
767 * from the fvwm window manager. 761 * from the fvwm window manager.
768 */ 762 */
769#ifdef KEEP_SCROLLCOLOR 763#ifdef KEEP_SCROLLCOLOR
770 764
771 if (display->depth <= 2) 765 if (display->depth <= 2)
766 {
772 { /* Monochrome */ 767 /* Monochrome */
773 pix_colors[Color_scroll] = pix_colors[Color_fg]; 768 pix_colors[Color_scroll] = pix_colors[Color_fg];
774 pix_colors[Color_topShadow] = pix_colors[Color_bg]; 769 pix_colors[Color_topShadow] = pix_colors[Color_bg];
775 pix_colors[Color_bottomShadow] = pix_colors[Color_bg]; 770 pix_colors[Color_bottomShadow] = pix_colors[Color_bg];
776 } 771 }
777 else 772 else
… …
813 int i = atoi (rs[Rs_color + idx]); 808 int i = atoi (rs[Rs_color + idx]);
814 809
815 if (i >= 8 && i <= 15) 810 if (i >= 8 && i <= 15)
816 { /* bright colors */ 811 { /* bright colors */
817 i -= 8; 812 i -= 8;
818#ifndef NO_BRIGHTCOLOR
819 rs[Rs_color + idx] = rs[Rs_color + minBrightCOLOR + i]; 813 rs[Rs_color + idx] = rs[Rs_color + minBrightCOLOR + i];
820 return; 814 return;
821#endif
822 } 815 }
823 816
824 if (i >= 0 && i <= 7) /* normal colors */ 817 if (i >= 0 && i <= 7) /* normal colors */
825 rs[Rs_color + idx] = rs[Rs_color + minCOLOR + i]; 818 rs[Rs_color + idx] = rs[Rs_color + minCOLOR + i];
826 } 819 }
… …
832 * Use resource ``modifier'' to override the Meta modifier 825 * Use resource ``modifier'' to override the Meta modifier
833 */ 826 */
834void 827void
835rxvt_term::get_ourmods () 828rxvt_term::get_ourmods ()
836{ 829{
837 int i, j, k; 830 int i, j, k;
838 int requestedmeta, realmeta, realalt; 831 int requestedmeta, realmeta, realalt;
839 const char *cm, *rsmod; 832 const char *cm, *rsmod;
840 XModifierKeymap *map; 833 XModifierKeymap *map;
841 KeyCode *kc; 834 KeyCode *kc;
842 const unsigned int modmasks[] = 835 const unsigned int modmasks[] =
843 { 836 {
844 Mod1Mask, Mod2Mask, Mod3Mask, Mod4Mask, Mod5Mask 837 Mod1Mask, Mod2Mask, Mod3Mask, Mod4Mask, Mod5Mask
845 }; 838 };
846 839
847 requestedmeta = realmeta = realalt = 0; 840 requestedmeta = realmeta = realalt = 0;
848 rsmod = rs[Rs_modifier]; 841 rsmod = rs[Rs_modifier];
842
849 if (rsmod 843 if (rsmod
850 && strcasecmp (rsmod, "mod1") >= 0 && strcasecmp (rsmod, "mod5") <= 0) 844 && strcasecmp (rsmod, "mod1") >= 0 && strcasecmp (rsmod, "mod5") <= 0)
851 requestedmeta = rsmod[3] - '0'; 845 requestedmeta = rsmod[3] - '0';
852 846
853 map = XGetModifierMapping (display->display); 847 map = XGetModifierMapping (display->display);
854 kc = map->modifiermap; 848 kc = map->modifiermap;
849
855 for (i = 1; i < 6; i++) 850 for (i = 1; i < 6; i++)
856 { 851 {
857 k = (i + 2) * map->max_keypermod; /* skip shift/lock/control */ 852 k = (i + 2) * map->max_keypermod; /* skip shift/lock/control */
853
858 for (j = map->max_keypermod; j--; k++) 854 for (j = map->max_keypermod; j--; k++)
859 { 855 {
860 if (kc[k] == 0) 856 if (kc[k] == 0)
861 break; 857 break;
858
862 switch (XKeycodeToKeysym (display->display, kc[k], 0)) 859 switch (XKeycodeToKeysym (display->display, kc[k], 0))
863 { 860 {
864 case XK_Num_Lock: 861 case XK_Num_Lock:
865 ModNumLockMask = modmasks[i - 1]; 862 ModNumLockMask = modmasks[i - 1];
866 /* FALLTHROUGH */ 863 continue;
867 default: 864
868 continue; /* for (;;) */ 865 case XK_ISO_Level3_Shift:
866 ModLevel3Mask = modmasks[i - 1];
867 continue;
868
869 case XK_Meta_L: 869 case XK_Meta_L:
870 case XK_Meta_R: 870 case XK_Meta_R:
871 cm = "meta"; 871 cm = "meta";
872 realmeta = i; 872 realmeta = i;
873 break; 873 break;
874
874 case XK_Alt_L: 875 case XK_Alt_L:
875 case XK_Alt_R: 876 case XK_Alt_R:
876 cm = "alt"; 877 cm = "alt";
877 realalt = i; 878 realalt = i;
878 break; 879 break;
880
879 case XK_Super_L: 881 case XK_Super_L:
880 case XK_Super_R: 882 case XK_Super_R:
881 cm = "super"; 883 cm = "super";
882 break; 884 break;
885
883 case XK_Hyper_L: 886 case XK_Hyper_L:
884 case XK_Hyper_R: 887 case XK_Hyper_R:
885 cm = "hyper"; 888 cm = "hyper";
886 break; 889 break;
890
891 default:
892 continue;
887 } 893 }
894
888 if (rsmod && strncasecmp (rsmod, cm, strlen (cm)) == 0) 895 if (rsmod && strncasecmp (rsmod, cm, strlen (cm)) == 0)
889 requestedmeta = i; 896 requestedmeta = i;
890 } 897 }
891 } 898 }
899
892 XFreeModifiermap (map); 900 XFreeModifiermap (map);
901
893 i = (requestedmeta ? requestedmeta 902 i = requestedmeta ? requestedmeta
894 : (realmeta ? realmeta 903 : realmeta ? realmeta
895 : (realalt ? realalt : 0))); 904 : realalt ? realalt
905 : 0;
906
896 if (i) 907 if (i)
897 ModMetaMask = modmasks[i - 1]; 908 ModMetaMask = modmasks[i - 1];
898} 909}
899 910
900/*----------------------------------------------------------------------*/ 911/*----------------------------------------------------------------------*/
… …
907#if ENABLE_FRILLS 918#if ENABLE_FRILLS
908 Atom prop = None; 919 Atom prop = None;
909 MWMHints mwmhints; 920 MWMHints mwmhints;
910#endif 921#endif
911 XGCValues gcvalue; 922 XGCValues gcvalue;
912 long vt_emask;
913 XSetWindowAttributes attributes; 923 XSetWindowAttributes attributes;
914 XWindowAttributes gattr; 924 XWindowAttributes gattr;
925 Window top, parent;
926 dDisp;
915 927
916 if (options & Opt_transparent) 928#ifdef USING_W11LIB
929 /* enable W11 callbacks */
930 W11AddEventHandler (disp, rxvt_W11_process_x_event);
931#endif
932
933 assert (sizeof (xa_names) / sizeof (char *) == NUM_XA);
934 XInternAtoms (disp, (char **)xa_names, NUM_XA, False, xa);
935
936 if (OPTION (Opt_transparent))
917 { 937 {
918 XGetWindowAttributes (display->display, RootWindow (display->display, display->screen), &gattr); 938 XGetWindowAttributes (disp, RootWindow (disp, display->screen), &gattr);
919 display->depth = gattr.depth; // doh //TODO, per-term not per-display? 939 display->depth = gattr.depth; // doh //TODO, per-term not per-display?
920 } 940 }
921 941
942 /* grab colors before netscape does */
943 Get_Colours ();
944
945 if (!set_fonts ())
946 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n");
947
948 parent = DefaultRootWindow (disp);
949
950 attributes.override_redirect = !!OPTION (Opt_override_redirect);
951
922#if ENABLE_FRILLS 952#if ENABLE_FRILLS
923 if (options & Opt_borderLess) 953 if (OPTION (Opt_borderLess))
924 { 954 {
925 prop = XInternAtom(display->display, "_MOTIF_WM_INFO", True); 955 prop = XInternAtom (disp, "_MOTIF_WM_INFO", True);
956
926 if (prop == None) 957 if (prop == None)
927 { 958 {
928 /* print_warning("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n");*/ 959 /* print_warning("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n");*/
929#ifdef PREFER_24BIT
930 attributes.override_redirect = TRUE; 960 attributes.override_redirect = TRUE;
931#endif
932 mwmhints.flags = 0; 961 mwmhints.flags = 0;
933 } 962 }
934 else 963 else
935 { 964 {
936 mwmhints.flags = MWM_HINTS_DECORATIONS; 965 mwmhints.flags = MWM_HINTS_DECORATIONS;
937 mwmhints.decorations = 0; 966 mwmhints.decorations = 0;
938 } 967 }
939 } 968 }
940 else 969 else
941 {
942 mwmhints.flags = 0; 970 mwmhints.flags = 0;
971#endif
972
973#if ENABLE_XEMBED
974 if (rs[Rs_embed])
943 } 975 {
944#endif 976 XWindowAttributes wattr;
945 977
946 /* grab colors before netscape does */ 978 parent = strtol (rs[Rs_embed], 0, 0);
947 Get_Colours ();
948 979
949 if (!set_fonts ()) 980 if (!XGetWindowAttributes (disp, parent, &wattr))
950 rxvt_fatal ("unable to load base fontset, please specify one using -fn, aborting.\n"); 981 rxvt_fatal ("invalid window-id specified with -embed, aborting.\n");
982
983 window_calc (wattr.width, wattr.height);
984 }
985#endif
951 986
952 window_calc (0, 0); 987 window_calc (0, 0);
953 old_width = szHint.width;
954 old_height = szHint.height;
955 988
956 /* sub-window placement & size in rxvt_resize_subwindows () */ 989 /* sub-window placement & size in rxvt_resize_subwindows () */
957
958#ifdef PREFER_24BIT
959 attributes.background_pixel = pix_colors_focused[Color_border]; 990 attributes.background_pixel = pix_colors_focused[Color_border];
960 attributes.border_pixel = pix_colors_focused[Color_border]; 991 attributes.border_pixel = pix_colors_focused[Color_border];
961 attributes.colormap = display->cmap; 992 attributes.colormap = display->cmap;
962 TermWin.parent[0] = XCreateWindow (display->display, DefaultRootWindow (display->display), 993 top = XCreateWindow (disp, parent,
963 szHint.x, szHint.y, 994 szHint.x, szHint.y,
964 szHint.width, szHint.height, 995 szHint.width, szHint.height,
965 TermWin.ext_bwidth, 996 ext_bwidth,
966 display->depth, InputOutput, 997 display->depth, InputOutput,
967 display->visual, 998 display->visual,
968 CWColormap | CWBackPixel | CWBorderPixel, &attributes); 999 CWColormap | CWBackPixel | CWBorderPixel | CWOverrideRedirect,
969#else 1000 &attributes);
970 TermWin.parent[0] = XCreateSimpleWindow (display->display, DefaultRootWindow (display->display), 1001
971 szHint.x, szHint.y, 1002 this->parent[0] = top;
972 szHint.width, szHint.height, 1003
973 TermWin.ext_bwidth, 1004 old_width = szHint.width;
974 pix_colors_focused[Color_border], 1005 old_height = szHint.height;
975 pix_colors_focused[Color_border]);
976#endif
977 1006
978 process_xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST); 1007 process_xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST);
979 process_xterm_seq (XTerm_iconName, rs[Rs_iconName], CHAR_ST); 1008 process_xterm_seq (XTerm_iconName, rs[Rs_iconName], CHAR_ST);
980 1009
981 classHint.res_name = (char *)rs[Rs_name]; 1010 classHint.res_name = (char *)rs[Rs_name];
982 classHint.res_class = (char *)RESCLASS; 1011 classHint.res_class = (char *)RESCLASS;
983 1012
984 wmHint.flags = InputHint | StateHint | WindowGroupHint; 1013 wmHint.flags = InputHint | StateHint | WindowGroupHint;
985 wmHint.input = True; 1014 wmHint.input = True;
986 wmHint.initial_state = options & Opt_iconic ? IconicState : NormalState; 1015 wmHint.initial_state = OPTION (Opt_iconic) ? IconicState : NormalState;
987 wmHint.window_group = TermWin.parent[0]; 1016 wmHint.window_group = top;
988 1017
989 XSetWMProperties (display->display, TermWin.parent[0], NULL, NULL, 1018 XmbSetWMProperties (disp, top, NULL, NULL, (char **)argv, argc,
990 (char **)argv, argc, &szHint, &wmHint, &classHint); 1019 &szHint, &wmHint, &classHint);
1020
1021 Atom protocols[] = {
1022 xa[XA_WM_DELETE_WINDOW],
1023#if ENABLE_EWMH
1024 xa[XA_NET_WM_PING],
1025#endif
1026 };
1027
1028 XSetWMProtocols (disp, top, protocols, sizeof (protocols) / sizeof (protocols[0]));
991 1029
992#if ENABLE_FRILLS 1030#if ENABLE_FRILLS
1031 if (rs[Rs_transient_for])
1032 XSetTransientForHint (disp, top, (Window)strtol (rs[Rs_transient_for], 0, 0));
1033#endif
1034
1035#if ENABLE_EWMH
993 long pid = getpid (); 1036 long pid = getpid ();
994 XChangeProperty (display->display, TermWin.parent[0], 1037
1038 XChangeProperty (disp, top,
995 display->atom ("_NET_WM_PID"), XA_CARDINAL, 32, 1039 xa[XA_NET_WM_PID], XA_CARDINAL, 32,
996 PropModeReplace, (unsigned char *)&pid, 1); 1040 PropModeReplace, (unsigned char *)&pid, 1);
997#endif
998 1041
999 XSelectInput (display->display, TermWin.parent[0], 1042 // _NET_WM_WINDOW_TYPE is NORMAL, which is the default
1043#endif
1044
1045 XSelectInput (disp, top,
1000 KeyPressMask 1046 KeyPressMask
1001#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ENABLE_FRILLS || ISO_14755 1047#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ENABLE_FRILLS || ISO_14755
1002 | KeyReleaseMask 1048 | KeyReleaseMask
1003#endif 1049#endif
1004 | FocusChangeMask | VisibilityChangeMask 1050 | FocusChangeMask | VisibilityChangeMask
1005 | ExposureMask
1006 | StructureNotifyMask); 1051 | ExposureMask | StructureNotifyMask);
1052
1007 termwin_ev.start (display, TermWin.parent[0]); 1053 termwin_ev.start (display, top);
1008 1054
1009#if ENABLE_FRILLS 1055#if ENABLE_FRILLS
1010 if (mwmhints.flags) 1056 if (mwmhints.flags)
1011 { 1057 XChangeProperty (disp, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32,
1012 prop = XInternAtom (display->display, "_MOTIF_WM_HINTS", False); 1058 PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS);
1013 XChangeProperty (display->display, TermWin.parent[0], prop, prop, 32, PropModeReplace, (unsigned char *) &mwmhints, PROP_MWM_HINTS_ELEMENTS);
1014 }
1015#endif 1059#endif
1016 1060
1017 /* vt cursor: Black-on-White is standard, but this is more popular */ 1061 /* vt cursor: Black-on-White is standard, but this is more popular */
1018 TermWin_cursor = XCreateFontCursor (display->display, XC_xterm); 1062 TermWin_cursor = XCreateFontCursor (disp, XC_xterm);
1019 1063
1020#if defined(HAVE_SCROLLBARS) || defined(MENUBAR) 1064#ifdef HAVE_SCROLLBARS
1021 /* cursor (menuBar/scrollBar): Black-on-White */ 1065 /* cursor scrollBar: Black-on-White */
1022 leftptr_cursor = XCreateFontCursor (display->display, XC_left_ptr); 1066 leftptr_cursor = XCreateFontCursor (disp, XC_left_ptr);
1023#endif
1024
1025#ifdef POINTER_BLANK
1026 {
1027 XColor blackcolour;
1028 blackcolour.red = 0;
1029 blackcolour.green = 0;
1030 blackcolour.blue = 0;
1031 Font f = XLoadFont (display->display, "fixed");
1032 blank_cursor = XCreateGlyphCursor (display->display, f, f, ' ', ' ',
1033 &blackcolour, &blackcolour);
1034 XUnloadFont (display->display, f);
1035 }
1036#endif 1067#endif
1037 1068
1038 /* the vt window */ 1069 /* the vt window */
1039 TermWin.vt = XCreateSimpleWindow (display->display, TermWin.parent[0], 1070 vt = XCreateSimpleWindow (disp, top,
1040 window_vt_x, 1071 window_vt_x,
1041 window_vt_y, 1072 window_vt_y,
1042 TermWin_TotalWidth (), 1073 width,
1043 TermWin_TotalHeight (), 1074 height,
1044 0, 1075 0,
1045 pix_colors_focused[Color_fg], 1076 pix_colors_focused[Color_fg],
1046 pix_colors_focused[Color_bg]); 1077 pix_colors_focused[Color_bg]);
1047#ifdef DEBUG_X 1078#ifdef DEBUG_X
1048 XStoreName (display->display, TermWin.vt, "vt window"); 1079 XStoreName (disp, vt, "vt window");
1049#endif 1080#endif
1050 1081
1051 attributes.bit_gravity = NorthWestGravity; 1082 attributes.bit_gravity = NorthWestGravity;
1052 XChangeWindowAttributes (display->display, TermWin.vt, CWBitGravity, &attributes); 1083 XChangeWindowAttributes (disp, vt, CWBitGravity, &attributes);
1053 1084
1054 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask; 1085 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask;
1055 1086
1056 pointer_unblank (); 1087 if (OPTION (Opt_pointerBlank))
1057
1058#ifdef POINTER_BLANK
1059 if (options & Opt_pointerBlank)
1060 vt_emask |= PointerMotionMask; 1088 vt_emask |= PointerMotionMask;
1061 else 1089 else
1062#endif
1063 vt_emask |= Button1MotionMask | Button3MotionMask; 1090 vt_emask |= Button1MotionMask | Button3MotionMask;
1064 1091
1065 XSelectInput (display->display, TermWin.vt, vt_emask); 1092 vt_select_input ();
1093
1066 vt_ev.start (display, TermWin.vt); 1094 vt_ev.start (display, vt);
1067
1068#if defined(MENUBAR) && (MENUBAR_MAX > 1)
1069 if (menuBar_height ())
1070 {
1071 menuBar.win = XCreateSimpleWindow (display->display, TermWin.parent[0],
1072 window_vt_x, 0,
1073 TermWin_TotalWidth (),
1074 menuBar_TotalHeight (),
1075 0,
1076 pix_colors_focused[Color_fg],
1077 pix_colors_focused[Color_scroll]);
1078
1079#ifdef DEBUG_X
1080 XStoreName (display->display, menuBar.win, "menubar");
1081#endif
1082
1083 menuBar.drawable = new rxvt_drawable (display, menuBar.win);
1084
1085 XDefineCursor (display->display, menuBar.win,
1086 XCreateFontCursor (display->display, XC_left_ptr));
1087
1088 XSelectInput (display->display, menuBar.win,
1089 (ExposureMask | ButtonPressMask | ButtonReleaseMask
1090 | Button1MotionMask));
1091 menubar_ev.start (display, menuBar.win);
1092 }
1093#endif
1094 1095
1095#ifdef XPM_BACKGROUND 1096#ifdef XPM_BACKGROUND
1096 if (rs[Rs_backgroundPixmap] != NULL 1097 if (rs[Rs_backgroundPixmap] != NULL
1097 && ! (options & Opt_transparent)) 1098 && ! OPTION (Opt_transparent))
1098 { 1099 {
1099 const char *p = rs[Rs_backgroundPixmap]; 1100 const char *p = rs[Rs_backgroundPixmap];
1100 1101
1101 if ((p = strchr (p, ';')) != NULL) 1102 if ((p = strchr (p, ';')) != NULL)
1102 { 1103 {
… …
1111 1112
1112 /* graphics context for the vt window */ 1113 /* graphics context for the vt window */
1113 gcvalue.foreground = pix_colors[Color_fg]; 1114 gcvalue.foreground = pix_colors[Color_fg];
1114 gcvalue.background = pix_colors[Color_bg]; 1115 gcvalue.background = pix_colors[Color_bg];
1115 gcvalue.graphics_exposures = 1; 1116 gcvalue.graphics_exposures = 1;
1116 TermWin.gc = XCreateGC (display->display, TermWin.vt, 1117 gc = XCreateGC (disp, vt,
1117 GCForeground | GCBackground | GCGraphicsExposures, 1118 GCForeground | GCBackground | GCGraphicsExposures,
1118 &gcvalue); 1119 &gcvalue);
1119 1120
1120 TermWin.drawable = new rxvt_drawable (display, TermWin.vt); 1121 drawable = new rxvt_drawable (display, vt);
1121 1122
1122#if defined(MENUBAR) || defined(RXVT_SCROLLBAR) 1123#ifdef RXVT_SCROLLBAR
1123 gcvalue.foreground = pix_colors[Color_topShadow]; 1124 gcvalue.foreground = pix_colors[Color_topShadow];
1124 topShadowGC = XCreateGC (display->display, TermWin.vt, GCForeground, &gcvalue); 1125 topShadowGC = XCreateGC (disp, vt, GCForeground, &gcvalue);
1125 gcvalue.foreground = pix_colors[Color_bottomShadow]; 1126 gcvalue.foreground = pix_colors[Color_bottomShadow];
1126 botShadowGC = XCreateGC (display->display, TermWin.vt, GCForeground, &gcvalue); 1127 botShadowGC = XCreateGC (disp, vt, GCForeground, &gcvalue);
1127 gcvalue.foreground = pix_colors[ (display->depth <= 2 ? Color_fg : Color_scroll)]; 1128 gcvalue.foreground = pix_colors[ (display->depth <= 2 ? Color_fg : Color_scroll)];
1128 scrollbarGC = XCreateGC (display->display, TermWin.vt, GCForeground, &gcvalue); 1129 scrollbarGC = XCreateGC (disp, vt, GCForeground, &gcvalue);
1129#endif 1130#endif
1130 1131
1131#ifdef OFF_FOCUS_FADING 1132#ifdef OFF_FOCUS_FADING
1132 // initially we are in unfocused state 1133 // initially we are in unfocused state
1133 if (rs[Rs_fade]) 1134 if (rs[Rs_fade])
1134 pix_colors = pix_colors_unfocused; 1135 pix_colors = pix_colors_unfocused;
1135#endif 1136#endif
1136 1137
1138 pointer_unblank ();
1137 scr_recolour (); 1139 scr_recolour ();
1140
1141#if ENABLE_XEMBED
1142 if (rs[Rs_embed])
1143 {
1144 long info[2] = { 0, XEMBED_MAPPED };
1145
1146 XChangeProperty (disp, parent, xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
1147 32, PropModeReplace, (unsigned char *)&info, 2);
1148 }
1149#endif
1138} 1150}
1139 1151
1140/* ------------------------------------------------------------------------- * 1152/* ------------------------------------------------------------------------- *
1141 * GET TTY CURRENT STATE * 1153 * GET TTY CURRENT STATE *
1142 * ------------------------------------------------------------------------- */ 1154 * ------------------------------------------------------------------------- */
… …
1147 /* 1159 /*
1148 * standard System V termios interface 1160 * standard System V termios interface
1149 */ 1161 */
1150 if (GET_TERMIOS (STDIN_FILENO, tio) < 0) 1162 if (GET_TERMIOS (STDIN_FILENO, tio) < 0)
1151 { 1163 {
1152 /* return error - use system defaults */ 1164 // return error - use system defaults,
1165 // where possible, and zero elsewhere
1166 memset (tio, 0, sizeof (ttymode_t));
1167
1153 tio->c_cc[VINTR] = CINTR; 1168 tio->c_cc[VINTR] = CINTR;
1154 tio->c_cc[VQUIT] = CQUIT; 1169 tio->c_cc[VQUIT] = CQUIT;
1155 tio->c_cc[VERASE] = CERASE; 1170 tio->c_cc[VERASE] = CERASE;
1171#ifdef VERASE2
1172 tio->c_cc[VERASE2] = CERASE2;
1173#endif
1156 tio->c_cc[VKILL] = CKILL; 1174 tio->c_cc[VKILL] = CKILL;
1157 tio->c_cc[VSTART] = CSTART; 1175 tio->c_cc[VSTART] = CSTART;
1158 tio->c_cc[VSTOP] = CSTOP; 1176 tio->c_cc[VSTOP] = CSTOP;
1159 tio->c_cc[VSUSP] = CSUSP; 1177 tio->c_cc[VSUSP] = CSUSP;
1160# ifdef VDSUSP 1178# ifdef VDSUSP
1161
1162 tio->c_cc[VDSUSP] = CDSUSP; 1179 tio->c_cc[VDSUSP] = CDSUSP;
1163# endif 1180# endif
1164# ifdef VREPRINT 1181# ifdef VREPRINT
1165
1166 tio->c_cc[VREPRINT] = CRPRNT; 1182 tio->c_cc[VREPRINT] = CRPRNT;
1167# endif 1183# endif
1168# ifdef VDISCRD 1184# ifdef VDISCRD
1169
1170 tio->c_cc[VDISCRD] = CFLUSH; 1185 tio->c_cc[VDISCRD] = CFLUSH;
1171# endif 1186# endif
1172# ifdef VWERSE 1187# ifdef VWERSE
1173
1174 tio->c_cc[VWERSE] = CWERASE; 1188 tio->c_cc[VWERSE] = CWERASE;
1175# endif 1189# endif
1176# ifdef VLNEXT 1190# ifdef VLNEXT
1177
1178 tio->c_cc[VLNEXT] = CLNEXT; 1191 tio->c_cc[VLNEXT] = CLNEXT;
1179# endif 1192# endif
1180
1181 } 1193 }
1194
1182 tio->c_cc[VEOF] = CEOF; 1195 tio->c_cc[VEOF] = CEOF;
1183 tio->c_cc[VEOL] = VDISABLE; 1196 tio->c_cc[VEOL] = VDISABLE;
1184# ifdef VEOL2 1197# ifdef VEOL2
1185
1186 tio->c_cc[VEOL2] = VDISABLE; 1198 tio->c_cc[VEOL2] = VDISABLE;
1187# endif 1199# endif
1188# ifdef VSWTC 1200# ifdef VSWTC
1189
1190 tio->c_cc[VSWTC] = VDISABLE; 1201 tio->c_cc[VSWTC] = VDISABLE;
1191# endif 1202# endif
1192# ifdef VSWTCH 1203# ifdef VSWTCH
1193
1194 tio->c_cc[VSWTCH] = VDISABLE; 1204 tio->c_cc[VSWTCH] = VDISABLE;
1195# endif 1205# endif
1196# if VMIN != VEOF 1206# if VMIN != VEOF
1197
1198 tio->c_cc[VMIN] = 1; 1207 tio->c_cc[VMIN] = 1;
1199# endif 1208# endif
1200# if VTIME != VEOL 1209# if VTIME != VEOL
1201
1202 tio->c_cc[VTIME] = 0; 1210 tio->c_cc[VTIME] = 0;
1203# endif 1211# endif
1204 1212
1205 if (erase != -1) 1213 if (erase != -1)
1206 tio->c_cc[VERASE] = (char)erase; 1214 tio->c_cc[VERASE] = (char)erase;
… …
1234 if (ioctl (STDIN_FILENO, TIOCGETP, & (tio->sg)) < 0) 1242 if (ioctl (STDIN_FILENO, TIOCGETP, & (tio->sg)) < 0)
1235 { 1243 {
1236 tio->sg.sg_erase = CERASE; /* ^H */ 1244 tio->sg.sg_erase = CERASE; /* ^H */
1237 tio->sg.sg_kill = CKILL; /* ^U */ 1245 tio->sg.sg_kill = CKILL; /* ^U */
1238 } 1246 }
1247
1239 if (erase != -1) 1248 if (erase != -1)
1240 tio->sg.sg_erase = (char)erase; 1249 tio->sg.sg_erase = (char)erase;
1241 1250
1242 tio->sg.sg_flags = (CRMOD | ECHO | EVENP | ODDP); 1251 tio->sg.sg_flags = (CRMOD | ECHO | EVENP | ODDP);
1243 1252
… …
1249 tio->tc.t_startc = CSTART; /* ^Q */ 1258 tio->tc.t_startc = CSTART; /* ^Q */
1250 tio->tc.t_stopc = CSTOP; /* ^S */ 1259 tio->tc.t_stopc = CSTOP; /* ^S */
1251 tio->tc.t_eofc = CEOF; /* ^D */ 1260 tio->tc.t_eofc = CEOF; /* ^D */
1252 tio->tc.t_brkc = -1; 1261 tio->tc.t_brkc = -1;
1253 } 1262 }
1263
1254 /* get local special chars */ 1264 /* get local special chars */
1255 if (ioctl (STDIN_FILENO, TIOCGLTC, & (tio->lc)) < 0) 1265 if (ioctl (STDIN_FILENO, TIOCGLTC, & (tio->lc)) < 0)
1256 { 1266 {
1257 tio->lc.t_suspc = CSUSP; /* ^Z */ 1267 tio->lc.t_suspc = CSUSP; /* ^Z */
1258 tio->lc.t_dsuspc = CDSUSP; /* ^Y */ 1268 tio->lc.t_dsuspc = CDSUSP; /* ^Y */
… …
1262 tio->lc.t_lnextc = CLNEXT; /* ^V */ 1272 tio->lc.t_lnextc = CLNEXT; /* ^V */
1263 } 1273 }
1264 /* get line discipline */ 1274 /* get line discipline */
1265 ioctl (STDIN_FILENO, TIOCGETD, & (tio->line)); 1275 ioctl (STDIN_FILENO, TIOCGETD, & (tio->line));
1266# ifdef NTTYDISC 1276# ifdef NTTYDISC
1267
1268 tio->line = NTTYDISC; 1277 tio->line = NTTYDISC;
1269# endif /* NTTYDISC */ 1278# endif /* NTTYDISC */
1270 1279
1271 tio->local = (LCRTBS | LCRTERA | LCTLECH | LPASS8 | LCRTKIL); 1280 tio->local = (LCRTBS | LCRTERA | LCTLECH | LPASS8 | LCRTKIL);
1272#endif /* HAVE_TERMIOS_H */ 1281#endif /* HAVE_TERMIOS_H */
… …
1295 FOO (IGNCR, "IGNCR"); 1304 FOO (IGNCR, "IGNCR");
1296 FOO (ICRNL, "ICRNL"); 1305 FOO (ICRNL, "ICRNL");
1297 FOO (IXON, "IXON"); 1306 FOO (IXON, "IXON");
1298 FOO (IXOFF, "IXOFF"); 1307 FOO (IXOFF, "IXOFF");
1299# ifdef IUCLC 1308# ifdef IUCLC
1300
1301 FOO (IUCLC, "IUCLC"); 1309 FOO (IUCLC, "IUCLC");
1302# endif 1310# endif
1303# ifdef IXANY 1311# ifdef IXANY
1304
1305 FOO (IXANY, "IXANY"); 1312 FOO (IXANY, "IXANY");
1306# endif 1313# endif
1307# ifdef IMAXBEL 1314# ifdef IMAXBEL
1308
1309 FOO (IMAXBEL, "IMAXBEL"); 1315 FOO (IMAXBEL, "IMAXBEL");
1310# endif 1316# endif
1311 1317
1312 fprintf (stderr, "\n"); 1318 fprintf (stderr, "\n");
1313 1319
… …
1320 FOO (VERASE, "VERASE"); 1326 FOO (VERASE, "VERASE");
1321 FOO (VKILL, "VKILL"); 1327 FOO (VKILL, "VKILL");
1322 FOO (VEOF, "VEOF"); 1328 FOO (VEOF, "VEOF");
1323 FOO (VEOL, "VEOL"); 1329 FOO (VEOL, "VEOL");
1324# ifdef VEOL2 1330# ifdef VEOL2
1325
1326 FOO (VEOL2, "VEOL2"); 1331 FOO (VEOL2, "VEOL2");
1327# endif 1332# endif
1328# ifdef VSWTC 1333# ifdef VSWTC
1329
1330 FOO (VSWTC, "VSWTC"); 1334 FOO (VSWTC, "VSWTC");
1331# endif 1335# endif
1332# ifdef VSWTCH 1336# ifdef VSWTCH
1333
1334 FOO (VSWTCH, "VSWTCH"); 1337 FOO (VSWTCH, "VSWTCH");
1335# endif 1338# endif
1336
1337 FOO (VSTART, "VSTART"); 1339 FOO (VSTART, "VSTART");
1338 FOO (VSTOP, "VSTOP"); 1340 FOO (VSTOP, "VSTOP");
1339 FOO (VSUSP, "VSUSP"); 1341 FOO (VSUSP, "VSUSP");
1340# ifdef VDSUSP 1342# ifdef VDSUSP
1341
1342 FOO (VDSUSP, "VDSUSP"); 1343 FOO (VDSUSP, "VDSUSP");
1343# endif 1344# endif
1344# ifdef VREPRINT 1345# ifdef VREPRINT
1345
1346 FOO (VREPRINT, "VREPRINT"); 1346 FOO (VREPRINT, "VREPRINT");
1347# endif 1347# endif
1348# ifdef VDISCRD 1348# ifdef VDISCRD
1349
1350 FOO (VDISCRD, "VDISCRD"); 1349 FOO (VDISCRD, "VDISCRD");
1351# endif 1350# endif
1352# ifdef VWERSE 1351# ifdef VWERSE
1353
1354 FOO (VWERSE, "VWERSE"); 1352 FOO (VWERSE, "VWERSE");
1355# endif 1353# endif
1356# ifdef VLNEXT 1354# ifdef VLNEXT
1357
1358 FOO (VLNEXT, "VLNEXT"); 1355 FOO (VLNEXT, "VLNEXT");
1359# endif 1356# endif
1360 1357
1361 fprintf (stderr, "\n"); 1358 fprintf (stderr, "\n");
1362# undef FOO 1359# undef FOO
… …
1371 * the slave. 1368 * the slave.
1372 */ 1369 */
1373void 1370void
1374rxvt_term::run_command (const char *const *argv) 1371rxvt_term::run_command (const char *const *argv)
1375{ 1372{
1373#if ENABLE_FRILLS
1374 if (rs[Rs_pty_fd])
1375 {
1376 pty->pty = atoi (rs[Rs_pty_fd]);
1377
1378 if (pty->pty >= 0)
1379 {
1380 if (getfd_hook)
1381 pty->pty = (*getfd_hook) (pty->pty);
1382
1383 if (pty->pty < 0 || fcntl (pty->pty, F_SETFL, O_NONBLOCK))
1384 rxvt_fatal ("unusable pty-fd filehandle, aborting.\n");
1385 }
1386 }
1387 else
1388#endif
1389 if (!pty->get ())
1390 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");
1391
1392 pty->set_utf8_mode (enc_utf8);
1393
1394 /* set initial window size */
1395 tt_winch ();
1396
1376 int er; 1397 int er;
1377
1378 if (!pty.get ())
1379 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");
1380 1398
1381#ifndef NO_BACKSPACE_KEY 1399#ifndef NO_BACKSPACE_KEY
1382 if (key_backspace[0] && !key_backspace[1]) 1400 if (key_backspace[0] && !key_backspace[1])
1383 er = key_backspace[0]; 1401 er = key_backspace[0];
1384 else if (strcmp (key_backspace, "DEC") == 0) 1402 else if (strcmp (key_backspace, "DEC") == 0)
… …
1387#endif 1405#endif
1388 er = -1; 1406 er = -1;
1389 1407
1390 rxvt_get_ttymode (&tio, er); 1408 rxvt_get_ttymode (&tio, er);
1391 1409
1392 /* set initial window size */ 1410#if ENABLE_FRILLS
1393 tt_winch (); 1411 if (rs[Rs_pty_fd])
1412 return;
1413#endif
1394 1414
1395#ifndef __QNX__
1396 /* spin off the command interpreter */ 1415 /* spin off the command interpreter */
1397 switch (cmd_pid = fork ()) 1416 switch (cmd_pid = fork ())
1398 { 1417 {
1399 case -1: 1418 case -1:
1419 {
1420 cmd_pid = 0;
1400 rxvt_fatal ("can't fork, aborting.\n"); 1421 rxvt_fatal ("can't fork, aborting.\n");
1422 }
1401 case 0: 1423 case 0:
1402 init_env (); 1424 init_env ();
1403 1425
1404 if (!pty.make_controlling_tty ()) 1426 if (!pty->make_controlling_tty ())
1405 fprintf (stderr, "%s: could not obtain control of tty.", RESNAME); 1427 fprintf (stderr, "%s: could not obtain control of tty.", RESNAME);
1406 else 1428 else
1407 { 1429 {
1408 /* Reopen stdin, stdout and stderr over the tty file descriptor */ 1430 /* Reopen stdin, stdout and stderr over the tty file descriptor */
1409 dup2 (pty.tty, STDIN_FILENO); 1431 dup2 (pty->tty, STDIN_FILENO);
1410 dup2 (pty.tty, STDOUT_FILENO); 1432 dup2 (pty->tty, STDOUT_FILENO);
1411 dup2 (pty.tty, STDERR_FILENO); 1433 dup2 (pty->tty, STDERR_FILENO);
1412 1434
1413 // close all our file handles that we do no longer need 1435 // close all our file handles that we do no longer need
1414 for (rxvt_term **t = termlist.begin (); t < termlist.end (); t++) 1436 for (rxvt_term **t = termlist.begin (); t < termlist.end (); t++)
1415 { 1437 {
1416 if ((*t)->pty.pty > 2) close ((*t)->pty.pty); 1438 if ((*t)->pty->pty > 2) close ((*t)->pty->pty);
1417 if ((*t)->pty.tty > 2) close ((*t)->pty.tty); 1439 if ((*t)->pty->tty > 2) close ((*t)->pty->tty);
1418 } 1440 }
1419 1441
1420 run_child (argv); 1442 run_child (argv);
1421 fprintf (stderr, "%s: unable to exec child.", RESNAME); 1443 fprintf (stderr, "%s: unable to exec child.", RESNAME);
1422 } 1444 }
1423 1445
1424 _exit (EXIT_FAILURE); 1446 _exit (EXIT_FAILURE);
1425 1447
1426 default: 1448 default:
1427 { 1449 if (!OPTION (Opt_utmpInhibit))
1428#if defined(HAVE_STRUCT_UTMP) && defined(HAVE_TTYSLOT) 1450 pty->login (cmd_pid, OPTION (Opt_loginShell), rs[Rs_display_name]);
1429 int fdstdin;
1430 1451
1431 fdstdin = dup (STDIN_FILENO); 1452 pty->close_tty ();
1432 dup2 (pty.tty, STDIN_FILENO);
1433#endif
1434 1453
1435#ifdef UTMP_SUPPORT 1454 child_ev.start (cmd_pid);
1436 privileged_utmp (SAVE);
1437#endif
1438 1455
1439#if defined(HAVE_STRUCT_UTMP) && defined(HAVE_TTYSLOT) 1456 HOOK_INVOKE ((this, HOOK_CHILD_START, DT_INT, cmd_pid, DT_END));
1440
1441 dup2 (fdstdin, STDIN_FILENO);
1442 close (fdstdin);
1443#endif
1444 }
1445
1446 pty.close_tty (); /* keep STDERR_FILENO, pty.pty, display->fd () open */
1447 break; 1457 break;
1448 } 1458 }
1449#else /* __QNX__ uses qnxspawn () */
1450 fchmod (pty.tty, 0622);
1451 fcntl (pty.tty, F_SETFD, FD_CLOEXEC);
1452 fcntl (pty.pty, F_SETFD, FD_CLOEXEC);
1453
1454 if (run_child (argv) == -1)
1455 exit (EXIT_FAILURE);
1456#endif
1457} 1459}
1458 1460
1459/* ------------------------------------------------------------------------- * 1461/* ------------------------------------------------------------------------- *
1460 * CHILD PROCESS OPERATIONS * 1462 * CHILD PROCESS OPERATIONS *
1461 * ------------------------------------------------------------------------- */ 1463 * ------------------------------------------------------------------------- */
… …
1468{ 1470{
1469 char *login; 1471 char *login;
1470 1472
1471 SET_TTYMODE (STDIN_FILENO, &tio); /* init terminal attributes */ 1473 SET_TTYMODE (STDIN_FILENO, &tio); /* init terminal attributes */
1472 1474
1473 if (options & Opt_console) 1475 if (OPTION (Opt_console))
1474 { /* be virtual console, fail silently */ 1476 { /* be virtual console, fail silently */
1475#ifdef TIOCCONS 1477#ifdef TIOCCONS
1476 unsigned int on = 1; 1478 unsigned int on = 1;
1477 1479
1478 ioctl (STDIN_FILENO, TIOCCONS, &on); 1480 ioctl (STDIN_FILENO, TIOCCONS, &on);
… …
1505 // unblock signals (signals are blocked by iom.C 1507 // unblock signals (signals are blocked by iom.C
1506 sigset_t ss; 1508 sigset_t ss;
1507 sigemptyset (&ss); 1509 sigemptyset (&ss);
1508 sigprocmask (SIG_SETMASK, &ss, 0); 1510 sigprocmask (SIG_SETMASK, &ss, 0);
1509 1511
1510#ifndef __QNX__
1511 /* command interpreter path */ 1512 /* command interpreter path */
1512 if (argv != NULL) 1513 if (argv != NULL)
1513 { 1514 {
1514# ifdef DEBUG_CMD 1515# ifdef DEBUG_CMD
1515 int i; 1516 int i;
… …
1521 execvp (argv[0], (char *const *)argv); 1522 execvp (argv[0], (char *const *)argv);
1522 /* no error message: STDERR is closed! */ 1523 /* no error message: STDERR is closed! */
1523 } 1524 }
1524 else 1525 else
1525 { 1526 {
1526 const char *argv0, *shell; 1527 const char *argv0, *shell;
1527 1528
1528 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0') 1529 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0')
1529 shell = "/bin/sh"; 1530 shell = "/bin/sh";
1530 1531
1531 argv0 = (const char *)rxvt_r_basename (shell); 1532 argv0 = (const char *)rxvt_r_basename (shell);
1532 1533
1533 if (options & Opt_loginShell) 1534 if (OPTION (Opt_loginShell))
1534 { 1535 {
1535 login = (char *)rxvt_malloc ((strlen (argv0) + 2) * sizeof (char)); 1536 login = (char *)rxvt_malloc ((strlen (argv0) + 2) * sizeof (char));
1536 1537
1537 login[0] = '-'; 1538 login[0] = '-';
1538 strcpy (&login[1], argv0); 1539 strcpy (&login[1], argv0);
1539 argv0 = login; 1540 argv0 = login;
1540 } 1541 }
1542
1541 execlp (shell, argv0, NULL); 1543 execlp (shell, argv0, NULL);
1542 /* no error message: STDERR is closed! */ 1544 /* no error message: STDERR is closed! */
1543 } 1545 }
1544 1546
1545#else /* __QNX__ uses qnxspawn () */
1546
1547 char iov_a[10] = { -1, -1, -1, -1, -1, -1, -1, -1, -1, -1 };
1548 char *command = NULL, fullcommand[_MAX_PATH];
1549 char **arg_v, *arg_a[2] = { NULL, NULL };
1550
1551 if (argv != NULL)
1552 {
1553 if (access (argv[0], X_OK) == -1)
1554 {
1555 if (strchr (argv[0], '/') == NULL)
1556 {
1557 searchenv (argv[0], "PATH", fullcommand);
1558
1559 if (fullcommand[0] != '\0')
1560 command = fullcommand;
1561 }
1562
1563 if (access (command, X_OK) == -1)
1564 return -1;
1565 }
1566 else
1567 command = argv[0];
1568
1569 arg_v = argv;
1570 }
1571 else
1572 {
1573 if ((command = getenv ("SHELL")) == NULL || *command == '\0')
1574 command = "/bin/sh";
1575
1576 arg_a[0] = my_basename (command);
1577
1578 if (options & Opt_loginShell)
1579 {
1580 login = rxvt_malloc ((strlen (arg_a[0]) + 2) * sizeof (char));
1581
1582 login[0] = '-';
1583 strcpy (&login[1], arg_a[0]);
1584 arg_a[0] = login;
1585 }
1586
1587 arg_v = arg_a;
1588 }
1589
1590 iov_a[0] = iov_a[1] = iov_a[2] = pty.tty;
1591 cmd_pid = qnx_spawn (0, 0, 0, -1, -1,
1592 _SPAWN_SETSID | _SPAWN_TCSETPGRP,
1593 command, arg_v, environ, iov_a, 0);
1594 if (login)
1595 free (login);
1596
1597 pty.close_tty ();
1598 return pty.pty;
1599#endif
1600
1601 return -1; 1547 return -1;
1602} 1548}
1603 1549
1604/*----------------------- end-of-file (C source) -----------------------*/ 1550/*----------------------- end-of-file (C source) -----------------------*/

Diff Legend

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