miguel.horta/commandergenius
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'sdl_android' of github.com:pelya/commandergenius into sdl_android

Browse Source
This commit is contained in:
Gerhard Stein
2015-02-24 16:50:51 +01:00
parent 8cbdc61b0b 354986e743
commit 94b4dd111b
4 changed files with 64 additions and 96 deletions
Download Patch File Download Diff File Expand all files Collapse all files

134
project/java/MainActivity.java
View File

@@ -297,34 +297,23 @@ public class MainActivity extends Activity
}
DimSystemStatusBar.get().dim(_videoLayout);
}
// Hackish way to set immersive mode, it seems to need some delay before we can create surfaces
runOnUiThread(new Runnable()
{
public void run()
{
initSDLVideoLayout();
}
});
try {
Thread.sleep(100);
} catch( Exception ee ) {}
runOnUiThread(new Runnable()
{
public void run()
{
DimSystemStatusBar.get().dim(_videoLayout);
}
});
if( android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.KITKAT && Globals.ImmersiveMode )
{
try {
Thread.sleep(200);
} catch( Exception eee ) {}
}
runOnUiThread(new Runnable()
{
public void run()
{
// Hide navigation buttons, and sleep a bit so OS will process the event.
// Do not check the display size in a loop - we may have several displays of different sizes,
// so app may stuck in infinite loop
DisplayMetrics dm = new DisplayMetrics();
getWindowManager().getDefaultDisplay().getMetrics(dm);
if( android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.KITKAT && Globals.ImmersiveMode &&
(_videoLayout.getHeight() != dm.widthPixels || _videoLayout.getWidth() != dm.heightPixels) )
{
DimSystemStatusBar.get().dim(_videoLayout);
try {
Thread.sleep(300);
} catch( Exception e ) {}
}
initSDLInternal();
}
});
@@ -332,10 +321,13 @@ public class MainActivity extends Activity
})).start();
}
private void initSDLVideoLayout()
private void initSDLInternal()
{
if(sdlInited)
return;
Log.i("SDL", "libSDL: Initializing video and SDL application");
sdlInited = true;
DimSystemStatusBar.get().dim(_videoLayout);
_videoLayout.removeView(_layout);
if( _ad.getView() != null )
@@ -348,15 +340,6 @@ public class MainActivity extends Activity
_videoLayout = new FrameLayout(this);
SetLayerType.get().setLayerType(_videoLayout);
setContentView(_videoLayout);
DimSystemStatusBar.get().dim(_videoLayout);
}
private void initSDLInternal()
{
if(sdlInited)
return;
Log.i("SDL", "libSDL: Initializing video and SDL application");
sdlInited = true;
mGLView = new DemoGLSurfaceView(this);
SetLayerType.get().setLayerType(mGLView);
_videoLayout.addView(mGLView);
@@ -369,7 +352,7 @@ public class MainActivity extends Activity
_ad.getView().setLayoutParams(new FrameLayout.LayoutParams(ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT, Gravity.TOP | Gravity.RIGHT));
}
DimSystemStatusBar.get().dim(_videoLayout);
DimSystemStatusBar.get().dim(mGLView);
//DimSystemStatusBar.get().dim(mGLView);
Rect r = new Rect();
_videoLayout.getWindowVisibleDisplayFrame(r);
@@ -378,12 +361,27 @@ public class MainActivity extends Activity
{
public void onGlobalLayout()
{
Rect r = new Rect();
final Rect r = new Rect();
_videoLayout.getWindowVisibleDisplayFrame(r);
int heightDiff = _videoLayout.getRootView().getHeight() - _videoLayout.getHeight(); // Take system bar into consideration
int widthDiff = _videoLayout.getRootView().getWidth() - _videoLayout.getWidth(); // Nexus 5 has system bar at the right side
mGLView.nativeScreenVisibleRect(r.left + widthDiff, r.top + heightDiff, r.width(), r.height());
final int heightDiff = _videoLayout.getRootView().getHeight() - _videoLayout.getHeight(); // Take system bar into consideration
final int widthDiff = _videoLayout.getRootView().getWidth() - _videoLayout.getWidth(); // Nexus 5 has system bar at the right side
Log.v("SDL", "Main window visible region changed: " + r.left + ":" + r.top + ":" + r.width() + ":" + r.height() );
_videoLayout.postDelayed( new Runnable()
{
public void run()
{
DimSystemStatusBar.get().dim(_videoLayout);
mGLView.nativeScreenVisibleRect(r.left + widthDiff, r.top + heightDiff, r.width(), r.height());
}
}, 300 );
_videoLayout.postDelayed( new Runnable()
{
public void run()
{
DimSystemStatusBar.get().dim(_videoLayout);
mGLView.nativeScreenVisibleRect(r.left + widthDiff, r.top + heightDiff, r.width(), r.height());
}
}, 600 );
}
});
}
@@ -410,9 +408,9 @@ public class MainActivity extends Activity
super.onResume();
if( mGLView != null )
{
mGLView.onResume();
DimSystemStatusBar.get().dim(_videoLayout);
DimSystemStatusBar.get().dim(mGLView);
//DimSystemStatusBar.get().dim(mGLView);
mGLView.onResume();
}
else
if( downloader != null )
@@ -439,14 +437,6 @@ public class MainActivity extends Activity
onPause();
else
onResume();
/*
if (hasFocus == false) {
synchronized(textInput) {
// Send 'SDLK_PAUSE' (to enter pause mode) to native code:
DemoRenderer.nativeTextInput( 19, 19 );
}
}
*/
}
public boolean isPaused()
@@ -506,7 +496,7 @@ public class MainActivity extends Activity
getWindow().setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_STATE_HIDDEN);
_inputManager.hideSoftInputFromWindow(mGLView.getWindowToken(), 0);
DimSystemStatusBar.get().dim(_videoLayout);
DimSystemStatusBar.get().dim(mGLView);
//DimSystemStatusBar.get().dim(mGLView);
}
}
@@ -651,16 +641,14 @@ public class MainActivity extends Activity
mGLView.setFocusable(true);
mGLView.requestFocus();
DimSystemStatusBar.get().dim(_videoLayout);
DimSystemStatusBar.get().dim(mGLView);
_videoLayout.postDelayed( new Runnable()
{
public void run()
{
public void run()
{
DimSystemStatusBar.get().dim(_videoLayout);
DimSystemStatusBar.get().dim(mGLView);
}
}, 500 );
DimSystemStatusBar.get().dim(_videoLayout);
}
}, 500 );
};
public boolean isScreenKeyboardShown()
@@ -773,34 +761,6 @@ public class MainActivity extends Activity
}
}
/*
@Override
public boolean dispatchKeyEvent(final KeyEvent event)
{
//Log.i("SDL", "dispatchKeyEvent: action " + event.getAction() + " keycode " + event.getKeyCode() + " unicode " + event.getUnicodeChar() + " getCharacters() " + ((event.getCharacters() != null) ? event.getCharacters() : "none"));
if( event.getAction() == KeyEvent.ACTION_DOWN )
return onKeyDown(event.getKeyCode(), event);
if( event.getAction() == KeyEvent.ACTION_UP )
return onKeyUp(event.getKeyCode(), event);
if( event.getAction() == KeyEvent.ACTION_MULTIPLE && event.getKeyCode() == KeyEvent.KEYCODE_UNKNOWN )
{
// International text input
if( mGLView != null && event.getCharacters() != null )
{
for(int i = 0; i < event.getCharacters().length(); i++ )
{
mGLView.nativeKey( event.getKeyCode(), 1, event.getCharacters().codePointAt(i) );
mGLView.nativeKey( event.getKeyCode(), 0, event.getCharacters().codePointAt(i) );
}
return true;
}
}
return true;
//return super.dispatchKeyEvent(event);
}
*/
@Override
public boolean onKeyDown(int keyCode, final KeyEvent event)
{
@@ -836,7 +796,7 @@ public class MainActivity extends Activity
if( keyCode == KeyEvent.KEYCODE_BACK || keyCode == KeyEvent.KEYCODE_MENU )
{
DimSystemStatusBar.get().dim(_videoLayout);
DimSystemStatusBar.get().dim(mGLView);
//DimSystemStatusBar.get().dim(mGLView);
}
}
else
@@ -1315,7 +1275,7 @@ public class MainActivity extends Activity
static int NOTIFY_ID = 12367098; // Random ID
private static DemoGLSurfaceView mGLView = null;
DemoGLSurfaceView mGLView = null;
private static AudioThread mAudioThread = null;
private static DataDownloader downloader = null;

