michael/lwjgl
michael
/
lwjgl
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Linux: Drop out of Xrandr loop after a set amount of iterations

This commit is contained in:
Elias Naur 2005-09-12 13:05:54 +00:00
parent 57635274d2
commit 545ac5ac95
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/native/linux/display.c
View File

@ -51,6 +51,8 @@
#include "common_tools.h" #include "common_tools.h"
#include "Window.h" #include "Window.h"
#define NUM_XRANDR_RETRIES 5
typedef struct { typedef struct {
int width; int width;
int height; int height;
@ -230,12 +232,13 @@ static Status trySetXrandrMode(Display *disp, int screen, mode_info *mode, Time
} }
static bool setXrandrMode(Display *disp, int screen, mode_info *mode) { static bool setXrandrMode(Display *disp, int screen, mode_info *mode) {
int iteration;
Time timestamp; Time timestamp;
Status status = trySetXrandrMode(disp, screen, mode, &timestamp); Status status = trySetXrandrMode(disp, screen, mode, &timestamp);
if (status == 0) if (status == 0)
return true; // Success return true; // Success
Time new_timestamp; Time new_timestamp;
while (true) { for (iteration = 0; iteration < NUM_XRANDR_RETRIES; iteration++) {
status = trySetXrandrMode(disp, screen, mode, &new_timestamp); status = trySetXrandrMode(disp, screen, mode, &new_timestamp);
if (status == 0) if (status == 0)
return true; // Success return true; // Success
@ -243,6 +246,7 @@ static bool setXrandrMode(Display *disp, int screen, mode_info *mode) {
return false; // Failure, and the stamps are equal meaning that the failure is not merely transient return false; // Failure, and the stamps are equal meaning that the failure is not merely transient
timestamp = new_timestamp; timestamp = new_timestamp;
} }
return false;
} }
static bool setMode(JNIEnv *env, Display *disp, int screen, int width, int height, int freq, bool temporary) { static bool setMode(JNIEnv *env, Display *disp, int screen, int width, int height, int freq, bool temporary) {