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.129 by root, Mon Jan 2 22:23:26 2006 UTC vs.
Revision 1.139 by root, Wed Jan 11 03:13:26 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) */
… …
341 rs[Rs_name] = rxvt_r_basename (argv[0]); 339 rs[Rs_name] = rxvt_r_basename (argv[0]);
342 340
343 /* 341 /*
344 * Open display, get options/resources and create the window 342 * Open display, get options/resources and create the window
345 */ 343 */
344 {
345 TEMP_ENV;
346
346 if ((rs[Rs_display_name] = getenv ("DISPLAY")) == NULL) 347 if ((rs[Rs_display_name] = getenv ("DISPLAY")) == NULL)
347 rs[Rs_display_name] = ":0"; 348 rs[Rs_display_name] = ":0";
348 349
349 get_options (r_argc, r_argv); 350 get_options (r_argc, r_argv);
350 351
351 if (!(display = displays.get (rs[Rs_display_name]))) 352 if (!(display = displays.get (rs[Rs_display_name])))
352 rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]); 353 rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]);
353 354
354 extract_resources (); 355 extract_resources ();
356 }
357
355 free (r_argv); 358 free (r_argv);
356 359
357 /* 360 /*
358 * set any defaults not already set 361 * set any defaults not already set
359 */ 362 */
… …
393 pointerBlankDelay = 2; 396 pointerBlankDelay = 2;
394#endif 397#endif
395 398
396 /* no point having a scrollbar without having any scrollback! */ 399 /* no point having a scrollbar without having any scrollback! */
397 if (!saveLines) 400 if (!saveLines)
398 CLR_OPTION (Opt_scrollBar); 401 set_option (Opt_scrollBar, 0);
399 402
400#ifdef PRINTPIPE 403#ifdef PRINTPIPE
401 if (!rs[Rs_print_pipe]) 404 if (!rs[Rs_print_pipe])
402 rs[Rs_print_pipe] = PRINTPIPE; 405 rs[Rs_print_pipe] = PRINTPIPE;
403#endif 406#endif
… …
578 * This should support all European type languages. 581 * This should support all European type languages.
579 */ 582 */
580void 583void
581rxvt_term::set_locale (const char *locale) 584rxvt_term::set_locale (const char *locale)
582{ 585{
586 TEMP_ENV;
587
583#if HAVE_XSETLOCALE || HAVE_SETLOCALE 588#if HAVE_XSETLOCALE || HAVE_SETLOCALE
584 free (this->locale); 589 free (this->locale);
585 this->locale = setlocale (LC_CTYPE, locale); 590 this->locale = setlocale (LC_CTYPE, locale);
586 591
587 if (!this->locale) 592 if (!this->locale)
588 { 593 {
589 if (*locale) 594 if (*locale)
590 { 595 {
591 rxvt_warn ("unable to set locale \"%s\", using default locale instead.\n", locale); 596 rxvt_warn ("unable to set locale \"%s\", using C locale instead.\n", locale);
592 setlocale (LC_CTYPE, ""); 597 setlocale (LC_CTYPE, "C");
593 } 598 }
594 else 599 else
595 rxvt_warn ("default locale unavailable, check LC_* and LANG variables. Continuing.\n"); 600 rxvt_warn ("default locale unavailable, check LC_* and LANG variables. Continuing.\n");
596 601
597 this->locale = ""; 602 this->locale = "C";
598 } 603 }
599 604
600 605
601 this->locale = rxvt_strdup (this->locale); 606 this->locale = rxvt_strdup (this->locale);
602 SET_LOCALE (this->locale); 607 SET_LOCALE (this->locale);
… …
617} 622}
618 623
619void 624void
620rxvt_term::init_xlocale () 625rxvt_term::init_xlocale ()
621{ 626{
627 TEMP_ENV;
628
622#ifdef USE_XIM 629#ifdef USE_XIM
623 if (!locale) 630 if (!locale)
624 rxvt_warn ("setting locale failed, working without locale support.\n"); 631 rxvt_warn ("setting locale failed, working without locale support.\n");
625 else 632 else
626 { 633 {
… …
677 if (menubar_visible ()) 684 if (menubar_visible ())
678 { 685 {
679 priv_modes |= PrivMode_menuBar; 686 priv_modes |= PrivMode_menuBar;
680 SavedModes |= PrivMode_menuBar; 687 SavedModes |= PrivMode_menuBar;
681 } 688 }
682
683#ifdef CURSOR_BLINK
684 if (OPTION (Opt_cursorBlink))
685 (void)gettimeofday (&lastcursorchange, NULL);
686#endif
687 689
688 run_command (argv); 690 run_command (argv);
689} 691}
690 692
691/*----------------------------------------------------------------------*/ 693/*----------------------------------------------------------------------*/
… …
813 int i = atoi (rs[Rs_color + idx]); 815 int i = atoi (rs[Rs_color + idx]);
814 816
815 if (i >= 8 && i <= 15) 817 if (i >= 8 && i <= 15)
816 { /* bright colors */ 818 { /* bright colors */
817 i -= 8; 819 i -= 8;
818#ifndef NO_BRIGHTCOLOR
819 rs[Rs_color + idx] = rs[Rs_color + minBrightCOLOR + i]; 820 rs[Rs_color + idx] = rs[Rs_color + minBrightCOLOR + i];
820 return; 821 return;
821#endif
822 } 822 }
823 823
824 if (i >= 0 && i <= 7) /* normal colors */ 824 if (i >= 0 && i <= 7) /* normal colors */
825 rs[Rs_color + idx] = rs[Rs_color + minCOLOR + i]; 825 rs[Rs_color + idx] = rs[Rs_color + minCOLOR + i];
826 } 826 }
… …
1041#endif 1041#endif
1042 }; 1042 };
1043 1043
1044 XSetWMProtocols (disp, top, protocols, sizeof (protocols) / sizeof (protocols[0])); 1044 XSetWMProtocols (disp, top, protocols, sizeof (protocols) / sizeof (protocols[0]));
1045 1045
1046#if ENABLE_FRILLS
1047 if (rs[Rs_transient_for])
1048 XSetTransientForHint (disp, top, (Window)strtol (rs[Rs_transient_for], 0, 0));
1049#endif
1050
1046#if ENABLE_EWMH 1051#if ENABLE_EWMH
1047 long pid = getpid (); 1052 long pid = getpid ();
1048 1053
1049 XChangeProperty (disp, top, 1054 XChangeProperty (disp, top,
1050 xa[XA_NET_WM_PID], XA_CARDINAL, 32, 1055 xa[XA_NET_WM_PID], XA_CARDINAL, 32,
… …
1079 1084
1080 /* the vt window */ 1085 /* the vt window */
1081 vt = XCreateSimpleWindow (disp, top, 1086 vt = XCreateSimpleWindow (disp, top,
1082 window_vt_x, 1087 window_vt_x,
1083 window_vt_y, 1088 window_vt_y,
1084 TermWin_TotalWidth (), 1089 width,
1085 TermWin_TotalHeight (), 1090 height,
1086 0, 1091 0,
1087 pix_colors_focused[Color_fg], 1092 pix_colors_focused[Color_fg],
1088 pix_colors_focused[Color_bg]); 1093 pix_colors_focused[Color_bg]);
1089#ifdef DEBUG_X 1094#ifdef DEBUG_X
1090 XStoreName (disp, vt, "vt window"); 1095 XStoreName (disp, vt, "vt window");
… …
1093 attributes.bit_gravity = NorthWestGravity; 1098 attributes.bit_gravity = NorthWestGravity;
1094 XChangeWindowAttributes (disp, vt, CWBitGravity, &attributes); 1099 XChangeWindowAttributes (disp, vt, CWBitGravity, &attributes);
1095 1100
1096 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask; 1101 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask;
1097 1102
1098#ifdef POINTER_BLANK
1099 if (OPTION (Opt_pointerBlank)) 1103 if (OPTION (Opt_pointerBlank)
1104#ifdef ENABLE_PERL
1105 || perl.self
1106#endif
1107 )
1100 vt_emask |= PointerMotionMask; 1108 vt_emask |= PointerMotionMask;
1101 else 1109 else
1102#endif
1103 vt_emask |= Button1MotionMask | Button3MotionMask; 1110 vt_emask |= Button1MotionMask | Button3MotionMask;
1104 1111
1105 XSelectInput (disp, vt, vt_emask); 1112 XSelectInput (disp, vt, vt_emask);
1106 vt_ev.start (display, vt); 1113 vt_ev.start (display, vt);
1107 1114
1108#if defined(MENUBAR) && (MENUBAR_MAX > 1) 1115#if defined(MENUBAR) && (MENUBAR_MAX > 1)
1109 if (menuBar_height ()) 1116 if (menuBar_height ())
1110 { 1117 {
1111 menuBar.win = XCreateSimpleWindow (disp, top, 1118 menuBar.win = XCreateSimpleWindow (disp, top,
1112 window_vt_x, 0, 1119 window_vt_x, 0,
1113 TermWin_TotalWidth (), 1120 width,
1114 menuBar_TotalHeight (), 1121 menuBar_TotalHeight (),
1115 0, 1122 0,
1116 pix_colors_focused[Color_fg], 1123 pix_colors_focused[Color_fg],
1117 pix_colors_focused[Color_scroll]); 1124 pix_colors_focused[Color_scroll]);
1118 1125
… …
1406 * the slave. 1413 * the slave.
1407 */ 1414 */
1408void 1415void
1409rxvt_term::run_command (const char *const *argv) 1416rxvt_term::run_command (const char *const *argv)
1410{ 1417{
1418 TEMP_ENV; // not very temporary...
1419
1411#if ENABLE_FRILLS 1420#if ENABLE_FRILLS
1412 if (rs[Rs_pty_fd]) 1421 if (rs[Rs_pty_fd])
1413 { 1422 {
1414 pty.pty = atoi (rs[Rs_pty_fd]); 1423 pty.pty = atoi (rs[Rs_pty_fd]);
1415 1424
1425 if (pty.pty >= 0)
1426 {
1416 if (getfd_hook) 1427 if (getfd_hook)
1417 pty.pty = (*getfd_hook) (pty.pty); 1428 pty.pty = (*getfd_hook) (pty.pty);
1418 1429
1419 if (pty.pty < 0 || fcntl (pty.pty, F_SETFL, O_NONBLOCK)) 1430 if (pty.pty < 0 || fcntl (pty.pty, F_SETFL, O_NONBLOCK))
1420 rxvt_fatal ("unusable pty-fd filehandle, aborting.\n"); 1431 rxvt_fatal ("unusable pty-fd filehandle, aborting.\n");
1432 }
1421 } 1433 }
1422 else 1434 else
1423#endif 1435#endif
1424 if (!pty.get ()) 1436 if (!pty.get ())
1425 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n"); 1437 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");
… …
1579 execvp (argv[0], (char *const *)argv); 1591 execvp (argv[0], (char *const *)argv);
1580 /* no error message: STDERR is closed! */ 1592 /* no error message: STDERR is closed! */
1581 } 1593 }
1582 else 1594 else
1583 { 1595 {
1584 const char *argv0, *shell; 1596 const char *argv0, *shell;
1585 1597
1586 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0') 1598 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0')
1587 shell = "/bin/sh"; 1599 shell = "/bin/sh";
1588 1600
1589 argv0 = (const char *)rxvt_r_basename (shell); 1601 argv0 = (const char *)rxvt_r_basename (shell);
… …
1594 1606
1595 login[0] = '-'; 1607 login[0] = '-';
1596 strcpy (&login[1], argv0); 1608 strcpy (&login[1], argv0);
1597 argv0 = login; 1609 argv0 = login;
1598 } 1610 }
1611
1599 execlp (shell, argv0, NULL); 1612 execlp (shell, argv0, NULL);
1600 /* no error message: STDERR is closed! */ 1613 /* no error message: STDERR is closed! */
1601 } 1614 }
1602 1615
1603#else /* __QNX__ uses qnxspawn () */ 1616#else /* __QNX__ uses qnxspawn () */

Diff Legend

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