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

Diff Legend

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