change jar

diff --git a/console.h b/console.h
index 6ac4ed3..5ab8611 100644 (file)
--- a/console.h
+++ b/console.h
@@ -55,6 +55,7 @@ QEMUPutLEDEntry *qemu_add_led_event_handler(QEMUPutLEDEvent *func, void *opaque)
 void qemu_remove_led_event_handler(QEMUPutLEDEntry *entry);
 
 void kbd_put_keycode(int keycode);
+void ps2kbd_put_keycode(int keycode);
 void kbd_put_ledstate(int ledstate);
 void kbd_mouse_event(int dx, int dy, int dz, int buttons_state);
 

diff --git a/hw/ps2.c b/hw/ps2.c
index 1d9057b..e0164b8 100644 (file)
--- a/hw/ps2.c
+++ b/hw/ps2.c
@@ -653,6 +653,7 @@ void *ps2_kbd_init(void (*update_irq)(void *, int), void *update_arg)
     s->scancode_set = 2;
     vmstate_register(NULL, 0, &vmstate_ps2_keyboard, s);
     qemu_add_kbd_event_handler(ps2_put_keycode, s);
+    qemu_add_ps2kbd_event_handler(ps2_put_keycode, s);
     qemu_register_reset(ps2_kbd_reset, s);
     return s;
 }

diff --git a/input.c b/input.c
index 9ade63f..cdae818 100644 (file)
--- a/input.c
+++ b/input.c
@@ -31,6 +31,8 @@
 
 static QEMUPutKBDEvent *qemu_put_kbd_event;
 static void *qemu_put_kbd_event_opaque;
+static QEMUPutKBDEvent *qemu_put_ps2kbd_event;
+static void *qemu_put_ps2kbd_event_opaque;
 static QTAILQ_HEAD(, QEMUPutLEDEntry) led_handlers = QTAILQ_HEAD_INITIALIZER(led_handlers);
 static QTAILQ_HEAD(, QEMUPutMouseEntry) mouse_handlers =
     QTAILQ_HEAD_INITIALIZER(mouse_handlers);
@@ -49,6 +51,19 @@ void qemu_remove_kbd_event_handler(void)
     qemu_put_kbd_event = NULL;
 }
 
+void qemu_add_ps2kbd_event_handler(QEMUPutKBDEvent *func, void *opaque)
+{
+    qemu_add_kbd_event_handler(func,opaque); // temporary code for compatibility with Xserver
+    qemu_put_ps2kbd_event_opaque = opaque;
+    qemu_put_ps2kbd_event = func;
+}
+
+void qemu_remove_ps2kbd_event_handler(void)
+{
+    qemu_put_ps2kbd_event_opaque = NULL;
+    qemu_put_ps2kbd_event = NULL;
+}
+
 static void check_mode_change(void)
 {
     static int current_is_absolute, current_has_absolute;
@@ -135,6 +150,13 @@ void kbd_put_keycode(int keycode)
     }
 }
 
