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.181 by ayin, Tue May 1 21:10:04 2007 UTC vs.
Revision 1.182 by root, Tue May 1 21:30:01 2007 UTC

… …
211 bgPixmap.pixmap = None; 211 bgPixmap.pixmap = None;
212#endif 212#endif
213 213
214 last_bot = last_state = -1; 214 last_bot = last_state = -1;
215 215
216 set_option (Opt_scrollBar, 1); 216 set_option (Opt_scrollBar);
217 set_option (Opt_scrollTtyOutput, 1); 217 set_option (Opt_scrollTtyOutput);
218 set_option (Opt_jumpScroll, 1); 218 set_option (Opt_jumpScroll);
219 set_option (Opt_secondaryScreen, 1); 219 set_option (Opt_secondaryScreen);
220 set_option (Opt_secondaryScroll, 1); 220 set_option (Opt_secondaryScroll);
221 set_option (Opt_pastableTabs, 1); 221 set_option (Opt_pastableTabs);
222 set_option (Opt_intensityStyles, 1); 222 set_option (Opt_intensityStyles);
223 223
224 return true; 224 return true;
225} 225}
226 226
227void 227void
… …
428 setup_scrollbar (rs[Rs_scrollBar_align], rs[Rs_scrollstyle], rs[Rs_scrollBar_thickness]); 428 setup_scrollbar (rs[Rs_scrollBar_align], rs[Rs_scrollstyle], rs[Rs_scrollBar_thickness]);
429#endif 429#endif
430 430
431#ifdef XTERM_REVERSE_VIDEO 431#ifdef XTERM_REVERSE_VIDEO
432 /* this is how xterm implements reverseVideo */ 432 /* this is how xterm implements reverseVideo */
433 if (OPTION (Opt_reverseVideo)) 433 if (option (Opt_reverseVideo))
434 { 434 {
435 if (!rs[Rs_color + Color_fg]) 435 if (!rs[Rs_color + Color_fg])
436 rs[Rs_color + Color_fg] = def_colorName[Color_bg]; 436 rs[Rs_color + Color_fg] = def_colorName[Color_bg];
437 437
438 if (!rs[Rs_color + Color_bg]) 438 if (!rs[Rs_color + Color_bg])
… …
444 if (!rs[Rs_color + i]) 444 if (!rs[Rs_color + i])
445 rs[Rs_color + i] = def_colorName[i]; 445 rs[Rs_color + i] = def_colorName[i];
446 446
447#ifndef XTERM_REVERSE_VIDEO 447#ifndef XTERM_REVERSE_VIDEO
448 /* this is how we implement reverseVideo */ 448 /* this is how we implement reverseVideo */
449 if (OPTION (Opt_reverseVideo)) 449 if (option (Opt_reverseVideo))
450 ::swap (rs[Rs_color + Color_fg], rs[Rs_color + Color_bg]); 450 ::swap (rs[Rs_color + Color_fg], rs[Rs_color + Color_bg]);
451#endif 451#endif
452 452
453 /* convenient aliases for setting fg/bg to colors */ 453 /* convenient aliases for setting fg/bg to colors */
454 color_aliases (Color_fg); 454 color_aliases (Color_fg);
… …
628 * Initialize the command connection. 628 * Initialize the command connection.
629 * This should be called after the X server connection is established. 629 * This should be called after the X server connection is established.
630 */ 630 */
631 631
632#ifdef META8_OPTION 632#ifdef META8_OPTION
633 meta_char = OPTION (Opt_meta8) ? 0x80 : C0_ESC; 633 meta_char = option (Opt_meta8) ? 0x80 : C0_ESC;
634#endif 634#endif
635 635
636 get_ourmods (); 636 get_ourmods ();
637 637
638 if (!OPTION (Opt_scrollTtyOutput)) 638 if (!option (Opt_scrollTtyOutput))
639 priv_modes |= PrivMode_TtyOutputInh; 639 priv_modes |= PrivMode_TtyOutputInh;
640 if (OPTION (Opt_scrollTtyKeypress)) 640 if (option (Opt_scrollTtyKeypress))
641 priv_modes |= PrivMode_Keypress; 641 priv_modes |= PrivMode_Keypress;
642 if (!OPTION (Opt_jumpScroll)) 642 if (!option (Opt_jumpScroll))
643 priv_modes |= PrivMode_smoothScroll; 643 priv_modes |= PrivMode_smoothScroll;
644 644
645#ifndef NO_BACKSPACE_KEY 645#ifndef NO_BACKSPACE_KEY
646 if (strcmp (key_backspace, "DEC") == 0) 646 if (strcmp (key_backspace, "DEC") == 0)
647 priv_modes |= PrivMode_HaveBackSpace; 647 priv_modes |= PrivMode_HaveBackSpace;
… …
677 rxvt_color xcol; 677 rxvt_color xcol;
678 678
679 if (!set_color (xcol, name)) 679 if (!set_color (xcol, name))
680 { 680 {
681#ifndef XTERM_REVERSE_VIDEO 681#ifndef XTERM_REVERSE_VIDEO
682 if (i < 2 && OPTION (Opt_reverseVideo)) 682 if (i < 2 && option (Opt_reverseVideo))
683 name = def_colorName [1 - i]; 683 name = def_colorName [1 - i];
684 else 684 else
685#endif 685#endif
686 name = def_colorName [i]; 686 name = def_colorName [i];
687 687
… …
894 if (!set_fonts ()) 894 if (!set_fonts ())
895 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n"); 895 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n");
896 896
897 parent = display->root; 897 parent = display->root;
898 898
899 attributes.override_redirect = !!OPTION (Opt_override_redirect); 899 attributes.override_redirect = !!option (Opt_override_redirect);
900 900
901#if ENABLE_FRILLS 901#if ENABLE_FRILLS
902 if (OPTION (Opt_borderLess)) 902 if (option (Opt_borderLess))
903 { 903 {
904 if (XInternAtom (dpy, "_MOTIF_WM_INFO", True) == None) 904 if (XInternAtom (dpy, "_MOTIF_WM_INFO", True) == None)
905 { 905 {
906 /* print_warning("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n");*/ 906 /* print_warning("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n");*/
907 attributes.override_redirect = true; 907 attributes.override_redirect = true;
… …
957 classHint.res_name = (char *)rs[Rs_name]; 957 classHint.res_name = (char *)rs[Rs_name];
958 classHint.res_class = (char *)RESCLASS; 958 classHint.res_class = (char *)RESCLASS;
959 959
960 wmHint.flags = InputHint | StateHint | WindowGroupHint; 960 wmHint.flags = InputHint | StateHint | WindowGroupHint;
961 wmHint.input = True; 961 wmHint.input = True;
962 wmHint.initial_state = OPTION (Opt_iconic) ? IconicState : NormalState; 962 wmHint.initial_state = option (Opt_iconic) ? IconicState : NormalState;
963 wmHint.window_group = top; 963 wmHint.window_group = top;
964 964
965 XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc, 965 XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc,
966 &szHint, &wmHint, &classHint); 966 &szHint, &wmHint, &classHint);
967 967
… …
1024 attributes.bit_gravity = NorthWestGravity; 1024 attributes.bit_gravity = NorthWestGravity;
1025 XChangeWindowAttributes (dpy, vt, CWBitGravity, &attributes); 1025 XChangeWindowAttributes (dpy, vt, CWBitGravity, &attributes);
1026 1026
1027 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask; 1027 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask;
1028 1028
1029 if (OPTION (Opt_pointerBlank)) 1029 if (option (Opt_pointerBlank))
1030 vt_emask |= PointerMotionMask; 1030 vt_emask |= PointerMotionMask;
1031 else 1031 else
1032 vt_emask |= Button1MotionMask | Button3MotionMask; 1032 vt_emask |= Button1MotionMask | Button3MotionMask;
1033 1033
1034 vt_select_input (); 1034 vt_select_input ();
1035 1035
1036 vt_ev.start (display, vt); 1036 vt_ev.start (display, vt);
1037 1037
1038#ifdef XPM_BACKGROUND 1038#ifdef XPM_BACKGROUND
1039 if (rs[Rs_backgroundPixmap] != NULL 1039 if (rs[Rs_backgroundPixmap] != NULL
1040 && !OPTION (Opt_transparent)) 1040 && !option (Opt_transparent))
1041 { 1041 {
1042 const char *p = rs[Rs_backgroundPixmap]; 1042 const char *p = rs[Rs_backgroundPixmap];
1043 1043
1044 if ((p = strchr (p, ';')) != NULL) 1044 if ((p = strchr (p, ';')) != NULL)
1045 { 1045 {
… …
1329 } 1329 }
1330 1330
1331 _exit (EXIT_FAILURE); 1331 _exit (EXIT_FAILURE);
1332 1332
1333 default: 1333 default:
1334 if (!OPTION (Opt_utmpInhibit)) 1334 if (!option (Opt_utmpInhibit))
1335 pty->login (cmd_pid, OPTION (Opt_loginShell), rs[Rs_display_name]); 1335 pty->login (cmd_pid, option (Opt_loginShell), rs[Rs_display_name]);
1336 1336
1337 pty->close_tty (); 1337 pty->close_tty ();
1338 1338
1339 child_ev.start (cmd_pid); 1339 child_ev.start (cmd_pid);
1340 1340
… …
1353int 1353int
1354rxvt_term::run_child (const char *const *argv) 1354rxvt_term::run_child (const char *const *argv)
1355{ 1355{
1356 char *login; 1356 char *login;
1357 1357
1358 if (OPTION (Opt_console)) 1358 if (option (Opt_console))
1359 { /* be virtual console, fail silently */ 1359 { /* be virtual console, fail silently */
1360#ifdef TIOCCONS 1360#ifdef TIOCCONS
1361 unsigned int on = 1; 1361 unsigned int on = 1;
1362 1362
1363 ioctl (STDIN_FILENO, TIOCCONS, &on); 1363 ioctl (STDIN_FILENO, TIOCCONS, &on);
… …
1412 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0') 1412 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0')
1413 shell = "/bin/sh"; 1413 shell = "/bin/sh";
1414 1414
1415 argv0 = (const char *)rxvt_r_basename (shell); 1415 argv0 = (const char *)rxvt_r_basename (shell);
1416 1416
1417 if (OPTION (Opt_loginShell)) 1417 if (option (Opt_loginShell))
1418 { 1418 {
1419 login = (char *)rxvt_malloc ((strlen (argv0) + 2) * sizeof (char)); 1419 login = (char *)rxvt_malloc ((strlen (argv0) + 2) * sizeof (char));
1420 1420
1421 login[0] = '-'; 1421 login[0] = '-';
1422 strcpy (&login[1], argv0); 1422 strcpy (&login[1], argv0);

Diff Legend

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