.

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

3 files changed, 81 insertions, 43 deletions

diff --git a/plugins/peopsxgl/cfg.c b/plugins/peopsxgl/cfg.c
index 4cd8e8e0..e43fa116 100755
--- a/plugins/peopsxgl/cfg.c
+++ b/plugins/peopsxgl/cfg.c
@@ -64,6 +64,11 @@ void ReadConfigFile()
  if(bKeepRatio<0) bKeepRatio=0;
  if(bKeepRatio>1) bKeepRatio=1;
 
+ strcpy(t,"\nForceRatio43");p=strstr(pB,t);if(p) {p=strstr(p,"=");len=1;}
+ if(p) bForceRatio43=atoi(p+len);
+ if(bForceRatio43<0) bForceRatio43=0;
+ if(bForceRatio43>1) bForceRatio43=1;
+ 
  strcpy(t,"\nScreenSmoothing");p=strstr(pB,t);if(p) {p=strstr(p,"=");len=1;}
  if(p) iBlurBuffer=atoi(p+len);
  if(iBlurBuffer<0) iBlurBuffer=0;
@@ -238,6 +243,7 @@ void ReadConfig(void)                                  // read config (linux fil
  iShowFPS=0;
  bGteAccuracy=0;
  bKeepRatio=FALSE;
+ bForceRatio43=FALSE;
  iScanBlend=0;
  iVRamSize=0;
  iTexGarbageCollection=1;
diff --git a/plugins/peopsxgl/gpucfg/main.c b/plugins/peopsxgl/gpucfg/main.c
index eb068883..812ec5f9 100755
--- a/plugins/peopsxgl/gpucfg/main.c
+++ b/plugins/peopsxgl/gpucfg/main.c
@@ -16,6 +16,7 @@ GtkWidget *window,
           *spinXSize,
           *spinYSize,
           *chkKeepRatio,
+		  *chkForceRatio43,
           *chkDithering,
           *chkFullScreen,
           *cbxTexQuality,
@@ -99,6 +100,7 @@ void on_btnSave_clicked( GObject *object, gpointer user_data ) {
         fprintf( out, "\nResX             = %i", gtk_spin_button_get_value_as_int( GTK_SPIN_BUTTON(   spinXSize           ) ) );
         fprintf( out, "\nResY             = %i", gtk_spin_button_get_value_as_int( GTK_SPIN_BUTTON(   spinYSize           ) ) );        
         fprintf( out, "\nKeepRatio        = %i", gtk_toggle_button_get_active(     GTK_TOGGLE_BUTTON( chkKeepRatio        ) ) );
+		fprintf( out, "\nForceRatio43     = %i", gtk_toggle_button_get_active(     GTK_TOGGLE_BUTTON( chkForceRatio43     ) ) );
         fprintf( out, "\nDithering        = %i", gtk_toggle_button_get_active(     GTK_TOGGLE_BUTTON( chkDithering        ) ) );
         fprintf( out, "\nFullScreen       = %i", gtk_toggle_button_get_active(     GTK_TOGGLE_BUTTON( chkFullScreen       ) ) );
         fprintf( out, "\nTexQuality       = %i", gtk_combo_box_get_active(         GTK_COMBO_BOX(     cbxTexQuality       ) ) );
@@ -140,6 +142,7 @@ void on_btnFast_clicked( GObject *object, gpointer user_data ) {
     gtk_spin_button_set_value(    GTK_SPIN_BUTTON(   spinXSize ),           640 );
     gtk_spin_button_set_value(    GTK_SPIN_BUTTON(   spinYSize ),           480 );
     gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON( chkKeepRatio ),          0 );
+	gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON( chkForceRatio43 ),       0 );
     gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON( chkDithering ),          0 );
     gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON( chkFullScreen ),         0 );
     gtk_combo_box_set_active(     GTK_COMBO_BOX(     cbxTexQuality ),         0 );
@@ -172,6 +175,7 @@ void on_btnBeautiful_clicked( GObject *object, gpointer user_data ) {
     gtk_spin_button_set_value(    GTK_SPIN_BUTTON(   spinXSize ),           640 );
     gtk_spin_button_set_value(    GTK_SPIN_BUTTON(   spinYSize ),           480 );
     gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON( chkKeepRatio ),          0 );
+	gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON( chkForceRatio43 ),       0 );
     gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON( chkDithering ),          0 );
     gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON( chkFullScreen ),         0 );
     gtk_combo_box_set_active(     GTK_COMBO_BOX(     cbxTexQuality ),         3 );
