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

Remove a few of the more irritating compiler messages, and clean up a few misc things on the Linux port. 

git-svn-id: http://pcsx2-playground.googlecode.com/svn/trunk@212 a6443dda-0b58-4228-96e9-037be469359c
This commit is contained in:
arcum42 2008-10-18 05:37:31 +00:00 committed by Gregory Hainaut
parent 9bd263e04f
commit 41f7d6f79f
7 changed files with 98 additions and 89 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
pcsx2/Linux/Config.c
View File

@ -51,7 +51,6 @@ int LoadConfig() {
FILE *f;
int size;
char *data,*tmp;
char strtemp[255];
if (stat(cfgfile, &buf) == -1) return -1;
size = buf.st_size;

22
pcsx2/Linux/GtkGui.c
View File

@ -16,10 +16,6 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
*/
#include "support.h"
#include "callbacks.h"
#include "interface.h"
#include "Linux.h"
#include "GtkGui.h"
#include "R3000A.h"
#include "PsxMem.h"
@ -27,8 +23,8 @@
void StartGui() {
GtkWidget *Menu;
GtkWidget *Item;
GtkWidget* vbox;
int i;
u32 i;
add_pixmap_directory(".pixmaps");
MainWindow = create_MainWindow();
@ -52,7 +48,7 @@ void StartGui() {
Menu = gtk_menu_new();
gtk_menu_item_set_submenu(GTK_MENU_ITEM(Item), Menu);
for (i=0; i<langsMax; i++) {
for (i=0; i < langsMax; i++) {
Item = gtk_check_menu_item_new_with_label(ParseLang(langs[i].lang));
gtk_widget_show(Item);
gtk_container_add(GTK_CONTAINER(Menu), Item);
@ -302,7 +298,6 @@ void OnStates_Load5(GtkMenuItem *menuitem, gpointer user_data) { States_Load(4);
void OnLoadOther_Ok(GtkButton* button, gpointer user_data) {
gchar *File;
char str[256];
char Text[256];
int ret;
File = (gchar*)gtk_file_selection_get_filename(GTK_FILE_SELECTION(FileSel));
@ -348,7 +343,6 @@ void OnStates_Save5(GtkMenuItem *menuitem, gpointer user_data) { States_Save(4);
void OnSaveOther_Ok(GtkButton* button, gpointer user_data) {
gchar *File;
char str[256];
char Text[256];
int ret;
File = (gchar*)gtk_file_selection_get_filename(GTK_FILE_SELECTION(FileSel));
@ -497,8 +491,6 @@ void OnConf_Fw(GtkMenuItem *menuitem, gpointer user_data) {
}
void OnCpu_Ok(GtkButton *button, gpointer user_data) {
GtkWidget *Btn;
long t;
u32 newopts = 0;
Cpu->Shutdown();
@ -554,7 +546,6 @@ void OnCpu_Cancel(GtkButton *button, gpointer user_data) {
void OnConf_Cpu(GtkMenuItem *menuitem, gpointer user_data)
{
GtkWidget *Btn;
char str[512];
CpuDlg = create_CpuDlg();
@ -1278,12 +1269,11 @@ void OnDebug_Debugger(GtkMenuItem *menuitem, gpointer user_data) {
}
void OnLogging_Ok(GtkButton *button, gpointer user_data) {
#ifdef PCSX2_DEVBUILD
GtkWidget *Btn;
char str[32];
int i, ret;
#ifdef PCSX2_DEVBUILD
for (i=0; i<17; i++) {
sprintf(str, "Log%d", i);
Btn = lookup_widget(LogDlg, str);
@ -1685,8 +1675,6 @@ void on_Speed_Hack_Cancel(GtkButton *button, gpointer user_data)
}
void on_Speed_Hack_OK(GtkButton *button, gpointer user_data)
{
int index;
Config.Hacks = 0;
Config.Hacks |= is_checked(SpeedHacksDlg, "check_EE_Double_Sync") ? FLAG_EE_2_SYNC : 0;

5
pcsx2/Linux/GtkGui.h
View File

@ -19,6 +19,11 @@
#ifndef __GTKGUI_H__
#define __GTKGUI_H__
#include "support.h"
#include "callbacks.h"
#include "interface.h"
#include "Linux.h"
bool applychanges = FALSE;
bool configuringplug = FALSE;
bool destroy = FALSE;

28
pcsx2/Linux/Linux.h
View File

@ -47,6 +47,34 @@
#include "../Paths.h"
#include "Common.h"
extern bool UseGui;
extern bool needReset;
extern bool RunExe;
extern GtkWidget *CpuDlg;
/* Config.c */
extern int LoadConfig();
extern void SaveConfig();
/* GtkGui */
extern void StartGui();
extern void RunGui();
extern int Pcsx2Configure();
extern void ChangeLanguage(char *lang);
extern void init_widgets();
/* LnxMain */
extern void InitLanguages();
extern char *GetLanguageNext();
extern void CloseLanguages();
extern void ChangeLanguage(char *lang);
/* Misc.c */
extern void vu0Shutdown();
extern void vu1Shutdown();
extern void SaveConfig();
typedef struct {
char lang[256];
} _langs;

90
pcsx2/Linux/LnxMain.c
View File

@ -21,7 +21,6 @@
#include "Common.h"
#include "PsxCommon.h"
#include "Linux.h"
#include "LnxMain.h"
DIR *dir;
@ -39,11 +38,8 @@ static int s_nShmCounter = 0;
int main(int argc, char *argv[]) {
char *file = NULL;
char elfname[256];
int runcd=0;
int efile = 0;
//char* g_pRunGSState = NULL;
int i = 1;
struct stat buf;
#ifdef PCSX2_VIRTUAL_MEM
void* pmem = mmap(PS2MEM_BASE, 0x40000000, PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS, 0, 0);
@ -275,6 +271,12 @@ void ChangeLanguage(char *lang) {
LoadConfig();
}
/* Quick macros for checking shift, control, alt, and caps lock. */
#define SHIFT_EVT(evt) ((evt == XK_Shift_L) || (evt == XK_Shift_R))
#define CTRL_EVT(evt) ((evt == XK_Control_L) || (evt == XK_Control_L))
#define ALT_EVT(evt) ((evt == XK_Alt_L) || (evt == XK_Alt_R))
#define CAPS_LOCK_EVT(evt) (evt == XK_Caps_Lock)
void KeyEvent(keyEvent* ev) {
static int shift = 0;
@ -282,50 +284,52 @@ void KeyEvent(keyEvent* ev) {
if( GSkeyEvent != NULL ) GSkeyEvent(ev);
if( ev->event == KEYPRESS )
if( ev->key == XK_Shift_L || ev->key == XK_Shift_R )
if (ev->event == KEYPRESS)
{
if (SHIFT_EVT(ev->key))
shift = 1;
else
if (ev->event == KEYRELEASE) {
if( ev->key == XK_Shift_L || ev->key == XK_Shift_R )
shift = 0;
return;
}
switch (ev->key) {
case XK_F1: ProcessFKeys(1, shift); break;
case XK_F2: ProcessFKeys(2, shift); break;
case XK_F3: ProcessFKeys(3, shift); break;
case XK_F4: ProcessFKeys(4, shift); break;
case XK_F5: ProcessFKeys(5, shift); break;
case XK_F6: ProcessFKeys(6, shift); break;
case XK_F7: ProcessFKeys(7, shift); break;
case XK_F8: ProcessFKeys(8, shift); break;
case XK_F9: ProcessFKeys(9, shift); break;
case XK_F10: ProcessFKeys(10, shift); break;
case XK_F11: ProcessFKeys(11, shift); break;
case XK_F12: ProcessFKeys(12, shift); break;
switch (ev->key) {
case XK_F1: ProcessFKeys(1, shift); break;
case XK_F2: ProcessFKeys(2, shift); break;
case XK_F3: ProcessFKeys(3, shift); break;
case XK_F4: ProcessFKeys(4, shift); break;
case XK_F5: ProcessFKeys(5, shift); break;
case XK_F6: ProcessFKeys(6, shift); break;
case XK_F7: ProcessFKeys(7, shift); break;
case XK_F8: ProcessFKeys(8, shift); break;
case XK_F9: ProcessFKeys(9, shift); break;
case XK_F10: ProcessFKeys(10, shift); break;
case XK_F11: ProcessFKeys(11, shift); break;
case XK_F12: ProcessFKeys(12, shift); break;
case XK_Escape:
signal(SIGINT, SIG_DFL);
signal(SIGPIPE, SIG_DFL);
case XK_Escape:
signal(SIGINT, SIG_DFL);
signal(SIGPIPE, SIG_DFL);
#ifdef PCSX2_DEVBUILD
if( g_SaveGSStream >= 3 ) {
g_SaveGSStream = 4;// gs state
break;
}
#endif
#ifdef PCSX2_DEVBUILD
if( g_SaveGSStream >= 3 ) {
// gs state
g_SaveGSStream = 4;
ClosePlugins();
if (!UseGui) exit(0);
RunGui();
break;
}
#endif
ClosePlugins();
if (!UseGui) exit(0);
RunGui();
break;
default:
GSkeyEvent(ev);
break;
default:
GSkeyEvent(ev);
break;
}
}
else if (ev->event == KEYRELEASE)
{
if (SHIFT_EVT(ev->key))
shift = 0;
}
return;
}
int SysInit() {
@ -374,7 +378,7 @@ void SysClose() {
void SysPrintf(const char *fmt, ...) {
va_list list;
char msg[512];
char* ptr, *src;
char* ptr;
int len, i, j, s;
va_start(list, fmt);

22
pcsx2/Linux/LnxMain.h
View File

@ -19,29 +19,9 @@
#ifndef __LNXMAIN_H__
#define __LNXMAIN_H__
extern bool UseGui;
extern bool needReset;
extern bool RunExe;
#include "Linux.h"
char* g_pRunGSState = NULL;
extern GtkWidget *CpuDlg;
/* Config.c */
extern int LoadConfig();
extern void SaveConfig();
/* GtkGui */
extern void StartGui();
extern void RunGui();
extern int Pcsx2Configure();
extern void ChangeLanguage(char *lang);
extern void init_widgets();
/* LnxMain */
void InitLanguages();
char *GetLanguageNext();
void CloseLanguages();
void ChangeLanguage(char *lang);
char* phelpmsg =
"\tpcsx2 [options] [file]\n\n"

19
pcsx2/configure.ac
View File

@ -16,6 +16,11 @@ CPPFLAGS=
CXXFLAGS=
CCASFLAGS=
WARNING_FLAGS="-Wall -Wextra -Wno-unused-parameter -Wno-format -Wno-empty-body -Wno-unused-value"
NORMAL_FLAGS="-O3 -fomit-frame-pointer ${WARNING_FLAGS}"
DEBUG_FLAGS=" -g ${WARNING_FLAGS}"
dnl Check for debug build
AC_MSG_CHECKING(debug build)
AC_ARG_ENABLE(debug, AC_HELP_STRING([--enable-debug], [debug build]),
@ -23,16 +28,16 @@ AC_ARG_ENABLE(debug, AC_HELP_STRING([--enable-debug], [debug build]),
if test "x$debug" == xyes
then
AC_DEFINE(_DEBUG,1,[_DEBUG])
CFLAGS+=" -g -Wall -Wextra"
CPPFLAGS+=" -g -Wall -Wextra "
CXXFLAGS+=" -g -Wall -Wextra"
CCASFLAGS+=" -D_DEBUG -g -Wall -Wextra"
CFLAGS+="${DEBUG_FLAGS}"
CPPFLAGS+="${DEBUG_FLAGS}"
CXXFLAGS+="${DEBUG_FLAGS}"
CCASFLAGS+=" -D_DEBUG ${DEBUG_FLAGS}"
MYOBJDIR="Debug"
else
AC_DEFINE(NDEBUG,1,[NDEBUG])
CFLAGS+=" -O3 -fomit-frame-pointer -Wall -Wextra"
CPPFLAGS+=" -O3 -fomit-frame-pointer -Wall -Wextra"
CXXFLAGS+=" -O3 -fomit-frame-pointer -Wall -Wextra"
CFLAGS+="${NORMAL_FLAGS}"
CPPFLAGS+="${NORMAL_FLAGS}"
CXXFLAGS+="${NORMAL_FLAGS}"
MYOBJDIR="Release"
fi
AC_MSG_RESULT($debug)