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.109 by root, Mon Feb 14 18:47:54 2005 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.
… …
34#include "../config.h" /* NECESSARY */ 34#include "../config.h" /* NECESSARY */
35#include "rxvt.h" /* NECESSARY */ 35#include "rxvt.h" /* NECESSARY */
36#include "rxvtutil.h" 36#include "rxvtutil.h"
37#include "init.h" 37#include "init.h"
38 38
39#include <limits>
40
39#include <csignal> 41#include <csignal>
40 42
41const char *const def_colorName[] = 43const char *const def_colorName[] =
42 { 44 {
43 COLOR_FOREGROUND, 45 COLOR_FOREGROUND,
44 COLOR_BACKGROUND, 46 COLOR_BACKGROUND,
45 /* low-intensity colors */ 47 /* low-intensity colors */
46 "Black", /* 0: black (#000000) */ 48 "Black", /* 0: black (#000000) */
47#ifndef NO_BRIGHTCOLOR
48 "Red3", /* 1: red (#CD0000) */ 49 "Red3", /* 1: red (#CD0000) */
49 "Green3", /* 2: green (#00CD00) */ 50 "Green3", /* 2: green (#00CD00) */
50 "Yellow3", /* 3: yellow (#CDCD00) */ 51 "Yellow3", /* 3: yellow (#CDCD00) */
51 "Blue3", /* 4: blue (#0000CD) */ 52 "Blue3", /* 4: blue (#0000CD) */
52 "Magenta3", /* 5: magenta (#CD00CD) */ 53 "Magenta3", /* 5: magenta (#CD00CD) */
… …
60# ifdef XTERM_COLORS 61# ifdef XTERM_COLORS
61 "Grey30", /* 8: bright black (#4D4D4D) */ 62 "Grey30", /* 8: bright black (#4D4D4D) */
62# else 63# else
63 "Grey25", /* 8: bright black (#404040) */ 64 "Grey25", /* 8: bright black (#404040) */
64# endif 65# endif
65#endif /* NO_BRIGHTCOLOR */
66 "Red", /* 1/9: bright red (#FF0000) */ 66 "Red", /* 1/9: bright red (#FF0000) */
67 "Green", /* 2/10: bright green (#00FF00) */ 67 "Green", /* 2/10: bright green (#00FF00) */
68 "Yellow", /* 3/11: bright yellow (#FFFF00) */ 68 "Yellow", /* 3/11: bright yellow (#FFFF00) */
69 "Blue", /* 4/12: bright blue (#0000FF) */ 69 "Blue", /* 4/12: bright blue (#0000FF) */
70 "Magenta", /* 5/13: bright magenta (#FF00FF) */ 70 "Magenta", /* 5/13: bright magenta (#FF00FF) */
… …
169 COLOR_SCROLLTROUGH, 169 COLOR_SCROLLTROUGH,
170#endif /* KEEP_SCROLLCOLOR */ 170#endif /* KEEP_SCROLLCOLOR */
171#if TINTING 171#if TINTING
172 NULL, 172 NULL,
173#endif 173#endif
174#if OFF_FOCUS_FADING
175 "black",
176#endif
174 }; 177 };
175 178
176const char *const xa_names[] = 179const char *const xa_names[] =
177 { 180 {
178 "TEXT", 181 "TEXT",
… …
181 "MULTIPLE", 184 "MULTIPLE",
182 "TARGETS", 185 "TARGETS",
183 "TIMESTAMP", 186 "TIMESTAMP",
184 "VT_SELECTION", 187 "VT_SELECTION",
185 "INCR", 188 "INCR",
189 "WM_PROTOCOLS",
186 "WM_DELETE_WINDOW", 190 "WM_DELETE_WINDOW",
187 "CLIPBOARD", 191 "CLIPBOARD",
188#if ENABLE_FRILLS 192#if ENABLE_FRILLS
193 "_MOTIF_WM_HINTS",
194#endif
195#if ENABLE_EWMH
189 "_NET_WM_PID", 196 "_NET_WM_PID",
190 "_MOTIF_WM_HINTS",
191 "_NET_WM_NAME", 197 "_NET_WM_NAME",
192 "_NET_WM_ICON_NAME", 198 "_NET_WM_ICON_NAME",
199 "_NET_WM_PING",
193#endif 200#endif
194#if USE_XIM 201#if USE_XIM
195 "WM_LOCALE_NAME", 202 "WM_LOCALE_NAME",
196#endif 203#endif
197#ifdef TRANSPARENT 204#ifdef TRANSPARENT
198 "_XROOTPMAP_ID", 205 "_XROOTPMAP_ID",
199 "ESETROOT_PMAP_ID", 206 "ESETROOT_PMAP_ID",
200#endif 207#endif
201#ifdef OFFIX_DND 208#if ENABLE_XEMBED
202 "DndProtocol", 209 "_XEMBED",
203 "DndSelection", 210 "_XEMBED_INFO",
204#endif 211#endif
205 }; 212 };
206 213
207bool 214bool
208rxvt_term::init_vars () 215rxvt_term::init_vars ()
209{ 216{
210 sw_term.start (SIGTERM);
211 sw_int.start (SIGINT);
212
213 pix_colors_focused = new rxvt_color [TOTAL_COLORS]; 217 pix_colors_focused = new rxvt_color [TOTAL_COLORS];
214#ifdef OFF_FOCUS_FADING 218#ifdef OFF_FOCUS_FADING
215 pix_colors_unfocused = new rxvt_color [TOTAL_COLORS]; 219 pix_colors_unfocused = new rxvt_color [TOTAL_COLORS];
216#endif 220#endif
217 pix_colors = pix_colors_focused; 221 pix_colors = pix_colors_focused;
218 222
219 if (pix_colors == NULL) 223 if (pix_colors == NULL)
220 return false; 224 return false;
221 225
222#if defined(XPM_BACKGROUND) || defined(TRANSPARENT) 226#if defined(XPM_BACKGROUND) || defined(TRANSPARENT)
223 TermWin.pixmap = None; 227 pixmap = None;
224#endif 228#endif
225 229
226 MEvent.time = CurrentTime; 230 MEvent.time = CurrentTime;
227 MEvent.button = AnyButton; 231 MEvent.button = AnyButton;
228 options = DEFAULT_OPTIONS; 232 options = DEFAULT_OPTIONS;
229 want_refresh = 1; 233 want_refresh = 1;
230 cmd_pid = -1;
231 pty.pty = pty.tty = -1;
232 priv_modes = SavedModes = PrivMode_Default; 234 priv_modes = SavedModes = PrivMode_Default;
233 TermWin.focus = 0; 235 focus = 0;
234 TermWin.ncol = 80; 236 ncol = 80;
235 TermWin.nrow = 24; 237 nrow = 24;
236 TermWin.int_bwidth = INTERNALBORDERWIDTH; 238 int_bwidth = INTERNALBORDERWIDTH;
237 TermWin.ext_bwidth = EXTERNALBORDERWIDTH; 239 ext_bwidth = EXTERNALBORDERWIDTH;
238 TermWin.lineSpace = LINESPACE; 240 lineSpace = LINESPACE;
239 TermWin.saveLines = SAVELINES; 241 saveLines = SAVELINES;
240 numpix_colors = TOTAL_COLORS; 242 numpix_colors = TOTAL_COLORS;
241 243
242 refresh_limit = 1; 244 refresh_limit = 1;
243 refresh_type = SLOW_REFRESH; 245 refresh_type = SLOW_REFRESH;
244 prev_nrow = prev_ncol = 0; 246 prev_nrow = prev_ncol = 0;
… …
249 bgPixmap.x = bgPixmap.y = 50; 251 bgPixmap.x = bgPixmap.y = 50;
250 bgPixmap.pixmap = None; 252 bgPixmap.pixmap = None;
251#endif 253#endif
252 254
253 last_bot = last_state = -1; 255 last_bot = last_state = -1;
254
255#ifdef MENUBAR
256 menu_readonly = 1;
257# if ! (MENUBAR_MAX > 1)
258 CurrentBar = &BarList;
259# endif /* (MENUBAR_MAX > 1) */
260#endif
261 256
262 return true; 257 return true;
263} 258}
264 259
265void 260void
… …
333 rs[Rs_name] = rxvt_r_basename (argv[0]); 328 rs[Rs_name] = rxvt_r_basename (argv[0]);
334 329
335 /* 330 /*
336 * Open display, get options/resources and create the window 331 * Open display, get options/resources and create the window
337 */ 332 */
333
338 if ((rs[Rs_display_name] = getenv ("DISPLAY")) == NULL) 334 if ((rs[Rs_display_name] = getenv ("DISPLAY")) == NULL)
339 rs[Rs_display_name] = ":0"; 335 rs[Rs_display_name] = ":0";
340 336
341 get_options (r_argc, r_argv); 337 get_options (r_argc, r_argv);
342 338
343#ifdef LOCAL_X_IS_UNIX
344 if (rs[Rs_display_name][0] == ':')
345 {
346 val = rxvt_malloc (5 + strlen (rs[Rs_display_name]));
347 strcpy (val, "unix");
348 strcat (val, rs[Rs_display_name]);
349 display = displays.get (val);
350 free (val);
351 }
352#endif
353
354 if (!display
355 && ! (display = displays.get (rs[Rs_display_name]))) 339 if (!(display = displays.get (rs[Rs_display_name])))
356 rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]); 340 rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]);
357 341
358 extract_resources (); 342 extract_resources ();
343
359 free (r_argv); 344 free (r_argv);
345
346#if ENABLE_PERL
347 if (!rs[Rs_perl_ext_1])
348 rs[Rs_perl_ext_1] = "default";
349
350 if ((rs[Rs_perl_ext_1] && *rs[Rs_perl_ext_1])
351 || (rs[Rs_perl_ext_2] && *rs[Rs_perl_ext_2])
352 || (rs[Rs_perl_eval] && *rs[Rs_perl_eval]))
353 {
354 rxvt_perl.init (this);
355 HOOK_INVOKE ((this, HOOK_INIT, DT_END));
356 }
357#endif
360 358
361 /* 359 /*
362 * set any defaults not already set 360 * set any defaults not already set
363 */ 361 */
364 if (cmd_argv && cmd_argv[0]) 362 if (cmd_argv && cmd_argv[0])
… …
375 if (!rs[Rs_iconName]) 373 if (!rs[Rs_iconName])
376 rs[Rs_iconName] = rs[Rs_name]; 374 rs[Rs_iconName] = rs[Rs_name];
377 } 375 }
378 376
379 if (rs[Rs_saveLines] && (i = atoi (rs[Rs_saveLines])) >= 0) 377 if (rs[Rs_saveLines] && (i = atoi (rs[Rs_saveLines])) >= 0)
380 TermWin.saveLines = BOUND_POSITIVE_INT16 (i); 378 saveLines = min (i, MAX_SAVELINES);
381 379
382#if ENABLE_FRILLS 380#if ENABLE_FRILLS
383 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)
384 TermWin.int_bwidth = min (i, 100); /* arbitrary limit */ 382 int_bwidth = min (i, std::numeric_limits<int16_t>::max ());
383
385 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)
386 TermWin.ext_bwidth = min (i, 100); /* arbitrary limit */ 385 ext_bwidth = min (i, std::numeric_limits<int16_t>::max ());
386
387 if (rs[Rs_lineSpace] && (i = atoi (rs[Rs_lineSpace])) >= 0) 387 if (rs[Rs_lineSpace] && (i = atoi (rs[Rs_lineSpace])) >= 0)
388 TermWin.lineSpace = min (i, 100); /* arbitrary limit */ 388 lineSpace = min (i, std::numeric_limits<int16_t>::max ());
389#endif 389#endif
390 390
391#ifdef POINTER_BLANK 391#ifdef POINTER_BLANK
392 if (rs[Rs_pointerBlankDelay] && (i = atoi (rs[Rs_pointerBlankDelay])) >= 0) 392 if (rs[Rs_pointerBlankDelay] && (i = atoi (rs[Rs_pointerBlankDelay])) >= 0)
393 pointerBlankDelay = i; 393 pointerBlankDelay = i;
394 else 394 else
395 pointerBlankDelay = 2; 395 pointerBlankDelay = 2;
396#endif 396#endif
397 397
398 /* no point having a scrollbar without having any scrollback! */ 398 /* no point having a scrollbar without having any scrollback! */
399 if (!TermWin.saveLines) 399 if (!saveLines)
400 options &= ~Opt_scrollBar; 400 set_option (Opt_scrollBar, 0);
401 401
402#ifdef PRINTPIPE 402#ifdef PRINTPIPE
403 if (!rs[Rs_print_pipe]) 403 if (!rs[Rs_print_pipe])
404 rs[Rs_print_pipe] = PRINTPIPE; 404 rs[Rs_print_pipe] = PRINTPIPE;
405#endif 405#endif
… …
448 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]);
449#endif 449#endif
450 450
451#ifdef XTERM_REVERSE_VIDEO 451#ifdef XTERM_REVERSE_VIDEO
452 /* this is how xterm implements reverseVideo */ 452 /* this is how xterm implements reverseVideo */
453 if (options & Opt_reverseVideo) 453 if (OPTION (Opt_reverseVideo))
454 { 454 {
455 if (!rs[Rs_color + Color_fg]) 455 if (!rs[Rs_color + Color_fg])
456 rs[Rs_color + Color_fg] = def_colorName[Color_bg]; 456 rs[Rs_color + Color_fg] = def_colorName[Color_bg];
457 if (!rs[Rs_color + Color_bg]) 457 if (!rs[Rs_color + Color_bg])
458 rs[Rs_color + Color_bg] = def_colorName[Color_fg]; 458 rs[Rs_color + Color_bg] = def_colorName[Color_fg];
… …
463 if (!rs[Rs_color + i]) 463 if (!rs[Rs_color + i])
464 rs[Rs_color + i] = def_colorName[i]; 464 rs[Rs_color + i] = def_colorName[i];
465 465
466#ifndef XTERM_REVERSE_VIDEO 466#ifndef XTERM_REVERSE_VIDEO
467 /* this is how we implement reverseVideo */ 467 /* this is how we implement reverseVideo */
468 if (options & Opt_reverseVideo) 468 if (OPTION (Opt_reverseVideo))
469 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]);
470#endif 470#endif
471 471
472 /* convenient aliases for setting fg/bg to colors */ 472 /* convenient aliases for setting fg/bg to colors */
473 color_aliases (Color_fg); 473 color_aliases (Color_fg);
474 color_aliases (Color_bg); 474 color_aliases (Color_bg);
… …
524 env_display = (char *)rxvt_malloc ((i + 9) * sizeof (char)); 524 env_display = (char *)rxvt_malloc ((i + 9) * sizeof (char));
525 525
526 sprintf (env_display, "DISPLAY=%s", val); 526 sprintf (env_display, "DISPLAY=%s", val);
527 527
528 /* avoiding the math library: 528 /* avoiding the math library:
529 * i = (int) (ceil (log10 ((unsigned int)TermWin.parent[0]))) */ 529 * i = (int) (ceil (log10 ((unsigned int)parent[0]))) */
530 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++)
531 ; 531 ;
532 MAX_IT (i, 1); 532 max_it (i, 1);
533 env_windowid = (char *)rxvt_malloc ((i + 10) * sizeof (char)); 533 env_windowid = (char *)rxvt_malloc ((i + 10) * sizeof (char));
534 534
535 sprintf (env_windowid, "WINDOWID=%u", 535 sprintf (env_windowid, "WINDOWID=%u",
536 (unsigned int)TermWin.parent[0]); 536 (unsigned int)parent[0]);
537 537
538 /* add entries to the environment: 538 /* add entries to the environment:
539 * @ DISPLAY: in case we started with -display 539 * @ DISPLAY: in case we started with -display
540 * @ WINDOWID: X window id number of the window 540 * @ WINDOWID: X window id number of the window
541 * @ COLORTERM: terminal sub-name and also indicates its color 541 * @ COLORTERM: terminal sub-name and also indicates its color
… …
580 * This should support all European type languages. 580 * This should support all European type languages.
581 */ 581 */
582void 582void
583rxvt_term::set_locale (const char *locale) 583rxvt_term::set_locale (const char *locale)
584{ 584{
585 set_environ (envv);
586
585#if HAVE_XSETLOCALE || HAVE_SETLOCALE 587#if HAVE_XSETLOCALE || HAVE_SETLOCALE
586 free (this->locale); 588 free (this->locale);
587 this->locale = setlocale (LC_CTYPE, locale); 589 this->locale = setlocale (LC_CTYPE, locale);
588 590
589 if (!this->locale) 591 if (!this->locale)
590 { 592 {
591 if (*locale) 593 if (*locale)
592 { 594 {
593 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);
594 setlocale (LC_CTYPE, ""); 596 setlocale (LC_CTYPE, "C");
595 } 597 }
596 else 598 else
597 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");
598 600
599 this->locale = ""; 601 this->locale = "C";
600 } 602 }
601 603
602 604
603 this->locale = rxvt_strdup (this->locale); 605 this->locale = rxvt_strdup (this->locale);
604 SET_LOCALE (this->locale); 606 SET_LOCALE (this->locale);
… …
619} 621}
620 622
621void 623void
622rxvt_term::init_xlocale () 624rxvt_term::init_xlocale ()
623{ 625{
626 set_environ (envv);
627
624#ifdef USE_XIM 628#ifdef USE_XIM
625 if (!locale) 629 if (!locale)
626 rxvt_warn ("setting locale failed, working without locale support.\n"); 630 rxvt_warn ("setting locale failed, working without locale support.\n");
627 else 631 else
628 { 632 {
… …
650 * Initialize the command connection. 654 * Initialize the command connection.
651 * This should be called after the X server connection is established. 655 * This should be called after the X server connection is established.
652 */ 656 */
653 657
654#ifdef META8_OPTION 658#ifdef META8_OPTION
655 meta_char = (options & Opt_meta8 ? 0x80 : C0_ESC); 659 meta_char = OPTION (Opt_meta8) ? 0x80 : C0_ESC;
656#endif 660#endif
657 661
658 get_ourmods (); 662 get_ourmods ();
659 663
660 if (!(options & Opt_scrollTtyOutput)) 664 if (!OPTION (Opt_scrollTtyOutput))
661 priv_modes |= PrivMode_TtyOutputInh; 665 priv_modes |= PrivMode_TtyOutputInh;
662 if (options & Opt_scrollTtyKeypress) 666 if (OPTION (Opt_scrollTtyKeypress))
663 priv_modes |= PrivMode_Keypress; 667 priv_modes |= PrivMode_Keypress;
664 if (!(options & Opt_jumpScroll)) 668 if (!OPTION (Opt_jumpScroll))
665 priv_modes |= PrivMode_smoothScroll; 669 priv_modes |= PrivMode_smoothScroll;
666 670
667#ifndef NO_BACKSPACE_KEY 671#ifndef NO_BACKSPACE_KEY
668 if (strcmp (key_backspace, "DEC") == 0) 672 if (strcmp (key_backspace, "DEC") == 0)
669 priv_modes |= PrivMode_HaveBackSpace; 673 priv_modes |= PrivMode_HaveBackSpace;
670#endif 674#endif
671 675
672 /* add value for scrollBar */ 676 /* add value for scrollBar */
673 if (scrollbar_visible ()) 677 if (scrollBar.state)
674 { 678 {
675 priv_modes |= PrivMode_scrollBar; 679 priv_modes |= PrivMode_scrollBar;
676 SavedModes |= PrivMode_scrollBar; 680 SavedModes |= PrivMode_scrollBar;
677 } 681 }
678 if (menubar_visible ())
679 {
680 priv_modes |= PrivMode_menuBar;
681 SavedModes |= PrivMode_menuBar;
682 }
683
684#ifdef CURSOR_BLINK
685 if (options & Opt_cursorBlink)
686 (void)gettimeofday (&lastcursorchange, NULL);
687#endif
688 682
689 run_command (argv); 683 run_command (argv);
690} 684}
691 685
692/*----------------------------------------------------------------------*/ 686/*----------------------------------------------------------------------*/
… …
707 continue; 701 continue;
708 702
709 if (!rXParseAllocColor (&xcol, rs[Rs_color + i])) 703 if (!rXParseAllocColor (&xcol, rs[Rs_color + i]))
710 { 704 {
711#ifndef XTERM_REVERSE_VIDEO 705#ifndef XTERM_REVERSE_VIDEO
712 if (i < 2 && (options & Opt_reverseVideo)) 706 if (i < 2 && OPTION (Opt_reverseVideo))
713 rs[Rs_color + i] = def_colorName[!i]; 707 rs[Rs_color + i] = def_colorName[!i];
714 else 708 else
715#endif 709#endif
716 rs[Rs_color + i] = def_colorName[i]; 710 rs[Rs_color + i] = def_colorName[i];
717 711
… …
742 } 736 }
743 } 737 }
744 } 738 }
745 739
746 pix_colors[i] = xcol; 740 pix_colors[i] = xcol;
741 SET_PIXCOLOR (i);
742 }
743
747#ifdef OFF_FOCUS_FADING 744#ifdef OFF_FOCUS_FADING
748 if (rs[Rs_fade]) 745 if (rs[Rs_fade])
746 for (i = 0; i < (display->depth <= 2 ? 2 : NRS_COLORS); i++)
749 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]);
750#endif 748#endif
751 SET_PIXCOLOR (i);
752 }
753 749
754 if (display->depth <= 2) 750 if (display->depth <= 2)
755 { 751 {
756 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];
757 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];
758 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];
759 } 755 }
760 756
761 /* 757 /*
762 * get scrollBar/menuBar shadow colors 758 * get scrollBar shadow colors
763 * 759 *
764 * The calculations of topShadow/bottomShadow values are adapted 760 * The calculations of topShadow/bottomShadow values are adapted
765 * from the fvwm window manager. 761 * from the fvwm window manager.
766 */ 762 */
767#ifdef KEEP_SCROLLCOLOR 763#ifdef KEEP_SCROLLCOLOR
768 764
769 if (display->depth <= 2) 765 if (display->depth <= 2)
766 {
770 { /* Monochrome */ 767 /* Monochrome */
771 pix_colors[Color_scroll] = pix_colors[Color_fg]; 768 pix_colors[Color_scroll] = pix_colors[Color_fg];
772 pix_colors[Color_topShadow] = pix_colors[Color_bg]; 769 pix_colors[Color_topShadow] = pix_colors[Color_bg];
773 pix_colors[Color_bottomShadow] = pix_colors[Color_bg]; 770 pix_colors[Color_bottomShadow] = pix_colors[Color_bg];
774 } 771 }
775 else 772 else
… …
811 int i = atoi (rs[Rs_color + idx]); 808 int i = atoi (rs[Rs_color + idx]);
812 809
813 if (i >= 8 && i <= 15) 810 if (i >= 8 && i <= 15)
814 { /* bright colors */ 811 { /* bright colors */
815 i -= 8; 812 i -= 8;
816#ifndef NO_BRIGHTCOLOR
817 rs[Rs_color + idx] = rs[Rs_color + minBrightCOLOR + i]; 813 rs[Rs_color + idx] = rs[Rs_color + minBrightCOLOR + i];
818 return; 814 return;
819#endif
820 } 815 }
821 816
822 if (i >= 0 && i <= 7) /* normal colors */ 817 if (i >= 0 && i <= 7) /* normal colors */
823 rs[Rs_color + idx] = rs[Rs_color + minCOLOR + i]; 818 rs[Rs_color + idx] = rs[Rs_color + minCOLOR + i];
824 } 819 }
… …
923#if ENABLE_FRILLS 918#if ENABLE_FRILLS
924 Atom prop = None; 919 Atom prop = None;
925 MWMHints mwmhints; 920 MWMHints mwmhints;
926#endif 921#endif
927 XGCValues gcvalue; 922 XGCValues gcvalue;
928 long vt_emask;
929 XSetWindowAttributes attributes; 923 XSetWindowAttributes attributes;
930 XWindowAttributes gattr; 924 XWindowAttributes gattr;
931 Window top; 925 Window top, parent;
932 dDisp; 926 dDisp;
933 927
934#ifdef USING_W11LIB 928#ifdef USING_W11LIB
935 /* enable W11 callbacks */ 929 /* enable W11 callbacks */
936 W11AddEventHandler (disp, rxvt_W11_process_x_event); 930 W11AddEventHandler (disp, rxvt_W11_process_x_event);
937#endif 931#endif
938 932
939 assert (sizeof (xa_names) / sizeof (char *) == NUM_XA); 933 assert (sizeof (xa_names) / sizeof (char *) == NUM_XA);
940 XInternAtoms (disp, (char **)xa_names, NUM_XA, False, xa); 934 XInternAtoms (disp, (char **)xa_names, NUM_XA, False, xa);
941 935
942 if (options & Opt_transparent) 936 if (OPTION (Opt_transparent))
943 { 937 {
944 XGetWindowAttributes (disp, RootWindow (disp, display->screen), &gattr); 938 XGetWindowAttributes (disp, RootWindow (disp, display->screen), &gattr);
945 display->depth = gattr.depth; // doh //TODO, per-term not per-display? 939 display->depth = gattr.depth; // doh //TODO, per-term not per-display?
946 } 940 }
947 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
948#if ENABLE_FRILLS 952#if ENABLE_FRILLS
949 if (options & Opt_borderLess) 953 if (OPTION (Opt_borderLess))
950 { 954 {
951 prop = XInternAtom(disp, "_MOTIF_WM_INFO", True); 955 prop = XInternAtom (disp, "_MOTIF_WM_INFO", True);
952 956
953 if (prop == None) 957 if (prop == None)
954 { 958 {
955 /* 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");*/
956#ifdef PREFER_24BIT
957 attributes.override_redirect = TRUE; 960 attributes.override_redirect = TRUE;
958#endif
959 mwmhints.flags = 0; 961 mwmhints.flags = 0;
960 } 962 }
961 else 963 else
962 { 964 {
963 mwmhints.flags = MWM_HINTS_DECORATIONS; 965 mwmhints.flags = MWM_HINTS_DECORATIONS;
964 mwmhints.decorations = 0; 966 mwmhints.decorations = 0;
965 } 967 }
966 } 968 }
967 else 969 else
968 {
969 mwmhints.flags = 0; 970 mwmhints.flags = 0;
970 }
971#endif 971#endif
972 972
973 /* grab colors before netscape does */ 973#if ENABLE_XEMBED
974 Get_Colours ();
975
976 if (!set_fonts ())
977 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n");
978
979#if ENABLE_FRILLS
980 if (rs[Rs_embed]) 974 if (rs[Rs_embed])
981 { 975 {
982 top = strtol (rs[Rs_embed], 0, 0);
983
984 XWindowAttributes wattr; 976 XWindowAttributes wattr;
977
978 parent = strtol (rs[Rs_embed], 0, 0);
979
985 XGetWindowAttributes (disp, top, &wattr); 980 if (!XGetWindowAttributes (disp, parent, &wattr))
981 rxvt_fatal ("invalid window-id specified with -embed, aborting.\n");
986 982
987 window_calc (wattr.width, wattr.height); 983 window_calc (wattr.width, wattr.height);
988
989#if 0
990 if (wattr.map_state == IsViewable)
991 {
992 TermWin.mapped = 1;
993 refresh_type = FAST_REFRESH;
994 XClearWindow (disp, top);
995 // TODO: make XMapNotify-event-code a function and call it
996 // TODO: how can I detetc visibility without unmpa/map?
997 // TODO: focusin etc.
998 }
999#else
1000 // it'S easiets just to unmap/map to get all state correctly set-up
1001 XUnmapWindow (disp, top);
1002#endif
1003 }
1004 else
1005#endif
1006 { 984 }
985#endif
986
1007 window_calc (0, 0); 987 window_calc (0, 0);
1008 988
1009 /* sub-window placement & size in rxvt_resize_subwindows () */ 989 /* sub-window placement & size in rxvt_resize_subwindows () */
1010#ifdef PREFER_24BIT
1011 attributes.background_pixel = pix_colors_focused[Color_border]; 990 attributes.background_pixel = pix_colors_focused[Color_border];
1012 attributes.border_pixel = pix_colors_focused[Color_border]; 991 attributes.border_pixel = pix_colors_focused[Color_border];
1013 attributes.colormap = display->cmap; 992 attributes.colormap = display->cmap;
1014 top = XCreateWindow (disp, DefaultRootWindow (disp), 993 top = XCreateWindow (disp, parent,
1015 szHint.x, szHint.y, 994 szHint.x, szHint.y,
1016 szHint.width, szHint.height, 995 szHint.width, szHint.height,
1017 TermWin.ext_bwidth, 996 ext_bwidth,
1018 display->depth, InputOutput, 997 display->depth, InputOutput,
1019 display->visual, 998 display->visual,
1020 CWColormap | CWBackPixel | CWBorderPixel, &attributes); 999 CWColormap | CWBackPixel | CWBorderPixel | CWOverrideRedirect,
1021#else 1000 &attributes);
1022 top = XCreateSimpleWindow (disp, DefaultRootWindow (disp),
1023 szHint.x, szHint.y,
1024 szHint.width, szHint.height,
1025 TermWin.ext_bwidth,
1026 pix_colors_focused[Color_border],
1027 pix_colors_focused[Color_border]);
1028#endif
1029 }
1030 1001
1031 TermWin.parent[0] = top; 1002 this->parent[0] = top;
1032 1003
1033 old_width = szHint.width; 1004 old_width = szHint.width;
1034 old_height = szHint.height; 1005 old_height = szHint.height;
1035 1006
1036 process_xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST); 1007 process_xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST);
… …
1039 classHint.res_name = (char *)rs[Rs_name]; 1010 classHint.res_name = (char *)rs[Rs_name];
1040 classHint.res_class = (char *)RESCLASS; 1011 classHint.res_class = (char *)RESCLASS;
1041 1012
1042 wmHint.flags = InputHint | StateHint | WindowGroupHint; 1013 wmHint.flags = InputHint | StateHint | WindowGroupHint;
1043 wmHint.input = True; 1014 wmHint.input = True;
1044 wmHint.initial_state = options & Opt_iconic ? IconicState : NormalState; 1015 wmHint.initial_state = OPTION (Opt_iconic) ? IconicState : NormalState;
1045 wmHint.window_group = top; 1016 wmHint.window_group = top;
1046 1017
1047 XSetWMProperties (disp, top, NULL, NULL, 1018 XmbSetWMProperties (disp, top, NULL, NULL, (char **)argv, argc,
1048 (char **)argv, argc, &szHint, &wmHint, &classHint); 1019 &szHint, &wmHint, &classHint);
1049 1020
1050 /* Enable delete window protocol */ 1021 Atom protocols[] = {
1051 XSetWMProtocols (disp, top, &xa[XA_WMDELETEWINDOW], 1); 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]));
1052 1029
1053#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
1054 long pid = getpid (); 1036 long pid = getpid ();
1055 1037
1056 XChangeProperty (disp, top, 1038 XChangeProperty (disp, top,
1057 xa[XA_NET_WM_PID], XA_CARDINAL, 32, 1039 xa[XA_NET_WM_PID], XA_CARDINAL, 32,
1058 PropModeReplace, (unsigned char *)&pid, 1); 1040 PropModeReplace, (unsigned char *)&pid, 1);
1041
1042 // _NET_WM_WINDOW_TYPE is NORMAL, which is the default
1059#endif 1043#endif
1060 1044
1061 XSelectInput (disp, top, 1045 XSelectInput (disp, top,
1062 KeyPressMask 1046 KeyPressMask
1063#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ENABLE_FRILLS || ISO_14755 1047#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ENABLE_FRILLS || ISO_14755
1064 | KeyReleaseMask 1048 | KeyReleaseMask
1065#endif 1049#endif
1066 | FocusChangeMask | VisibilityChangeMask 1050 | FocusChangeMask | VisibilityChangeMask
1067 | ExposureMask
1068 | StructureNotifyMask); 1051 | ExposureMask | StructureNotifyMask);
1052
1069 termwin_ev.start (display, top); 1053 termwin_ev.start (display, top);
1070 1054
1071#if ENABLE_FRILLS 1055#if ENABLE_FRILLS
1072 if (mwmhints.flags) 1056 if (mwmhints.flags)
1073 XChangeProperty (disp, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32, 1057 XChangeProperty (disp, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32,
… …
1075#endif 1059#endif
1076 1060
1077 /* 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 */
1078 TermWin_cursor = XCreateFontCursor (disp, XC_xterm); 1062 TermWin_cursor = XCreateFontCursor (disp, XC_xterm);
1079 1063
1080#if defined(HAVE_SCROLLBARS) || defined(MENUBAR) 1064#ifdef HAVE_SCROLLBARS
1081 /* cursor (menuBar/scrollBar): Black-on-White */ 1065 /* cursor scrollBar: Black-on-White */
1082 leftptr_cursor = XCreateFontCursor (disp, XC_left_ptr); 1066 leftptr_cursor = XCreateFontCursor (disp, XC_left_ptr);
1083#endif 1067#endif
1084 1068
1085 /* the vt window */ 1069 /* the vt window */
1086 TermWin.vt = XCreateSimpleWindow (disp, top, 1070 vt = XCreateSimpleWindow (disp, top,
1087 window_vt_x, 1071 window_vt_x,
1088 window_vt_y, 1072 window_vt_y,
1089 TermWin_TotalWidth (), 1073 width,
1090 TermWin_TotalHeight (), 1074 height,
1091 0, 1075 0,
1092 pix_colors_focused[Color_fg], 1076 pix_colors_focused[Color_fg],
1093 pix_colors_focused[Color_bg]); 1077 pix_colors_focused[Color_bg]);
1094#ifdef DEBUG_X 1078#ifdef DEBUG_X
1095 XStoreName (disp, TermWin.vt, "vt window"); 1079 XStoreName (disp, vt, "vt window");
1096#endif 1080#endif
1097 1081
1098 attributes.bit_gravity = NorthWestGravity; 1082 attributes.bit_gravity = NorthWestGravity;
1099 XChangeWindowAttributes (disp, TermWin.vt, CWBitGravity, &attributes); 1083 XChangeWindowAttributes (disp, vt, CWBitGravity, &attributes);
1100 1084
1101 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask; 1085 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask;
1102 1086
1103 pointer_unblank (); 1087 if (OPTION (Opt_pointerBlank))
1104
1105#ifdef POINTER_BLANK
1106 if (options & Opt_pointerBlank)
1107 vt_emask |= PointerMotionMask; 1088 vt_emask |= PointerMotionMask;
1108 else 1089 else
1109#endif
1110 vt_emask |= Button1MotionMask | Button3MotionMask; 1090 vt_emask |= Button1MotionMask | Button3MotionMask;
1111 1091
1112 XSelectInput (disp, TermWin.vt, vt_emask); 1092 vt_select_input ();
1093
1113 vt_ev.start (display, TermWin.vt); 1094 vt_ev.start (display, vt);
1114
1115#if defined(MENUBAR) && (MENUBAR_MAX > 1)
1116 if (menuBar_height ())
1117 {
1118 menuBar.win = XCreateSimpleWindow (disp, top,
1119 window_vt_x, 0,
1120 TermWin_TotalWidth (),
1121 menuBar_TotalHeight (),
1122 0,
1123 pix_colors_focused[Color_fg],
1124 pix_colors_focused[Color_scroll]);
1125
1126#ifdef DEBUG_X
1127 XStoreName (disp, menuBar.win, "menubar");
1128#endif
1129
1130 menuBar.drawable = new rxvt_drawable (display, menuBar.win);
1131
1132 XDefineCursor (disp, menuBar.win,
1133 XCreateFontCursor (disp, XC_left_ptr));
1134
1135 XSelectInput (disp, menuBar.win,
1136 (ExposureMask | ButtonPressMask | ButtonReleaseMask | Button1MotionMask));
1137 menubar_ev.start (display, menuBar.win);
1138 }
1139#endif
1140 1095
1141#ifdef XPM_BACKGROUND 1096#ifdef XPM_BACKGROUND
1142 if (rs[Rs_backgroundPixmap] != NULL 1097 if (rs[Rs_backgroundPixmap] != NULL
1143 && ! (options & Opt_transparent)) 1098 && ! OPTION (Opt_transparent))
1144 { 1099 {
1145 const char *p = rs[Rs_backgroundPixmap]; 1100 const char *p = rs[Rs_backgroundPixmap];
1146 1101
1147 if ((p = strchr (p, ';')) != NULL) 1102 if ((p = strchr (p, ';')) != NULL)
1148 { 1103 {
… …
1157 1112
1158 /* graphics context for the vt window */ 1113 /* graphics context for the vt window */
1159 gcvalue.foreground = pix_colors[Color_fg]; 1114 gcvalue.foreground = pix_colors[Color_fg];
1160 gcvalue.background = pix_colors[Color_bg]; 1115 gcvalue.background = pix_colors[Color_bg];
1161 gcvalue.graphics_exposures = 1; 1116 gcvalue.graphics_exposures = 1;
1162 TermWin.gc = XCreateGC (disp, TermWin.vt, 1117 gc = XCreateGC (disp, vt,
1163 GCForeground | GCBackground | GCGraphicsExposures, 1118 GCForeground | GCBackground | GCGraphicsExposures,
1164 &gcvalue); 1119 &gcvalue);
1165 1120
1166 TermWin.drawable = new rxvt_drawable (display, TermWin.vt); 1121 drawable = new rxvt_drawable (display, vt);
1167 1122
1168#if defined(MENUBAR) || defined(RXVT_SCROLLBAR) 1123#ifdef RXVT_SCROLLBAR
1169 gcvalue.foreground = pix_colors[Color_topShadow]; 1124 gcvalue.foreground = pix_colors[Color_topShadow];
1170 topShadowGC = XCreateGC (disp, TermWin.vt, GCForeground, &gcvalue); 1125 topShadowGC = XCreateGC (disp, vt, GCForeground, &gcvalue);
1171 gcvalue.foreground = pix_colors[Color_bottomShadow]; 1126 gcvalue.foreground = pix_colors[Color_bottomShadow];
1172 botShadowGC = XCreateGC (disp, TermWin.vt, GCForeground, &gcvalue); 1127 botShadowGC = XCreateGC (disp, vt, GCForeground, &gcvalue);
1173 gcvalue.foreground = pix_colors[ (display->depth <= 2 ? Color_fg : Color_scroll)]; 1128 gcvalue.foreground = pix_colors[ (display->depth <= 2 ? Color_fg : Color_scroll)];
1174 scrollbarGC = XCreateGC (disp, TermWin.vt, GCForeground, &gcvalue); 1129 scrollbarGC = XCreateGC (disp, vt, GCForeground, &gcvalue);
1175#endif 1130#endif
1176 1131
1177#ifdef OFF_FOCUS_FADING 1132#ifdef OFF_FOCUS_FADING
1178 // initially we are in unfocused state 1133 // initially we are in unfocused state
1179 if (rs[Rs_fade]) 1134 if (rs[Rs_fade])
1180 pix_colors = pix_colors_unfocused; 1135 pix_colors = pix_colors_unfocused;
1181#endif 1136#endif
1182 1137
1138 pointer_unblank ();
1183 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
1184} 1150}
1185 1151
1186/* ------------------------------------------------------------------------- * 1152/* ------------------------------------------------------------------------- *
1187 * GET TTY CURRENT STATE * 1153 * GET TTY CURRENT STATE *
1188 * ------------------------------------------------------------------------- */ 1154 * ------------------------------------------------------------------------- */
… …
1193 /* 1159 /*
1194 * standard System V termios interface 1160 * standard System V termios interface
1195 */ 1161 */
1196 if (GET_TERMIOS (STDIN_FILENO, tio) < 0) 1162 if (GET_TERMIOS (STDIN_FILENO, tio) < 0)
1197 { 1163 {
1198 /* 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
1199 tio->c_cc[VINTR] = CINTR; 1168 tio->c_cc[VINTR] = CINTR;
1200 tio->c_cc[VQUIT] = CQUIT; 1169 tio->c_cc[VQUIT] = CQUIT;
1201 tio->c_cc[VERASE] = CERASE; 1170 tio->c_cc[VERASE] = CERASE;
1171#ifdef VERASE2
1172 tio->c_cc[VERASE2] = CERASE2;
1173#endif
1202 tio->c_cc[VKILL] = CKILL; 1174 tio->c_cc[VKILL] = CKILL;
1203 tio->c_cc[VSTART] = CSTART; 1175 tio->c_cc[VSTART] = CSTART;
1204 tio->c_cc[VSTOP] = CSTOP; 1176 tio->c_cc[VSTOP] = CSTOP;
1205 tio->c_cc[VSUSP] = CSUSP; 1177 tio->c_cc[VSUSP] = CSUSP;
1206# ifdef VDSUSP 1178# ifdef VDSUSP
1207
1208 tio->c_cc[VDSUSP] = CDSUSP; 1179 tio->c_cc[VDSUSP] = CDSUSP;
1209# endif 1180# endif
1210# ifdef VREPRINT 1181# ifdef VREPRINT
1211
1212 tio->c_cc[VREPRINT] = CRPRNT; 1182 tio->c_cc[VREPRINT] = CRPRNT;
1213# endif 1183# endif
1214# ifdef VDISCRD 1184# ifdef VDISCRD
1215
1216 tio->c_cc[VDISCRD] = CFLUSH; 1185 tio->c_cc[VDISCRD] = CFLUSH;
1217# endif 1186# endif
1218# ifdef VWERSE 1187# ifdef VWERSE
1219
1220 tio->c_cc[VWERSE] = CWERASE; 1188 tio->c_cc[VWERSE] = CWERASE;
1221# endif 1189# endif
1222# ifdef VLNEXT 1190# ifdef VLNEXT
1223
1224 tio->c_cc[VLNEXT] = CLNEXT; 1191 tio->c_cc[VLNEXT] = CLNEXT;
1225# endif 1192# endif
1226
1227 } 1193 }
1194
1228 tio->c_cc[VEOF] = CEOF; 1195 tio->c_cc[VEOF] = CEOF;
1229 tio->c_cc[VEOL] = VDISABLE; 1196 tio->c_cc[VEOL] = VDISABLE;
1230# ifdef VEOL2 1197# ifdef VEOL2
1231
1232 tio->c_cc[VEOL2] = VDISABLE; 1198 tio->c_cc[VEOL2] = VDISABLE;
1233# endif 1199# endif
1234# ifdef VSWTC 1200# ifdef VSWTC
1235
1236 tio->c_cc[VSWTC] = VDISABLE; 1201 tio->c_cc[VSWTC] = VDISABLE;
1237# endif 1202# endif
1238# ifdef VSWTCH 1203# ifdef VSWTCH
1239
1240 tio->c_cc[VSWTCH] = VDISABLE; 1204 tio->c_cc[VSWTCH] = VDISABLE;
1241# endif 1205# endif
1242# if VMIN != VEOF 1206# if VMIN != VEOF
1243
1244 tio->c_cc[VMIN] = 1; 1207 tio->c_cc[VMIN] = 1;
1245# endif 1208# endif
1246# if VTIME != VEOL 1209# if VTIME != VEOL
1247
1248 tio->c_cc[VTIME] = 0; 1210 tio->c_cc[VTIME] = 0;
1249# endif 1211# endif
1250 1212
1251 if (erase != -1) 1213 if (erase != -1)
1252 tio->c_cc[VERASE] = (char)erase; 1214 tio->c_cc[VERASE] = (char)erase;
… …
1280 if (ioctl (STDIN_FILENO, TIOCGETP, & (tio->sg)) < 0) 1242 if (ioctl (STDIN_FILENO, TIOCGETP, & (tio->sg)) < 0)
1281 { 1243 {
1282 tio->sg.sg_erase = CERASE; /* ^H */ 1244 tio->sg.sg_erase = CERASE; /* ^H */
1283 tio->sg.sg_kill = CKILL; /* ^U */ 1245 tio->sg.sg_kill = CKILL; /* ^U */
1284 } 1246 }
1247
1285 if (erase != -1) 1248 if (erase != -1)
1286 tio->sg.sg_erase = (char)erase; 1249 tio->sg.sg_erase = (char)erase;
1287 1250
1288 tio->sg.sg_flags = (CRMOD | ECHO | EVENP | ODDP); 1251 tio->sg.sg_flags = (CRMOD | ECHO | EVENP | ODDP);
1289 1252
… …
1295 tio->tc.t_startc = CSTART; /* ^Q */ 1258 tio->tc.t_startc = CSTART; /* ^Q */
1296 tio->tc.t_stopc = CSTOP; /* ^S */ 1259 tio->tc.t_stopc = CSTOP; /* ^S */
1297 tio->tc.t_eofc = CEOF; /* ^D */ 1260 tio->tc.t_eofc = CEOF; /* ^D */
1298 tio->tc.t_brkc = -1; 1261 tio->tc.t_brkc = -1;
1299 } 1262 }
1263
1300 /* get local special chars */ 1264 /* get local special chars */
1301 if (ioctl (STDIN_FILENO, TIOCGLTC, & (tio->lc)) < 0) 1265 if (ioctl (STDIN_FILENO, TIOCGLTC, & (tio->lc)) < 0)
1302 { 1266 {
1303 tio->lc.t_suspc = CSUSP; /* ^Z */ 1267 tio->lc.t_suspc = CSUSP; /* ^Z */
1304 tio->lc.t_dsuspc = CDSUSP; /* ^Y */ 1268 tio->lc.t_dsuspc = CDSUSP; /* ^Y */
… …
1308 tio->lc.t_lnextc = CLNEXT; /* ^V */ 1272 tio->lc.t_lnextc = CLNEXT; /* ^V */
1309 } 1273 }
1310 /* get line discipline */ 1274 /* get line discipline */
1311 ioctl (STDIN_FILENO, TIOCGETD, & (tio->line)); 1275 ioctl (STDIN_FILENO, TIOCGETD, & (tio->line));
1312# ifdef NTTYDISC 1276# ifdef NTTYDISC
1313
1314 tio->line = NTTYDISC; 1277 tio->line = NTTYDISC;
1315# endif /* NTTYDISC */ 1278# endif /* NTTYDISC */
1316 1279
1317 tio->local = (LCRTBS | LCRTERA | LCTLECH | LPASS8 | LCRTKIL); 1280 tio->local = (LCRTBS | LCRTERA | LCTLECH | LPASS8 | LCRTKIL);
1318#endif /* HAVE_TERMIOS_H */ 1281#endif /* HAVE_TERMIOS_H */
… …
1341 FOO (IGNCR, "IGNCR"); 1304 FOO (IGNCR, "IGNCR");
1342 FOO (ICRNL, "ICRNL"); 1305 FOO (ICRNL, "ICRNL");
1343 FOO (IXON, "IXON"); 1306 FOO (IXON, "IXON");
1344 FOO (IXOFF, "IXOFF"); 1307 FOO (IXOFF, "IXOFF");
1345# ifdef IUCLC 1308# ifdef IUCLC
1346
1347 FOO (IUCLC, "IUCLC"); 1309 FOO (IUCLC, "IUCLC");
1348# endif 1310# endif
1349# ifdef IXANY 1311# ifdef IXANY
1350
1351 FOO (IXANY, "IXANY"); 1312 FOO (IXANY, "IXANY");
1352# endif 1313# endif
1353# ifdef IMAXBEL 1314# ifdef IMAXBEL
1354
1355 FOO (IMAXBEL, "IMAXBEL"); 1315 FOO (IMAXBEL, "IMAXBEL");
1356# endif 1316# endif
1357 1317
1358 fprintf (stderr, "\n"); 1318 fprintf (stderr, "\n");
1359 1319
… …
1366 FOO (VERASE, "VERASE"); 1326 FOO (VERASE, "VERASE");
1367 FOO (VKILL, "VKILL"); 1327 FOO (VKILL, "VKILL");
1368 FOO (VEOF, "VEOF"); 1328 FOO (VEOF, "VEOF");
1369 FOO (VEOL, "VEOL"); 1329 FOO (VEOL, "VEOL");
1370# ifdef VEOL2 1330# ifdef VEOL2
1371
1372 FOO (VEOL2, "VEOL2"); 1331 FOO (VEOL2, "VEOL2");
1373# endif 1332# endif
1374# ifdef VSWTC 1333# ifdef VSWTC
1375
1376 FOO (VSWTC, "VSWTC"); 1334 FOO (VSWTC, "VSWTC");
1377# endif 1335# endif
1378# ifdef VSWTCH 1336# ifdef VSWTCH
1379
1380 FOO (VSWTCH, "VSWTCH"); 1337 FOO (VSWTCH, "VSWTCH");
1381# endif 1338# endif
1382
1383 FOO (VSTART, "VSTART"); 1339 FOO (VSTART, "VSTART");
1384 FOO (VSTOP, "VSTOP"); 1340 FOO (VSTOP, "VSTOP");
1385 FOO (VSUSP, "VSUSP"); 1341 FOO (VSUSP, "VSUSP");
1386# ifdef VDSUSP 1342# ifdef VDSUSP
1387
1388 FOO (VDSUSP, "VDSUSP"); 1343 FOO (VDSUSP, "VDSUSP");
1389# endif 1344# endif
1390# ifdef VREPRINT 1345# ifdef VREPRINT
1391
1392 FOO (VREPRINT, "VREPRINT"); 1346 FOO (VREPRINT, "VREPRINT");
1393# endif 1347# endif
1394# ifdef VDISCRD 1348# ifdef VDISCRD
1395
1396 FOO (VDISCRD, "VDISCRD"); 1349 FOO (VDISCRD, "VDISCRD");
1397# endif 1350# endif
1398# ifdef VWERSE 1351# ifdef VWERSE
1399
1400 FOO (VWERSE, "VWERSE"); 1352 FOO (VWERSE, "VWERSE");
1401# endif 1353# endif
1402# ifdef VLNEXT 1354# ifdef VLNEXT
1403
1404 FOO (VLNEXT, "VLNEXT"); 1355 FOO (VLNEXT, "VLNEXT");
1405# endif 1356# endif
1406 1357
1407 fprintf (stderr, "\n"); 1358 fprintf (stderr, "\n");
1408# undef FOO 1359# undef FOO
… …
1417 * the slave. 1368 * the slave.
1418 */ 1369 */
1419void 1370void
1420rxvt_term::run_command (const char *const *argv) 1371rxvt_term::run_command (const char *const *argv)
1421{ 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
1422 if (!pty.get ()) 1389 if (!pty->get ())
1423 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n"); 1390 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");
1424 1391
1425 pty.set_utf8_mode (enc_utf8); 1392 pty->set_utf8_mode (enc_utf8);
1426 1393
1427 /* set initial window size */ 1394 /* set initial window size */
1428 tt_winch (); 1395 tt_winch ();
1429 1396
1430 int er; 1397 int er;
… …
1438#endif 1405#endif
1439 er = -1; 1406 er = -1;
1440 1407
1441 rxvt_get_ttymode (&tio, er); 1408 rxvt_get_ttymode (&tio, er);
1442 1409
1443 sw_chld.start (SIGCHLD); 1410#if ENABLE_FRILLS
1411 if (rs[Rs_pty_fd])
1412 return;
1413#endif
1444 1414
1445#ifndef __QNX__
1446 /* spin off the command interpreter */ 1415 /* spin off the command interpreter */
1447 switch (cmd_pid = fork ()) 1416 switch (cmd_pid = fork ())
1448 { 1417 {
1449 case -1: 1418 case -1:
1419 {
1420 cmd_pid = 0;
1450 rxvt_fatal ("can't fork, aborting.\n"); 1421 rxvt_fatal ("can't fork, aborting.\n");
1422 }
1451 case 0: 1423 case 0:
1452 init_env (); 1424 init_env ();
1453 1425
1454 if (!pty.make_controlling_tty ()) 1426 if (!pty->make_controlling_tty ())
1455 fprintf (stderr, "%s: could not obtain control of tty.", RESNAME); 1427 fprintf (stderr, "%s: could not obtain control of tty.", RESNAME);
1456 else 1428 else
1457 { 1429 {
1458 /* Reopen stdin, stdout and stderr over the tty file descriptor */ 1430 /* Reopen stdin, stdout and stderr over the tty file descriptor */
1459 dup2 (pty.tty, STDIN_FILENO); 1431 dup2 (pty->tty, STDIN_FILENO);
1460 dup2 (pty.tty, STDOUT_FILENO); 1432 dup2 (pty->tty, STDOUT_FILENO);
1461 dup2 (pty.tty, STDERR_FILENO); 1433 dup2 (pty->tty, STDERR_FILENO);
1462 1434
1463 // close all our file handles that we do no longer need 1435 // close all our file handles that we do no longer need
1464 for (rxvt_term **t = termlist.begin (); t < termlist.end (); t++) 1436 for (rxvt_term **t = termlist.begin (); t < termlist.end (); t++)
1465 { 1437 {
1466 if ((*t)->pty.pty > 2) close ((*t)->pty.pty); 1438 if ((*t)->pty->pty > 2) close ((*t)->pty->pty);
1467 if ((*t)->pty.tty > 2) close ((*t)->pty.tty); 1439 if ((*t)->pty->tty > 2) close ((*t)->pty->tty);
1468 } 1440 }
1469 1441
1470 run_child (argv); 1442 run_child (argv);
1471 fprintf (stderr, "%s: unable to exec child.", RESNAME); 1443 fprintf (stderr, "%s: unable to exec child.", RESNAME);
1472 } 1444 }
1473 1445
1474 _exit (EXIT_FAILURE); 1446 _exit (EXIT_FAILURE);
1475 1447
1476 default: 1448 default:
1477 { 1449 if (!OPTION (Opt_utmpInhibit))
1478#if defined(HAVE_STRUCT_UTMP) && defined(HAVE_TTYSLOT) 1450 pty->login (cmd_pid, OPTION (Opt_loginShell), rs[Rs_display_name]);
1479 int fdstdin;
1480 1451
1481 fdstdin = dup (STDIN_FILENO); 1452 pty->close_tty ();
1482 dup2 (pty.tty, STDIN_FILENO);
1483#endif
1484 1453
1485#ifdef UTMP_SUPPORT 1454 child_ev.start (cmd_pid);
1486 privileged_utmp (SAVE);
1487#endif
1488 1455
1489#if defined(HAVE_STRUCT_UTMP) && defined(HAVE_TTYSLOT) 1456 HOOK_INVOKE ((this, HOOK_CHILD_START, DT_INT, cmd_pid, DT_END));
1490
1491 dup2 (fdstdin, STDIN_FILENO);
1492 close (fdstdin);
1493#endif
1494 }
1495
1496 pty.close_tty (); /* keep STDERR_FILENO, pty.pty, display->fd () open */
1497 break; 1457 break;
1498 } 1458 }
1499#else /* __QNX__ uses qnxspawn () */
1500 fchmod (pty.tty, 0622);
1501 fcntl (pty.tty, F_SETFD, FD_CLOEXEC);
1502 fcntl (pty.pty, F_SETFD, FD_CLOEXEC);
1503
1504 if (run_child (argv) == -1)
1505 exit (EXIT_FAILURE);
1506#endif
1507} 1459}
1508 1460
1509/* ------------------------------------------------------------------------- * 1461/* ------------------------------------------------------------------------- *
1510 * CHILD PROCESS OPERATIONS * 1462 * CHILD PROCESS OPERATIONS *
1511 * ------------------------------------------------------------------------- */ 1463 * ------------------------------------------------------------------------- */
… …
1518{ 1470{
1519 char *login; 1471 char *login;
1520 1472
1521 SET_TTYMODE (STDIN_FILENO, &tio); /* init terminal attributes */ 1473 SET_TTYMODE (STDIN_FILENO, &tio); /* init terminal attributes */
1522 1474
1523 if (options & Opt_console) 1475 if (OPTION (Opt_console))
1524 { /* be virtual console, fail silently */ 1476 { /* be virtual console, fail silently */
1525#ifdef TIOCCONS 1477#ifdef TIOCCONS
1526 unsigned int on = 1; 1478 unsigned int on = 1;
1527 1479
1528 ioctl (STDIN_FILENO, TIOCCONS, &on); 1480 ioctl (STDIN_FILENO, TIOCCONS, &on);
… …
1555 // unblock signals (signals are blocked by iom.C 1507 // unblock signals (signals are blocked by iom.C
1556 sigset_t ss; 1508 sigset_t ss;
1557 sigemptyset (&ss); 1509 sigemptyset (&ss);
1558 sigprocmask (SIG_SETMASK, &ss, 0); 1510 sigprocmask (SIG_SETMASK, &ss, 0);
1559 1511
1560#ifndef __QNX__
1561 /* command interpreter path */ 1512 /* command interpreter path */
1562 if (argv != NULL) 1513 if (argv != NULL)
1563 { 1514 {
1564# ifdef DEBUG_CMD 1515# ifdef DEBUG_CMD
1565 int i; 1516 int i;
… …
1571 execvp (argv[0], (char *const *)argv); 1522 execvp (argv[0], (char *const *)argv);
1572 /* no error message: STDERR is closed! */ 1523 /* no error message: STDERR is closed! */
1573 } 1524 }
1574 else 1525 else
1575 { 1526 {
1576 const char *argv0, *shell; 1527 const char *argv0, *shell;
1577 1528
1578 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0') 1529 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0')
1579 shell = "/bin/sh"; 1530 shell = "/bin/sh";
1580 1531
1581 argv0 = (const char *)rxvt_r_basename (shell); 1532 argv0 = (const char *)rxvt_r_basename (shell);
1582 1533
1583 if (options & Opt_loginShell) 1534 if (OPTION (Opt_loginShell))
1584 { 1535 {
1585 login = (char *)rxvt_malloc ((strlen (argv0) + 2) * sizeof (char)); 1536 login = (char *)rxvt_malloc ((strlen (argv0) + 2) * sizeof (char));
1586 1537
1587 login[0] = '-'; 1538 login[0] = '-';
1588 strcpy (&login[1], argv0); 1539 strcpy (&login[1], argv0);
1589 argv0 = login; 1540 argv0 = login;
1590 } 1541 }
1542
1591 execlp (shell, argv0, NULL); 1543 execlp (shell, argv0, NULL);
1592 /* no error message: STDERR is closed! */ 1544 /* no error message: STDERR is closed! */
1593 } 1545 }
1594 1546
1595#else /* __QNX__ uses qnxspawn () */
1596
1597 char iov_a[10] = { -1, -1, -1, -1, -1, -1, -1, -1, -1, -1 };
1598 char *command = NULL, fullcommand[_MAX_PATH];
1599 char **arg_v, *arg_a[2] = { NULL, NULL };
1600
1601 if (argv != NULL)
1602 {
1603 if (access (argv[0], X_OK) == -1)
1604 {
1605 if (strchr (argv[0], '/') == NULL)
1606 {
1607 searchenv (argv[0], "PATH", fullcommand);
1608
1609 if (fullcommand[0] != '\0')
1610 command = fullcommand;
1611 }
1612
1613 if (access (command, X_OK) == -1)
1614 return -1;
1615 }
1616 else
1617 command = argv[0];
1618
1619 arg_v = argv;
1620 }
1621 else
1622 {
1623 if ((command = getenv ("SHELL")) == NULL || *command == '\0')
1624 command = "/bin/sh";
1625
1626 arg_a[0] = my_basename (command);
1627
1628 if (options & Opt_loginShell)
1629 {
1630 login = rxvt_malloc ((strlen (arg_a[0]) + 2) * sizeof (char));
1631
1632 login[0] = '-';
1633 strcpy (&login[1], arg_a[0]);
1634 arg_a[0] = login;
1635 }
1636
1637 arg_v = arg_a;
1638 }
1639
1640 iov_a[0] = iov_a[1] = iov_a[2] = pty.tty;
1641 cmd_pid = qnx_spawn (0, 0, 0, -1, -1,
1642 _SPAWN_SETSID | _SPAWN_TCSETPGRP,
1643 command, arg_v, environ, iov_a, 0);
1644 if (login)
1645 free (login);
1646
1647 pty.close_tty ();
1648 return pty.pty;
1649#endif
1650
1651 return -1; 1547 return -1;
1652} 1548}
1653 1549
1654/*----------------------- end-of-file (C source) -----------------------*/ 1550/*----------------------- end-of-file (C source) -----------------------*/

Diff Legend

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