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.187 by root, Mon Jun 18 12:53:26 2007 UTC vs.
Revision 1.208 by ayin, Mon Sep 3 08:48:00 2007 UTC

… …
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 want_refresh = 1; 191 want_refresh = 1;
195 priv_modes = SavedModes = PrivMode_Default; 192 priv_modes = SavedModes = PrivMode_Default;
… …
202 numpix_colors = TOTAL_COLORS; 199 numpix_colors = TOTAL_COLORS;
203 200
204 refresh_type = SLOW_REFRESH; 201 refresh_type = SLOW_REFRESH;
205 202
206 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; */
207#ifdef XPM_BACKGROUND 209#ifdef XPM_BACKGROUND
208 /* bgPixmap.w = bgPixmap.h = 0; */
209 bgPixmap.x = bgPixmap.y = 0; 210 bgPixmap.h_scale = bgPixmap.v_scale = 0;
211 bgPixmap.h_align = bgPixmap.v_align = 0;
212#endif
213 bgPixmap.flags = 0;
210 bgPixmap.pixmap = None; 214 bgPixmap.pixmap = None;
211#endif 215#endif
212
213 last_bot = last_state = -1; 216 last_bot = last_state = -1;
214 217
215 set_option (Opt_scrollBar); 218 set_option (Opt_scrollBar);
216 set_option (Opt_scrollTtyOutput); 219 set_option (Opt_scrollTtyOutput);
217 set_option (Opt_jumpScroll); 220 set_option (Opt_jumpScroll);
221 set_option (Opt_skipScroll);
218 set_option (Opt_secondaryScreen); 222 set_option (Opt_secondaryScreen);
219 set_option (Opt_secondaryScroll); 223 set_option (Opt_secondaryScroll);
220 set_option (Opt_pastableTabs); 224 set_option (Opt_pastableTabs);
221 set_option (Opt_intensityStyles); 225 set_option (Opt_intensityStyles);
222 set_option (Opt_iso14755_52); 226 set_option (Opt_iso14755_52);
… …
315#if XFT 319#if XFT
316 if (rs[Rs_depth]) 320 if (rs[Rs_depth])
317 select_visual (strtol (rs[Rs_depth], 0, 0)); 321 select_visual (strtol (rs[Rs_depth], 0, 0));
318#endif 322#endif
319 323
324#ifdef HAVE_AFTERIMAGE
325 asv = create_asvisual_for_id (dpy, display->screen, depth, XVisualIDFromVisual (visual), cmap, NULL);
326#endif
320 free (r_argv); 327 free (r_argv);
321 328
322 for (int i = NUM_RESOURCES; i--; ) 329 for (int i = NUM_RESOURCES; i--; )
323 if (rs [i] == resval_undef) 330 if (rs [i] == resval_undef)
324 rs [i] = 0; 331 rs [i] = 0;
… …
475/*----------------------------------------------------------------------*/ 482/*----------------------------------------------------------------------*/
476void 483void
477rxvt_term::init_env () 484rxvt_term::init_env ()
478{ 485{
479 int i; 486 int i;
480 unsigned int u;
481 char *val; 487 char *val;
482 488
483#ifdef DISPLAY_IS_IP 489#ifdef DISPLAY_IS_IP
484 /* Fixup display_name for export over pty to any interested terminal 490 /* Fixup display_name for export over pty to any interested terminal
485 * clients via "ESC[7n" (e.g. shells). Note we use the pure IP number 491 * clients via "ESC[7n" (e.g. shells). Note we use the pure IP number
… …
500 506
501 if (rs[Rs_display_name] == NULL) 507 if (rs[Rs_display_name] == NULL)
502 rs[Rs_display_name] = val; /* use broken `:0' value */ 508 rs[Rs_display_name] = val; /* use broken `:0' value */
503 509
504 i = strlen (val); 510 i = strlen (val);
505 env_display = (char *)rxvt_malloc ((i + 9) * sizeof (char)); 511 env_display = (char *)rxvt_malloc (i + 9);
506 512
507 sprintf (env_display, "DISPLAY=%s", val); 513 sprintf (env_display, "DISPLAY=%s", val);
508 514
509 sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent[0]); 515 sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent[0]);
510 516
… …
531 else 537 else
532 putenv ("COLORTERM=" COLORTERMENVFULL); 538 putenv ("COLORTERM=" COLORTERMENVFULL);
533 539
534 if (rs[Rs_term_name] != NULL) 540 if (rs[Rs_term_name] != NULL)
535 { 541 {
536 env_term = (char *)rxvt_malloc ((strlen (rs[Rs_term_name]) + 6) * sizeof (char)); 542 env_term = (char *)rxvt_malloc (strlen (rs[Rs_term_name]) + 6);
537 sprintf (env_term, "TERM=%s", rs[Rs_term_name]); 543 sprintf (env_term, "TERM=%s", rs[Rs_term_name]);
538 putenv (env_term); 544 putenv (env_term);
539 } 545 }
540 else 546 else
541 putenv ("TERM=" TERMENV); 547 putenv ("TERM=" TERMENV);
… …
878rxvt_term::create_windows (int argc, const char *const *argv) 884rxvt_term::create_windows (int argc, const char *const *argv)
879{ 885{
880 XClassHint classHint; 886 XClassHint classHint;
881 XWMHints wmHint; 887 XWMHints wmHint;
882#if ENABLE_FRILLS 888#if ENABLE_FRILLS
883 MWMHints mwmhints; 889 MWMHints mwmhints = { };
884#endif 890#endif
885 XGCValues gcvalue; 891 XGCValues gcvalue;
886 XSetWindowAttributes attributes; 892 XSetWindowAttributes attributes;
887 Window top, parent; 893 Window top, parent;
888 894
… …
901#if ENABLE_FRILLS 907#if ENABLE_FRILLS
902 if (option (Opt_borderLess)) 908 if (option (Opt_borderLess))
903 { 909 {
904 if (XInternAtom (dpy, "_MOTIF_WM_INFO", True) == None) 910 if (XInternAtom (dpy, "_MOTIF_WM_INFO", True) == None)
905 { 911 {
906 /* print_warning("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n");*/ 912 // rxvt_warn("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n");
907 attributes.override_redirect = true; 913 attributes.override_redirect = true;
908 mwmhints.flags = 0;
909 } 914 }
910 else 915 else
911 { 916 {
912 mwmhints.flags = MWM_HINTS_DECORATIONS; 917 mwmhints.flags = MWM_HINTS_DECORATIONS;
913 mwmhints.decorations = 0;
914 } 918 }
915 } 919 }
916 else
917 mwmhints.flags = 0;
918#endif 920#endif
919 921
920#if ENABLE_XEMBED 922#if ENABLE_XEMBED
921 if (rs[Rs_embed]) 923 if (rs[Rs_embed])
922 { 924 {
… …
1032 vt_emask |= Button1MotionMask | Button3MotionMask; 1034 vt_emask |= Button1MotionMask | Button3MotionMask;
1033 1035
1034 vt_select_input (); 1036 vt_select_input ();
1035 1037
1036 vt_ev.start (display, vt); 1038 vt_ev.start (display, vt);
1037
1038#ifdef XPM_BACKGROUND
1039 if (rs[Rs_backgroundPixmap] != NULL
1040#ifndef HAVE_AFTERIMAGE
1041 && !option (Opt_transparent)
1042#endif
1043 )
1044 {
1045 const char *p = rs[Rs_backgroundPixmap];
1046
1047 if ((p = strchr (p, ';')) != NULL)
1048 {
1049 p++;
1050 scale_pixmap (p);
1051 }
1052
1053 set_bgPixmap (rs[Rs_backgroundPixmap]);
1054 scr_touch (true);
1055 }
1056#endif
1057 1039
1058 /* graphics context for the vt window */ 1040 /* graphics context for the vt window */
1059 gcvalue.foreground = pix_colors[Color_fg]; 1041 gcvalue.foreground = pix_colors[Color_fg];
1060 gcvalue.background = pix_colors[Color_bg]; 1042 gcvalue.background = pix_colors[Color_bg];
1061 gcvalue.graphics_exposures = 0; 1043 gcvalue.graphics_exposures = 0;
… …
1417 1399
1418 argv0 = (const char *)rxvt_r_basename (shell); 1400 argv0 = (const char *)rxvt_r_basename (shell);
1419 1401
1420 if (option (Opt_loginShell)) 1402 if (option (Opt_loginShell))
1421 { 1403 {
1422 login = (char *)rxvt_malloc ((strlen (argv0) + 2) * sizeof (char)); 1404 login = (char *)rxvt_malloc (strlen (argv0) + 2);
1423 1405
1424 login[0] = '-'; 1406 login[0] = '-';
1425 strcpy (&login[1], argv0); 1407 strcpy (&login[1], argv0);
1426 argv0 = login; 1408 argv0 = login;
1427 } 1409 }

Diff Legend

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