Patches (7851): 7851, 7855, 7856;

git-svn-id: https://pcsxr.svn.codeplex.com/svn/pcsxr@61440 e17a0e51-4ae3-4d35-97c3-1a29b211df97

2 files changed, 37 insertions, 41 deletions

diff --git a/plugins/peopsxgl/Makefile.am b/plugins/peopsxgl/Makefile.am
index d88dc94b..9875cbfe 100644
--- a/plugins/peopsxgl/Makefile.am
+++ b/plugins/peopsxgl/Makefile.am
@@ -1,8 +1,8 @@
-INCLUDES = -DPIXMAPDIR=\"${datadir}/pixmaps/\" \
+AM_CPPFLAGS = -DPIXMAPDIR=\"${datadir}/pixmaps/\" \
 	-DLOCALE_DIR=\"${datadir}/locale/\" \
 	-DDATADIR=\"${datadir}/psemu/\" \
-	$(GTK2_CFLAGS) $(GLADE2_CFLAGS) -I/usr/X11R6/include \
-	-I../../libpcsxcore -I../../include -fPIC
+	$(GTK2_CFLAGS) \
+	-I../../libpcsxcore -I../../include
 
 bindir = @libdir@/games/psemu/
 libdir = @libdir@/games/psemu/
@@ -11,14 +11,13 @@ lib_LTLIBRARIES = libpeopsxgl.la
 
 libpeopsxgl_la_SOURCES = cfg.c draw.c fps.c gpu.c key.c menu.c \
 	prim.c soft.c texture.c
-libpeopsxgl_la_LDFLAGS = -module -avoid-version \
-	-L/usr/X11R6/lib64 -L/usr/X11R6/lib -lX11 -lXxf86vm -lGL -lm
+libpeopsxgl_la_LDFLAGS = -module -avoid-version
+libpeopsxgl_la_LIBADD = -lX11 -lXxf86vm -lGL -lm
 
 bin_PROGRAMS = cfgpeopsxgl
-cfgpeopsxgl_SOURCES = gpucfg/main.c gpucfg/callbacks.c gpucfg/interface.c \
-	gpucfg/support.c
-cfgpeopsxgl_LDADD = $(GTK2_LIBS) $(GLADE2_LIBS)
+cfgpeopsxgl_SOURCES = gpucfg/main.c
+cfgpeopsxgl_LDADD = $(GTK2_LIBS)
 
-#glade_DATA = gpucfg-0.1df/peopsxgl.glade2
-#gladedir = $(datadir)/psemu/
+glade_DATA = gpucfg/gpucfg-newstyle2.glade
+gladedir = $(datadir)/psemu/
 #EXTRA_DIST = $(glade_DATA)
diff --git a/plugins/peopsxgl/gpucfg/main.c b/plugins/peopsxgl/gpucfg/main.c
index 5c38737f..af93df17 100644
--- a/plugins/peopsxgl/gpucfg/main.c
+++ b/plugins/peopsxgl/gpucfg/main.c
@@ -1,29 +1,25 @@
+#ifdef HAVE_CONFIG_H
 #include "config.h"
+#endif
 
 #include <gtk/gtk.h>
 
-#include "interface.h"
-#include "support.h"
 #include <unistd.h>
 #include <stdio.h>
 #include <stdlib.h>  
 #include <string.h>
 
-#ifdef ENABLE_NLS
-#include <libintl.h>
-#include <locale.h>
-#endif 
-
-#define SETCHECK(winame)  gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON ((GtkWidget*) gtk_object_get_data (GTK_OBJECT (CfgWnd),winame)), TRUE)
-#define SETEDIT(winame,sz)  gtk_entry_set_text(GTK_ENTRY((GtkWidget*) gtk_object_get_data (GTK_OBJECT (CfgWnd),winame)), sz)
-#define SETEDITVAL(winame,v)  sprintf(t,"%d",v);gtk_entry_set_text(GTK_ENTRY((GtkWidget*) gtk_object_get_data (GTK_OBJECT (CfgWnd),winame)), t)
-#define SETLIST(winame,v)  gtk_list_select_item(GTK_LIST(GTK_COMBO((GtkWidget*) gtk_object_get_data (GTK_OBJECT (CfgWnd),winame))->list),v)
+#define SETCHECK(winame)  gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (gtk_builder_get_object (wndMain,winame)), TRUE)
+#define SETEDITVAL(winame,v)  sprintf(t,"%d",v);gtk_entry_set_text(GTK_ENTRY(gtk_builder_get_object (wndMain,winame)), t)
+#define SETLIST(winame,v)  gtk_combo_box_set_active(GTK_COMBO_BOX(gtk_builder_get_object(wndMain,winame)), v)
 
