Apple-2-Tools/kegs-android
1
0
Fork 0
mirror of https://github.com/jamessanford/kegs.git synced 2024-06-18 09:30:41 +00:00
Code Issues Projects Releases Wiki Activity

Add JNI Joystick code.

Browse Source
This commit is contained in:
James Sanford 2012-08-21 03:27:48 -07:00
parent 541019db47
commit f0648382c8
4 changed files with 94 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
jni/Android.mk
View File

@ -6,7 +6,7 @@ LOCAL_CFLAGS := -DNDEBUG -DKEGS_LITTLE_ENDIAN -O2 -I.
LOCAL_MODULE := kegs
LOCAL_SRC_FILES := adb.c clock.c config_generic.c config_kegs.c \
dis.c engine_c.c scc.c iwm.c \
joystick_dummy.c moremem.c paddles.c sim65816.c smartport.c \
moremem.c paddles.c sim65816.c smartport.c \
sound.c sound_driver.c video.c scc_socket_driver.c scc_windriver.c \
scc_macdriver.c android_driver.c android_sound_driver.c
LOCAL_LDLIBS := -lm -llog -ljnigraphics -lOpenSLES

95
jni/android_driver.c
View File

@ -38,10 +38,16 @@ int g_screen_mdepth = 0;
int g_android_mouse_x = 0;
int g_android_mouse_y = 0;
extern int g_joystick_type;
extern int g_paddle_buttons;
extern int g_paddle_val[];
extern Kimage g_mainwin_kimage;
extern int g_send_sound_to_file;
extern int g_config_kegs_update_needed;
extern int g_limit_speed;
extern int g_quit_sim_now;
int g_has_focus = 0;
@ -331,6 +337,67 @@ dev_video_init()
g_installed_full_superhires_colormap = 1;
}
void joystick_init() {
g_paddle_val[0] = 32767; // x
g_paddle_val[1] = 32767; // y
g_paddle_val[2] = 32767; // x #2
g_paddle_val[3] = 32767; // y #2
g_paddle_buttons = 0x0C;
if (g_joystick_type != JOYSTICK_TYPE_NATIVE_1) {
g_joystick_type = JOYSTICK_TYPE_NATIVE_1;
g_config_kegs_update_needed = 1;
}
}
void joystick_update(double dcycs) {
paddle_update_trigger_dcycs(dcycs);
}
void joystick_update_buttons() {
}
void joystick_shut() {
}
int x_joystick_update(jclass joystick_class, jobject joystick_event) {
static int button_last = 0;
jfieldID fid = (*g_env)->GetFieldID(g_env, joystick_class, "x", "I");
if (fid == NULL) {
LOGE("NO FID");
return 0;
}
jint x = (*g_env)->GetIntField(g_env, joystick_event, fid);
fid = (*g_env)->GetFieldID(g_env, joystick_class, "y", "I");
if (fid == NULL) {
LOGE("NO FID");
return 0;
}
jint y = (*g_env)->GetIntField(g_env, joystick_event, fid);
fid = (*g_env)->GetFieldID(g_env, joystick_class, "buttons", "I");
if (fid == NULL) {
LOGE("NO FID");
return 0;
}
jint buttons = (*g_env)->GetIntField(g_env, joystick_event, fid);
if (x != 0xFFFF) {
g_paddle_val[0] = MIN(32767, MAX(-32767, x));
}
if (y != 0xFFFF) {
g_paddle_val[1] = MIN(32767, MAX(-32767, y));
}
g_paddle_buttons = (g_paddle_buttons & ~3) + (buttons & 3);
if (buttons != button_last) {
button_last = buttons;
return 0; // wait until the next cycle to process more events
}
return 1;
}
int x_mouse_update(jclass mouse_class, jobject mouse_event) {
static int button_last = 0;
@ -378,6 +445,19 @@ int x_mouse_update(jclass mouse_class, jobject mouse_event) {
return 1;
}
void x_key_special(int key_id) {
key_id = key_id & 0x7f;
switch(key_id) {
case 0:
case 1:
case 2:
case 3:
g_limit_speed = key_id;
g_config_kegs_update_needed = 1;
break;
}
}
int x_key_update(jclass key_class, jobject key_event) {
jfieldID fid = (*g_env)->GetFieldID(g_env, key_class, "key_id", "I");
if (fid == NULL) {
@ -397,9 +477,10 @@ int x_key_update(jclass key_class, jobject key_event) {
LOGE("got key_id %d %d", key_id, key_up);
#endif
int a2_code = key_id;
if (a2_code != -1) {
adb_physical_key_update(a2_code, key_up);
if (key_id >= 0 && key_id < 0x80) {
adb_physical_key_update(key_id, key_up);
} else if (key_id >= 0x80) {
x_key_special(key_id);
}
if (!key_up) {
return 0; // only process one key down event per loop
@ -445,15 +526,19 @@ check_input_events()
event_item = (*g_env)->CallObjectMethod(g_env, g_eventqueue, mid);
if (event_item != NULL) {
jclass mouse_class = (*g_env)->FindClass(g_env, "com/froop/app/kegs/KegsView$MouseKegsEvent");
jclass key_class = (*g_env)->FindClass(g_env, "com/froop/app/kegs/KegsView$KeyKegsEvent");
jclass mouse_class = (*g_env)->FindClass(g_env, "com/froop/app/kegs/Event$MouseKegsEvent");
jclass joystick_class = (*g_env)->FindClass(g_env, "com/froop/app/kegs/Event$JoystickKegsEvent");
jclass key_class = (*g_env)->FindClass(g_env, "com/froop/app/kegs/Event$KeyKegsEvent");
if (mouse_class != NULL && (*g_env)->IsInstanceOf(g_env, event_item, mouse_class)) {
keep_going = x_mouse_update(mouse_class, event_item);
} else if (joystick_class != NULL && (*g_env)->IsInstanceOf(g_env, event_item, joystick_class)) {
keep_going = x_joystick_update(joystick_class, event_item);
} else if (key_class != NULL && (*g_env)->IsInstanceOf(g_env, event_item, key_class)) {
keep_going = x_key_update(key_class, event_item);
}
(*g_env)->DeleteLocalRef(g_env, mouse_class);
(*g_env)->DeleteLocalRef(g_env, joystick_class);
(*g_env)->DeleteLocalRef(g_env, key_class);
(*g_env)->DeleteLocalRef(g_env, event_item);
}

9
jni/config_kegs.c
View File

@ -149,14 +149,11 @@ Cfg_menu g_cfg_disk_menu[] = {
{ 0, 0, 0, 0, 0 },
};
// OG Use define instead of const for joystick_types
#define STRINGIFY(x) #x
#define TOSTRING(x) STRINGIFY(x)
Cfg_menu g_cfg_joystick_menu[] = {
{ "Joystick Configuration", g_cfg_joystick_menu, 0, 0, CFGTYPE_MENU },
{ "Joystick Emulation,"TOSTRING(JOYSTICK_TYPE_KEYPAD)",Keypad Joystick,"TOSTRING(JOYSTICK_TYPE_MOUSE)",Mouse Joystick,"TOSTRING(JOYSTICK_TYPE_NATIVE_1)",Native Joystick 1,"
TOSTRING(JOYSTICK_TYPE_NATIVE_2)",Native Joystick 2,"TOSTRING(JOYSTICK_TYPE_NONE)",No Joystick", KNMP(g_joystick_type), CFGTYPE_INT },
{ "Joystick Configuration", g_cfg_joystick_menu, 0, 0, CFGTYPE_MENU },
{ "Joystick Emulation,0,Keypad Joystick,1,Mouse Joystick,2,Native Joystick 1,"
"3,Native Joystick 2", KNMP(g_joystick_type), CFGTYPE_INT },
{ "Joystick Scale X,0x100,Standard,0x119,+10%,0x133,+20%,"
"0x150,+30%,0xb0,-30%,0xcd,-20%,0xe7,-10%",
KNMP(g_joystick_scale_factor_x), CFGTYPE_INT },

22
jni/paddles.c
View File

@ -38,26 +38,6 @@ double g_paddle_dcycs[4] = { 0.0, 0.0, 0.0, 0.0 };
void
paddle_fixup_joystick_type()
{
/* If g_joystick_type points to an illegal value, change it */
if(g_joystick_type == JOYSTICK_TYPE_NATIVE_1) {
g_joystick_native_type = g_joystick_native_type1;
if(g_joystick_native_type1 < 0) {
g_joystick_type = JOYSTICK_TYPE_KEYPAD;
printf("no joy 1 --- switching to keypad\n");
}
}
if(g_joystick_type == JOYSTICK_TYPE_NATIVE_2) {
g_joystick_native_type = g_joystick_native_type2;
if(g_joystick_native_type2 < 0) {
g_joystick_type = JOYSTICK_TYPE_KEYPAD;
printf("no joy 2 --- switching to keypad\n");
}
}
}
void
paddle_trigger(double dcycs)
{
@ -65,7 +45,6 @@ paddle_trigger(double dcycs)
g_paddle_trig_dcycs = dcycs;
/* Determine what all the paddle values are right now */
paddle_fixup_joystick_type();
switch(g_joystick_type) {
case JOYSTICK_TYPE_KEYPAD: /* Keypad Joystick */
@ -190,6 +169,5 @@ read_paddles(double dcycs, int paddle)
void
paddle_update_buttons()
{
paddle_fixup_joystick_type();
joystick_update_buttons();
}