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.179 by root, Sat Jan 20 12:29:35 2007 UTC vs.
Revision 1.192 by root, Tue Jul 24 14:38:59 2007 UTC

1/*----------------------------------------------------------------------* 1 /*----------------------------------------------------------------------*
2 * File: init.C 2 * File: init.C
3 *----------------------------------------------------------------------* 3 *----------------------------------------------------------------------*
4 * 4 *
5 * All portions of code are copyright by their respective author/s. 5 * All portions of code are copyright by their respective author/s.
6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk> 6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk>
… …
46 COLOR_BACKGROUND, 46 COLOR_BACKGROUND,
47 /* low-intensity colors */ 47 /* low-intensity colors */
48 "rgb:00/00/00", // 0: black (Black) 48 "rgb:00/00/00", // 0: black (Black)
49 "rgb:cd/00/00", // 1: red (Red3) 49 "rgb:cd/00/00", // 1: red (Red3)
50 "rgb:00/cd/00", // 2: green (Green3) 50 "rgb:00/cd/00", // 2: green (Green3)
51 "rgb:cd/cd/00", // 3: ywlloe (Yellow3) 51 "rgb:cd/cd/00", // 3: yellow (Yellow3)
52 "rgb:00/00/cd", // 4: blue (Blue3) 52 "rgb:00/00/cd", // 4: blue (Blue3)
53 "rgb:cd/00/cd", // 5: magenta (Magenta3) 53 "rgb:cd/00/cd", // 5: magenta (Magenta3)
54 "rgb:00/cd/cd", // 6: cyan (Cyan3) 54 "rgb:00/cd/cd", // 6: cyan (Cyan3)
55# ifdef XTERM_COLORS 55# ifdef XTERM_COLORS
56 "rgb:e5/e5/e5", // 7: white (Grey90) 56 "rgb:e5/e5/e5", // 7: white (Grey90)
… …
183 pix_colors_focused = new rxvt_color [TOTAL_COLORS]; 183 pix_colors_focused = new rxvt_color [TOTAL_COLORS];
184#ifdef OFF_FOCUS_FADING 184#ifdef OFF_FOCUS_FADING
185 pix_colors_unfocused = new rxvt_color [TOTAL_COLORS]; 185 pix_colors_unfocused = new rxvt_color [TOTAL_COLORS];
186#endif 186#endif
187 187
188#if defined(XPM_BACKGROUND) || defined(TRANSPARENT) 188#if defined(XPM_BACKGROUND) || defined(ENABLE_TRANSPARENCY)
189 pixmap = None; 189 pixmap = None;
190#endif 190#endif
191 191
192 MEvent.time = CurrentTime; 192 MEvent.time = CurrentTime;
193 MEvent.button = AnyButton; 193 MEvent.button = AnyButton;
194 options = DEFAULT_OPTIONS;
195 want_refresh = 1; 194 want_refresh = 1;
196 priv_modes = SavedModes = PrivMode_Default; 195 priv_modes = SavedModes = PrivMode_Default;
197 ncol = 80; 196 ncol = 80;
198 nrow = 24; 197 nrow = 24;
199 int_bwidth = INTERNALBORDERWIDTH; 198 int_bwidth = INTERNALBORDERWIDTH;
200 ext_bwidth = EXTERNALBORDERWIDTH; 199 ext_bwidth = EXTERNALBORDERWIDTH;
201 lineSpace = LINESPACE; 200 lineSpace = LINESPACE;
202 saveLines = SAVELINES; 201 saveLines = SAVELINES;
203 numpix_colors = TOTAL_COLORS; 202 numpix_colors = TOTAL_COLORS;
204 203
205 refresh_limit = 1;
206 refresh_type = SLOW_REFRESH; 204 refresh_type = SLOW_REFRESH;
207 205
208 oldcursor.row = oldcursor.col = -1; 206 oldcursor.row = oldcursor.col = -1;
209#ifdef XPM_BACKGROUND 207#ifdef XPM_BACKGROUND
210 /* bgPixmap.w = bgPixmap.h = 0; */ 208 /* bgPixmap.w = bgPixmap.h = 0; */
211 bgPixmap.x = bgPixmap.y = 50; 209 bgPixmap.x = bgPixmap.y = 0;
212 bgPixmap.pixmap = None; 210 bgPixmap.pixmap = None;
213#endif 211#endif
214 212
215 last_bot = last_state = -1; 213 last_bot = last_state = -1;
214
215 set_option (Opt_scrollBar);
216 set_option (Opt_scrollTtyOutput);
217 set_option (Opt_jumpScroll);
218 set_option (Opt_skipScroll);
219 set_option (Opt_secondaryScreen);
220 set_option (Opt_secondaryScroll);
221 set_option (Opt_pastableTabs);
222 set_option (Opt_intensityStyles);
223 set_option (Opt_iso14755_52);
216 224
217 return true; 225 return true;
218} 226}
219 227
220void 228void
… …
308#if XFT 316#if XFT
309 if (rs[Rs_depth]) 317 if (rs[Rs_depth])
310 select_visual (strtol (rs[Rs_depth], 0, 0)); 318 select_visual (strtol (rs[Rs_depth], 0, 0));
311#endif 319#endif
312 320
321#ifdef HAVE_AFTERIMAGE
322 //TODO: is this neccessary for future versions who check the global var whern the macro doesn'T set it?
323 ::dpy = NULL ; /* init global var from libAfter... */
324 asv = AFTERIMAGE_DPY_OP (create_asvisual_for_id (dpy, display->screen, depth, XVisualIDFromVisual (visual), cmap, NULL));
325#endif
313 free (r_argv); 326 free (r_argv);
314 327
315 for (int i = NUM_RESOURCES; i--; ) 328 for (int i = NUM_RESOURCES; i--; )
316 if (rs [i] == resval_undef) 329 if (rs [i] == resval_undef)
317 rs [i] = 0; 330 rs [i] = 0;
… …
421 setup_scrollbar (rs[Rs_scrollBar_align], rs[Rs_scrollstyle], rs[Rs_scrollBar_thickness]); 434 setup_scrollbar (rs[Rs_scrollBar_align], rs[Rs_scrollstyle], rs[Rs_scrollBar_thickness]);
422#endif 435#endif
423 436
424#ifdef XTERM_REVERSE_VIDEO 437#ifdef XTERM_REVERSE_VIDEO
425 /* this is how xterm implements reverseVideo */ 438 /* this is how xterm implements reverseVideo */
426 if (OPTION (Opt_reverseVideo)) 439 if (option (Opt_reverseVideo))
427 { 440 {
428 if (!rs[Rs_color + Color_fg]) 441 if (!rs[Rs_color + Color_fg])
429 rs[Rs_color + Color_fg] = def_colorName[Color_bg]; 442 rs[Rs_color + Color_fg] = def_colorName[Color_bg];
430 443
431 if (!rs[Rs_color + Color_bg]) 444 if (!rs[Rs_color + Color_bg])
… …
437 if (!rs[Rs_color + i]) 450 if (!rs[Rs_color + i])
438 rs[Rs_color + i] = def_colorName[i]; 451 rs[Rs_color + i] = def_colorName[i];
439 452
440#ifndef XTERM_REVERSE_VIDEO 453#ifndef XTERM_REVERSE_VIDEO
441 /* this is how we implement reverseVideo */ 454 /* this is how we implement reverseVideo */
442 if (OPTION (Opt_reverseVideo)) 455 if (option (Opt_reverseVideo))
443 ::swap (rs[Rs_color + Color_fg], rs[Rs_color + Color_bg]); 456 ::swap (rs[Rs_color + Color_fg], rs[Rs_color + Color_bg]);
444#endif 457#endif
445 458
446 /* convenient aliases for setting fg/bg to colors */ 459 /* convenient aliases for setting fg/bg to colors */
447 color_aliases (Color_fg); 460 color_aliases (Color_fg);
… …
621 * Initialize the command connection. 634 * Initialize the command connection.
622 * This should be called after the X server connection is established. 635 * This should be called after the X server connection is established.
623 */ 636 */
624 637
625#ifdef META8_OPTION 638#ifdef META8_OPTION
626 meta_char = OPTION (Opt_meta8) ? 0x80 : C0_ESC; 639 meta_char = option (Opt_meta8) ? 0x80 : C0_ESC;
627#endif 640#endif
628 641
629 get_ourmods (); 642 get_ourmods ();
630 643
631 if (!OPTION (Opt_scrollTtyOutput)) 644 if (!option (Opt_scrollTtyOutput))
632 priv_modes |= PrivMode_TtyOutputInh; 645 priv_modes |= PrivMode_TtyOutputInh;
633 if (OPTION (Opt_scrollTtyKeypress)) 646 if (option (Opt_scrollTtyKeypress))
634 priv_modes |= PrivMode_Keypress; 647 priv_modes |= PrivMode_Keypress;
635 if (!OPTION (Opt_jumpScroll)) 648 if (!option (Opt_jumpScroll))
636 priv_modes |= PrivMode_smoothScroll; 649 priv_modes |= PrivMode_smoothScroll;
637 650
638#ifndef NO_BACKSPACE_KEY 651#ifndef NO_BACKSPACE_KEY
639 if (strcmp (key_backspace, "DEC") == 0) 652 if (strcmp (key_backspace, "DEC") == 0)
640 priv_modes |= PrivMode_HaveBackSpace; 653 priv_modes |= PrivMode_HaveBackSpace;
… …
670 rxvt_color xcol; 683 rxvt_color xcol;
671 684
672 if (!set_color (xcol, name)) 685 if (!set_color (xcol, name))
673 { 686 {
674#ifndef XTERM_REVERSE_VIDEO 687#ifndef XTERM_REVERSE_VIDEO
675 if (i < 2 && OPTION (Opt_reverseVideo)) 688 if (i < 2 && option (Opt_reverseVideo))
676 name = def_colorName [1 - i]; 689 name = def_colorName [1 - i];
677 else 690 else
678#endif 691#endif
679 name = def_colorName [i]; 692 name = def_colorName [i];
680 693
… …
887 if (!set_fonts ()) 900 if (!set_fonts ())
888 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n"); 901 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n");
889 902
890 parent = display->root; 903 parent = display->root;
891 904
892 attributes.override_redirect = !!OPTION (Opt_override_redirect); 905 attributes.override_redirect = !!option (Opt_override_redirect);
893 906
894#if ENABLE_FRILLS 907#if ENABLE_FRILLS
895 if (OPTION (Opt_borderLess)) 908 if (option (Opt_borderLess))
896 { 909 {
897 if (XInternAtom (dpy, "_MOTIF_WM_INFO", True) == None) 910 if (XInternAtom (dpy, "_MOTIF_WM_INFO", True) == None)
898 { 911 {
899 /* print_warning("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n");*/ 912 /* print_warning("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n");*/
900 attributes.override_redirect = true; 913 attributes.override_redirect = true;
… …
950 classHint.res_name = (char *)rs[Rs_name]; 963 classHint.res_name = (char *)rs[Rs_name];
951 classHint.res_class = (char *)RESCLASS; 964 classHint.res_class = (char *)RESCLASS;
952 965
953 wmHint.flags = InputHint | StateHint | WindowGroupHint; 966 wmHint.flags = InputHint | StateHint | WindowGroupHint;
954 wmHint.input = True; 967 wmHint.input = True;
955 wmHint.initial_state = OPTION (Opt_iconic) ? IconicState : NormalState; 968 wmHint.initial_state = option (Opt_iconic) ? IconicState : NormalState;
956 wmHint.window_group = top; 969 wmHint.window_group = top;
957 970
958 XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc, 971 XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc,
959 &szHint, &wmHint, &classHint); 972 &szHint, &wmHint, &classHint);
960 973
… …
1017 attributes.bit_gravity = NorthWestGravity; 1030 attributes.bit_gravity = NorthWestGravity;
1018 XChangeWindowAttributes (dpy, vt, CWBitGravity, &attributes); 1031 XChangeWindowAttributes (dpy, vt, CWBitGravity, &attributes);
1019 1032
1020 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask; 1033 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask;
1021 1034
1022 if (OPTION (Opt_pointerBlank)) 1035 if (option (Opt_pointerBlank))
1023 vt_emask |= PointerMotionMask; 1036 vt_emask |= PointerMotionMask;
1024 else 1037 else
1025 vt_emask |= Button1MotionMask | Button3MotionMask; 1038 vt_emask |= Button1MotionMask | Button3MotionMask;
1026 1039
1027 vt_select_input (); 1040 vt_select_input ();
1028 1041
1029 vt_ev.start (display, vt); 1042 vt_ev.start (display, vt);
1030 1043
1031#ifdef XPM_BACKGROUND 1044#ifdef XPM_BACKGROUND
1032 if (rs[Rs_backgroundPixmap] != NULL 1045 if (rs[Rs_backgroundPixmap] != NULL
1046#ifndef HAVE_AFTERIMAGE
1033 && !OPTION (Opt_transparent)) 1047 && !option (Opt_transparent)
1048#endif
1049 )
1034 { 1050 {
1035 const char *p = rs[Rs_backgroundPixmap]; 1051 const char *p = rs[Rs_backgroundPixmap];
1036 1052
1037 if ((p = strchr (p, ';')) != NULL) 1053 if ((p = strchr (p, ';')) != NULL)
1038 { 1054 {
… …
1322 } 1338 }
1323 1339
1324 _exit (EXIT_FAILURE); 1340 _exit (EXIT_FAILURE);
1325 1341
1326 default: 1342 default:
1327 if (!OPTION (Opt_utmpInhibit)) 1343 if (!option (Opt_utmpInhibit))
1328 pty->login (cmd_pid, OPTION (Opt_loginShell), rs[Rs_display_name]); 1344 pty->login (cmd_pid, option (Opt_loginShell), rs[Rs_display_name]);
1329 1345
1330 pty->close_tty (); 1346 pty->close_tty ();
1331 1347
1332 child_ev.start (cmd_pid); 1348 child_ev.start (cmd_pid);
1333 1349
… …
1346int 1362int
1347rxvt_term::run_child (const char *const *argv) 1363rxvt_term::run_child (const char *const *argv)
1348{ 1364{
1349 char *login; 1365 char *login;
1350 1366
1351 if (OPTION (Opt_console)) 1367 if (option (Opt_console))
1352 { /* be virtual console, fail silently */ 1368 { /* be virtual console, fail silently */
1353#ifdef TIOCCONS 1369#ifdef TIOCCONS
1354 unsigned int on = 1; 1370 unsigned int on = 1;
1355 1371
1356 ioctl (STDIN_FILENO, TIOCCONS, &on); 1372 ioctl (STDIN_FILENO, TIOCCONS, &on);
… …
1405 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0') 1421 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0')
1406 shell = "/bin/sh"; 1422 shell = "/bin/sh";
1407 1423
1408 argv0 = (const char *)rxvt_r_basename (shell); 1424 argv0 = (const char *)rxvt_r_basename (shell);
1409 1425
1410 if (OPTION (Opt_loginShell)) 1426 if (option (Opt_loginShell))
1411 { 1427 {
1412 login = (char *)rxvt_malloc ((strlen (argv0) + 2) * sizeof (char)); 1428 login = (char *)rxvt_malloc ((strlen (argv0) + 2) * sizeof (char));
1413 1429
1414 login[0] = '-'; 1430 login[0] = '-';
1415 strcpy (&login[1], argv0); 1431 strcpy (&login[1], argv0);

Diff Legend

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