sera/0ad
1
0
Fork 0
forked from 0ad/0ad
Code Pull Requests Activity

Hardware cursor isn't implemented for X.

Browse Source 
Remove dead sys_cursor_create references.

This was SVN commit r2812.
This commit is contained in:
prefect 2005-09-29 21:48:04 +00:00
parent 88f78b9ea2
commit 38dfc3da99
3 changed files with 4 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
source/lib/res/graphics/cursor.cpp
View File

@ -6,7 +6,9 @@
// On Windows, allow runtime choice between system cursors and OpenGL
// cursors (Windows = more responsive, OpenGL = more consistent with what
// the game sees)
#if OS_WIN
#define ALLOW_SYS_CURSOR 1
#endif
#include "lib/ogl.h"
#include "sysdep/sysdep.h" // sys_cursor_*
@ -108,6 +110,8 @@ static int Cursor_reload(Cursor* c, const char* name, Handle)
// .. system cursor (2d, hardware accelerated)
#if ALLOW_SYS_CURSOR
WARN_ERR(sys_cursor_load(filename, hotspotx, hotspoty, &c->sys_cursor));
#else
c->sys_cursor = 0;
#endif
// .. fall back to GLCursor (system cursor code is disabled or failed)
if(!c->sys_cursor)

7
source/lib/sysdep/sysdep.h
View File

@ -112,13 +112,6 @@ extern int clipboard_free(wchar_t* copy);
// note: these do not warn on error; that is left to the caller.
// creates a cursor from the given 32 bpp texture (described by tex.h flags).
// hotspot (hx,hy) is the offset from its upper-left corner to the
// position where mouse clicks are registered.
// the cursor must be cursor_free-ed when no longer needed.
extern int sys_cursor_create(uint w, uint h, uint flags, void* img,
uint hx, uint hy, void** cursor);
// creates a cursor from the given texture file.
// hotspot (hx,hy) is the offset from its upper-left corner to the
// position where mouse clicks are registered.

7
source/lib/sysdep/unix/unix.cpp
View File

@ -112,13 +112,6 @@ ErrorReaction display_error_impl(const wchar_t* text, int flags)
// take advantage of hardware mouse cursors instead of the (jerky when
// loading) OpenGL cursor.
int sys_cursor_create(int UNUSED(w), int UNUSED(h), void* UNUSED(img),
int UNUSED(hx), int UNUSED(hy), void** cursor)
{
*cursor = 0;
return 0;
}
int sys_cursor_set(void* cursor)
{
return 0;