|
@@ -122,7 +122,6 @@
|
|
SUSPENDED | --- | --- | --- | YES | YES | YES | --- | TODO
|
|
SUSPENDED | --- | --- | --- | YES | YES | YES | --- | TODO
|
|
RESUMED | --- | --- | --- | YES | YES | YES | --- | TODO
|
|
RESUMED | --- | --- | --- | YES | YES | YES | --- | TODO
|
|
QUIT_REQUESTED | YES | YES | YES | --- | --- | --- | TODO | YES
|
|
QUIT_REQUESTED | YES | YES | YES | --- | --- | --- | TODO | YES
|
|
- UPDATE_CURSOR | YES | YES | TODO | --- | --- | TODO | --- | TODO
|
|
|
|
IME | TODO | TODO? | TODO | ??? | TODO | --- | ??? | ???
|
|
IME | TODO | TODO? | TODO | ??? | TODO | --- | ??? | ???
|
|
key repeat flag | YES | YES | YES | --- | --- | YES | TODO | YES
|
|
key repeat flag | YES | YES | YES | --- | --- | YES | TODO | YES
|
|
windowed | YES | YES | YES | --- | --- | YES | TODO | YES
|
|
windowed | YES | YES | YES | --- | --- | YES | TODO | YES
|
|
@@ -1015,9 +1014,6 @@
|
|
- sapp_desc needs a bool whether to initialize depth-stencil surface
|
|
- sapp_desc needs a bool whether to initialize depth-stencil surface
|
|
- GL context initialization needs more control (at least what GL version to initialize)
|
|
- GL context initialization needs more control (at least what GL version to initialize)
|
|
- application icon
|
|
- application icon
|
|
- - the UPDATE_CURSOR event currently behaves differently between Win32 and OSX
|
|
|
|
- (Win32 sends the event each frame when the mouse moves and is inside the window
|
|
|
|
- client area, OSX sends it only once when the mouse enters the client area)
|
|
|
|
- the Android implementation calls cleanup_cb() and destroys the egl context in onDestroy
|
|
- the Android implementation calls cleanup_cb() and destroys the egl context in onDestroy
|
|
at the latest but should do it earlier, in onStop, as an app is "killable" after onStop
|
|
at the latest but should do it earlier, in onStop, as an app is "killable" after onStop
|
|
on Android Honeycomb and later (it can't be done at the moment as the app may be started
|
|
on Android Honeycomb and later (it can't be done at the moment as the app may be started
|
|
@@ -1109,7 +1105,6 @@ typedef enum sapp_event_type {
|
|
SAPP_EVENTTYPE_UNFOCUSED,
|
|
SAPP_EVENTTYPE_UNFOCUSED,
|
|
SAPP_EVENTTYPE_SUSPENDED,
|
|
SAPP_EVENTTYPE_SUSPENDED,
|
|
SAPP_EVENTTYPE_RESUMED,
|
|
SAPP_EVENTTYPE_RESUMED,
|
|
- SAPP_EVENTTYPE_UPDATE_CURSOR,
|
|
|
|
SAPP_EVENTTYPE_QUIT_REQUESTED,
|
|
SAPP_EVENTTYPE_QUIT_REQUESTED,
|
|
SAPP_EVENTTYPE_CLIPBOARD_PASTED,
|
|
SAPP_EVENTTYPE_CLIPBOARD_PASTED,
|
|
SAPP_EVENTTYPE_FILES_DROPPED,
|
|
SAPP_EVENTTYPE_FILES_DROPPED,
|
|
@@ -1420,7 +1415,6 @@ typedef struct sapp_desc {
|
|
bool fullscreen; // whether the window should be created in fullscreen mode
|
|
bool fullscreen; // whether the window should be created in fullscreen mode
|
|
bool alpha; // whether the framebuffer should have an alpha channel (ignored on some platforms)
|
|
bool alpha; // whether the framebuffer should have an alpha channel (ignored on some platforms)
|
|
const char* window_title; // the window title as UTF-8 encoded string
|
|
const char* window_title; // the window title as UTF-8 encoded string
|
|
- bool user_cursor; // if true, user is expected to manage cursor image in SAPP_EVENTTYPE_UPDATE_CURSOR
|
|
|
|
bool enable_clipboard; // enable clipboard access, default is false
|
|
bool enable_clipboard; // enable clipboard access, default is false
|
|
int clipboard_size; // max size of clipboard content in bytes
|
|
int clipboard_size; // max size of clipboard content in bytes
|
|
bool enable_dragndrop; // enable file dropping (drag'n'drop), default is false
|
|
bool enable_dragndrop; // enable file dropping (drag'n'drop), default is false
|
|
@@ -4023,12 +4017,6 @@ _SOKOL_PRIVATE void _sapp_macos_poll_input_events() {
|
|
_sapp_macos_mods(event));
|
|
_sapp_macos_mods(event));
|
|
}
|
|
}
|
|
}
|
|
}
|
|
-- (void)cursorUpdate:(NSEvent*)event {
|
|
|
|
- _SOKOL_UNUSED(event);
|
|
|
|
- if (_sapp.desc.user_cursor) {
|
|
|
|
- _sapp_macos_app_event(SAPP_EVENTTYPE_UPDATE_CURSOR);
|
|
|
|
- }
|
|
|
|
-}
|
|
|
|
@end
|
|
@end
|
|
|
|
|
|
#endif /* MacOS */
|
|
#endif /* MacOS */
|
|
@@ -6872,17 +6860,9 @@ _SOKOL_PRIVATE LRESULT CALLBACK _sapp_win32_wndproc(HWND hWnd, UINT uMsg, WPARAM
|
|
_sapp_win32_uwp_app_event(SAPP_EVENTTYPE_UNFOCUSED);
|
|
_sapp_win32_uwp_app_event(SAPP_EVENTTYPE_UNFOCUSED);
|
|
break;
|
|
break;
|
|
case WM_SETCURSOR:
|
|
case WM_SETCURSOR:
|
|
- if (_sapp.desc.user_cursor) {
|
|
|
|
- if (LOWORD(lParam) == HTCLIENT) {
|
|
|
|
- _sapp_win32_uwp_app_event(SAPP_EVENTTYPE_UPDATE_CURSOR);
|
|
|
|
- return TRUE;
|
|
|
|
- }
|
|
|
|
- }
|
|
|
|
- else {
|
|
|
|
- if (LOWORD(lParam) == HTCLIENT) {
|
|
|
|
- _sapp_win32_update_cursor(_sapp.mouse.current_cursor, _sapp.mouse.shown, true);
|
|
|
|
- return TRUE;
|
|
|
|
- }
|
|
|
|
|
|
+ if (LOWORD(lParam) == HTCLIENT) {
|
|
|
|
+ _sapp_win32_update_cursor(_sapp.mouse.current_cursor, _sapp.mouse.shown, true);
|
|
|
|
+ return TRUE;
|
|
}
|
|
}
|
|
break;
|
|
break;
|
|
case WM_DPICHANGED:
|
|
case WM_DPICHANGED:
|