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.189 by root, Tue Jun 26 00:40:18 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(ENABLE_TRANSPARENCY)
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);
… …
316#if XFT 319#if XFT
317 if (rs[Rs_depth]) 320 if (rs[Rs_depth])
318 select_visual (strtol (rs[Rs_depth], 0, 0)); 321 select_visual (strtol (rs[Rs_depth], 0, 0));
319#endif 322#endif
320 323
324#ifdef HAVE_AFTERIMAGE
325 asv = create_asvisual_for_id (dpy, display->screen, depth, XVisualIDFromVisual (visual), cmap, NULL);
326#endif
321 free (r_argv); 327 free (r_argv);
322 328
323 for (int i = NUM_RESOURCES; i--; ) 329 for (int i = NUM_RESOURCES; i--; )
324 if (rs [i] == resval_undef) 330 if (rs [i] == resval_undef)
325 rs [i] = 0; 331 rs [i] = 0;
… …
476/*----------------------------------------------------------------------*/ 482/*----------------------------------------------------------------------*/
477void 483void
478rxvt_term::init_env () 484rxvt_term::init_env ()
479{ 485{
480 int i; 486 int i;
481 unsigned int u;
482 char *val; 487 char *val;
483 488
484#ifdef DISPLAY_IS_IP 489#ifdef DISPLAY_IS_IP
485 /* Fixup display_name for export over pty to any interested terminal 490 /* Fixup display_name for export over pty to any interested terminal
486 * 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
… …
501 506
502 if (rs[Rs_display_name] == NULL) 507 if (rs[Rs_display_name] == NULL)
503 rs[Rs_display_name] = val; /* use broken `:0' value */ 508 rs[Rs_display_name] = val; /* use broken `:0' value */
504 509
505 i = strlen (val); 510 i = strlen (val);
506 env_display = (char *)rxvt_malloc ((i + 9) * sizeof (char)); 511 env_display = (char *)rxvt_malloc (i + 9);
507 512
508 sprintf (env_display, "DISPLAY=%s", val); 513 sprintf (env_display, "DISPLAY=%s", val);
509 514
510 sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent[0]); 515 sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent[0]);
511 516
… …
532 else 537 else
533 putenv ("COLORTERM=" COLORTERMENVFULL); 538 putenv ("COLORTERM=" COLORTERMENVFULL);
534 539
535 if (rs[Rs_term_name] != NULL) 540 if (rs[Rs_term_name] != NULL)
536 { 541 {
537 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);
538 sprintf (env_term, "TERM=%s", rs[Rs_term_name]); 543 sprintf (env_term, "TERM=%s", rs[Rs_term_name]);
539 putenv (env_term); 544 putenv (env_term);
540 } 545 }
541 else 546 else
542 putenv ("TERM=" TERMENV); 547 putenv ("TERM=" TERMENV);
… …
879rxvt_term::create_windows (int argc, const char *const *argv) 884rxvt_term::create_windows (int argc, const char *const *argv)
880{ 885{
881 XClassHint classHint; 886 XClassHint classHint;
882 XWMHints wmHint; 887 XWMHints wmHint;
883#if ENABLE_FRILLS 888#if ENABLE_FRILLS
884 MWMHints mwmhints; 889 MWMHints mwmhints = { };
885#endif 890#endif
886 XGCValues gcvalue; 891 XGCValues gcvalue;
887 XSetWindowAttributes attributes; 892 XSetWindowAttributes attributes;
888 Window top, parent; 893 Window top, parent;
889 894
… …
902#if ENABLE_FRILLS 907#if ENABLE_FRILLS
903 if (option (Opt_borderLess)) 908 if (option (Opt_borderLess))
904 { 909 {
905 if (XInternAtom (dpy, "_MOTIF_WM_INFO", True) == None) 910 if (XInternAtom (dpy, "_MOTIF_WM_INFO", True) == None)
906 { 911 {
907 /* 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");
908 attributes.override_redirect = true; 913 attributes.override_redirect = true;
909 mwmhints.flags = 0;
910 } 914 }
911 else 915 else
912 { 916 {
913 mwmhints.flags = MWM_HINTS_DECORATIONS; 917 mwmhints.flags = MWM_HINTS_DECORATIONS;
914 mwmhints.decorations = 0;
915 } 918 }
916 } 919 }
917 else
918 mwmhints.flags = 0;
919#endif 920#endif
920 921
921#if ENABLE_XEMBED 922#if ENABLE_XEMBED
922 if (rs[Rs_embed]) 923 if (rs[Rs_embed])
923 { 924 {
… …
1033 vt_emask |= Button1MotionMask | Button3MotionMask; 1034 vt_emask |= Button1MotionMask | Button3MotionMask;
1034 1035
1035 vt_select_input (); 1036 vt_select_input ();
1036 1037
1037 vt_ev.start (display, vt); 1038 vt_ev.start (display, vt);
1038
1039#ifdef XPM_BACKGROUND
1040 if (rs[Rs_backgroundPixmap] != NULL
1041#ifndef HAVE_AFTERIMAGE
1042 && !option (Opt_transparent)
1043#endif
1044 )
1045 {
1046 const char *p = rs[Rs_backgroundPixmap];
1047
1048 if ((p = strchr (p, ';')) != NULL)
1049 {
1050 p++;
1051 scale_pixmap (p);
1052 }
1053
1054 set_bgPixmap (rs[Rs_backgroundPixmap]);
1055 scr_touch (true);
1056 }
1057#endif
1058 1039
1059 /* graphics context for the vt window */ 1040 /* graphics context for the vt window */
1060 gcvalue.foreground = pix_colors[Color_fg]; 1041 gcvalue.foreground = pix_colors[Color_fg];
1061 gcvalue.background = pix_colors[Color_bg]; 1042 gcvalue.background = pix_colors[Color_bg];
1062 gcvalue.graphics_exposures = 0; 1043 gcvalue.graphics_exposures = 0;
… …
1418 1399
1419 argv0 = (const char *)rxvt_r_basename (shell); 1400 argv0 = (const char *)rxvt_r_basename (shell);
1420 1401
1421 if (option (Opt_loginShell)) 1402 if (option (Opt_loginShell))
1422 { 1403 {
1423 login = (char *)rxvt_malloc ((strlen (argv0) + 2) * sizeof (char)); 1404 login = (char *)rxvt_malloc (strlen (argv0) + 2);
1424 1405
1425 login[0] = '-'; 1406 login[0] = '-';
1426 strcpy (&login[1], argv0); 1407 strcpy (&login[1], argv0);
1427 argv0 = login; 1408 argv0 = login;
1428 } 1409 }

Diff Legend

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