Commit graph

985 commits

Author SHA1 Message Date
Brendan Zabarauskas 73078e0569 Rename osx->cocoa 2015-01-26 14:28:12 +11:00
Brendan Zabarauskas 44c21c4bbb Implement some more osx stuff 2015-01-26 14:22:50 +11:00
Peter Atashian 33cd252f99 Upgrade to latest winapi
Signed-off-by: Peter Atashian <retep998@gmail.com>
2015-01-25 21:52:17 -05:00
Brendan Zabarauskas df5fe355df Merge pull request #229 from bjz/osxup
{true, false}->{YES, NO}
2015-01-26 11:04:38 +11:00
Brendan Zabarauskas 6b31fe9b1c {true, false}->{YES, NO} 2015-01-26 10:59:40 +11:00
tomaka f8c66ff2a9 Merge pull request #220 from tomaka/x11-vsync
Implement vsync for x11 and add vsync example
2015-01-25 12:56:15 +01:00
tomaka a2e03e7c15 Merge pull request #221 from tomaka/fix-rc
Fix race condition with XOpenIM
2015-01-25 12:55:58 +01:00
tomaka aa92625064 Merge pull request #224 from andrewrk/fix-error-trait
fix for latest rustc
2015-01-24 07:57:01 +01:00
Andrew Kelley 02a57e0422 fix for latest rustc 2015-01-23 19:18:22 -07:00
tomaka bd3d7513f8 Merge pull request #223 from Ms2ger/CString
Fix a use-after-free in Android get_proc_address.
2015-01-23 22:02:08 +01:00
Ms2ger 8005b012ce Fix a use-after-free in Android get_proc_address. 2015-01-23 19:24:42 +01:00
Pierre Krieger 56c6afd03c Fix race condition with XOpenIM 2015-01-23 11:10:23 +01:00
tomaka 36538b5634 Merge pull request #219 from bjwbell/remove-deadcode-warning
Remove deadcode warning in BuilderAttribs
2015-01-23 09:40:41 +01:00
Pierre Krieger b05ef16d81 Implement vsync for x11 and add vsync example 2015-01-23 09:33:22 +01:00
tomaka 60ec8542ab Merge pull request #218 from bjwbell/disable-unstable-warnings
Disable compiler unstable warnings
2015-01-23 09:29:21 +01:00
Bryan Bell 3e06c1c0e2 Remove deadcode warning in BuilderAttribs
In src/lib.rs remove the deadcode warning about the 'headless' builder
attribute. Headless is /actually/ set to false or true depending on if
HeadlessRendererBuilder is used.
2015-01-23 00:15:18 -08:00
Bryan Bell 6ea483dc78 Disable compiler unstable warnings
To cleanup the compiler output when building, disable
warnings about using unstable crates/features.
2015-01-22 23:40:17 -08:00
tomaka 1d6b863cd4 Merge pull request #217 from glennw/context-fallback
Some GPU/driver combinations have glxCreateContextAttribsARB present, bu...
2015-01-22 21:37:07 +01:00
Glenn Watson de3f354566 Fix log prefix 2015-01-23 06:01:22 +10:00
Brendan Zabarauskas 13be9b2598 Merge pull request #216 from jdm/osx
Fix OS X build.
2015-01-22 15:53:12 +11:00
Glenn Watson 19475f8521 Some GPU/driver combinations have glxCreateContextAttribsARB present, but it fails with an X error. In this case, catch the X error and fall back to the old method of creating a context. 2015-01-22 12:07:31 +10:00
Josh Matthews e12e4bf38f Fix OS X build. 2015-01-21 10:58:08 -05:00
tomaka 862baf8220 Merge pull request #215 from akiss77/pr-u8-c_char-upstream
`c_char` isn't always `i8`
2015-01-20 23:04:39 +01:00
Akos Kiss 935e5a36a2 c_char isn't always i8 2015-01-20 21:49:23 +00:00
Brendan Zabarauskas 4d12d3ea3d Merge pull request #214 from bjz/osx-window
Move osx delegate stuff into separate type
2015-01-20 22:38:25 +11:00
Brendan Zabarauskas de8fe684e7 Move osx delegate stuff into separate type 2015-01-20 08:12:53 +11:00
tomaka d48ccb381a Merge pull request #213 from tomaka/permanent-iterators
Iterators returned by wait_events and poll_events are now persistent
2015-01-19 13:46:30 +01:00
Pierre Krieger 8fcd676714 Iterators returned by wait_events and poll_events are now persistent 2015-01-19 13:11:33 +01:00
Brendan Zabarauskas a203385e76 if letify 2015-01-19 22:35:34 +11:00
tomaka b6f3bfa768 Merge pull request #211 from glennw/upstream-fixes
Upstream of various fixes and features (details below)
2015-01-19 11:27:47 +01:00
Glenn Watson 213f8b8534 Fix android API 2015-01-19 11:59:34 +10:00
Glenn Watson fd5e77f23e Add missing get_api stubs.
Add hidpi_factor() support for retina displays.
Fix Resize and MouseMoved events to handle retina displays.
Fix inverted y position for MouseMoved events on mac.
Fix initial painting on retina display.
2015-01-19 11:54:11 +10:00
tomaka bcda363188 Merge pull request #210 from tomaka/fix-winapi
Fix for changes in winapi
2015-01-18 13:51:43 +01:00
Pierre Krieger c2c43b80b3 Fix for changes in winapi 2015-01-18 13:48:43 +01:00
tomaka 0d114c72b3 Merge pull request #209 from bjz/osx-window
Remove unnecessary inner method in OSX window constructor
2015-01-18 10:38:59 +01:00
Brendan Zabarauskas 1891764afd Clean up pattern matches 2015-01-18 20:22:33 +11:00
Brendan Zabarauskas f8f2950afd Remove unnecessary inner method 2015-01-18 20:11:52 +11:00
Brendan Zabarauskas f5fb030c36 Squash some warnings 2015-01-18 20:11:33 +11:00
tomaka 00460364ca Merge pull request #208 from kazimuth/osxcontext
Fix #177 merge conflicts
2015-01-18 09:09:50 +01:00
James Gilles 75c14c5213 Remove AsciiExt import, s/uint/u32/, delete some files I accidentally
committed (whoops)
2015-01-17 21:13:57 -05:00
James Gilles 211a326036 Merge PixelPirate's changes and fix merge conflicts 2015-01-17 20:42:44 -05:00
tomaka 495f6f886d Merge pull request #207 from tomaka/update-rustc
Update for rustc/cargo
2015-01-17 18:07:29 +01:00
Pierre Krieger 7557dc52fc Update for rustc/cargo 2015-01-17 18:02:22 +01:00
tomaka f1ec5db585 Merge pull request #206 from tomaka/non-mutable-set-cursor
Change &mut self to &self in set_cursor
2015-01-17 08:46:25 +01:00
Bryan Bell e7e66b057d Change &mut self to &self in set_cursor 2015-01-17 08:28:52 +01:00
tomaka 2cabfdd373 Merge pull request #204 from tomaka/fix-osx-attempt
More OS/X fixes
2015-01-15 21:01:21 +01:00
Pierre Krieger 3ce5fd08a8 More OS/X fixes 2015-01-15 21:01:09 +01:00
tomaka afba03bf2a Merge pull request #203 from tomaka/osx-fix-attempt
More OS/X fixes
2015-01-15 20:49:44 +01:00
Pierre Krieger c3b2f45ca3 More OS/X fixes 2015-01-15 20:49:03 +01:00
tomaka 1e2248a441 Merge pull request #202 from tomaka/osx-fix-attempt
Blind attempt to fix the OS/X build
2015-01-15 20:26:24 +01:00