From: Holger Schemel Date: Thu, 10 Jan 2019 18:59:36 +0000 (+0100) Subject: removed experimental (Windows specific) drag and drop test code X-Git-Tag: 4.1.2.0~56 X-Git-Url: https://git.artsoft.org/?a=commitdiff_plain;h=0f1e162b9ce8b032e3e50d1cfe9dcc157b4814de;p=rocksndiamonds.git removed experimental (Windows specific) drag and drop test code --- diff --git a/src/events.c b/src/events.c index 7b2ba984..e770480d 100644 --- a/src/events.c +++ b/src/events.c @@ -268,10 +268,6 @@ void HandleOtherEvents(Event *event) HandleJoystickEvent(event); break; - case SDL_SYSWMEVENT: - HandleWindowManagerEvent(event); - break; - default: break; } @@ -1522,11 +1518,6 @@ void HandleClientMessageEvent(ClientMessageEvent *event) CloseAllAndExit(0); } -void HandleWindowManagerEvent(Event *event) -{ - SDLHandleWindowManagerEvent(event); -} - void HandleButton(int mx, int my, int button, int button_nr) { static int old_mx = 0, old_my = 0; diff --git a/src/events.h b/src/events.h index 93504eb9..c90580b0 100644 --- a/src/events.h +++ b/src/events.h @@ -35,7 +35,6 @@ boolean HandleKeysDebug(Key, int); void HandleKeyEvent(KeyEvent *); void HandleFocusEvent(FocusChangeEvent *); void HandleClientMessageEvent(ClientMessageEvent *); -void HandleWindowManagerEvent(Event *); void HandleToonAnimations(void); diff --git a/src/libgame/sdl.c b/src/libgame/sdl.c index 2c8e116a..45cfcd7d 100644 --- a/src/libgame/sdl.c +++ b/src/libgame/sdl.c @@ -660,32 +660,6 @@ boolean SDLSetVideoMode(boolean fullscreen) SDLRedrawWindow(); // map window -#ifdef DEBUG -#if defined(PLATFORM_WIN32) - // experimental drag and drop code - - SDL_EventState(SDL_SYSWMEVENT, SDL_ENABLE); - - { - SDL_SysWMinfo wminfo; - HWND hwnd; - boolean wminfo_success = FALSE; - - SDL_VERSION(&wminfo.version); - - if (sdl_window) - wminfo_success = SDL_GetWindowWMInfo(sdl_window, &wminfo); - - if (wminfo_success) - { - hwnd = wminfo.info.win.window; - - DragAcceptFiles(hwnd, TRUE); - } - } -#endif -#endif - return success; } @@ -2388,40 +2362,6 @@ void SDLWaitEvent(Event *event) SDL_WaitEvent(event); } -void SDLHandleWindowManagerEvent(Event *event) -{ -#ifdef DEBUG -#if defined(PLATFORM_WIN32) - // experimental drag and drop code - - SDL_SysWMEvent *syswmevent = (SDL_SysWMEvent *)event; - SDL_SysWMmsg *syswmmsg = (SDL_SysWMmsg *)(syswmevent->msg); - - if (syswmmsg->msg.win.msg == WM_DROPFILES) - { - HDROP hdrop = (HDROP)syswmmsg->msg.win.wParam; - int i, num_files; - - printf("::: SDL_SYSWMEVENT:\n"); - - num_files = DragQueryFile(hdrop, 0xffffffff, NULL, 0); - - for (i = 0; i < num_files; i++) - { - int buffer_len = DragQueryFile(hdrop, i, NULL, 0); - char buffer[buffer_len + 1]; - - DragQueryFile(hdrop, i, buffer, buffer_len + 1); - - printf("::: - '%s'\n", buffer); - } - - DragFinish((HDROP)syswmmsg->msg.win.wParam); - } -#endif -#endif -} - // ============================================================================ // joystick functions diff --git a/src/libgame/sdl.h b/src/libgame/sdl.h index 4f9ced82..676dfab9 100644 --- a/src/libgame/sdl.h +++ b/src/libgame/sdl.h @@ -413,7 +413,6 @@ void SDLOpenAudio(void); void SDLCloseAudio(void); void SDLWaitEvent(Event *); -void SDLHandleWindowManagerEvent(Event *); void HandleJoystickEvent(Event *); void SDLInitJoysticks(void);