mirror of
https://github.com/digarok/gsplus.git
synced 2024-06-28 10:29:36 +00:00
merge other stuff
This commit is contained in:
commit
6ccf74f60d
|
@ -122,10 +122,9 @@ int parse_int(const char *str1, int min, int max)
|
||||||
tmp = strtol(str1, 0, 0);
|
tmp = strtol(str1, 0, 0);
|
||||||
if (tmp > max) { tmp = max; }
|
if (tmp > max) { tmp = max; }
|
||||||
if (tmp < min) { tmp = min; }
|
if (tmp < min) { tmp = min; }
|
||||||
printf ( "TMP %d\n", tmp);
|
|
||||||
return tmp;
|
return tmp;
|
||||||
}
|
}
|
||||||
int parse_cli_options(int argc, char **argv) {
|
void parse_cli_options(int argc, char **argv) {
|
||||||
int i;
|
int i;
|
||||||
int tmp1;
|
int tmp1;
|
||||||
int skip_amt;
|
int skip_amt;
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
#ifdef __cplusplus
|
#ifdef __cplusplus
|
||||||
extern "C" {
|
extern "C" {
|
||||||
#endif
|
#endif
|
||||||
int parse_cli_options(int argc, char **argv);
|
void parse_cli_options(int argc, char **argv);
|
||||||
#ifdef __cplusplus
|
#ifdef __cplusplus
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
|
@ -790,7 +790,6 @@ void banner() {
|
||||||
|
|
||||||
int gsplusmain(int argc, char **argv) {
|
int gsplusmain(int argc, char **argv) {
|
||||||
int diff;
|
int diff;
|
||||||
int tmp1;
|
|
||||||
char *final_arg = 0;
|
char *final_arg = 0;
|
||||||
|
|
||||||
|
|
||||||
|
@ -800,7 +799,7 @@ int gsplusmain(int argc, char **argv) {
|
||||||
// OG Restoring globals
|
// OG Restoring globals
|
||||||
sim65816_initglobals();
|
sim65816_initglobals();
|
||||||
moremem_init();
|
moremem_init();
|
||||||
tmp1 = parse_cli_options(argc, argv);
|
parse_cli_options(argc, argv);
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -304,8 +304,15 @@ LRESULT CALLBACK win_event_handler(HWND hwnd, UINT umsg, WPARAM wParam, LPARAM l
|
||||||
DragFinish((HDROP)wParam);
|
DragFinish((HDROP)wParam);
|
||||||
break;
|
break;
|
||||||
case WM_KILLFOCUS:
|
case WM_KILLFOCUS:
|
||||||
adb_all_keys_up(); // ALT-TAB doesn't send key-up messages
|
nb_win32_key = 0;
|
||||||
break;
|
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) {
|
switch(umsg) {
|
||||||
HANDLE_MSG(hwnd, WM_KEYUP, WIN_EVENT_KEY);
|
HANDLE_MSG(hwnd, WM_KEYUP, WIN_EVENT_KEY);
|
||||||
|
|
Loading…
Reference in New Issue
Block a user