ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/rxvt-unicode/src/init.C
(Generate patch)

Comparing rxvt-unicode/src/init.C (file contents):
Revision 1.109 by root, Mon Feb 14 18:47:54 2005 UTC vs.
Revision 1.149 by root, Thu Jan 19 09:47:15 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 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]))) 343 if (!(display = displays.get (rs[Rs_display_name])))
356 rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]); 344 rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]);
357 345
358 extract_resources (); 346 extract_resources ();
347
359 free (r_argv); 348 free (r_argv);
360 349
361 /* 350 /*
362 * set any defaults not already set 351 * set any defaults not already set
363 */ 352 */
… …
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 }
… …
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;
931 Window top; 916 Window top, parent;
932 dDisp; 917 dDisp;
933 918
934#ifdef USING_W11LIB 919#ifdef USING_W11LIB
935 /* enable W11 callbacks */ 920 /* enable W11 callbacks */
936 W11AddEventHandler (disp, rxvt_W11_process_x_event); 921 W11AddEventHandler (disp, rxvt_W11_process_x_event);
937#endif 922#endif
938 923
939 assert (sizeof (xa_names) / sizeof (char *) == NUM_XA); 924 assert (sizeof (xa_names) / sizeof (char *) == NUM_XA);
940 XInternAtoms (disp, (char **)xa_names, NUM_XA, False, xa); 925 XInternAtoms (disp, (char **)xa_names, NUM_XA, False, xa);
941 926
942 if (options & Opt_transparent) 927 if (OPTION (Opt_transparent))
943 { 928 {
944 XGetWindowAttributes (disp, RootWindow (disp, display->screen), &gattr); 929 XGetWindowAttributes (disp, RootWindow (disp, display->screen), &gattr);
945 display->depth = gattr.depth; // doh //TODO, per-term not per-display? 930 display->depth = gattr.depth; // doh //TODO, per-term not per-display?
946 } 931 }
947 932
933 /* grab colors before netscape does */
934 Get_Colours ();
935
936 if (!set_fonts ())
937 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n");
938
939 parent = DefaultRootWindow (disp);
940
941 attributes.override_redirect = !!OPTION (Opt_override_redirect);
942
948#if ENABLE_FRILLS 943#if ENABLE_FRILLS
949 if (options & Opt_borderLess) 944 if (OPTION (Opt_borderLess))
950 { 945 {
951 prop = XInternAtom(disp, "_MOTIF_WM_INFO", True); 946 prop = XInternAtom (disp, "_MOTIF_WM_INFO", True);
952 947
953 if (prop == None) 948 if (prop == None)
954 { 949 {
955 /* print_warning("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n");*/ 950 /* print_warning("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n");*/
956#ifdef PREFER_24BIT
957 attributes.override_redirect = TRUE; 951 attributes.override_redirect = TRUE;
958#endif
959 mwmhints.flags = 0; 952 mwmhints.flags = 0;
960 } 953 }
961 else 954 else
962 { 955 {
963 mwmhints.flags = MWM_HINTS_DECORATIONS; 956 mwmhints.flags = MWM_HINTS_DECORATIONS;
964 mwmhints.decorations = 0; 957 mwmhints.decorations = 0;
965 } 958 }
966 } 959 }
967 else 960 else
968 {
969 mwmhints.flags = 0; 961 mwmhints.flags = 0;
970 }
971#endif 962#endif
972 963
973 /* grab colors before netscape does */ 964#if ENABLE_XEMBED
974 Get_Colours ();
975
976 if (!set_fonts ())
977 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n");
978
979#if ENABLE_FRILLS
980 if (rs[Rs_embed]) 965 if (rs[Rs_embed])
981 { 966 {
982 top = strtol (rs[Rs_embed], 0, 0);
983
984 XWindowAttributes wattr; 967 XWindowAttributes wattr;
968
969 parent = strtol (rs[Rs_embed], 0, 0);
970
985 XGetWindowAttributes (disp, top, &wattr); 971 if (!XGetWindowAttributes (disp, parent, &wattr))
972 rxvt_fatal ("invalid window-id specified with -embed, aborting.\n");
986 973
987 window_calc (wattr.width, wattr.height); 974 window_calc (wattr.width, wattr.height);
988
989#if 0
990 if (wattr.map_state == IsViewable)
991 {
992 TermWin.mapped = 1;
993 refresh_type = FAST_REFRESH;
994 XClearWindow (disp, top);
995 // TODO: make XMapNotify-event-code a function and call it
996 // TODO: how can I detetc visibility without unmpa/map?
997 // TODO: focusin etc.
998 }
999#else
1000 // it'S easiets just to unmap/map to get all state correctly set-up
1001 XUnmapWindow (disp, top);
1002#endif
1003 }
1004 else
1005#endif
1006 { 975 }
976#endif
977
1007 window_calc (0, 0); 978 window_calc (0, 0);
1008 979
1009 /* sub-window placement & size in rxvt_resize_subwindows () */ 980 /* sub-window placement & size in rxvt_resize_subwindows () */
1010#ifdef PREFER_24BIT
1011 attributes.background_pixel = pix_colors_focused[Color_border]; 981 attributes.background_pixel = pix_colors_focused[Color_border];
1012 attributes.border_pixel = pix_colors_focused[Color_border]; 982 attributes.border_pixel = pix_colors_focused[Color_border];
1013 attributes.colormap = display->cmap; 983 attributes.colormap = display->cmap;
1014 top = XCreateWindow (disp, DefaultRootWindow (disp), 984 top = XCreateWindow (disp, parent,
1015 szHint.x, szHint.y, 985 szHint.x, szHint.y,
1016 szHint.width, szHint.height, 986 szHint.width, szHint.height,
1017 TermWin.ext_bwidth, 987 ext_bwidth,
1018 display->depth, InputOutput, 988 display->depth, InputOutput,
1019 display->visual, 989 display->visual,
1020 CWColormap | CWBackPixel | CWBorderPixel, &attributes); 990 CWColormap | CWBackPixel | CWBorderPixel | CWOverrideRedirect,
1021#else 991 &attributes);
1022 top = XCreateSimpleWindow (disp, DefaultRootWindow (disp),
1023 szHint.x, szHint.y,
1024 szHint.width, szHint.height,
1025 TermWin.ext_bwidth,
1026 pix_colors_focused[Color_border],
1027 pix_colors_focused[Color_border]);
1028#endif
1029 }
1030 992
1031 TermWin.parent[0] = top; 993 this->parent[0] = top;
1032 994
1033 old_width = szHint.width; 995 old_width = szHint.width;
1034 old_height = szHint.height; 996 old_height = szHint.height;
1035 997
1036 process_xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST); 998 process_xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST);
… …
1039 classHint.res_name = (char *)rs[Rs_name]; 1001 classHint.res_name = (char *)rs[Rs_name];
1040 classHint.res_class = (char *)RESCLASS; 1002 classHint.res_class = (char *)RESCLASS;
1041 1003
1042 wmHint.flags = InputHint | StateHint | WindowGroupHint; 1004 wmHint.flags = InputHint | StateHint | WindowGroupHint;
1043 wmHint.input = True; 1005 wmHint.input = True;
1044 wmHint.initial_state = options & Opt_iconic ? IconicState : NormalState; 1006 wmHint.initial_state = OPTION (Opt_iconic) ? IconicState : NormalState;
1045 wmHint.window_group = top; 1007 wmHint.window_group = top;
1046 1008
1047 XSetWMProperties (disp, top, NULL, NULL, 1009 XmbSetWMProperties (disp, top, NULL, NULL, (char **)argv, argc,
1048 (char **)argv, argc, &szHint, &wmHint, &classHint); 1010 &szHint, &wmHint, &classHint);
1049 1011
1050 /* Enable delete window protocol */ 1012 Atom protocols[] = {
1051 XSetWMProtocols (disp, top, &xa[XA_WMDELETEWINDOW], 1); 1013 xa[XA_WM_DELETE_WINDOW],
1014#if ENABLE_EWMH
1015 xa[XA_NET_WM_PING],
1016#endif
1017 };
1018
1019 XSetWMProtocols (disp, top, protocols, sizeof (protocols) / sizeof (protocols[0]));
1052 1020
1053#if ENABLE_FRILLS 1021#if ENABLE_FRILLS
1022 if (rs[Rs_transient_for])
1023 XSetTransientForHint (disp, top, (Window)strtol (rs[Rs_transient_for], 0, 0));
1024#endif
1025
1026#if ENABLE_EWMH
1054 long pid = getpid (); 1027 long pid = getpid ();
1055 1028
1056 XChangeProperty (disp, top, 1029 XChangeProperty (disp, top,
1057 xa[XA_NET_WM_PID], XA_CARDINAL, 32, 1030 xa[XA_NET_WM_PID], XA_CARDINAL, 32,
1058 PropModeReplace, (unsigned char *)&pid, 1); 1031 PropModeReplace, (unsigned char *)&pid, 1);
1032
1033 // _NET_WM_WINDOW_TYPE is NORMAL, which is the default
1059#endif 1034#endif
1060 1035
1061 XSelectInput (disp, top, 1036 XSelectInput (disp, top,
1062 KeyPressMask 1037 KeyPressMask
1063#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ENABLE_FRILLS || ISO_14755 1038#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ENABLE_FRILLS || ISO_14755
1064 | KeyReleaseMask 1039 | KeyReleaseMask
1065#endif 1040#endif
1066 | FocusChangeMask | VisibilityChangeMask 1041 | FocusChangeMask | VisibilityChangeMask
1067 | ExposureMask
1068 | StructureNotifyMask); 1042 | ExposureMask | StructureNotifyMask);
1043
1069 termwin_ev.start (display, top); 1044 termwin_ev.start (display, top);
1070 1045
1071#if ENABLE_FRILLS 1046#if ENABLE_FRILLS
1072 if (mwmhints.flags) 1047 if (mwmhints.flags)
1073 XChangeProperty (disp, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32, 1048 XChangeProperty (disp, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32,
… …
1075#endif 1050#endif
1076 1051
1077 /* vt cursor: Black-on-White is standard, but this is more popular */ 1052 /* vt cursor: Black-on-White is standard, but this is more popular */
1078 TermWin_cursor = XCreateFontCursor (disp, XC_xterm); 1053 TermWin_cursor = XCreateFontCursor (disp, XC_xterm);
1079 1054
1080#if defined(HAVE_SCROLLBARS) || defined(MENUBAR) 1055#ifdef HAVE_SCROLLBARS
1081 /* cursor (menuBar/scrollBar): Black-on-White */ 1056 /* cursor scrollBar: Black-on-White */
1082 leftptr_cursor = XCreateFontCursor (disp, XC_left_ptr); 1057 leftptr_cursor = XCreateFontCursor (disp, XC_left_ptr);
1083#endif 1058#endif
1084 1059
1085 /* the vt window */ 1060 /* the vt window */
1086 TermWin.vt = XCreateSimpleWindow (disp, top, 1061 vt = XCreateSimpleWindow (disp, top,
1087 window_vt_x, 1062 window_vt_x,
1088 window_vt_y, 1063 window_vt_y,
1089 TermWin_TotalWidth (), 1064 width,
1090 TermWin_TotalHeight (), 1065 height,
1091 0, 1066 0,
1092 pix_colors_focused[Color_fg], 1067 pix_colors_focused[Color_fg],
1093 pix_colors_focused[Color_bg]); 1068 pix_colors_focused[Color_bg]);
1094#ifdef DEBUG_X 1069#ifdef DEBUG_X
1095 XStoreName (disp, TermWin.vt, "vt window"); 1070 XStoreName (disp, vt, "vt window");
1096#endif 1071#endif
1097 1072
1098 attributes.bit_gravity = NorthWestGravity; 1073 attributes.bit_gravity = NorthWestGravity;
1099 XChangeWindowAttributes (disp, TermWin.vt, CWBitGravity, &attributes); 1074 XChangeWindowAttributes (disp, vt, CWBitGravity, &attributes);
1100 1075
1101 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask; 1076 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask;
1102 1077
1103 pointer_unblank (); 1078 if (OPTION (Opt_pointerBlank))
1104
1105#ifdef POINTER_BLANK
1106 if (options & Opt_pointerBlank)
1107 vt_emask |= PointerMotionMask; 1079 vt_emask |= PointerMotionMask;
1108 else 1080 else
1109#endif
1110 vt_emask |= Button1MotionMask | Button3MotionMask; 1081 vt_emask |= Button1MotionMask | Button3MotionMask;
1111 1082
1112 XSelectInput (disp, TermWin.vt, vt_emask); 1083 vt_select_input ();
1084
1113 vt_ev.start (display, TermWin.vt); 1085 vt_ev.start (display, vt);
1114
1115#if defined(MENUBAR) && (MENUBAR_MAX > 1)
1116 if (menuBar_height ())
1117 {
1118 menuBar.win = XCreateSimpleWindow (disp, top,
1119 window_vt_x, 0,
1120 TermWin_TotalWidth (),
1121 menuBar_TotalHeight (),
1122 0,
1123 pix_colors_focused[Color_fg],
1124 pix_colors_focused[Color_scroll]);
1125
1126#ifdef DEBUG_X
1127 XStoreName (disp, menuBar.win, "menubar");
1128#endif
1129
1130 menuBar.drawable = new rxvt_drawable (display, menuBar.win);
1131
1132 XDefineCursor (disp, menuBar.win,
1133 XCreateFontCursor (disp, XC_left_ptr));
1134
1135 XSelectInput (disp, menuBar.win,
1136 (ExposureMask | ButtonPressMask | ButtonReleaseMask | Button1MotionMask));
1137 menubar_ev.start (display, menuBar.win);
1138 }
1139#endif
1140 1086
1141#ifdef XPM_BACKGROUND 1087#ifdef XPM_BACKGROUND
1142 if (rs[Rs_backgroundPixmap] != NULL 1088 if (rs[Rs_backgroundPixmap] != NULL
1143 && ! (options & Opt_transparent)) 1089 && ! OPTION (Opt_transparent))
1144 { 1090 {
1145 const char *p = rs[Rs_backgroundPixmap]; 1091 const char *p = rs[Rs_backgroundPixmap];
1146 1092
1147 if ((p = strchr (p, ';')) != NULL) 1093 if ((p = strchr (p, ';')) != NULL)
1148 { 1094 {
… …
1157 1103
1158 /* graphics context for the vt window */ 1104 /* graphics context for the vt window */
1159 gcvalue.foreground = pix_colors[Color_fg]; 1105 gcvalue.foreground = pix_colors[Color_fg];
1160 gcvalue.background = pix_colors[Color_bg]; 1106 gcvalue.background = pix_colors[Color_bg];
1161 gcvalue.graphics_exposures = 1; 1107 gcvalue.graphics_exposures = 1;
1162 TermWin.gc = XCreateGC (disp, TermWin.vt, 1108 gc = XCreateGC (disp, vt,
1163 GCForeground | GCBackground | GCGraphicsExposures, 1109 GCForeground | GCBackground | GCGraphicsExposures,
1164 &gcvalue); 1110 &gcvalue);
1165 1111
1166 TermWin.drawable = new rxvt_drawable (display, TermWin.vt); 1112 drawable = new rxvt_drawable (display, vt);
1167 1113
1168#if defined(MENUBAR) || defined(RXVT_SCROLLBAR) 1114#ifdef RXVT_SCROLLBAR
1169 gcvalue.foreground = pix_colors[Color_topShadow]; 1115 gcvalue.foreground = pix_colors[Color_topShadow];
1170 topShadowGC = XCreateGC (disp, TermWin.vt, GCForeground, &gcvalue); 1116 topShadowGC = XCreateGC (disp, vt, GCForeground, &gcvalue);
1171 gcvalue.foreground = pix_colors[Color_bottomShadow]; 1117 gcvalue.foreground = pix_colors[Color_bottomShadow];
1172 botShadowGC = XCreateGC (disp, TermWin.vt, GCForeground, &gcvalue); 1118 botShadowGC = XCreateGC (disp, vt, GCForeground, &gcvalue);
1173 gcvalue.foreground = pix_colors[ (display->depth <= 2 ? Color_fg : Color_scroll)]; 1119 gcvalue.foreground = pix_colors[ (display->depth <= 2 ? Color_fg : Color_scroll)];
1174 scrollbarGC = XCreateGC (disp, TermWin.vt, GCForeground, &gcvalue); 1120 scrollbarGC = XCreateGC (disp, vt, GCForeground, &gcvalue);
1175#endif 1121#endif
1176 1122
1177#ifdef OFF_FOCUS_FADING 1123#ifdef OFF_FOCUS_FADING
1178 // initially we are in unfocused state 1124 // initially we are in unfocused state
1179 if (rs[Rs_fade]) 1125 if (rs[Rs_fade])
1180 pix_colors = pix_colors_unfocused; 1126 pix_colors = pix_colors_unfocused;
1181#endif 1127#endif
1182 1128
1129 pointer_unblank ();
1183 scr_recolour (); 1130 scr_recolour ();
1131
1132#if ENABLE_XEMBED
1133 if (rs[Rs_embed])
1134 {
1135 long info[2] = { 0, XEMBED_MAPPED };
1136
1137 XChangeProperty (disp, parent, xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
1138 32, PropModeReplace, (unsigned char *)&info, 2);
1139 }
1140#endif
1184} 1141}
1185 1142
1186/* ------------------------------------------------------------------------- * 1143/* ------------------------------------------------------------------------- *
1187 * GET TTY CURRENT STATE * 1144 * GET TTY CURRENT STATE *
1188 * ------------------------------------------------------------------------- */ 1145 * ------------------------------------------------------------------------- */
… …
1193 /* 1150 /*
1194 * standard System V termios interface 1151 * standard System V termios interface
1195 */ 1152 */
1196 if (GET_TERMIOS (STDIN_FILENO, tio) < 0) 1153 if (GET_TERMIOS (STDIN_FILENO, tio) < 0)
1197 { 1154 {
1198 /* return error - use system defaults */ 1155 // return error - use system defaults,
1156 // where possible, and zero elsewhere
1157 memset (tio, 0, sizeof (ttymode_t));
1158
1199 tio->c_cc[VINTR] = CINTR; 1159 tio->c_cc[VINTR] = CINTR;
1200 tio->c_cc[VQUIT] = CQUIT; 1160 tio->c_cc[VQUIT] = CQUIT;
1201 tio->c_cc[VERASE] = CERASE; 1161 tio->c_cc[VERASE] = CERASE;
1162#ifdef VERASE2
1163 tio->c_cc[VERASE2] = CERASE2;
1164#endif
1202 tio->c_cc[VKILL] = CKILL; 1165 tio->c_cc[VKILL] = CKILL;
1203 tio->c_cc[VSTART] = CSTART; 1166 tio->c_cc[VSTART] = CSTART;
1204 tio->c_cc[VSTOP] = CSTOP; 1167 tio->c_cc[VSTOP] = CSTOP;
1205 tio->c_cc[VSUSP] = CSUSP; 1168 tio->c_cc[VSUSP] = CSUSP;
1206# ifdef VDSUSP 1169# ifdef VDSUSP
1207
1208 tio->c_cc[VDSUSP] = CDSUSP; 1170 tio->c_cc[VDSUSP] = CDSUSP;
1209# endif 1171# endif
1210# ifdef VREPRINT 1172# ifdef VREPRINT
1211
1212 tio->c_cc[VREPRINT] = CRPRNT; 1173 tio->c_cc[VREPRINT] = CRPRNT;
1213# endif 1174# endif
1214# ifdef VDISCRD 1175# ifdef VDISCRD
1215
1216 tio->c_cc[VDISCRD] = CFLUSH; 1176 tio->c_cc[VDISCRD] = CFLUSH;
1217# endif 1177# endif
1218# ifdef VWERSE 1178# ifdef VWERSE
1219
1220 tio->c_cc[VWERSE] = CWERASE; 1179 tio->c_cc[VWERSE] = CWERASE;
1221# endif 1180# endif
1222# ifdef VLNEXT 1181# ifdef VLNEXT
1223
1224 tio->c_cc[VLNEXT] = CLNEXT; 1182 tio->c_cc[VLNEXT] = CLNEXT;
1225# endif 1183# endif
1226
1227 } 1184 }
1185
1228 tio->c_cc[VEOF] = CEOF; 1186 tio->c_cc[VEOF] = CEOF;
1229 tio->c_cc[VEOL] = VDISABLE; 1187 tio->c_cc[VEOL] = VDISABLE;
1230# ifdef VEOL2 1188# ifdef VEOL2
1231
1232 tio->c_cc[VEOL2] = VDISABLE; 1189 tio->c_cc[VEOL2] = VDISABLE;
1233# endif 1190# endif
1234# ifdef VSWTC 1191# ifdef VSWTC
1235
1236 tio->c_cc[VSWTC] = VDISABLE; 1192 tio->c_cc[VSWTC] = VDISABLE;
1237# endif 1193# endif
1238# ifdef VSWTCH 1194# ifdef VSWTCH
1239
1240 tio->c_cc[VSWTCH] = VDISABLE; 1195 tio->c_cc[VSWTCH] = VDISABLE;
1241# endif 1196# endif
1242# if VMIN != VEOF 1197# if VMIN != VEOF
1243
1244 tio->c_cc[VMIN] = 1; 1198 tio->c_cc[VMIN] = 1;
1245# endif 1199# endif
1246# if VTIME != VEOL 1200# if VTIME != VEOL
1247
1248 tio->c_cc[VTIME] = 0; 1201 tio->c_cc[VTIME] = 0;
1249# endif 1202# endif
1250 1203
1251 if (erase != -1) 1204 if (erase != -1)
1252 tio->c_cc[VERASE] = (char)erase; 1205 tio->c_cc[VERASE] = (char)erase;
… …
1280 if (ioctl (STDIN_FILENO, TIOCGETP, & (tio->sg)) < 0) 1233 if (ioctl (STDIN_FILENO, TIOCGETP, & (tio->sg)) < 0)
1281 { 1234 {
1282 tio->sg.sg_erase = CERASE; /* ^H */ 1235 tio->sg.sg_erase = CERASE; /* ^H */
1283 tio->sg.sg_kill = CKILL; /* ^U */ 1236 tio->sg.sg_kill = CKILL; /* ^U */
1284 } 1237 }
1238
1285 if (erase != -1) 1239 if (erase != -1)
1286 tio->sg.sg_erase = (char)erase; 1240 tio->sg.sg_erase = (char)erase;
1287 1241
1288 tio->sg.sg_flags = (CRMOD | ECHO | EVENP | ODDP); 1242 tio->sg.sg_flags = (CRMOD | ECHO | EVENP | ODDP);
1289 1243
… …
1295 tio->tc.t_startc = CSTART; /* ^Q */ 1249 tio->tc.t_startc = CSTART; /* ^Q */
1296 tio->tc.t_stopc = CSTOP; /* ^S */ 1250 tio->tc.t_stopc = CSTOP; /* ^S */
1297 tio->tc.t_eofc = CEOF; /* ^D */ 1251 tio->tc.t_eofc = CEOF; /* ^D */
1298 tio->tc.t_brkc = -1; 1252 tio->tc.t_brkc = -1;
1299 } 1253 }
1254
1300 /* get local special chars */ 1255 /* get local special chars */
1301 if (ioctl (STDIN_FILENO, TIOCGLTC, & (tio->lc)) < 0) 1256 if (ioctl (STDIN_FILENO, TIOCGLTC, & (tio->lc)) < 0)
1302 { 1257 {
1303 tio->lc.t_suspc = CSUSP; /* ^Z */ 1258 tio->lc.t_suspc = CSUSP; /* ^Z */
1304 tio->lc.t_dsuspc = CDSUSP; /* ^Y */ 1259 tio->lc.t_dsuspc = CDSUSP; /* ^Y */
… …
1308 tio->lc.t_lnextc = CLNEXT; /* ^V */ 1263 tio->lc.t_lnextc = CLNEXT; /* ^V */
1309 } 1264 }
1310 /* get line discipline */ 1265 /* get line discipline */
1311 ioctl (STDIN_FILENO, TIOCGETD, & (tio->line)); 1266 ioctl (STDIN_FILENO, TIOCGETD, & (tio->line));
1312# ifdef NTTYDISC 1267# ifdef NTTYDISC
1313
1314 tio->line = NTTYDISC; 1268 tio->line = NTTYDISC;
1315# endif /* NTTYDISC */ 1269# endif /* NTTYDISC */
1316 1270
1317 tio->local = (LCRTBS | LCRTERA | LCTLECH | LPASS8 | LCRTKIL); 1271 tio->local = (LCRTBS | LCRTERA | LCTLECH | LPASS8 | LCRTKIL);
1318#endif /* HAVE_TERMIOS_H */ 1272#endif /* HAVE_TERMIOS_H */
… …
1341 FOO (IGNCR, "IGNCR"); 1295 FOO (IGNCR, "IGNCR");
1342 FOO (ICRNL, "ICRNL"); 1296 FOO (ICRNL, "ICRNL");
1343 FOO (IXON, "IXON"); 1297 FOO (IXON, "IXON");
1344 FOO (IXOFF, "IXOFF"); 1298 FOO (IXOFF, "IXOFF");
1345# ifdef IUCLC 1299# ifdef IUCLC
1346
1347 FOO (IUCLC, "IUCLC"); 1300 FOO (IUCLC, "IUCLC");
1348# endif 1301# endif
1349# ifdef IXANY 1302# ifdef IXANY
1350
1351 FOO (IXANY, "IXANY"); 1303 FOO (IXANY, "IXANY");
1352# endif 1304# endif
1353# ifdef IMAXBEL 1305# ifdef IMAXBEL
1354
1355 FOO (IMAXBEL, "IMAXBEL"); 1306 FOO (IMAXBEL, "IMAXBEL");
1356# endif 1307# endif
1357 1308
1358 fprintf (stderr, "\n"); 1309 fprintf (stderr, "\n");
1359 1310
… …
1366 FOO (VERASE, "VERASE"); 1317 FOO (VERASE, "VERASE");
1367 FOO (VKILL, "VKILL"); 1318 FOO (VKILL, "VKILL");
1368 FOO (VEOF, "VEOF"); 1319 FOO (VEOF, "VEOF");
1369 FOO (VEOL, "VEOL"); 1320 FOO (VEOL, "VEOL");
1370# ifdef VEOL2 1321# ifdef VEOL2
1371
1372 FOO (VEOL2, "VEOL2"); 1322 FOO (VEOL2, "VEOL2");
1373# endif 1323# endif
1374# ifdef VSWTC 1324# ifdef VSWTC
1375
1376 FOO (VSWTC, "VSWTC"); 1325 FOO (VSWTC, "VSWTC");
1377# endif 1326# endif
1378# ifdef VSWTCH 1327# ifdef VSWTCH
1379
1380 FOO (VSWTCH, "VSWTCH"); 1328 FOO (VSWTCH, "VSWTCH");
1381# endif 1329# endif
1382
1383 FOO (VSTART, "VSTART"); 1330 FOO (VSTART, "VSTART");
1384 FOO (VSTOP, "VSTOP"); 1331 FOO (VSTOP, "VSTOP");
1385 FOO (VSUSP, "VSUSP"); 1332 FOO (VSUSP, "VSUSP");
1386# ifdef VDSUSP 1333# ifdef VDSUSP
1387
1388 FOO (VDSUSP, "VDSUSP"); 1334 FOO (VDSUSP, "VDSUSP");
1389# endif 1335# endif
1390# ifdef VREPRINT 1336# ifdef VREPRINT
1391
1392 FOO (VREPRINT, "VREPRINT"); 1337 FOO (VREPRINT, "VREPRINT");
1393# endif 1338# endif
1394# ifdef VDISCRD 1339# ifdef VDISCRD
1395
1396 FOO (VDISCRD, "VDISCRD"); 1340 FOO (VDISCRD, "VDISCRD");
1397# endif 1341# endif
1398# ifdef VWERSE 1342# ifdef VWERSE
1399
1400 FOO (VWERSE, "VWERSE"); 1343 FOO (VWERSE, "VWERSE");
1401# endif 1344# endif
1402# ifdef VLNEXT 1345# ifdef VLNEXT
1403
1404 FOO (VLNEXT, "VLNEXT"); 1346 FOO (VLNEXT, "VLNEXT");
1405# endif 1347# endif
1406 1348
1407 fprintf (stderr, "\n"); 1349 fprintf (stderr, "\n");
1408# undef FOO 1350# undef FOO
… …
1417 * the slave. 1359 * the slave.
1418 */ 1360 */
1419void 1361void
1420rxvt_term::run_command (const char *const *argv) 1362rxvt_term::run_command (const char *const *argv)
1421{ 1363{
1364#if ENABLE_FRILLS
1365 if (rs[Rs_pty_fd])
1366 {
1367 pty->pty = atoi (rs[Rs_pty_fd]);
1368
1369 if (pty->pty >= 0)
1370 {
1371 if (getfd_hook)
1372 pty->pty = (*getfd_hook) (pty->pty);
1373
1374 if (pty->pty < 0 || fcntl (pty->pty, F_SETFL, O_NONBLOCK))
1375 rxvt_fatal ("unusable pty-fd filehandle, aborting.\n");
1376 }
1377 }
1378 else
1379#endif
1422 if (!pty.get ()) 1380 if (!pty->get ())
1423 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n"); 1381 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");
1424 1382
1425 pty.set_utf8_mode (enc_utf8); 1383 pty->set_utf8_mode (enc_utf8);
1426 1384
1427 /* set initial window size */ 1385 /* set initial window size */
1428 tt_winch (); 1386 tt_winch ();
1429 1387
1430 int er; 1388 int er;
… …
1438#endif 1396#endif
1439 er = -1; 1397 er = -1;
1440 1398
1441 rxvt_get_ttymode (&tio, er); 1399 rxvt_get_ttymode (&tio, er);
1442 1400
1443 sw_chld.start (SIGCHLD); 1401#if ENABLE_FRILLS
1402 if (rs[Rs_pty_fd])
1403 return;
1404#endif
1444 1405
1445#ifndef __QNX__
1446 /* spin off the command interpreter */ 1406 /* spin off the command interpreter */
1447 switch (cmd_pid = fork ()) 1407 switch (cmd_pid = fork ())
1448 { 1408 {
1449 case -1: 1409 case -1:
1410 {
1411 cmd_pid = 0;
1450 rxvt_fatal ("can't fork, aborting.\n"); 1412 rxvt_fatal ("can't fork, aborting.\n");
1413 }
1451 case 0: 1414 case 0:
1452 init_env (); 1415 init_env ();
1453 1416
1454 if (!pty.make_controlling_tty ()) 1417 if (!pty->make_controlling_tty ())
1455 fprintf (stderr, "%s: could not obtain control of tty.", RESNAME); 1418 fprintf (stderr, "%s: could not obtain control of tty.", RESNAME);
1456 else 1419 else
1457 { 1420 {
1458 /* Reopen stdin, stdout and stderr over the tty file descriptor */ 1421 /* Reopen stdin, stdout and stderr over the tty file descriptor */
1459 dup2 (pty.tty, STDIN_FILENO); 1422 dup2 (pty->tty, STDIN_FILENO);
1460 dup2 (pty.tty, STDOUT_FILENO); 1423 dup2 (pty->tty, STDOUT_FILENO);
1461 dup2 (pty.tty, STDERR_FILENO); 1424 dup2 (pty->tty, STDERR_FILENO);
1462 1425
1463 // close all our file handles that we do no longer need 1426 // close all our file handles that we do no longer need
1464 for (rxvt_term **t = termlist.begin (); t < termlist.end (); t++) 1427 for (rxvt_term **t = termlist.begin (); t < termlist.end (); t++)
1465 { 1428 {
1466 if ((*t)->pty.pty > 2) close ((*t)->pty.pty); 1429 if ((*t)->pty->pty > 2) close ((*t)->pty->pty);
1467 if ((*t)->pty.tty > 2) close ((*t)->pty.tty); 1430 if ((*t)->pty->tty > 2) close ((*t)->pty->tty);
1468 } 1431 }
1469 1432
1470 run_child (argv); 1433 run_child (argv);
1471 fprintf (stderr, "%s: unable to exec child.", RESNAME); 1434 fprintf (stderr, "%s: unable to exec child.", RESNAME);
1472 } 1435 }
1473 1436
1474 _exit (EXIT_FAILURE); 1437 _exit (EXIT_FAILURE);
1475 1438
1476 default: 1439 default:
1477 {
1478#if defined(HAVE_STRUCT_UTMP) && defined(HAVE_TTYSLOT)
1479 int fdstdin;
1480
1481 fdstdin = dup (STDIN_FILENO);
1482 dup2 (pty.tty, STDIN_FILENO);
1483#endif
1484
1485#ifdef UTMP_SUPPORT 1440#if UTMP_SUPPORT
1486 privileged_utmp (SAVE); 1441 if (!OPTION (Opt_utmpInhibit))
1442 pty->login (cmd_pid, OPTION (Opt_loginShell), rs[Rs_display_name]);
1487#endif 1443#endif
1488 1444
1489#if defined(HAVE_STRUCT_UTMP) && defined(HAVE_TTYSLOT) 1445 pty->close_tty ();
1490 1446
1491 dup2 (fdstdin, STDIN_FILENO); 1447 child_ev.start (cmd_pid);
1492 close (fdstdin);
1493#endif
1494 }
1495 1448
1496 pty.close_tty (); /* keep STDERR_FILENO, pty.pty, display->fd () open */ 1449 HOOK_INVOKE ((this, HOOK_CHILD_START, DT_INT, cmd_pid, DT_END));
1497 break; 1450 break;
1498 } 1451 }
1499#else /* __QNX__ uses qnxspawn () */
1500 fchmod (pty.tty, 0622);
1501 fcntl (pty.tty, F_SETFD, FD_CLOEXEC);
1502 fcntl (pty.pty, F_SETFD, FD_CLOEXEC);
1503
1504 if (run_child (argv) == -1)
1505 exit (EXIT_FAILURE);
1506#endif
1507} 1452}
1508 1453
1509/* ------------------------------------------------------------------------- * 1454/* ------------------------------------------------------------------------- *
1510 * CHILD PROCESS OPERATIONS * 1455 * CHILD PROCESS OPERATIONS *
1511 * ------------------------------------------------------------------------- */ 1456 * ------------------------------------------------------------------------- */
… …
1518{ 1463{
1519 char *login; 1464 char *login;
1520 1465
1521 SET_TTYMODE (STDIN_FILENO, &tio); /* init terminal attributes */ 1466 SET_TTYMODE (STDIN_FILENO, &tio); /* init terminal attributes */
1522 1467
1523 if (options & Opt_console) 1468 if (OPTION (Opt_console))
1524 { /* be virtual console, fail silently */ 1469 { /* be virtual console, fail silently */
1525#ifdef TIOCCONS 1470#ifdef TIOCCONS
1526 unsigned int on = 1; 1471 unsigned int on = 1;
1527 1472
1528 ioctl (STDIN_FILENO, TIOCCONS, &on); 1473 ioctl (STDIN_FILENO, TIOCCONS, &on);
… …
1555 // unblock signals (signals are blocked by iom.C 1500 // unblock signals (signals are blocked by iom.C
1556 sigset_t ss; 1501 sigset_t ss;
1557 sigemptyset (&ss); 1502 sigemptyset (&ss);
1558 sigprocmask (SIG_SETMASK, &ss, 0); 1503 sigprocmask (SIG_SETMASK, &ss, 0);
1559 1504
1560#ifndef __QNX__
1561 /* command interpreter path */ 1505 /* command interpreter path */
1562 if (argv != NULL) 1506 if (argv != NULL)
1563 { 1507 {
1564# ifdef DEBUG_CMD 1508# ifdef DEBUG_CMD
1565 int i; 1509 int i;
… …
1571 execvp (argv[0], (char *const *)argv); 1515 execvp (argv[0], (char *const *)argv);
1572 /* no error message: STDERR is closed! */ 1516 /* no error message: STDERR is closed! */
1573 } 1517 }
1574 else 1518 else
1575 { 1519 {
1576 const char *argv0, *shell; 1520 const char *argv0, *shell;
1577 1521
1578 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0') 1522 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0')
1579 shell = "/bin/sh"; 1523 shell = "/bin/sh";
1580 1524
1581 argv0 = (const char *)rxvt_r_basename (shell); 1525 argv0 = (const char *)rxvt_r_basename (shell);
1582 1526
1583 if (options & Opt_loginShell) 1527 if (OPTION (Opt_loginShell))
1584 { 1528 {
1585 login = (char *)rxvt_malloc ((strlen (argv0) + 2) * sizeof (char)); 1529 login = (char *)rxvt_malloc ((strlen (argv0) + 2) * sizeof (char));
1586 1530
1587 login[0] = '-'; 1531 login[0] = '-';
1588 strcpy (&login[1], argv0); 1532 strcpy (&login[1], argv0);
1589 argv0 = login; 1533 argv0 = login;
1590 } 1534 }
1535
1591 execlp (shell, argv0, NULL); 1536 execlp (shell, argv0, NULL);
1592 /* no error message: STDERR is closed! */ 1537 /* no error message: STDERR is closed! */
1593 } 1538 }
1594 1539
1595#else /* __QNX__ uses qnxspawn () */
1596
1597 char iov_a[10] = { -1, -1, -1, -1, -1, -1, -1, -1, -1, -1 };
1598 char *command = NULL, fullcommand[_MAX_PATH];
1599 char **arg_v, *arg_a[2] = { NULL, NULL };
1600
1601 if (argv != NULL)
1602 {
1603 if (access (argv[0], X_OK) == -1)
1604 {
1605 if (strchr (argv[0], '/') == NULL)
1606 {
1607 searchenv (argv[0], "PATH", fullcommand);
1608
1609 if (fullcommand[0] != '\0')
1610 command = fullcommand;
1611 }
1612
1613 if (access (command, X_OK) == -1)
1614 return -1;
1615 }
1616 else
1617 command = argv[0];
1618
1619 arg_v = argv;
1620 }
1621 else
1622 {
1623 if ((command = getenv ("SHELL")) == NULL || *command == '\0')
1624 command = "/bin/sh";
1625
1626 arg_a[0] = my_basename (command);
1627
1628 if (options & Opt_loginShell)
1629 {
1630 login = rxvt_malloc ((strlen (arg_a[0]) + 2) * sizeof (char));
1631
1632 login[0] = '-';
1633 strcpy (&login[1], arg_a[0]);
1634 arg_a[0] = login;
1635 }
1636
1637 arg_v = arg_a;
1638 }
1639
1640 iov_a[0] = iov_a[1] = iov_a[2] = pty.tty;
1641 cmd_pid = qnx_spawn (0, 0, 0, -1, -1,
1642 _SPAWN_SETSID | _SPAWN_TCSETPGRP,
1643 command, arg_v, environ, iov_a, 0);
1644 if (login)
1645 free (login);
1646
1647 pty.close_tty ();
1648 return pty.pty;
1649#endif
1650
1651 return -1; 1540 return -1;
1652} 1541}
1653 1542
1654/*----------------------- end-of-file (C source) -----------------------*/ 1543/*----------------------- end-of-file (C source) -----------------------*/

Diff Legend

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