Attachment #151785 for bug #217819

View | Details | Raw Unified | Return to bug 217819
Collapse All | Expand All

Lines 324-332 Link Here

(-)rxvt-2.7.10.orig/rclock/rclock.c (-4 / +3 lines)
324	CheckMaildir();	324	CheckMaildir();
325	#endif	325	#endif
326		326
327	if ((display_name = getenv ("DISPLAY")) == NULL)
328	display_name = ":0";
329
330	/* parse the command line */	327	/* parse the command line */
331	for (i = 1; i < argc; i += 2)	328	for (i = 1; i < argc; i += 2)
332	{	329	{
Lines 424-430 Link Here
424	Xdisplay = XOpenDisplay (display_name);	421	Xdisplay = XOpenDisplay (display_name);
425	if (!Xdisplay)	422	if (!Xdisplay)
426	{	423	{
427	print_error ("can't open display %s", display_name);	424	print_error ("can't open display %s", display_name?display_name:
		425	getenv("DISPLAY")?getenv("DISPLAY"):
		426	"as no -d given and DISPLAY not set");
428	goto Abort;	427	goto Abort;
429	}	428	}
430		429




/*
 * Open display, get options/resources and create the window
 */
    rs[Rs_display_name] = getenv("DISPLAY");
	rs[Rs_display_name] = ":0";

    rxvt_get_options(r, r_argc, r_argv);
    free(r_argv);


    if (r->Xdisplay == NULL
	&& (r->Xdisplay = XOpenDisplay(rs[Rs_display_name])) == NULL) {
	rxvt_print_error("can't open display %s",
			rs[Rs_display_name]?rs[Rs_display_name]:
			"as no -display option given and DISPLAY not set");
	exit(EXIT_FAILURE);
    }


Return to bug 217819

Lines 532-539 Link Here

(-)rxvt-2.7.10.orig/src/init.c (-3 / +4 lines)
532	/*	532	/*
533	* Open display, get options/resources and create the window	533	* Open display, get options/resources and create the window
534	*/	534	*/
535	if ((rs[Rs_display_name] = getenv("DISPLAY")) == NULL)	535	rs[Rs_display_name] = getenv("DISPLAY");
536	rs[Rs_display_name] = ":0";
537		536
538	rxvt_get_options(r, r_argc, r_argv);	537	rxvt_get_options(r, r_argc, r_argv);
539	free(r_argv);	538	free(r_argv);
Lines 550-556 Link Here
550		549
551	if (r->Xdisplay == NULL	550	if (r->Xdisplay == NULL
552	&& (r->Xdisplay = XOpenDisplay(rs[Rs_display_name])) == NULL) {	551	&& (r->Xdisplay = XOpenDisplay(rs[Rs_display_name])) == NULL) {
553	rxvt_print_error("can't open display %s", rs[Rs_display_name]);	552	rxvt_print_error("can't open display %s",
		553	rs[Rs_display_name]?rs[Rs_display_name]:
		554	"as no -display option given and DISPLAY not set");
554	exit(EXIT_FAILURE);	555	exit(EXIT_FAILURE);
555	}	556	}
556		557