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

Diff Legend

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