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.205 by sasha, Fri Aug 10 22:10:36 2007 UTC

… …
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)
… …
166#endif 166#endif
167#ifdef KEEP_SCROLLCOLOR 167#ifdef KEEP_SCROLLCOLOR
168 COLOR_SCROLLBAR, 168 COLOR_SCROLLBAR,
169 COLOR_SCROLLTROUGH, 169 COLOR_SCROLLTROUGH,
170#endif /* KEEP_SCROLLCOLOR */ 170#endif /* KEEP_SCROLLCOLOR */
171#if TINTING 171#if ENABLE_TRANSPARENCY
172 NULL, 172 NULL,
173#endif 173#endif
174#if OFF_FOCUS_FADING 174#if OFF_FOCUS_FADING
175 "rgb:00/00/00", 175 "rgb:00/00/00",
176#endif 176#endif
… …
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)
189 pixmap = None;
190#endif
191 188
192 MEvent.time = CurrentTime; 189 MEvent.time = CurrentTime;
193 MEvent.button = AnyButton; 190 MEvent.button = AnyButton;
194 options = DEFAULT_OPTIONS;
195 want_refresh = 1; 191 want_refresh = 1;
196 priv_modes = SavedModes = PrivMode_Default; 192 priv_modes = SavedModes = PrivMode_Default;
197 ncol = 80; 193 ncol = 80;
198 nrow = 24; 194 nrow = 24;
199 int_bwidth = INTERNALBORDERWIDTH; 195 int_bwidth = INTERNALBORDERWIDTH;
200 ext_bwidth = EXTERNALBORDERWIDTH; 196 ext_bwidth = EXTERNALBORDERWIDTH;
201 lineSpace = LINESPACE; 197 lineSpace = LINESPACE;
202 saveLines = SAVELINES; 198 saveLines = SAVELINES;
203 numpix_colors = TOTAL_COLORS; 199 numpix_colors = TOTAL_COLORS;
204 200
205 refresh_limit = 1;
206 refresh_type = SLOW_REFRESH; 201 refresh_type = SLOW_REFRESH;
207 202
208 oldcursor.row = oldcursor.col = -1; 203 oldcursor.row = oldcursor.col = -1;
204#ifdef HAVE_BG_PIXMAP
205#ifdef HAVE_AFTERIMAGE
206 bgPixmap.original_asim = NULL;
207#endif
208 /* bgPixmap.w = bgPixmap.h = 0; */
209#ifdef XPM_BACKGROUND 209#ifdef XPM_BACKGROUND
210 /* bgPixmap.w = bgPixmap.h = 0; */
211 bgPixmap.x = bgPixmap.y = 50; 210 bgPixmap.h_scale = bgPixmap.v_scale = 0;
211 bgPixmap.h_align = bgPixmap.v_align = 0;
212#endif
213 bgPixmap.flags = 0;
212 bgPixmap.pixmap = None; 214 bgPixmap.pixmap = None;
213#endif 215#endif
214
215 last_bot = last_state = -1; 216 last_bot = last_state = -1;
217
218 set_option (Opt_scrollBar);
219 set_option (Opt_scrollTtyOutput);
220 set_option (Opt_jumpScroll);
221 set_option (Opt_skipScroll);
222 set_option (Opt_secondaryScreen);
223 set_option (Opt_secondaryScroll);
224 set_option (Opt_pastableTabs);
225 set_option (Opt_intensityStyles);
226 set_option (Opt_iso14755_52);
216 227
217 return true; 228 return true;
218} 229}
219 230
220void 231void
… …
308#if XFT 319#if XFT
309 if (rs[Rs_depth]) 320 if (rs[Rs_depth])
310 select_visual (strtol (rs[Rs_depth], 0, 0)); 321 select_visual (strtol (rs[Rs_depth], 0, 0));
311#endif 322#endif
312 323
324#ifdef HAVE_AFTERIMAGE
325 asv = create_asvisual_for_id (dpy, display->screen, depth, XVisualIDFromVisual (visual), cmap, NULL);
326#endif
313 free (r_argv); 327 free (r_argv);
314 328
315 for (int i = NUM_RESOURCES; i--; ) 329 for (int i = NUM_RESOURCES; i--; )
316 if (rs [i] == resval_undef) 330 if (rs [i] == resval_undef)
317 rs [i] = 0; 331 rs [i] = 0;
… …
421 setup_scrollbar (rs[Rs_scrollBar_align], rs[Rs_scrollstyle], rs[Rs_scrollBar_thickness]); 435 setup_scrollbar (rs[Rs_scrollBar_align], rs[Rs_scrollstyle], rs[Rs_scrollBar_thickness]);
422#endif 436#endif
423 437
424#ifdef XTERM_REVERSE_VIDEO 438#ifdef XTERM_REVERSE_VIDEO
425 /* this is how xterm implements reverseVideo */ 439 /* this is how xterm implements reverseVideo */
426 if (OPTION (Opt_reverseVideo)) 440 if (option (Opt_reverseVideo))
427 { 441 {
428 if (!rs[Rs_color + Color_fg]) 442 if (!rs[Rs_color + Color_fg])
429 rs[Rs_color + Color_fg] = def_colorName[Color_bg]; 443 rs[Rs_color + Color_fg] = def_colorName[Color_bg];
430 444
431 if (!rs[Rs_color + Color_bg]) 445 if (!rs[Rs_color + Color_bg])
… …
437 if (!rs[Rs_color + i]) 451 if (!rs[Rs_color + i])
438 rs[Rs_color + i] = def_colorName[i]; 452 rs[Rs_color + i] = def_colorName[i];
439 453
440#ifndef XTERM_REVERSE_VIDEO 454#ifndef XTERM_REVERSE_VIDEO
441 /* this is how we implement reverseVideo */ 455 /* this is how we implement reverseVideo */
442 if (OPTION (Opt_reverseVideo)) 456 if (option (Opt_reverseVideo))
443 ::swap (rs[Rs_color + Color_fg], rs[Rs_color + Color_bg]); 457 ::swap (rs[Rs_color + Color_fg], rs[Rs_color + Color_bg]);
444#endif 458#endif
445 459
446 /* convenient aliases for setting fg/bg to colors */ 460 /* convenient aliases for setting fg/bg to colors */
447 color_aliases (Color_fg); 461 color_aliases (Color_fg);
… …
621 * Initialize the command connection. 635 * Initialize the command connection.
622 * This should be called after the X server connection is established. 636 * This should be called after the X server connection is established.
623 */ 637 */
624 638
625#ifdef META8_OPTION 639#ifdef META8_OPTION
626 meta_char = OPTION (Opt_meta8) ? 0x80 : C0_ESC; 640 meta_char = option (Opt_meta8) ? 0x80 : C0_ESC;
627#endif 641#endif
628 642
629 get_ourmods (); 643 get_ourmods ();
630 644
631 if (!OPTION (Opt_scrollTtyOutput)) 645 if (!option (Opt_scrollTtyOutput))
632 priv_modes |= PrivMode_TtyOutputInh; 646 priv_modes |= PrivMode_TtyOutputInh;
633 if (OPTION (Opt_scrollTtyKeypress)) 647 if (option (Opt_scrollTtyKeypress))
634 priv_modes |= PrivMode_Keypress; 648 priv_modes |= PrivMode_Keypress;
635 if (!OPTION (Opt_jumpScroll)) 649 if (!option (Opt_jumpScroll))
636 priv_modes |= PrivMode_smoothScroll; 650 priv_modes |= PrivMode_smoothScroll;
637 651
638#ifndef NO_BACKSPACE_KEY 652#ifndef NO_BACKSPACE_KEY
639 if (strcmp (key_backspace, "DEC") == 0) 653 if (strcmp (key_backspace, "DEC") == 0)
640 priv_modes |= PrivMode_HaveBackSpace; 654 priv_modes |= PrivMode_HaveBackSpace;
… …
670 rxvt_color xcol; 684 rxvt_color xcol;
671 685
672 if (!set_color (xcol, name)) 686 if (!set_color (xcol, name))
673 { 687 {
674#ifndef XTERM_REVERSE_VIDEO 688#ifndef XTERM_REVERSE_VIDEO
675 if (i < 2 && OPTION (Opt_reverseVideo)) 689 if (i < 2 && option (Opt_reverseVideo))
676 name = def_colorName [1 - i]; 690 name = def_colorName [1 - i];
677 else 691 else
678#endif 692#endif
679 name = def_colorName [i]; 693 name = def_colorName [i];
680 694
… …
871rxvt_term::create_windows (int argc, const char *const *argv) 885rxvt_term::create_windows (int argc, const char *const *argv)
872{ 886{
873 XClassHint classHint; 887 XClassHint classHint;
874 XWMHints wmHint; 888 XWMHints wmHint;
875#if ENABLE_FRILLS 889#if ENABLE_FRILLS
876 MWMHints mwmhints; 890 MWMHints mwmhints = { };
877#endif 891#endif
878 XGCValues gcvalue; 892 XGCValues gcvalue;
879 XSetWindowAttributes attributes; 893 XSetWindowAttributes attributes;
880 Window top, parent; 894 Window top, parent;
881 895
… …
887 if (!set_fonts ()) 901 if (!set_fonts ())
888 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n"); 902 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n");
889 903
890 parent = display->root; 904 parent = display->root;
891 905
892 attributes.override_redirect = !!OPTION (Opt_override_redirect); 906 attributes.override_redirect = !!option (Opt_override_redirect);
893 907
894#if ENABLE_FRILLS 908#if ENABLE_FRILLS
895 if (OPTION (Opt_borderLess)) 909 if (option (Opt_borderLess))
896 { 910 {
897 if (XInternAtom (dpy, "_MOTIF_WM_INFO", True) == None) 911 if (XInternAtom (dpy, "_MOTIF_WM_INFO", True) == None)
898 { 912 {
899 /* print_warning("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n");*/ 913 /* print_warning("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n");*/
900 attributes.override_redirect = true; 914 attributes.override_redirect = true;
… …
950 classHint.res_name = (char *)rs[Rs_name]; 964 classHint.res_name = (char *)rs[Rs_name];
951 classHint.res_class = (char *)RESCLASS; 965 classHint.res_class = (char *)RESCLASS;
952 966
953 wmHint.flags = InputHint | StateHint | WindowGroupHint; 967 wmHint.flags = InputHint | StateHint | WindowGroupHint;
954 wmHint.input = True; 968 wmHint.input = True;
955 wmHint.initial_state = OPTION (Opt_iconic) ? IconicState : NormalState; 969 wmHint.initial_state = option (Opt_iconic) ? IconicState : NormalState;
956 wmHint.window_group = top; 970 wmHint.window_group = top;
957 971
958 XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc, 972 XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc,
959 &szHint, &wmHint, &classHint); 973 &szHint, &wmHint, &classHint);
960 974
… …
1017 attributes.bit_gravity = NorthWestGravity; 1031 attributes.bit_gravity = NorthWestGravity;
1018 XChangeWindowAttributes (dpy, vt, CWBitGravity, &attributes); 1032 XChangeWindowAttributes (dpy, vt, CWBitGravity, &attributes);
1019 1033
1020 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask; 1034 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask;
1021 1035
1022 if (OPTION (Opt_pointerBlank)) 1036 if (option (Opt_pointerBlank))
1023 vt_emask |= PointerMotionMask; 1037 vt_emask |= PointerMotionMask;
1024 else 1038 else
1025 vt_emask |= Button1MotionMask | Button3MotionMask; 1039 vt_emask |= Button1MotionMask | Button3MotionMask;
1026 1040
1027 vt_select_input (); 1041 vt_select_input ();
1028 1042
1029 vt_ev.start (display, vt); 1043 vt_ev.start (display, vt);
1030
1031#ifdef XPM_BACKGROUND
1032 if (rs[Rs_backgroundPixmap] != NULL
1033 && !OPTION (Opt_transparent))
1034 {
1035 const char *p = rs[Rs_backgroundPixmap];
1036
1037 if ((p = strchr (p, ';')) != NULL)
1038 {
1039 p++;
1040 scale_pixmap (p);
1041 }
1042
1043 set_bgPixmap (rs[Rs_backgroundPixmap]);
1044 scr_touch (true);
1045 }
1046#endif
1047 1044
1048 /* graphics context for the vt window */ 1045 /* graphics context for the vt window */
1049 gcvalue.foreground = pix_colors[Color_fg]; 1046 gcvalue.foreground = pix_colors[Color_fg];
1050 gcvalue.background = pix_colors[Color_bg]; 1047 gcvalue.background = pix_colors[Color_bg];
1051 gcvalue.graphics_exposures = 0; 1048 gcvalue.graphics_exposures = 0;
… …
1322 } 1319 }
1323 1320
1324 _exit (EXIT_FAILURE); 1321 _exit (EXIT_FAILURE);
1325 1322
1326 default: 1323 default:
1327 if (!OPTION (Opt_utmpInhibit)) 1324 if (!option (Opt_utmpInhibit))
1328 pty->login (cmd_pid, OPTION (Opt_loginShell), rs[Rs_display_name]); 1325 pty->login (cmd_pid, option (Opt_loginShell), rs[Rs_display_name]);
1329 1326
1330 pty->close_tty (); 1327 pty->close_tty ();
1331 1328
1332 child_ev.start (cmd_pid); 1329 child_ev.start (cmd_pid);
1333 1330
… …
1346int 1343int
1347rxvt_term::run_child (const char *const *argv) 1344rxvt_term::run_child (const char *const *argv)
1348{ 1345{
1349 char *login; 1346 char *login;
1350 1347
1351 if (OPTION (Opt_console)) 1348 if (option (Opt_console))
1352 { /* be virtual console, fail silently */ 1349 { /* be virtual console, fail silently */
1353#ifdef TIOCCONS 1350#ifdef TIOCCONS
1354 unsigned int on = 1; 1351 unsigned int on = 1;
1355 1352
1356 ioctl (STDIN_FILENO, TIOCCONS, &on); 1353 ioctl (STDIN_FILENO, TIOCCONS, &on);
… …
1405 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0') 1402 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0')
1406 shell = "/bin/sh"; 1403 shell = "/bin/sh";
1407 1404
1408 argv0 = (const char *)rxvt_r_basename (shell); 1405 argv0 = (const char *)rxvt_r_basename (shell);
1409 1406
1410 if (OPTION (Opt_loginShell)) 1407 if (option (Opt_loginShell))
1411 { 1408 {
1412 login = (char *)rxvt_malloc ((strlen (argv0) + 2) * sizeof (char)); 1409 login = (char *)rxvt_malloc ((strlen (argv0) + 2) * sizeof (char));
1413 1410
1414 login[0] = '-'; 1411 login[0] = '-';
1415 strcpy (&login[1], argv0); 1412 strcpy (&login[1], argv0);

Diff Legend

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