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.124 by root, Wed Dec 21 14:19:19 2005 UTC vs.
Revision 1.153 by root, Wed Jan 25 02:42:06 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) */
… …
174#if OFF_FOCUS_FADING 174#if OFF_FOCUS_FADING
175 "black", 175 "black",
176#endif 176#endif
177 }; 177 };
178 178
179const char *const xa_names[] =
180 {
181 "TEXT",
182 "COMPOUND_TEXT",
183 "UTF8_STRING",
184 "MULTIPLE",
185 "TARGETS",
186 "TIMESTAMP",
187 "VT_SELECTION",
188 "INCR",
189 "WM_PROTOCOLS",
190 "WM_DELETE_WINDOW",
191 "CLIPBOARD",
192#if ENABLE_FRILLS
193 "_MOTIF_WM_HINTS",
194#endif
195#if ENABLE_EWMH
196 "_NET_WM_PID",
197 "_NET_WM_NAME",
198 "_NET_WM_ICON_NAME",
199 "_NET_WM_PING",
200#endif
201#if USE_XIM
202 "WM_LOCALE_NAME",
203#endif
204#ifdef TRANSPARENT
205 "_XROOTPMAP_ID",
206 "ESETROOT_PMAP_ID",
207#endif
208#ifdef OFFIX_DND
209 "DndProtocol",
210 "DndSelection",
211#endif
212#if ENABLE_XEMBED
213 "_XEMBED",
214 "_XEMBED_INFO",
215#endif
216 };
217
218bool 179bool
219rxvt_term::init_vars () 180rxvt_term::init_vars ()
220{ 181{
221 pix_colors_focused = new rxvt_color [TOTAL_COLORS]; 182 pix_colors_focused = new rxvt_color [TOTAL_COLORS];
222#ifdef OFF_FOCUS_FADING 183#ifdef OFF_FOCUS_FADING
… …
256 bgPixmap.pixmap = None; 217 bgPixmap.pixmap = None;
257#endif 218#endif
258 219
259 last_bot = last_state = -1; 220 last_bot = last_state = -1;
260 221
261#ifdef MENUBAR
262 menu_readonly = 1;
263# if ! (MENUBAR_MAX > 1)
264 CurrentBar = &BarList;
265# endif /* (MENUBAR_MAX > 1) */
266#endif
267
268 return true; 222 return true;
269} 223}
270 224
271void 225void
272rxvt_term::init_secondary () 226rxvt_term::init_secondary ()
… …
339 rs[Rs_name] = rxvt_r_basename (argv[0]); 293 rs[Rs_name] = rxvt_r_basename (argv[0]);
340 294
341 /* 295 /*
342 * Open display, get options/resources and create the window 296 * Open display, get options/resources and create the window
343 */ 297 */
298
344 if ((rs[Rs_display_name] = getenv ("DISPLAY")) == NULL) 299 if ((rs[Rs_display_name] = getenv ("DISPLAY")) == NULL)
345 rs[Rs_display_name] = ":0"; 300 rs[Rs_display_name] = ":0";
346 301
347 get_options (r_argc, r_argv); 302 get_options (r_argc, r_argv);
348 303
349 if (!(display = displays.get (rs[Rs_display_name]))) 304 if (!(display = displays.get (rs[Rs_display_name])))
350 rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]); 305 rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]);
351 306
352 extract_resources (); 307 extract_resources ();
308
353 free (r_argv); 309 free (r_argv);
310
311#if ENABLE_PERL
312 if (!rs[Rs_perl_ext_1])
313 rs[Rs_perl_ext_1] = "default";
314
315 if ((rs[Rs_perl_ext_1] && *rs[Rs_perl_ext_1])
316 || (rs[Rs_perl_ext_2] && *rs[Rs_perl_ext_2])
317 || (rs[Rs_perl_eval] && *rs[Rs_perl_eval]))
318 {
319 rxvt_perl.init (this);
320 HOOK_INVOKE ((this, HOOK_INIT, DT_END));
321 }
322#endif
354 323
355 /* 324 /*
356 * set any defaults not already set 325 * set any defaults not already set
357 */ 326 */
358 if (cmd_argv && cmd_argv[0]) 327 if (cmd_argv && cmd_argv[0])
… …
369 if (!rs[Rs_iconName]) 338 if (!rs[Rs_iconName])
370 rs[Rs_iconName] = rs[Rs_name]; 339 rs[Rs_iconName] = rs[Rs_name];
371 } 340 }
372 341
373 if (rs[Rs_saveLines] && (i = atoi (rs[Rs_saveLines])) >= 0) 342 if (rs[Rs_saveLines] && (i = atoi (rs[Rs_saveLines])) >= 0)
374 saveLines = min (i, MAX_POSITIVE_INT16); 343 saveLines = min (i, MAX_SAVELINES);
375 344
376#if ENABLE_FRILLS 345#if ENABLE_FRILLS
377 if (rs[Rs_int_bwidth] && (i = atoi (rs[Rs_int_bwidth])) >= 0) 346 if (rs[Rs_int_bwidth] && (i = atoi (rs[Rs_int_bwidth])) >= 0)
378 int_bwidth = min (i, MAX_POSITIVE_INT16); 347 int_bwidth = min (i, std::numeric_limits<int16_t>::max ());
379 348
380 if (rs[Rs_ext_bwidth] && (i = atoi (rs[Rs_ext_bwidth])) >= 0) 349 if (rs[Rs_ext_bwidth] && (i = atoi (rs[Rs_ext_bwidth])) >= 0)
381 ext_bwidth = min (i, MAX_POSITIVE_INT16); 350 ext_bwidth = min (i, std::numeric_limits<int16_t>::max ());
382 351
383 if (rs[Rs_lineSpace] && (i = atoi (rs[Rs_lineSpace])) >= 0) 352 if (rs[Rs_lineSpace] && (i = atoi (rs[Rs_lineSpace])) >= 0)
384 lineSpace = min (i, MAX_POSITIVE_INT16); 353 lineSpace = min (i, std::numeric_limits<int16_t>::max ());
385#endif 354#endif
386 355
387#ifdef POINTER_BLANK 356#ifdef POINTER_BLANK
388 if (rs[Rs_pointerBlankDelay] && (i = atoi (rs[Rs_pointerBlankDelay])) >= 0) 357 if (rs[Rs_pointerBlankDelay] && (i = atoi (rs[Rs_pointerBlankDelay])) >= 0)
389 pointerBlankDelay = i; 358 pointerBlankDelay = i;
… …
391 pointerBlankDelay = 2; 360 pointerBlankDelay = 2;
392#endif 361#endif
393 362
394 /* no point having a scrollbar without having any scrollback! */ 363 /* no point having a scrollbar without having any scrollback! */
395 if (!saveLines) 364 if (!saveLines)
396 options &= ~Opt_scrollBar; 365 set_option (Opt_scrollBar, 0);
397 366
398#ifdef PRINTPIPE 367#ifdef PRINTPIPE
399 if (!rs[Rs_print_pipe]) 368 if (!rs[Rs_print_pipe])
400 rs[Rs_print_pipe] = PRINTPIPE; 369 rs[Rs_print_pipe] = PRINTPIPE;
401#endif 370#endif
… …
444 setup_scrollbar (rs[Rs_scrollBar_align], rs[Rs_scrollstyle], rs[Rs_scrollBar_thickness]); 413 setup_scrollbar (rs[Rs_scrollBar_align], rs[Rs_scrollstyle], rs[Rs_scrollBar_thickness]);
445#endif 414#endif
446 415
447#ifdef XTERM_REVERSE_VIDEO 416#ifdef XTERM_REVERSE_VIDEO
448 /* this is how xterm implements reverseVideo */ 417 /* this is how xterm implements reverseVideo */
449 if (options & Opt_reverseVideo) 418 if (OPTION (Opt_reverseVideo))
450 { 419 {
451 if (!rs[Rs_color + Color_fg]) 420 if (!rs[Rs_color + Color_fg])
452 rs[Rs_color + Color_fg] = def_colorName[Color_bg]; 421 rs[Rs_color + Color_fg] = def_colorName[Color_bg];
453 if (!rs[Rs_color + Color_bg]) 422 if (!rs[Rs_color + Color_bg])
454 rs[Rs_color + Color_bg] = def_colorName[Color_fg]; 423 rs[Rs_color + Color_bg] = def_colorName[Color_fg];
… …
459 if (!rs[Rs_color + i]) 428 if (!rs[Rs_color + i])
460 rs[Rs_color + i] = def_colorName[i]; 429 rs[Rs_color + i] = def_colorName[i];
461 430
462#ifndef XTERM_REVERSE_VIDEO 431#ifndef XTERM_REVERSE_VIDEO
463 /* this is how we implement reverseVideo */ 432 /* this is how we implement reverseVideo */
464 if (options & Opt_reverseVideo) 433 if (OPTION (Opt_reverseVideo))
465 ::swap (rs[Rs_color + Color_fg], rs[Rs_color + Color_bg]); 434 ::swap (rs[Rs_color + Color_fg], rs[Rs_color + Color_bg]);
466#endif 435#endif
467 436
468 /* convenient aliases for setting fg/bg to colors */ 437 /* convenient aliases for setting fg/bg to colors */
469 color_aliases (Color_fg); 438 color_aliases (Color_fg);
… …
576 * This should support all European type languages. 545 * This should support all European type languages.
577 */ 546 */
578void 547void
579rxvt_term::set_locale (const char *locale) 548rxvt_term::set_locale (const char *locale)
580{ 549{
550 set_environ (envv);
551
581#if HAVE_XSETLOCALE || HAVE_SETLOCALE 552#if HAVE_XSETLOCALE || HAVE_SETLOCALE
582 free (this->locale); 553 free (this->locale);
583 this->locale = setlocale (LC_CTYPE, locale); 554 this->locale = setlocale (LC_CTYPE, locale);
584 555
585 if (!this->locale) 556 if (!this->locale)
586 { 557 {
587 if (*locale) 558 if (*locale)
588 { 559 {
589 rxvt_warn ("unable to set locale \"%s\", using default locale instead.\n", locale); 560 rxvt_warn ("unable to set locale \"%s\", using C locale instead.\n", locale);
590 setlocale (LC_CTYPE, ""); 561 setlocale (LC_CTYPE, "C");
591 } 562 }
592 else 563 else
593 rxvt_warn ("default locale unavailable, check LC_* and LANG variables. Continuing.\n"); 564 rxvt_warn ("default locale unavailable, check LC_* and LANG variables. Continuing.\n");
594 565
595 this->locale = ""; 566 this->locale = "C";
596 } 567 }
597 568
598 569
599 this->locale = rxvt_strdup (this->locale); 570 this->locale = rxvt_strdup (this->locale);
600 SET_LOCALE (this->locale); 571 SET_LOCALE (this->locale);
… …
615} 586}
616 587
617void 588void
618rxvt_term::init_xlocale () 589rxvt_term::init_xlocale ()
619{ 590{
591 set_environ (envv);
592
620#ifdef USE_XIM 593#ifdef USE_XIM
621 if (!locale) 594 if (!locale)
622 rxvt_warn ("setting locale failed, working without locale support.\n"); 595 rxvt_warn ("setting locale failed, working without locale support.\n");
623 else 596 else
624 { 597 {
… …
646 * Initialize the command connection. 619 * Initialize the command connection.
647 * This should be called after the X server connection is established. 620 * This should be called after the X server connection is established.
648 */ 621 */
649 622
650#ifdef META8_OPTION 623#ifdef META8_OPTION
651 meta_char = (options & Opt_meta8 ? 0x80 : C0_ESC); 624 meta_char = OPTION (Opt_meta8) ? 0x80 : C0_ESC;
652#endif 625#endif
653 626
654 get_ourmods (); 627 get_ourmods ();
655 628
656 if (!(options & Opt_scrollTtyOutput)) 629 if (!OPTION (Opt_scrollTtyOutput))
657 priv_modes |= PrivMode_TtyOutputInh; 630 priv_modes |= PrivMode_TtyOutputInh;
658 if (options & Opt_scrollTtyKeypress) 631 if (OPTION (Opt_scrollTtyKeypress))
659 priv_modes |= PrivMode_Keypress; 632 priv_modes |= PrivMode_Keypress;
660 if (!(options & Opt_jumpScroll)) 633 if (!OPTION (Opt_jumpScroll))
661 priv_modes |= PrivMode_smoothScroll; 634 priv_modes |= PrivMode_smoothScroll;
662 635
663#ifndef NO_BACKSPACE_KEY 636#ifndef NO_BACKSPACE_KEY
664 if (strcmp (key_backspace, "DEC") == 0) 637 if (strcmp (key_backspace, "DEC") == 0)
665 priv_modes |= PrivMode_HaveBackSpace; 638 priv_modes |= PrivMode_HaveBackSpace;
666#endif 639#endif
667 640
668 /* add value for scrollBar */ 641 /* add value for scrollBar */
669 if (scrollbar_visible ()) 642 if (scrollBar.state)
670 { 643 {
671 priv_modes |= PrivMode_scrollBar; 644 priv_modes |= PrivMode_scrollBar;
672 SavedModes |= PrivMode_scrollBar; 645 SavedModes |= PrivMode_scrollBar;
673 } 646 }
674
675 if (menubar_visible ())
676 {
677 priv_modes |= PrivMode_menuBar;
678 SavedModes |= PrivMode_menuBar;
679 }
680
681#ifdef CURSOR_BLINK
682 if (options & Opt_cursorBlink)
683 (void)gettimeofday (&lastcursorchange, NULL);
684#endif
685 647
686 run_command (argv); 648 run_command (argv);
687} 649}
688 650
689/*----------------------------------------------------------------------*/ 651/*----------------------------------------------------------------------*/
… …
704 continue; 666 continue;
705 667
706 if (!rXParseAllocColor (&xcol, rs[Rs_color + i])) 668 if (!rXParseAllocColor (&xcol, rs[Rs_color + i]))
707 { 669 {
708#ifndef XTERM_REVERSE_VIDEO 670#ifndef XTERM_REVERSE_VIDEO
709 if (i < 2 && (options & Opt_reverseVideo)) 671 if (i < 2 && OPTION (Opt_reverseVideo))
710 rs[Rs_color + i] = def_colorName[!i]; 672 rs[Rs_color + i] = def_colorName[!i];
711 else 673 else
712#endif 674#endif
713 rs[Rs_color + i] = def_colorName[i]; 675 rs[Rs_color + i] = def_colorName[i];
714 676
… …
756 if (!rs[Rs_color + Color_pointer_bg]) pix_colors[Color_pointer_bg] = pix_colors[Color_bg]; 718 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]; 719 if (!rs[Rs_color + Color_border] ) pix_colors[Color_border] = pix_colors[Color_fg];
758 } 720 }
759 721
760 /* 722 /*
761 * get scrollBar/menuBar shadow colors 723 * get scrollBar shadow colors
762 * 724 *
763 * The calculations of topShadow/bottomShadow values are adapted 725 * The calculations of topShadow/bottomShadow values are adapted
764 * from the fvwm window manager. 726 * from the fvwm window manager.
765 */ 727 */
766#ifdef KEEP_SCROLLCOLOR 728#ifdef KEEP_SCROLLCOLOR
… …
811 int i = atoi (rs[Rs_color + idx]); 773 int i = atoi (rs[Rs_color + idx]);
812 774
813 if (i >= 8 && i <= 15) 775 if (i >= 8 && i <= 15)
814 { /* bright colors */ 776 { /* bright colors */
815 i -= 8; 777 i -= 8;
816#ifndef NO_BRIGHTCOLOR
817 rs[Rs_color + idx] = rs[Rs_color + minBrightCOLOR + i]; 778 rs[Rs_color + idx] = rs[Rs_color + minBrightCOLOR + i];
818 return; 779 return;
819#endif
820 } 780 }
821 781
822 if (i >= 0 && i <= 7) /* normal colors */ 782 if (i >= 0 && i <= 7) /* normal colors */
823 rs[Rs_color + idx] = rs[Rs_color + minCOLOR + i]; 783 rs[Rs_color + idx] = rs[Rs_color + minCOLOR + i];
824 } 784 }
… …
919rxvt_term::create_windows (int argc, const char *const *argv) 879rxvt_term::create_windows (int argc, const char *const *argv)
920{ 880{
921 XClassHint classHint; 881 XClassHint classHint;
922 XWMHints wmHint; 882 XWMHints wmHint;
923#if ENABLE_FRILLS 883#if ENABLE_FRILLS
924 Atom prop = None;
925 MWMHints mwmhints; 884 MWMHints mwmhints;
926#endif 885#endif
927 XGCValues gcvalue; 886 XGCValues gcvalue;
928 long vt_emask;
929 XSetWindowAttributes attributes; 887 XSetWindowAttributes attributes;
930 XWindowAttributes gattr;
931 Window top, parent; 888 Window top, parent;
932 dDisp; 889 dDisp;
933 890
934#ifdef USING_W11LIB 891 xa = display->xa;
935 /* enable W11 callbacks */
936 W11AddEventHandler (disp, rxvt_W11_process_x_event);
937#endif
938 892
939 assert (sizeof (xa_names) / sizeof (char *) == NUM_XA); 893 /* grab colors before netscape does */
940 XInternAtoms (disp, (char **)xa_names, NUM_XA, False, xa); 894 Get_Colours ();
941 895
942 if (options & Opt_transparent) 896 if (!set_fonts ())
943 { 897 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n");
944 XGetWindowAttributes (disp, RootWindow (disp, display->screen), &gattr); 898
945 display->depth = gattr.depth; // doh //TODO, per-term not per-display? 899 parent = display->root;
946 } 900
901 attributes.override_redirect = !!OPTION (Opt_override_redirect);
947 902
948#if ENABLE_FRILLS 903#if ENABLE_FRILLS
949 if (options & Opt_borderLess) 904 if (OPTION (Opt_borderLess))
950 { 905 {
951 prop = XInternAtom(disp, "_MOTIF_WM_INFO", True); 906 if (XInternAtom (disp, "_MOTIF_WM_INFO", True) == None)
952
953 if (prop == None)
954 { 907 {
955 /* print_warning("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n");*/ 908 /* print_warning("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n");*/
956#ifdef PREFER_24BIT
957 attributes.override_redirect = TRUE; 909 attributes.override_redirect = TRUE;
958#endif
959 mwmhints.flags = 0; 910 mwmhints.flags = 0;
960 } 911 }
961 else 912 else
962 { 913 {
963 mwmhints.flags = MWM_HINTS_DECORATIONS; 914 mwmhints.flags = MWM_HINTS_DECORATIONS;
… …
966 } 917 }
967 else 918 else
968 mwmhints.flags = 0; 919 mwmhints.flags = 0;
969#endif 920#endif
970 921
971 /* grab colors before netscape does */
972 Get_Colours ();
973
974 if (!set_fonts ())
975 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n");
976
977 parent = DefaultRootWindow (disp);
978
979#if ENABLE_XEMBED 922#if ENABLE_XEMBED
980 if (rs[Rs_embed]) 923 if (rs[Rs_embed])
981 { 924 {
982 XWindowAttributes wattr; 925 XWindowAttributes wattr;
983 926
… …
991#endif 934#endif
992 935
993 window_calc (0, 0); 936 window_calc (0, 0);
994 937
995 /* sub-window placement & size in rxvt_resize_subwindows () */ 938 /* sub-window placement & size in rxvt_resize_subwindows () */
996#ifdef PREFER_24BIT
997 attributes.background_pixel = pix_colors_focused[Color_border]; 939 attributes.background_pixel = pix_colors_focused[Color_border];
998 attributes.border_pixel = pix_colors_focused[Color_border]; 940 attributes.border_pixel = pix_colors_focused[Color_border];
999 attributes.colormap = display->cmap; 941 attributes.colormap = display->cmap;
942
1000 top = XCreateWindow (disp, parent, 943 top = XCreateWindow (disp, parent,
1001 szHint.x, szHint.y, 944 szHint.x, szHint.y,
1002 szHint.width, szHint.height, 945 szHint.width, szHint.height,
1003 ext_bwidth, 946 ext_bwidth,
1004 display->depth, InputOutput, 947 display->depth, InputOutput,
1005 display->visual, 948 display->visual,
1006 CWColormap | CWBackPixel | CWBorderPixel, &attributes); 949 CWColormap | CWBackPixel | CWBorderPixel | CWOverrideRedirect,
1007#else 950 &attributes);
1008 top = XCreateSimpleWindow (disp, parent,
1009 szHint.x, szHint.y,
1010 szHint.width, szHint.height,
1011 ext_bwidth,
1012 pix_colors_focused[Color_border],
1013 pix_colors_focused[Color_border]);
1014#endif
1015 951
1016 this->parent[0] = top; 952 this->parent[0] = top;
1017 953
1018 old_width = szHint.width; 954 old_width = szHint.width;
1019 old_height = szHint.height; 955 old_height = szHint.height;
1020 956
1021 process_xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST); 957 process_xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST);
1022 process_xterm_seq (XTerm_iconName, rs[Rs_iconName], CHAR_ST); 958 process_xterm_seq (XTerm_iconName, rs[Rs_iconName], CHAR_ST);
1023 959
1024 classHint.res_name = (char *)rs[Rs_name]; 960 classHint.res_name = (char *)rs[Rs_name];
1025 classHint.res_class = (char *)RESCLASS; 961 classHint.res_class = (char *)RESCLASS;
1026 962
1027 wmHint.flags = InputHint | StateHint | WindowGroupHint; 963 wmHint.flags = InputHint | StateHint | WindowGroupHint;
1028 wmHint.input = True; 964 wmHint.input = True;
1029 wmHint.initial_state = options & Opt_iconic ? IconicState : NormalState; 965 wmHint.initial_state = OPTION (Opt_iconic) ? IconicState : NormalState;
1030 wmHint.window_group = top; 966 wmHint.window_group = top;
1031 967
1032 XmbSetWMProperties (disp, top, NULL, NULL, (char **)argv, argc, 968 XmbSetWMProperties (disp, top, NULL, NULL, (char **)argv, argc,
1033 &szHint, &wmHint, &classHint); 969 &szHint, &wmHint, &classHint);
970
971#if ENABLE_FRILLS
972 if (mwmhints.flags)
973 XChangeProperty (disp, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32,
974 PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS);
975#endif
1034 976
1035 Atom protocols[] = { 977 Atom protocols[] = {
1036 xa[XA_WM_DELETE_WINDOW], 978 xa[XA_WM_DELETE_WINDOW],
1037#if ENABLE_EWMH 979#if ENABLE_EWMH
1038 xa[XA_NET_WM_PING], 980 xa[XA_NET_WM_PING],
1039#endif 981#endif
1040 }; 982 };
1041 983
1042 XSetWMProtocols (disp, top, protocols, sizeof (protocols) / sizeof (protocols[0])); 984 XSetWMProtocols (disp, top, protocols, sizeof (protocols) / sizeof (protocols[0]));
1043 985
986#if ENABLE_FRILLS
987 if (rs[Rs_transient_for])
988 XSetTransientForHint (disp, top, (Window)strtol (rs[Rs_transient_for], 0, 0));
989#endif
990
1044#if ENABLE_EWMH 991#if ENABLE_EWMH
1045 long pid = getpid (); 992 long pid = getpid ();
1046 993
1047 XChangeProperty (disp, top, 994 XChangeProperty (disp, top,
1048 xa[XA_NET_WM_PID], XA_CARDINAL, 32, 995 xa[XA_NET_WM_PID], XA_CARDINAL, 32,
… …
1059 | FocusChangeMask | VisibilityChangeMask 1006 | FocusChangeMask | VisibilityChangeMask
1060 | ExposureMask | StructureNotifyMask); 1007 | ExposureMask | StructureNotifyMask);
1061 1008
1062 termwin_ev.start (display, top); 1009 termwin_ev.start (display, top);
1063 1010
1064#if ENABLE_FRILLS
1065 if (mwmhints.flags)
1066 XChangeProperty (disp, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32,
1067 PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS);
1068#endif
1069
1070 /* vt cursor: Black-on-White is standard, but this is more popular */ 1011 /* vt cursor: Black-on-White is standard, but this is more popular */
1071 TermWin_cursor = XCreateFontCursor (disp, XC_xterm); 1012 TermWin_cursor = XCreateFontCursor (disp, XC_xterm);
1072 1013
1073#if defined(HAVE_SCROLLBARS) || defined(MENUBAR) 1014#ifdef HAVE_SCROLLBARS
1074 /* cursor (menuBar/scrollBar): Black-on-White */ 1015 /* cursor scrollBar: Black-on-White */
1075 leftptr_cursor = XCreateFontCursor (disp, XC_left_ptr); 1016 leftptr_cursor = XCreateFontCursor (disp, XC_left_ptr);
1076#endif 1017#endif
1077 1018
1078 /* the vt window */ 1019 /* the vt window */
1079 vt = XCreateSimpleWindow (disp, top, 1020 vt = XCreateSimpleWindow (disp, top,
1080 window_vt_x,
1081 window_vt_y, 1021 window_vt_x, window_vt_y,
1082 TermWin_TotalWidth (), 1022 width, height,
1083 TermWin_TotalHeight (),
1084 0, 1023 0,
1085 pix_colors_focused[Color_fg], 1024 pix_colors_focused[Color_fg],
1086 pix_colors_focused[Color_bg]); 1025 pix_colors_focused[Color_bg]);
1087#ifdef DEBUG_X
1088 XStoreName (disp, vt, "vt window");
1089#endif
1090 1026
1091 attributes.bit_gravity = NorthWestGravity; 1027 attributes.bit_gravity = NorthWestGravity;
1092 XChangeWindowAttributes (disp, vt, CWBitGravity, &attributes); 1028 XChangeWindowAttributes (disp, vt, CWBitGravity, &attributes);
1093 1029
1094 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask; 1030 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask;
1095 1031
1096#ifdef POINTER_BLANK 1032 if (OPTION (Opt_pointerBlank))
1097 if (options & Opt_pointerBlank)
1098 vt_emask |= PointerMotionMask; 1033 vt_emask |= PointerMotionMask;
1099 else 1034 else
1100#endif
1101 vt_emask |= Button1MotionMask | Button3MotionMask; 1035 vt_emask |= Button1MotionMask | Button3MotionMask;
1102 1036
1103 XSelectInput (disp, vt, vt_emask); 1037 vt_select_input ();
1038
1104 vt_ev.start (display, vt); 1039 vt_ev.start (display, vt);
1105
1106#if defined(MENUBAR) && (MENUBAR_MAX > 1)
1107 if (menuBar_height ())
1108 {
1109 menuBar.win = XCreateSimpleWindow (disp, top,
1110 window_vt_x, 0,
1111 TermWin_TotalWidth (),
1112 menuBar_TotalHeight (),
1113 0,
1114 pix_colors_focused[Color_fg],
1115 pix_colors_focused[Color_scroll]);
1116
1117#ifdef DEBUG_X
1118 XStoreName (disp, menuBar.win, "menubar");
1119#endif
1120
1121 menuBar.drawable = new rxvt_drawable (display, menuBar.win);
1122
1123 XDefineCursor (disp, menuBar.win,
1124 XCreateFontCursor (disp, XC_left_ptr));
1125
1126 XSelectInput (disp, menuBar.win,
1127 (ExposureMask | ButtonPressMask | ButtonReleaseMask | Button1MotionMask));
1128 menubar_ev.start (display, menuBar.win);
1129 }
1130#endif
1131 1040
1132#ifdef XPM_BACKGROUND 1041#ifdef XPM_BACKGROUND
1133 if (rs[Rs_backgroundPixmap] != NULL 1042 if (rs[Rs_backgroundPixmap] != NULL
1134 && ! (options & Opt_transparent)) 1043 && ! OPTION (Opt_transparent))
1135 { 1044 {
1136 const char *p = rs[Rs_backgroundPixmap]; 1045 const char *p = rs[Rs_backgroundPixmap];
1137 1046
1138 if ((p = strchr (p, ';')) != NULL) 1047 if ((p = strchr (p, ';')) != NULL)
1139 { 1048 {
… …
1145 scr_touch (true); 1054 scr_touch (true);
1146 } 1055 }
1147#endif 1056#endif
1148 1057
1149 /* graphics context for the vt window */ 1058 /* graphics context for the vt window */
1150 gcvalue.foreground = pix_colors[Color_fg]; 1059 gcvalue.foreground = pix_colors[Color_fg];
1151 gcvalue.background = pix_colors[Color_bg]; 1060 gcvalue.background = pix_colors[Color_bg];
1152 gcvalue.graphics_exposures = 1; 1061 gcvalue.graphics_exposures = 1;
1062
1153 gc = XCreateGC (disp, vt, 1063 gc = XCreateGC (disp, vt,
1154 GCForeground | GCBackground | GCGraphicsExposures, 1064 GCForeground | GCBackground | GCGraphicsExposures,
1155 &gcvalue); 1065 &gcvalue);
1156 1066
1157 drawable = new rxvt_drawable (display, vt); 1067 drawable = new rxvt_drawable (display, vt);
1158 1068
1159#if defined(MENUBAR) || defined(RXVT_SCROLLBAR) 1069#ifdef RXVT_SCROLLBAR
1160 gcvalue.foreground = pix_colors[Color_topShadow]; 1070 gcvalue.foreground = pix_colors[Color_topShadow];
1161 topShadowGC = XCreateGC (disp, vt, GCForeground, &gcvalue); 1071 topShadowGC = XCreateGC (disp, vt, GCForeground, &gcvalue);
1162 gcvalue.foreground = pix_colors[Color_bottomShadow]; 1072 gcvalue.foreground = pix_colors[Color_bottomShadow];
1163 botShadowGC = XCreateGC (disp, vt, GCForeground, &gcvalue); 1073 botShadowGC = XCreateGC (disp, vt, GCForeground, &gcvalue);
1164 gcvalue.foreground = pix_colors[ (display->depth <= 2 ? Color_fg : Color_scroll)]; 1074 gcvalue.foreground = pix_colors[ (display->depth <= 2 ? Color_fg : Color_scroll)];
… …
1171 pix_colors = pix_colors_unfocused; 1081 pix_colors = pix_colors_unfocused;
1172#endif 1082#endif
1173 1083
1174 pointer_unblank (); 1084 pointer_unblank ();
1175 scr_recolour (); 1085 scr_recolour ();
1176
1177#if ENABLE_XEMBED
1178 if (rs[Rs_embed])
1179 {
1180 long info[2] = { 0, XEMBED_MAPPED };
1181
1182 XChangeProperty (disp, parent, xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
1183 32, PropModeReplace, (unsigned char *)&info, 2);
1184 }
1185#endif
1186} 1086}
1187 1087
1188/* ------------------------------------------------------------------------- * 1088/* ------------------------------------------------------------------------- *
1189 * GET TTY CURRENT STATE * 1089 * GET TTY CURRENT STATE *
1190 * ------------------------------------------------------------------------- */ 1090 * ------------------------------------------------------------------------- */
… …
1195 /* 1095 /*
1196 * standard System V termios interface 1096 * standard System V termios interface
1197 */ 1097 */
1198 if (GET_TERMIOS (STDIN_FILENO, tio) < 0) 1098 if (GET_TERMIOS (STDIN_FILENO, tio) < 0)
1199 { 1099 {
1200 /* return error - use system defaults */ 1100 // return error - use system defaults,
1101 // where possible, and zero elsewhere
1102 memset (tio, 0, sizeof (ttymode_t));
1103
1201 tio->c_cc[VINTR] = CINTR; 1104 tio->c_cc[VINTR] = CINTR;
1202 tio->c_cc[VQUIT] = CQUIT; 1105 tio->c_cc[VQUIT] = CQUIT;
1203 tio->c_cc[VERASE] = CERASE; 1106 tio->c_cc[VERASE] = CERASE;
1107#ifdef VERASE2
1108 tio->c_cc[VERASE2] = CERASE2;
1109#endif
1204 tio->c_cc[VKILL] = CKILL; 1110 tio->c_cc[VKILL] = CKILL;
1205 tio->c_cc[VSTART] = CSTART; 1111 tio->c_cc[VSTART] = CSTART;
1206 tio->c_cc[VSTOP] = CSTOP; 1112 tio->c_cc[VSTOP] = CSTOP;
1207 tio->c_cc[VSUSP] = CSUSP; 1113 tio->c_cc[VSUSP] = CSUSP;
1208# ifdef VDSUSP 1114# ifdef VDSUSP
… …
1401rxvt_term::run_command (const char *const *argv) 1307rxvt_term::run_command (const char *const *argv)
1402{ 1308{
1403#if ENABLE_FRILLS 1309#if ENABLE_FRILLS
1404 if (rs[Rs_pty_fd]) 1310 if (rs[Rs_pty_fd])
1405 { 1311 {
1406 pty.pty = atoi (rs[Rs_pty_fd]); 1312 pty->pty = atoi (rs[Rs_pty_fd]);
1407 fcntl (pty.pty, F_SETFL, O_NONBLOCK); 1313
1314 if (pty->pty >= 0)
1315 {
1316 if (getfd_hook)
1317 pty->pty = (*getfd_hook) (pty->pty);
1318
1319 if (pty->pty < 0 || fcntl (pty->pty, F_SETFL, O_NONBLOCK))
1320 rxvt_fatal ("unusable pty-fd filehandle, aborting.\n");
1321 }
1408 } 1322 }
1409 else 1323 else
1410#endif 1324#endif
1411 if (!pty.get ()) 1325 if (!pty->get ())
1412 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n"); 1326 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");
1413 1327
1414 pty.set_utf8_mode (enc_utf8); 1328 pty->set_utf8_mode (enc_utf8);
1415 1329
1416 /* set initial window size */ 1330 /* set initial window size */
1417 tt_winch (); 1331 tt_winch ();
1418 1332
1419 int er; 1333 int er;
… …
1432#if ENABLE_FRILLS 1346#if ENABLE_FRILLS
1433 if (rs[Rs_pty_fd]) 1347 if (rs[Rs_pty_fd])
1434 return; 1348 return;
1435#endif 1349#endif
1436 1350
1437#ifndef __QNX__
1438 /* spin off the command interpreter */ 1351 /* spin off the command interpreter */
1439 switch (cmd_pid = fork ()) 1352 switch (cmd_pid = fork ())
1440 { 1353 {
1441 case -1: 1354 case -1:
1442 { 1355 {
… …
1444 rxvt_fatal ("can't fork, aborting.\n"); 1357 rxvt_fatal ("can't fork, aborting.\n");
1445 } 1358 }
1446 case 0: 1359 case 0:
1447 init_env (); 1360 init_env ();
1448 1361
1449 if (!pty.make_controlling_tty ()) 1362 if (!pty->make_controlling_tty ())
1450 fprintf (stderr, "%s: could not obtain control of tty.", RESNAME); 1363 fprintf (stderr, "%s: could not obtain control of tty.", RESNAME);
1451 else 1364 else
1452 { 1365 {
1453 /* Reopen stdin, stdout and stderr over the tty file descriptor */ 1366 /* Reopen stdin, stdout and stderr over the tty file descriptor */
1454 dup2 (pty.tty, STDIN_FILENO); 1367 dup2 (pty->tty, STDIN_FILENO);
1455 dup2 (pty.tty, STDOUT_FILENO); 1368 dup2 (pty->tty, STDOUT_FILENO);
1456 dup2 (pty.tty, STDERR_FILENO); 1369 dup2 (pty->tty, STDERR_FILENO);
1457 1370
1458 // close all our file handles that we do no longer need 1371 // close all our file handles that we do no longer need
1459 for (rxvt_term **t = termlist.begin (); t < termlist.end (); t++) 1372 for (rxvt_term **t = termlist.begin (); t < termlist.end (); t++)
1460 { 1373 {
1461 if ((*t)->pty.pty > 2) close ((*t)->pty.pty); 1374 if ((*t)->pty->pty > 2) close ((*t)->pty->pty);
1462 if ((*t)->pty.tty > 2) close ((*t)->pty.tty); 1375 if ((*t)->pty->tty > 2) close ((*t)->pty->tty);
1463 } 1376 }
1464 1377
1465 run_child (argv); 1378 run_child (argv);
1466 fprintf (stderr, "%s: unable to exec child.", RESNAME); 1379 fprintf (stderr, "%s: unable to exec child.", RESNAME);
1467 } 1380 }
1468 1381
1469 _exit (EXIT_FAILURE); 1382 _exit (EXIT_FAILURE);
1470 1383
1471 default: 1384 default:
1472 { 1385 if (!OPTION (Opt_utmpInhibit))
1473#if defined(HAVE_STRUCT_UTMP) && defined(HAVE_TTYSLOT) 1386 pty->login (cmd_pid, OPTION (Opt_loginShell), rs[Rs_display_name]);
1474 int fdstdin;
1475 1387
1476 fdstdin = dup (STDIN_FILENO); 1388 pty->close_tty ();
1477 dup2 (pty.tty, STDIN_FILENO);
1478#endif
1479 1389
1480#ifdef UTMP_SUPPORT 1390 child_ev.start (cmd_pid);
1481 privileged_utmp (SAVE);
1482#endif
1483 1391
1484#if defined(HAVE_STRUCT_UTMP) && defined(HAVE_TTYSLOT) 1392 HOOK_INVOKE ((this, HOOK_CHILD_START, DT_INT, cmd_pid, DT_END));
1485
1486 dup2 (fdstdin, STDIN_FILENO);
1487 close (fdstdin);
1488#endif
1489 }
1490
1491 pty.close_tty (); /* keep STDERR_FILENO, pty.pty, display->fd () open */
1492 break; 1393 break;
1493 } 1394 }
1494#else /* __QNX__ uses qnxspawn () */
1495 fchmod (pty.tty, 0622);
1496 fcntl (pty.tty, F_SETFD, FD_CLOEXEC);
1497 fcntl (pty.pty, F_SETFD, FD_CLOEXEC);
1498
1499 if (run_child (argv) == -1)
1500 exit (EXIT_FAILURE);
1501#endif
1502} 1395}
1503 1396
1504/* ------------------------------------------------------------------------- * 1397/* ------------------------------------------------------------------------- *
1505 * CHILD PROCESS OPERATIONS * 1398 * CHILD PROCESS OPERATIONS *
1506 * ------------------------------------------------------------------------- */ 1399 * ------------------------------------------------------------------------- */
… …
1513{ 1406{
1514 char *login; 1407 char *login;
1515 1408
1516 SET_TTYMODE (STDIN_FILENO, &tio); /* init terminal attributes */ 1409 SET_TTYMODE (STDIN_FILENO, &tio); /* init terminal attributes */
1517 1410
1518 if (options & Opt_console) 1411 if (OPTION (Opt_console))
1519 { /* be virtual console, fail silently */ 1412 { /* be virtual console, fail silently */
1520#ifdef TIOCCONS 1413#ifdef TIOCCONS
1521 unsigned int on = 1; 1414 unsigned int on = 1;
1522 1415
1523 ioctl (STDIN_FILENO, TIOCCONS, &on); 1416 ioctl (STDIN_FILENO, TIOCCONS, &on);
… …
1550 // unblock signals (signals are blocked by iom.C 1443 // unblock signals (signals are blocked by iom.C
1551 sigset_t ss; 1444 sigset_t ss;
1552 sigemptyset (&ss); 1445 sigemptyset (&ss);
1553 sigprocmask (SIG_SETMASK, &ss, 0); 1446 sigprocmask (SIG_SETMASK, &ss, 0);
1554 1447
1555#ifndef __QNX__
1556 /* command interpreter path */ 1448 /* command interpreter path */
1557 if (argv != NULL) 1449 if (argv != NULL)
1558 { 1450 {
1559# ifdef DEBUG_CMD 1451# ifdef DEBUG_CMD
1560 int i; 1452 int i;
… …
1566 execvp (argv[0], (char *const *)argv); 1458 execvp (argv[0], (char *const *)argv);
1567 /* no error message: STDERR is closed! */ 1459 /* no error message: STDERR is closed! */
1568 } 1460 }
1569 else 1461 else
1570 { 1462 {
1571 const char *argv0, *shell; 1463 const char *argv0, *shell;
1572 1464
1573 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0') 1465 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0')
1574 shell = "/bin/sh"; 1466 shell = "/bin/sh";
1575 1467
1576 argv0 = (const char *)rxvt_r_basename (shell); 1468 argv0 = (const char *)rxvt_r_basename (shell);
1577 1469
1578 if (options & Opt_loginShell) 1470 if (OPTION (Opt_loginShell))
1579 { 1471 {
1580 login = (char *)rxvt_malloc ((strlen (argv0) + 2) * sizeof (char)); 1472 login = (char *)rxvt_malloc ((strlen (argv0) + 2) * sizeof (char));
1581 1473
1582 login[0] = '-'; 1474 login[0] = '-';
1583 strcpy (&login[1], argv0); 1475 strcpy (&login[1], argv0);
1584 argv0 = login; 1476 argv0 = login;
1585 } 1477 }
1478
1586 execlp (shell, argv0, NULL); 1479 execlp (shell, argv0, NULL);
1587 /* no error message: STDERR is closed! */ 1480 /* no error message: STDERR is closed! */
1588 } 1481 }
1589 1482
1590#else /* __QNX__ uses qnxspawn () */
1591
1592 char iov_a[10] = { -1, -1, -1, -1, -1, -1, -1, -1, -1, -1 };
1593 char *command = NULL, fullcommand[_MAX_PATH];
1594 char **arg_v, *arg_a[2] = { NULL, NULL };
1595
1596 if (argv != NULL)
1597 {
1598 if (access (argv[0], X_OK) == -1)
1599 {
1600 if (strchr (argv[0], '/') == NULL)
1601 {
1602 searchenv (argv[0], "PATH", fullcommand);
1603
1604 if (fullcommand[0] != '\0')
1605 command = fullcommand;
1606 }
1607
1608 if (access (command, X_OK) == -1)
1609 return -1;
1610 }
1611 else
1612 command = argv[0];
1613
1614 arg_v = argv;
1615 }
1616 else
1617 {
1618 if ((command = getenv ("SHELL")) == NULL || *command == '\0')
1619 command = "/bin/sh";
1620
1621 arg_a[0] = my_basename (command);
1622
1623 if (options & Opt_loginShell)
1624 {
1625 login = rxvt_malloc ((strlen (arg_a[0]) + 2) * sizeof (char));
1626
1627 login[0] = '-';
1628 strcpy (&login[1], arg_a[0]);
1629 arg_a[0] = login;
1630 }
1631
1632 arg_v = arg_a;
1633 }
1634
1635 iov_a[0] = iov_a[1] = iov_a[2] = pty.tty;
1636 cmd_pid = qnx_spawn (0, 0, 0, -1, -1,
1637 _SPAWN_SETSID | _SPAWN_TCSETPGRP,
1638 command, arg_v, environ, iov_a, 0);
1639 if (login)
1640 free (login);
1641
1642 pty.close_tty ();
1643 return pty.pty;
1644#endif
1645
1646 return -1; 1483 return -1;
1647} 1484}
1648 1485
1649/*----------------------- end-of-file (C source) -----------------------*/ 1486/*----------------------- end-of-file (C source) -----------------------*/

Diff Legend

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