aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorraysan5 <raysan5@gmail.com>2017-03-05 10:55:29 +0100
committerraysan5 <raysan5@gmail.com>2017-03-05 10:55:29 +0100
commit9cfaa81a7e7741f03db1f9579aa0b49bee42cdd7 (patch)
tree86c771651851f7c3164dcbe106feae00412fd76c /src
parent9cda98b4e9ce285698e6a7bbd58b425ac6ce345c (diff)
downloadraylib-9cfaa81a7e7741f03db1f9579aa0b49bee42cdd7.tar.gz
raylib-9cfaa81a7e7741f03db1f9579aa0b49bee42cdd7.zip
Added some flags and functions to manage window
- SetWindowPosition(int x, int y); - SetWindowMonitor(int monitor);
Diffstat (limited to 'src')
-rw-r--r--src/core.c46
-rw-r--r--src/raylib.h17
2 files changed, 45 insertions, 18 deletions
diff --git a/src/core.c b/src/core.c
index 9d40edcc..6ea54862 100644
--- a/src/core.c
+++ b/src/core.c
@@ -578,6 +578,26 @@ void SetWindowIcon(Image image)
#endif
}
+// Set window position on screen (windowed mode)
+void SetWindowPosition(int x, int y)
+{
+ glfwSetWindowPos(window, x, y);
+}
+
+// Set monitor for the current window (fullscreen mode)
+void SetWindowMonitor(int monitor)
+{
+ int monitorCount;
+ GLFWmonitor** monitors = glfwGetMonitors(&monitorCount);
+
+ if ((monitor >= 0) && (monitor < monitorCount))
+ {
+ glfwSetWindowMonitor(window, monitors[monitor], 0, 0, screenWidth, screenHeight, GLFW_DONT_CARE);
+ TraceLog(INFO, "Selected fullscreen monitor: [%i] %s", monitor, glfwGetMonitorName(monitors[monitor]));
+ }
+ else TraceLog(WARNING, "Selected monitor not found");
+}
+
// Get current screen width
int GetScreenWidth(void)
{
@@ -1536,13 +1556,23 @@ static void InitGraphicsDevice(int width, int height)
glfwDefaultWindowHints(); // Set default windows hints
- if (configFlags & FLAG_RESIZABLE_WINDOW)
+ // Check some Window creation flags
+ if (configFlags & FLAG_WINDOW_RESIZABLE) glfwWindowHint(GLFW_RESIZABLE, GL_TRUE); // Resizable window
+ else glfwWindowHint(GLFW_RESIZABLE, GL_FALSE); // Avoid window being resizable
+
+ if (configFlags & FLAG_WINDOW_DECORATED) glfwWindowHint(GLFW_DECORATED, GL_TRUE); // Border and buttons on Window
+
+ if (configFlags & FLAG_WINDOW_TRANSPARENT)
{
- glfwWindowHint(GLFW_RESIZABLE, GL_TRUE); // Resizable window
+ // TODO: Enable transparent window (not ready yet on GLFW 3.2)
}
- else glfwWindowHint(GLFW_RESIZABLE, GL_FALSE); // Avoid window being resizable
- //glfwWindowHint(GLFW_DECORATED, GL_TRUE); // Border and buttons on Window
+ if (configFlags & FLAG_MSAA_4X_HINT)
+ {
+ glfwWindowHint(GLFW_SAMPLES, 4); // Enables multisampling x4 (MSAA), default is 0
+ TraceLog(INFO, "Trying to enable MSAA x4");
+ }
+
//glfwWindowHint(GLFW_RED_BITS, 8); // Framebuffer red color component bits
//glfwWindowHint(GLFW_DEPTH_BITS, 16); // Depthbuffer bits (24 by default)
//glfwWindowHint(GLFW_REFRESH_RATE, 0); // Refresh rate for fullscreen window
@@ -1551,13 +1581,7 @@ static void InitGraphicsDevice(int width, int height)
// NOTE: When asking for an OpenGL context version, most drivers provide highest supported version
// with forward compatibility to older OpenGL versions.
- // For example, if using OpenGL 1.1, driver can provide a 3.3 context fordward compatible.
-
- if (configFlags & FLAG_MSAA_4X_HINT)
- {
- glfwWindowHint(GLFW_SAMPLES, 4); // Enables multisampling x4 (MSAA), default is 0
- TraceLog(INFO, "Trying to enable MSAA x4");
- }
+ // For example, if using OpenGL 1.1, driver can provide a 4.3 context forward compatible.
// Check selection OpenGL version
if (rlGetVersion() == OPENGL_21)
diff --git a/src/raylib.h b/src/raylib.h
index 3ff0d28f..ab7d7027 100644
--- a/src/raylib.h
+++ b/src/raylib.h
@@ -98,13 +98,14 @@
#define RAD2DEG (180.0f/PI)
// raylib Config Flags
-#define FLAG_FULLSCREEN_MODE 1
-#define FLAG_RESIZABLE_WINDOW 2
-#define FLAG_SHOW_LOGO 4
-#define FLAG_SHOW_MOUSE_CURSOR 8
-#define FLAG_CENTERED_MODE 16
-#define FLAG_MSAA_4X_HINT 32
-#define FLAG_VSYNC_HINT 64
+#define FLAG_SHOW_LOGO 1
+#define FLAG_SHOW_MOUSE_CURSOR 2
+#define FLAG_FULLSCREEN_MODE 4
+#define FLAG_WINDOW_RESIZABLE 8
+#define FLAG_WINDOW_DECORATED 16
+#define FLAG_WINDOW_TRANSPARENT 32
+#define FLAG_MSAA_4X_HINT 64
+#define FLAG_VSYNC_HINT 128
// Keyboard Function Keys
#define KEY_SPACE 32
@@ -644,6 +645,8 @@ RLAPI bool WindowShouldClose(void); // Detect if K
RLAPI bool IsWindowMinimized(void); // Detect if window has been minimized (or lost focus)
RLAPI void ToggleFullscreen(void); // Fullscreen toggle (only PLATFORM_DESKTOP)
RLAPI void SetWindowIcon(Image image); // Set icon for window (only PLATFORM_DESKTOP)
+RLAPI void SetWindowPosition(int x, int y); // Set window position on screen (only PLATFORM_DESKTOP)
+RLAPI void SetWindowMonitor(int monitor); // Set monitor for the current window (fullscreen mode)
RLAPI int GetScreenWidth(void); // Get current screen width
RLAPI int GetScreenHeight(void); // Get current screen height