Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
G
glfw
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
pirvi-public
glfw
Commits
1e828327
Commit
1e828327
authored
Apr 8, 2016
by
Emmanuel Gil Peyrot
Committed by
Camilla Löwy
May 2, 2016
Browse files
Options
Downloads
Patches
Plain Diff
wayland: Report unsupported operations as errors
parent
c301a1e5
Branches
Branches containing commit
No related tags found
No related merge requests found
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
src/wl_monitor.c
+4
-2
4 additions, 2 deletions
src/wl_monitor.c
src/wl_window.c
+13
-10
13 additions, 10 deletions
src/wl_window.c
with
17 additions
and
12 deletions
src/wl_monitor.c
+
4
−
2
View file @
1e828327
...
...
@@ -244,13 +244,15 @@ void _glfwPlatformGetVideoMode(_GLFWmonitor* monitor, GLFWvidmode* mode)
void
_glfwPlatformGetGammaRamp
(
_GLFWmonitor
*
monitor
,
GLFWgammaramp
*
ramp
)
{
// TODO
fprintf
(
stderr
,
"_glfwPlatformGetGammaRamp not implemented yet
\n
"
);
_glfwInputError
(
GLFW_PLATFORM_ERROR
,
"Wayland: Gamma ramp getting not supported yet"
);
}
void
_glfwPlatformSetGammaRamp
(
_GLFWmonitor
*
monitor
,
const
GLFWgammaramp
*
ramp
)
{
// TODO
fprintf
(
stderr
,
"_glfwPlatformSetGammaRamp not implemented yet
\n
"
);
_glfwInputError
(
GLFW_PLATFORM_ERROR
,
"Wayland: Gamma ramp setting not supported yet"
);
}
...
...
This diff is collapsed.
Click to expand it.
src/wl_window.c
+
13
−
10
View file @
1e828327
...
...
@@ -444,8 +444,8 @@ void _glfwPlatformSetWindowTitle(_GLFWwindow* window, const char* title)
void
_glfwPlatformSetWindowIcon
(
_GLFWwindow
*
window
,
int
count
,
const
GLFWimage
*
images
)
{
// TODO
fprintf
(
stderr
,
"_glfwPlatformSetW
indow
I
con not
implemented yet
\n
"
);
_glfwInputError
(
GLFW_PLATFORM_ERROR
,
"Wayland: Setting w
indow
i
con not
supported
"
);
}
void
_glfwPlatformGetWindowPos
(
_GLFWwindow
*
window
,
int
*
xpos
,
int
*
ypos
)
...
...
@@ -514,8 +514,9 @@ void _glfwPlatformGetWindowFrameSize(_GLFWwindow* window,
void
_glfwPlatformIconifyWindow
(
_GLFWwindow
*
window
)
{
// TODO
fprintf
(
stderr
,
"_glfwPlatformIconifyWindow not implemented yet
\n
"
);
// TODO: move to xdg_shell instead of wl_shell.
_glfwInputError
(
GLFW_PLATFORM_ERROR
,
"Wayland: Iconify window not supported"
);
}
void
_glfwPlatformRestoreWindow
(
_GLFWwindow
*
window
)
...
...
@@ -565,8 +566,8 @@ void _glfwPlatformHideWindow(_GLFWwindow* window)
void
_glfwPlatformFocusWindow
(
_GLFWwindow
*
window
)
{
// TODO
fprintf
(
stderr
,
"_glfwPlatform
Focus
W
in
dow not implemented yet
\
n
"
);
_glfwInputError
(
GLFW_PLATFORM_ERROR
,
"Wayland:
Focusin
g a window requires user interactio
n"
);
}
void
_glfwPlatformSetWindowMonitor
(
_GLFWwindow
*
window
,
...
...
@@ -677,7 +678,7 @@ int _glfwPlatformCreateCursor(_GLFWcursor* cursor,
if
(
fd
<
0
)
{
_glfwInputError
(
GLFW_PLATFORM_ERROR
,
"Wayland: Creating a buffer file for %d B failed: %m
\n
"
,
"Wayland: Creating a buffer file for %d B failed: %m"
,
length
);
return
GLFW_FALSE
;
}
...
...
@@ -686,7 +687,7 @@ int _glfwPlatformCreateCursor(_GLFWcursor* cursor,
if
(
data
==
MAP_FAILED
)
{
_glfwInputError
(
GLFW_PLATFORM_ERROR
,
"Wayland: Cursor mmap failed: %m
\n
"
);
"Wayland: Cursor mmap failed: %m"
);
close
(
fd
);
return
GLFW_FALSE
;
}
...
...
@@ -925,13 +926,15 @@ void _glfwPlatformSetCursor(_GLFWwindow* window, _GLFWcursor* cursor)
void
_glfwPlatformSetClipboardString
(
_GLFWwindow
*
window
,
const
char
*
string
)
{
// TODO
fprintf
(
stderr
,
"_glfwPlatformSetClipboardString not implemented yet
\n
"
);
_glfwInputError
(
GLFW_PLATFORM_ERROR
,
"Wayland: Clipboard setting not implemented yet"
);
}
const
char
*
_glfwPlatformGetClipboardString
(
_GLFWwindow
*
window
)
{
// TODO
fprintf
(
stderr
,
"_glfwPlatformGetClipboardString not implemented yet
\n
"
);
_glfwInputError
(
GLFW_PLATFORM_ERROR
,
"Wayland: Clipboard getting not implemented yet"
);
return
NULL
;
}
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
sign in
to comment