mirror/glfw
1
0
Fork 0
mirror of https://github.com/glfw/glfw.git synced 2024-11-22 04:54:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Added window title to glfwOpenWindow.

Browse Source
This commit is contained in:
Camilla Berglund 2010-09-14 03:10:45 +02:00
parent 3863a22dc1
commit 0f80e066ea
6 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/GL/glfw3.h
View File

@ -410,7 +410,7 @@ GLFWAPI int glfwGetVideoModes(GLFWvidmode* list, int maxcount);
GLFWAPI void glfwGetDesktopMode(GLFWvidmode* mode); GLFWAPI void glfwGetDesktopMode(GLFWvidmode* mode);
/* Window handling */ /* Window handling */
GLFWAPI GLFWwindow glfwOpenWindow(int width, int height, int mode); GLFWAPI GLFWwindow glfwOpenWindow(int width, int height, int mode, const char* title);
GLFWAPI void glfwOpenWindowHint(int target, int hint); GLFWAPI void glfwOpenWindowHint(int target, int hint);
GLFWAPI void glfwMakeWindowCurrent(GLFWwindow window); GLFWAPI void glfwMakeWindowCurrent(GLFWwindow window);
GLFWAPI int glfwIsWindow(GLFWwindow window); GLFWAPI int glfwIsWindow(GLFWwindow window);

1
readme.html
View File

@ -268,6 +268,7 @@ version of GLFW.</p>
<li>Added <code>glfwSetWindowUserPointer</code> and <code>glfwGetWindowUserPointer</code> functions for per-window user pointers</li> <li>Added <code>glfwSetWindowUserPointer</code> and <code>glfwGetWindowUserPointer</code> functions for per-window user pointers</li>
<li>Added <code>glfwGetVersionString</code> function for determining which code paths were enabled at compile time</li> <li>Added <code>glfwGetVersionString</code> function for determining which code paths were enabled at compile time</li>
<li>Added <code>windows</code> simple multi-window test program</li> <li>Added <code>windows</code> simple multi-window test program</li>
<li>Added initial window title parameter to <code>glfwOpenWindow</code></li>
<li>Changed buffer bit depth parameters of <code>glfwOpenWindow</code> to window hints</li> <li>Changed buffer bit depth parameters of <code>glfwOpenWindow</code> to window hints</li>
<li>Renamed <code>lib</code> source code directory to <code>src</code></li> <li>Renamed <code>lib</code> source code directory to <code>src</code></li>
<li>Renamed <code>glfw.h</code> to <code>glfw3.h</code> to avoid conflicts with 2.x series</li> <li>Renamed <code>glfw.h</code> to <code>glfw3.h</code> to avoid conflicts with 2.x series</li>

1
src/internal.h
View File

@ -99,6 +99,7 @@ typedef struct _GLFWhints
typedef struct _GLFWwndconfig typedef struct _GLFWwndconfig
{ {
int mode; int mode;
const char* title;
int refreshRate; int refreshRate;
int windowNoResize; int windowNoResize;
int glMajor; int glMajor;

2
src/win32/win32_window.c
View File

@ -1166,7 +1166,7 @@ static int createWindow(_GLFWwindow* window,
window->Win32.handle = CreateWindowEx(window->Win32.dwExStyle, window->Win32.handle = CreateWindowEx(window->Win32.dwExStyle,
_GLFW_WNDCLASSNAME, _GLFW_WNDCLASSNAME,
"GLFW Window", wndconfig->title,
window->Win32.dwStyle, window->Win32.dwStyle,
wa.left, wa.top, // Window position wa.left, wa.top, // Window position
fullWidth, // Decorated window width fullWidth, // Decorated window width

4
src/window.c
View File

@ -395,7 +395,8 @@ const _GLFWfbconfig* _glfwChooseFBConfig(const _GLFWfbconfig* desired,
// Create the GLFW window and its associated context // Create the GLFW window and its associated context
//======================================================================== //========================================================================
GLFWAPI GLFWwindow glfwOpenWindow(int width, int height, int mode) GLFWAPI GLFWwindow glfwOpenWindow(int width, int height,
int mode, const char* title)
{ {
_GLFWfbconfig fbconfig; _GLFWfbconfig fbconfig;
_GLFWwndconfig wndconfig; _GLFWwndconfig wndconfig;
@ -436,6 +437,7 @@ GLFWAPI GLFWwindow glfwOpenWindow(int width, int height, int mode)
// Set up desired window config // Set up desired window config
wndconfig.mode = mode; wndconfig.mode = mode;
wndconfig.title = title;
wndconfig.refreshRate = Max(_glfwLibrary.hints.refreshRate, 0); wndconfig.refreshRate = Max(_glfwLibrary.hints.refreshRate, 0);
wndconfig.windowNoResize = _glfwLibrary.hints.windowNoResize ? GL_TRUE : GL_FALSE; wndconfig.windowNoResize = _glfwLibrary.hints.windowNoResize ? GL_TRUE : GL_FALSE;
wndconfig.glMajor = Max(_glfwLibrary.hints.glMajor, 1); wndconfig.glMajor = Max(_glfwLibrary.hints.glMajor, 1);

2
src/x11/x11_window.c
View File

@ -828,7 +828,7 @@ static GLboolean createWindow(_GLFWwindow* window,
XFree(hints); XFree(hints);
} }
_glfwPlatformSetWindowTitle(window, "GLFW Window"); _glfwPlatformSetWindowTitle(window, wndconfig->title);
// Make sure the window is mapped before proceeding // Make sure the window is mapped before proceeding
XMapWindow(_glfwLibrary.X11.display, window->X11.handle); XMapWindow(_glfwLibrary.X11.display, window->X11.handle);