Edgaru089/SFML
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #351 from Shizmob/master

Browse Source 
Unicode window title support.
This commit is contained in:
Laurent Gomila 2013-02-12 10:56:05 -08:00
commit a97577ccbe
14 changed files with 78 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/SFML/Graphics/RenderWindow.hpp
View File

@ -73,7 +73,7 @@ public :
/// \param settings Additional settings for the underlying OpenGL context
///
////////////////////////////////////////////////////////////
RenderWindow(VideoMode mode, const std::string& title, Uint32 style = Style::Default, const ContextSettings& settings = ContextSettings());
RenderWindow(VideoMode mode, const String& title, Uint32 style = Style::Default, const ContextSettings& settings = ContextSettings());
////////////////////////////////////////////////////////////
/// \brief Construct the window from an existing control

8
include/SFML/Window/Window.hpp
View File

@ -37,7 +37,7 @@
#include <SFML/System/Clock.hpp>
#include <SFML/System/Vector2.hpp>
#include <SFML/System/NonCopyable.hpp>
#include <string>
#include <SFML/System/String.hpp>
namespace sf
@ -86,7 +86,7 @@ public :
/// \param settings Additional settings for the underlying OpenGL context
///
////////////////////////////////////////////////////////////
Window(VideoMode mode, const std::string& title, Uint32 style = Style::Default, const ContextSettings& settings = ContextSettings());
Window(VideoMode mode, const String& title, Uint32 style = Style::Default, const ContextSettings& settings = ContextSettings());
////////////////////////////////////////////////////////////
/// \brief Construct the window from an existing control
@ -125,7 +125,7 @@ public :
/// \param settings Additional settings for the underlying OpenGL context
///
////////////////////////////////////////////////////////////
void create(VideoMode mode, const std::string& title, Uint32 style = Style::Default, const ContextSettings& settings = ContextSettings());
void create(VideoMode mode, const String& title, Uint32 style = Style::Default, const ContextSettings& settings = ContextSettings());
////////////////////////////////////////////////////////////
/// \brief Create (or recreate) the window from an existing control
@ -284,7 +284,7 @@ public :
/// \see setIcon
///
////////////////////////////////////////////////////////////
void setTitle(const std::string& title);
void setTitle(const String& title);
////////////////////////////////////////////////////////////
/// \brief Change the window's icon

2
src/SFML/Graphics/RenderWindow.cpp
View File

