Commit ef598b2e authored by Sam Lantinga's avatar Sam Lantinga

Amazingly the Windows code is almost identical to the Mac OS X code. :)

parent ff0ba0af
...@@ -568,6 +568,14 @@ ...@@ -568,6 +568,14 @@
RelativePath="..\..\src\video\SDL_clipboard.c" RelativePath="..\..\src\video\SDL_clipboard.c"
> >
</File> </File>
<File
RelativePath="..\..\src\events\SDL_clipboardevents.c"
>
</File>
<File
RelativePath="..\..\src\events\SDL_clipboardevents_c.h"
>
</File>
<File <File
RelativePath="..\..\src\SDL_compat.c" RelativePath="..\..\src\SDL_compat.c"
> >
......
...@@ -723,6 +723,14 @@ ...@@ -723,6 +723,14 @@
RelativePath="..\..\src\video\SDL_clipboard.c" RelativePath="..\..\src\video\SDL_clipboard.c"
> >
</File> </File>
<File
RelativePath="..\..\src\events\SDL_clipboardevents.c"
>
</File>
<File
RelativePath="..\..\src\events\SDL_clipboardevents_c.h"
>
</File>
<File <File
RelativePath="..\..\src\SDL_compat.c" RelativePath="..\..\src\SDL_compat.c"
> >
......
...@@ -45,7 +45,7 @@ Cocoa_SetClipboardText(_THIS, const char *text) ...@@ -45,7 +45,7 @@ Cocoa_SetClipboardText(_THIS, const char *text)
{ {
SDL_VideoData *data = (SDL_VideoData *) _this->driverdata; SDL_VideoData *data = (SDL_VideoData *) _this->driverdata;
NSAutoreleasePool *pool; NSAutoreleasePool *pool;
NSPasteboard *pasteboard; NSPasteboard *pasteboard;
NSString *format = GetTextFormat(_this); NSString *format = GetTextFormat(_this);
pool = [[NSAutoreleasePool alloc] init]; pool = [[NSAutoreleasePool alloc] init];
...@@ -63,7 +63,7 @@ char * ...@@ -63,7 +63,7 @@ char *
Cocoa_GetClipboardText(_THIS) Cocoa_GetClipboardText(_THIS)
{ {
NSAutoreleasePool *pool; NSAutoreleasePool *pool;
NSPasteboard *pasteboard; NSPasteboard *pasteboard;
NSString *format = GetTextFormat(_this); NSString *format = GetTextFormat(_this);
NSString *available; NSString *available;
char *text; char *text;
...@@ -96,7 +96,7 @@ SDL_bool ...@@ -96,7 +96,7 @@ SDL_bool
Cocoa_HasClipboardText(_THIS) Cocoa_HasClipboardText(_THIS)
{ {
NSAutoreleasePool *pool; NSAutoreleasePool *pool;
NSPasteboard *pasteboard; NSPasteboard *pasteboard;
NSString *format = GetTextFormat(_this); NSString *format = GetTextFormat(_this);
NSString *available; NSString *available;
SDL_bool result; SDL_bool result;
...@@ -120,7 +120,7 @@ void ...@@ -120,7 +120,7 @@ void
Cocoa_CheckClipboardUpdate(struct SDL_VideoData * data) Cocoa_CheckClipboardUpdate(struct SDL_VideoData * data)
{ {
NSAutoreleasePool *pool; NSAutoreleasePool *pool;
NSPasteboard *pasteboard; NSPasteboard *pasteboard;
NSInteger count; NSInteger count;
pool = [[NSAutoreleasePool alloc] init]; pool = [[NSAutoreleasePool alloc] init];
......
...@@ -23,6 +23,7 @@ ...@@ -23,6 +23,7 @@
#include "SDL_win32video.h" #include "SDL_win32video.h"
#include "SDL_win32window.h" #include "SDL_win32window.h"
#include "../../events/SDL_clipboardevents_c.h"
#ifdef UNICODE #ifdef UNICODE
...@@ -52,6 +53,7 @@ GetWindowHandle(_THIS) ...@@ -52,6 +53,7 @@ GetWindowHandle(_THIS)
int int
WIN_SetClipboardText(_THIS, const char *text) WIN_SetClipboardText(_THIS, const char *text)
{ {
SDL_VideoData *data = (SDL_VideoData *) _this->driverdata;
int result = 0; int result = 0;
if (OpenClipboard(GetWindowHandle(_this))) { if (OpenClipboard(GetWindowHandle(_this))) {
...@@ -93,6 +95,7 @@ WIN_SetClipboardText(_THIS, const char *text) ...@@ -93,6 +95,7 @@ WIN_SetClipboardText(_THIS, const char *text)
WIN_SetError("Couldn't set clipboard data"); WIN_SetError("Couldn't set clipboard data");
result = -1; result = -1;
} }
data->clipboard_count = GetClipboardSequenceNumber();
} }
SDL_free(tstr); SDL_free(tstr);
...@@ -141,4 +144,18 @@ WIN_HasClipboardText(_THIS) ...@@ -141,4 +144,18 @@ WIN_HasClipboardText(_THIS)
} }
} }
void
WIN_CheckClipboardUpdate(struct SDL_VideoData * data)
{
DWORD count;
count = GetClipboardSequenceNumber();
if (count != data->clipboard_count) {
if (data->clipboard_count) {
SDL_SendClipboardUpdate();
}
data->clipboard_count = count;
}
}
/* vi: set ts=4 sw=4 expandtab: */ /* vi: set ts=4 sw=4 expandtab: */
...@@ -24,9 +24,13 @@ ...@@ -24,9 +24,13 @@
#ifndef _SDL_win32clipboard_h #ifndef _SDL_win32clipboard_h
#define _SDL_win32clipboard_h #define _SDL_win32clipboard_h
/* Forward declaration */
struct SDL_VideoData;
extern int WIN_SetClipboardText(_THIS, const char *text); extern int WIN_SetClipboardText(_THIS, const char *text);
extern char *WIN_GetClipboardText(_THIS); extern char *WIN_GetClipboardText(_THIS);
extern SDL_bool WIN_HasClipboardText(_THIS); extern SDL_bool WIN_HasClipboardText(_THIS);
extern void WIN_CheckClipboardUpdate(struct SDL_VideoData * data);
#endif /* _SDL_win32clipboard_h */ #endif /* _SDL_win32clipboard_h */
......
...@@ -162,7 +162,10 @@ WIN_WindowProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam) ...@@ -162,7 +162,10 @@ WIN_WindowProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam)
if (SDL_GetKeyboardFocus() != data->window) { if (SDL_GetKeyboardFocus() != data->window) {
SDL_SetKeyboardFocus(data->window); SDL_SetKeyboardFocus(data->window);
} }
/* FIXME: Update keyboard state */ /*
* FIXME: Update keyboard state
*/
WIN_CheckClipboardUpdate(data->videodata);
} else { } else {
if (SDL_GetKeyboardFocus() == data->window) { if (SDL_GetKeyboardFocus() == data->window) {
SDL_SetKeyboardFocus(NULL); SDL_SetKeyboardFocus(NULL);
......
...@@ -28,7 +28,6 @@ ...@@ -28,7 +28,6 @@
#include "../SDL_pixels_c.h" #include "../SDL_pixels_c.h"
#include "SDL_win32video.h" #include "SDL_win32video.h"
#include "SDL_win32clipboard.h"
#include "SDL_d3drender.h" #include "SDL_d3drender.h"
#include "SDL_gdirender.h" #include "SDL_gdirender.h"
......
...@@ -45,6 +45,7 @@ ...@@ -45,6 +45,7 @@
#include "ddraw.h" #include "ddraw.h"
#endif #endif
#include "SDL_win32clipboard.h"
#include "SDL_win32events.h" #include "SDL_win32events.h"
#include "SDL_win32gamma.h" #include "SDL_win32gamma.h"
#include "SDL_win32keyboard.h" #include "SDL_win32keyboard.h"
...@@ -75,6 +76,8 @@ typedef struct SDL_VideoData ...@@ -75,6 +76,8 @@ typedef struct SDL_VideoData
IDirectDraw *ddraw; IDirectDraw *ddraw;
#endif #endif
DWORD clipboard_count;
const SDL_scancode *key_layout; const SDL_scancode *key_layout;
} SDL_VideoData; } SDL_VideoData;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment