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.194 by sasha, Thu Jul 26 16:17:50 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;
… …
199 ext_bwidth = EXTERNALBORDERWIDTH; 199 ext_bwidth = EXTERNALBORDERWIDTH;
200 lineSpace = LINESPACE; 200 lineSpace = LINESPACE;
201 saveLines = SAVELINES; 201 saveLines = SAVELINES;
202 numpix_colors = TOTAL_COLORS; 202 numpix_colors = TOTAL_COLORS;
203 203
204 refresh_limit = 1;
205 refresh_type = SLOW_REFRESH; 204 refresh_type = SLOW_REFRESH;
206 205
207 oldcursor.row = oldcursor.col = -1; 206 oldcursor.row = oldcursor.col = -1;
208#ifdef XPM_BACKGROUND 207#ifdef XPM_BACKGROUND
209 /* bgPixmap.w = bgPixmap.h = 0; */ 208 /* bgPixmap.w = bgPixmap.h = 0; */
… …
211 bgPixmap.pixmap = None; 210 bgPixmap.pixmap = None;
212#endif 211#endif
213 212
214 last_bot = last_state = -1; 213 last_bot = last_state = -1;
215 214
216 set_option (Opt_scrollBar, 1); 215 set_option (Opt_scrollBar);
217 set_option (Opt_scrollTtyOutput, 1); 216 set_option (Opt_scrollTtyOutput);
218 set_option (Opt_jumpScroll, 1); 217 set_option (Opt_jumpScroll);
218 set_option (Opt_skipScroll);
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 set_option (Opt_iso14755_52);
223 224
224 return true; 225 return true;
225} 226}
226 227
227void 228void
… …
315#if XFT 316#if XFT
316 if (rs[Rs_depth]) 317 if (rs[Rs_depth])
317 select_visual (strtol (rs[Rs_depth], 0, 0)); 318 select_visual (strtol (rs[Rs_depth], 0, 0));
318#endif 319#endif
319 320
321#ifdef HAVE_AFTERIMAGE
322 asv = create_asvisual_for_id (dpy, display->screen, depth, XVisualIDFromVisual (visual), cmap, NULL);
323#endif
320 free (r_argv); 324 free (r_argv);
321 325
322 for (int i = NUM_RESOURCES; i--; ) 326 for (int i = NUM_RESOURCES; i--; )
323 if (rs [i] == resval_undef) 327 if (rs [i] == resval_undef)
324 rs [i] = 0; 328 rs [i] = 0;
… …
428 setup_scrollbar (rs[Rs_scrollBar_align], rs[Rs_scrollstyle], rs[Rs_scrollBar_thickness]); 432 setup_scrollbar (rs[Rs_scrollBar_align], rs[Rs_scrollstyle], rs[Rs_scrollBar_thickness]);
429#endif 433#endif
430 434
431#ifdef XTERM_REVERSE_VIDEO 435#ifdef XTERM_REVERSE_VIDEO
432 /* this is how xterm implements reverseVideo */ 436 /* this is how xterm implements reverseVideo */
433 if (OPTION (Opt_reverseVideo)) 437 if (option (Opt_reverseVideo))
434 { 438 {
435 if (!rs[Rs_color + Color_fg]) 439 if (!rs[Rs_color + Color_fg])
436 rs[Rs_color + Color_fg] = def_colorName[Color_bg]; 440 rs[Rs_color + Color_fg] = def_colorName[Color_bg];
437 441
438 if (!rs[Rs_color + Color_bg]) 442 if (!rs[Rs_color + Color_bg])
… …
444 if (!rs[Rs_color + i]) 448 if (!rs[Rs_color + i])
445 rs[Rs_color + i] = def_colorName[i]; 449 rs[Rs_color + i] = def_colorName[i];
446 450
447#ifndef XTERM_REVERSE_VIDEO 451#ifndef XTERM_REVERSE_VIDEO
448 /* this is how we implement reverseVideo */ 452 /* this is how we implement reverseVideo */
449 if (OPTION (Opt_reverseVideo)) 453 if (option (Opt_reverseVideo))
450 ::swap (rs[Rs_color + Color_fg], rs[Rs_color + Color_bg]); 454 ::swap (rs[Rs_color + Color_fg], rs[Rs_color + Color_bg]);
451#endif 455#endif
452 456
453 /* convenient aliases for setting fg/bg to colors */ 457 /* convenient aliases for setting fg/bg to colors */
454 color_aliases (Color_fg); 458 color_aliases (Color_fg);
… …
628 * Initialize the command connection. 632 * Initialize the command connection.
629 * This should be called after the X server connection is established. 633 * This should be called after the X server connection is established.
630 */ 634 */
631 635
632#ifdef META8_OPTION 636#ifdef META8_OPTION
633 meta_char = OPTION (Opt_meta8) ? 0x80 : C0_ESC; 637 meta_char = option (Opt_meta8) ? 0x80 : C0_ESC;
634#endif 638#endif
635 639
636 get_ourmods (); 640 get_ourmods ();
637 641
638 if (!OPTION (Opt_scrollTtyOutput)) 642 if (!option (Opt_scrollTtyOutput))
639 priv_modes |= PrivMode_TtyOutputInh; 643 priv_modes |= PrivMode_TtyOutputInh;
640 if (OPTION (Opt_scrollTtyKeypress)) 644 if (option (Opt_scrollTtyKeypress))
641 priv_modes |= PrivMode_Keypress; 645 priv_modes |= PrivMode_Keypress;
642 if (!OPTION (Opt_jumpScroll)) 646 if (!option (Opt_jumpScroll))
643 priv_modes |= PrivMode_smoothScroll; 647 priv_modes |= PrivMode_smoothScroll;
644 648
645#ifndef NO_BACKSPACE_KEY 649#ifndef NO_BACKSPACE_KEY
646 if (strcmp (key_backspace, "DEC") == 0) 650 if (strcmp (key_backspace, "DEC") == 0)
647 priv_modes |= PrivMode_HaveBackSpace; 651 priv_modes |= PrivMode_HaveBackSpace;
… …
677 rxvt_color xcol; 681 rxvt_color xcol;
678 682
679 if (!set_color (xcol, name)) 683 if (!set_color (xcol, name))
680 { 684 {
681#ifndef XTERM_REVERSE_VIDEO 685#ifndef XTERM_REVERSE_VIDEO
682 if (i < 2 && OPTION (Opt_reverseVideo)) 686 if (i < 2 && option (Opt_reverseVideo))
683 name = def_colorName [1 - i]; 687 name = def_colorName [1 - i];
684 else 688 else
685#endif 689#endif
686 name = def_colorName [i]; 690 name = def_colorName [i];
687 691
… …
894 if (!set_fonts ()) 898 if (!set_fonts ())
895 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n"); 899 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n");
896 900
897 parent = display->root; 901 parent = display->root;
898 902
899 attributes.override_redirect = !!OPTION (Opt_override_redirect); 903 attributes.override_redirect = !!option (Opt_override_redirect);
900 904
901#if ENABLE_FRILLS 905#if ENABLE_FRILLS
902 if (OPTION (Opt_borderLess)) 906 if (option (Opt_borderLess))
903 { 907 {
904 if (XInternAtom (dpy, "_MOTIF_WM_INFO", True) == None) 908 if (XInternAtom (dpy, "_MOTIF_WM_INFO", True) == None)
905 { 909 {
906 /* print_warning("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n");*/ 910 /* print_warning("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n");*/
907 attributes.override_redirect = true; 911 attributes.override_redirect = true;
… …
957 classHint.res_name = (char *)rs[Rs_name]; 961 classHint.res_name = (char *)rs[Rs_name];
958 classHint.res_class = (char *)RESCLASS; 962 classHint.res_class = (char *)RESCLASS;
959 963
960 wmHint.flags = InputHint | StateHint | WindowGroupHint; 964 wmHint.flags = InputHint | StateHint | WindowGroupHint;
961 wmHint.input = True; 965 wmHint.input = True;
962 wmHint.initial_state = OPTION (Opt_iconic) ? IconicState : NormalState; 966 wmHint.initial_state = option (Opt_iconic) ? IconicState : NormalState;
963 wmHint.window_group = top; 967 wmHint.window_group = top;
964 968
965 XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc, 969 XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc,
966 &szHint, &wmHint, &classHint); 970 &szHint, &wmHint, &classHint);
967 971
… …
1024 attributes.bit_gravity = NorthWestGravity; 1028 attributes.bit_gravity = NorthWestGravity;
1025 XChangeWindowAttributes (dpy, vt, CWBitGravity, &attributes); 1029 XChangeWindowAttributes (dpy, vt, CWBitGravity, &attributes);
1026 1030
1027 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask; 1031 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask;
1028 1032
1029 if (OPTION (Opt_pointerBlank)) 1033 if (option (Opt_pointerBlank))
1030 vt_emask |= PointerMotionMask; 1034 vt_emask |= PointerMotionMask;
1031 else 1035 else
1032 vt_emask |= Button1MotionMask | Button3MotionMask; 1036 vt_emask |= Button1MotionMask | Button3MotionMask;
1033 1037
1034 vt_select_input (); 1038 vt_select_input ();
1035 1039
1036 vt_ev.start (display, vt); 1040 vt_ev.start (display, vt);
1037 1041
1038#ifdef XPM_BACKGROUND 1042#ifdef XPM_BACKGROUND
1039 if (rs[Rs_backgroundPixmap] != NULL 1043 if (rs[Rs_backgroundPixmap] != NULL
1044#ifndef HAVE_AFTERIMAGE
1040 && !OPTION (Opt_transparent)) 1045 && !option (Opt_transparent)
1046#endif
1047 )
1041 { 1048 {
1042 const char *p = rs[Rs_backgroundPixmap]; 1049 const char *p = rs[Rs_backgroundPixmap];
1043 1050
1044 if ((p = strchr (p, ';')) != NULL) 1051 if ((p = strchr (p, ';')) != NULL)
1045 { 1052 {
… …
1329 } 1336 }
1330 1337
1331 _exit (EXIT_FAILURE); 1338 _exit (EXIT_FAILURE);
1332 1339
1333 default: 1340 default:
1334 if (!OPTION (Opt_utmpInhibit)) 1341 if (!option (Opt_utmpInhibit))
1335 pty->login (cmd_pid, OPTION (Opt_loginShell), rs[Rs_display_name]); 1342 pty->login (cmd_pid, option (Opt_loginShell), rs[Rs_display_name]);
1336 1343
1337 pty->close_tty (); 1344 pty->close_tty ();
1338 1345
1339 child_ev.start (cmd_pid); 1346 child_ev.start (cmd_pid);
1340 1347
… …
1353int 1360int
1354rxvt_term::run_child (const char *const *argv) 1361rxvt_term::run_child (const char *const *argv)
1355{ 1362{
1356 char *login; 1363 char *login;
1357 1364
1358 if (OPTION (Opt_console)) 1365 if (option (Opt_console))
1359 { /* be virtual console, fail silently */ 1366 { /* be virtual console, fail silently */
1360#ifdef TIOCCONS 1367#ifdef TIOCCONS
1361 unsigned int on = 1; 1368 unsigned int on = 1;
1362 1369
1363 ioctl (STDIN_FILENO, TIOCCONS, &on); 1370 ioctl (STDIN_FILENO, TIOCCONS, &on);
… …
1412 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0') 1419 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0')
1413 shell = "/bin/sh"; 1420 shell = "/bin/sh";
1414 1421
1415 argv0 = (const char *)rxvt_r_basename (shell); 1422 argv0 = (const char *)rxvt_r_basename (shell);
1416 1423
1417 if (OPTION (Opt_loginShell)) 1424 if (option (Opt_loginShell))
1418 { 1425 {
1419 login = (char *)rxvt_malloc ((strlen (argv0) + 2) * sizeof (char)); 1426 login = (char *)rxvt_malloc ((strlen (argv0) + 2) * sizeof (char));
1420 1427
1421 login[0] = '-'; 1428 login[0] = '-';
1422 strcpy (&login[1], argv0); 1429 strcpy (&login[1], argv0);

Diff Legend

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