claunia/86Box
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

Fixed bugs that were preventing NVR and Flash files from behind saved;

Browse Source 
A lot of clean ups from waltje;
Start of a directory structure for the code, thanks to waltje.
This commit is contained in:
OBattler
2017-05-06 17:48:33 +02:00
parent e2a717deae
commit f6612fb33b
344 changed files with 2011 additions and 1870 deletions
Download Patch File Download Diff File Expand all files Collapse all files

57
src/mouse.c
View File

@@ -1,40 +1,22 @@
#include "ibm.h"
#include "mouse.h"
#include "mouse_serial.h"
#ifdef INPORT_MOUSE
# include "mouse_inport.h"
#endif
#include "mouse_ps2.h"
#include "mouse_bus.h"
#include "amstrad.h"
#include "keyboard_olim24.h"
#ifndef INPORTMOUSE
static mouse_t mouse_notimp = {
"Microsoft InPort Mouse",
"msinport",
MOUSE_TYPE_INPORT,
NULL, NULL, NULL
};
#endif
static mouse_t *mouse_list[] = {
&mouse_serial_microsoft, /* 0 Microsoft Serial Mouse */
#ifdef INPORTMOUSE
&mouse_inport, /* 1 Microsoft InPort Bus Mouse */
#else
&mouse_notimp, /* 1 (not implemented) */
#endif
&mouse_ps2_2_button, /* 2 PS/2 Mouse 2-button */
&mouse_ps2_2_button, /* 1 PS/2 Mouse 2-button */
&mouse_intellimouse, /* 2 PS/2 Intellimouse 3-button */
&mouse_bus, /* 3 Logitech Bus Mouse 2-button */
&mouse_intellimouse, /* 4 PS/2 Intellimouse 3-button */
&mouse_amstrad, /* 5 Amstrad PC System Mouse */
&mouse_olim24, /* 6 Olivetti M24 System Mouse */
&mouse_amstrad, /* 4 Amstrad PC System Mouse */
&mouse_olim24, /* 5 Olivetti M24 System Mouse */
#if 0
&mouse_msystems, /* 7 Mouse Systems */
&mouse_genius, /* 8 Genius Bus Mouse */
&mouse_msystems, /* 6 Mouse Systems */
&mouse_genius, /* 7 Genius Bus Mouse */
#endif
NULL
};
@@ -44,14 +26,16 @@ static void *mouse_p;
int mouse_type = 0;
void mouse_emu_init(void)
void
mouse_emu_init(void)
{
cur_mouse = mouse_list[mouse_type];
mouse_p = cur_mouse->init();
}
void mouse_emu_close(void)
void
mouse_emu_close(void)
{
if (cur_mouse)
cur_mouse->close(mouse_p);
@@ -59,14 +43,16 @@ void mouse_emu_close(void)
}
void mouse_poll(int x, int y, int z, int b)
void
mouse_poll(int x, int y, int z, int b)
{
if (cur_mouse)
cur_mouse->poll(x, y, z, b, mouse_p);
}
char *mouse_get_name(int mouse)
char *
mouse_get_name(int mouse)
{
if (!mouse_list[mouse])
return(NULL);
@@ -74,18 +60,19 @@ char *mouse_get_name(int mouse)
}
char *mouse_get_internal_name(int mouse)
char *
mouse_get_internal_name(int mouse)
{
return(mouse_list[mouse]->internal_name);
}
int mouse_get_from_internal_name(char *s)
int
mouse_get_from_internal_name(char *s)
{
int c = 0;
while (mouse_list[c] != NULL)
{
while (mouse_list[c] != NULL) {
if (!strcmp(mouse_list[c]->internal_name, s))
return(c);
c++;
@@ -95,14 +82,16 @@ int mouse_get_from_internal_name(char *s)
}
int mouse_get_type(int mouse)
int
mouse_get_type(int mouse)
{
return(mouse_list[mouse]->type);
}
/* Return number of MOUSE types we know about. */
int mouse_get_ndev(void)
int
mouse_get_ndev(void)
{
return(sizeof(mouse_list)/sizeof(mouse_t *) - 1);
}