Attachment 147711 Details for Bug 190969 – Proposed patch for no xrandr (since 369291 revision)

[patch] Proposed patch for no xrandr (since 369291 revision)

patch_no_xrandr.diff (text/plain), 1.64 KB, created by lightside on 2014-09-27 04:29:03 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: lightside

Created: 2014-09-27 04:29:03 UTC

Size: 1.64 KB

patch

obsolete

>diff -ruN warsow.orig/files/extra-patch-no-xrandr warsow/files/extra-patch-no-xrandr
>--- warsow.orig/files/extra-patch-no-xrandr	2014-09-26 00:18:05.000000000 +0400
>+++ warsow/files/extra-patch-no-xrandr	2014-09-26 17:38:48.000000000 +0400
>@@ -1,32 +1,37 @@
> --- unix/unix_vid.c.orig	2014-06-08 16:08:05.000000000 +0400
>-+++ unix/unix_vid.c	2014-09-25 15:20:25.000000000 +0400
>-@@ -126,28 +126,5 @@
>++++ unix/unix_vid.c	2014-09-26 17:37:39.000000000 +0400
>+@@ -126,7 +126,7 @@
>  */
>  qboolean VID_GetDisplaySize( int *width, int *height )
>  {
> -	XRRScreenConfiguration *xrrConfig;
>--	XRRScreenSize *xrrSizes;
>--	Display *dpy;
>--	Window root;
>--	Rotation rotation;
>--	SizeID size_id;
>--	int num_sizes;
>--
>--	dpy = XOpenDisplay( NULL );
>--	if( dpy )
>--	{
>--		root = DefaultRootWindow( dpy );
>--		xrrConfig = XRRGetScreenInfo( dpy, root );
>--		xrrSizes = XRRConfigSizes( xrrConfig, &num_sizes );
>--		size_id = XRRConfigCurrentConfiguration( xrrConfig, &rotation );
>--
>--		*width = xrrSizes[size_id].width;
>--		*height = xrrSizes[size_id].height;
>--
>--		XCloseDisplay( dpy );
>--		return qtrue;
>--	}
>--
>++/*	XRRScreenConfiguration *xrrConfig;
>+ 	XRRScreenSize *xrrSizes;
>+ 	Display *dpy;
>+ 	Window root;
>+@@ -148,6 +148,24 @@
>+ 		XCloseDisplay( dpy );
>+ 		return qtrue;
>+ 	}
>++*/
>++	int w = 0, h = 0;
>++	Display *dpy = XOpenDisplay(NULL);
>++	if (dpy)
>++	{
>++		int scr = DefaultScreen(dpy);
>++		if (scr >= 0) {
>++			w = XDisplayWidth(dpy, scr),
>++			h = XDisplayHeight(dpy, scr);
>++		}
>++		XCloseDisplay(dpy);
>++	}
>++
>++	if (w != 0 && h != 0) {
>++		*width = w;
>++		*height = h;
>++		return qtrue;
>++	}
>+ 
>  	return qfalse;
>  }
> --- unix/unix_glw.c.orig	2014-06-08 16:08:05.000000000 +0400

Actions: View | Diff

Attachments on bug 190969: 143710 | 144866 | 146752 | 146753 | 147343 | 147711