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

Vastly overhauled the UI, there's now a completely new Settings dialog as well as a status bar with disk activity icons and removable drive menus;

Browse Source 
Thoroughly clean up the code to vastly reduce the number of compiler warnings and found and fixed several bugs in the process;
Applied all mainline PCem commits;
Added SCSI hard disk emulation;
Commented out all unfinished machines and graphics cards;
Added the AOpen AP53 and ASUS P/I-P55T2 machines as well as another Tyan 440FX machine, all three with AMI WinBIOS (patch from TheCollector1995);
Added the Diamond Stealth 3D 3000 (S3 ViRGE/VX) graphics card (patch from TheCollector1995);
Added the PS/2 XT IDE (AccuLogic) HDD Controller (patch from TheCollector1995);
Added Microsoft/Logitech Bus Mouse emulation (patch from waltje);
Overhauled the makefiles (patch from waltje);
Added the Adaptec AHA-1542CF SCSI controller (patch from waltje);
Added preliminary (but still unfinished) Adaptec AHA-154x SCSI controller BIOS support (patch from waltje);
Added an ISABugger debugging device (patch from waltje);
Added sanity checks to the Direct3D code.
This commit is contained in:
OBattler
2017-05-05 01:49:42 +02:00
parent d07d53962c
commit f6ef1f833c
346 changed files with 24292 additions and 18058 deletions
Download Patch File Download Diff File Expand all files Collapse all files

104
src/mouse.c
View File

@@ -1,50 +1,108 @@
#include "ibm.h"
#include "mouse.h"
#include "amstrad.h"
#include "mouse_ps2.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"
static mouse_t *mouse_list[] =
{
&mouse_serial_microsoft,
&mouse_ps2_2_button,
&mouse_intellimouse,
&mouse_amstrad,
&mouse_olim24,
NULL
#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_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 */
#if 0
&mouse_msystems, /* 7 Mouse Systems */
&mouse_genius, /* 8 Genius Bus Mouse */
#endif
NULL
};
static mouse_t *cur_mouse;
static void *mouse_p;
int mouse_type = 0;
void mouse_emu_init()
void mouse_emu_init(void)
{
cur_mouse = mouse_list[mouse_type];
mouse_p = cur_mouse->init();
cur_mouse = mouse_list[mouse_type];
mouse_p = cur_mouse->init();
}
void mouse_emu_close()
void mouse_emu_close(void)
{
if (cur_mouse)
cur_mouse->close(mouse_p);
cur_mouse = NULL;
if (cur_mouse)
cur_mouse->close(mouse_p);
cur_mouse = NULL;
}
void mouse_poll(int x, int y, int z, int b)
{
if (cur_mouse)
cur_mouse->poll(x, y, z, b, mouse_p);
if (cur_mouse)
cur_mouse->poll(x, y, z, b, mouse_p);
}
char *mouse_get_name(int mouse)
{
if (!mouse_list[mouse])
return NULL;
return mouse_list[mouse]->name;
if (!mouse_list[mouse])
return(NULL);
return(mouse_list[mouse]->name);
}
char *mouse_get_internal_name(int mouse)
{
return(mouse_list[mouse]->internal_name);
}
int mouse_get_from_internal_name(char *s)
{
int c = 0;
while (mouse_list[c] != NULL)
{
if (!strcmp(mouse_list[c]->internal_name, s))
return(c);
c++;
}
return(0);
}
int mouse_get_type(int mouse)
{
return mouse_list[mouse]->type;
return(mouse_list[mouse]->type);
}
/* Return number of MOUSE types we know about. */
int mouse_get_ndev(void)
{
return(sizeof(mouse_list)/sizeof(mouse_t *) - 1);
}