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.184 by sasha, Fri Jun 8 20:04:12 2007 UTC vs.
Revision 1.203 by sasha, Wed Aug 8 22:39:49 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;
… …
199 ext_bwidth = EXTERNALBORDERWIDTH; 196 ext_bwidth = EXTERNALBORDERWIDTH;
200 lineSpace = LINESPACE; 197 lineSpace = LINESPACE;
201 saveLines = SAVELINES; 198 saveLines = SAVELINES;
202 numpix_colors = TOTAL_COLORS; 199 numpix_colors = TOTAL_COLORS;
203 200
204 refresh_limit = 1;
205 refresh_type = SLOW_REFRESH; 201 refresh_type = SLOW_REFRESH;
206 202
207 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; */
208#ifdef XPM_BACKGROUND 209#ifdef XPM_BACKGROUND
209 /* bgPixmap.w = bgPixmap.h = 0; */
210 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;
211 bgPixmap.pixmap = None; 214 bgPixmap.pixmap = None;
212#endif 215#endif
216 bgPixmap.set_target (this);
213 217
214 last_bot = last_state = -1; 218 last_bot = last_state = -1;
215 219
216 set_option (Opt_scrollBar); 220 set_option (Opt_scrollBar);
217 set_option (Opt_scrollTtyOutput); 221 set_option (Opt_scrollTtyOutput);
218 set_option (Opt_jumpScroll); 222 set_option (Opt_jumpScroll);
223 set_option (Opt_skipScroll);
219 set_option (Opt_secondaryScreen); 224 set_option (Opt_secondaryScreen);
220 set_option (Opt_secondaryScroll); 225 set_option (Opt_secondaryScroll);
221 set_option (Opt_pastableTabs); 226 set_option (Opt_pastableTabs);
222 set_option (Opt_intensityStyles); 227 set_option (Opt_intensityStyles);
228 set_option (Opt_iso14755_52);
223 229
224 return true; 230 return true;
225} 231}
226 232
227void 233void
… …
315#if XFT 321#if XFT
316 if (rs[Rs_depth]) 322 if (rs[Rs_depth])
317 select_visual (strtol (rs[Rs_depth], 0, 0)); 323 select_visual (strtol (rs[Rs_depth], 0, 0));
318#endif 324#endif
319 325
326#ifdef HAVE_AFTERIMAGE
327 asv = create_asvisual_for_id (dpy, display->screen, depth, XVisualIDFromVisual (visual), cmap, NULL);
328#endif
320 free (r_argv); 329 free (r_argv);
321 330
322 for (int i = NUM_RESOURCES; i--; ) 331 for (int i = NUM_RESOURCES; i--; )
323 if (rs [i] == resval_undef) 332 if (rs [i] == resval_undef)
324 rs [i] = 0; 333 rs [i] = 0;
… …
878rxvt_term::create_windows (int argc, const char *const *argv) 887rxvt_term::create_windows (int argc, const char *const *argv)
879{ 888{
880 XClassHint classHint; 889 XClassHint classHint;
881 XWMHints wmHint; 890 XWMHints wmHint;
882#if ENABLE_FRILLS 891#if ENABLE_FRILLS
883 MWMHints mwmhints; 892 MWMHints mwmhints = { };
884#endif 893#endif
885 XGCValues gcvalue; 894 XGCValues gcvalue;
886 XSetWindowAttributes attributes; 895 XSetWindowAttributes attributes;
887 Window top, parent; 896 Window top, parent;
888 897
… …
1034 vt_select_input (); 1043 vt_select_input ();
1035 1044
1036 vt_ev.start (display, vt); 1045 vt_ev.start (display, vt);
1037 1046
1038#ifdef XPM_BACKGROUND 1047#ifdef XPM_BACKGROUND
1039 if (rs[Rs_backgroundPixmap] != NULL 1048 if (rs[Rs_backgroundPixmap] != NULL)
1040#ifndef HAVE_AFTERIMAGE
1041 && !OPTION (Opt_transparent)
1042#endif
1043 )
1044 { 1049 {
1045 const char *p = rs[Rs_backgroundPixmap]; 1050 const char *p = rs[Rs_backgroundPixmap];
1046 1051
1047 if ((p = strchr (p, ';')) != NULL) 1052 if ((p = strchr (p, ';')) != NULL)
1048 { 1053 {
1049 p++; 1054 p++;
1050 scale_pixmap (p); 1055 bgPixmap.handle_geometry (p);
1051 } 1056 }
1057 else
1058 bgPixmap.set_defaultGeometry ();
1052 1059
1053 set_bgPixmap (rs[Rs_backgroundPixmap]); 1060 set_bgPixmap (rs[Rs_backgroundPixmap]);
1054 scr_touch (true); 1061 scr_touch (true);
1055 } 1062 }
1056#endif 1063#endif

Diff Legend

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