+void ps2kbd_put_keycode(int keycode)
+{
+    if (qemu_put_ps2kbd_event) {
+        qemu_put_ps2kbd_event(qemu_put_ps2kbd_event_opaque, keycode);
+    }
+}
+
 void kbd_put_ledstate(int ledstate)
 {
     QEMUPutLEDEntry *cursor;

diff --git a/tizen/distrib/temp/dev/emul-skin.properties b/tizen/distrib/temp/dev/emul-skin.properties
index 96e8da9..971be4a 100644 (file)
--- 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
+#Fri Mar 09 13:56:32 KST 2012
+window.y=48
+window.x=838
 window.scale=1
-window.rotate=1
+window.rotate=0

diff --git a/tizen/distrib/temp/run_emulator.sh b/tizen/distrib/temp/run_emulator.sh
index 5bb2815..8e903f3 100755 (executable)
--- 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 -drive file=emulimg.x86,if=virtio -boot c -append "console=ttyS0 video=uvesafb:ywrap,480x800-32@60 proxy= dns1=168.126.63.1 sdb_port=26100 dpi=2070 root=/dev/vda rw ip=10.0.2.16::10.0.2.2:255.255.255.0::eth0:none 5" -serial file:emulator.klog -m 512 -M maru-x86-machine -net nic,model=virtio -soundhw all -usb -usbdevice maru-touchscreen -vga maru -bios bios.bin -L . -kernel bzImage -usbdevice keyboard -net user -rtc base=utc -enable-kvm 
+./qemu-system-i386 --skin-args a --qemu-args -drive file=emulimg.x86,if=virtio -boot c -append "console=ttyS0 video=uvesafb:ywrap,480x800-32@60 proxy= dns1=168.126.63.1 sdb_port=26100 dpi=2070 root=/dev/vda rw ip=10.0.2.16::10.0.2.2:255.255.255.0::eth0:none 5" -serial file:emulator.klog -m 512 -M maru-x86-machine -net nic,model=virtio -soundhw all -usb -usbdevice maru-touchscreen -vga maru -bios bios.bin -L . -kernel bzImage -usbdevice keyboard -net user -rtc base=utc -enable-kvm -redir tcp:1202:10.0.2.16:22 

diff --git a/tizen/src/hw/maru_pm.c b/tizen/src/hw/maru_pm.c
index b46461f..0c20cea 100644 (file)
--- a/tizen/src/hw/maru_pm.c
+++ b/tizen/src/hw/maru_pm.c
@@ -39,6 +39,7 @@
 #include "range.h"
 #include "ioport.h"
 #include "debug_ch.h"
+#include "../skin/maruskin_server.h"
 
 //#define DEBUG
 
@@ -132,6 +133,7 @@ static void maru_pm1_cnt_write(ACPIPM1EVT *pm1a, ACPIPM1CNT *pm1_cnt, uint16_t v
         switch(sus_typ) {
         case 0: /* soft power off */
             qemu_system_shutdown_request();
+            shutdown_skin_server();
             break;
         case 1:
 #if 0 // changed suspend operation for emulator

diff --git a/tizen/src/skin/maruskin_operation.c b/tizen/src/skin/maruskin_operation.c
index 5b09e17..79b50c7 100644 (file)
--- a/tizen/src/skin/maruskin_operation.c
+++ b/tizen/src/skin/maruskin_operation.c
@@ -32,9 +32,7 @@
 #include "maruskin_operation.h"
 #include "maru_sdl.h"
 #include "debug_ch.h"
-#include "console.h"
-//FIXME uncomment
-//#include "maru_pm.h"
+#include "../hw/maru_pm.h"
 
 MULTI_DEBUG_CHANNEL(qemu, skin_operation);
 
@@ -135,13 +133,12 @@ void open_shell(void) {
 void request_close( void ) {
     INFO( "request_close\n" );
 
-//FIXME uncomment
-//    ps2kbd_put_keycode( 103 & 0x7f );
+    kbd_put_keycode( 103 & 0x7f );
 //#ifdef _WIN32
 //    Sleep( 1.6 * 1000 ); // 1.6 seconds
 //#else
 //    usleep( 1.6 * 1000 * 1000 ); // 1.6 seconds
 //#endif
-//    ps2kbd_put_keycode( 103 | 0x80 );
+//    kbd_put_keycode( 103 | 0x80 );
 
 }

diff --git a/tizen/src/skin/maruskin_server.c b/tizen/src/skin/maruskin_server.c
index 1e53378..3d4d2fb 100644 (file)
--- a/tizen/src/skin/maruskin_server.c
+++ b/tizen/src/skin/maruskin_server.c
@@ -411,7 +411,7 @@ static void* run_skin_server( void* args ) {
                     INFO( "RECV_CLOSE\n" );
                     request_close();
                     //XXX
-                    shutdown_skin_server();
+//                    shutdown_skin_server();
                     break;
                 }
                 case RECV_RESPONSE_SHUTDOWN: {

diff --git a/tizen/src/ui b/tizen/src/ui
index 4747bd3..391b22a 160000 (submodule)
--- a/tizen/src/ui
+++ b/tizen/src/ui
@@ -1 +1 @@
-Subproject commit 4747bd3c9d42da6a7aeb05a37cb4bde5bbd7f376
+Subproject commit 391b22a753b756bd073b81d99d63cd90442ee9f8