Skip to content
This repository has been archived by the owner on Jul 10, 2023. It is now read-only.

Merge from glutin upstream #62

Merged
merged 14 commits into from Jan 16, 2016
Merged

Merge from glutin upstream #62

merged 14 commits into from Jan 16, 2016

Conversation

emilio
Copy link
Member

@emilio emilio commented Jan 16, 2016

This should allow landing the glutinup into servo now rust-windowing#706 has landed fixing rust-windowing#697.

Review on Reviewable

pmarcelll and others added 13 commits December 31, 2015 21:22
Per http://linux.die.net/man/3/xiquerydevice:

> XIFreeDeviceInfo frees the information returned by
> XIQueryDevice.
According to https://msdn.microsoft.com/en-us/library/windows/desktop/dd318284(v=vs.85).aspx if double buffer is unavailable then a single buffer will be returned
Prefer double buffer on wgl if unspecified
Fixes rust-windowing#697

It seems that `XSync` doesn't really makes the window viewable.

This feels hacky, other option to do it could be using `XIfEvent` or
similar to listen to `MapNotify` events, but we'll have a loop still.

In practice, this lasts between two and thre iterations on my machine,
which is something not noticeable.
x11: Poll the window until it is really visible
This includes rust-windowing#706, which should
allow the landing of the glutin update.
@emilio
Copy link
Member Author

emilio commented Jan 16, 2016

r? @SimonSapin

@SimonSapin
Copy link
Member

@bors-servo r+

@SimonSapin
Copy link
Member

Not sure what’s happening with homu, but the Travis build for this PR is green.

SimonSapin added a commit that referenced this pull request Jan 16, 2016
@SimonSapin SimonSapin merged commit 7ef1cb7 into servo:servo Jan 16, 2016
@SimonSapin
Copy link
Member

@emilio emilio deleted the servo-merge branch January 16, 2016 22:13
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

6 participants