Apple-2-Tools/apple2ix
1
0
Fork 0
mirror of https://github.com/mauiaaron/apple2.git synced 2024-06-25 09:29:28 +00:00
Code Issues Projects Releases Wiki Activity

Expose particular settings back to Android so we can persist the values

Browse Source
This commit is contained in:
Aaron Culliney 2015-07-30 23:00:00 -07:00
parent 0bc8869627
commit 0d658932b6
7 changed files with 122 additions and 86 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
Android/app/src/main/java/org/deadc0de/apple2ix/Apple2Activity.java
View File

@ -66,11 +66,16 @@ public class Apple2Activity extends Activity {
public final static int NATIVE_TOUCH_HANDLED = (1 << 0);
public final static int NATIVE_TOUCH_REQUEST_SHOW_MENU = (1 << 1);
public final static int NATIVE_TOUCH_KEY_TAP = (1 << 4);
public final static int NATIVE_TOUCH_KBD = (1 << 5);
public final static int NATIVE_TOUCH_JOY = (1 << 6);
public final static int NATIVE_TOUCH_MENU = (1 << 7);
public final static int NATIVE_TOUCH_INPUT_DEVICE_CHANGED = (1 << 16);
public final static int NATIVE_TOUCH_CPU_SPEED_DEC = (1 << 17);
public final static int NATIVE_TOUCH_CPU_SPEED_INC = (1 << 18);
private native void nativeOnCreate(String dataDir, int sampleRate, int monoBufferSize, int stereoBufferSize);
private native void nativeGraphicsInitialized(int width, int height);
@ -425,6 +430,37 @@ public class Apple2Activity extends Activity {
}
}
if ((nativeFlags & NATIVE_TOUCH_MENU) == 0) {
break;
}
// handle menu-specific actions
if ((nativeFlags & NATIVE_TOUCH_INPUT_DEVICE_CHANGED) != 0) {
if (Apple2Preferences.nativeIsTouchJoystickScreenOwner()) {
Apple2Preferences.CURRENT_TOUCH_DEVICE.saveTouchDevice(this, Apple2Preferences.TouchDevice.JOYSTICK);
} else {
Apple2Preferences.CURRENT_TOUCH_DEVICE.saveTouchDevice(this, Apple2Preferences.TouchDevice.KEYBOARD);
}
}
if ((nativeFlags & NATIVE_TOUCH_CPU_SPEED_DEC) != 0) {
int percentSpeed = Apple2Preferences.nativeGetCPUSpeed();
if (percentSpeed > 100) {
percentSpeed -= 25;
} else {
percentSpeed -= 5;
}
Apple2Preferences.CPU_SPEED_PERCENT.saveInt(this, percentSpeed);
}
if ((nativeFlags & NATIVE_TOUCH_CPU_SPEED_INC) != 0) {
int percentSpeed = Apple2Preferences.nativeGetCPUSpeed();
if (percentSpeed >= 100) {
percentSpeed += 25;
} else {
percentSpeed += 5;
}
Apple2Preferences.CPU_SPEED_PERCENT.saveInt(this, percentSpeed);
}
} while (false);
return super.onTouchEvent(event);

13
Android/app/src/main/java/org/deadc0de/apple2ix/Apple2InputSettingsMenu.java
View File

