Apple-2-Tools/gsplus
1
0
Fork 0
mirror of https://github.com/digarok/gsplus.git synced 2024-05-28 13:41:31 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/ksherlock/gsplus

Browse Source
This commit is contained in:
Kelvin Sherlock 2019-03-08 00:54:12 -05:00
commit 3e6f97c3ea
4 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/options.c
View File

@ -122,10 +122,9 @@ int parse_int(const char *str1, int min, int max)
tmp = strtol(str1, 0, 0);
if (tmp > max) { tmp = max; }
if (tmp < min) { tmp = min; }
printf ( "TMP %d\n", tmp);
return tmp;
}
int parse_cli_options(int argc, char **argv) {
void parse_cli_options(int argc, char **argv) {
int i;
int tmp1;
int skip_amt;

2
src/options.h
View File

@ -1,7 +1,7 @@
#ifdef __cplusplus
extern "C" {
#endif
int parse_cli_options(int argc, char **argv);
void parse_cli_options(int argc, char **argv);
#ifdef __cplusplus
}
#endif

3
src/sim65816.c
View File

@ -790,7 +790,6 @@ void banner() {
int gsplusmain(int argc, char **argv) {
int diff;
int tmp1;
char *final_arg = 0;
@ -800,7 +799,7 @@ int gsplusmain(int argc, char **argv) {
// OG Restoring globals
sim65816_initglobals();
moremem_init();
tmp1 = parse_cli_options(argc, argv);
parse_cli_options(argc, argv);

11
src/win_generic.c
View File

@ -304,8 +304,15 @@ LRESULT CALLBACK win_event_handler(HWND hwnd, UINT umsg, WPARAM wParam, LPARAM l
DragFinish((HDROP)wParam);
break;
case WM_KILLFOCUS:
adb_all_keys_up(); // ALT-TAB doesn't send key-up messages
break;
nb_win32_key = 0;
adb_all_keys_up(); // ALT-TAB doesn't send key-up messages
break;
case WM_ACTIVATE:
if (wParam == WA_INACTIVE) {
nb_win32_key = 0;
adb_all_keys_up();
}
break;
}
switch(umsg) {
HANDLE_MSG(hwnd, WM_KEYUP, WIN_EVENT_KEY);