|
Lines 1-32
Link Here
|
| 1 |
--- unix/unix_vid.c.orig 2014-06-08 16:08:05.000000000 +0400 |
1 |
--- unix/unix_vid.c.orig 2014-06-08 16:08:05.000000000 +0400 |
| 2 |
+++ unix/unix_vid.c 2014-09-25 15:20:25.000000000 +0400 |
2 |
+++ unix/unix_vid.c 2014-09-26 17:37:39.000000000 +0400 |
| 3 |
@@ -126,28 +126,5 @@ |
3 |
@@ -126,7 +126,7 @@ |
| 4 |
*/ |
4 |
*/ |
| 5 |
qboolean VID_GetDisplaySize( int *width, int *height ) |
5 |
qboolean VID_GetDisplaySize( int *width, int *height ) |
| 6 |
{ |
6 |
{ |
| 7 |
- XRRScreenConfiguration *xrrConfig; |
7 |
- XRRScreenConfiguration *xrrConfig; |
| 8 |
- XRRScreenSize *xrrSizes; |
8 |
+/* XRRScreenConfiguration *xrrConfig; |
| 9 |
- Display *dpy; |
9 |
XRRScreenSize *xrrSizes; |
| 10 |
- Window root; |
10 |
Display *dpy; |
| 11 |
- Rotation rotation; |
11 |
Window root; |
| 12 |
- SizeID size_id; |
12 |
@@ -148,6 +148,24 @@ |
| 13 |
- int num_sizes; |
13 |
XCloseDisplay( dpy ); |
| 14 |
- |
14 |
return qtrue; |
| 15 |
- dpy = XOpenDisplay( NULL ); |
15 |
} |
| 16 |
- if( dpy ) |
16 |
+*/ |
| 17 |
- { |
17 |
+ int w = 0, h = 0; |
| 18 |
- root = DefaultRootWindow( dpy ); |
18 |
+ Display *dpy = XOpenDisplay(NULL); |
| 19 |
- xrrConfig = XRRGetScreenInfo( dpy, root ); |
19 |
+ if (dpy) |
| 20 |
- xrrSizes = XRRConfigSizes( xrrConfig, &num_sizes ); |
20 |
+ { |
| 21 |
- size_id = XRRConfigCurrentConfiguration( xrrConfig, &rotation ); |
21 |
+ int scr = DefaultScreen(dpy); |
| 22 |
- |
22 |
+ if (scr >= 0) { |
| 23 |
- *width = xrrSizes[size_id].width; |
23 |
+ w = XDisplayWidth(dpy, scr), |
| 24 |
- *height = xrrSizes[size_id].height; |
24 |
+ h = XDisplayHeight(dpy, scr); |
| 25 |
- |
25 |
+ } |
| 26 |
- XCloseDisplay( dpy ); |
26 |
+ XCloseDisplay(dpy); |
| 27 |
- return qtrue; |
27 |
+ } |
| 28 |
- } |
28 |
+ |
| 29 |
- |
29 |
+ if (w != 0 && h != 0) { |
|
|
30 |
+ *width = w; |
| 31 |
+ *height = h; |
| 32 |
+ return qtrue; |
| 33 |
+ } |
| 34 |
|
| 30 |
return qfalse; |
35 |
return qfalse; |
| 31 |
} |
36 |
} |
| 32 |
--- unix/unix_glw.c.orig 2014-06-08 16:08:05.000000000 +0400 |
37 |
--- unix/unix_glw.c.orig 2014-06-08 16:08:05.000000000 +0400 |