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.186 by ayin, Sat Jun 9 09:05:38 2007 UTC vs.
Revision 1.205 by sasha, Fri Aug 10 22:10:36 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
213
214 last_bot = last_state = -1; 216 last_bot = last_state = -1;
215 217
216 set_option (Opt_scrollBar); 218 set_option (Opt_scrollBar);
217 set_option (Opt_scrollTtyOutput); 219 set_option (Opt_scrollTtyOutput);
218 set_option (Opt_jumpScroll); 220 set_option (Opt_jumpScroll);
221 set_option (Opt_skipScroll);
219 set_option (Opt_secondaryScreen); 222 set_option (Opt_secondaryScreen);
220 set_option (Opt_secondaryScroll); 223 set_option (Opt_secondaryScroll);
221 set_option (Opt_pastableTabs); 224 set_option (Opt_pastableTabs);
222 set_option (Opt_intensityStyles); 225 set_option (Opt_intensityStyles);
223 set_option (Opt_iso14755_52); 226 set_option (Opt_iso14755_52);
… …
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;
… …
879rxvt_term::create_windows (int argc, const char *const *argv) 885rxvt_term::create_windows (int argc, const char *const *argv)
880{ 886{
881 XClassHint classHint; 887 XClassHint classHint;
882 XWMHints wmHint; 888 XWMHints wmHint;
883#if ENABLE_FRILLS 889#if ENABLE_FRILLS
884 MWMHints mwmhints; 890 MWMHints mwmhints = { };
885#endif 891#endif
886 XGCValues gcvalue; 892 XGCValues gcvalue;
887 XSetWindowAttributes attributes; 893 XSetWindowAttributes attributes;
888 Window top, parent; 894 Window top, parent;
889 895
… …
1033 vt_emask |= Button1MotionMask | Button3MotionMask; 1039 vt_emask |= Button1MotionMask | Button3MotionMask;
1034 1040
1035 vt_select_input (); 1041 vt_select_input ();
1036 1042
1037 vt_ev.start (display, vt); 1043 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 1044
1059 /* graphics context for the vt window */ 1045 /* graphics context for the vt window */
1060 gcvalue.foreground = pix_colors[Color_fg]; 1046 gcvalue.foreground = pix_colors[Color_fg];
1061 gcvalue.background = pix_colors[Color_bg]; 1047 gcvalue.background = pix_colors[Color_bg];
1062 gcvalue.graphics_exposures = 0; 1048 gcvalue.graphics_exposures = 0;

Diff Legend

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