From e7a41fe4d67c5ebb6284d14b999d219dcbec5ca8 Mon Sep 17 00:00:00 2001 From: Son Hyunjun Date: Thu, 8 Mar 2012 21:46:41 +0900 Subject: [PATCH] remve warning and add mouse operation --- tizen/distrib/temp/dev/emul-skin.properties | 6 +++--- tizen/distrib/temp/run_emulator.sh | 2 +- tizen/src/skin/maruskin_client.c | 9 +++++++-- tizen/src/skin/maruskin_operation.c | 5 ++--- 4 files changed, 13 insertions(+), 9 deletions(-) diff --git a/tizen/distrib/temp/dev/emul-skin.properties b/tizen/distrib/temp/dev/emul-skin.properties index 96e8da9..4d4719d 100644 --- a/tizen/distrib/temp/dev/emul-skin.properties +++ b/tizen/distrib/temp/dev/emul-skin.properties @@ -1,6 +1,6 @@ #Generated automatically by emulator. -#Thu Mar 08 17:39:01 KST 2012 -window.y=61 -window.x=969 +#Thu Mar 08 21:45:08 KST 2012 +window.y=71 +window.x=1009 window.scale=1 window.rotate=1 diff --git a/tizen/distrib/temp/run_emulator.sh b/tizen/distrib/temp/run_emulator.sh index 4a5a7f7..a24d3d0 100755 --- a/tizen/distrib/temp/run_emulator.sh +++ b/tizen/distrib/temp/run_emulator.sh @@ -1,2 +1,2 @@ #!/bin/bash -./qemu-system-i386 --skin-args a --qemu-args -M maru-x86-machine -net nic,model=virtio -soundhw all -usb -usbdevice wacom-tablet -vga maru -bios bios.bin -L ../../../pc-bios -kernel bzImage -usbdevice keyboard -net user -rtc base=utc -enable-kvm emulimg.x86 +./qemu-system-i386 --skin-args a --qemu-args -M maru-x86-machine -net nic,model=virtio -soundhw all -usb -usbdevice wacom-tablet -vga maru -bios bios.bin -L ../../../pc-bios -kernel bzImage -usbdevice keyboard -net user -rtc base=utc -enable-kvm emulimg.x86 -redir tcp:1202:10.0.2.16:22 diff --git a/tizen/src/skin/maruskin_client.c b/tizen/src/skin/maruskin_client.c index b87d135..c2b2e5c 100644 --- a/tizen/src/skin/maruskin_client.c +++ b/tizen/src/skin/maruskin_client.c @@ -32,6 +32,7 @@ #include #include #include "maruskin_client.h" +#include #define JAR_SKINFILE_PATH "EmulatorSkin.jar" @@ -44,7 +45,7 @@ static int skin_argc; static char** skin_argv; -static void* run_skin_client() +static void* run_skin_client(void* arg) { char cmd[256]; char argv[200]; @@ -56,7 +57,11 @@ static void* run_skin_client() } sprintf(cmd, "%s %s %s %s", JAVA_EXEFILE_PATH, JAVA_EXEOPTION, JAR_SKINFILE_PATH, argv); - system(cmd); + if( system(cmd) ) { + + }else { + + } return NULL; } diff --git a/tizen/src/skin/maruskin_operation.c b/tizen/src/skin/maruskin_operation.c index 8117079..b34b19c 100644 --- a/tizen/src/skin/maruskin_operation.c +++ b/tizen/src/skin/maruskin_operation.c @@ -32,8 +32,8 @@ #include "maruskin_operation.h" #include "maruskin_sdl.h" #include "../debug_ch.h" +#include "console.h" //FIXME uncomment -//#include "console.h" //#include "maru_pm.h" MULTI_DEBUG_CHANNEL(qemu, maruskin_operation); @@ -76,8 +76,7 @@ void do_mouse_event( int event_type, int x, int y, int z ) { int type = ( MOUSE_DRAG == event_type ) ? MOUSE_DOWN : event_type; if ( MOUSE_UP == type || MOUSE_DOWN == type ) { -//FIXME uncomment -// kbd_mouse_event(x, y, z, type); + kbd_mouse_event(x, y, z, type); } else { INFO( "undefined mouse event type:%d\n", type ); } -- 2.7.4