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

Minor Linux code cleanups. 

git-svn-id: http://pcsx2-playground.googlecode.com/svn/trunk@398 a6443dda-0b58-4228-96e9-037be469359c
This commit is contained in:
arcum42 2008-12-07 01:50:17 +00:00 committed by Gregory Hainaut
parent 3568b5cd1a
commit 8ccd60b450
6 changed files with 41 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

78
pcsx2/Linux/GtkGui.cpp
View File

@ -90,13 +90,14 @@ void FixCPUState(void)
SetCPUState(Config.sseMXCSR, Config.sseVUMXCSR);
}
void OnDestroy(GtkObject *object, gpointer user_data) {
if (!destroy) OnFile_Exit(NULL, user_data);
void OnDestroy(GtkObject *object, gpointer user_data) {}
gboolean OnDelete(GtkWidget *widget, GdkEvent *event, gpointer user_data)
{
pcsx2_exit();
}
int Pcsx2Configure() {
if (!UseGui)
return 0;
if (!UseGui) return 0;
configuringplug = TRUE;
MainWindow = NULL;
@ -108,9 +109,7 @@ int Pcsx2Configure() {
void OnLanguage(GtkMenuItem *menuitem, gpointer user_data) {
ChangeLanguage(langs[(int)(uptr)user_data].lang);
destroy = TRUE;
gtk_widget_destroy(MainWindow);
destroy = FALSE;
gtk_main_quit();
while (gtk_events_pending()) gtk_main_iteration();
StartGui();
@ -118,18 +117,14 @@ void OnLanguage(GtkMenuItem *menuitem, gpointer user_data) {
void SignalExit(int sig) {
ClosePlugins();
OnFile_Exit(NULL, 0);
pcsx2_exit();
}
void RunExecute(int run)
{
if (needReset == TRUE) {
SysReset();
}
if (needReset == TRUE) SysReset();
destroy= TRUE;
gtk_widget_destroy(MainWindow);
destroy=FALSE;
gtk_main_quit();
while (gtk_events_pending()) gtk_main_iteration();
@ -137,6 +132,7 @@ void RunExecute(int run)
RunGui();
return;
}
signal(SIGINT, SignalExit);
signal(SIGPIPE, SignalExit);
@ -155,8 +151,7 @@ void RunExecute(int run)
}
// this needs to be called for every new game! (note: sometimes launching games through bios will give a crc of 0)
if( GSsetGameCRC != NULL )
GSsetGameCRC(ElfCRC, g_ZeroGSOptions);
if( GSsetGameCRC != NULL ) GSsetGameCRC(ElfCRC, g_ZeroGSOptions);
if (run) Cpu->Execute();
}
@ -202,8 +197,8 @@ void OnFile_LoadElf(GtkMenuItem *menuitem, gpointer user_data) {
gtk_widget_show(FileSel);
gdk_window_raise(FileSel->window);
}
void OnFile_Exit(GtkMenuItem *menuitem, gpointer user_data) {
void pcsx2_exit()
{
DIR *dir;
struct dirent *ent;
void *Handle;
@ -237,11 +232,15 @@ void OnFile_Exit(GtkMenuItem *menuitem, gpointer user_data) {
exit(0);
}
}
void OnFile_Exit(GtkMenuItem *menuitem, gpointer user_data)
{
pcsx2_exit();
}
void OnEmu_Run(GtkMenuItem *menuitem, gpointer user_data)
{
if(needReset == TRUE)
RunExe = 1;
if(needReset == TRUE) RunExe = 1;
efile = 0;
RunExecute(1);
}
@ -517,23 +516,11 @@ void OnLogging_Ok(GtkButton *button, gpointer user_data) {
char str[32];
int i, ret;
for (i=0; i<17; i++) {
sprintf(str, "Log%d", i);
Btn = lookup_widget(LogDlg, str);
ret = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(Btn));
if (ret) varLog|= 1<<i;
else varLog&=~(1<<i);
}
for (i=20; i<29; i++) {
sprintf(str, "Log%d", i);
Btn = lookup_widget(LogDlg, str);
ret = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(Btn));
if (ret) varLog|= 1<<i;
else varLog&=~(1<<i);
}
for (i=30; i<32; i++) {
for (i=0; i<32; i++) {
if (((i > 16) && (i < 20)) || (i == 29))
continue;
sprintf(str, "Log%d", i);
Btn = lookup_widget(LogDlg, str);
ret = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(Btn));
@ -558,19 +545,12 @@ void OnDebug_Logging(GtkMenuItem *menuitem, gpointer user_data) {
int i;
LogDlg = create_Logging();
for (i=0; i<17; i++) {
sprintf(str, "Log%d", i);
Btn = lookup_widget(LogDlg, str);
gtk_toggle_button_set_state(GTK_TOGGLE_BUTTON(Btn), varLog & (1<<i));
}
for (i=20; i<29; i++) {
sprintf(str, "Log%d", i);
Btn = lookup_widget(LogDlg, str);
gtk_toggle_button_set_state(GTK_TOGGLE_BUTTON(Btn), varLog & (1<<i));
}
for (i=30; i<32; i++) {
for (i=0; i<32; i++) {
if (((i > 16) && (i < 20)) || (i == 29))
continue;
sprintf(str, "Log%d", i);
Btn = lookup_widget(LogDlg, str);
gtk_toggle_button_set_state(GTK_TOGGLE_BUTTON(Btn), varLog & (1<<i));

2
pcsx2/Linux/GtkGui.h
View File

@ -37,7 +37,6 @@ extern "C" {
bool applychanges = FALSE;
bool configuringplug = FALSE;
bool destroy = FALSE;
bool UseGui = TRUE;
bool needReset = TRUE;
bool RunExe = FALSE;
@ -59,6 +58,7 @@ void OnHelp_Help();
void OnHelp_About(GtkMenuItem *menuitem, gpointer user_data);
void StartGui();
void pcsx2_exit();
GtkWidget *MainWindow;
GtkWidget *pStatusBar = NULL, *Status_Box;
GtkWidget *CmdLine; //2002-09-28 (Florin)

5
pcsx2/Linux/callbacks.h
View File

@ -241,6 +241,11 @@ void
OnDestroy (GtkObject *object,
gpointer user_data);
gboolean
OnDelete (GtkWidget *widget,
GdkEvent *event,
gpointer user_data);
void
OnFile_RunCD (GtkMenuItem *menuitem,
gpointer user_data);

3
pcsx2/Linux/interface.c
View File

@ -2866,6 +2866,9 @@ create_MainWindow (void)
g_signal_connect ((gpointer) MainWindow, "destroy",
G_CALLBACK (OnDestroy),
NULL);
g_signal_connect ((gpointer) MainWindow, "delete_event",
G_CALLBACK (OnDelete),
NULL);
g_signal_connect ((gpointer) run_cd1, "activate",
G_CALLBACK (OnFile_RunCD),
NULL);

3
pcsx2/Linux/pcsx2.glade
View File

@ -5047,7 +5047,8 @@ Version x.x</property>
<property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
<property name="focus_on_map">True</property>
<property name="urgency_hint">False</property>
<signal name="destroy" handler="OnDestroy"/>
<signal name="destroy" handler="OnDestroy" last_modification_time="Sun, 07 Dec 2008 01:35:21 GMT"/>
<signal name="delete_event" handler="OnDelete" last_modification_time="Sun, 07 Dec 2008 01:42:37 GMT"/>
<child>
<widget class="GtkVBox" id="vbox1">

2
pcsx2/Misc.h
View File

@ -357,7 +357,7 @@ static __forceinline long InterlockedDecrement( long* Addend )
return InterlockedExchangeAdd( Addend, -1 );
}
#if 0 // These don't work, but are also never called.l
#if 0 // These don't work, but are also never called.
static __forceinline long InterlockedCompareExchange(volatile long *dest, long exch, long comp)
{
long old;