@@ -283,6 +287,7 @@ int main( int argc, char **argv ) {
 		spinXSize           = GTK_WIDGET( gtk_builder_get_object( builder, "spinXSize"           ) );
 		spinYSize           = GTK_WIDGET( gtk_builder_get_object( builder, "spinYSize"           ) );
 		chkKeepRatio        = GTK_WIDGET( gtk_builder_get_object( builder, "chkKeepRatio"        ) );
+		chkForceRatio43     = GTK_WIDGET( gtk_builder_get_object( builder, "chkForceRatio43"     ) );
 		chkDithering        = GTK_WIDGET( gtk_builder_get_object( builder, "chkDithering"        ) );
 		chkFullScreen       = GTK_WIDGET( gtk_builder_get_object( builder, "chkFullScreen"       ) );
 		cbxTexQuality       = GTK_WIDGET( gtk_builder_get_object( builder, "cbxTexQuality"       ) );
@@ -382,6 +387,18 @@ int main( int argc, char **argv ) {
 
 		val = 0;
 		if ( pB ) {
+			strcpy( t, "\nForceRatio43" );
+			p = strstr( pB, t );
+			if ( p ) {
+				p = strstr( p, "=" );
+				len = 1;
+				val = atoi( p + len );
+			}
+		}
+		gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON( chkForceRatio43 ), val );
+
+		val = 0;
+		if ( pB ) {
 			strcpy( t, "\nDithering" );
 			p = strstr( pB, t );
 			if ( p ) {
diff --git a/plugins/peopsxgl/gpucfg/peopsxgl.ui b/plugins/peopsxgl/gpucfg/peopsxgl.ui
index 6019ba46..895c8d45 100755
--- a/plugins/peopsxgl/gpucfg/peopsxgl.ui
+++ b/plugins/peopsxgl/gpucfg/peopsxgl.ui
@@ -142,6 +142,21 @@
                     <property name="position">3</property>
                   </packing>
                 </child>
+                <child>
+                  <object class="GtkCheckButton" id="chkForceRatio43">
+                    <property name="label" translatable="yes">Force 4:3 aspect ratio</property>
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                    <property name="receives_default">False</property>
+                    <property name="xalign">0</property>
+                    <property name="draw_indicator">True</property>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">False</property>
+                    <property name="position">4</property>
+                  </packing>
+                </child>
               </object>
             </child>
             <child type="tab">
@@ -1248,6 +1263,49 @@
     <property name="step_increment">1</property>
     <property name="page_increment">10</property>
   </object>
+  <object class="GtkListStore" id="liststore1">
+    <columns>
+      <!-- column-name item -->
+      <column type="gchararray"/>
+    </columns>
+    <data>
+      <row>
+        <col id="0" translatable="yes">Emulated VRam - Ok most times</col>
+      </row>
+      <row>
+        <col id="0" translatable="yes">Gfx card buffer reads</col>
+      </row>
+      <row>
+        <col id="0" translatable="yes">Gfx card buffer moves</col>
+      </row>
+      <row>
+        <col id="0" translatable="yes">Gfx card buffer reads and moves</col>
+      </row>
+      <row>
+        <col id="0" translatable="yes">Full Software (FVP)</col>
+      </row>
+    </data>
+  </object>
+  <object class="GtkListStore" id="liststore2">
+    <columns>
+      <!-- column-name item -->
+      <column type="gchararray"/>
+    </columns>
+    <data>
+      <row>
+        <col id="0" translatable="yes">Emulated VRam - Needs FVP</col>
+      </row>
+      <row>
+        <col id="0" translatable="yes">Black - Fast, no effects</col>
+      </row>
+      <row>
+        <col id="0" translatable="yes">Gfx card buffer - Can be slow</col>
+      </row>
+      <row>
+        <col id="0" translatable="yes">Gfx card and soft - Slow</col>
+      </row>
+    </data>
+  </object>
   <object class="GtkListStore" id="liststore3">
     <columns>
       <!-- column-name item -->
@@ -1346,49 +1404,6 @@
     <property name="step_increment">1</property>
     <property name="page_increment">10</property>
   </object>
-  <object class="GtkListStore" id="liststore1">
-    <columns>
-      <!-- column-name item -->
-      <column type="gchararray"/>
-    </columns>
-    <data>
-      <row>
-        <col id="0" translatable="yes">Emulated VRam - Ok most times</col>
-      </row>
-      <row>
-        <col id="0" translatable="yes">Gfx card buffer reads</col>
-      </row>
-      <row>
-        <col id="0" translatable="yes">Gfx card buffer moves</col>
-      </row>
-      <row>
-        <col id="0" translatable="yes">Gfx card buffer reads and moves</col>
-      </row>
-      <row>
-        <col id="0" translatable="yes">Full Software (FVP)</col>
-      </row>
-    </data>
-  </object>
-  <object class="GtkListStore" id="liststore2">
-    <columns>
-      <!-- column-name item -->
-      <column type="gchararray"/>
-    </columns>
-    <data>
-      <row>
-        <col id="0" translatable="yes">Emulated VRam - Needs FVP</col>
-      </row>
-      <row>
-        <col id="0" translatable="yes">Black - Fast, no effects</col>
-      </row>
-      <row>
-        <col id="0" translatable="yes">Gfx card buffer - Can be slow</col>
-      </row>
-      <row>
-        <col id="0" translatable="yes">Gfx card and soft - Slow</col>
-      </row>
-    </data>
-  </object>
   <object class="GtkAdjustment" id="v">
     <property name="upper">1024</property>
     <property name="step_increment">1</property>