Commit Graph

3195 Commits

Author SHA1 Message Date
Lukas Dürrenberger
c348171f24 Merge branch 'feature/rpath_osx' 2014-10-09 09:11:23 +02:00
Marco Antognini
b2ba2307b3 Fixed documentation warnings
- WindowImpl.hpp:94:16: warning: parameter 'threshold:' not found in the function declaration
 - SFContext.hpp:120:16: warning: parameter 'enabled:' not found in the function declaration
2014-10-07 12:00:34 +02:00
Marco Antognini
9a8ba74c62 Updated Xcode templates
Since the @loader_path was replaced with @rpath, to correctly load
binaries from within a bundle app we need to add the Frameworks
subdirectory to the run path list.
2014-10-07 10:58:39 +02:00
Marco Antognini
ba1488ec97 Improve flexibility of dependencies locations on OS X
- Replaced @executable_path by @rpath for more flexibility
 - Updated freetype and sndfile libs as follow:

    install_name_tool -id "@rpath/../Frameworks/freetype.framework/Versions/A/freetype" freetype
    install_name_tool -id "@rpath/../Frameworks/sndfile.framework/Versions/A/sndfile" sndfile
2014-10-07 10:46:05 +02:00
Jan Haller
60c4f95795 Implemented case differentiation for window focus/notification on Windows and X11 2014-10-06 22:21:46 +02:00
Alexandre Bodelot
c4435b8a31 X11: Notify instead of force focus
Signed-off-by: Jan Haller <bromeon@gmail.com>
2014-10-06 22:21:45 +02:00
Jan Haller
c98bd1eaba Window focus on X11: check if window is viewable 2014-10-06 22:21:45 +02:00
Jan Haller
93d2789f70 Window focus: Added empty implementations for Android and iOS 2014-10-06 22:21:44 +02:00
Jan Haller
4155b2e449 Changed Window::requestFocus() return type from bool to void
Reasons:
* Consistent with other sf::Window methods
* User can test whether focus succeeded by subsequent hasFocus() call
* Implementation would have to call hasFocus() anyway on some systems

