From b59859784f3d86b70fbf024fcce878c44a92d9e8 Mon Sep 17 00:00:00 2001 From: "SND\\weimingzhi_cp" Date: Mon, 5 Oct 2009 08:12:50 +0000 Subject: git-svn-id: https://pcsxr.svn.codeplex.com/svn/pcsxr@31115 e17a0e51-4ae3-4d35-97c3-1a29b211df97 --- plugins/dfcdrom/cdr.c | 12 +- plugins/dfcdrom/cfgCdr.glade | 923 +++++++++++-------------- plugins/dfinput/dfinput.glade2 | 68 +- plugins/dfinput/pad.c | 8 +- plugins/dfsound/cfg.c | 29 +- plugins/dfsound/spucfg-0.1df/dfsound.glade2 | 940 ++++++++------------------ plugins/dfsound/spucfg-0.1df/main.c | 15 - plugins/dfxvideo/cfg.c | 24 +- plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2 | 202 ++---- plugins/peopsxgl/cfg.c | 7 +- plugins/peopsxgl/gpu.c | 18 +- 11 files changed, 831 insertions(+), 1415 deletions(-) (limited to 'plugins') diff --git a/plugins/dfcdrom/cdr.c b/plugins/dfcdrom/cdr.c index d6529a4d..f16a1c3a 100644 --- a/plugins/dfcdrom/cdr.c +++ b/plugins/dfcdrom/cdr.c @@ -569,17 +569,17 @@ void ExecCfg(char *arg) { strcpy(cfg, "./cfgDFCdrom"); if (stat(cfg, &buf) != -1) { - strcat(cfg, " "); - strcat(cfg, arg); - system(cfg); + if (fork() == 0) { + execl(cfg, "cfgDFCdrom", arg, NULL); + } return; } strcpy(cfg, "./cfg/DFCdrom"); if (stat(cfg, &buf) != -1) { - strcat(cfg, " "); - strcat(cfg, arg); - system(cfg); + if (fork() == 0) { + execl(cfg, "cfgDFCdrom", arg, NULL); + } return; } diff --git a/plugins/dfcdrom/cfgCdr.glade b/plugins/dfcdrom/cfgCdr.glade index 60fa04af..c926cf08 100644 --- a/plugins/dfcdrom/cfgCdr.glade +++ b/plugins/dfcdrom/cfgCdr.glade @@ -1,549 +1,386 @@ - - - + - - - 5 - True - CDR configuration - GTK_WINDOW_TOPLEVEL - GTK_WIN_POS_CENTER - True - True - False - False - - - - - True - False - 0 - - - - True - GTK_BUTTONBOX_END - - - - True - True - True - gtk-cancel - True - GTK_RELIEF_NORMAL - -6 - - - - - - - True - True - True - gtk-ok - True - GTK_RELIEF_NORMAL - -5 - - - - - - 0 - False - True - GTK_PACK_END - - - - - - True - False - 0 - - - - True - 0 - 0.5 - GTK_SHADOW_ETCHED_IN - - - - 10 - True - False - True - False - True - False - - - - True - chose yor cdrom device or type its path if it's not listed - True - True - True - 0 - - True - * - True - - - - - - True - GTK_SELECTION_BROWSE - - - - - - - - True - Select cdrom device - False - False - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - - - label_item - - - - - 0 - True - True - - - - - - True - 0 - 0.5 - GTK_SHADOW_ETCHED_IN - - - - True - False - 0 - - - - 5 - True - False - 0 - - - - True - Select read mode: - False - False - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 5 - 5 - - - 0 - False - False - - - - - - 5 - True - True - 0 - - - - - - - True - Normal (No Cache) - True - - - - - - True - Threaded - Faster (With Cache) - True - - - - - - - 1 - True - True - - - - - 0 - False - False - - - - - - True - - - 0 - True - True - - - - - - 5 - True - False - 5 - - - - True - Cache Size (Def. 64): - False - False - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - - - 0 - False - False - - - - - - True - True - 1 - 0 - True - GTK_UPDATE_ALWAYS - False - False - 32 32 2048 1 16 16 - - - 0 - True - True - - - - - 0 - True - True - - - - - - True - - - 0 - True - True - - - - - - 5 - True - False - 5 - - - - True - Cdrom Speed (Def. 0 = MAX): - False - False - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - - - 0 - False - False - - - - - - True - True - 1 - 0 - True - GTK_UPDATE_ALWAYS - False - False - 0 0 100 1 4 4 - - - 0 - True - True - - - - - 0 - True - True - - - - - - True - - hseparator - - - - 0 - True - True - - - - - - 10 - True - True - Enable subQ read - True - GTK_RELIEF_NORMAL - False - False - True - - - 0 - False - False - - - - - - - - True - Options - False - False - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - - - label_item - - - - - 0 - True - True - - - - - 0 - True - True - - - - - - - - 10 - 300 - 200 - True - About CDR - GTK_WINDOW_TOPLEVEL - GTK_WIN_POS_CENTER - False - True - True - True - - - - True - False - 0 - - - - True - GTK_BUTTONBOX_END - - - - True - True - True - gtk-ok - True - GTK_RELIEF_NORMAL - -5 - - - - - - 0 - False - True - GTK_PACK_END - - - - - - 10 - True - False - 0 - - - - True - <span size="xx-large"><b>CDR plugin</b></span> - False - True - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 5 - 5 - - - 0 - False - False - - - - - - True - linux CDR plugin for Pcsx + + + + True + 5 + CDR configuration + True + center + normal + False + + + + True + vertical + + + True + vertical + + + True + 0 + + + True + 10 + False + + + True + True + chose yor cdrom device or type its path if it's not listed + True + + + 0 + + + + + True + browse + + + + + + + True + Select cdrom device + + + label_item + + + + + 0 + + + + + True + 0 + + + True + vertical + + + True + 5 + + + True + 5 + 5 + Select read mode: + + + False + False + 0 + + + + + True + True + False + 5 + + + 1 + 1 + + + + + False + False + 0 + + + + + True + + + 1 + + + + + True + 5 + 5 + + + True + Cache Size (Def. 64): + + + False + False + 0 + + + + + True + True + 32 32 2048 1 16 16 + 1 + True + + + 1 + + + + + 2 + + + + + True + + + 3 + + + + + True + 5 + 5 + + + True + Cdrom Speed (Def. 0 = MAX): + + + False + False + 0 + + + + + True + True + 0 0 100 1 4 4 + 1 + True + + + 1 + + + + + 4 + + + + + True + + hseparator + + + + 5 + + + + + Enable subchannel read + True + True + False + 10 + True + True + + + False + False + 6 + + + + + + + True + Options + + + label_item + + + + + 1 + + + + + 1 + + + + + True + end + + + gtk-cancel + -6 + True + True + True + False + True + + + + False + False + 0 + + + + + gtk-ok + -5 + True + True + True + False + True + + + + False + False + 1 + + + + + False + end + 0 + + + + + + + 300 + 200 + True + 10 + About CDR + center + True + normal + + + True + vertical + + + True + 10 + vertical + + + True + 5 + 5 + <span size="xx-large"><b>CDR plugin</b></span> + True + + + False + False + 0 + + + + + True + 5 + 5 + linux CDR plugin for Pcsx - False - False - GTK_JUSTIFY_FILL - False - False - 0.5 - 0.5 - 5 - 5 - - - 0 - False - False - - - - - - True - <small>(c) linuzappz linuzappz@hotmail.com + fill + + + False + False + 1 + + + + + True + 5 + 5 + <small>(c) linuzappz linuzappz@hotmail.com xobro _xobro_@tin.it</small> - False - True - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 5 - 5 - - - 0 - False - False - - - - - 0 - True - True - - - - - - + True + + + False + False + 2 + + + + + 2 + + + + + True + end + + + gtk-ok + -5 + True + True + True + False + True + + + + False + False + 0 + + + + + False + end + 0 + + + + + diff --git a/plugins/dfinput/dfinput.glade2 b/plugins/dfinput/dfinput.glade2 index b6905f2e..d98fcbd7 100644 --- a/plugins/dfinput/dfinput.glade2 +++ b/plugins/dfinput/dfinput.glade2 @@ -1,19 +1,22 @@ - - - + + + True Configure Gamepad/Keyboard True + dialog True 6 + vertical 6 True + vertical True @@ -27,15 +30,16 @@ False False + 0 + 1 True True - 1 + False True - 0 True @@ -46,11 +50,11 @@ + 2 True True - 2 + False True - 0 True radiobutton1 @@ -61,6 +65,9 @@ + + 0 + @@ -75,13 +82,13 @@ False False + 0 True True - * 1 @@ -99,25 +106,26 @@ 6 + Multi-threaded True True - Multi-threaded + False True - 0 True False False + 0 + Analog True True - Analog + False True - 0 True @@ -135,7 +143,7 @@ True 0 - GTK_SHADOW_OUT + out True @@ -165,32 +173,42 @@ + + 0 + True 6 - GTK_BUTTONBOX_END + end + gtk-cancel True True True - gtk-cancel + False True - 0 + + False + False + 0 + + gtk-ok True True True - gtk-ok + False True - 0 + False + False 1 @@ -205,19 +223,21 @@ True - GDK_WINDOW_TYPE_HINT_NORMAL - Based on PadJoy by Erich Kitzmüller (ammoq@ammoq.com) - Erich Kitzmüller (ammoq@ammoq.com) + center + normal + Based on PadJoy by Erich Kitzmüller (ammoq@ammoq.com) + Erich Kitzmüller (ammoq@ammoq.com) Andrew Burton (adb@iinet.net.au) translator-credits + vertical - - + False - GTK_PACK_END + end + 0 diff --git a/plugins/dfinput/pad.c b/plugins/dfinput/pad.c index 4d17cf24..784b8ee3 100644 --- a/plugins/dfinput/pad.c +++ b/plugins/dfinput/pad.c @@ -956,7 +956,9 @@ static void loadConfig() { } long PADconfigure(void) { - system("cfg/cfgDFInput"); + if (fork() == 0) { + execl("cfg/cfgDFInput", "cfgDFInput", NULL); + } return 0; } @@ -967,7 +969,9 @@ long PADconfigure(void) { void PADabout(void) { - system("cfg/cfgDFInput -about"); + if (fork() == 0) { + execl("cfg/cfgDFInput", "cfgDFInput", "-about", NULL); + } } #ifdef __linux__ diff --git a/plugins/dfsound/cfg.c b/plugins/dfsound/cfg.c index 6f092e54..142494f9 100644 --- a/plugins/dfsound/cfg.c +++ b/plugins/dfsound/cfg.c @@ -33,18 +33,19 @@ void StartCfgTool(char * pCmdLine) { - FILE * cf;char filename[255],t[255]; + FILE * cf; + char filename[255]; strcpy(filename,"cfg/cfgDFSound"); cf=fopen(filename,"rb"); if(cf!=NULL) { fclose(cf); - getcwd(t,255); - chdir("cfg"); - sprintf(filename,"./cfgDFSound %s",pCmdLine); - system(filename); - chdir(t); + if(fork()==0) + { + chdir("cfg"); + execl(filename,"cfgDFSound",pCmdLine,NULL); + } } else { @@ -53,8 +54,10 @@ void StartCfgTool(char * pCmdLine) if(cf!=NULL) { fclose(cf); - sprintf(filename,"./cfgDFSound %s",pCmdLine); - system(filename); + if(fork()==0) + { + execl(filename,"cfgDFSound",pCmdLine,NULL); + } } else { @@ -63,11 +66,11 @@ void StartCfgTool(char * pCmdLine) if(cf!=NULL) { fclose(cf); - getcwd(t,255); - chdir(getenv("HOME")); - sprintf(filename,"./cfgDFSound %s",pCmdLine); - system(filename); - chdir(t); + if(fork()==0) + { + chdir(getenv("HOME")); + execl(filename,"cfgDFSound",pCmdLine,NULL); + } } else printf("Sound error: cfgDFSound not found!\n"); } diff --git a/plugins/dfsound/spucfg-0.1df/dfsound.glade2 b/plugins/dfsound/spucfg-0.1df/dfsound.glade2 index bc834599..12d3e8ac 100644 --- a/plugins/dfsound/spucfg-0.1df/dfsound.glade2 +++ b/plugins/dfsound/spucfg-0.1df/dfsound.glade2 @@ -1,654 +1,306 @@ - - - + - - - 10 - True - Configure Sound - GTK_WINDOW_TOPLEVEL - GTK_WIN_POS_NONE - True - True - False - True - False - False - GDK_WINDOW_TYPE_HINT_NORMAL - GDK_GRAVITY_NORTH_WEST - True - False - - - - - True - False - 6 - - - - True - 0 - 0.5 - GTK_SHADOW_ETCHED_IN - - - - True - 0.5 - 0.5 - 1 - 1 - 6 - 6 - 12 - 12 - - - - 6 - True - 3 - 2 - False - 6 - 6 - - - - True - Volume: - False - False - GTK_JUSTIFY_RIGHT - False - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - 1 - 0 - 1 - fill - - - - - - - True - Interpolation: - False - False - GTK_JUSTIFY_RIGHT - False - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - 1 - 2 - 3 - fill - - - - - - - True - Reverb: - False - False - GTK_JUSTIFY_RIGHT - False - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - 1 - 1 - 2 - fill - - - - - - - True - Low + + + + True + 10 + Configure Sound + True + center + dialog + + + + True + vertical + 6 + + + True + 0 + + + True + 6 + 6 + 12 + 12 + + + True + 6 + 3 + 2 + 6 + 6 + + + True + 0 + Volume: + right + + + GTK_FILL + + + + + + True + 0 + Interpolation: + right + + + 2 + 3 + GTK_FILL + + + + + + True + 0 + Reverb: + right + + + 1 + 2 + GTK_FILL + + + + + + True + Low Medium Loud Loudest - False - True - - - 1 - 2 - 0 - 1 - fill - - - - - - True - Off + + + 1 + 2 + GTK_FILL + + + + + True + Off Simple Playstation - False - True - - - 1 - 2 - 1 - 2 - fill - fill - - - - - - True - None + + + 1 + 2 + 1 + 2 + GTK_FILL + GTK_FILL + + + + + True + None Simple Gaussian Cubic - False - True - - - 1 - 2 - 2 - 3 - fill - fill - - - - - - - - - - True - <b>General</b> - False - True - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - label_item - - - - - 0 - True - True - - - - - - True - 0 - 0.5 - GTK_SHADOW_ETCHED_IN - - - - True - 0.5 - 0.5 - 1 - 1 - 6 - 6 - 12 - 12 - - - - 6 - True - False - 6 - - - - True - Choose this if XA music is played too quickly. - True - Adjust XA speed - True - GTK_RELIEF_NORMAL - True - False - False - True - - - 0 - False - False - - - - - - - - - - True - <b>XA Music</b> - False - True - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - label_item - - - - - 0 - True - True - - - - - - True - 0 - 0.5 - GTK_SHADOW_ETCHED_IN - - - - True - 0.5 - 0.5 - 1 - 1 - 6 - 6 - 12 - 12 - - - - 6 - True - False - 6 - - - - True - Use the asynchronous SPU interface. - True - High compatibility mode - True - GTK_RELIEF_NORMAL - True - False - False - True - - - 0 - False - False - - - - - - True - Wait for CPU; only useful for some games. - True - SPU IRQ Wait - True - GTK_RELIEF_NORMAL - True - False - False - True - - - 0 - False - False - - - - - - True - Play only one channel for a performance boost. - True - Single channel sound - True - GTK_RELIEF_NORMAL - True - False - False - True - - - 0 - False - False - - - - - - - - - - True - <b>Compatibility</b> - False - True - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - label_item - - - - - 0 - True - True - - - - - - True - GTK_BUTTONBOX_END - 0 - - - - True - True - True - gtk-close - True - GTK_RELIEF_NORMAL - True - - - - - 0 - True - True - - - - - - - - 12 - True - About Sound Plugin - GTK_WINDOW_TOPLEVEL - GTK_WIN_POS_NONE - True - True - False - True - False - False - GDK_WINDOW_TYPE_HINT_NORMAL - GDK_GRAVITY_NORTH_WEST - True - False - - - - - True - False - 0 - - - - True - False - 0 - - - - True - Coded by: Pete Bernert and the P.E.Op.S. team - False - False - GTK_JUSTIFY_CENTER - False - False - 0.5 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - False - False - - - - - - True - Homepage: http://home.t-online.de/home/PeteBernert/ - False - False - GTK_JUSTIFY_CENTER - False - False - 0.5 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - False - False - - - - - - True - EMail: BlackDove@addcom.de - False - False - GTK_JUSTIFY_CENTER - False - False - 0.5 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - False - False - - - - - - 0 - True - Version: 1.6 - False - False - GTK_JUSTIFY_CENTER - False - False - 0.5 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - False - False - - - - - - True - Release date: 05.04.2003 - False - False - GTK_JUSTIFY_CENTER - False - False - 0.5 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - False - False - - - - - - True - <b>PCSX-df Sound Plugin Adaption</b> - False - True - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - False - False - - - - - 0 - True - True - - - - - - + + + 1 + 2 + 2 + 3 + GTK_FILL + GTK_FILL + + + + + + + + + True + <b>General</b> + True + + + label_item + + + + + 0 + + + + + True + 0 + + + True + 6 + 6 + 12 + 12 + + + True + 6 + vertical + 6 + + + Adjust XA speed + True + True + False + Choose this if XA music is played too quickly. + True + True + + + False + False + 0 + + + + + + + + + True + <b>XA Music</b> + True + + + label_item + + + + + 1 + + + + + True + 0 + + + True + 6 + 6 + 12 + 12 + + + True + 6 + vertical + 6 + + + High compatibility mode + True + True + False + Use the asynchronous SPU interface. + True + True + + + False + False + 0 + + + + + SPU IRQ Wait + True + True + False + Wait for CPU; only useful for some games. + True + True + + + False + False + 1 + + + + + Single channel sound + True + True + False + Play only one channel for a performance boost. + True + True + + + False + False + 2 + + + + + + + + + True + <b>Compatibility</b> + True + + + label_item + + + + + 2 + + + + + True + end + + + gtk-close + True + True + True + False + True + + + False + False + 0 + + + + + 3 + + + + + diff --git a/plugins/dfsound/spucfg-0.1df/main.c b/plugins/dfsound/spucfg-0.1df/main.c index 66ba0936..8008e87d 100644 --- a/plugins/dfsound/spucfg-0.1df/main.c +++ b/plugins/dfsound/spucfg-0.1df/main.c @@ -20,21 +20,6 @@ void SaveConfig (GtkWidget *widget, gpointer user_datal); -/* ADB DONE -GtkWidget *wndMain = 0; - -GtkWidget *create_CfgWnd(GladeXML * xml) -{ - wndMain = glade_xml_get_widget(xml, "CfgWnd"); - return wndMain; -} - -GtkWidget *create_AboutWnd(GladeXML * xml) -{ - wndMain = glade_xml_get_widget(xml, "AboutWnd"); - return wndMain; -}*/ - /* This function checks for the value being outside the accepted range, and returns the appropriate boundary value */ int set_limit (char *p, int len, int lower, int upper) diff --git a/plugins/dfxvideo/cfg.c b/plugins/dfxvideo/cfg.c index f98e1256..458cde09 100644 --- a/plugins/dfxvideo/cfg.c +++ b/plugins/dfxvideo/cfg.c @@ -18,6 +18,7 @@ #define _IN_CFG #include +#include #undef FALSE #undef TRUE #define MAKELONG(low,high) ((unsigned long)(((unsigned short)(low)) | (((unsigned long)((unsigned short)(high))) << 16))) @@ -26,12 +27,9 @@ #include "cfg.h" #include "gpu.h" -// CONFIG FILE helpers.... used in (non-fpse) Linux and ZN Windows - -#include - char * pConfigFile = NULL; +// CONFIG FILE helpers.... // some helper macros: #define GetValue(name, var) \ @@ -172,25 +170,25 @@ void ExecCfg(char *arg) { strcpy(cfg, "./cfgDFXVideo"); if (stat(cfg, &buf) != -1) { - strcat(cfg, " "); - strcat(cfg, arg); - system(cfg); + if (fork() == 0) { + execl(cfg, "cfgDFXVideo", arg, NULL); + } return; } strcpy(cfg, "./cfg/cfgDFXVideo"); if (stat(cfg, &buf) != -1) { - strcat(cfg, " "); - strcat(cfg, arg); - system(cfg); + if (fork() == 0) { + execl(cfg, "cfgDFXVideo", arg, NULL); + } return; } sprintf(cfg, "%s/.pcsx/plugins/cfg/cfgDFXVideo", getenv("HOME")); if (stat(cfg, &buf) != -1) { - strcat(cfg, " "); - strcat(cfg, arg); - system(cfg); + if (fork() == 0) { + execl(cfg, "cfgDFXVideo", arg, NULL); + } return; } diff --git a/plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2 b/plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2 index 3eba6be9..62e7c597 100644 --- a/plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2 +++ b/plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2 @@ -1,20 +1,24 @@ - - - + + + True 10 Configure X11 Video True + center + dialog True + vertical 6 True + 0 True @@ -25,6 +29,7 @@ True + vertical True @@ -128,32 +133,36 @@ + + 0 + True + Maintain 4:3 Aspect Ratio True True - Maintain 4:3 Aspect Ratio + False True - 0 True False False + 0 + Fullscreen True True + False Toggle windowed/fullscreen mode. - Fullscreen True - 0 True @@ -182,10 +191,14 @@ + + 0 + True + 0 True @@ -196,29 +209,31 @@ True + vertical + Show FPS True True + False Toggle whether the FPS will be shown. - Show FPS True - 0 True False False + 0 + Autodetect FPS limit True True + False Enable this if games display too quickly. - Autodetect FPS limit True - 0 True True @@ -230,12 +245,12 @@ + Enable frame skipping True True + False Skip frames when rendering. - Enable frame skipping True - 0 True @@ -247,16 +262,15 @@ True - 1 2 12 + Set FPS True True - Set FPS + False True - 0 True @@ -307,6 +321,7 @@ True + 0 True @@ -317,18 +332,20 @@ True + vertical + Use game fixes True True - Use game fixes + False True - 0 True False False + 0 @@ -373,11 +390,11 @@ + Draw quads with triangles True True - Draw quads with triangles + False True - 0 True @@ -389,11 +406,11 @@ + Repeated flat tex triangles True True - Repeated flat tex triangles + False True - 0 True @@ -405,11 +422,11 @@ + Disable CPU Saving True True - Disable CPU Saving + False True - 0 True @@ -421,11 +438,11 @@ + Odd/even bit hack True True - Odd/even bit hack + False True - 0 True @@ -465,11 +482,11 @@ + PC FPS calculation True True - PC FPS calculation + False True - 0 True @@ -496,11 +513,11 @@ + Lazy screen update True True - Lazy screen update + False True - 0 True @@ -527,11 +544,11 @@ + Old frame skipping True True - Old frame skipping + False True - 0 True @@ -543,11 +560,11 @@ + Expand screen width True True - Expand screen width + False True - 0 True @@ -559,11 +576,11 @@ + Ignore brightness color True True - Ignore brightness color + False True - 0 True @@ -575,11 +592,11 @@ + Disable coordinate check True True - Disable coordinate check + False True - 0 True @@ -676,121 +693,26 @@ True - GTK_BUTTONBOX_END + end + gtk-close True True True - gtk-close + False True - 0 - - - - - 3 - - - - - - - True - 12 - About X11 Video Plugin - True - - - - True - - - True - True - - - True - Coded by: Pete Bernert and the P.E.Op.S. team - GTK_JUSTIFY_CENTER - - - False - False - - - - - True - Homepage: http://home.t-online.de/home/PeteBernert/ - GTK_JUSTIFY_CENTER - - - False - False - 1 - - - - - True - EMail: BlackDove@addcom.de - GTK_JUSTIFY_CENTER - - - False - False - 2 - - - - - 0 - True - Version: 1.15 - GTK_JUSTIFY_CENTER - - - False - False - 3 - - - - - True - Release date: 2003 - GTK_JUSTIFY_CENTER False False - 4 - - - - - True - <b>PCSX-df Video Plugin Adaption</b> - True - - - False - False - 5 - - - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - XVideo Support: Stephen Chao - - - 6 + 0 + + 3 + diff --git a/plugins/peopsxgl/cfg.c b/plugins/peopsxgl/cfg.c index 0c5d28bf..3dcd0aba 100644 --- a/plugins/peopsxgl/cfg.c +++ b/plugins/peopsxgl/cfg.c @@ -203,7 +203,7 @@ void ReadConfigFile() void ReadConfig(void) // read config (linux file) { - iResX=640; + iResX=640; iResY=480; iColDepth=16; bChangeRes=FALSE; @@ -247,8 +247,3 @@ void ReadConfig(void) // read config (linux fil else iZBufferDepth=0; if(bUseFixes) dwActFixes=dwCfgFixes; // init game fix global } - - - - - diff --git a/plugins/peopsxgl/gpu.c b/plugins/peopsxgl/gpu.c index 8d6aa712..f956a63c 100644 --- a/plugins/peopsxgl/gpu.c +++ b/plugins/peopsxgl/gpu.c @@ -2624,25 +2624,25 @@ void StartCfgTool(char *arg) // linux: start external cfg tool strcpy(cfg, "./cfgpeopsxgl"); if (stat(cfg, &buf) != -1) { - strcat(cfg, " "); - strcat(cfg, arg); - system(cfg); + if (fork() == 0) { + execl(cfg, "cfgpeopsxgl", arg, NULL); + } return; } strcpy(cfg, "./cfg/cfgpeopsxgl"); if (stat(cfg, &buf) != -1) { - strcat(cfg, " "); - strcat(cfg, arg); - system(cfg); + if (fork() == 0) { + execl(cfg, "cfgpeopsxgl", arg, NULL); + } return; } sprintf(cfg, "%s/.pcsx/plugins/cfg/cfgpeopsxgl", getenv("HOME")); if (stat(cfg, &buf) != -1) { - strcat(cfg, " "); - strcat(cfg, arg); - system(cfg); + if (fork() == 0) { + execl(cfg, "cfgpeopsxgl", arg, NULL); + } return; } -- cgit v1.2.3