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.150 by root, Fri Jan 20 11:02:46 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
343#ifdef LOCAL_X_IS_UNIX
344 if (rs[Rs_display_name][0] == ':')
345 {
346 val = rxvt_malloc (5 + strlen (rs[Rs_display_name]));
347 strcpy (val, "unix");
348 strcat (val, rs[Rs_display_name]);
349 display = displays.get (val);
350 free (val);
351 }
352#endif
353
354 if (!display
355 && ! (display = displays.get (rs[Rs_display_name])))
356 rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]);
357
358 extract_resources (display->display, rs[Rs_name]);
359 345
360 /* 346 /*
361 * set any defaults not already set 347 * set any defaults not already set
362 */ 348 */
363 if (cmd_argv && cmd_argv[0]) 349 if (cmd_argv && cmd_argv[0])
… …
374 if (!rs[Rs_iconName]) 360 if (!rs[Rs_iconName])
375 rs[Rs_iconName] = rs[Rs_name]; 361 rs[Rs_iconName] = rs[Rs_name];
376 } 362 }
377 363
378 if (rs[Rs_saveLines] && (i = atoi (rs[Rs_saveLines])) >= 0) 364 if (rs[Rs_saveLines] && (i = atoi (rs[Rs_saveLines])) >= 0)
379 TermWin.saveLines = BOUND_POSITIVE_INT16 (i); 365 saveLines = min (i, MAX_SAVELINES);
380 366
381#if ENABLE_FRILLS 367#if ENABLE_FRILLS
382 if (rs[Rs_int_bwidth] && (i = atoi (rs[Rs_int_bwidth])) >= 0) 368 if (rs[Rs_int_bwidth] && (i = atoi (rs[Rs_int_bwidth])) >= 0)
383 TermWin.int_bwidth = min (i, 100); /* arbitrary limit */ 369 int_bwidth = min (i, std::numeric_limits<int16_t>::max ());
370
384 if (rs[Rs_ext_bwidth] && (i = atoi (rs[Rs_ext_bwidth])) >= 0) 371 if (rs[Rs_ext_bwidth] && (i = atoi (rs[Rs_ext_bwidth])) >= 0)
385 TermWin.ext_bwidth = min (i, 100); /* arbitrary limit */ 372 ext_bwidth = min (i, std::numeric_limits<int16_t>::max ());
373
386 if (rs[Rs_lineSpace] && (i = atoi (rs[Rs_lineSpace])) >= 0) 374 if (rs[Rs_lineSpace] && (i = atoi (rs[Rs_lineSpace])) >= 0)
387 TermWin.lineSpace = min (i, 100); /* arbitrary limit */ 375 lineSpace = min (i, std::numeric_limits<int16_t>::max ());
388#endif 376#endif
389 377
390#ifdef POINTER_BLANK 378#ifdef POINTER_BLANK
391 if (rs[Rs_pointerBlankDelay] && (i = atoi (rs[Rs_pointerBlankDelay])) >= 0) 379 if (rs[Rs_pointerBlankDelay] && (i = atoi (rs[Rs_pointerBlankDelay])) >= 0)
392 pointerBlankDelay = i; 380 pointerBlankDelay = i;
393 else 381 else
394 pointerBlankDelay = 2; 382 pointerBlankDelay = 2;
395#endif 383#endif
396 384
397 /* no point having a scrollbar without having any scrollback! */ 385 /* no point having a scrollbar without having any scrollback! */
398 if (!TermWin.saveLines) 386 if (!saveLines)
399 options &= ~Opt_scrollBar; 387 set_option (Opt_scrollBar, 0);
400 388
401#ifdef PRINTPIPE 389#ifdef PRINTPIPE
402 if (!rs[Rs_print_pipe]) 390 if (!rs[Rs_print_pipe])
403 rs[Rs_print_pipe] = PRINTPIPE; 391 rs[Rs_print_pipe] = PRINTPIPE;
404#endif 392#endif
… …
447 setup_scrollbar (rs[Rs_scrollBar_align], rs[Rs_scrollstyle], rs[Rs_scrollBar_thickness]); 435 setup_scrollbar (rs[Rs_scrollBar_align], rs[Rs_scrollstyle], rs[Rs_scrollBar_thickness]);
448#endif 436#endif
449 437
450#ifdef XTERM_REVERSE_VIDEO 438#ifdef XTERM_REVERSE_VIDEO
451 /* this is how xterm implements reverseVideo */ 439 /* this is how xterm implements reverseVideo */
452 if (options & Opt_reverseVideo) 440 if (OPTION (Opt_reverseVideo))
453 { 441 {
454 if (!rs[Rs_color + Color_fg]) 442 if (!rs[Rs_color + Color_fg])
455 rs[Rs_color + Color_fg] = def_colorName[Color_bg]; 443 rs[Rs_color + Color_fg] = def_colorName[Color_bg];
456 if (!rs[Rs_color + Color_bg]) 444 if (!rs[Rs_color + Color_bg])
457 rs[Rs_color + Color_bg] = def_colorName[Color_fg]; 445 rs[Rs_color + Color_bg] = def_colorName[Color_fg];
… …
462 if (!rs[Rs_color + i]) 450 if (!rs[Rs_color + i])
463 rs[Rs_color + i] = def_colorName[i]; 451 rs[Rs_color + i] = def_colorName[i];
464 452
465#ifndef XTERM_REVERSE_VIDEO 453#ifndef XTERM_REVERSE_VIDEO
466 /* this is how we implement reverseVideo */ 454 /* this is how we implement reverseVideo */
467 if (options & Opt_reverseVideo) 455 if (OPTION (Opt_reverseVideo))
468 SWAP_IT (rs[Rs_color + Color_fg], rs[Rs_color + Color_bg], const char *); 456 ::swap (rs[Rs_color + Color_fg], rs[Rs_color + Color_bg]);
469#endif 457#endif
470 458
471 /* convenient aliases for setting fg/bg to colors */ 459 /* convenient aliases for setting fg/bg to colors */
472 color_aliases (Color_fg); 460 color_aliases (Color_fg);
473 color_aliases (Color_bg); 461 color_aliases (Color_bg);
… …
523 env_display = (char *)rxvt_malloc ((i + 9) * sizeof (char)); 511 env_display = (char *)rxvt_malloc ((i + 9) * sizeof (char));
524 512
525 sprintf (env_display, "DISPLAY=%s", val); 513 sprintf (env_display, "DISPLAY=%s", val);
526 514
527 /* avoiding the math library: 515 /* avoiding the math library:
528 * i = (int) (ceil (log10 ((unsigned int)TermWin.parent[0]))) */ 516 * i = (int) (ceil (log10 ((unsigned int)parent[0]))) */
529 for (i = 0, u = (unsigned int)TermWin.parent[0]; u; u /= 10, i++) 517 for (i = 0, u = (unsigned int)parent[0]; u; u /= 10, i++)
530 ; 518 ;
531 MAX_IT (i, 1); 519 max_it (i, 1);
532 env_windowid = (char *)rxvt_malloc ((i + 10) * sizeof (char)); 520 env_windowid = (char *)rxvt_malloc ((i + 10) * sizeof (char));
533 521
534 sprintf (env_windowid, "WINDOWID=%u", 522 sprintf (env_windowid, "WINDOWID=%u",
535 (unsigned int)TermWin.parent[0]); 523 (unsigned int)parent[0]);
536 524
537 /* add entries to the environment: 525 /* add entries to the environment:
538 * @ DISPLAY: in case we started with -display 526 * @ DISPLAY: in case we started with -display
539 * @ WINDOWID: X window id number of the window 527 * @ WINDOWID: X window id number of the window
540 * @ COLORTERM: terminal sub-name and also indicates its color 528 * @ COLORTERM: terminal sub-name and also indicates its color
… …
579 * This should support all European type languages. 567 * This should support all European type languages.
580 */ 568 */
581void 569void
582rxvt_term::set_locale (const char *locale) 570rxvt_term::set_locale (const char *locale)
583{ 571{
572 set_environ (envv);
573
584#if HAVE_XSETLOCALE || HAVE_SETLOCALE 574#if HAVE_XSETLOCALE || HAVE_SETLOCALE
585 free (this->locale); 575 free (this->locale);
586 this->locale = setlocale (LC_CTYPE, locale); 576 this->locale = setlocale (LC_CTYPE, locale);
587 577
588 if (!this->locale) 578 if (!this->locale)
589 { 579 {
590 if (*locale) 580 if (*locale)
591 { 581 {
592 rxvt_warn ("unable to set locale \"%s\", using default locale instead.\n", locale); 582 rxvt_warn ("unable to set locale \"%s\", using C locale instead.\n", locale);
593 setlocale (LC_CTYPE, ""); 583 setlocale (LC_CTYPE, "C");
594 } 584 }
595 else 585 else
596 rxvt_warn ("default locale unavailable, check LC_* and LANG variables. Continuing.\n"); 586 rxvt_warn ("default locale unavailable, check LC_* and LANG variables. Continuing.\n");
597 587
598 this->locale = ""; 588 this->locale = "C";
599 } 589 }
600 590
601 591
602 this->locale = rxvt_strdup (this->locale); 592 this->locale = rxvt_strdup (this->locale);
603 SET_LOCALE (this->locale); 593 SET_LOCALE (this->locale);
… …
618} 608}
619 609
620void 610void
621rxvt_term::init_xlocale () 611rxvt_term::init_xlocale ()
622{ 612{
613 set_environ (envv);
614
623#ifdef USE_XIM 615#ifdef USE_XIM
624 if (!locale) 616 if (!locale)
625 rxvt_warn ("setting locale failed, working without locale support.\n"); 617 rxvt_warn ("setting locale failed, working without locale support.\n");
626 else 618 else
627 { 619 {
… …
649 * Initialize the command connection. 641 * Initialize the command connection.
650 * This should be called after the X server connection is established. 642 * This should be called after the X server connection is established.
651 */ 643 */
652 644
653#ifdef META8_OPTION 645#ifdef META8_OPTION
654 meta_char = (options & Opt_meta8 ? 0x80 : C0_ESC); 646 meta_char = OPTION (Opt_meta8) ? 0x80 : C0_ESC;
655#endif 647#endif
656 648
657 get_ourmods (); 649 get_ourmods ();
658 650
659 if (!(options & Opt_scrollTtyOutput)) 651 if (!OPTION (Opt_scrollTtyOutput))
660 priv_modes |= PrivMode_TtyOutputInh; 652 priv_modes |= PrivMode_TtyOutputInh;
661 if (options & Opt_scrollTtyKeypress) 653 if (OPTION (Opt_scrollTtyKeypress))
662 priv_modes |= PrivMode_Keypress; 654 priv_modes |= PrivMode_Keypress;
663 if (!(options & Opt_jumpScroll)) 655 if (!OPTION (Opt_jumpScroll))
664 priv_modes |= PrivMode_smoothScroll; 656 priv_modes |= PrivMode_smoothScroll;
665 657
666#ifndef NO_BACKSPACE_KEY 658#ifndef NO_BACKSPACE_KEY
667 if (strcmp (key_backspace, "DEC") == 0) 659 if (strcmp (key_backspace, "DEC") == 0)
668 priv_modes |= PrivMode_HaveBackSpace; 660 priv_modes |= PrivMode_HaveBackSpace;
669#endif 661#endif
670 662
671 /* add value for scrollBar */ 663 /* add value for scrollBar */
672 if (scrollbar_visible ()) 664 if (scrollBar.state)
673 { 665 {
674 priv_modes |= PrivMode_scrollBar; 666 priv_modes |= PrivMode_scrollBar;
675 SavedModes |= PrivMode_scrollBar; 667 SavedModes |= PrivMode_scrollBar;
676 } 668 }
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 669
688 run_command (argv); 670 run_command (argv);
689} 671}
690 672
691/*----------------------------------------------------------------------*/ 673/*----------------------------------------------------------------------*/
… …
706 continue; 688 continue;
707 689
708 if (!rXParseAllocColor (&xcol, rs[Rs_color + i])) 690 if (!rXParseAllocColor (&xcol, rs[Rs_color + i]))
709 { 691 {
710#ifndef XTERM_REVERSE_VIDEO 692#ifndef XTERM_REVERSE_VIDEO
711 if (i < 2 && (options & Opt_reverseVideo)) 693 if (i < 2 && OPTION (Opt_reverseVideo))
712 rs[Rs_color + i] = def_colorName[!i]; 694 rs[Rs_color + i] = def_colorName[!i];
713 else 695 else
714#endif 696#endif
715 rs[Rs_color + i] = def_colorName[i]; 697 rs[Rs_color + i] = def_colorName[i];
716 698
… …
741 } 723 }
742 } 724 }
743 } 725 }
744 726
745 pix_colors[i] = xcol; 727 pix_colors[i] = xcol;
728 SET_PIXCOLOR (i);
729 }
730
746#ifdef OFF_FOCUS_FADING 731#ifdef OFF_FOCUS_FADING
747 if (rs[Rs_fade]) 732 if (rs[Rs_fade])
733 for (i = 0; i < (display->depth <= 2 ? 2 : NRS_COLORS); i++)
748 pix_colors_unfocused[i] = xcol.fade (display, atoi (rs[Rs_fade])); 734 pix_colors_unfocused[i] = pix_colors_focused[i].fade (display, atoi (rs[Rs_fade]), pix_colors[Color_fade]);
749#endif 735#endif
750 SET_PIXCOLOR (i);
751 }
752 736
753 if (display->depth <= 2) 737 if (display->depth <= 2)
754 { 738 {
755 if (!rs[Rs_color + Color_pointer_fg]) pix_colors[Color_pointer_fg] = pix_colors[Color_fg]; 739 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]; 740 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]; 741 if (!rs[Rs_color + Color_border] ) pix_colors[Color_border] = pix_colors[Color_fg];
758 } 742 }
759 743
760 /* 744 /*
761 * get scrollBar/menuBar shadow colors 745 * get scrollBar shadow colors
762 * 746 *
763 * The calculations of topShadow/bottomShadow values are adapted 747 * The calculations of topShadow/bottomShadow values are adapted
764 * from the fvwm window manager. 748 * from the fvwm window manager.
765 */ 749 */
766#ifdef KEEP_SCROLLCOLOR 750#ifdef KEEP_SCROLLCOLOR
767 751
768 if (display->depth <= 2) 752 if (display->depth <= 2)
753 {
769 { /* Monochrome */ 754 /* Monochrome */
770 pix_colors[Color_scroll] = pix_colors[Color_fg]; 755 pix_colors[Color_scroll] = pix_colors[Color_fg];
771 pix_colors[Color_topShadow] = pix_colors[Color_bg]; 756 pix_colors[Color_topShadow] = pix_colors[Color_bg];
772 pix_colors[Color_bottomShadow] = pix_colors[Color_bg]; 757 pix_colors[Color_bottomShadow] = pix_colors[Color_bg];
773 } 758 }
774 else 759 else
… …
810 int i = atoi (rs[Rs_color + idx]); 795 int i = atoi (rs[Rs_color + idx]);
811 796
812 if (i >= 8 && i <= 15) 797 if (i >= 8 && i <= 15)
813 { /* bright colors */ 798 { /* bright colors */
814 i -= 8; 799 i -= 8;
815#ifndef NO_BRIGHTCOLOR
816 rs[Rs_color + idx] = rs[Rs_color + minBrightCOLOR + i]; 800 rs[Rs_color + idx] = rs[Rs_color + minBrightCOLOR + i];
817 return; 801 return;
818#endif
819 } 802 }
820 803
821 if (i >= 0 && i <= 7) /* normal colors */ 804 if (i >= 0 && i <= 7) /* normal colors */
822 rs[Rs_color + idx] = rs[Rs_color + minCOLOR + i]; 805 rs[Rs_color + idx] = rs[Rs_color + minCOLOR + i];
823 } 806 }
… …
829 * Use resource ``modifier'' to override the Meta modifier 812 * Use resource ``modifier'' to override the Meta modifier
830 */ 813 */
831void 814void
832rxvt_term::get_ourmods () 815rxvt_term::get_ourmods ()
833{ 816{
834 int i, j, k; 817 int i, j, k;
835 int requestedmeta, realmeta, realalt; 818 int requestedmeta, realmeta, realalt;
836 const char *cm, *rsmod; 819 const char *cm, *rsmod;
837 XModifierKeymap *map; 820 XModifierKeymap *map;
838 KeyCode *kc; 821 KeyCode *kc;
839 const unsigned int modmasks[] = 822 const unsigned int modmasks[] =
840 { 823 {
841 Mod1Mask, Mod2Mask, Mod3Mask, Mod4Mask, Mod5Mask 824 Mod1Mask, Mod2Mask, Mod3Mask, Mod4Mask, Mod5Mask
842 }; 825 };
843 826
… …
922#if ENABLE_FRILLS 905#if ENABLE_FRILLS
923 Atom prop = None; 906 Atom prop = None;
924 MWMHints mwmhints; 907 MWMHints mwmhints;
925#endif 908#endif
926 XGCValues gcvalue; 909 XGCValues gcvalue;
927 long vt_emask;
928 XSetWindowAttributes attributes; 910 XSetWindowAttributes attributes;
929 XWindowAttributes gattr; 911 XWindowAttributes gattr;
912 Window top, parent;
913 dDisp;
930 914
931#ifdef USING_W11LIB 915#ifdef USING_W11LIB
932 /* enable W11 callbacks */ 916 /* enable W11 callbacks */
933 W11AddEventHandler (display->display, rxvt_W11_process_x_event); 917 W11AddEventHandler (disp, rxvt_W11_process_x_event);
934#endif 918#endif
935 919
936 assert (sizeof (xa_names) / sizeof (char *) == NUM_XA); 920 assert (sizeof (xa_names) / sizeof (char *) == NUM_XA);
937 XInternAtoms (display->display, (char **)xa_names, NUM_XA, False, xa); 921 XInternAtoms (disp, (char **)xa_names, NUM_XA, False, xa);
938 922
939 if (options & Opt_transparent) 923 if (OPTION (Opt_transparent))
940 { 924 {
941 XGetWindowAttributes (display->display, RootWindow (display->display, display->screen), &gattr); 925 XGetWindowAttributes (disp, RootWindow (disp, display->screen), &gattr);
942 display->depth = gattr.depth; // doh //TODO, per-term not per-display? 926 display->depth = gattr.depth; // doh //TODO, per-term not per-display?
943 } 927 }
944 928
929 /* grab colors before netscape does */
930 Get_Colours ();
931
932 if (!set_fonts ())
933 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n");
934
935 parent = DefaultRootWindow (disp);
936
937 attributes.override_redirect = !!OPTION (Opt_override_redirect);
938
945#if ENABLE_FRILLS 939#if ENABLE_FRILLS
946 if (options & Opt_borderLess) 940 if (OPTION (Opt_borderLess))
947 { 941 {
948 prop = XInternAtom(display->display, "_MOTIF_WM_INFO", True); 942 prop = XInternAtom (disp, "_MOTIF_WM_INFO", True);
949 943
950 if (prop == None) 944 if (prop == None)
951 { 945 {
952 /* print_warning("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n");*/ 946 /* 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; 947 attributes.override_redirect = TRUE;
955#endif
956 mwmhints.flags = 0; 948 mwmhints.flags = 0;
957 } 949 }
958 else 950 else
959 { 951 {
960 mwmhints.flags = MWM_HINTS_DECORATIONS; 952 mwmhints.flags = MWM_HINTS_DECORATIONS;
961 mwmhints.decorations = 0; 953 mwmhints.decorations = 0;
962 } 954 }
963 } 955 }
964 else 956 else
965 {
966 mwmhints.flags = 0; 957 mwmhints.flags = 0;
958#endif
959
960#if ENABLE_XEMBED
961 if (rs[Rs_embed])
967 } 962 {
968#endif 963 XWindowAttributes wattr;
969 964
970 /* grab colors before netscape does */ 965 parent = strtol (rs[Rs_embed], 0, 0);
971 Get_Colours ();
972 966
973 if (!set_fonts ()) 967 if (!XGetWindowAttributes (disp, parent, &wattr))
974 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n"); 968 rxvt_fatal ("invalid window-id specified with -embed, aborting.\n");
969
970 window_calc (wattr.width, wattr.height);
971 }
972#endif
975 973
976 window_calc (0, 0); 974 window_calc (0, 0);
977 old_width = szHint.width;
978 old_height = szHint.height;
979 975
980 /* sub-window placement & size in rxvt_resize_subwindows () */ 976 /* sub-window placement & size in rxvt_resize_subwindows () */
981
982#ifdef PREFER_24BIT
983 attributes.background_pixel = pix_colors_focused[Color_border]; 977 attributes.background_pixel = pix_colors_focused[Color_border];
984 attributes.border_pixel = pix_colors_focused[Color_border]; 978 attributes.border_pixel = pix_colors_focused[Color_border];
985 attributes.colormap = display->cmap; 979 attributes.colormap = display->cmap;
986 TermWin.parent[0] = XCreateWindow (display->display, DefaultRootWindow (display->display), 980 top = XCreateWindow (disp, parent,
987 szHint.x, szHint.y, 981 szHint.x, szHint.y,
988 szHint.width, szHint.height, 982 szHint.width, szHint.height,
989 TermWin.ext_bwidth, 983 ext_bwidth,
990 display->depth, InputOutput, 984 display->depth, InputOutput,
991 display->visual, 985 display->visual,
992 CWColormap | CWBackPixel | CWBorderPixel, &attributes); 986 CWColormap | CWBackPixel | CWBorderPixel | CWOverrideRedirect,
993#else 987 &attributes);
994 TermWin.parent[0] = XCreateSimpleWindow (display->display, DefaultRootWindow (display->display), 988
995 szHint.x, szHint.y, 989 this->parent[0] = top;
996 szHint.width, szHint.height, 990
997 TermWin.ext_bwidth, 991 old_width = szHint.width;
998 pix_colors_focused[Color_border], 992 old_height = szHint.height;
999 pix_colors_focused[Color_border]);
1000#endif
1001 993
1002 process_xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST); 994 process_xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST);
1003 process_xterm_seq (XTerm_iconName, rs[Rs_iconName], CHAR_ST); 995 process_xterm_seq (XTerm_iconName, rs[Rs_iconName], CHAR_ST);
1004 996
1005 classHint.res_name = (char *)rs[Rs_name]; 997 classHint.res_name = (char *)rs[Rs_name];
1006 classHint.res_class = (char *)RESCLASS; 998 classHint.res_class = (char *)RESCLASS;
1007 999
1008 wmHint.flags = InputHint | StateHint | WindowGroupHint; 1000 wmHint.flags = InputHint | StateHint | WindowGroupHint;
1009 wmHint.input = True; 1001 wmHint.input = True;
1010 wmHint.initial_state = options & Opt_iconic ? IconicState : NormalState; 1002 wmHint.initial_state = OPTION (Opt_iconic) ? IconicState : NormalState;
1011 wmHint.window_group = TermWin.parent[0]; 1003 wmHint.window_group = top;
1012 1004
1013 XSetWMProperties (display->display, TermWin.parent[0], NULL, NULL, 1005 XmbSetWMProperties (disp, top, NULL, NULL, (char **)argv, argc,
1014 (char **)argv, argc, &szHint, &wmHint, &classHint); 1006 &szHint, &wmHint, &classHint);
1015 1007
1016 /* Enable delete window protocol */ 1008 Atom protocols[] = {
1017 XSetWMProtocols (display->display, TermWin.parent[0], 1009 xa[XA_WM_DELETE_WINDOW],
1018 &xa[XA_WMDELETEWINDOW], 1); 1010#if ENABLE_EWMH
1011 xa[XA_NET_WM_PING],
1012#endif
1013 };
1014
1015 XSetWMProtocols (disp, top, protocols, sizeof (protocols) / sizeof (protocols[0]));
1019 1016
1020#if ENABLE_FRILLS 1017#if ENABLE_FRILLS
1018 if (rs[Rs_transient_for])
1019 XSetTransientForHint (disp, top, (Window)strtol (rs[Rs_transient_for], 0, 0));
1020#endif
1021
1022#if ENABLE_EWMH
1021 long pid = getpid (); 1023 long pid = getpid ();
1022 1024
1023 XChangeProperty (display->display, TermWin.parent[0], 1025 XChangeProperty (disp, top,
1024 xa[XA_NET_WM_PID], XA_CARDINAL, 32, 1026 xa[XA_NET_WM_PID], XA_CARDINAL, 32,
1025 PropModeReplace, (unsigned char *)&pid, 1); 1027 PropModeReplace, (unsigned char *)&pid, 1);
1026#endif
1027 1028
1028 XSelectInput (display->display, TermWin.parent[0], 1029 // _NET_WM_WINDOW_TYPE is NORMAL, which is the default
1030#endif
1031
1032 XSelectInput (disp, top,
1029 KeyPressMask 1033 KeyPressMask
1030#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ENABLE_FRILLS || ISO_14755 1034#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ENABLE_FRILLS || ISO_14755
1031 | KeyReleaseMask 1035 | KeyReleaseMask
1032#endif 1036#endif
1033 | FocusChangeMask | VisibilityChangeMask 1037 | FocusChangeMask | VisibilityChangeMask
1034 | ExposureMask
1035 | StructureNotifyMask); 1038 | ExposureMask | StructureNotifyMask);
1039
1036 termwin_ev.start (display, TermWin.parent[0]); 1040 termwin_ev.start (display, top);
1037 1041
1038#if ENABLE_FRILLS 1042#if ENABLE_FRILLS
1039 if (mwmhints.flags) 1043 if (mwmhints.flags)
1040 XChangeProperty (display->display, TermWin.parent[0], xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32, 1044 XChangeProperty (disp, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32,
1041 PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS); 1045 PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS);
1042#endif 1046#endif
1043 1047
1044 /* vt cursor: Black-on-White is standard, but this is more popular */ 1048 /* vt cursor: Black-on-White is standard, but this is more popular */
1045 TermWin_cursor = XCreateFontCursor (display->display, XC_xterm); 1049 TermWin_cursor = XCreateFontCursor (disp, XC_xterm);
1046 1050
1047#if defined(HAVE_SCROLLBARS) || defined(MENUBAR) 1051#ifdef HAVE_SCROLLBARS
1048 /* cursor (menuBar/scrollBar): Black-on-White */ 1052 /* cursor scrollBar: Black-on-White */
1049 leftptr_cursor = XCreateFontCursor (display->display, XC_left_ptr); 1053 leftptr_cursor = XCreateFontCursor (disp, XC_left_ptr);
1050#endif 1054#endif
1051 1055
1052 /* the vt window */ 1056 /* the vt window */
1053 TermWin.vt = XCreateSimpleWindow (display->display, TermWin.parent[0], 1057 vt = XCreateSimpleWindow (disp, top,
1054 window_vt_x, 1058 window_vt_x,
1055 window_vt_y, 1059 window_vt_y,
1056 TermWin_TotalWidth (), 1060 width,
1057 TermWin_TotalHeight (), 1061 height,
1058 0, 1062 0,
1059 pix_colors_focused[Color_fg], 1063 pix_colors_focused[Color_fg],
1060 pix_colors_focused[Color_bg]); 1064 pix_colors_focused[Color_bg]);
1061#ifdef DEBUG_X 1065#ifdef DEBUG_X
1062 XStoreName (display->display, TermWin.vt, "vt window"); 1066 XStoreName (disp, vt, "vt window");
1063#endif 1067#endif
1064 1068
1065 attributes.bit_gravity = NorthWestGravity; 1069 attributes.bit_gravity = NorthWestGravity;
1066 XChangeWindowAttributes (display->display, TermWin.vt, CWBitGravity, &attributes); 1070 XChangeWindowAttributes (disp, vt, CWBitGravity, &attributes);
1067 1071
1068 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask; 1072 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask;
1069 1073
1070 pointer_unblank (); 1074 if (OPTION (Opt_pointerBlank))
1071
1072#ifdef POINTER_BLANK
1073 if (options & Opt_pointerBlank)
1074 vt_emask |= PointerMotionMask; 1075 vt_emask |= PointerMotionMask;
1075 else 1076 else
1076#endif
1077 vt_emask |= Button1MotionMask | Button3MotionMask; 1077 vt_emask |= Button1MotionMask | Button3MotionMask;
1078 1078
1079 XSelectInput (display->display, TermWin.vt, vt_emask); 1079 vt_select_input ();
1080
1080 vt_ev.start (display, TermWin.vt); 1081 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 1082
1109#ifdef XPM_BACKGROUND 1083#ifdef XPM_BACKGROUND
1110 if (rs[Rs_backgroundPixmap] != NULL 1084 if (rs[Rs_backgroundPixmap] != NULL
1111 && ! (options & Opt_transparent)) 1085 && ! OPTION (Opt_transparent))
1112 { 1086 {
1113 const char *p = rs[Rs_backgroundPixmap]; 1087 const char *p = rs[Rs_backgroundPixmap];
1114 1088
1115 if ((p = strchr (p, ';')) != NULL) 1089 if ((p = strchr (p, ';')) != NULL)
1116 { 1090 {
… …
1125 1099
1126 /* graphics context for the vt window */ 1100 /* graphics context for the vt window */
1127 gcvalue.foreground = pix_colors[Color_fg]; 1101 gcvalue.foreground = pix_colors[Color_fg];
1128 gcvalue.background = pix_colors[Color_bg]; 1102 gcvalue.background = pix_colors[Color_bg];
1129 gcvalue.graphics_exposures = 1; 1103 gcvalue.graphics_exposures = 1;
1130 TermWin.gc = XCreateGC (display->display, TermWin.vt, 1104 gc = XCreateGC (disp, vt,
1131 GCForeground | GCBackground | GCGraphicsExposures, 1105 GCForeground | GCBackground | GCGraphicsExposures,
1132 &gcvalue); 1106 &gcvalue);
1133 1107
1134 TermWin.drawable = new rxvt_drawable (display, TermWin.vt); 1108 drawable = new rxvt_drawable (display, vt);
1135 1109
1136#if defined(MENUBAR) || defined(RXVT_SCROLLBAR) 1110#ifdef RXVT_SCROLLBAR
1137 gcvalue.foreground = pix_colors[Color_topShadow]; 1111 gcvalue.foreground = pix_colors[Color_topShadow];
1138 topShadowGC = XCreateGC (display->display, TermWin.vt, GCForeground, &gcvalue); 1112 topShadowGC = XCreateGC (disp, vt, GCForeground, &gcvalue);
1139 gcvalue.foreground = pix_colors[Color_bottomShadow]; 1113 gcvalue.foreground = pix_colors[Color_bottomShadow];
1140 botShadowGC = XCreateGC (display->display, TermWin.vt, GCForeground, &gcvalue); 1114 botShadowGC = XCreateGC (disp, vt, GCForeground, &gcvalue);
1141 gcvalue.foreground = pix_colors[ (display->depth <= 2 ? Color_fg : Color_scroll)]; 1115 gcvalue.foreground = pix_colors[ (display->depth <= 2 ? Color_fg : Color_scroll)];
1142 scrollbarGC = XCreateGC (display->display, TermWin.vt, GCForeground, &gcvalue); 1116 scrollbarGC = XCreateGC (disp, vt, GCForeground, &gcvalue);
1143#endif 1117#endif
1144 1118
1145#ifdef OFF_FOCUS_FADING 1119#ifdef OFF_FOCUS_FADING
1146 // initially we are in unfocused state 1120 // initially we are in unfocused state
1147 if (rs[Rs_fade]) 1121 if (rs[Rs_fade])
1148 pix_colors = pix_colors_unfocused; 1122 pix_colors = pix_colors_unfocused;
1149#endif 1123#endif
1150 1124
1125 pointer_unblank ();
1151 scr_recolour (); 1126 scr_recolour ();
1127
1128#if ENABLE_XEMBED
1129 if (rs[Rs_embed])
1130 {
1131 long info[2] = { 0, XEMBED_MAPPED };
1132
1133 XChangeProperty (disp, parent, xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
1134 32, PropModeReplace, (unsigned char *)&info, 2);
1135 }
1136#endif
1152} 1137}
1153 1138
1154/* ------------------------------------------------------------------------- * 1139/* ------------------------------------------------------------------------- *
1155 * GET TTY CURRENT STATE * 1140 * GET TTY CURRENT STATE *
1156 * ------------------------------------------------------------------------- */ 1141 * ------------------------------------------------------------------------- */
… …
1161 /* 1146 /*
1162 * standard System V termios interface 1147 * standard System V termios interface
1163 */ 1148 */
1164 if (GET_TERMIOS (STDIN_FILENO, tio) < 0) 1149 if (GET_TERMIOS (STDIN_FILENO, tio) < 0)
1165 { 1150 {
1166 /* return error - use system defaults */ 1151 // return error - use system defaults,
1152 // where possible, and zero elsewhere
1153 memset (tio, 0, sizeof (ttymode_t));
1154
1167 tio->c_cc[VINTR] = CINTR; 1155 tio->c_cc[VINTR] = CINTR;
1168 tio->c_cc[VQUIT] = CQUIT; 1156 tio->c_cc[VQUIT] = CQUIT;
1169 tio->c_cc[VERASE] = CERASE; 1157 tio->c_cc[VERASE] = CERASE;
1158#ifdef VERASE2
1159 tio->c_cc[VERASE2] = CERASE2;
1160#endif
1170 tio->c_cc[VKILL] = CKILL; 1161 tio->c_cc[VKILL] = CKILL;
1171 tio->c_cc[VSTART] = CSTART; 1162 tio->c_cc[VSTART] = CSTART;
1172 tio->c_cc[VSTOP] = CSTOP; 1163 tio->c_cc[VSTOP] = CSTOP;
1173 tio->c_cc[VSUSP] = CSUSP; 1164 tio->c_cc[VSUSP] = CSUSP;
1174# ifdef VDSUSP 1165# ifdef VDSUSP
1175
1176 tio->c_cc[VDSUSP] = CDSUSP; 1166 tio->c_cc[VDSUSP] = CDSUSP;
1177# endif 1167# endif
1178# ifdef VREPRINT 1168# ifdef VREPRINT
1179
1180 tio->c_cc[VREPRINT] = CRPRNT; 1169 tio->c_cc[VREPRINT] = CRPRNT;
1181# endif 1170# endif
1182# ifdef VDISCRD 1171# ifdef VDISCRD
1183
1184 tio->c_cc[VDISCRD] = CFLUSH; 1172 tio->c_cc[VDISCRD] = CFLUSH;
1185# endif 1173# endif
1186# ifdef VWERSE 1174# ifdef VWERSE
1187
1188 tio->c_cc[VWERSE] = CWERASE; 1175 tio->c_cc[VWERSE] = CWERASE;
1189# endif 1176# endif
1190# ifdef VLNEXT 1177# ifdef VLNEXT
1191
1192 tio->c_cc[VLNEXT] = CLNEXT; 1178 tio->c_cc[VLNEXT] = CLNEXT;
1193# endif 1179# endif
1194
1195 } 1180 }
1181
1196 tio->c_cc[VEOF] = CEOF; 1182 tio->c_cc[VEOF] = CEOF;
1197 tio->c_cc[VEOL] = VDISABLE; 1183 tio->c_cc[VEOL] = VDISABLE;
1198# ifdef VEOL2 1184# ifdef VEOL2
1199
1200 tio->c_cc[VEOL2] = VDISABLE; 1185 tio->c_cc[VEOL2] = VDISABLE;
1201# endif 1186# endif
1202# ifdef VSWTC 1187# ifdef VSWTC
1203
1204 tio->c_cc[VSWTC] = VDISABLE; 1188 tio->c_cc[VSWTC] = VDISABLE;
1205# endif 1189# endif
1206# ifdef VSWTCH 1190# ifdef VSWTCH
1207
1208 tio->c_cc[VSWTCH] = VDISABLE; 1191 tio->c_cc[VSWTCH] = VDISABLE;
1209# endif 1192# endif
1210# if VMIN != VEOF 1193# if VMIN != VEOF
1211
1212 tio->c_cc[VMIN] = 1; 1194 tio->c_cc[VMIN] = 1;
1213# endif 1195# endif
1214# if VTIME != VEOL 1196# if VTIME != VEOL
1215
1216 tio->c_cc[VTIME] = 0; 1197 tio->c_cc[VTIME] = 0;
1217# endif 1198# endif
1218 1199
1219 if (erase != -1) 1200 if (erase != -1)
1220 tio->c_cc[VERASE] = (char)erase; 1201 tio->c_cc[VERASE] = (char)erase;
… …
1248 if (ioctl (STDIN_FILENO, TIOCGETP, & (tio->sg)) < 0) 1229 if (ioctl (STDIN_FILENO, TIOCGETP, & (tio->sg)) < 0)
1249 { 1230 {
1250 tio->sg.sg_erase = CERASE; /* ^H */ 1231 tio->sg.sg_erase = CERASE; /* ^H */
1251 tio->sg.sg_kill = CKILL; /* ^U */ 1232 tio->sg.sg_kill = CKILL; /* ^U */
1252 } 1233 }
1234
1253 if (erase != -1) 1235 if (erase != -1)
1254 tio->sg.sg_erase = (char)erase; 1236 tio->sg.sg_erase = (char)erase;
1255 1237
1256 tio->sg.sg_flags = (CRMOD | ECHO | EVENP | ODDP); 1238 tio->sg.sg_flags = (CRMOD | ECHO | EVENP | ODDP);
1257 1239
… …
1263 tio->tc.t_startc = CSTART; /* ^Q */ 1245 tio->tc.t_startc = CSTART; /* ^Q */
1264 tio->tc.t_stopc = CSTOP; /* ^S */ 1246 tio->tc.t_stopc = CSTOP; /* ^S */
1265 tio->tc.t_eofc = CEOF; /* ^D */ 1247 tio->tc.t_eofc = CEOF; /* ^D */
1266 tio->tc.t_brkc = -1; 1248 tio->tc.t_brkc = -1;
1267 } 1249 }
1250
1268 /* get local special chars */ 1251 /* get local special chars */
1269 if (ioctl (STDIN_FILENO, TIOCGLTC, & (tio->lc)) < 0) 1252 if (ioctl (STDIN_FILENO, TIOCGLTC, & (tio->lc)) < 0)
1270 { 1253 {
1271 tio->lc.t_suspc = CSUSP; /* ^Z */ 1254 tio->lc.t_suspc = CSUSP; /* ^Z */
1272 tio->lc.t_dsuspc = CDSUSP; /* ^Y */ 1255 tio->lc.t_dsuspc = CDSUSP; /* ^Y */
… …
1276 tio->lc.t_lnextc = CLNEXT; /* ^V */ 1259 tio->lc.t_lnextc = CLNEXT; /* ^V */
1277 } 1260 }
1278 /* get line discipline */ 1261 /* get line discipline */
1279 ioctl (STDIN_FILENO, TIOCGETD, & (tio->line)); 1262 ioctl (STDIN_FILENO, TIOCGETD, & (tio->line));
1280# ifdef NTTYDISC 1263# ifdef NTTYDISC
1281
1282 tio->line = NTTYDISC; 1264 tio->line = NTTYDISC;
1283# endif /* NTTYDISC */ 1265# endif /* NTTYDISC */
1284 1266
1285 tio->local = (LCRTBS | LCRTERA | LCTLECH | LPASS8 | LCRTKIL); 1267 tio->local = (LCRTBS | LCRTERA | LCTLECH | LPASS8 | LCRTKIL);
1286#endif /* HAVE_TERMIOS_H */ 1268#endif /* HAVE_TERMIOS_H */
… …
1309 FOO (IGNCR, "IGNCR"); 1291 FOO (IGNCR, "IGNCR");
1310 FOO (ICRNL, "ICRNL"); 1292 FOO (ICRNL, "ICRNL");
1311 FOO (IXON, "IXON"); 1293 FOO (IXON, "IXON");
1312 FOO (IXOFF, "IXOFF"); 1294 FOO (IXOFF, "IXOFF");
1313# ifdef IUCLC 1295# ifdef IUCLC
1314
1315 FOO (IUCLC, "IUCLC"); 1296 FOO (IUCLC, "IUCLC");
1316# endif 1297# endif
1317# ifdef IXANY 1298# ifdef IXANY
1318
1319 FOO (IXANY, "IXANY"); 1299 FOO (IXANY, "IXANY");
1320# endif 1300# endif
1321# ifdef IMAXBEL 1301# ifdef IMAXBEL
1322
1323 FOO (IMAXBEL, "IMAXBEL"); 1302 FOO (IMAXBEL, "IMAXBEL");
1324# endif 1303# endif
1325 1304
1326 fprintf (stderr, "\n"); 1305 fprintf (stderr, "\n");
1327 1306
… …
1334 FOO (VERASE, "VERASE"); 1313 FOO (VERASE, "VERASE");
1335 FOO (VKILL, "VKILL"); 1314 FOO (VKILL, "VKILL");
1336 FOO (VEOF, "VEOF"); 1315 FOO (VEOF, "VEOF");
1337 FOO (VEOL, "VEOL"); 1316 FOO (VEOL, "VEOL");
1338# ifdef VEOL2 1317# ifdef VEOL2
1339
1340 FOO (VEOL2, "VEOL2"); 1318 FOO (VEOL2, "VEOL2");
1341# endif 1319# endif
1342# ifdef VSWTC 1320# ifdef VSWTC
1343
1344 FOO (VSWTC, "VSWTC"); 1321 FOO (VSWTC, "VSWTC");
1345# endif 1322# endif
1346# ifdef VSWTCH 1323# ifdef VSWTCH
1347
1348 FOO (VSWTCH, "VSWTCH"); 1324 FOO (VSWTCH, "VSWTCH");
1349# endif 1325# endif
1350
1351 FOO (VSTART, "VSTART"); 1326 FOO (VSTART, "VSTART");
1352 FOO (VSTOP, "VSTOP"); 1327 FOO (VSTOP, "VSTOP");
1353 FOO (VSUSP, "VSUSP"); 1328 FOO (VSUSP, "VSUSP");
1354# ifdef VDSUSP 1329# ifdef VDSUSP
1355
1356 FOO (VDSUSP, "VDSUSP"); 1330 FOO (VDSUSP, "VDSUSP");
1357# endif 1331# endif
1358# ifdef VREPRINT 1332# ifdef VREPRINT
1359
1360 FOO (VREPRINT, "VREPRINT"); 1333 FOO (VREPRINT, "VREPRINT");
1361# endif 1334# endif
1362# ifdef VDISCRD 1335# ifdef VDISCRD
1363
1364 FOO (VDISCRD, "VDISCRD"); 1336 FOO (VDISCRD, "VDISCRD");
1365# endif 1337# endif
1366# ifdef VWERSE 1338# ifdef VWERSE
1367
1368 FOO (VWERSE, "VWERSE"); 1339 FOO (VWERSE, "VWERSE");
1369# endif 1340# endif
1370# ifdef VLNEXT 1341# ifdef VLNEXT
1371
1372 FOO (VLNEXT, "VLNEXT"); 1342 FOO (VLNEXT, "VLNEXT");
1373# endif 1343# endif
1374 1344
1375 fprintf (stderr, "\n"); 1345 fprintf (stderr, "\n");
1376# undef FOO 1346# undef FOO
… …
1385 * the slave. 1355 * the slave.
1386 */ 1356 */
1387void 1357void
1388rxvt_term::run_command (const char *const *argv) 1358rxvt_term::run_command (const char *const *argv)
1389{ 1359{
1360#if ENABLE_FRILLS
1361 if (rs[Rs_pty_fd])
1362 {
1363 pty->pty = atoi (rs[Rs_pty_fd]);
1364
1365 if (pty->pty >= 0)
1366 {
1367 if (getfd_hook)
1368 pty->pty = (*getfd_hook) (pty->pty);
1369
1370 if (pty->pty < 0 || fcntl (pty->pty, F_SETFL, O_NONBLOCK))
1371 rxvt_fatal ("unusable pty-fd filehandle, aborting.\n");
1372 }
1373 }
1374 else
1375#endif
1390 if (!pty.get ()) 1376 if (!pty->get ())
1391 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n"); 1377 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");
1392 1378
1393 pty.set_utf8_mode (enc_utf8); 1379 pty->set_utf8_mode (enc_utf8);
1394 1380
1395 /* set initial window size */ 1381 /* set initial window size */
1396 tt_winch (); 1382 tt_winch ();
1397 1383
1398 int er; 1384 int er;
… …
1406#endif 1392#endif
1407 er = -1; 1393 er = -1;
1408 1394
1409 rxvt_get_ttymode (&tio, er); 1395 rxvt_get_ttymode (&tio, er);
1410 1396
1411 sw_chld.start (SIGCHLD); 1397#if ENABLE_FRILLS
1398 if (rs[Rs_pty_fd])
1399 return;
1400#endif
1412 1401
1413#ifndef __QNX__
1414 /* spin off the command interpreter */ 1402 /* spin off the command interpreter */
1415 switch (cmd_pid = fork ()) 1403 switch (cmd_pid = fork ())
1416 { 1404 {
1417 case -1: 1405 case -1:
1406 {
1407 cmd_pid = 0;
1418 rxvt_fatal ("can't fork, aborting.\n"); 1408 rxvt_fatal ("can't fork, aborting.\n");
1409 }
1419 case 0: 1410 case 0:
1420 init_env (); 1411 init_env ();
1421 1412
1422 if (!pty.make_controlling_tty ()) 1413 if (!pty->make_controlling_tty ())
1423 fprintf (stderr, "%s: could not obtain control of tty.", RESNAME); 1414 fprintf (stderr, "%s: could not obtain control of tty.", RESNAME);
1424 else 1415 else
1425 { 1416 {
1426 /* Reopen stdin, stdout and stderr over the tty file descriptor */ 1417 /* Reopen stdin, stdout and stderr over the tty file descriptor */
1427 dup2 (pty.tty, STDIN_FILENO); 1418 dup2 (pty->tty, STDIN_FILENO);
1428 dup2 (pty.tty, STDOUT_FILENO); 1419 dup2 (pty->tty, STDOUT_FILENO);
1429 dup2 (pty.tty, STDERR_FILENO); 1420 dup2 (pty->tty, STDERR_FILENO);
1430 1421
1431 // close all our file handles that we do no longer need 1422 // close all our file handles that we do no longer need
1432 for (rxvt_term **t = termlist.begin (); t < termlist.end (); t++) 1423 for (rxvt_term **t = termlist.begin (); t < termlist.end (); t++)
1433 { 1424 {
1434 if ((*t)->pty.pty > 2) close ((*t)->pty.pty); 1425 if ((*t)->pty->pty > 2) close ((*t)->pty->pty);
1435 if ((*t)->pty.tty > 2) close ((*t)->pty.tty); 1426 if ((*t)->pty->tty > 2) close ((*t)->pty->tty);
1436 } 1427 }
1437 1428
1438 run_child (argv); 1429 run_child (argv);
1439 fprintf (stderr, "%s: unable to exec child.", RESNAME); 1430 fprintf (stderr, "%s: unable to exec child.", RESNAME);
1440 } 1431 }
1441 1432
1442 _exit (EXIT_FAILURE); 1433 _exit (EXIT_FAILURE);
1443 1434
1444 default: 1435 default:
1445 {
1446#if defined(HAVE_STRUCT_UTMP) && defined(HAVE_TTYSLOT)
1447 int fdstdin;
1448
1449 fdstdin = dup (STDIN_FILENO);
1450 dup2 (pty.tty, STDIN_FILENO);
1451#endif
1452
1453#ifdef UTMP_SUPPORT 1436#if UTMP_SUPPORT
1454 privileged_utmp (SAVE); 1437 if (!OPTION (Opt_utmpInhibit))
1438 pty->login (cmd_pid, OPTION (Opt_loginShell), rs[Rs_display_name]);
1455#endif 1439#endif
1456 1440
1457#if defined(HAVE_STRUCT_UTMP) && defined(HAVE_TTYSLOT) 1441 pty->close_tty ();
1458 1442
1459 dup2 (fdstdin, STDIN_FILENO); 1443 child_ev.start (cmd_pid);
1460 close (fdstdin);
1461#endif
1462 }
1463 1444
1464 pty.close_tty (); /* keep STDERR_FILENO, pty.pty, display->fd () open */ 1445 HOOK_INVOKE ((this, HOOK_CHILD_START, DT_INT, cmd_pid, DT_END));
1465 break; 1446 break;
1466 } 1447 }
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} 1448}
1476 1449
1477/* ------------------------------------------------------------------------- * 1450/* ------------------------------------------------------------------------- *
1478 * CHILD PROCESS OPERATIONS * 1451 * CHILD PROCESS OPERATIONS *
1479 * ------------------------------------------------------------------------- */ 1452 * ------------------------------------------------------------------------- */
… …
1486{ 1459{
1487 char *login; 1460 char *login;
1488 1461
1489 SET_TTYMODE (STDIN_FILENO, &tio); /* init terminal attributes */ 1462 SET_TTYMODE (STDIN_FILENO, &tio); /* init terminal attributes */
1490 1463
1491 if (options & Opt_console) 1464 if (OPTION (Opt_console))
1492 { /* be virtual console, fail silently */ 1465 { /* be virtual console, fail silently */
1493#ifdef TIOCCONS 1466#ifdef TIOCCONS
1494 unsigned int on = 1; 1467 unsigned int on = 1;
1495 1468
1496 ioctl (STDIN_FILENO, TIOCCONS, &on); 1469 ioctl (STDIN_FILENO, TIOCCONS, &on);
… …
1523 // unblock signals (signals are blocked by iom.C 1496 // unblock signals (signals are blocked by iom.C
1524 sigset_t ss; 1497 sigset_t ss;
1525 sigemptyset (&ss); 1498 sigemptyset (&ss);
1526 sigprocmask (SIG_SETMASK, &ss, 0); 1499 sigprocmask (SIG_SETMASK, &ss, 0);
1527 1500
1528#ifndef __QNX__
1529 /* command interpreter path */ 1501 /* command interpreter path */
1530 if (argv != NULL) 1502 if (argv != NULL)
1531 { 1503 {
1532# ifdef DEBUG_CMD 1504# ifdef DEBUG_CMD
1533 int i; 1505 int i;
… …
1539 execvp (argv[0], (char *const *)argv); 1511 execvp (argv[0], (char *const *)argv);
1540 /* no error message: STDERR is closed! */ 1512 /* no error message: STDERR is closed! */
1541 } 1513 }
1542 else 1514 else
1543 { 1515 {
1544 const char *argv0, *shell; 1516 const char *argv0, *shell;
1545 1517
1546 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0') 1518 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0')
1547 shell = "/bin/sh"; 1519 shell = "/bin/sh";
1548 1520
1549 argv0 = (const char *)rxvt_r_basename (shell); 1521 argv0 = (const char *)rxvt_r_basename (shell);
1550 1522
1551 if (options & Opt_loginShell) 1523 if (OPTION (Opt_loginShell))
1552 { 1524 {
1553 login = (char *)rxvt_malloc ((strlen (argv0) + 2) * sizeof (char)); 1525 login = (char *)rxvt_malloc ((strlen (argv0) + 2) * sizeof (char));
1554 1526
1555 login[0] = '-'; 1527 login[0] = '-';
1556 strcpy (&login[1], argv0); 1528 strcpy (&login[1], argv0);
1557 argv0 = login; 1529 argv0 = login;
1558 } 1530 }
1531
1559 execlp (shell, argv0, NULL); 1532 execlp (shell, argv0, NULL);
1560 /* no error message: STDERR is closed! */ 1533 /* no error message: STDERR is closed! */
1561 } 1534 }
1562 1535
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; 1536 return -1;
1620} 1537}
1621 1538
1622/*----------------------- end-of-file (C source) -----------------------*/ 1539/*----------------------- end-of-file (C source) -----------------------*/

Diff Legend

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