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

Diff Legend

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