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

Fix handling of numpad keys w.r.t. numlock (derived from fix mentione… #22

Closed
wants to merge 7 commits into from

Conversation

aweinstock314
Copy link

gw3583 and others added 7 commits May 6, 2015 08:13
This was previously in glutin, but was removed since Weak is not
marked stable here:

rust-windowing@0f7bd90

Some X drivers crash if the window isn't closed from the main thread.
Fix a double free corruption crash in some X drivers on exit. r=mbrubeck
implement get_platform_window() return for X11
add ability to set parent window when creating windows
@jdm
Copy link
Member

jdm commented May 16, 2015

This should go upstream to https://github.com/tomaka/glutin, I think.

@aweinstock314
Copy link
Author

I have a local branch of tomaka/glutin that I've cherry-picked the commit onto, but servo doesn't compile with that version of glutin. I have tested this branch with servo, and verified that it allows numbers to be entered into textboxes with the numpad. Should I PR the branch of tomaka/glutin/master, then do a seperate PR rebasing servo/glutin/servo onto tomaka/glutin/master (once the former is accepted)?

@jdm
Copy link
Member

jdm commented May 18, 2015

I don't know what the current setup is; do you @larsbergstrom?

@metajack
Copy link

Generally for forks of community projects we should always land upstream, and then cherry pick down to our fork. When the next rust upgrade happens, we'll be back on upstream master hopefully.

We should probably be naming our fork branches servo-20YYMMDD so that this is clearer.

@larsbergstrom
Copy link

@metajack We should probably talk at the meeting about this. We've been having trouble with landing changes required for CEF into upstream glutin due to differing design goals upstream and may end up with a fork.

@aweinstock314
Copy link
Author

rust-windowing#456

@bors-servo
Copy link

☔ The latest upstream changes (presumably rust-windowing#567) made this pull request unmergeable. Please resolve the merge conflicts.

@jdm
Copy link
Member

jdm commented Aug 14, 2015

This went upstream so we're covered.

@jdm jdm closed this Aug 14, 2015
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.

8 participants