Merge branch 'android-new-input-ui'
This commit is contained in:
Lioncash
commit
e051935659
|
|
@ -31,6 +31,9 @@
|
|||
<string name="file_clicked">クリックされたファイル： </string>
|
||||
|
||||
<!-- Input Config Fragment -->
|
||||
<string name="input_settings">入力設定</string>
|
||||
<string name="input_binding">入力バインディング</string>
|
||||
<string name="input_binding_descrip">このコントロールにバインドするための入力を移動または押してください。</string>
|
||||
<string name="button_a">Aボタン</string>
|
||||
<string name="button_b">Bボタン</string>
|
||||
<string name="button_start">スタートボタン</string>
|
||||
|
|
@ -115,6 +118,7 @@
|
|||
<!-- Miscellaneous -->
|
||||
<string name="yes">はい</string>
|
||||
<string name="no">いいえ</string>
|
||||
<string name="cancel">キャンセル</string>
|
||||
<string name="disabled">無効</string>
|
||||
<string name="other">その他</string>
|
||||
|
||||
|
|
|
|||
|
|
@ -31,6 +31,9 @@
|
|||
<string name="file_clicked">File clicked: </string>
|
||||
|
||||
<!-- Input Config Fragment -->
|
||||
<string name="input_settings">Input</string>
|
||||
<string name="input_binding">Input Binding</string>
|
||||
<string name="input_binding_descrip">Press or move an input to bind it to this control.</string>
|
||||
<string name="button_a">Button A</string>
|
||||
<string name="button_b">Button B</string>
|
||||
<string name="button_start">Button Start</string>
|
||||
|
|
@ -115,6 +118,7 @@
|
|||
<!-- Miscellaneous -->
|
||||
<string name="yes">Yes</string>
|
||||
<string name="no">No</string>
|
||||
<string name="cancel">Cancel</string>
|
||||
<string name="disabled">Disabled</string>
|
||||
<string name="other">Other</string>
|
||||
|
||||
|
|
|
|||
|
|
@ -0,0 +1,83 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
|
||||
<Preference
|
||||
android:key="InputA"
|
||||
android:title="@string/button_a" />
|
||||
|
||||
<Preference
|
||||
android:key="InputB"
|
||||
android:title="@string/button_b" />
|
||||
|
||||
<Preference
|
||||
android:key="InputX"
|
||||
android:title="@string/button_x" />
|
||||
|
||||
<Preference
|
||||
android:key="InputY"
|
||||
android:title="@string/button_y" />
|
||||
|
||||
<Preference
|
||||
android:key="InputZ"
|
||||
android:title="@string/button_z" />
|
||||
|
||||
<Preference
|
||||
android:key="InputStart"
|
||||
android:title="@string/button_start" />
|
||||
|
||||
<Preference
|
||||
android:key="DPadUp"
|
||||
android:title="@string/dpad_up" />
|
||||
|
||||
<Preference
|
||||
android:key="DPadDown"
|
||||
android:title="@string/dpad_down" />
|
||||
|
||||
<Preference
|
||||
android:key="DPadLeft"
|
||||
android:title="@string/dpad_left" />
|
||||
|
||||
<Preference
|
||||
android:key="DPadRight"
|
||||
android:title="@string/dpad_right" />
|
||||
|
||||
<Preference
|
||||
android:key="MainUp"
|
||||
android:title="@string/main_stick_up" />
|
||||
|
||||
<Preference
|
||||
android:key="MainDown"
|
||||
android:title="@string/main_stick_down" />
|
||||
|
||||
<Preference
|
||||
android:key="MainLeft"
|
||||
android:title="@string/main_stick_left" />
|
||||
|
||||
<Preference
|
||||
android:key="MainRight"
|
||||
android:title="@string/main_stick_right" />
|
||||
|
||||
<Preference
|
||||
android:key="CStickUp"
|
||||
android:title="@string/c_stick_up" />
|
||||
|
||||
<Preference
|
||||
android:key="CStickDown"
|
||||
android:title="@string/c_stick_down" />
|
||||
|
||||
<Preference
|
||||
android:key="CStickLeft"
|
||||
android:title="@string/c_stick_left" />
|
||||
|
||||
<Preference
|
||||
android:key="CStickRight"
|
||||
android:title="@string/c_stick_right" />
|
||||
|
||||
<Preference
|
||||
android:key="InputL"
|
||||
android:title="@string/trigger_left" />
|
||||
|
||||
<Preference
|
||||
android:key="InputR"
|
||||
android:title="@string/trigger_right" />
|
||||
</PreferenceScreen>
|
||||
|
|
@ -22,7 +22,7 @@ import java.io.*;
|
|||
import java.util.List;
|
||||
|
||||
import org.dolphinemu.dolphinemu.gamelist.GameListActivity;
|
||||
import org.dolphinemu.dolphinemu.inputconfig.InputConfigFragment;
|
||||
import org.dolphinemu.dolphinemu.settings.InputConfigFragment;
|
||||
import org.dolphinemu.dolphinemu.settings.UserPreferences;
|
||||
|
||||
public final class DolphinEmulator<MainActivity> extends Activity
|
||||
|
|
|
|||
|
|
@ -15,10 +15,33 @@ import android.view.Surface;
|
|||
*/
|
||||
public final class NativeLibrary
|
||||
{
|
||||
/**
|
||||
* Handles touch events.
|
||||
*
|
||||
* @param Action Mask for the action being performed.
|
||||
* @param X Location on the screen's X-axis that the touch event occurred.
|
||||
* @param Y Location on the screen's Y-axis that the touch event occurred.
|
||||
*/
|
||||
public static native void onTouchEvent(int Action, float X, float Y);
|
||||
|
||||
/**
|
||||
* Handles button press events for a gamepad.
|
||||
*
|
||||
* @param Device The input descriptor of the gamepad.
|
||||
* @param Button Key code identifying which button was pressed.
|
||||
* @param Action Mask identifying which action is happing (button pressed down, or button released).
|
||||
*/
|
||||
public static native void onGamePadEvent(String Device, int Button, int Action);
|
||||
|
||||
/**
|
||||
* Handles gamepad movement events.
|
||||
*
|
||||
* @param Device The device ID of the gamepad.
|
||||
* @param Axis The axis ID
|
||||
* @param Value The value of the axis represented by the given ID.
|
||||
*/
|
||||
public static native void onGamePadMoveEvent(String Device, int Axis, float Value);
|
||||
|
||||
|
||||
/**
|
||||
* Gets a value from a key in the given ini-based config file.
|
||||
*
|
||||
|
|
@ -30,7 +53,7 @@ public final class NativeLibrary
|
|||
* @return the value stored at the key, or a default value if it doesn't exist.
|
||||
*/
|
||||
public static native String GetConfig(String configFile, String Section, String Key, String Default);
|
||||
|
||||
|
||||
/**
|
||||
* Sets a value to a key in the given ini config file.
|
||||
*
|
||||
|
|
@ -40,14 +63,14 @@ public final class NativeLibrary
|
|||
* @param Value The string to set the ini key to.
|
||||
*/
|
||||
public static native void SetConfig(String configFile, String Section, String Key, String Value);
|
||||
|
||||
|
||||
/**
|
||||
* Sets the filename to be run during emulation.
|
||||
*
|
||||
* @param filename The filename to be run during emulation.
|
||||
*/
|
||||
public static native void SetFilename(String filename);
|
||||
|
||||
|
||||
/**
|
||||
* Sets the dimensions of the rendering window.
|
||||
*
|
||||
|
|
@ -55,7 +78,7 @@ public final class NativeLibrary
|
|||
* @param height The new height of the rendering window (in pixels).
|
||||
*/
|
||||
public static native void SetDimensions(int width, int height);
|
||||
|
||||
|
||||
/**
|
||||
* Gets the embedded banner within the given ISO/ROM.
|
||||
*
|
||||
|
|
@ -64,7 +87,7 @@ public final class NativeLibrary
|
|||
* @return an integer array containing the color data for the banner.
|
||||
*/
|
||||
public static native int[] GetBanner(String filename);
|
||||
|
||||
|
||||
/**
|
||||
* Gets the embedded title of the given ISO/ROM.
|
||||
*
|
||||
|
|
@ -73,7 +96,7 @@ public final class NativeLibrary
|
|||
* @return the embedded title of the ISO/ROM.
|
||||
*/
|
||||
public static native String GetTitle(String filename);
|
||||
|
||||
|
||||
/**
|
||||
* Gets the Dolphin version string.
|
||||
*
|
||||
|
|
@ -87,13 +110,13 @@ public final class NativeLibrary
|
|||
* @param surf The surface to render to.
|
||||
*/
|
||||
public static native void Run(Surface surf);
|
||||
|
||||
|
||||
/** Unpauses emulation from a paused state. */
|
||||
public static native void UnPauseEmulation();
|
||||
|
||||
|
||||
/** Pauses emulation. */
|
||||
public static native void PauseEmulation();
|
||||
|
||||
|
||||
/** Stops emulation. */
|
||||
public static native void StopEmulation();
|
||||
|
||||
|
|
|
|||
|
|
@ -27,9 +27,6 @@ import org.dolphinemu.dolphinemu.AboutFragment;
|
|||
import org.dolphinemu.dolphinemu.NativeLibrary;
|
||||
import org.dolphinemu.dolphinemu.R;
|
||||
import org.dolphinemu.dolphinemu.folderbrowser.FolderBrowser;
|
||||
import org.dolphinemu.dolphinemu.inputconfig.InputConfigAdapter;
|
||||
import org.dolphinemu.dolphinemu.inputconfig.InputConfigFragment;
|
||||
import org.dolphinemu.dolphinemu.inputconfig.InputConfigItem;
|
||||
import org.dolphinemu.dolphinemu.settings.PrefsActivity;
|
||||
import org.dolphinemu.dolphinemu.sidemenu.SideMenuAdapter;
|
||||
import org.dolphinemu.dolphinemu.sidemenu.SideMenuItem;
|
||||
|
|
@ -49,16 +46,7 @@ public final class GameListActivity extends Activity
|
|||
private SideMenuAdapter mDrawerAdapter;
|
||||
private ListView mDrawerList;
|
||||
|
||||
/**
|
||||
* Interface defining methods which handle
|
||||
* the binding of specific key presses within
|
||||
* the input mapping settings.
|
||||
*/
|
||||
public interface OnGameConfigListener
|
||||
{
|
||||
boolean onMotionEvent(MotionEvent event);
|
||||
boolean onKeyEvent(KeyEvent event);
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* Called from the {@link GameListFragment}.
|
||||
|
|
@ -84,8 +72,7 @@ public final class GameListActivity extends Activity
|
|||
dir.add(new SideMenuItem(getString(R.string.game_list), 0));
|
||||
dir.add(new SideMenuItem(getString(R.string.browse_folder), 1));
|
||||
dir.add(new SideMenuItem(getString(R.string.settings), 2));
|
||||
dir.add(new SideMenuItem(getString(R.string.gamepad_config), 3));
|
||||
dir.add(new SideMenuItem(getString(R.string.about), 4));
|
||||
dir.add(new SideMenuItem(getString(R.string.about), 3));
|
||||
|
||||
mDrawerAdapter = new SideMenuAdapter(this, R.layout.sidemenu, dir);
|
||||
mDrawerList.setAdapter(mDrawerAdapter);
|
||||
|
|
@ -142,25 +129,9 @@ public final class GameListActivity extends Activity
|
|||
recreateFragment();
|
||||
break;
|
||||
|
||||
case 3: // Gamepad settings
|
||||
{
|
||||
InputConfigAdapter adapter = ((InputConfigFragment)mCurFragment).getAdapter();
|
||||
for (int a = 0; a < adapter.getCount(); ++a)
|
||||
{
|
||||
InputConfigItem o = adapter.getItem(a);
|
||||
String config = o.getConfig();
|
||||
String bind = o.getBind();
|
||||
String ConfigValues[] = config.split("-");
|
||||
String Key = ConfigValues[0];
|
||||
String Value = ConfigValues[1];
|
||||
NativeLibrary.SetConfig("Dolphin.ini", Key, Value, bind);
|
||||
}
|
||||
}
|
||||
break;
|
||||
|
||||
case 0: // Game List
|
||||
case 2: // Settings
|
||||
case 4: // About
|
||||
case 3: // About
|
||||
/* Do Nothing */
|
||||
break;
|
||||
}
|
||||
|
|
@ -197,16 +168,6 @@ public final class GameListActivity extends Activity
|
|||
case 3:
|
||||
{
|
||||
mCurFragmentNum = 3;
|
||||
mCurFragment = new InputConfigFragment();
|
||||
FragmentManager fragmentManager = getFragmentManager();
|
||||
fragmentManager.beginTransaction().replace(R.id.content_frame, mCurFragment).commit();
|
||||
invalidateOptionsMenu();
|
||||
}
|
||||
break;
|
||||
|
||||
case 4:
|
||||
{
|
||||
mCurFragmentNum = 4;
|
||||
mCurFragment = new AboutFragment();
|
||||
FragmentManager fragmentManager = getFragmentManager();
|
||||
fragmentManager.beginTransaction().replace(R.id.content_frame, mCurFragment).commit();
|
||||
|
|
@ -322,30 +283,4 @@ public final class GameListActivity extends Activity
|
|||
{
|
||||
SwitchPage(0);
|
||||
}
|
||||
|
||||
// Gets move(triggers, joystick) events
|
||||
@Override
|
||||
public boolean dispatchGenericMotionEvent(MotionEvent event)
|
||||
{
|
||||
if (mCurFragmentNum == 3)
|
||||
{
|
||||
if (((OnGameConfigListener)mCurFragment).onMotionEvent(event))
|
||||
return true;
|
||||
}
|
||||
|
||||
return super.dispatchGenericMotionEvent(event);
|
||||
}
|
||||
|
||||
// Gets button presses
|
||||
@Override
|
||||
public boolean dispatchKeyEvent(KeyEvent event)
|
||||
{
|
||||
if (mCurFragmentNum == 3)
|
||||
{
|
||||
if (((OnGameConfigListener)mCurFragment).onKeyEvent(event))
|
||||
return true;
|
||||
}
|
||||
|
||||
return super.dispatchKeyEvent(event);
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,70 +0,0 @@
|
|||
/**
|
||||
* Copyright 2013 Dolphin Emulator Project
|
||||
* Licensed under GPLv2
|
||||
* Refer to the license.txt file included.
|
||||
*/
|
||||
|
||||
package org.dolphinemu.dolphinemu.inputconfig;
|
||||
|
||||
import android.content.Context;
|
||||
import android.view.LayoutInflater;
|
||||
import android.view.View;
|
||||
import android.view.ViewGroup;
|
||||
import android.widget.ArrayAdapter;
|
||||
import android.widget.TextView;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
import org.dolphinemu.dolphinemu.R;
|
||||
|
||||
/**
|
||||
* The adapter backing the input mapping configuration.
|
||||
* <p>
|
||||
* Responsible for handling the list items.
|
||||
*/
|
||||
public final class InputConfigAdapter extends ArrayAdapter<InputConfigItem>
|
||||
{
|
||||
private final Context c;
|
||||
private final int id;
|
||||
private final List<InputConfigItem> items;
|
||||
|
||||
public InputConfigAdapter(Context context, int textViewResourceId, List<InputConfigItem> objects)
|
||||
{
|
||||
super(context, textViewResourceId, objects);
|
||||
c = context;
|
||||
id = textViewResourceId;
|
||||
items = objects;
|
||||
}
|
||||
|
||||
@Override
|
||||
public InputConfigItem getItem(int i)
|
||||
{
|
||||
return items.get(i);
|
||||
}
|
||||
|
||||
@Override
|
||||
public View getView(int position, View convertView, ViewGroup parent)
|
||||
{
|
||||
View v = convertView;
|
||||
if (v == null)
|
||||
{
|
||||
LayoutInflater vi = (LayoutInflater)c.getSystemService(Context.LAYOUT_INFLATER_SERVICE);
|
||||
v = vi.inflate(id, parent, false);
|
||||
}
|
||||
|
||||
final InputConfigItem item = items.get(position);
|
||||
if (item != null)
|
||||
{
|
||||
TextView title = (TextView) v.findViewById(R.id.FolderTitle);
|
||||
TextView subtitle = (TextView) v.findViewById(R.id.FolderSubTitle);
|
||||
|
||||
if (title != null)
|
||||
title.setText(item.getName());
|
||||
|
||||
if (subtitle != null)
|
||||
subtitle.setText(item.getBind());
|
||||
}
|
||||
|
||||
return v;
|
||||
}
|
||||
}
|
||||
|
|
@ -1,217 +0,0 @@
|
|||
/**
|
||||
* Copyright 2013 Dolphin Emulator Project
|
||||
* Licensed under GPLv2
|
||||
* Refer to the license.txt file included.
|
||||
*/
|
||||
|
||||
package org.dolphinemu.dolphinemu.inputconfig;
|
||||
|
||||
import android.app.Activity;
|
||||
import android.app.Fragment;
|
||||
import android.os.Build;
|
||||
import android.os.Bundle;
|
||||
import android.util.Log;
|
||||
import android.view.*;
|
||||
import android.widget.AdapterView;
|
||||
import android.widget.ListView;
|
||||
import android.widget.Toast;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
|
||||
import org.dolphinemu.dolphinemu.R;
|
||||
import org.dolphinemu.dolphinemu.gamelist.GameListActivity;
|
||||
|
||||
/**
|
||||
* The {@link Fragment} responsible for implementing the functionality
|
||||
* within the input control mapping config.
|
||||
*/
|
||||
public final class InputConfigFragment extends Fragment
|
||||
implements GameListActivity.OnGameConfigListener
|
||||
{
|
||||
private Activity m_activity;
|
||||
private ListView mDrawerList;
|
||||
private InputConfigAdapter adapter;
|
||||
private int configPosition = 0;
|
||||
private boolean Configuring = false;
|
||||
private boolean firstEvent = true;
|
||||
|
||||
/**
|
||||
* Gets the descriptor for the given {@link InputDevice}.
|
||||
*
|
||||
* @param input The {@link InputDevice} to get the descriptor of.
|
||||
*
|
||||
* @return the descriptor for the given {@link InputDevice}.
|
||||
*/
|
||||
public static String getInputDesc(InputDevice input)
|
||||
{
|
||||
if (input == null)
|
||||
return "null"; // Happens when the inputdevice is from an unknown source
|
||||
|
||||
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN)
|
||||
{
|
||||
return input.getDescriptor();
|
||||
}
|
||||
else
|
||||
{
|
||||
List<InputDevice.MotionRange> motions = input.getMotionRanges();
|
||||
String fakeid = "";
|
||||
|
||||
for (InputDevice.MotionRange range : motions)
|
||||
fakeid += range.getAxis();
|
||||
|
||||
return fakeid;
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState)
|
||||
{
|
||||
List<InputConfigItem> Input = new ArrayList<InputConfigItem>();
|
||||
Input.add(new InputConfigItem(getString(R.string.button_a), "Android-InputA"));
|
||||
Input.add(new InputConfigItem(getString(R.string.button_b), "Android-InputB"));
|
||||
Input.add(new InputConfigItem(getString(R.string.button_start), "Android-InputStart"));
|
||||
Input.add(new InputConfigItem(getString(R.string.button_x), "Android-InputX"));
|
||||
Input.add(new InputConfigItem(getString(R.string.button_y), "Android-InputY"));
|
||||
Input.add(new InputConfigItem(getString(R.string.button_z), "Android-InputZ"));
|
||||
Input.add(new InputConfigItem(getString(R.string.dpad_up), "Android-DPadUp"));
|
||||
Input.add(new InputConfigItem(getString(R.string.dpad_down), "Android-DPadDown"));
|
||||
Input.add(new InputConfigItem(getString(R.string.dpad_left), "Android-DPadLeft"));
|
||||
Input.add(new InputConfigItem(getString(R.string.dpad_right), "Android-DPadRight"));
|
||||
Input.add(new InputConfigItem(getString(R.string.main_stick_up), "Android-MainUp"));
|
||||
Input.add(new InputConfigItem(getString(R.string.main_stick_down), "Android-MainDown"));
|
||||
Input.add(new InputConfigItem(getString(R.string.main_stick_left), "Android-MainLeft"));
|
||||
Input.add(new InputConfigItem(getString(R.string.main_stick_right), "Android-MainRight"));
|
||||
Input.add(new InputConfigItem(getString(R.string.c_stick_up), "Android-CStickUp"));
|
||||
Input.add(new InputConfigItem(getString(R.string.c_stick_down), "Android-CStickDown"));
|
||||
Input.add(new InputConfigItem(getString(R.string.c_stick_left), "Android-CStickLeft"));
|
||||
Input.add(new InputConfigItem(getString(R.string.c_stick_right), "Android-CStickRight"));
|
||||
Input.add(new InputConfigItem(getString(R.string.trigger_left), "Android-InputL"));
|
||||
Input.add(new InputConfigItem(getString(R.string.trigger_right), "Android-InputR"));
|
||||
|
||||
adapter = new InputConfigAdapter(m_activity, R.layout.folderbrowser, Input);
|
||||
View rootView = inflater.inflate(R.layout.gamelist_listview, container, false);
|
||||
mDrawerList = (ListView) rootView.findViewById(R.id.gamelist);
|
||||
|
||||
mDrawerList.setAdapter(adapter);
|
||||
mDrawerList.setOnItemClickListener(mMenuItemClickListener);
|
||||
return mDrawerList;
|
||||
}
|
||||
|
||||
private AdapterView.OnItemClickListener mMenuItemClickListener = new AdapterView.OnItemClickListener()
|
||||
{
|
||||
public void onItemClick(AdapterView<?> parent, View view, int position, long id)
|
||||
{
|
||||
InputConfigItem o = adapter.getItem(position);
|
||||
|
||||
Toast.makeText(m_activity, getString(R.string.press_button_to_config, o.getName()), Toast.LENGTH_SHORT).show();
|
||||
configPosition = position;
|
||||
Configuring = true;
|
||||
firstEvent = true;
|
||||
}
|
||||
};
|
||||
|
||||
private static ArrayList<Float> m_values = new ArrayList<Float>();
|
||||
|
||||
private void AssignBind(String bind)
|
||||
{
|
||||
InputConfigItem o = adapter.getItem(configPosition);
|
||||
adapter.remove(o);
|
||||
o.setBind(bind);
|
||||
adapter.insert(o, configPosition);
|
||||
}
|
||||
|
||||
/**
|
||||
* Gets the current {@link InputConfigAdapter}
|
||||
*
|
||||
* @return the current {@link InputConfigAdapter}.
|
||||
*/
|
||||
public InputConfigAdapter getAdapter()
|
||||
{
|
||||
return adapter;
|
||||
}
|
||||
|
||||
// Called from GameListActivity
|
||||
public boolean onMotionEvent(MotionEvent event)
|
||||
{
|
||||
if ((event.getSource() & InputDevice.SOURCE_CLASS_JOYSTICK) == 0)
|
||||
return false;
|
||||
|
||||
InputDevice input = event.getDevice();
|
||||
List<InputDevice.MotionRange> motions = input.getMotionRanges();
|
||||
if (Configuring)
|
||||
{
|
||||
if (firstEvent)
|
||||
{
|
||||
m_values.clear();
|
||||
|
||||
for (InputDevice.MotionRange range : motions)
|
||||
{
|
||||
m_values.add(event.getAxisValue(range.getAxis()));
|
||||
}
|
||||
|
||||
firstEvent = false;
|
||||
}
|
||||
else
|
||||
{
|
||||
for (int a = 0; a < motions.size(); ++a)
|
||||
{
|
||||
InputDevice.MotionRange range = motions.get(a);
|
||||
|
||||
if (m_values.get(a) > (event.getAxisValue(range.getAxis()) + 0.5f))
|
||||
{
|
||||
AssignBind("Device '" + InputConfigFragment.getInputDesc(input) + "'-Axis " + range.getAxis() + "-");
|
||||
Configuring = false;
|
||||
}
|
||||
else if (m_values.get(a) < (event.getAxisValue(range.getAxis()) - 0.5f))
|
||||
{
|
||||
AssignBind("Device '" + InputConfigFragment.getInputDesc(input) + "'-Axis " + range.getAxis() + "+");
|
||||
Configuring = false;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
return true;
|
||||
}
|
||||
|
||||
// Called from GameListActivity
|
||||
public boolean onKeyEvent(KeyEvent event)
|
||||
{
|
||||
Log.w("InputConfigFragment", "Got Event " + event.getAction());
|
||||
switch (event.getAction())
|
||||
{
|
||||
case KeyEvent.ACTION_DOWN:
|
||||
case KeyEvent.ACTION_UP:
|
||||
if (Configuring)
|
||||
{
|
||||
InputDevice input = event.getDevice();
|
||||
AssignBind("Device '" + InputConfigFragment.getInputDesc(input) + "'-Button " + event.getKeyCode());
|
||||
Configuring = false;
|
||||
return true;
|
||||
}
|
||||
|
||||
default:
|
||||
break;
|
||||
}
|
||||
|
||||
return false;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onAttach(Activity activity)
|
||||
{
|
||||
super.onAttach(activity);
|
||||
|
||||
// This makes sure that the container activity has implemented
|
||||
// the callback interface. If not, it throws an exception
|
||||
try
|
||||
{
|
||||
m_activity = activity;
|
||||
}
|
||||
catch (ClassCastException e)
|
||||
{
|
||||
throw new ClassCastException(activity.toString()
|
||||
+ " must implement OnGameListZeroListener");
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -1,101 +0,0 @@
|
|||
/*
|
||||
* Copyright 2013 Dolphin Emulator Project
|
||||
* Licensed under GPLv2
|
||||
* Refer to the license.txt file included.
|
||||
*/
|
||||
|
||||
package org.dolphinemu.dolphinemu.inputconfig;
|
||||
|
||||
import org.dolphinemu.dolphinemu.NativeLibrary;
|
||||
|
||||
/**
|
||||
* Represents a controller input item (button, stick, etc).
|
||||
*/
|
||||
public final class InputConfigItem implements Comparable<InputConfigItem>
|
||||
{
|
||||
private String m_name;
|
||||
private String m_Config;
|
||||
private String m_bind;
|
||||
|
||||
private void Init(String name, String config, String defaultBind)
|
||||
{
|
||||
m_name = name;
|
||||
m_Config = config;
|
||||
String ConfigValues[] = m_Config.split("-");
|
||||
String Key = ConfigValues[0];
|
||||
String Value = ConfigValues[1];
|
||||
m_bind = NativeLibrary.GetConfig("Dolphin.ini", Key, Value, defaultBind);
|
||||
}
|
||||
|
||||
/**
|
||||
* Constructor
|
||||
*
|
||||
* @param name Name of the input config item.
|
||||
* @param config Name of the key in the configuration file that this control modifies.
|
||||
* @param defaultBind Default binding to fall back upon if binding fails.
|
||||
*/
|
||||
public InputConfigItem(String name, String config, String defaultBind)
|
||||
{
|
||||
Init(name, config, defaultBind);
|
||||
}
|
||||
|
||||
/**
|
||||
* Constructor that creates an InputConfigItem
|
||||
* that has a default binding of "None".
|
||||
*
|
||||
* @param name Name of the input config item.
|
||||
* @param config Name of the key in the configuration file that this control modifies.
|
||||
*/
|
||||
public InputConfigItem(String name, String config)
|
||||
{
|
||||
Init(name, config, "None");
|
||||
}
|
||||
|
||||
/**
|
||||
* Gets the name of this InputConfigItem.
|
||||
*
|
||||
* @return the name of this InputConfigItem
|
||||
*/
|
||||
public String getName()
|
||||
{
|
||||
return m_name;
|
||||
}
|
||||
|
||||
/**
|
||||
* Gets the config key this InputConfigItem modifies.
|
||||
*
|
||||
* @return the config key this InputConfigItem modifies.
|
||||
*/
|
||||
public String getConfig()
|
||||
{
|
||||
return m_Config;
|
||||
}
|
||||
|
||||
/**
|
||||
* Gets the currently set binding of this InputConfigItem.
|
||||
*
|
||||
* @return the currently set binding of this InputConfigItem
|
||||
*/
|
||||
public String getBind()
|
||||
{
|
||||
return m_bind;
|
||||
}
|
||||
|
||||
/**
|
||||
* Sets a new binding for this InputConfigItem.
|
||||
*
|
||||
* @param bind The new binding.
|
||||
*/
|
||||
public void setBind(String bind)
|
||||
{
|
||||
m_bind = bind;
|
||||
}
|
||||
|
||||
public int compareTo(InputConfigItem o)
|
||||
{
|
||||
if (this.m_name != null)
|
||||
return this.m_name.toLowerCase().compareTo(o.getName().toLowerCase());
|
||||
else
|
||||
throw new IllegalArgumentException();
|
||||
}
|
||||
}
|
||||
|
|
@ -0,0 +1,258 @@
|
|||
/**
|
||||
* Copyright 2013 Dolphin Emulator Project
|
||||
* Licensed under GPLv2
|
||||
* Refer to the license.txt file included.
|
||||
*/
|
||||
|
||||
package org.dolphinemu.dolphinemu.settings;
|
||||
|
||||
import android.app.Activity;
|
||||
import android.app.AlertDialog;
|
||||
import android.app.Fragment;
|
||||
import android.content.Context;
|
||||
import android.content.DialogInterface;
|
||||
import android.os.Build;
|
||||
import android.os.Bundle;
|
||||
import android.preference.Preference;
|
||||
import android.preference.PreferenceFragment;
|
||||
import android.preference.PreferenceScreen;
|
||||
import android.util.Log;
|
||||
import android.view.*;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
|
||||
import org.dolphinemu.dolphinemu.NativeLibrary;
|
||||
import org.dolphinemu.dolphinemu.R;
|
||||
|
||||
/**
|
||||
* The {@link Fragment} responsible for implementing the functionality
|
||||
* within the input control mapping config.
|
||||
*/
|
||||
public final class InputConfigFragment extends PreferenceFragment
|
||||
//implements PrefsActivity.OnGameConfigListener
|
||||
{
|
||||
private Activity m_activity;
|
||||
private boolean firstEvent = true;
|
||||
private static ArrayList<Float> m_values = new ArrayList<Float>();
|
||||
protected MotionAlertDialog dialog;
|
||||
|
||||
/**
|
||||
* Gets the descriptor for the given {@link InputDevice}.
|
||||
*
|
||||
* @param input The {@link InputDevice} to get the descriptor of.
|
||||
*
|
||||
* @return the descriptor for the given {@link InputDevice}.
|
||||
*/
|
||||
public static String getInputDesc(InputDevice input)
|
||||
{
|
||||
if (input == null)
|
||||
return "null"; // Happens when the inputdevice is from an unknown source
|
||||
|
||||
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN)
|
||||
{
|
||||
return input.getDescriptor();
|
||||
}
|
||||
else
|
||||
{
|
||||
List<InputDevice.MotionRange> motions = input.getMotionRanges();
|
||||
String fakeid = "";
|
||||
|
||||
for (InputDevice.MotionRange range : motions)
|
||||
fakeid += range.getAxis();
|
||||
|
||||
return fakeid;
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onCreate(Bundle savedInstanceState)
|
||||
{
|
||||
super.onCreate(savedInstanceState);
|
||||
|
||||
// Expand the preferences from the XML.
|
||||
addPreferencesFromResource(R.xml.input_prefs);
|
||||
|
||||
// Set the summary messages of the preferences to whatever binding
|
||||
// is currently set within the Dolphin config.
|
||||
final String[] keys =
|
||||
{
|
||||
"InputA", "InputB", "InputX", "InputY", "InputZ", "InputStart",
|
||||
"DPadUp", "DPadDown", "DPadLeft", "DPadRight",
|
||||
"MainUp", "MainDown", "MainLeft", "MainRight",
|
||||
"CStickUp", "CStickDown", "CStickLeft", "CStickRight",
|
||||
"InputL", "InputR",
|
||||
};
|
||||
|
||||
Preference pref;
|
||||
for (String key : keys)
|
||||
{
|
||||
String binding = NativeLibrary.GetConfig("Dolphin.ini", "Android", key, "None");
|
||||
pref = findPreference(key);
|
||||
pref.setSummary(binding);
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean onPreferenceTreeClick(final PreferenceScreen screen, final Preference pref)
|
||||
{
|
||||
// Begin the creation of the input alert.
|
||||
dialog = new MotionAlertDialog(m_activity);
|
||||
|
||||
// Set the key listener
|
||||
dialog.setOnKeyEventListener(new MotionAlertDialog.OnKeyEventListener()
|
||||
{
|
||||
public boolean onKey(KeyEvent event)
|
||||
{
|
||||
Log.d("InputConfigFragment", "Received key event: " + event.getAction());
|
||||
switch (event.getAction())
|
||||
{
|
||||
case KeyEvent.ACTION_DOWN:
|
||||
case KeyEvent.ACTION_UP:
|
||||
InputDevice input = event.getDevice();
|
||||
String bindStr = "Device '" + getInputDesc(input) + "'-Button " + event.getKeyCode();
|
||||
NativeLibrary.SetConfig("Dolphin.ini", "Android", pref.getKey(), bindStr);
|
||||
pref.setSummary(bindStr);
|
||||
dialog.dismiss();
|
||||
return true;
|
||||
|
||||
default:
|
||||
break;
|
||||
}
|
||||
|
||||
return false;
|
||||
}
|
||||
});
|
||||
|
||||
// Set the motion event listener.
|
||||
dialog.setOnMotionEventListener(new MotionAlertDialog.OnMotionEventListener()
|
||||
{
|
||||
public boolean onMotion(MotionEvent event)
|
||||
{
|
||||
Log.d("InputConfigFragment", "Received motion event: " + event.getAction());
|
||||
if (event == null || (event.getSource() & InputDevice.SOURCE_CLASS_JOYSTICK) == 0)
|
||||
return false;
|
||||
|
||||
InputDevice input = event.getDevice();
|
||||
List<InputDevice.MotionRange> motions = input.getMotionRanges();
|
||||
if (firstEvent)
|
||||
{
|
||||
m_values.clear();
|
||||
|
||||
for (InputDevice.MotionRange range : motions)
|
||||
{
|
||||
m_values.add(event.getAxisValue(range.getAxis()));
|
||||
}
|
||||
|
||||
firstEvent = false;
|
||||
}
|
||||
else
|
||||
{
|
||||
for (int a = 0; a < motions.size(); ++a)
|
||||
{
|
||||
InputDevice.MotionRange range = motions.get(a);
|
||||
|
||||
if (m_values.get(a) > (event.getAxisValue(range.getAxis()) + 0.5f))
|
||||
{
|
||||
String bindStr = "Device '" + InputConfigFragment.getInputDesc(input) + "'-Axis " + range.getAxis() + "-";
|
||||
NativeLibrary.SetConfig("Dolphin.ini", "Android", pref.getKey(), bindStr);
|
||||
pref.setSummary(bindStr);
|
||||
}
|
||||
else if (m_values.get(a) < (event.getAxisValue(range.getAxis()) - 0.5f))
|
||||
{
|
||||
String bindStr = "Device '" + InputConfigFragment.getInputDesc(input) + "'-Axis " + range.getAxis() + "+";
|
||||
NativeLibrary.SetConfig("Dolphin.ini", "Android", pref.getKey(), bindStr);
|
||||
pref.setSummary(bindStr);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
dialog.dismiss();
|
||||
return true;
|
||||
}
|
||||
});
|
||||
|
||||
// Set the cancel button.
|
||||
dialog.setButton(AlertDialog.BUTTON_NEGATIVE, getString(R.string.cancel), new AlertDialog.OnClickListener()
|
||||
{
|
||||
public void onClick(DialogInterface dialog, int which)
|
||||
{
|
||||
// Do nothing. This just makes the cancel button appear.
|
||||
}
|
||||
});
|
||||
|
||||
// Set the title and description message.
|
||||
dialog.setTitle(R.string.input_binding);
|
||||
dialog.setMessage(getString(R.string.input_binding_descrip));
|
||||
|
||||
// Don't allow the dialog to close when a user taps
|
||||
// outside of it. They must press cancel or provide an input.
|
||||
dialog.setCanceledOnTouchOutside(false);
|
||||
|
||||
// Everything is set, show the dialog.
|
||||
dialog.show();
|
||||
return true;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onAttach(Activity activity)
|
||||
{
|
||||
super.onAttach(activity);
|
||||
|
||||
// Cache the activity instance.
|
||||
m_activity = activity;
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* {@link AlertDialog} class derivative that can handle motion events.
|
||||
*/
|
||||
protected static final class MotionAlertDialog extends AlertDialog
|
||||
{
|
||||
private OnKeyEventListener keyListener;
|
||||
private OnMotionEventListener motionListener;
|
||||
|
||||
public MotionAlertDialog(Context ctx)
|
||||
{
|
||||
super(ctx);
|
||||
}
|
||||
|
||||
public interface OnKeyEventListener
|
||||
{
|
||||
boolean onKey(KeyEvent event);
|
||||
}
|
||||
|
||||
public interface OnMotionEventListener
|
||||
{
|
||||
boolean onMotion(MotionEvent event);
|
||||
}
|
||||
|
||||
public void setOnKeyEventListener(OnKeyEventListener listener)
|
||||
{
|
||||
this.keyListener = listener;
|
||||
}
|
||||
|
||||
public void setOnMotionEventListener(OnMotionEventListener listener)
|
||||
{
|
||||
this.motionListener = listener;
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean dispatchKeyEvent(KeyEvent event)
|
||||
{
|
||||
if (keyListener.onKey(event))
|
||||
return true;
|
||||
|
||||
return super.dispatchKeyEvent(event);
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean dispatchGenericMotionEvent(MotionEvent event)
|
||||
{
|
||||
if (motionListener.onMotion(event))
|
||||
return true;
|
||||
|
||||
return super.dispatchGenericMotionEvent(event);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -72,6 +72,7 @@ public final class PrefsActivity extends Activity implements ActionBar.TabListen
|
|||
// the TabListener interface, as the callback (listener) for when
|
||||
// this tab is selected.
|
||||
actionBar.addTab(actionBar.newTab().setText(R.string.cpu_settings).setTabListener(this));
|
||||
actionBar.addTab(actionBar.newTab().setText(R.string.input_settings).setTabListener(this));
|
||||
actionBar.addTab(actionBar.newTab().setText(R.string.video_settings).setTabListener(this));
|
||||
}
|
||||
|
||||
|
|
@ -111,6 +112,9 @@ public final class PrefsActivity extends Activity implements ActionBar.TabListen
|
|||
return new CPUSettingsFragment();
|
||||
|
||||
case 1:
|
||||
return new InputConfigFragment();
|
||||
|
||||
case 2:
|
||||
return new VideoSettingsFragment();
|
||||
|
||||
default: // Should never happen.
|
||||
|
|
@ -122,7 +126,7 @@ public final class PrefsActivity extends Activity implements ActionBar.TabListen
|
|||
public int getCount()
|
||||
{
|
||||
// Show total pages.
|
||||
return 2;
|
||||
return 3;
|
||||
}
|
||||
|
||||
@Override
|
||||
|
|
@ -134,6 +138,9 @@ public final class PrefsActivity extends Activity implements ActionBar.TabListen
|
|||
return getString(R.string.cpu_settings).toUpperCase();
|
||||
|
||||
case 1:
|
||||
return getString(R.string.input_settings).toUpperCase();
|
||||
|
||||
case 2:
|
||||
return getString(R.string.video_settings).toUpperCase();
|
||||
|
||||
default: // Should never happen.
|
||||
|
|
|
|||
Loading…
Reference in New Issue