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

Diff Legend

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