@ -39,7 +39,7 @@ RenderWindow::RenderWindow()
////////////////////////////////////////////////////////////
RenderWindow::RenderWindow(VideoMode mode, const std::string& title, Uint32 style, const ContextSettings& settings)
RenderWindow::RenderWindow(VideoMode mode, const String& title, Uint32 style, const ContextSettings& settings)
{
// Don't call the base class constructor because it contains virtual function calls
create(mode, title, style, settings);

22
src/SFML/Window/Linux/WindowImplX11.cpp
View File

@ -35,6 +35,8 @@
#include <X11/extensions/Xrandr.h>
#include <sstream>
#include <vector>
#include <string>
#include <iterator>
////////////////////////////////////////////////////////////
@ -91,7 +93,7 @@ m_keyRepeat (true)
////////////////////////////////////////////////////////////
WindowImplX11::WindowImplX11(VideoMode mode, const std::string& title, unsigned long style) :
WindowImplX11::WindowImplX11(VideoMode mode, const String& title, unsigned long style) :
m_window (0),
m_inputMethod (NULL),
m_inputContext(NULL),
@ -313,9 +315,23 @@ void WindowImplX11::setSize(const Vector2u& size)
////////////////////////////////////////////////////////////
void WindowImplX11::setTitle(const std::string& title)
void WindowImplX11::setTitle(const String& title)
{
XStoreName(m_display, m_window, title.c_str());
// Bare X11 has no Unicode window title support.
// There is however an option to tell the window manager your unicode title via hints.
// Convert to UTF-8 encoding.
std::basic_string<sf::Uint8> utf8Title;
sf::Utf32::toUtf8(title.begin(), title.end(), std::back_inserter(utf8Title));
// Set the _NET_WM_NAME atom, which specifies a UTF-8 encoded window title.
Atom wmName = XInternAtom(m_display, "_NET_WM_NAME", False);
Atom useUtf8 = XInternAtom(m_display, "UTF8_STRING", False);
XChangeProperty(m_display, m_window, wmName, useUtf8, 8,
PropModeReplace, utf8Title.c_str(), utf8Title.size());
// Set the non-Unicode title as a fallback for window managers who don't support _NET_WM_NAME.
XStoreName(m_display, m_window, title.toAnsiString().c_str());
}

6
src/SFML/Window/Linux/WindowImplX11.hpp
View File

@ -30,9 +30,9 @@
////////////////////////////////////////////////////////////
#include <SFML/Window/Event.hpp>
#include <SFML/Window/WindowImpl.hpp>
#include <SFML/System/String.hpp>
#include <X11/Xlib.h>
#include <set>
#include <string>
namespace sf
@ -63,7 +63,7 @@ public :
/// \param style Window style (resizable, fixed, or fullscren)
///
////////////////////////////////////////////////////////////
WindowImplX11(VideoMode mode, const std::string& title, unsigned long style);
WindowImplX11(VideoMode mode, const String& title, unsigned long style);
////////////////////////////////////////////////////////////
/// \brief Destructor
@ -117,7 +117,7 @@ public :
/// \param title New title
///
////////////////////////////////////////////////////////////
virtual void setTitle(const std::string& title);
virtual void setTitle(const String& title);
////////////////////////////////////////////////////////////
/// \brief Change the window's icon

5
src/SFML/Window/OSX/WindowImplCocoa.hpp
View File

@ -31,6 +31,7 @@
////////////////////////////////////////////////////////////
#include <SFML/Window/Event.hpp>
#include <SFML/Window/WindowImpl.hpp>
#include <SFML/System/String.hpp>
////////////////////////////////////////////////////////////
/// Predefine OBJC classes
@ -79,7 +80,7 @@ public :
/// \param style Window style (resizable, fixed, or fullscren)
///
////////////////////////////////////////////////////////////
WindowImplCocoa(VideoMode mode, const std::string& title, unsigned long style);
WindowImplCocoa(VideoMode mode, const String& title, unsigned long style);
////////////////////////////////////////////////////////////
/// \brief Destructor
@ -280,7 +281,7 @@ public :
/// \param title New title
///
////////////////////////////////////////////////////////////
virtual void setTitle(const std::string& title);
virtual void setTitle(const String& title);
////////////////////////////////////////////////////////////
/// \brief Change the window's icon

9
src/SFML/Window/OSX/WindowImplCocoa.mm
View File

@ -28,6 +28,7 @@
////////////////////////////////////////////////////////////
#include <SFML/Window/OSX/WindowImplCocoa.hpp>
#include <SFML/System/Err.hpp>
#include <SFML/System/String.hpp>
#import <SFML/Window/OSX/SFWindowController.h>
#import <SFML/Window/OSX/SFViewController.h>
@ -80,7 +81,7 @@ WindowImplCocoa::WindowImplCocoa(WindowHandle handle)
////////////////////////////////////////////////////////////
WindowImplCocoa::WindowImplCocoa(VideoMode mode,
const std::string& title,
const String& title,
unsigned long style)
: m_showCursor(true)
{
@ -91,7 +92,7 @@ WindowImplCocoa::WindowImplCocoa(VideoMode mode,
retainPool();
m_delegate = [[SFWindowController alloc] initWithMode:mode andStyle:style];
[m_delegate changeTitle:stringToNSString(title)];
[m_delegate changeTitle:sfStringToNSString(title)];
[m_delegate setRequesterTo:this];
}
@ -362,9 +363,9 @@ void WindowImplCocoa::setSize(const Vector2u& size)
////////////////////////////////////////////////////////////
void WindowImplCocoa::setTitle(const std::string& title)
void WindowImplCocoa::setTitle(const String& title)
{
[m_delegate changeTitle:stringToNSString(title)];
[m_delegate changeTitle:sfStringToNSString(title)];
}

3
src/SFML/Window/OSX/cpp_objc_conversion.h
View File

@ -27,6 +27,7 @@
// Headers
////////////////////////////////////////////////////////////
#include <string>
#include <SFML/System/String.hpp>
#import <Foundation/Foundation.h>
@ -35,4 +36,4 @@
///
////////////////////////////////////////////////////////////
NSString* stringToNSString(std::string const& string);
NSString* sfStringToNSString(sf::String const& string);

16
src/SFML/Window/OSX/cpp_objc_conversion.mm
View File

@ -28,6 +28,7 @@
////////////////////////////////////////////////////////////
#include <SFML/System/Utf.hpp>
#import <Foundation/Foundation.h>
#import <SFML/Window/OSX/cpp_objc_conversion.h>
////////////////////////////////////////////////////////////
@ -40,3 +41,18 @@ NSString* stringToNSString(std::string const& string)
return str;
}
////////////////////////////////////////////////////////////
NSString* sfStringToNSString(sf::String const& string)
{
sf::Uint32 length = string.getSize() * sizeof(sf::Uint32);
const void* data = reinterpret_cast<const void*>(string.getData());
NSStringEncoding encoding;
if (NSHostByteOrder() == NS_LittleEndian)
encoding = NSUTF32LittleEndianStringEncoding;
else
encoding = NSUTF32BigEndianStringEncoding;
NSString* str = [[NSString alloc] initWithBytes:data length:length encoding:encoding];
return str;
}

22
src/SFML/Window/Win32/WindowImplWin32.cpp
View File

@ -37,6 +37,7 @@
#include <SFML/Window/WindowStyle.hpp>
#include <GL/gl.h>
#include <SFML/System/Err.hpp>
#include <SFML/System/Utf.hpp>
#include <vector>
// MinGW lacks the definition of some Win32 constants
@ -84,7 +85,7 @@ m_resizing (false)
////////////////////////////////////////////////////////////
WindowImplWin32::WindowImplWin32(VideoMode mode, const std::string& title, Uint32 style) :
WindowImplWin32::WindowImplWin32(VideoMode mode, const String& title, Uint32 style) :
m_handle (NULL),
m_callback (0),
m_cursor (NULL),
@ -132,14 +133,11 @@ m_resizing (false)
// Create the window
if (hasUnicodeSupport())
{
wchar_t wTitle[256];
int count = MultiByteToWideChar(CP_ACP, MB_PRECOMPOSED, title.c_str(), static_cast<int>(title.size()), wTitle, sizeof(wTitle) / sizeof(*wTitle));
wTitle[count] = L'\0';
m_handle = CreateWindowW(classNameW, wTitle, win32Style, left, top, width, height, NULL, NULL, GetModuleHandle(NULL), this);
m_handle = CreateWindowW(classNameW, title.toWideString().c_str(), win32Style, left, top, width, height, NULL, NULL, GetModuleHandle(NULL), this);
}
else
{
m_handle = CreateWindowA(classNameA, title.c_str(), win32Style, left, top, width, height, NULL, NULL, GetModuleHandle(NULL), this);
m_handle = CreateWindowA(classNameA, title.toAnsiString().c_str(), win32Style, left, top, width, height, NULL, NULL, GetModuleHandle(NULL), this);
}
// Switch to fullscreen if requested
@ -253,9 +251,16 @@ void WindowImplWin32::setSize(const Vector2u& size)
////////////////////////////////////////////////////////////
void WindowImplWin32::setTitle(const std::string& title)
void WindowImplWin32::setTitle(const String& title)
{
SetWindowTextA(m_handle, title.c_str());
if (hasUnicodeSupport())
{
SetWindowTextW(m_handle, title.toWideString().c_str());
}
else
{
SetWindowTextA(m_handle, title.toAnsiString().c_str());
}
}
@ -877,3 +882,4 @@ LRESULT CALLBACK WindowImplWin32::globalOnEvent(HWND handle, UINT message, WPARA
} // namespace priv
} // namespace sf

