mirror of
https://github.com/SFML/CSFML.git
synced 2026-10-27 21:36:13 +01:00
Update for 2.5.0
This commit is contained in:
spacechase0 committed
1 parent
75f95202b7
commit
7ef69e3b1c
40 files changed
+1327
-24
No files matched your search
@@ -0,0 +1,85 @@
|
||||
////////////////////////////////////////////////////////////
|
||||
//
|
||||
// SFML - Simple and Fast Multimedia Library
|
||||
// Copyright (C) 2007-2015 Laurent Gomila (laurent@sfml-dev.org)
|
||||
//
|
||||
// This software is provided 'as-is', without any express or implied warranty.
|
||||
// In no event will the authors be held liable for any damages arising from the use of this software.
|
||||
//
|
||||
// Permission is granted to anyone to use this software for any purpose,
|
||||
// including commercial applications, and to alter it and redistribute it freely,
|
||||
// subject to the following restrictions:
|
||||
//
|
||||
// 1. The origin of this software must not be misrepresented;
|
||||
// you must not claim that you wrote the original software.
|
||||
// If you use this software in a product, an acknowledgment
|
||||
// in the product documentation would be appreciated but is not required.
|
||||
//
|
||||
// 2. Altered source versions must be plainly marked as such,
|
||||
// and must not be misrepresented as being the original software.
|
||||
//
|
||||
// 3. This notice may not be removed or altered from any source distribution.
|
||||
//
|
||||
////////////////////////////////////////////////////////////
|
||||
|
||||
#ifndef SFML_CLIPBOARD_H
|
||||
#define SFML_CLIPBOARD_H
|
||||
|
||||
////////////////////////////////////////////////////////////
|
||||
// Headers
|
||||
////////////////////////////////////////////////////////////
|
||||
#include <SFML/Window/Export.h>
|
||||
#include <SFML/Window/Types.h>
|
||||
|
||||
|
||||
////////////////////////////////////////////////////////////
|
||||
/// \brief Get the content of the clipboard as string data (returns an ANSI string)
|
||||
///
|
||||
/// This function returns the content of the clipboard
|
||||
/// as a string. If the clipboard does not contain string
|
||||
/// it returns an empty string.
|
||||
///
|
||||
/// \return Clipboard contents as a locale-dependent ANSI string
|
||||
///
|
||||
////////////////////////////////////////////////////////////
|
||||
CSFML_WINDOW_API const char* sfClipboard_getString();
|
||||
|
||||
|
||||
////////////////////////////////////////////////////////////
|
||||
/// \brief Get the content of the clipboard as string data (returns a Unicode string)
|
||||
///
|
||||
/// This function returns the content of the clipboard
|
||||
/// as a string. If the clipboard does not contain string
|
||||
/// it returns an empty string.
|
||||
///
|
||||
/// \return Clipboard contents as UTF-32
|
||||
///
|
||||
////////////////////////////////////////////////////////////
|
||||
CSFML_WINDOW_API const sfUint32* sfClipboard_getUnicodeString();
|
||||
|
||||
////////////////////////////////////////////////////////////
|
||||
/// \brief Set the content of the clipboard as ANSI string data
|
||||
///
|
||||
/// This function sets the content of the clipboard as an
|
||||
/// ANSI string.
|
||||
///
|
||||
/// \param text ANSI string containing the data to be sent
|
||||
/// to the clipboard
|
||||
///
|
||||
////////////////////////////////////////////////////////////
|
||||
CSFML_WINDOW_API void sfClipboard_setString(const char* text);
|
||||
|
||||
////////////////////////////////////////////////////////////
|
||||
/// \brief Set the content of the clipboard as Unicode string data
|
||||
///
|
||||
/// This function sets the content of the clipboard as a
|
||||
/// Unicode string.
|
||||
///
|
||||
/// \param text Unicode string containing the data to be sent
|
||||
/// to the clipboard
|
||||
///
|
||||
////////////////////////////////////////////////////////////
|
||||
CSFML_WINDOW_API void sfClipboard_setUnicodeString(const sfUint32* text);
|
||||
|
||||
|
||||
#endif // SFML_CURSOR_H
|
||||
@@ -73,4 +73,15 @@ CSFML_WINDOW_API sfBool sfContext_setActive(sfContext* context, sfBool active);
|
||||
////////////////////////////////////////////////////////////
|
||||
CSFML_WINDOW_API sfContextSettings sfContext_getSettings(const sfContext* context);
|
||||
|
||||
////////////////////////////////////////////////////////////
|
||||
/// \brief Get the currently active context's ID
|
||||
///
|
||||
/// The context ID is used to identify contexts when
|
||||
/// managing unshareable OpenGL resources.
|
||||
///
|
||||
/// \return The active context's ID or 0 if no context is currently active
|
||||
///
|
||||
////////////////////////////////////////////////////////////
|
||||
CSFML_WINDOW_API sfUint64 sfContext_getActiveContextId();
|
||||
|
||||
#endif // SFML_CONTEXT_H
|
||||
@@ -0,0 +1,132 @@
|
||||
////////////////////////////////////////////////////////////
|
||||
//
|
||||
// SFML - Simple and Fast Multimedia Library
|
||||
// Copyright (C) 2007-2015 Laurent Gomila (laurent@sfml-dev.org)
|
||||
//
|
||||
// This software is provided 'as-is', without any express or implied warranty.
|
||||
// In no event will the authors be held liable for any damages arising from the use of this software.
|
||||
//
|
||||
// Permission is granted to anyone to use this software for any purpose,
|
||||
// including commercial applications, and to alter it and redistribute it freely,
|
||||
// subject to the following restrictions:
|
||||
//
|
||||
// 1. The origin of this software must not be misrepresented;
|
||||
// you must not claim that you wrote the original software.
|
||||
// If you use this software in a product, an acknowledgment
|
||||
// in the product documentation would be appreciated but is not required.
|
||||
//
|
||||
// 2. Altered source versions must be plainly marked as such,
|
||||
// and must not be misrepresented as being the original software.
|
||||
//
|
||||
// 3. This notice may not be removed or altered from any source distribution.
|
||||
//
|
||||
////////////////////////////////////////////////////////////
|
||||
|
||||
#ifndef SFML_CURSOR_H
|
||||
#define SFML_CURSOR_H
|
||||
|
||||
////////////////////////////////////////////////////////////
|
||||
// Headers
|
||||
////////////////////////////////////////////////////////////
|
||||
#include <SFML/System/Vector2.h>
|
||||
#include <SFML/Window/Export.h>
|
||||
#include <SFML/Window/Types.h>
|
||||
|
||||
|
||||
////////////////////////////////////////////////////////////
|
||||
/// \brief Enumeration of the native system cursor types
|
||||
///
|
||||
/// Refer to the following table to determine which cursor
|
||||
/// is available on which platform.
|
||||
///
|
||||
/// Type | Linux | Mac OS X | Windows
|
||||
/// ------------------------------------|:-----:|:--------:|:--------:
|
||||
/// sfCursorArrow | yes | yes | yes
|
||||
/// sfCursorArrowWait | no | no | yes
|
||||
/// sfCursorWait | yes | no | yes
|
||||
/// sfCursorText | yes | yes | yes
|
||||
/// sfCursorHand | yes | yes | yes
|
||||
/// sfCursorSizeHorizontal | yes | yes | yes
|
||||
/// sfCursorSizeVertical | yes | yes | yes
|
||||
/// sfCursorSizeTopLeftBottomRight | no | no | yes
|
||||
/// sfCursorSizeBottomLeftTopRight | no | no | yes
|
||||
/// sfCursorSizeAll | yes | no | yes
|
||||
/// sfCursorCross | yes | yes | yes
|
||||
/// sfCursorHelp | yes | no | yes
|
||||
/// sfCursorNotAllowed | yes | yes | yes
|
||||
///
|
||||
////////////////////////////////////////////////////////////
|
||||
typedef enum
|
||||
{
|
||||
sfCursorArrow, ///< Arrow cursor (default)
|
||||
sfCursorArrowWait, ///< Busy arrow cursor
|
||||
sfCursorWait, ///< Busy cursor
|
||||
sfCursorText, ///< I-beam, cursor when hovering over a field allowing text entry
|
||||
sfCursorHand, ///< Pointing hand cursor
|
||||
sfCursorSizeHorizontal, ///< Horizontal double arrow cursor
|
||||
sfCursorSizeVertical, ///< Vertical double arrow cursor
|
||||
sfCursorSizeTopLeftBottomRight, ///< Double arrow cursor going from top-left to bottom-right
|
||||
sfCursorSizeBottomLeftTopRight, ///< Double arrow cursor going from bottom-left to top-right
|
||||
sfCursorSizeAll, ///< Combination of SizeHorizontal and SizeVertical
|
||||
sfCursorCross, ///< Crosshair cursor
|
||||
sfCursorHelp, ///< Help cursor
|
||||
sfCursorNotAllowed ///< Action not allowed cursor
|
||||
} sfCursorType;
|
||||
|
||||
|
||||
////////////////////////////////////////////////////////////
|
||||
/// \brief Create a cursor with the provided image
|
||||
///
|
||||
/// \a pixels must be an array of \a width by \a height pixels
|
||||
/// in 32-bit RGBA format. If not, this will cause undefined behavior.
|
||||
///
|
||||
/// If \a pixels is null or either \a width or \a height are 0,
|
||||
/// the current cursor is left unchanged and the function will
|
||||
/// return false.
|
||||
///
|
||||
/// In addition to specifying the pixel data, you can also
|
||||
/// specify the location of the hotspot of the cursor. The
|
||||
/// hotspot is the pixel coordinate within the cursor image
|
||||
/// which will be located exactly where the mouse pointer
|
||||
/// position is. Any mouse actions that are performed will
|
||||
/// return the window/screen location of the hotspot.
|
||||
///
|
||||
/// \warning On Unix, the pixels are mapped into a monochrome
|
||||
/// bitmap: pixels with an alpha channel to 0 are
|
||||
/// transparent, black if the RGB channel are close
|
||||
/// to zero, and white otherwise.
|
||||
///
|
||||
/// \param pixels Array of pixels of the image
|
||||
/// \param size Width and height of the image
|
||||
/// \param hotspot (x,y) location of the hotspot
|
||||
/// \return A new sfCursor object
|
||||
///
|
||||
////////////////////////////////////////////////////////////
|
||||
CSFML_WINDOW_API sfCursor* sfCursor_createFromPixels(const sfUint8* pixels, sfVector2u size, sfVector2u hotspot);
|
||||
|
||||
|
||||
////////////////////////////////////////////////////////////
|
||||
/// \brief Create a native system cursor
|
||||
///
|
||||
/// Refer to the list of cursor available on each system
|
||||
/// (see sfCursorType) to know whether a given cursor is
|
||||
/// expected to load successfully or is not supported by
|
||||
/// the operating system.
|
||||
///
|
||||
/// \param type Native system cursor type
|
||||
/// \return A new sfCursor object
|
||||
///
|
||||
////////////////////////////////////////////////////////////
|
||||
CSFML_WINDOW_API sfCursor* sfCursor_createFromSystem(sfCursorType type);
|
||||
|
||||
|
||||
////////////////////////////////////////////////////////////
|
||||
/// \brief Destroy a cursor
|
||||
///
|
||||
/// \param cursor Cursor to destroy
|
||||
///
|
||||
////////////////////////////////////////////////////////////
|
||||
CSFML_WINDOW_API void sfCursor_destroy(sfCursor* cursor);
|
||||
|
||||
|
||||
#endif // SFML_CURSOR_H
|
||||
@@ -86,18 +86,18 @@ typedef enum
|
||||
sfKeyMenu, ///< The Menu key
|
||||
sfKeyLBracket, ///< The [ key
|
||||
sfKeyRBracket, ///< The ] key
|
||||
sfKeySemiColon, ///< The ; key
|
||||
sfKeySemicolon, ///< The ; key
|
||||
sfKeyComma, ///< The , key
|
||||
sfKeyPeriod, ///< The . key
|
||||
sfKeyQuote, ///< The ' key
|
||||
sfKeySlash, ///< The / key
|
||||
sfKeyBackSlash, ///< The \ key
|
||||
sfKeyBackslash, ///< The \ key
|
||||
sfKeyTilde, ///< The ~ key
|
||||
sfKeyEqual, ///< The = key
|
||||
sfKeyDash, ///< The - key
|
||||
sfKeyHyphen, ///< The - key (hyphen)
|
||||
sfKeySpace, ///< The Space key
|
||||
sfKeyReturn, ///< The Return key
|
||||
sfKeyBack, ///< The Backspace key
|
||||
sfKeyEnter, ///< The Enter/Return key
|
||||
sfKeyBackspace, ///< The Backspace key
|
||||
sfKeyTab, ///< The Tabulation key
|
||||
sfKeyPageUp, ///< The Page up key
|
||||
sfKeyPageDown, ///< The Page down key
|
||||
@@ -105,10 +105,10 @@ typedef enum
|
||||
sfKeyHome, ///< The Home key
|
||||
sfKeyInsert, ///< The Insert key
|
||||
sfKeyDelete, ///< The Delete key
|
||||
sfKeyAdd, ///< +
|
||||
sfKeySubtract, ///< -
|
||||
sfKeyMultiply, ///< *
|
||||
sfKeyDivide, ///< /
|
||||
sfKeyAdd, ///< The + key
|
||||
sfKeySubtract, ///< The - key (minus, usually from numpad)
|
||||
sfKeyMultiply, ///< The * key
|
||||
sfKeyDivide, ///< The / key
|
||||
sfKeyLeft, ///< Left arrow
|
||||
sfKeyRight, ///< Right arrow
|
||||
sfKeyUp, ///< Up arrow
|
||||
@@ -140,7 +140,15 @@ typedef enum
|
||||
sfKeyF15, ///< The F15 key
|
||||
sfKeyPause, ///< The Pause key
|
||||
|
||||
sfKeyCount ///< Keep last -- the total number of keyboard keys
|
||||
sfKeyCount, ///< Keep last -- the total number of keyboard keys
|
||||
|
||||
// Deprecated values:
|
||||
|
||||
sfKeyDash = sfKeyHyphen, ///< \deprecated Use Hyphen instead
|
||||
sfKeyBack = sfKeyBackspace, ///< \deprecated Use Backspace instead
|
||||
sfKeyBackSlash = sfKeyBackslash, ///< \deprecated Use Backslash instead
|
||||
sfKeySemiColon = sfKeySemicolon, ///< \deprecated Use Semicolon instead
|
||||
sfKeyReturn = sfKeyEnter ///< \deprecated Use Enter instead
|
||||
} sfKeyCode;
|
||||
|
||||
|
||||
|
||||
@@ -27,6 +27,7 @@
|
||||
|
||||
|
||||
typedef struct sfContext sfContext;
|
||||
typedef struct sfCursor sfCursor;
|
||||
typedef struct sfWindow sfWindow;
|
||||
|
||||
|
||||
|
||||
@@ -354,6 +354,26 @@ CSFML_WINDOW_API void sfWindow_setMouseCursorVisible(sfWindow* window, sfBool vi
|
||||
////////////////////////////////////////////////////////////
|
||||
CSFML_WINDOW_API void sfWindow_setMouseCursorGrabbed(sfWindow* window, sfBool grabbed);
|
||||
|
||||
////////////////////////////////////////////////////////////
|
||||
/// \brief Set the displayed cursor to a native system cursor
|
||||
///
|
||||
/// Upon window creation, the arrow cursor is used by default.
|
||||
///
|
||||
/// \warning The cursor must not be destroyed while in use by
|
||||
/// the window.
|
||||
///
|
||||
/// \warning Features related to Cursor are not supported on
|
||||
/// iOS and Android.
|
||||
///
|
||||
/// \param window Window object
|
||||
/// \param cursor Native system cursor type to display
|
||||
///
|
||||
/// \see sfCursor_createFromSystem
|
||||
/// \see sfCursor_createFromPixels
|
||||
///
|
||||
////////////////////////////////////////////////////////////
|
||||
CSFML_WINDOW_API void sfWindow_setMouseCursor(sfWindow* window, const sfCursor* cursor);
|
||||
|
||||
////////////////////////////////////////////////////////////
|
||||
/// \brief Enable or disable automatic key-repeat
|
||||
///
|
||||
|
||||
Reference in new issue
Block a user