20
project/java/Video.java
View File

@@ -608,17 +608,19 @@ class DemoRenderer extends GLSurfaceView_SDL.Renderer
nativeResize(mWidth, mHeight, Globals.KeepAspectRatio ? 1 : 0);
}
int mLastPendingResize = 0;
public void onWindowResize(final int w, final int h)
{
Log.d("SDL", "libSDL: DemoRenderer.onWindowResize(): " + w + "x" + h);
new Thread(new Runnable()
mLastPendingResize ++;
final int resizeThreadIndex = mLastPendingResize;
context.mGLView.postDelayed(new Runnable()
{
public void run()
{
// Samsung multiwindow will swap screen dimensions when unlocking the lockscreen, sleep a while so we won't use these temporary values
try{
Thread.sleep(2000);
} catch (InterruptedException e) {}
if (resizeThreadIndex != mLastPendingResize)
return; // Avoid running this function multiple times in a row
int ww = w - w % 2;
int hh = h - h % 2;
View topView = context.getWindow().peekDecorView();
@@ -632,7 +634,7 @@ class DemoRenderer extends GLSurfaceView_SDL.Renderer
if (mWidth != 0 && mHeight != 0 && (mWidth != ww || mHeight != hh))
{
Log.w("SDL", "libSDL: DemoRenderer.onWindowResize(): screen size changed from " + mWidth + "x" + mHeight + " to " + ww + "x" + hh);
Log.i("SDL", "libSDL: DemoRenderer.onWindowResize(): screen size changed from " + mWidth + "x" + mHeight + " to " + ww + "x" + hh);
if (Globals.SwVideoMode &&
(Math.abs(display.getWidth() - ww) > display.getWidth() / 10 ||
Math.abs(display.getHeight() - hh) > display.getHeight() / 10))
@@ -643,6 +645,12 @@ class DemoRenderer extends GLSurfaceView_SDL.Renderer
DemoRenderer.super.ResetVideoSurface();
DemoRenderer.super.onWindowResize(ww, hh);
}
else
{
Log.i("SDL", "System button bar hidden - re-init video to avoid black bar at the top");
DemoRenderer.super.ResetVideoSurface();
DemoRenderer.super.onWindowResize(ww, hh);
}
}
if (mWidth == 0 && mHeight == 0)
{
@@ -655,7 +663,7 @@ class DemoRenderer extends GLSurfaceView_SDL.Renderer
if (Globals.AutoDetectOrientation && (ww > hh) != (mWidth > mHeight))
Globals.HorizontalOrientation = (ww > hh);
}
}).start();
}, 2000);
}
public void onSurfaceDestroyed()

2
project/jni/application/hid-pc-keyboard/src

Submodule project/jni/application/hid-pc-keyboard/src updated: f062b76c86...83ca8656e6

4
project/jni/application/xserver/AndroidAppSettings.cfg
View File

@@ -7,10 +7,10 @@ AppName="XServer XSDL"
AppFullName=x.org.server
# Application version code (integer)
AppVersionCode=11124
AppVersionCode=11125
# Application user-visible version name (string)
AppVersionName="1.11.24"
AppVersionName="1.11.25"
# Specify path to download application data in zip archive in the form 'Description|URL|MirrorURL^Description2|URL2|MirrorURL2^...'
# If you'll start Description with '!' symbol it will be enabled by default, other downloads should be selected by user from startup config menu