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

Comparing rxvt-unicode/src/init.C (file contents):
Revision 1.105 by root, Mon Jan 17 00:59:23 2005 UTC vs.
Revision 1.152 by root, Sat Jan 21 22:38:05 2006 UTC

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

Diff Legend

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