notaz.gp2x.de
/
pcsx_rearmed.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
drc: fix mtc0 argument
[pcsx_rearmed.git]
/
maemo
/
hildon.c
diff --git
a/maemo/hildon.c
b/maemo/hildon.c
index
2cea99a
..
ba035d1
100644
(file)
--- a/
maemo/hildon.c
+++ b/
maemo/hildon.c
@@
-1,22
+1,26
@@
#include <gtk/gtk.h>
#include <glib.h>
#include <stdlib.h>
#include <gtk/gtk.h>
#include <glib.h>
#include <stdlib.h>
+#include <stdint.h>
#include <unistd.h>
#include <hildon/hildon.h>
#include "plugin_lib.h"
#include <unistd.h>
#include <hildon/hildon.h>
#include "plugin_lib.h"
+#include "main.h"
+#include "../libpcsxcore/psemu_plugin_defs.h"
#define X_RES 800
#define Y_RES 480
#define D_WIDTH 640
#define D_HEIGHT 480
#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;
static GdkImage *image;
static HildonAnimationActor *actor;
static GtkWidget *window, *drawing;
-void *pl_fbdev_buf;
-int keystate;
-
static int keymap[65536];
// map psx4m compatible keymap to PSX keys
static int keymap[65536];
// map psx4m compatible keymap to PSX keys
@@
-77,24
+81,28
@@
window_key_proxy(GtkWidget *widget,
psxkey2 = DKEY_RIGHT;
break;
case 19:
psxkey2 = DKEY_RIGHT;
break;
case 19:
- //SaveState(cfile);
+ if (event->type == GDK_KEY_PRESS)
+ emu_set_action(SACTION_SAVE_STATE);
return;
case 20:
return;
case 20:
- //LoadState(cfile);
+ if (event->type == GDK_KEY_PRESS)
+ emu_set_action(SACTION_LOAD_STATE);
return;
}
if (event->type == GDK_KEY_PRESS) {
if (psxkey1 >= 0)
return;
}
if (event->type == GDK_KEY_PRESS) {
if (psxkey1 >= 0)
- keystate |= 1 << psxkey1;
+
in_
keystate |= 1 << psxkey1;
if (psxkey2 >= 0)
if (psxkey2 >= 0)
- keystate |= 1 << psxkey2;
+
in_
keystate |= 1 << psxkey2;
}
else if (event->type == GDK_KEY_RELEASE) {
if (psxkey1 >= 0)
}
else if (event->type == GDK_KEY_RELEASE) {
if (psxkey1 >= 0)
- keystate &= ~(1 << psxkey1);
+
in_
keystate &= ~(1 << psxkey1);
if (psxkey2 >= 0)
if (psxkey2 >= 0)
- keystate &= ~(1 << psxkey2);
+ in_keystate &= ~(1 << psxkey2);
+
+ emu_set_action(SACTION_NONE);
}
}
}
}
@@
-145,15
+153,19
@@
void maemo_init(int *argc, char ***argv)
gtk_widget_show_all (GTK_WIDGET (window));
}
gtk_widget_show_all (GTK_WIDGET (window));
}
-void *pl_fbdev_set_mode(int w, int h, int bpp)
+void menu_loop(void)
+{
+}
+
+void *hildon_set_mode(int w, int h)
{
if (w <= 0 || h <= 0)
{
if (w <= 0 || h <= 0)
- return;
+ return
pl_vout_buf
;
if (image) gdk_image_destroy(image);
image = gdk_image_new( GDK_IMAGE_FASTEST, gdk_visual_get_system(), w, h );
if (image) gdk_image_destroy(image);
image = gdk_image_new( GDK_IMAGE_FASTEST, gdk_visual_get_system(), w, h );
- pl_
fbdev
_buf = (void *) image->mem;
+ pl_
vout
_buf = (void *) image->mem;
gtk_image_set_from_image (GTK_IMAGE(drawing), image, NULL);
gtk_image_set_from_image (GTK_IMAGE(drawing), image, NULL);
@@
-163,48
+175,26
@@
void *pl_fbdev_set_mode(int w, int h, int bpp)
(gdouble)D_HEIGHT / (gdouble)h
);
(gdouble)D_HEIGHT / (gdouble)h
);
- return pl_
fbdev
_buf;
+ return pl_
vout
_buf;
}
}
-void *
pl_fbdev
_flip(void)
+void *
hildon
_flip(void)
{
gtk_widget_queue_draw (drawing);
{
gtk_widget_queue_draw (drawing);
-}
-
-void pl_frame_limit(void)
-{
- extern void CheckFrameRate(void);
- //CheckFrameRate();
/* process GTK+ events */
while (gtk_events_pending())
gtk_main_iteration();
/* process GTK+ events */
while (gtk_events_pending())
gtk_main_iteration();
-}
-void pl_fbdev_close(void)
-{
+ return pl_vout_buf;
}
}
-int
pl_fbdev_open(voi
d)
+int
omap_enable_layer(int enable
d)
{
{
+ return 0;
}
}
-
static void pl_get_layer_pos(int *x, int *y, int *w, int *h
)
+
void menu_notify_mode_change(int w, int h, int bpp
)
{
{
- *x = 0;
- *y = 0;
- *w = 800;
- *h = 640;
}
}
-extern int UseFrameSkip; // hmh
-
-const struct rearmed_cbs pl_rearmed_cbs = {
- pl_get_layer_pos,
- pl_fbdev_open,
- pl_fbdev_set_mode,
- pl_fbdev_flip,
- pl_fbdev_close,
- &UseFrameSkip,
-};
-