# HG changeset patch # User Reto Schneider # Date 1428488076 -7200 # Wed Apr 08 12:14:36 2015 +0200 # Node ID c9e8af2496d2e9092b527e0328e290808cc1917f # Parent daeaa68d7acf3596b16d8ac30ef74253446d1503 Remove trailing spaces in Android source code. diff -r daeaa68d7acf -r c9e8af2496d2 android-project/src/org/libsdl/app/SDLActivity.java --- a/android-project/src/org/libsdl/app/SDLActivity.java Wed Apr 08 02:42:29 2015 -0400 +++ b/android-project/src/org/libsdl/app/SDLActivity.java Wed Apr 08 12:14:36 2015 +0200 @@ -54,7 +54,7 @@ // This is what SDL runs in. It invokes SDL_main(), eventually protected static Thread mSDLThread; - + // Audio protected static AudioTrack mAudioTrack; @@ -83,7 +83,7 @@ System.loadLibrary(lib); } } - + /** * This method is called by SDL before starting the native application thread. * It can be overridden to provide the arguments after the application name. @@ -93,7 +93,7 @@ protected String[] getArguments() { return new String[0]; } - + public static void initialize() { // The static nature of the singleton and Android quirkyness force us to initialize everything here // Otherwise, when exiting the app and returning to it, these variables *keep* their pre exit values @@ -114,11 +114,11 @@ // Setup @Override protected void onCreate(Bundle savedInstanceState) { - Log.v("SDL", "Device: " + android.os.Build.DEVICE); + Log.v("SDL", "Device: " + android.os.Build.DEVICE); Log.v("SDL", "Model: " + android.os.Build.MODEL); Log.v("SDL", "onCreate():" + mSingleton); super.onCreate(savedInstanceState); - + SDLActivity.initialize(); // So we can call stuff from static callbacks mSingleton = this; @@ -161,7 +161,7 @@ // Set up the surface mSurface = new SDLSurface(getApplication()); - + if(Build.VERSION.SDK_INT >= 12) { mJoystickHandler = new SDLJoystickHandler_API12(); } @@ -254,7 +254,7 @@ //Log.v("SDL", "Finished waiting for SDL thread"); } - + super.onDestroy(); // Reset everything in case the user re opens the app SDLActivity.initialize(); @@ -303,7 +303,7 @@ mSurface.handleResume(); } } - + /* The native thread has finished */ public static void handleNativeExit() { SDLActivity.mSDLThread = null; @@ -409,14 +409,14 @@ public static native void onNativeKeyboardFocusLost(); public static native void onNativeMouse(int button, int action, float x, float y); public static native void onNativeTouch(int touchDevId, int pointerFingerId, - int action, float x, + int action, float x, float y, float p); public static native void onNativeAccel(float x, float y, float z); public static native void onNativeSurfaceChanged(); public static native void onNativeSurfaceDestroyed(); public static native void nativeFlipBuffers(); - public static native int nativeAddJoystick(int device_id, String name, - int is_accelerometer, int nbuttons, + public static native int nativeAddJoystick(int device_id, String name, + int is_accelerometer, int nbuttons, int naxes, int nhats, int nballs); public static native int nativeRemoveJoystick(int device_id); public static native String nativeGetHint(String name); @@ -541,33 +541,33 @@ int channelConfig = isStereo ? AudioFormat.CHANNEL_CONFIGURATION_STEREO : AudioFormat.CHANNEL_CONFIGURATION_MONO; int audioFormat = is16Bit ? AudioFormat.ENCODING_PCM_16BIT : AudioFormat.ENCODING_PCM_8BIT; int frameSize = (isStereo ? 2 : 1) * (is16Bit ? 2 : 1); - + Log.v("SDL", "SDL audio: wanted " + (isStereo ? "stereo" : "mono") + " " + (is16Bit ? "16-bit" : "8-bit") + " " + (sampleRate / 1000f) + "kHz, " + desiredFrames + " frames buffer"); - + // Let the user pick a larger buffer if they really want -- but ye // gods they probably shouldn't, the minimums are horrifyingly high // latency already desiredFrames = Math.max(desiredFrames, (AudioTrack.getMinBufferSize(sampleRate, channelConfig, audioFormat) + frameSize - 1) / frameSize); - + if (mAudioTrack == null) { mAudioTrack = new AudioTrack(AudioManager.STREAM_MUSIC, sampleRate, channelConfig, audioFormat, desiredFrames * frameSize, AudioTrack.MODE_STREAM); - + // Instantiating AudioTrack can "succeed" without an exception and the track may still be invalid // Ref: https://android.googlesource.com/platform/frameworks/base/+/refs/heads/master/media/java/android/media/AudioTrack.java // Ref: http://developer.android.com/reference/android/media/AudioTrack.html#getState() - + if (mAudioTrack.getState() != AudioTrack.STATE_INITIALIZED) { Log.e("SDL", "Failed during initialization of Audio Track"); mAudioTrack = null; return -1; } - + mAudioTrack.play(); } - + Log.v("SDL", "SDL audio: got " + ((mAudioTrack.getChannelCount() >= 2) ? "stereo" : "mono") + " " + ((mAudioTrack.getAudioFormat() == AudioFormat.ENCODING_PCM_16BIT) ? "16-bit" : "8-bit") + " " + (mAudioTrack.getSampleRate() / 1000f) + "kHz, " + desiredFrames + " frames buffer"); - + return 0; } @@ -927,11 +927,11 @@ /** SDLSurface. This is what we draw on, so we need to know when it's created - in order to do anything useful. + in order to do anything useful. Because of this, that's where we set up the SDL thread */ -class SDLSurface extends SurfaceView implements SurfaceHolder.Callback, +class SDLSurface extends SurfaceView implements SurfaceHolder.Callback, View.OnKeyListener, View.OnTouchListener, SensorEventListener { // Sensors @@ -941,20 +941,20 @@ // Keep track of the surface size to normalize touch events protected static float mWidth, mHeight; - // Startup + // Startup public SDLSurface(Context context) { super(context); - getHolder().addCallback(this); - + getHolder().addCallback(this); + setFocusable(true); setFocusableInTouchMode(true); requestFocus(); - setOnKeyListener(this); - setOnTouchListener(this); + setOnKeyListener(this); + setOnTouchListener(this); mDisplay = ((WindowManager)context.getSystemService(Context.WINDOW_SERVICE)).getDefaultDisplay(); mSensorManager = (SensorManager)context.getSystemService(Context.SENSOR_SERVICE); - + if(Build.VERSION.SDK_INT >= 12) { setOnGenericMotionListener(new SDLGenericMotionListener_API12()); } @@ -963,7 +963,7 @@ mWidth = 1.0f; mHeight = 1.0f; } - + public void handleResume() { setFocusable(true); setFocusableInTouchMode(true); @@ -972,7 +972,7 @@ setOnTouchListener(this); enableSensor(Sensor.TYPE_ACCELEROMETER, true); } - + public Surface getNativeSurface() { return getHolder().getSurface(); } @@ -1062,7 +1062,7 @@ final Thread sdlThread = new Thread(new SDLMain(), "SDLThread"); enableSensor(Sensor.TYPE_ACCELEROMETER, true); sdlThread.start(); - + // Set up a listener thread to catch when the native thread ends SDLActivity.mSDLThread = new Thread(new Runnable(){ @Override @@ -1071,7 +1071,7 @@ sdlThread.join(); } catch(Exception e){} - finally{ + finally{ // Native thread has finished if (! SDLActivity.mExitCalledFromJava) { SDLActivity.handleNativeExit(); @@ -1107,7 +1107,7 @@ } } } - + if( (event.getSource() & InputDevice.SOURCE_KEYBOARD) != 0) { if (event.getAction() == KeyEvent.ACTION_DOWN) { //Log.v("SDL", "key down: " + keyCode); @@ -1120,7 +1120,7 @@ return true; } } - + return false; } @@ -1159,7 +1159,7 @@ SDLActivity.onNativeTouch(touchDevId, pointerFingerId, action, x, y, p); } break; - + case MotionEvent.ACTION_UP: case MotionEvent.ACTION_DOWN: // Primary pointer up/down, the index is always zero @@ -1170,14 +1170,14 @@ if (i == -1) { i = event.getActionIndex(); } - + pointerFingerId = event.getPointerId(i); x = event.getX(i) / mWidth; y = event.getY(i) / mHeight; p = event.getPressure(i); SDLActivity.onNativeTouch(touchDevId, pointerFingerId, action, x, y, p); break; - + case MotionEvent.ACTION_CANCEL: for (i = 0; i < pointerCount; i++) { pointerFingerId = event.getPointerId(i); @@ -1194,21 +1194,21 @@ } return true; - } + } // Sensor events public void enableSensor(int sensortype, boolean enabled) { // TODO: This uses getDefaultSensor - what if we have >1 accels? if (enabled) { - mSensorManager.registerListener(this, - mSensorManager.getDefaultSensor(sensortype), + mSensorManager.registerListener(this, + mSensorManager.getDefaultSensor(sensortype), SensorManager.SENSOR_DELAY_GAME, null); } else { - mSensorManager.unregisterListener(this, + mSensorManager.unregisterListener(this, mSensorManager.getDefaultSensor(sensortype)); } } - + @Override public void onAccuracyChanged(Sensor sensor, int accuracy) { // TODO @@ -1240,7 +1240,7 @@ y / SensorManager.GRAVITY_EARTH, event.values[2] / SensorManager.GRAVITY_EARTH - 1); } - } + } } /* This is a fake invisible editor view that receives the input and defines the @@ -1282,7 +1282,7 @@ return false; } - + // @Override public boolean onKeyPreIme (int keyCode, KeyEvent event) { @@ -1361,7 +1361,7 @@ public native void nativeSetComposingText(String text, int newCursorPosition); @Override - public boolean deleteSurroundingText(int beforeLength, int afterLength) { + public boolean deleteSurroundingText(int beforeLength, int afterLength) { // Workaround to capture backspace key. Ref: http://stackoverflow.com/questions/14560344/android-backspace-in-webview-baseinputconnection if (beforeLength == 1 && afterLength == 0) { // backspace @@ -1375,7 +1375,7 @@ /* A null joystick handler for API level < 12 devices (the accelerometer is handled separately) */ class SDLJoystickHandler { - + /** * Handles given MotionEvent. * @param event the event to be handled. @@ -1407,11 +1407,11 @@ return arg0.getAxis() - arg1.getAxis(); } } - + private ArrayList mJoysticks; - + public SDLJoystickHandler_API12() { - + mJoysticks = new ArrayList(); } @@ -1422,7 +1422,7 @@ // For example, in the case of the XBox 360 wireless dongle, // so the first controller seen by SDL matches what the receiver // considers to be the first controller - + for(int i=deviceIds.length-1; i>-1; i--) { SDLJoystick joystick = getJoystick(deviceIds[i]); if (joystick == null) { @@ -1433,7 +1433,7 @@ joystick.name = joystickDevice.getName(); joystick.axes = new ArrayList(); joystick.hats = new ArrayList(); - + List ranges = joystickDevice.getMotionRanges(); Collections.sort(ranges, new RangeComparator()); for (InputDevice.MotionRange range : ranges ) { @@ -1447,14 +1447,14 @@ } } } - + mJoysticks.add(joystick); - SDLActivity.nativeAddJoystick(joystick.device_id, joystick.name, 0, -1, + SDLActivity.nativeAddJoystick(joystick.device_id, joystick.name, 0, -1, joystick.axes.size(), joystick.hats.size()/2, 0); } } } - + /* Check removed devices */ ArrayList removedDevices = new ArrayList(); for(int i=0; i < mJoysticks.size(); i++) { @@ -1467,7 +1467,7 @@ removedDevices.add(Integer.valueOf(device_id)); } } - + for(int i=0; i < removedDevices.size(); i++) { int device_id = removedDevices.get(i).intValue(); SDLActivity.nativeRemoveJoystick(device_id); @@ -1477,9 +1477,9 @@ break; } } - } + } } - + protected SDLJoystick getJoystick(int device_id) { for(int i=0; i < mJoysticks.size(); i++) { if (mJoysticks.get(i).device_id == device_id) { @@ -1487,9 +1487,9 @@ } } return null; - } - - @Override + } + + @Override public boolean handleMotionEvent(MotionEvent event) { if ( (event.getSource() & InputDevice.SOURCE_JOYSTICK) != 0) { int actionPointerIndex = event.getActionIndex(); @@ -1503,7 +1503,7 @@ /* Normalize the value to -1...1 */ float value = ( event.getAxisValue( range.getAxis(), actionPointerIndex) - range.getMin() ) / range.getRange() * 2.0f - 1.0f; SDLActivity.onNativeJoy(joystick.device_id, i, value ); - } + } for (int i = 0; i < joystick.hats.size(); i+=2) { int hatX = Math.round(event.getAxisValue( joystick.hats.get(i).getAxis(), actionPointerIndex ) ); int hatY = Math.round(event.getAxisValue( joystick.hats.get(i+1).getAxis(), actionPointerIndex ) ); @@ -1516,7 +1516,7 @@ } } return true; - } + } } class SDLGenericMotionListener_API12 implements View.OnGenericMotionListener {