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.130 by root, Wed Jan 4 04:42:45 2006 UTC vs.
Revision 1.143 by root, Mon Jan 16 15:00:20 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.
… …
44 { 44 {
45 COLOR_FOREGROUND, 45 COLOR_FOREGROUND,
46 COLOR_BACKGROUND, 46 COLOR_BACKGROUND,
47 /* low-intensity colors */ 47 /* low-intensity colors */
48 "Black", /* 0: black (#000000) */ 48 "Black", /* 0: black (#000000) */
49#ifndef NO_BRIGHTCOLOR
50 "Red3", /* 1: red (#CD0000) */ 49 "Red3", /* 1: red (#CD0000) */
51 "Green3", /* 2: green (#00CD00) */ 50 "Green3", /* 2: green (#00CD00) */
52 "Yellow3", /* 3: yellow (#CDCD00) */ 51 "Yellow3", /* 3: yellow (#CDCD00) */
53 "Blue3", /* 4: blue (#0000CD) */ 52 "Blue3", /* 4: blue (#0000CD) */
54 "Magenta3", /* 5: magenta (#CD00CD) */ 53 "Magenta3", /* 5: magenta (#CD00CD) */
… …
62# ifdef XTERM_COLORS 61# ifdef XTERM_COLORS
63 "Grey30", /* 8: bright black (#4D4D4D) */ 62 "Grey30", /* 8: bright black (#4D4D4D) */
64# else 63# else
65 "Grey25", /* 8: bright black (#404040) */ 64 "Grey25", /* 8: bright black (#404040) */
66# endif 65# endif
67#endif /* NO_BRIGHTCOLOR */
68 "Red", /* 1/9: bright red (#FF0000) */ 66 "Red", /* 1/9: bright red (#FF0000) */
69 "Green", /* 2/10: bright green (#00FF00) */ 67 "Green", /* 2/10: bright green (#00FF00) */
70 "Yellow", /* 3/11: bright yellow (#FFFF00) */ 68 "Yellow", /* 3/11: bright yellow (#FFFF00) */
71 "Blue", /* 4/12: bright blue (#0000FF) */ 69 "Blue", /* 4/12: bright blue (#0000FF) */
72 "Magenta", /* 5/13: bright magenta (#FF00FF) */ 70 "Magenta", /* 5/13: bright magenta (#FF00FF) */
… …
258 bgPixmap.pixmap = None; 256 bgPixmap.pixmap = None;
259#endif 257#endif
260 258
261 last_bot = last_state = -1; 259 last_bot = last_state = -1;
262 260
263#ifdef MENUBAR
264 menu_readonly = 1;
265# if ! (MENUBAR_MAX > 1)
266 CurrentBar = &BarList;
267# endif /* (MENUBAR_MAX > 1) */
268#endif
269
270 return true; 261 return true;
271} 262}
272 263
273void 264void
274rxvt_term::init_secondary () 265rxvt_term::init_secondary ()
… …
341 rs[Rs_name] = rxvt_r_basename (argv[0]); 332 rs[Rs_name] = rxvt_r_basename (argv[0]);
342 333
343 /* 334 /*
344 * Open display, get options/resources and create the window 335 * Open display, get options/resources and create the window
345 */ 336 */
337
346 if ((rs[Rs_display_name] = getenv ("DISPLAY")) == NULL) 338 if ((rs[Rs_display_name] = getenv ("DISPLAY")) == NULL)
347 rs[Rs_display_name] = ":0"; 339 rs[Rs_display_name] = ":0";
348 340
349 get_options (r_argc, r_argv); 341 get_options (r_argc, r_argv);
350 342
351 if (!(display = displays.get (rs[Rs_display_name]))) 343 if (!(display = displays.get (rs[Rs_display_name])))
352 rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]); 344 rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]);
353 345
354 extract_resources (); 346 extract_resources ();
347
355 free (r_argv); 348 free (r_argv);
356 349
357 /* 350 /*
358 * set any defaults not already set 351 * set any defaults not already set
359 */ 352 */
… …
393 pointerBlankDelay = 2; 386 pointerBlankDelay = 2;
394#endif 387#endif
395 388
396 /* no point having a scrollbar without having any scrollback! */ 389 /* no point having a scrollbar without having any scrollback! */
397 if (!saveLines) 390 if (!saveLines)
398 CLR_OPTION (Opt_scrollBar); 391 set_option (Opt_scrollBar, 0);
399 392
400#ifdef PRINTPIPE 393#ifdef PRINTPIPE
401 if (!rs[Rs_print_pipe]) 394 if (!rs[Rs_print_pipe])
402 rs[Rs_print_pipe] = PRINTPIPE; 395 rs[Rs_print_pipe] = PRINTPIPE;
403#endif 396#endif
… …
578 * This should support all European type languages. 571 * This should support all European type languages.
579 */ 572 */
580void 573void
581rxvt_term::set_locale (const char *locale) 574rxvt_term::set_locale (const char *locale)
582{ 575{
576 set_environ (envv);
577
583#if HAVE_XSETLOCALE || HAVE_SETLOCALE 578#if HAVE_XSETLOCALE || HAVE_SETLOCALE
584 free (this->locale); 579 free (this->locale);
585 this->locale = setlocale (LC_CTYPE, locale); 580 this->locale = setlocale (LC_CTYPE, locale);
586 581
587 if (!this->locale) 582 if (!this->locale)
588 { 583 {
589 if (*locale) 584 if (*locale)
590 { 585 {
591 rxvt_warn ("unable to set locale \"%s\", using default locale instead.\n", locale); 586 rxvt_warn ("unable to set locale \"%s\", using C locale instead.\n", locale);
592 setlocale (LC_CTYPE, ""); 587 setlocale (LC_CTYPE, "C");
593 } 588 }
594 else 589 else
595 rxvt_warn ("default locale unavailable, check LC_* and LANG variables. Continuing.\n"); 590 rxvt_warn ("default locale unavailable, check LC_* and LANG variables. Continuing.\n");
596 591
597 this->locale = ""; 592 this->locale = "C";
598 } 593 }
599 594
600 595
601 this->locale = rxvt_strdup (this->locale); 596 this->locale = rxvt_strdup (this->locale);
602 SET_LOCALE (this->locale); 597 SET_LOCALE (this->locale);
… …
617} 612}
618 613
619void 614void
620rxvt_term::init_xlocale () 615rxvt_term::init_xlocale ()
621{ 616{
617 set_environ (envv);
618
622#ifdef USE_XIM 619#ifdef USE_XIM
623 if (!locale) 620 if (!locale)
624 rxvt_warn ("setting locale failed, working without locale support.\n"); 621 rxvt_warn ("setting locale failed, working without locale support.\n");
625 else 622 else
626 { 623 {
… …
666 if (strcmp (key_backspace, "DEC") == 0) 663 if (strcmp (key_backspace, "DEC") == 0)
667 priv_modes |= PrivMode_HaveBackSpace; 664 priv_modes |= PrivMode_HaveBackSpace;
668#endif 665#endif
669 666
670 /* add value for scrollBar */ 667 /* add value for scrollBar */
671 if (scrollbar_visible ()) 668 if (scrollBar.state)
672 { 669 {
673 priv_modes |= PrivMode_scrollBar; 670 priv_modes |= PrivMode_scrollBar;
674 SavedModes |= PrivMode_scrollBar; 671 SavedModes |= PrivMode_scrollBar;
675 }
676
677 if (menubar_visible ())
678 {
679 priv_modes |= PrivMode_menuBar;
680 SavedModes |= PrivMode_menuBar;
681 } 672 }
682 673
683 run_command (argv); 674 run_command (argv);
684} 675}
685 676
… …
753 if (!rs[Rs_color + Color_pointer_bg]) pix_colors[Color_pointer_bg] = pix_colors[Color_bg]; 744 if (!rs[Rs_color + Color_pointer_bg]) pix_colors[Color_pointer_bg] = pix_colors[Color_bg];
754 if (!rs[Rs_color + Color_border] ) pix_colors[Color_border] = pix_colors[Color_fg]; 745 if (!rs[Rs_color + Color_border] ) pix_colors[Color_border] = pix_colors[Color_fg];
755 } 746 }
756 747
757 /* 748 /*
758 * get scrollBar/menuBar shadow colors 749 * get scrollBar shadow colors
759 * 750 *
760 * The calculations of topShadow/bottomShadow values are adapted 751 * The calculations of topShadow/bottomShadow values are adapted
761 * from the fvwm window manager. 752 * from the fvwm window manager.
762 */ 753 */
763#ifdef KEEP_SCROLLCOLOR 754#ifdef KEEP_SCROLLCOLOR
… …
808 int i = atoi (rs[Rs_color + idx]); 799 int i = atoi (rs[Rs_color + idx]);
809 800
810 if (i >= 8 && i <= 15) 801 if (i >= 8 && i <= 15)
811 { /* bright colors */ 802 { /* bright colors */
812 i -= 8; 803 i -= 8;
813#ifndef NO_BRIGHTCOLOR
814 rs[Rs_color + idx] = rs[Rs_color + minBrightCOLOR + i]; 804 rs[Rs_color + idx] = rs[Rs_color + minBrightCOLOR + i];
815 return; 805 return;
816#endif
817 } 806 }
818 807
819 if (i >= 0 && i <= 7) /* normal colors */ 808 if (i >= 0 && i <= 7) /* normal colors */
820 rs[Rs_color + idx] = rs[Rs_color + minCOLOR + i]; 809 rs[Rs_color + idx] = rs[Rs_color + minCOLOR + i];
821 } 810 }
… …
920#if ENABLE_FRILLS 909#if ENABLE_FRILLS
921 Atom prop = None; 910 Atom prop = None;
922 MWMHints mwmhints; 911 MWMHints mwmhints;
923#endif 912#endif
924 XGCValues gcvalue; 913 XGCValues gcvalue;
925 long vt_emask;
926 XSetWindowAttributes attributes; 914 XSetWindowAttributes attributes;
927 XWindowAttributes gattr; 915 XWindowAttributes gattr;
928 Window top, parent; 916 Window top, parent;
929 dDisp; 917 dDisp;
930 918
… …
1036#endif 1024#endif
1037 }; 1025 };
1038 1026
1039 XSetWMProtocols (disp, top, protocols, sizeof (protocols) / sizeof (protocols[0])); 1027 XSetWMProtocols (disp, top, protocols, sizeof (protocols) / sizeof (protocols[0]));
1040 1028
1029#if ENABLE_FRILLS
1030 if (rs[Rs_transient_for])
1031 XSetTransientForHint (disp, top, (Window)strtol (rs[Rs_transient_for], 0, 0));
1032#endif
1033
1041#if ENABLE_EWMH 1034#if ENABLE_EWMH
1042 long pid = getpid (); 1035 long pid = getpid ();
1043 1036
1044 XChangeProperty (disp, top, 1037 XChangeProperty (disp, top,
1045 xa[XA_NET_WM_PID], XA_CARDINAL, 32, 1038 xa[XA_NET_WM_PID], XA_CARDINAL, 32,
… …
1065#endif 1058#endif
1066 1059
1067 /* vt cursor: Black-on-White is standard, but this is more popular */ 1060 /* vt cursor: Black-on-White is standard, but this is more popular */
1068 TermWin_cursor = XCreateFontCursor (disp, XC_xterm); 1061 TermWin_cursor = XCreateFontCursor (disp, XC_xterm);
1069 1062
1070#if defined(HAVE_SCROLLBARS) || defined(MENUBAR) 1063#ifdef HAVE_SCROLLBARS
1071 /* cursor (menuBar/scrollBar): Black-on-White */ 1064 /* cursor scrollBar: Black-on-White */
1072 leftptr_cursor = XCreateFontCursor (disp, XC_left_ptr); 1065 leftptr_cursor = XCreateFontCursor (disp, XC_left_ptr);
1073#endif 1066#endif
1074 1067
1075 /* the vt window */ 1068 /* the vt window */
1076 vt = XCreateSimpleWindow (disp, top, 1069 vt = XCreateSimpleWindow (disp, top,
… …
1088 attributes.bit_gravity = NorthWestGravity; 1081 attributes.bit_gravity = NorthWestGravity;
1089 XChangeWindowAttributes (disp, vt, CWBitGravity, &attributes); 1082 XChangeWindowAttributes (disp, vt, CWBitGravity, &attributes);
1090 1083
1091 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask; 1084 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask;
1092 1085
1093#ifdef POINTER_BLANK
1094 if (OPTION (Opt_pointerBlank)) 1086 if (OPTION (Opt_pointerBlank))
1095 vt_emask |= PointerMotionMask; 1087 vt_emask |= PointerMotionMask;
1096 else 1088 else
1097#endif
1098 vt_emask |= Button1MotionMask | Button3MotionMask; 1089 vt_emask |= Button1MotionMask | Button3MotionMask;
1099 1090
1100 XSelectInput (disp, vt, vt_emask); 1091 vt_select_input ();
1092
1101 vt_ev.start (display, vt); 1093 vt_ev.start (display, vt);
1102
1103#if defined(MENUBAR) && (MENUBAR_MAX > 1)
1104 if (menuBar_height ())
1105 {
1106 menuBar.win = XCreateSimpleWindow (disp, top,
1107 window_vt_x, 0,
1108 width,
1109 menuBar_TotalHeight (),
1110 0,
1111 pix_colors_focused[Color_fg],
1112 pix_colors_focused[Color_scroll]);
1113
1114#ifdef DEBUG_X
1115 XStoreName (disp, menuBar.win, "menubar");
1116#endif
1117
1118 menuBar.drawable = new rxvt_drawable (display, menuBar.win);
1119
1120 XDefineCursor (disp, menuBar.win,
1121 XCreateFontCursor (disp, XC_left_ptr));
1122
1123 XSelectInput (disp, menuBar.win,
1124 (ExposureMask | ButtonPressMask | ButtonReleaseMask | Button1MotionMask));
1125 menubar_ev.start (display, menuBar.win);
1126 }
1127#endif
1128 1094
1129#ifdef XPM_BACKGROUND 1095#ifdef XPM_BACKGROUND
1130 if (rs[Rs_backgroundPixmap] != NULL 1096 if (rs[Rs_backgroundPixmap] != NULL
1131 && ! OPTION (Opt_transparent)) 1097 && ! OPTION (Opt_transparent))
1132 { 1098 {
… …
1151 GCForeground | GCBackground | GCGraphicsExposures, 1117 GCForeground | GCBackground | GCGraphicsExposures,
1152 &gcvalue); 1118 &gcvalue);
1153 1119
1154 drawable = new rxvt_drawable (display, vt); 1120 drawable = new rxvt_drawable (display, vt);
1155 1121
1156#if defined(MENUBAR) || defined(RXVT_SCROLLBAR) 1122#ifdef RXVT_SCROLLBAR
1157 gcvalue.foreground = pix_colors[Color_topShadow]; 1123 gcvalue.foreground = pix_colors[Color_topShadow];
1158 topShadowGC = XCreateGC (disp, vt, GCForeground, &gcvalue); 1124 topShadowGC = XCreateGC (disp, vt, GCForeground, &gcvalue);
1159 gcvalue.foreground = pix_colors[Color_bottomShadow]; 1125 gcvalue.foreground = pix_colors[Color_bottomShadow];
1160 botShadowGC = XCreateGC (disp, vt, GCForeground, &gcvalue); 1126 botShadowGC = XCreateGC (disp, vt, GCForeground, &gcvalue);
1161 gcvalue.foreground = pix_colors[ (display->depth <= 2 ? Color_fg : Color_scroll)]; 1127 gcvalue.foreground = pix_colors[ (display->depth <= 2 ? Color_fg : Color_scroll)];
… …
1406#if ENABLE_FRILLS 1372#if ENABLE_FRILLS
1407 if (rs[Rs_pty_fd]) 1373 if (rs[Rs_pty_fd])
1408 { 1374 {
1409 pty.pty = atoi (rs[Rs_pty_fd]); 1375 pty.pty = atoi (rs[Rs_pty_fd]);
1410 1376
1377 if (pty.pty >= 0)
1378 {
1411 if (getfd_hook) 1379 if (getfd_hook)
1412 pty.pty = (*getfd_hook) (pty.pty); 1380 pty.pty = (*getfd_hook) (pty.pty);
1413 1381
1414 if (pty.pty < 0 || fcntl (pty.pty, F_SETFL, O_NONBLOCK)) 1382 if (pty.pty < 0 || fcntl (pty.pty, F_SETFL, O_NONBLOCK))
1415 rxvt_fatal ("unusable pty-fd filehandle, aborting.\n"); 1383 rxvt_fatal ("unusable pty-fd filehandle, aborting.\n");
1384 }
1416 } 1385 }
1417 else 1386 else
1418#endif 1387#endif
1419 if (!pty.get ()) 1388 if (!pty.get ())
1420 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n"); 1389 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");
… …
1574 execvp (argv[0], (char *const *)argv); 1543 execvp (argv[0], (char *const *)argv);
1575 /* no error message: STDERR is closed! */ 1544 /* no error message: STDERR is closed! */
1576 } 1545 }
1577 else 1546 else
1578 { 1547 {
1579 const char *argv0, *shell; 1548 const char *argv0, *shell;
1580 1549
1581 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0') 1550 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0')
1582 shell = "/bin/sh"; 1551 shell = "/bin/sh";
1583 1552
1584 argv0 = (const char *)rxvt_r_basename (shell); 1553 argv0 = (const char *)rxvt_r_basename (shell);
… …
1589 1558
1590 login[0] = '-'; 1559 login[0] = '-';
1591 strcpy (&login[1], argv0); 1560 strcpy (&login[1], argv0);
1592 argv0 = login; 1561 argv0 = login;
1593 } 1562 }
1563
1594 execlp (shell, argv0, NULL); 1564 execlp (shell, argv0, NULL);
1595 /* no error message: STDERR is closed! */ 1565 /* no error message: STDERR is closed! */
1596 } 1566 }
1597 1567
1598#else /* __QNX__ uses qnxspawn () */ 1568#else /* __QNX__ uses qnxspawn () */

Diff Legend

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