Commit graph

718 commits

Author SHA1 Message Date
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
Pierre Krieger 7652cc5860 Blind attempt to fix the OS/X build 2015-01-15 20:20:52 +01:00
tomaka 22a27767d5 Merge pull request #200 from ozkriff/master
android: Fixed depth buffer
2015-01-15 09:04:03 +01:00
Andrey Lesnikov 5a589b1783 android: Fixed depth buffer 2015-01-15 10:05:19 +03:00
tomaka e3943945c7 Merge pull request #197 from ozkriff/master
x11, android, win: [ui]size -> [ui]32
2015-01-13 20:59:48 +01:00
Andrey Lesnikov 5a4fee967a x11, android, win32: [ui]size, [u]int -> [ui]32 2015-01-13 16:23:30 +03:00
tomaka 2d4f1c72fb Merge pull request #196 from ozkriff/master
Fixed android: Added 'MouseCursor' import
2015-01-13 12:18:32 +01:00
Andrey Lesnikov d11f63a749 Fixed android: Added 'MouseCursor' import 2015-01-13 13:58:05 +03:00
tomaka 05a03fb6a1 Merge pull request #192 from bjwbell/mouse-cursors
Add mouse cursor support
2015-01-13 10:43:46 +01:00
Bryan Bell 0fba0a9a73 Code review comments
- Revert version back to 0.0.4
- Add comment that set_cursor has no effect on Android
2015-01-13 01:23:34 -08:00
tomaka 88fd84f595 Merge pull request #195 from tomaka/appveyor-badge
Add appveyor build status in README
2015-01-13 09:44:49 +01:00
Pierre Krieger 746af5a835 Add appveyor build status in README 2015-01-13 09:44:14 +01:00
tomaka 0ffa3b80f1 Merge pull request #193 from bjwbell/int-and-uint-to-u-and-isize
Change uint/int to usize/isize
2015-01-13 07:57:10 +01:00
Bryan Bell 5389c73b85 Fix OS X & Win32 builds 2015-01-12 19:45:20 -08:00
Bryan Bell 995bd37c78 Change uint/int to usize/isize
From https://github.com/rust-lang/rfcs/pull/544 the types uint/int were
renamed to usize/isize.
2015-01-12 19:33:31 -08:00
Bryan Bell 95f0990074 Refine X11 cursor selections
For MouseCursor::Cell, NotAllowed, NoDrop, Grab, Grabbing, ... set the
appropriate X11 cursor.

Also alphabetize the cursors listed in the MouseCursor enum.
2015-01-12 19:00:45 -08:00
Bryan Bell b532b8c65f Add mouse cursor support
Add a new api, window.set_cursor, for setting the cursor. The enum MouseCursor lists the possible cursors.

Only X11 is implemented. On OSX, Android, & Win32 the window.set_cursor function
either does nothing or calls the "unimplemented!" macro.
2015-01-12 16:22:37 -08:00
tomaka 318f0d2d06 Merge pull request #191 from sbward/osx-1.0-alpha
OSX compatibility for Rust 1.0 alpha
2015-01-12 21:21:53 +01:00