a_dinosaur/ZSNES
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Major mouse fixes, cpu free-up, odd behavior on startup [Ryan Gordon]

Browse Source
This commit is contained in:
hpsolo
2001-06-18 23:45:46 +00:00
parent 33e6666334
commit 2a1c76edf7
1 changed files with 42 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
zsnes/src/linux/sdllink.c
View File

@@ -71,11 +71,13 @@ int MouseX, MouseY;
float MouseMoveX, MouseMoveY; float MouseMoveX, MouseMoveY;
int MouseMove2X, MouseMove2Y; int MouseMove2X, MouseMove2Y;
Uint8 MouseButton; Uint8 MouseButton;
float MouseXScale = 1.0;
float MouseYScale = 1.0;
DWORD LastUsedPos = 0; DWORD LastUsedPos = 0;
DWORD CurMode = -1; DWORD CurMode = -1;
extern BYTE GUIOn2; extern BYTE GUIOn2;
static BYTE IsActivated; static BYTE IsActivated = 1;
#define UPDATE_TICKS_GAME (1000.855001760297741789468390082/60.0) // milliseconds per world update #define UPDATE_TICKS_GAME (1000.855001760297741789468390082/60.0) // milliseconds per world update
#define UPDATE_TICKS_GAMEPAL (1000/50.0)// milliseconds per world update #define UPDATE_TICKS_GAMEPAL (1000/50.0)// milliseconds per world update
@@ -95,6 +97,16 @@ void LinuxExit(void);
extern void gl_clearwin(); extern void gl_clearwin();
#endif #endif
static void adjustMouseXScale(void)
{
MouseXScale = (MouseMaxX - MouseMinX) / ((float) WindowWidth);
}
static void adjustMouseYScale(void)
{
MouseYScale = (MouseMaxY - MouseMinY) / ((float) WindowHeight);
}
int Main_Proc(void) int Main_Proc(void)
{ {
int j; int j;
@@ -133,8 +145,17 @@ int Main_Proc(void)
break; break;
case SDL_MOUSEMOTION: case SDL_MOUSEMOTION:
MouseX = event.motion.x; if (FullScreen)
MouseY = event.motion.y; {
MouseX += event.motion.xrel;
MouseY += event.motion.yrel;
}
else
{
MouseX = ((int) ((float) event.motion.x) * MouseXScale);
MouseY = ((int) ((float) event.motion.y) * MouseYScale);
}
if (MouseX < MouseMinX) MouseX = MouseMinX; if (MouseX < MouseMinX) MouseX = MouseMinX;
if (MouseX > MouseMaxX) MouseX = MouseMaxX; if (MouseX > MouseMaxX) MouseX = MouseMaxX;
if (MouseY < MouseMinY) MouseY = MouseMinY; if (MouseY < MouseMinY) MouseY = MouseMinY;
@@ -310,12 +331,16 @@ int Main_Proc(void)
if(cvidmode != 16) { if(cvidmode != 16) {
surface = SDL_SetVideoMode(WindowWidth, WindowHeight, surface = SDL_SetVideoMode(WindowWidth, WindowHeight,
BitDepth, surface->flags & ~SDL_RESIZABLE); BitDepth, surface->flags & ~SDL_RESIZABLE);
adjustMouseXScale();
adjustMouseYScale();
break; break;
} }
WindowWidth = SurfaceX = event.resize.w; WindowWidth = SurfaceX = event.resize.w;
WindowHeight = SurfaceY = event.resize.h; WindowHeight = SurfaceY = event.resize.h;
surface = SDL_SetVideoMode(WindowWidth, surface = SDL_SetVideoMode(WindowWidth,
WindowHeight, BitDepth, surface->flags); WindowHeight, BitDepth, surface->flags);
adjustMouseXScale();
adjustMouseYScale();
glViewport(0,0, WindowWidth, WindowHeight); glViewport(0,0, WindowWidth, WindowHeight);
glFlush(); glFlush();
gl_clearwin(); gl_clearwin();
@@ -325,6 +350,7 @@ int Main_Proc(void)
break; break;
} }
} }
/* TODO - fix this later /* TODO - fix this later
if(pressed[0x38]!=0&&pressed[0x3E]!=0) if(pressed[0x38]!=0&&pressed[0x3E]!=0)
LinuxExit(); LinuxExit();
@@ -741,6 +767,8 @@ void initwinvideo(void)
WindowHeight = 768; WindowHeight = 768;
break; break;
} }
adjustMouseXScale();
adjustMouseYScale();
} }
if (startgame() != TRUE) if (startgame() != TRUE)
@@ -926,9 +954,13 @@ void UpdateSound(void *userdata, Uint8 * stream, int len)
void UpdateVFrame(void) void UpdateVFrame(void)
{ {
if (GUIOn2 == 1 && IsActivated == 0) SDL_WaitEvent(NULL); /* rcg06172001 get menu animations running correctly... */
Main_Proc(); /*if (GUIOn2 == 1 && IsActivated == 0) SDL_WaitEvent(NULL);*/
if (GUIOn2 == 1 && IsActivated == 0)
SDL_Delay(100); /* spare the CPU a little. */
CheckTimers(); CheckTimers();
Main_Proc();
} }
void clearwin() void clearwin()
@@ -982,18 +1014,22 @@ int GetMouseButton(void)
void SetMouseMinX(int MinX) void SetMouseMinX(int MinX)
{ {
MouseMinX = MinX; MouseMinX = MinX;
adjustMouseXScale();
} }
void SetMouseMaxX(int MaxX) void SetMouseMaxX(int MaxX)
{ {
MouseMaxX = MaxX; MouseMaxX = MaxX;
adjustMouseXScale();
} }
void SetMouseMinY(int MinY) void SetMouseMinY(int MinY)
{ {
MouseMinY = MinY; MouseMinY = MinY;
adjustMouseYScale();
} }
void SetMouseMaxY(int MaxY) void SetMouseMaxY(int MaxY)
{ {
MouseMaxY = MaxY; MouseMaxY = MaxY;
adjustMouseYScale();
} }
// we can probably get rid of these functions since they are no // we can probably get rid of these functions since they are no