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.193 by root, Tue Jul 24 14:40:41 2007 UTC vs.
Revision 1.197 by ayin, Thu Aug 2 15:01:30 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>
317 if (rs[Rs_depth]) 317 if (rs[Rs_depth])
318 select_visual (strtol (rs[Rs_depth], 0, 0)); 318 select_visual (strtol (rs[Rs_depth], 0, 0));
319#endif 319#endif
320 320
321#ifdef HAVE_AFTERIMAGE 321#ifdef HAVE_AFTERIMAGE
322 //TODO: why set it to 0 and then to dpy?
323 ::dpy = NULL; /* init global var from libAfter... */
324 asv = AFTERIMAGE_DPY_OP (create_asvisual_for_id (dpy, display->screen, depth, XVisualIDFromVisual (visual), cmap, NULL)); 322 asv = create_asvisual_for_id (dpy, display->screen, depth, XVisualIDFromVisual (visual), cmap, NULL);
325#endif 323#endif
326 free (r_argv); 324 free (r_argv);
327 325
328 for (int i = NUM_RESOURCES; i--; ) 326 for (int i = NUM_RESOURCES; i--; )
329 if (rs [i] == resval_undef) 327 if (rs [i] == resval_undef)
884rxvt_term::create_windows (int argc, const char *const *argv) 882rxvt_term::create_windows (int argc, const char *const *argv)
885{ 883{
886 XClassHint classHint; 884 XClassHint classHint;
887 XWMHints wmHint; 885 XWMHints wmHint;
888#if ENABLE_FRILLS 886#if ENABLE_FRILLS
889 MWMHints mwmhints; 887 MWMHints mwmhints = { };
890#endif 888#endif
891 XGCValues gcvalue; 889 XGCValues gcvalue;
892 XSetWindowAttributes attributes; 890 XSetWindowAttributes attributes;
893 Window top, parent; 891 Window top, parent;
894 892
1040 vt_select_input (); 1038 vt_select_input ();
1041 1039
1042 vt_ev.start (display, vt); 1040 vt_ev.start (display, vt);
1043 1041
1044#ifdef XPM_BACKGROUND 1042#ifdef XPM_BACKGROUND
1045 if (rs[Rs_backgroundPixmap] != NULL 1043 if (rs[Rs_backgroundPixmap] != NULL)
1046#ifndef HAVE_AFTERIMAGE
1047 && !option (Opt_transparent)
1048#endif
1049 )
1050 { 1044 {
1051 const char *p = rs[Rs_backgroundPixmap]; 1045 const char *p = rs[Rs_backgroundPixmap];
1052 1046
1053 if ((p = strchr (p, ';')) != NULL) 1047 if ((p = strchr (p, ';')) != NULL)
1054 { 1048 {

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines