Mirrors/eepp
1
0
Fork 0
mirror of https://github.com/SpartanJ/eepp.git synced 2026-10-01 10:40:20 +03:00
Code Issues Packages Projects Releases Wiki Activity

Android build fixes and improvements.

Browse Source 
Updated jpeg-compressor.
eterm: More clean up and improvements.
This commit is contained in:
Martín Lucas Golini
2022-06-28 22:36:46 -03:00
parent 51b0db9280
commit ff67a99203
29 changed files with 5457 additions and 4621 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/tools/eterm/eterm.cpp
+23 -1
View File
@@ -5,7 +5,7 @@ EE::Window::Window* win = NULL;
std::shared_ptr<TerminalDisplay> terminal = nullptr;
void inputCallback( InputEvent* event ) {
if ( !terminal )
if ( !terminal || event->Type == InputEvent::EventsSent )
return;
switch ( event->Type ) {
@@ -17,6 +17,9 @@ void inputCallback( InputEvent* event ) {
case InputEvent::MouseButtonDown: {
terminal->onMouseDown( win->getInput()->getMousePos(),
win->getInput()->getPressTrigger() );
#if EE_PLATFORM == EE_PLATFORM_ANDROID
win->startTextInput();
#endif
break;
}
case InputEvent::MouseButtonUp: {
@@ -31,6 +34,13 @@ void inputCallback( InputEvent* event ) {
break;
}
case InputEvent::Window: {
switch ( event->window.type ) {
case InputEvent::WindowKeyboardFocusLost:
case InputEvent::WindowKeyboardFocusGain: {
terminal->setFocus( win->hasFocus() );
break;
}
}
break;
}
case InputEvent::KeyUp: {
@@ -39,6 +49,12 @@ void inputCallback( InputEvent* event ) {
case InputEvent::KeyDown: {
terminal->onKeyDown( event->key.keysym.sym, event->key.keysym.unicode,
event->key.keysym.mod, event->key.keysym.scancode );
#if EE_PLATFORM == EE_PLATFORM_ANDROID
if ( event->key.keysym.sym == KEY_RETURN ||
event->key.keysym.scancode == SCANCODE_RETURN ) {
win->startTextInput();
}
#endif
break;
}
case InputEvent::TextInput: {
@@ -73,6 +89,10 @@ void mainLoop() {
}
EE_MAIN_FUNC int main( int, char*[] ) {
#ifdef EE_DEBUG
Log::instance()->setConsoleOutput( true );
Log::instance()->setLiveWrite( true );
#endif
DisplayManager* displayManager = Engine::instance()->getDisplayManager();
Display* currentDisplay = displayManager->getDisplayIndex( 0 );
FileSystem::changeWorkingDirectory( Sys::getProcessPath() );
@@ -108,6 +128,8 @@ EE_MAIN_FUNC int main( int, char*[] ) {
if ( event.type == TerminalDisplay::EventType::TITLE )
win->setTitle( "eterm - " + event.eventData );
} );
win->startTextInput();
}
win->getInput()->pushCallback( &inputCallback );