From 6c6d9d42f7dddb620c5c71745a7e88adf2a4d9ca Mon Sep 17 00:00:00 2001 From: Sam Lantinga Date: Tue, 19 Feb 2013 05:39:19 -0800 Subject: [PATCH] The input API was never implemented, so removing it before release. --- Makefile.in | 1 - include/SDL_input.h | 87 --------------------------------------------- include/SDL_mouse.h | 16 --------- 3 files changed, 104 deletions(-) delete mode 100644 include/SDL_input.h diff --git a/Makefile.in b/Makefile.in index 393e89fa8..dda6692e1 100644 --- a/Makefile.in +++ b/Makefile.in @@ -58,7 +58,6 @@ HDRS = \ SDL_gesture.h \ SDL_haptic.h \ SDL_hints.h \ - SDL_input.h \ SDL_joystick.h \ SDL_keyboard.h \ SDL_keycode.h \ diff --git a/include/SDL_input.h b/include/SDL_input.h deleted file mode 100644 index 38f6f4074..000000000 --- a/include/SDL_input.h +++ /dev/null @@ -1,87 +0,0 @@ -/* - Simple DirectMedia Layer - Copyright (C) 1997-2013 Sam Lantinga - - This software is provided 'as-is', without any express or implied - warranty. In no event will the authors be held liable for any damages - arising from the use of this software. - - Permission is granted to anyone to use this software for any purpose, - including commercial applications, and to alter it and redistribute it - freely, subject to the following restrictions: - - 1. The origin of this software must not be misrepresented; you must not - claim that you wrote the original software. If you use this software - in a product, an acknowledgment in the product documentation would be - appreciated but is not required. - 2. Altered source versions must be plainly marked as such, and must not be - misrepresented as being the original software. - 3. This notice may not be removed or altered from any source distribution. -*/ - -/** - * \file SDL_input.h - * - * Include file for lowlevel SDL input device handling. - * - * This talks about individual devices, and not the system cursor. If you - * just want to know when the user moves the pointer somewhere in your - * window, this is NOT the API you want. This one handles things like - * multi-touch, drawing tablets, and multiple, separate mice. - * - * The other API is in SDL_mouse.h - */ - -#ifndef _SDL_input_h -#define _SDL_input_h - -#include "SDL_stdinc.h" -#include "SDL_error.h" -#include "SDL_video.h" - -#include "begin_code.h" -/* Set up for C function definitions, even when using C++ */ -#ifdef __cplusplus -/* *INDENT-OFF* */ -extern "C" { -/* *INDENT-ON* */ -#endif - - -/* Function prototypes */ - -/* !!! FIXME: real documentation - * - Redetect devices - * - This invalidates all existing device information from previous queries! - * - There is an implicit (re)detect upon SDL_Init(). - */ -extern DECLSPEC int SDLCALL SDL_RedetectInputDevices(void); - -/** - * \brief Get the number of mouse input devices available. - */ -extern DECLSPEC int SDLCALL SDL_GetNumInputDevices(void); - -/** - * \brief Gets the name of a device with the given index. - * - * \param index is the index of the device, whose name is to be returned. - * - * \return the name of the device with the specified index - */ -extern DECLSPEC const char *SDLCALL SDL_GetInputDeviceName(int index); - - -extern DECLSPEC int SDLCALL SDL_IsDeviceDisconnected(int index); - -/* Ends C function definitions when using C++ */ -#ifdef __cplusplus -/* *INDENT-OFF* */ -} -/* *INDENT-ON* */ -#endif -#include "close_code.h" - -#endif /* _SDL_mouse_h */ - -/* vi: set ts=4 sw=4 expandtab: */ diff --git a/include/SDL_mouse.h b/include/SDL_mouse.h index 005da5b56..f6d6300cb 100644 --- a/include/SDL_mouse.h +++ b/include/SDL_mouse.h @@ -23,22 +23,6 @@ * \file SDL_mouse.h * * Include file for SDL mouse event handling. - * - * Please note that this ONLY discusses "mice" with the notion of the - * desktop GUI. You (usually) have one system cursor, and the OS hides - * the hardware details from you. If you plug in 10 mice, all ten move that - * one cursor. For many applications and games, this is perfect, and this - * API has served hundreds of SDL programs well since its birth. - * - * It's not the whole picture, though. If you want more lowlevel control, - * SDL offers a different API, that gives you visibility into each input - * device, multi-touch interfaces, etc. - * - * Those two APIs are incompatible, and you usually should not use both - * at the same time. But for legacy purposes, this API refers to a "mouse" - * when it actually means the system pointer and not a physical mouse. - * - * The other API is in SDL_input.h */ #ifndef _SDL_mouse_h