@ -23,7 +23,6 @@ import android.widget.ArrayAdapter;
import android.widget.CheckBox;
import android.widget.CheckedTextView;
import android.widget.CompoundButton;
import android.widget.FrameLayout;
import android.widget.ImageView;
import android.widget.LinearLayout;
import android.widget.ListView;
@ -149,15 +148,15 @@ public class Apple2InputSettingsMenu implements Apple2MenuView {
return convertView;
}
},
FIRST_INPUT {
CURRENT_INPUT {
@Override
public String getTitle(Apple2Activity activity) {
return activity.getResources().getString(R.string.input_configure_first_title);
return activity.getResources().getString(R.string.input_current);
}
@Override
public String getSummary(Apple2Activity activity) {
return activity.getResources().getString(R.string.input_configure_first_summary);
return activity.getResources().getString(R.string.input_current_summary);
}
@Override
@ -169,7 +168,7 @@ public class Apple2InputSettingsMenu implements Apple2MenuView {
@Override
public void handleSelection(final Apple2Activity activity, final Apple2InputSettingsMenu settingsMenu, boolean isChecked) {
AlertDialog.Builder builder = new AlertDialog.Builder(activity).setIcon(R.drawable.ic_launcher).setCancelable(true).setTitle(R.string.input_configure_first_title);
AlertDialog.Builder builder = new AlertDialog.Builder(activity).setIcon(R.drawable.ic_launcher).setCancelable(true).setTitle(R.string.input_current);
builder.setNegativeButton(R.string.cancel, new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialog, int which) {
@ -181,7 +180,7 @@ public class Apple2InputSettingsMenu implements Apple2MenuView {
activity.getResources().getString(R.string.joystick),
activity.getResources().getString(R.string.keyboard),
};
final int checkedPosition = Apple2Preferences.FIRST_TOUCH_DEVICE.intValue(activity) - 1;
final int checkedPosition = Apple2Preferences.CURRENT_TOUCH_DEVICE.intValue(activity) - 1;
final ArrayAdapter<String> adapter = new ArrayAdapter<String>(activity, android.R.layout.select_dialog_singlechoice, touch_choices) {
@Override
public View getView(int position, View convertView, ViewGroup parent) {
@ -195,7 +194,7 @@ public class Apple2InputSettingsMenu implements Apple2MenuView {
builder.setAdapter(adapter, new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialog, int color) {
Apple2Preferences.FIRST_TOUCH_DEVICE.saveTouchDevice(activity, Apple2Preferences.TouchDevice.values()[color + 1]);
Apple2Preferences.CURRENT_TOUCH_DEVICE.saveTouchDevice(activity, Apple2Preferences.TouchDevice.values()[color + 1]);
dialog.dismiss();
}
});

27
Android/app/src/main/java/org/deadc0de/apple2ix/Apple2Preferences.java
View File

@ -28,6 +28,17 @@ public enum Apple2Preferences {
activity.getPreferences(Context.MODE_PRIVATE).edit().putBoolean(toString(), true).apply();
}
},
CPU_SPEED_PERCENT {
@Override
public void load(Apple2Activity activity) {
nativeSetCPUSpeed(intValue(activity));
}
@Override
public int intValue(Apple2Activity activity) {
return activity.getPreferences(Context.MODE_PRIVATE).getInt(toString(), 100);
}
},
HIRES_COLOR {
@Override
public void load(Apple2Activity activity) {
@ -112,10 +123,10 @@ public enum Apple2Preferences {
return activity.getPreferences(Context.MODE_PRIVATE).getFloat(toString(), defaultLatency);
}
},
FIRST_TOUCH_DEVICE {
CURRENT_TOUCH_DEVICE {
@Override
public void load(Apple2Activity activity) {
nativeSetDefaultTouchDevice(intValue(activity));
nativeSetCurrentTouchDevice(intValue(activity));
}
@Override
@ -260,6 +271,8 @@ public enum Apple2Preferences {
loadPreferences(activity);
}
// native hooks
private static native void nativeSetColor(int color);
private static native boolean nativeSetSpeakerEnabled(boolean enabled);
@ -272,9 +285,17 @@ public enum Apple2Preferences {
private static native void nativeSetAudioLatency(float latencySecs);
private static native void nativeSetDefaultTouchDevice(int device);
private static native void nativeSetCurrentTouchDevice(int device);
private static native void nativeSetTouchMenuEnabled(boolean enabled);
private static native void nativeSetTouchMenuVisibility(float alpha);
public static native boolean nativeIsTouchKeyboardScreenOwner();
public static native boolean nativeIsTouchJoystickScreenOwner();
public static native int nativeGetCPUSpeed();
public static native void nativeSetCPUSpeed(int percentSpeed);
}

4
Android/app/src/main/res/values/strings.xml
View File

@ -24,8 +24,8 @@
<string name="joystick">Joystick</string>
<string name="input_configure">Configure input devices…</string>
<string name="input_configure_summary">Keyboard, joystick, etc</string>
<string name="input_configure_first_title">First touch device</string>
<string name="input_configure_first_summary">Touch device enabled on launch</string>
<string name="input_current">Current touch device</string>
<string name="input_current_summary">Choose current touch device</string>
<string name="input_first_joystick">Touch joystick</string>
<string name="input_first_keyboard">Touch keyboard</string>
<string name="joystick_configure">Configure joysticks…</string>

50
Android/jni/jniprefs.c
View File

@ -21,14 +21,6 @@ typedef enum AndroidTouchDevice_t {
ANDROID_TOUCH_DEVICE_MAX,
} AndroidTouchDevice_t;
void Java_org_deadc0de_apple2ix_Apple2Preferences_nativeEnableTouchJoystick(JNIEnv *env, jclass cls, jboolean enabled) {
LOG("native enable touch joystick : %d", enabled);
}
void Java_org_deadc0de_apple2ix_Apple2Preferences_nativeEnableTiltJoystick(JNIEnv *env, jclass cls, jboolean enabled) {
LOG("native enable tilt joystick : %d", enabled);
}
void Java_org_deadc0de_apple2ix_Apple2Preferences_nativeSetColor(JNIEnv *env, jclass cls, jint color) {
LOG("native set hires color : %d", color);
if (color < COLOR_NONE || color > COLOR_INTERP) {
@ -76,7 +68,7 @@ void Java_org_deadc0de_apple2ix_Apple2Preferences_nativeSetMockingboardVolume(JN
MB_SetVolumeZeroToTen(goesToTen);
}
void Java_org_deadc0de_apple2ix_Apple2Preferences_nativeSetDefaultTouchDevice(JNIEnv *env, jclass cls, jint touchDevice) {
void Java_org_deadc0de_apple2ix_Apple2Preferences_nativeSetCurrentTouchDevice(JNIEnv *env, jclass cls, jint touchDevice) {
LOG("native set default touch device : %d", touchDevice);
assert(touchDevice >= 0 && touchDevice < ANDROID_TOUCH_DEVICE_MAX);
switch (touchDevice) {
@ -106,3 +98,43 @@ void Java_org_deadc0de_apple2ix_Apple2Preferences_nativeSetTouchMenuVisibility(J
interface_setTouchMenuVisibility(alpha);
}
jboolean Java_org_deadc0de_apple2ix_Apple2Preferences_nativeIsTouchKeyboardScreenOwner(JNIEnv *env, jclass cls) {
LOG("nativeIsTouchKeyboardScreenOwner() ...");
return keydriver_ownsScreen();
}
jboolean Java_org_deadc0de_apple2ix_Apple2Preferences_nativeIsTouchJoystickScreenOwner(JNIEnv *env, jclass cls) {
LOG("nativeIsTouchJoystickScreenOwner() ...");
return joydriver_ownsScreen();
}
jint Java_org_deadc0de_apple2ix_Apple2Preferences_nativeGetCPUSpeed(JNIEnv *env, jclass cls) {
LOG("nativeGetCPUSpeed() ...");
return (jint)round(cpu_scale_factor * 100.0);
}
void Java_org_deadc0de_apple2ix_Apple2Preferences_nativeSetCPUSpeed(JNIEnv *env, jclass cls, jint percentSpeed) {
LOG("nativeSetCPUSpeed() : %d%%", percentSpeed);
bool wasPaused = cpu_isPaused();
if (!wasPaused) {
cpu_pause();
}
cpu_scale_factor = percentSpeed/100.0;
if (cpu_scale_factor > CPU_SCALE_FASTEST) {
cpu_scale_factor = CPU_SCALE_FASTEST;
}
if (cpu_scale_factor < CPU_SCALE_SLOWEST) {
cpu_scale_factor = CPU_SCALE_SLOWEST;
}
if (video_backend->animation_showCPUSpeed) {
video_backend->animation_showCPUSpeed();
}
if (!wasPaused) {
cpu_resume();
}
}

15
src/interface.h
View File

@ -55,12 +55,15 @@ typedef enum interface_touch_event_t {
} interface_touch_event_t;
typedef enum interface_touch_event_flags {
TOUCH_FLAGS_HANDLED = (1<<0),
TOUCH_FLAGS_REQUEST_HOST_MENU = (1<<1),
TOUCH_FLAGS_KEY_TAP = (1<<4),
TOUCH_FLAGS_KBD = (1<<5),
TOUCH_FLAGS_JOY = (1<<6),
TOUCH_FLAGS_MENU = (1<<7),
TOUCH_FLAGS_HANDLED = (1<<0),
TOUCH_FLAGS_REQUEST_HOST_MENU = (1<<1),
TOUCH_FLAGS_KEY_TAP = (1<<4),
TOUCH_FLAGS_KBD = (1<<5),
TOUCH_FLAGS_JOY = (1<<6),
TOUCH_FLAGS_MENU = (1<<7),
TOUCH_FLAGS_INPUT_DEVICE_CHANGE = (1<<16),
TOUCH_FLAGS_CPU_SPEED_DEC = (1<<17),
TOUCH_FLAGS_CPU_SPEED_INC = (1<<18),
} interface_touch_event_flags;
// handle touch event

63
src/video/gltouchmenu.c
View File

@ -186,63 +186,6 @@ static inline void _screen_to_menu(float x, float y, OUTPARM int *col, OUTPARM i
//LOG("SCREEN TO MENU : menuX:%d menuXMax:%d menuW:%d keyW:%d ... scrn:(%f,%f)->kybd:(%d,%d)", touchport.topLeftX, touchport.topLeftXMax, touchport.width, keyW, x, y, *col, *row);
}
static void _increase_cpu_speed(void) {
cpu_pause();
int percent_scale = (int)round(cpu_scale_factor * 100.0);
if (percent_scale >= 100) {
percent_scale += 25;
} else {
percent_scale += 5;
}
cpu_scale_factor = percent_scale/100.0;
if (cpu_scale_factor > CPU_SCALE_FASTEST) {
cpu_scale_factor = CPU_SCALE_FASTEST;
}
LOG("native set emulation percentage to %f", cpu_scale_factor);
if (video_backend->animation_showCPUSpeed) {
video_backend->animation_showCPUSpeed();
}
timing_initialize();
cpu_resume();
}
void _decrease_cpu_speed(void) {
cpu_pause();
int percent_scale = (int)round(cpu_scale_factor * 100.0);
if (cpu_scale_factor == CPU_SCALE_FASTEST) {
cpu_scale_factor = CPU_SCALE_FASTEST0;
percent_scale = (int)round(cpu_scale_factor * 100);
} else {
if (percent_scale > 100) {
percent_scale -= 25;
} else {
percent_scale -= 5;
}
}
cpu_scale_factor = percent_scale/100.0;
if (cpu_scale_factor < CPU_SCALE_SLOWEST) {
cpu_scale_factor = CPU_SCALE_SLOWEST;
}
LOG("native set emulation percentage to %f", cpu_scale_factor);
if (video_backend->animation_showCPUSpeed) {
video_backend->animation_showCPUSpeed();
}
timing_initialize();
cpu_resume();
}
static inline bool _sprout_menu(float x, float y) {
if (! (_is_point_on_left_menu(x, y) || _is_point_on_right_menu(x, y)) ) {
@ -303,12 +246,12 @@ static inline int64_t _tap_menu_item(float x, float y) {
case MOUSETEXT_LEFT:
LOG("decreasing cpu speed...");
_decrease_cpu_speed();
flags |= TOUCH_FLAGS_CPU_SPEED_DEC;
break;
case MOUSETEXT_RIGHT:
LOG("increasing cpu speed...");
_increase_cpu_speed();
flags |= TOUCH_FLAGS_CPU_SPEED_INC;
break;
case MOUSETEXT_CHECKMARK:
@ -327,6 +270,7 @@ static inline int64_t _tap_menu_item(float x, float y) {
if (video_backend->animation_showTouchJoystick) {
video_backend->animation_showTouchJoystick();
}
flags |= TOUCH_FLAGS_INPUT_DEVICE_CHANGE;
_hide_top_left();
break;
@ -340,6 +284,7 @@ static inline int64_t _tap_menu_item(float x, float y) {
if (video_backend->animation_showTouchKeyboard) {
video_backend->animation_showTouchKeyboard();
}
flags |= TOUCH_FLAGS_INPUT_DEVICE_CHANGE;
_hide_top_left();
break;