Also: minor code style change in Window::hasFocus()
2014-10-06 22:21:44 +02:00
Jan Haller
6a24eb5eec Slightly adapted window focus documentation 2014-10-06 22:21:43 +02:00
Marco Antognini
85291debb4 Added OS X impl of requestFocus and hasFocus
Signed-off-by: Foaly <foaly.f@web.de>
Signed-off-by: Jan Haller <bromeon@gmail.com>
2014-10-06 22:21:42 +02:00
Foaly
b965ad198b Added window methods to request and to check focus
Signed-off-by: Stefan Schindler <stefan@boxbox.org>
Signed-off-by: Jan Haller <bromeon@gmail.com>
2014-10-06 22:21:42 +02:00
Laurent
ef6391678e Added (empty) implementation of JoystickImpl::getIdentification on iOS 2014-10-06 22:21:11 +02:00
Laurent Gomila
f99035bea1 Added support for 64-bit integers in sf::Packet 2014-10-06 13:26:28 +02:00
Stefan Schindler
f24ca9a840 Source code changes.
* Changed newlines to \n.
* Removed whitespace before colons.
* Fixed several alignments.
2014-10-06 01:18:47 +02:00
binary1248
b27cbd5036 Fixed font glyphs always being 2 pixels larger than they are supposed to be in each dimension, fixed wrong underline offset with some fonts, offset underline and strike through by half of their thickness so their center is positioned correctly, changed glyph and font metrics to use floats instead of ints to support scaling better. 2014-10-02 23:30:58 +02:00
Mario Liebisch
c36ea074d8 Joystick fixes/update for non-MSVC compilers
* This fixes building on non-MSVC compilers for Windows since they don't
know `_tcsnlen()`.
* Changed logic so SFML tries to retrieve the paths from the user key
first, machine key second (typical behavior for most registry settings).
* Removed the registry key length checks since that check is performed
inside`RegOpenKeyEx()` anyway and cut-off keys might point to the wrong
keys.
* Updated the error string retrieval to properly handle errors.
2014-09-25 13:06:42 +02:00
Marco Antognini
7159e4ba43 Improved cursor hiding on OS X 2014-09-25 01:18:29 +02:00
binary1248
330ea0bbe3 Fixed trying to truncate registry key names that did not need truncating. (#701) 2014-09-24 22:35:42 +02:00
Marco Antognini
6d122f428a Updated OS X Pool Wrapper 2014-09-23 14:12:11 +02:00
Lukas Dürrenberger
dcba593e8f Merge branch 'bugfix/joystick' 2014-09-23 10:46:13 +02:00
Marco Antognini
2427aaf3bb Added support for OS X 10.10
Note: this only fix the compilation process. SFML was not thoroughly
tested on this OS yet.
2014-09-21 07:39:05 +02:00
binary1248
eec9f7750f Amended based on comments from last commit. 2014-08-28 04:02:25 +02:00
binary1248
86c81f7458 Fixed memory leak in Unix JoystickImpl, refactored joystick code for all platforms, prevent accelerometers registering as joysticks on Unix. 2014-08-28 04:02:25 +02:00
Stefan Schindler
e157e7a7a8 Re-enabled RPATH feature.
RPATH is especially useful when running debug builds for testing on *nix
operating systems, because the binaries (e.g. examples) include library
runtime path information. This allows you to skip installing SFML to the
system or adjusting PATH variables/ld config.
2014-08-27 08:11:07 +02:00
binary1248
c37e442cee Fixed FindSFML.cmake not updating library entries when the user changes the value of SFML_STATIC_LIBRARIES after the initial configure (#637). 2014-08-26 08:27:33 +02:00
binary1248
20bf0e0b9c Merge pull request #688 from bruceoutdoors/master
Fixed compilation error in VS2013 64bit
2014-08-23 15:00:37 +02:00
Lee Zhen Yong
e5a98aa1d5 bug fix: compilation error in VS2013 64bit 2014-08-23 20:31:57 +08:00
Lukas Dürrenberger
ef1b9d6b20 Merge branch 'feature/strikethrough' 2014-08-19 23:02:21 +02:00
Łukasz Twarduś
fc7637681d C++11/14 compatibility 2014-08-19 22:47:35 +02:00
Lukas Dürrenberger
c016ab5d0a Merge branch 'bugfix/windows_dpi_scaling' 2014-08-19 22:37:55 +02:00
Lukas Dürrenberger
7c63c5885e Merge branch 'bugfix/texture_max_size' 2014-08-19 22:18:38 +02:00
binary1248
f9ed3fdcb3 Added support for SetProcessDpiAwareness as well, on Windows versions that support it. 2014-08-19 22:01:59 +02:00
Lukas Dürrenberger
b96d330b9f Merge branch 'bugfix/socket_selector' 2014-08-18 21:46:48 +02:00
binary1248
3b9e246c83 Renamed SocketSelectorImpl's members to use camelCase, removed unnecessary checks from SocketSelector::add and SocketSelector::remove. 2014-08-18 21:43:57 +02:00
binary1248
eaab2c1c68 Fixed SocketSelector not being able to accept sockets with IDs larger than FD_SETSIZE on Windows (#153) and added the same checks to other affected methods as well. 2014-08-18 21:43:55 +02:00
binary1248
34933520ac Fixed Windows DPI scaling causing strange window behavior (#679). 2014-08-18 19:02:40 +02:00
binary1248
6959c1a826 Added notes to documentation and adjusted OpenGL example as a workaround for the side effects of making static functions that require a context work. If the user wants to make use of both sfml-graphics and OpenGL, they should make sure sf::Texture::getMaximumSize() and/or sf::Shader::isAvailable() are called at least once before setting their final context active as those functions will cause a context switch the first time they are called. 2014-08-15 13:39:06 +02:00
binary1248
7defb17e8c Made a few functions in Texture and Shader a bit more thread-safe. 2014-08-13 08:44:48 +02:00
Maximilian Wagenbach
713407e159 Fixed a bug where calling Texture::getMaximumSize() before any GlResource is created would break context management. 2014-08-13 07:25:12 +02:00
STU
6ad7b21203 Fix a bug in the font system.
When the finding a rectangle for a glyph at a particular character size,
if the glyph happens to be wider than the current texture size, but less
high than the unused height in the texture, the texture will not be
correctly doubled in size (since only the height is checked).

In practice, this only occurs when finding the rectangle for the *very
first* glyph (so the texture is at its default 128x128 size): otherwise,
the glyph would need to be unusually wide compared to its height to
trigger the bug.

This will trigger a debug assertion in Texture::update(). With assertions
disabled, there are knock-on effects and most text at that character size
will fail to render.
2014-08-12 10:52:39 +02:00
Lukas Dürrenberger
7ace90986b Merge branch 'bugfix/winxp_stack_align' 2014-08-12 09:45:59 +02:00
Laurent Gomila
386f56d6a4 Merge pull request #673 from arnolddumas/master
No space before exclamation mark.
2014-08-03 22:47:23 +02:00
Arnold Dumas
700c2e3823 I missed one exclamation mark in the previous commit. 2014-08-03 21:18:27 +02:00
Arnold Dumas
1fa2ff0458 No space before exclamation mark. 2014-08-03 20:44:38 +02:00
Laurent Gomila
83e019e7d3 Fixed order of dependent libraries (SFML_DEPENDENCIES variable) in FindSFML.cmake 2014-07-26 21:01:17 +02:00
Jonathan De Wachter
ca77ea58d0 Merge pull request #646 from MarioLiebisch/android-keyevents
[Android] Rewrote key event handling
2014-07-24 12:20:18 +02:00
Mario Liebisch
621793a354 [Android] Rewrote key event handling
* This fixes duplicate TextEntered events and should properly handle
`AKEY_EVENT_ACTION_MULTIPLE` (including key down and key up events; as
far as possible; see comment). Unfortunately I don't have/know any IME
utilizing this, so can't test it.
* The back button is now mapped to the Escape key (best match without
adding new keys).
* The volume buttons are no longer intercepted by SFML and no longer
generate events.
2014-07-24 11:00:59 +02:00
Jonathan De Wachter
3f69629d0c Merge branch 'android_improvements' 2014-07-24 10:05:09 +02:00
Jonathan De Wachter
f7561f5fa1 Fixed EGL surface not recreated in the right thread 2014-07-24 10:04:27 +02:00