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.182 by root, Tue May 1 21:30:01 2007 UTC vs.
Revision 1.198 by sasha, Fri Aug 3 05:33:04 2007 UTC

… …
46 COLOR_BACKGROUND, 46 COLOR_BACKGROUND,
47 /* low-intensity colors */ 47 /* low-intensity colors */
48 "rgb:00/00/00", // 0: black (Black) 48 "rgb:00/00/00", // 0: black (Black)
49 "rgb:cd/00/00", // 1: red (Red3) 49 "rgb:cd/00/00", // 1: red (Red3)
50 "rgb:00/cd/00", // 2: green (Green3) 50 "rgb:00/cd/00", // 2: green (Green3)
51 "rgb:cd/cd/00", // 3: ywlloe (Yellow3) 51 "rgb:cd/cd/00", // 3: yellow (Yellow3)
52 "rgb:00/00/cd", // 4: blue (Blue3) 52 "rgb:00/00/cd", // 4: blue (Blue3)
53 "rgb:cd/00/cd", // 5: magenta (Magenta3) 53 "rgb:cd/00/cd", // 5: magenta (Magenta3)
54 "rgb:00/cd/cd", // 6: cyan (Cyan3) 54 "rgb:00/cd/cd", // 6: cyan (Cyan3)
55# ifdef XTERM_COLORS 55# ifdef XTERM_COLORS
56 "rgb:e5/e5/e5", // 7: white (Grey90) 56 "rgb:e5/e5/e5", // 7: white (Grey90)
… …
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#if defined(XPM_BACKGROUND) || defined(ENABLE_TRANSPARENCY)
208#ifdef XPM_BACKGROUND 205#ifdef XPM_BACKGROUND
206 bgPixmap.original_asim = NULL;
207#endif
209 /* bgPixmap.w = bgPixmap.h = 0; */ 208 /* bgPixmap.w = bgPixmap.h = 0; */
210 bgPixmap.x = bgPixmap.y = 0; 209 bgPixmap.x = bgPixmap.y = 0;
211 bgPixmap.pixmap = None; 210 bgPixmap.pixmap = None;
212#endif 211#endif
213 212
214 last_bot = last_state = -1; 213 last_bot = last_state = -1;
215 214
216 set_option (Opt_scrollBar); 215 set_option (Opt_scrollBar);
217 set_option (Opt_scrollTtyOutput); 216 set_option (Opt_scrollTtyOutput);
218 set_option (Opt_jumpScroll); 217 set_option (Opt_jumpScroll);
218 set_option (Opt_skipScroll);
219 set_option (Opt_secondaryScreen); 219 set_option (Opt_secondaryScreen);
220 set_option (Opt_secondaryScroll); 220 set_option (Opt_secondaryScroll);
221 set_option (Opt_pastableTabs); 221 set_option (Opt_pastableTabs);
222 set_option (Opt_intensityStyles); 222 set_option (Opt_intensityStyles);
223 set_option (Opt_iso14755_52);
223 224
224 return true; 225 return true;
225} 226}
226 227
227void 228void
… …
315#if XFT 316#if XFT
316 if (rs[Rs_depth]) 317 if (rs[Rs_depth])
317 select_visual (strtol (rs[Rs_depth], 0, 0)); 318 select_visual (strtol (rs[Rs_depth], 0, 0));
318#endif 319#endif
319 320
321#ifdef HAVE_AFTERIMAGE
322 asv = create_asvisual_for_id (dpy, display->screen, depth, XVisualIDFromVisual (visual), cmap, NULL);
323#endif
320 free (r_argv); 324 free (r_argv);
321 325
322 for (int i = NUM_RESOURCES; i--; ) 326 for (int i = NUM_RESOURCES; i--; )
323 if (rs [i] == resval_undef) 327 if (rs [i] == resval_undef)
324 rs [i] = 0; 328 rs [i] = 0;
… …
878rxvt_term::create_windows (int argc, const char *const *argv) 882rxvt_term::create_windows (int argc, const char *const *argv)
879{ 883{
880 XClassHint classHint; 884 XClassHint classHint;
881 XWMHints wmHint; 885 XWMHints wmHint;
882#if ENABLE_FRILLS 886#if ENABLE_FRILLS
883 MWMHints mwmhints; 887 MWMHints mwmhints = { };
884#endif 888#endif
885 XGCValues gcvalue; 889 XGCValues gcvalue;
886 XSetWindowAttributes attributes; 890 XSetWindowAttributes attributes;
887 Window top, parent; 891 Window top, parent;
888 892
… …
1034 vt_select_input (); 1038 vt_select_input ();
1035 1039
1036 vt_ev.start (display, vt); 1040 vt_ev.start (display, vt);
1037 1041
1038#ifdef XPM_BACKGROUND 1042#ifdef XPM_BACKGROUND
1039 if (rs[Rs_backgroundPixmap] != NULL 1043 if (rs[Rs_backgroundPixmap] != NULL)
1040 && !option (Opt_transparent))
1041 { 1044 {
1042 const char *p = rs[Rs_backgroundPixmap]; 1045 const char *p = rs[Rs_backgroundPixmap];
1043 1046
1044 if ((p = strchr (p, ';')) != NULL) 1047 if ((p = strchr (p, ';')) != NULL)
1045 { 1048 {

Diff Legend

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