X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?p=pcsx_rearmed.git;a=blobdiff_plain;f=maemo%2Fhildon.c;h=8e7635a6c09b223d7f3f3852518b0340c9718a0f;hp=003dfddbe189e07385e0ec0227d1723f435fa438;hb=ac6575cdd93d665efc374c1a14b391c6a5308972;hpb=bbd471aff0d4a499872d7ab9ef8ff0f7e9db8b60

diff --git a/maemo/hildon.c b/maemo/hildon.c
index 003dfddb..8e7635a6 100644
--- a/maemo/hildon.c
+++ b/maemo/hildon.c
@@ -7,24 +7,20 @@
 #include "plugin_lib.h"
 
 #include "main.h"
+#include "plat.h"
 #include "../libpcsxcore/psemu_plugin_defs.h"
 #include "common/readpng.h"
+#include "maemo_common.h"
 
 #define X_RES           800
 #define Y_RES           480
 #define D_WIDTH			640
 #define D_HEIGHT		480
 
-int g_layer_x = (X_RES - D_WIDTH) / 2;
-int g_layer_y = (Y_RES - D_HEIGHT) / 2;
-int g_layer_w = D_WIDTH, g_layer_h = D_HEIGHT;
-
 static GdkImage *image;
 static HildonAnimationActor *actor;
 static GtkWidget *window, *drawing;
 
-extern int g_opts;
-extern char * file_name;
 static int pl_buf_w, pl_buf_h;
 static int sens, y_def;
 static int keymap[65536];
@@ -170,7 +166,7 @@ void maemo_init(int *argc, char ***argv)
 				GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK);
 
 	actor = HILDON_ANIMATION_ACTOR (hildon_animation_actor_new());
-	if (g_opts & 2)
+	if (g_maemo_opts & 2)
 		hildon_animation_actor_set_position (actor, 0, 0 );
 	else
 		hildon_animation_actor_set_position (actor, (X_RES - D_WIDTH)/2, (Y_RES - D_HEIGHT)/2 );
@@ -182,14 +178,22 @@ void maemo_init(int *argc, char ***argv)
 
 	gtk_widget_show_all (GTK_WIDGET (actor));
 	gtk_widget_show_all (GTK_WIDGET (window));
+
+	g_layer_x = (X_RES - D_WIDTH) / 2;
+	g_layer_y = (Y_RES - D_HEIGHT) / 2;
+	g_layer_w = D_WIDTH, g_layer_h = D_HEIGHT;
+
+	pl_rearmed_cbs.only_16bpp = 1;
 }
 
 void menu_loop(void)
 {
 }
 
-void *hildon_set_mode(int w, int h)
+void *plat_gvideo_set_mode(int *w_, int *h_, int *bpp_)
 {
+	int w = *w_, h = *h_;
+
 	if (w <= 0 || h <= 0)
 		return pl_vout_buf;
 
@@ -201,7 +205,7 @@ void *hildon_set_mode(int w, int h)
 	gtk_image_set_from_image (GTK_IMAGE(drawing), image, NULL);
 
 	gtk_window_resize (GTK_WINDOW (actor), w, h);
-	if (g_opts & 2)
+	if (g_maemo_opts & 2)
 		hildon_animation_actor_set_scale (actor,
 				(gdouble)800 / (gdouble)w,
 				(gdouble)480 / (gdouble)h
@@ -215,26 +219,26 @@ void *hildon_set_mode(int w, int h)
 	return pl_vout_buf;
 }
 
-void *hildon_flip(void)
+void *plat_gvideo_flip(void)
 {
 	gtk_widget_queue_draw (drawing);
 
 	// process accelometer
-	if (g_opts & 4) {
+	if (g_maemo_opts & 4) {
 		int x, y, z;
 		FILE* f = fopen( "/sys/class/i2c-adapter/i2c-3/3-001d/coord", "r" );
 		if( !f ) {printf ("err in accel"); exit(1);}
 		fscanf( f, "%d %d %d", &x, &y, &z );
 		fclose( f );
 
-		if( x > sens ) keystate |= 1 << DKEY_LEFT;
-		else if( x < -sens ) keystate |= 1 << DKEY_RIGHT;
-		else {keystate &= ~(1 << DKEY_LEFT);keystate &= ~(1 << DKEY_RIGHT);}
+		if( x > sens ) in_keystate |= 1 << DKEY_LEFT;
+		else if( x < -sens ) in_keystate |= 1 << DKEY_RIGHT;
+		else {in_keystate &= ~(1 << DKEY_LEFT);in_keystate &= ~(1 << DKEY_RIGHT);}
 
 		y+=y_def;
-		if( y > sens )keystate |= 1 << DKEY_UP;
-		else if( y < -sens ) keystate |= 1 << DKEY_DOWN; 
-		else {keystate &= ~(1 << DKEY_DOWN);keystate &= ~(1 << DKEY_UP);}
+		if( y > sens )in_keystate |= 1 << DKEY_UP;
+		else if( y < -sens ) in_keystate |= 1 << DKEY_DOWN; 
+		else {in_keystate &= ~(1 << DKEY_DOWN);in_keystate &= ~(1 << DKEY_UP);}
 
 	}
 
@@ -245,12 +249,11 @@ void *hildon_flip(void)
 	return pl_vout_buf;
 }
 
-int omap_enable_layer(int enabled)
+void plat_gvideo_open(void)
 {
-	return 0;
 }
 
-void menu_notify_mode_change(int w, int h, int bpp)
+void plat_gvideo_close(void)
 {
 }
 
@@ -259,3 +262,14 @@ void *plat_prepare_screenshot(int *w, int *h, int *bpp)
 	return NULL;
 }
 
+void plat_step_volume(int is_up)
+{
+}
+
+void plat_trigger_vibrate(int is_strong)
+{
+}
+
+void plat_minimize(void)
+{
+}