6
src/SFML/Window/Win32/WindowImplWin32.hpp
View File

@ -30,8 +30,8 @@
////////////////////////////////////////////////////////////
#include <SFML/Window/Event.hpp>
#include <SFML/Window/WindowImpl.hpp>
#include <SFML/System/String.hpp>
#include <windows.h>
#include <string>
namespace sf
@ -62,7 +62,7 @@ public :
/// \param style Window style
///
////////////////////////////////////////////////////////////
WindowImplWin32(VideoMode mode, const std::string& title, Uint32 style);
WindowImplWin32(VideoMode mode, const String& title, Uint32 style);
////////////////////////////////////////////////////////////
/// \brief Destructor
@ -116,7 +116,7 @@ public :
/// \param title New title
///
////////////////////////////////////////////////////////////
virtual void setTitle(const std::string& title);
virtual void setTitle(const String& title);
////////////////////////////////////////////////////////////
/// \brief Change the window's icon

6
src/SFML/Window/Window.cpp
View File

@ -51,7 +51,7 @@ m_frameTimeLimit(Time::Zero)
////////////////////////////////////////////////////////////
Window::Window(VideoMode mode, const std::string& title, Uint32 style, const ContextSettings& settings) :
Window::Window(VideoMode mode, const String& title, Uint32 style, const ContextSettings& settings) :
m_impl (NULL),
m_context (NULL),
m_frameTimeLimit(Time::Zero)
@ -78,7 +78,7 @@ Window::~Window()
////////////////////////////////////////////////////////////
void Window::create(VideoMode mode, const std::string& title, Uint32 style, const ContextSettings& settings)
void Window::create(VideoMode mode, const String& title, Uint32 style, const ContextSettings& settings)
{
// Destroy the previous window implementation
close();
@ -236,7 +236,7 @@ void Window::setSize(const Vector2u size)
////////////////////////////////////////////////////////////
void Window::setTitle(const std::string& title)
void Window::setTitle(const String& title)
{
if (m_impl)
m_impl->setTitle(title);

2
src/SFML/Window/WindowImpl.cpp
View File

@ -55,7 +55,7 @@ namespace sf
namespace priv
{
////////////////////////////////////////////////////////////
WindowImpl* WindowImpl::create(VideoMode mode, const std::string& title, Uint32 style)
WindowImpl* WindowImpl::create(VideoMode mode, const String& title, Uint32 style)
{
return new WindowImplType(mode, title, style);
}

7
src/SFML/Window/WindowImpl.hpp
View File

@ -30,6 +30,7 @@
////////////////////////////////////////////////////////////
#include <SFML/Config.hpp>
#include <SFML/System/NonCopyable.hpp>
#include <SFML/System/String.hpp>
#include <SFML/Window/Event.hpp>
#include <SFML/Window/Joystick.hpp>
#include <SFML/Window/JoystickImpl.hpp>
@ -37,8 +38,6 @@
#include <SFML/Window/WindowHandle.hpp>
#include <queue>
#include <set>
#include <string>
namespace sf
{
@ -64,7 +63,7 @@ public :
/// \return Pointer to the created window (don't forget to delete it)
///
////////////////////////////////////////////////////////////
static WindowImpl* create(VideoMode mode, const std::string& title, Uint32 style);
static WindowImpl* create(VideoMode mode, const String& title, Uint32 style);
////////////////////////////////////////////////////////////
/// \brief Create a new window depending on to the current OS
@ -155,7 +154,7 @@ public :
/// \param title New title
///
////////////////////////////////////////////////////////////
virtual void setTitle(const std::string& title) = 0;
virtual void setTitle(const String& title) = 0;
////////////////////////////////////////////////////////////
/// \brief Change the window's icon