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.136 by root, Sun Jan 8 01:02:15 2006 UTC vs.
Revision 1.143 by root, Mon Jan 16 15:00:20 2006 UTC

… …
256 bgPixmap.pixmap = None; 256 bgPixmap.pixmap = None;
257#endif 257#endif
258 258
259 last_bot = last_state = -1; 259 last_bot = last_state = -1;
260 260
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; 261 return true;
269} 262}
270 263
271void 264void
272rxvt_term::init_secondary () 265rxvt_term::init_secondary ()
… …
339 rs[Rs_name] = rxvt_r_basename (argv[0]); 332 rs[Rs_name] = rxvt_r_basename (argv[0]);
340 333
341 /* 334 /*
342 * Open display, get options/resources and create the window 335 * Open display, get options/resources and create the window
343 */ 336 */
337
344 if ((rs[Rs_display_name] = getenv ("DISPLAY")) == NULL) 338 if ((rs[Rs_display_name] = getenv ("DISPLAY")) == NULL)
345 rs[Rs_display_name] = ":0"; 339 rs[Rs_display_name] = ":0";
346 340
347 get_options (r_argc, r_argv); 341 get_options (r_argc, r_argv);
348 342
349 if (!(display = displays.get (rs[Rs_display_name]))) 343 if (!(display = displays.get (rs[Rs_display_name])))
350 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]);
351 345
352 extract_resources (); 346 extract_resources ();
347
353 free (r_argv); 348 free (r_argv);
354 349
355 /* 350 /*
356 * set any defaults not already set 351 * set any defaults not already set
357 */ 352 */
… …
576 * This should support all European type languages. 571 * This should support all European type languages.
577 */ 572 */
578void 573void
579rxvt_term::set_locale (const char *locale) 574rxvt_term::set_locale (const char *locale)
580{ 575{
576 set_environ (envv);
577
581#if HAVE_XSETLOCALE || HAVE_SETLOCALE 578#if HAVE_XSETLOCALE || HAVE_SETLOCALE
582 free (this->locale); 579 free (this->locale);
583 this->locale = setlocale (LC_CTYPE, locale); 580 this->locale = setlocale (LC_CTYPE, locale);
584 581
585 if (!this->locale) 582 if (!this->locale)
586 { 583 {
587 if (*locale) 584 if (*locale)
588 { 585 {
589 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);
590 setlocale (LC_CTYPE, ""); 587 setlocale (LC_CTYPE, "C");
591 } 588 }
592 else 589 else
593 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");
594 591
595 this->locale = ""; 592 this->locale = "C";
596 } 593 }
597 594
598 595
599 this->locale = rxvt_strdup (this->locale); 596 this->locale = rxvt_strdup (this->locale);
600 SET_LOCALE (this->locale); 597 SET_LOCALE (this->locale);
… …
615} 612}
616 613
617void 614void
618rxvt_term::init_xlocale () 615rxvt_term::init_xlocale ()
619{ 616{
617 set_environ (envv);
618
620#ifdef USE_XIM 619#ifdef USE_XIM
621 if (!locale) 620 if (!locale)
622 rxvt_warn ("setting locale failed, working without locale support.\n"); 621 rxvt_warn ("setting locale failed, working without locale support.\n");
623 else 622 else
624 { 623 {
… …
664 if (strcmp (key_backspace, "DEC") == 0) 663 if (strcmp (key_backspace, "DEC") == 0)
665 priv_modes |= PrivMode_HaveBackSpace; 664 priv_modes |= PrivMode_HaveBackSpace;
666#endif 665#endif
667 666
668 /* add value for scrollBar */ 667 /* add value for scrollBar */
669 if (scrollbar_visible ()) 668 if (scrollBar.state)
670 { 669 {
671 priv_modes |= PrivMode_scrollBar; 670 priv_modes |= PrivMode_scrollBar;
672 SavedModes |= PrivMode_scrollBar; 671 SavedModes |= PrivMode_scrollBar;
673 }
674
675 if (menubar_visible ())
676 {
677 priv_modes |= PrivMode_menuBar;
678 SavedModes |= PrivMode_menuBar;
679 } 672 }
680 673
681 run_command (argv); 674 run_command (argv);
682} 675}
683 676
… …
751 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];
752 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];
753 } 746 }
754 747
755 /* 748 /*
756 * get scrollBar/menuBar shadow colors 749 * get scrollBar shadow colors
757 * 750 *
758 * The calculations of topShadow/bottomShadow values are adapted 751 * The calculations of topShadow/bottomShadow values are adapted
759 * from the fvwm window manager. 752 * from the fvwm window manager.
760 */ 753 */
761#ifdef KEEP_SCROLLCOLOR 754#ifdef KEEP_SCROLLCOLOR
… …
916#if ENABLE_FRILLS 909#if ENABLE_FRILLS
917 Atom prop = None; 910 Atom prop = None;
918 MWMHints mwmhints; 911 MWMHints mwmhints;
919#endif 912#endif
920 XGCValues gcvalue; 913 XGCValues gcvalue;
921 long vt_emask;
922 XSetWindowAttributes attributes; 914 XSetWindowAttributes attributes;
923 XWindowAttributes gattr; 915 XWindowAttributes gattr;
924 Window top, parent; 916 Window top, parent;
925 dDisp; 917 dDisp;
926 918
… …
1066#endif 1058#endif
1067 1059
1068 /* 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 */
1069 TermWin_cursor = XCreateFontCursor (disp, XC_xterm); 1061 TermWin_cursor = XCreateFontCursor (disp, XC_xterm);
1070 1062
1071#if defined(HAVE_SCROLLBARS) || defined(MENUBAR) 1063#ifdef HAVE_SCROLLBARS
1072 /* cursor (menuBar/scrollBar): Black-on-White */ 1064 /* cursor scrollBar: Black-on-White */
1073 leftptr_cursor = XCreateFontCursor (disp, XC_left_ptr); 1065 leftptr_cursor = XCreateFontCursor (disp, XC_left_ptr);
1074#endif 1066#endif
1075 1067
1076 /* the vt window */ 1068 /* the vt window */
1077 vt = XCreateSimpleWindow (disp, top, 1069 vt = XCreateSimpleWindow (disp, top,
… …
1089 attributes.bit_gravity = NorthWestGravity; 1081 attributes.bit_gravity = NorthWestGravity;
1090 XChangeWindowAttributes (disp, vt, CWBitGravity, &attributes); 1082 XChangeWindowAttributes (disp, vt, CWBitGravity, &attributes);
1091 1083
1092 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask; 1084 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask;
1093 1085
1094 if (OPTION (Opt_pointerBlank) 1086 if (OPTION (Opt_pointerBlank))
1095#ifdef ENABLE_PERL
1096 || perl.self
1097#endif
1098 )
1099 vt_emask |= PointerMotionMask; 1087 vt_emask |= PointerMotionMask;
1100 else 1088 else
1101 vt_emask |= Button1MotionMask | Button3MotionMask; 1089 vt_emask |= Button1MotionMask | Button3MotionMask;
1102 1090
1103 XSelectInput (disp, vt, vt_emask); 1091 vt_select_input ();
1092
1104 vt_ev.start (display, vt); 1093 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 width,
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 1094
1132#ifdef XPM_BACKGROUND 1095#ifdef XPM_BACKGROUND
1133 if (rs[Rs_backgroundPixmap] != NULL 1096 if (rs[Rs_backgroundPixmap] != NULL
1134 && ! OPTION (Opt_transparent)) 1097 && ! OPTION (Opt_transparent))
1135 { 1098 {
… …
1154 GCForeground | GCBackground | GCGraphicsExposures, 1117 GCForeground | GCBackground | GCGraphicsExposures,
1155 &gcvalue); 1118 &gcvalue);
1156 1119
1157 drawable = new rxvt_drawable (display, vt); 1120 drawable = new rxvt_drawable (display, vt);
1158 1121
1159#if defined(MENUBAR) || defined(RXVT_SCROLLBAR) 1122#ifdef RXVT_SCROLLBAR
1160 gcvalue.foreground = pix_colors[Color_topShadow]; 1123 gcvalue.foreground = pix_colors[Color_topShadow];
1161 topShadowGC = XCreateGC (disp, vt, GCForeground, &gcvalue); 1124 topShadowGC = XCreateGC (disp, vt, GCForeground, &gcvalue);
1162 gcvalue.foreground = pix_colors[Color_bottomShadow]; 1125 gcvalue.foreground = pix_colors[Color_bottomShadow];
1163 botShadowGC = XCreateGC (disp, vt, GCForeground, &gcvalue); 1126 botShadowGC = XCreateGC (disp, vt, GCForeground, &gcvalue);
1164 gcvalue.foreground = pix_colors[ (display->depth <= 2 ? Color_fg : Color_scroll)]; 1127 gcvalue.foreground = pix_colors[ (display->depth <= 2 ? Color_fg : Color_scroll)];
… …
1580 execvp (argv[0], (char *const *)argv); 1543 execvp (argv[0], (char *const *)argv);
1581 /* no error message: STDERR is closed! */ 1544 /* no error message: STDERR is closed! */
1582 } 1545 }
1583 else 1546 else
1584 { 1547 {
1585 const char *argv0, *shell; 1548 const char *argv0, *shell;
1586 1549
1587 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0') 1550 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0')
1588 shell = "/bin/sh"; 1551 shell = "/bin/sh";
1589 1552
1590 argv0 = (const char *)rxvt_r_basename (shell); 1553 argv0 = (const char *)rxvt_r_basename (shell);
… …
1595 1558
1596 login[0] = '-'; 1559 login[0] = '-';
1597 strcpy (&login[1], argv0); 1560 strcpy (&login[1], argv0);
1598 argv0 = login; 1561 argv0 = login;
1599 } 1562 }
1563
1600 execlp (shell, argv0, NULL); 1564 execlp (shell, argv0, NULL);
1601 /* no error message: STDERR is closed! */ 1565 /* no error message: STDERR is closed! */
1602 } 1566 }
1603 1567
1604#else /* __QNX__ uses qnxspawn () */ 1568#else /* __QNX__ uses qnxspawn () */

Diff Legend

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