-static GtkWidget * wndMain=0;
+static GtkBuilder *wndMain;
+void SaveConfig(void);
 
 int main (int argc, char *argv[])
 {
-  GtkWidget *CfgWnd;
+  GtkWidget *main_win;
+  GError *error = NULL;
   FILE *in;char t[256];int len,val; 
   char * pB, * p; 
 
@@ -31,26 +27,27 @@ int main (int argc, char *argv[])
   if(strcmp(argv[1],"CFG")!=0 && strcmp(argv[1],"ABOUT")!=0)
    return 0;
 
-#ifdef ENABLE_NLS
-  setlocale (LC_ALL, "");
-  bindtextdomain (GETTEXT_PACKAGE, LOCALE_DIR);
-  bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
-  textdomain (GETTEXT_PACKAGE);
-#endif
-
   gtk_set_locale ();
   gtk_init (&argc, &argv);
 
+  wndMain = gtk_builder_new();
+  gtk_builder_set_translation_domain(wndMain, PACKAGE_NAME);
+  if (!gtk_builder_add_from_file (wndMain, DATADIR "gpucfg-newstyle2.glade", &error))
+    {
+     g_warning ("Couldn't load builder file: %s", error->message);
+     g_error_free (error);
+     return -1;
+    }
+
   if (strcmp(argv[1],"ABOUT") == 0)
    {
-    CfgWnd  = create_AboutWnd ();
-    gtk_widget_show (CfgWnd);
-    gtk_main ();
+    main_win  = GTK_WIDGET(gtk_builder_get_object(wndMain, "AboutWnd"));
+    gtk_widget_show_all (main_win);
+    gtk_dialog_run(GTK_DIALOG(main_win));
     return 0;
    }
 
-  CfgWnd  = create_CfgWnd ();
-  wndMain = CfgWnd;
+  main_win = GTK_WIDGET(gtk_builder_get_object(wndMain, "CfgWnd"));
 
   in = fopen("gpuPeopsMesaGL.cfg","rb");
   if(in)
@@ -321,7 +318,7 @@ int main (int argc, char *argv[])
    }
   if(val) SETCHECK("chkFastMdec");
 
-  val=0;
+  val=1;
   if(pB)
    {
     strcpy(t,"\nOGLExtensions");p=strstr(pB,t);if(p) {p=strstr(p,"=");len=1;}
@@ -369,8 +366,8 @@ int main (int argc, char *argv[])
 
   if(pB) free(pB);
 
-  gtk_widget_show (CfgWnd);
-  gtk_main ();
+  gtk_widget_show_all (main_win);
+  if (gtk_dialog_run(GTK_DIALOG(main_win))==GTK_RESPONSE_OK) {SaveConfig();}
   return 0;
 }
 
@@ -409,9 +406,9 @@ void SetCfgVal(char * pB,char * pE,int val)
 
 ////////////////////////////////////////////////////////////////////////////////////////////////
 
-#define GETEDITVAL(winame) atoi(gtk_entry_get_text(GTK_ENTRY((GtkWidget*) gtk_object_get_data (GTK_OBJECT (wndMain),winame))))
-#define GETCHECK(winame)  gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON ((GtkWidget*) gtk_object_get_data (GTK_OBJECT (wndMain),winame)))?1:0
-#define GETLIST(winame) atoi(gtk_entry_get_text(GTK_ENTRY(GTK_COMBO((GtkWidget*) gtk_object_get_data (GTK_OBJECT (wndMain),winame))->entry)))
+#define GETEDITVAL(winame) atoi(gtk_entry_get_text(GTK_ENTRY(gtk_builder_get_object (wndMain,winame))))
+#define GETCHECK(winame)  gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (gtk_builder_get_object (wndMain,winame)))
+#define GETLIST(winame)  gtk_combo_box_get_active(GTK_COMBO_BOX(gtk_builder_get_object(wndMain,winame)))
 
 void SaveConfig(void)
 {