ShuriZma
/
desmume
mirror of https://github.com/TASEmulators/desmume.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixed 64bit compatibility. There are still two areas where it needs to be fixed: screen resize via the menu and screen rotation via the menu. 

Note: *((float*)&my_gpointer) doesn't work!? Is there a problem with floats in Glade?
This commit is contained in:
evilynux 2007-02-11 07:37:25 +00:00
parent d81a01b6b4
commit 247dfdcf37
2 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
desmume/src/gtk-glade/callbacks.c
View File

@ -133,15 +133,15 @@ void on_menu_quit_activate (GtkMenuItem *menuitem, gpointer user_data) { gtk
/* MENU SAVES ***** ***** ***** ***** */ /* MENU SAVES ***** ***** ***** ***** */
void on_loadstateXX_activate (GtkMenuItem *m, gpointer d) { void on_loadstateXX_activate (GtkMenuItem *m, gpointer d) {
int slot = dyn_CAST(int,d); int slot = (int)d;
loadstate_slot(slot); loadstate_slot(slot);
} }
void on_savestateXX_activate (GtkMenuItem *m, gpointer d) { void on_savestateXX_activate (GtkMenuItem *m, gpointer d) {
int slot = dyn_CAST(int,d); int slot = (int)d;
update_savestate(slot); update_savestate(slot);
} }
void on_savetypeXX_activate (GtkMenuItem *m, gpointer d) { void on_savetypeXX_activate (GtkMenuItem *m, gpointer d) {
int type = dyn_CAST(int,d); int type = (int)d;
desmume_savetype(type); desmume_savetype(type);
} }
@ -167,7 +167,7 @@ void on_menu_layers_activate (GtkMenuItem *menuitem, gpointer user_data) {
/* SUBMENU FRAMESKIP ***** ***** ***** ***** */ /* SUBMENU FRAMESKIP ***** ***** ***** ***** */
void on_fsXX_activate (GtkMenuItem *menuitem,gpointer user_data) { void on_fsXX_activate (GtkMenuItem *menuitem,gpointer user_data) {
Frameskip = dyn_CAST(int,user_data); Frameskip = (int)user_data;
// printf ("setting FS %d %d\n", Frameskip, user_data); // printf ("setting FS %d %d\n", Frameskip, user_data);
} }
@ -220,6 +220,7 @@ void rotate(float angle) {
resize(ScreenCoeff_Size[0],ScreenCoeff_Size[1]); resize(ScreenCoeff_Size[0],ScreenCoeff_Size[1]);
} }
/* FIXME: Totally broken for 64bit; dyn_CAST won't work. */
void on_sizeXX_activate (GtkMenuItem *menuitem, gpointer user_data) { void on_sizeXX_activate (GtkMenuItem *menuitem, gpointer user_data) {
float f = dyn_CAST(float,user_data); float f = dyn_CAST(float,user_data);
// printf("setting ZOOM %f\n",f); // printf("setting ZOOM %f\n",f);
@ -295,6 +296,7 @@ void on_menu_rightscreen_activate (GtkMenuItem *menuitem, gpointer user_data)
rightscreen(ScreenRight); rightscreen(ScreenRight);
} }
/* FIXME: Totally broken for 64bit; dyn_CAST won't work. */
void on_menu_rotatescreen_activate (GtkMenuItem *menuitem, gpointer user_data) { void on_menu_rotatescreen_activate (GtkMenuItem *menuitem, gpointer user_data) {
/* we want to rotate the screen */ /* we want to rotate the screen */
float angle = dyn_CAST(float,user_data); float angle = dyn_CAST(float,user_data);
@ -357,10 +359,10 @@ void change_bgx_layer(int layer, gboolean state, NDS_Screen scr) {
//fprintf(stderr,"Changed Layer %s to %d\n",layer,state); //fprintf(stderr,"Changed Layer %s to %d\n",layer,state);
} }
void on_wc_1_BGXX_toggled (GtkToggleButton *togglebutton, gpointer user_data) { void on_wc_1_BGXX_toggled (GtkToggleButton *togglebutton, gpointer user_data) {
int layer = dyn_CAST(int,user_data); int layer = (int)user_data;
change_bgx_layer(layer, gtk_toggle_button_get_active(togglebutton), MainScreen); change_bgx_layer(layer, gtk_toggle_button_get_active(togglebutton), MainScreen);
} }
void on_wc_2_BGXX_toggled (GtkToggleButton *togglebutton, gpointer user_data) { void on_wc_2_BGXX_toggled (GtkToggleButton *togglebutton, gpointer user_data) {
int layer = dyn_CAST(int,user_data); int layer = (int)user_data;
change_bgx_layer(layer, gtk_toggle_button_get_active(togglebutton), SubScreen); change_bgx_layer(layer, gtk_toggle_button_get_active(togglebutton), SubScreen);
} }

12
desmume/src/gtk-glade/callbacks_IO.c
View File

@ -170,11 +170,11 @@ gboolean screen (GtkWidget * widget, int off) {
/* OUTPUT SCREENS */ /* OUTPUT SCREENS */
gboolean on_wDrawScreen_expose_event (GtkWidget *widget, GdkEventExpose *event, gpointer user_data) { gboolean on_wDrawScreen_expose_event (GtkWidget *widget, GdkEventExpose *event, gpointer user_data) {
int scr = dyn_CAST(int,user_data); int scr = (int)user_data;
return screen(widget, scr); return screen(widget, scr);
} }
gboolean on_wDrawScreen_configure_event(GtkWidget *widget, GdkEventConfigure *event, gpointer user_data) { gboolean on_wDrawScreen_configure_event(GtkWidget *widget, GdkEventConfigure *event, gpointer user_data) {
int scr = dyn_CAST(int,user_data); int scr = (int)user_data;
reshape(widget, scr); return TRUE; reshape(widget, scr); return TRUE;
} }
@ -203,7 +203,7 @@ static void resize_incremental(int i, GdkEventScroll *event) {
} }
gboolean on_wDrawScreen_scroll_event (GtkWidget *widget, GdkEvent *event, gpointer user_data) { gboolean on_wDrawScreen_scroll_event (GtkWidget *widget, GdkEvent *event, gpointer user_data) {
int scr = dyn_CAST(int,user_data); int scr = (int)user_data;
// separate zoom factors not supported yet // separate zoom factors not supported yet
scr = 0; scr = 0;
resize_incremental(scr,event); resize_incremental(scr,event);
@ -225,7 +225,7 @@ void set_touch_pos (int x, int y) {
} }
gboolean on_wDrawScreen_button_press_event (GtkWidget *widget, GdkEventButton *event, gpointer user_data) { gboolean on_wDrawScreen_button_press_event (GtkWidget *widget, GdkEventButton *event, gpointer user_data) {
int scr = dyn_CAST(int,user_data); int scr = (int)user_data;
GdkModifierType state; GdkModifierType state;
gint x,y; gint x,y;
@ -245,7 +245,7 @@ gboolean on_wDrawScreen_button_press_event (GtkWidget *widget, GdkEventButton
} }
gboolean on_wDrawScreen_button_release_event (GtkWidget *widget, GdkEventButton *event, gpointer user_data) { gboolean on_wDrawScreen_button_release_event (GtkWidget *widget, GdkEventButton *event, gpointer user_data) {
int scr = dyn_CAST(int,user_data); int scr = (int)user_data;
if ((scr==1) ^ ScreenInvert) { if ((scr==1) ^ ScreenInvert) {
if (click) NDS_releasTouch(); if (click) NDS_releasTouch();
click = FALSE; click = FALSE;
@ -254,7 +254,7 @@ gboolean on_wDrawScreen_button_release_event (GtkWidget *widget, GdkEventButton
} }
gboolean on_wDrawScreen_motion_notify_event (GtkWidget *widget, GdkEventMotion *event, gpointer user_data) { gboolean on_wDrawScreen_motion_notify_event (GtkWidget *widget, GdkEventMotion *event, gpointer user_data) {
int scr = dyn_CAST(int,user_data); int scr = (int)user_data;
GdkModifierType state; GdkModifierType state;
gint x,y; gint x,y;