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.169 by root, Thu Feb 2 18:04:46 2006 UTC vs.
Revision 1.174 by root, Wed Jul 5 22:46:14 2006 UTC

1/*--------------------------------*-C-*---------------------------------* 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>
… …
258 int i, r_argc; 258 int i, r_argc;
259 char *val; 259 char *val;
260 const char **cmd_argv, **r_argv; 260 const char **cmd_argv, **r_argv;
261 261
262 /* 262 /*
263 * Look for -exec option. Find => split and make cmd_argv[] of command args 263 * Look for -e option. Find => split and make cmd_argv[] of command args
264 */ 264 */
265 for (r_argc = 0; r_argc < argc; r_argc++) 265 for (r_argc = 0; r_argc < argc; r_argc++)
266 if (!strcmp (argv[r_argc], "-e") || !strcmp (argv[r_argc], "-exec")) 266 if (!strcmp (argv[r_argc], "-e"))
267 break; 267 break;
268 268
269 r_argv = (const char **)rxvt_malloc (sizeof (char *) * (r_argc + 1)); 269 r_argv = (const char **)rxvt_malloc (sizeof (char *) * (r_argc + 1));
270 270
271 for (i = 0; i < r_argc; i++) 271 for (i = 0; i < r_argc; i++)
… …
300 rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]); 300 rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]);
301 301
302 // using a local pointer decreases code size a lot 302 // using a local pointer decreases code size a lot
303 xa = display->xa; 303 xa = display->xa;
304 304
305 set (display);
306 extract_resources ();
307
305#if XFT 308#if XFT
306 if (rs[Rs_depth]) 309 if (rs[Rs_depth])
307 set (display, strtol (rs[Rs_depth], 0, 0)); 310 select_visual (strtol (rs[Rs_depth], 0, 0));
308 else
309#endif 311#endif
310 set (display);
311
312 extract_resources ();
313 312
314 free (r_argv); 313 free (r_argv);
315 314
316 for (int i = NUM_RESOURCES; i--; ) 315 for (int i = NUM_RESOURCES; i--; )
317 if (rs [i] == resval_undef) 316 if (rs [i] == resval_undef)
… …
749 alias_color (Color_topShadow, Color_White); 748 alias_color (Color_topShadow, Color_White);
750 } 749 }
751#endif /* KEEP_SCROLLCOLOR */ 750#endif /* KEEP_SCROLLCOLOR */
752 751
753#ifdef OFF_FOCUS_FADING 752#ifdef OFF_FOCUS_FADING
754 if (rs[Rs_fade])
755 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++) 753 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)
756 { 754 update_fade_color (i);
757 rgba c;
758 pix_colors [Color_fade].get (c);
759 pix_colors_focused [i].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused[i],c);
760 }
761#endif 755#endif
762} 756}
763 757
764/*----------------------------------------------------------------------*/ 758/*----------------------------------------------------------------------*/
765/* color aliases, fg/bg bright-bold */ 759/* color aliases, fg/bg bright-bold */
… …
1052#endif 1046#endif
1053 1047
1054 /* graphics context for the vt window */ 1048 /* graphics context for the vt window */
1055 gcvalue.foreground = pix_colors[Color_fg]; 1049 gcvalue.foreground = pix_colors[Color_fg];
1056 gcvalue.background = pix_colors[Color_bg]; 1050 gcvalue.background = pix_colors[Color_bg];
1057 gcvalue.graphics_exposures = 1; 1051 gcvalue.graphics_exposures = 0;
1058 1052
1059 gc = XCreateGC (dpy, vt, 1053 gc = XCreateGC (dpy, vt,
1060 GCForeground | GCBackground | GCGraphicsExposures, 1054 GCForeground | GCBackground | GCGraphicsExposures,
1061 &gcvalue); 1055 &gcvalue);
1062 1056

Diff Legend

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