summaryrefslogtreecommitdiff
path: root/plugins/dfxvideo
diff options
context:
space:
mode:
Diffstat (limited to 'plugins/dfxvideo')
-rwxr-xr-xplugins/dfxvideo/Makefile.am4
-rwxr-xr-xplugins/dfxvideo/gpucfg-0.1df/dfxvideo.ui161
-rwxr-xr-xplugins/dfxvideo/gpucfg-0.1df/main.c21
3 files changed, 119 insertions, 67 deletions
diff --git a/plugins/dfxvideo/Makefile.am b/plugins/dfxvideo/Makefile.am
index bc487db4..2af76fde 100755
--- a/plugins/dfxvideo/Makefile.am
+++ b/plugins/dfxvideo/Makefile.am
@@ -8,7 +8,7 @@ SUFFIXES = .asm
AM_CPPFLAGS = -DLOCALE_DIR=\"${datadir}/locale/\" \
-DDATADIR=\"${datadir}/psemu/\" \
- $(GTK2_CFLAGS)\
+ $(GTK3_CFLAGS)\
-I../../libpcsxcore \
-I../../include
@@ -27,7 +27,7 @@ libDFXVideo_la_LIBADD = -lX11 -lXv -lXext -lm
bin_PROGRAMS = cfgDFXVideo
cfgDFXVideo_SOURCES = gpucfg-0.1df/main.c
-cfgDFXVideo_LDADD = $(GTK2_LIBS) -lXext
+cfgDFXVideo_LDADD = $(GTK3_LIBS) -lXext
glade_DATA = gpucfg-0.1df/dfxvideo.ui
gladedir = $(datadir)/psemu/
diff --git a/plugins/dfxvideo/gpucfg-0.1df/dfxvideo.ui b/plugins/dfxvideo/gpucfg-0.1df/dfxvideo.ui
index b60c02d3..2530f076 100755
--- a/plugins/dfxvideo/gpucfg-0.1df/dfxvideo.ui
+++ b/plugins/dfxvideo/gpucfg-0.1df/dfxvideo.ui
@@ -1,39 +1,42 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<interface>
- <requires lib="gtk+" version="2.16"/>
- <!-- interface-naming-policy project-wide -->
+ <!-- interface-requires gtk+ 3.0 -->
<object class="GtkWindow" id="CfgWnd">
<property name="visible">True</property>
- <property name="border_width">10</property>
+ <property name="can_focus">False</property>
+ <property name="border_width">5</property>
<property name="title" translatable="yes">Configure X11 Video</property>
<property name="resizable">False</property>
<property name="modal">True</property>
<property name="window_position">center</property>
<property name="type_hint">dialog</property>
- <signal name="destroy" handler="on_CfgWnd_destroy"/>
+ <signal name="destroy" handler="on_CfgWnd_destroy" swapped="no"/>
<child>
<object class="GtkVBox" id="vbox1">
<property name="visible">True</property>
- <property name="orientation">vertical</property>
+ <property name="can_focus">False</property>
<property name="spacing">6</property>
<child>
<object class="GtkFrame" id="frame1">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="label_xalign">0</property>
<child>
<object class="GtkAlignment" id="alignment4">
<property name="visible">True</property>
- <property name="top_padding">6</property>
- <property name="bottom_padding">6</property>
- <property name="left_padding">12</property>
- <property name="right_padding">12</property>
+ <property name="can_focus">False</property>
+ <property name="top_padding">5</property>
+ <property name="bottom_padding">5</property>
+ <property name="left_padding">5</property>
+ <property name="right_padding">5</property>
<child>
<object class="GtkVBox" id="vbox7">
<property name="visible">True</property>
- <property name="orientation">vertical</property>
+ <property name="can_focus">False</property>
<child>
<object class="GtkTable" id="table1">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="n_rows">3</property>
<property name="n_columns">2</property>
<property name="column_spacing">30</property>
@@ -41,6 +44,7 @@
<child>
<object class="GtkLabel" id="label14">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">Initial Window Size:</property>
</object>
@@ -52,6 +56,7 @@
<child>
<object class="GtkLabel" id="label15">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">Stretching:</property>
</object>
@@ -65,6 +70,7 @@
<child>
<object class="GtkLabel" id="label16">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">Dithering:</property>
</object>
@@ -78,6 +84,7 @@
<child>
<object class="GtkComboBox" id="stretchCombo2">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="model">liststoreStretching</property>
<property name="active">0</property>
<child>
@@ -99,6 +106,7 @@
<child>
<object class="GtkComboBox" id="ditherCombo2">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="model">liststoreDither</property>
<property name="active">1</property>
<child>
@@ -120,10 +128,12 @@
<child>
<object class="GtkHBox" id="hbox2">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="spacing">10</property>
<child>
<object class="GtkComboBox" id="resCombo2">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="model">liststoreRes</property>
<property name="active">2</property>
<child>
@@ -134,6 +144,8 @@
</child>
</object>
<packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
@@ -146,6 +158,7 @@
<property name="has_tooltip">True</property>
<property name="tooltip_text" translatable="yes">Toggle windowed/fullscreen mode.</property>
<property name="use_underline">True</property>
+ <property name="xalign">0</property>
<property name="draw_indicator">True</property>
</object>
<packing>
@@ -162,12 +175,15 @@
</child>
</object>
<packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkHBox" id="hbox1">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<child>
<object class="GtkCheckButton" id="maintain43">
<property name="label" translatable="yes">Maintain 4:3 Aspect Ratio</property>
@@ -175,6 +191,7 @@
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="use_underline">True</property>
+ <property name="xalign">0</property>
<property name="draw_indicator">True</property>
</object>
<packing>
@@ -185,6 +202,8 @@
</child>
</object>
<packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
@@ -194,24 +213,28 @@
</child>
</object>
<packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkFrame" id="frame2">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="label_xalign">0</property>
<child>
<object class="GtkAlignment" id="alignment2">
<property name="visible">True</property>
- <property name="top_padding">6</property>
- <property name="bottom_padding">6</property>
- <property name="left_padding">12</property>
- <property name="right_padding">12</property>
+ <property name="can_focus">False</property>
+ <property name="top_padding">5</property>
+ <property name="bottom_padding">5</property>
+ <property name="left_padding">5</property>
+ <property name="right_padding">5</property>
<child>
<object class="GtkVBox" id="vbox3">
<property name="visible">True</property>
- <property name="orientation">vertical</property>
+ <property name="can_focus">False</property>
<child>
<object class="GtkCheckButton" id="checkShowFPS">
<property name="label" translatable="yes">Show FPS</property>
@@ -220,6 +243,7 @@
<property name="receives_default">False</property>
<property name="tooltip_text" translatable="yes">Toggle whether the FPS will be shown.</property>
<property name="use_underline">True</property>
+ <property name="xalign">0</property>
<property name="draw_indicator">True</property>
</object>
<packing>
@@ -236,6 +260,7 @@
<property name="receives_default">False</property>
<property name="tooltip_text" translatable="yes">Skip frames when rendering.</property>
<property name="use_underline">True</property>
+ <property name="xalign">0</property>
<property name="draw_indicator">True</property>
</object>
<packing>
@@ -247,6 +272,7 @@
<child>
<object class="GtkTable" id="table2">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="n_columns">3</property>
<property name="column_spacing">12</property>
<child>
@@ -257,6 +283,7 @@
<property name="receives_default">False</property>
<property name="tooltip_text" translatable="yes">Enable this if games display too quickly.</property>
<property name="use_underline">True</property>
+ <property name="xalign">0.5</property>
<property name="draw_indicator">True</property>
</object>
<packing>
@@ -286,6 +313,7 @@
<property name="receives_default">False</property>
<property name="has_tooltip">True</property>
<property name="use_underline">True</property>
+ <property name="xalign">0</property>
<property name="active">True</property>
<property name="draw_indicator">True</property>
</object>
@@ -307,24 +335,28 @@
</child>
</object>
<packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
<child>
<object class="GtkFrame" id="frame3">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="label_xalign">0</property>
<child>
<object class="GtkAlignment" id="alignment3">
<property name="visible">True</property>
- <property name="top_padding">6</property>
- <property name="bottom_padding">6</property>
- <property name="left_padding">12</property>
- <property name="right_padding">12</property>
+ <property name="can_focus">False</property>
+ <property name="top_padding">5</property>
+ <property name="bottom_padding">5</property>
+ <property name="left_padding">5</property>
+ <property name="right_padding">5</property>
<child>
<object class="GtkVBox" id="vbox4">
<property name="visible">True</property>
- <property name="orientation">vertical</property>
+ <property name="can_focus">False</property>
<child>
<object class="GtkCheckButton" id="checkUseFixes">
<property name="label" translatable="yes">Use game fixes</property>
@@ -332,6 +364,7 @@
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="use_underline">True</property>
+ <property name="xalign">0</property>
<property name="draw_indicator">True</property>
</object>
<packing>
@@ -343,14 +376,19 @@
<child>
<object class="GtkAlignment" id="alignment5">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="left_padding">19</property>
<child>
<object class="GtkTable" id="table_fixes">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="n_rows">6</property>
<property name="n_columns">2</property>
<property name="column_spacing">16</property>
<child>
+ <placeholder/>
+ </child>
+ <child>
<object class="GtkCheckButton" id="checkFix5">
<property name="label" translatable="yes">Disable CPU Saving</property>
<property name="visible">True</property>
@@ -358,6 +396,7 @@
<property name="receives_default">False</property>
<property name="tooltip_text" translatable="yes">For precise framerate</property>
<property name="use_underline">True</property>
+ <property name="xalign">0</property>
<property name="draw_indicator">True</property>
</object>
<packing>
@@ -375,6 +414,7 @@
<property name="receives_default">False</property>
<property name="tooltip_text" translatable="yes">Chrono Cross</property>
<property name="use_underline">True</property>
+ <property name="xalign">0</property>
<property name="draw_indicator">True</property>
</object>
<packing>
@@ -390,6 +430,7 @@
<property name="receives_default">False</property>
<property name="tooltip_text" translatable="yes">Better FPS limit in some</property>
<property name="use_underline">True</property>
+ <property name="xalign">0</property>
<property name="draw_indicator">True</property>
</object>
<packing>
@@ -407,6 +448,7 @@
<property name="receives_default">False</property>
<property name="tooltip_text" translatable="yes">Capcom fighting games</property>
<property name="use_underline">True</property>
+ <property name="xalign">0</property>
<property name="draw_indicator">True</property>
</object>
<packing>
@@ -424,6 +466,7 @@
<property name="receives_default">False</property>
<property name="tooltip_text" translatable="yes">Black screens in Lunar</property>
<property name="use_underline">True</property>
+ <property name="xalign">0</property>
<property name="draw_indicator">True</property>
</object>
<packing>
@@ -441,6 +484,7 @@
<property name="receives_default">False</property>
<property name="tooltip_text" translatable="yes">Compatibility mode</property>
<property name="use_underline">True</property>
+ <property name="xalign">0</property>
<property name="draw_indicator">True</property>
</object>
<packing>
@@ -459,6 +503,7 @@
<property name="has_tooltip">True</property>
<property name="tooltip_text" translatable="yes">Pandemonium 2</property>
<property name="use_underline">True</property>
+ <property name="xalign">0</property>
<property name="draw_indicator">True</property>
</object>
<packing>
@@ -477,6 +522,7 @@
<property name="has_tooltip">True</property>
<property name="tooltip_text" translatable="yes">Skip every second frame</property>
<property name="use_underline">True</property>
+ <property name="xalign">0</property>
<property name="draw_indicator">True</property>
</object>
<packing>
@@ -497,6 +543,7 @@
<property name="has_tooltip">True</property>
<property name="tooltip_text" translatable="yes">Needed by Dark Forces</property>
<property name="use_underline">True</property>
+ <property name="xalign">0</property>
<property name="draw_indicator">True</property>
</object>
<packing>
@@ -517,6 +564,7 @@
<property name="has_tooltip">True</property>
<property name="tooltip_text" translatable="yes">better g-colors, worse textures</property>
<property name="use_underline">True</property>
+ <property name="xalign">0</property>
<property name="draw_indicator">True</property>
</object>
<packing>
@@ -537,6 +585,7 @@
<property name="has_tooltip">True</property>
<property name="tooltip_text" translatable="yes">Toggle busy flags after drawing</property>
<property name="use_underline">True</property>
+ <property name="xalign">0</property>
<property name="draw_indicator">True</property>
</object>
<packing>
@@ -548,13 +597,12 @@
<property name="y_options"></property>
</packing>
</child>
- <child>
- <placeholder/>
- </child>
</object>
</child>
</object>
<packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
@@ -564,12 +612,15 @@
</child>
</object>
<packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
<property name="position">2</property>
</packing>
</child>
<child>
<object class="GtkHButtonBox" id="hbuttonbox1">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="spacing">12</property>
<property name="layout_style">end</property>
<child>
@@ -589,87 +640,89 @@
</child>
</object>
<packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
<property name="position">3</property>
</packing>
</child>
</object>
</child>
</object>
- <object class="GtkListStore" id="liststoreStretching">
+ <object class="GtkListStore" id="liststoreDither">
<columns>
<!-- column-name Item -->
<column type="gchararray"/>
</columns>
<data>
<row>
- <col id="0" translatable="yes">0: None</col>
- </row>
- <row>
- <col id="0" translatable="yes">1: 2xSai</col>
+ <col id="0" translatable="yes">0: Off (fastest)</col>
</row>
<row>
- <col id="0" translatable="yes">2: 2xSuperSai</col>
+ <col id="0" translatable="yes">1: Game dependant</col>
</row>
<row>
- <col id="0" translatable="yes">3: SuperEagle</col>
+ <col id="0" translatable="yes">2: Always</col>
</row>
+ </data>
+ </object>
+ <object class="GtkListStore" id="liststoreRes">
+ <columns>
+ <!-- column-name Item -->
+ <column type="gchararray"/>
+ </columns>
+ <data>
<row>
- <col id="0" translatable="yes">4: Scale2x</col>
+ <col id="0" translatable="yes">320x240</col>
</row>
<row>
- <col id="0" translatable="yes">5: Scale3x</col>
+ <col id="0" translatable="yes">640x480</col>
</row>
<row>
- <col id="0" translatable="yes">6: HQ2X</col>
+ <col id="0" translatable="yes">800x600</col>
</row>
<row>
- <col id="0" translatable="yes">7: HQ3X</col>
+ <col id="0" translatable="yes">1024x768</col>
</row>
- </data>
- </object>
- <object class="GtkListStore" id="liststoreDither">
- <columns>
- <!-- column-name Item -->
- <column type="gchararray"/>
- </columns>
- <data>
<row>
- <col id="0" translatable="yes">0: Off (fastest)</col>
+ <col id="0" translatable="yes">1152x864</col>
</row>
<row>
- <col id="0" translatable="yes">1: Game dependant</col>
+ <col id="0" translatable="yes">1280x1024</col>
</row>
<row>
- <col id="0" translatable="yes">2: Always</col>
+ <col id="0" translatable="yes">1600x1200</col>
</row>
</data>
</object>
- <object class="GtkListStore" id="liststoreRes">
+ <object class="GtkListStore" id="liststoreStretching">
<columns>
<!-- column-name Item -->
<column type="gchararray"/>
</columns>
<data>
<row>
- <col id="0" translatable="yes">320x240</col>
+ <col id="0" translatable="yes">0: None</col>
</row>
<row>
- <col id="0" translatable="yes">640x480</col>
+ <col id="0" translatable="yes">1: 2xSai</col>
</row>
<row>
- <col id="0" translatable="yes">800x600</col>
+ <col id="0" translatable="yes">2: 2xSuperSai</col>
</row>
<row>
- <col id="0" translatable="yes">1024x768</col>
+ <col id="0" translatable="yes">3: SuperEagle</col>
</row>
<row>
- <col id="0" translatable="yes">1152x864</col>
+ <col id="0" translatable="yes">4: Scale2x</col>
</row>
<row>
- <col id="0" translatable="yes">1280x1024</col>
+ <col id="0" translatable="yes">5: Scale3x</col>
</row>
<row>
- <col id="0" translatable="yes">1600x1200</col>
+ <col id="0" translatable="yes">6: HQ2X</col>
+ </row>
+ <row>
+ <col id="0" translatable="yes">7: HQ3X</col>
</row>
</data>
</object>
diff --git a/plugins/dfxvideo/gpucfg-0.1df/main.c b/plugins/dfxvideo/gpucfg-0.1df/main.c
index b7639c6a..1eb550af 100755
--- a/plugins/dfxvideo/gpucfg-0.1df/main.c
+++ b/plugins/dfxvideo/gpucfg-0.1df/main.c
@@ -96,7 +96,7 @@ void on_fps_toggled(GtkWidget *widget, gpointer user_data)
void OnConfigClose(GtkWidget *widget, gpointer user_data)
{
gtk_widget_destroy(gtk_builder_get_object(builder, "CfgWnd"));
- gtk_exit(0);
+ exit(0);
}
int
@@ -126,19 +126,18 @@ main (int argc, char *argv[])
return 0;
}
- gtk_set_locale ();
gtk_init (&argc, &argv);
if (strcmp(argv[1], "ABOUT") == 0) {
const char *authors[]= {"Pete Bernert and the P.E.Op.S. team", "Ryan Schultz", "Andrew Burton", NULL};
widget = gtk_about_dialog_new ();
- gtk_about_dialog_set_name (GTK_ABOUT_DIALOG (widget), "P.E.Op.S PCSXR Video Plugin");
+ gtk_about_dialog_set_program_name (GTK_ABOUT_DIALOG (widget), "P.E.Op.S PCSXR Video Plugin");
gtk_about_dialog_set_version (GTK_ABOUT_DIALOG (widget), "1.17");
gtk_about_dialog_set_authors (GTK_ABOUT_DIALOG (widget), authors);
gtk_about_dialog_set_website (GTK_ABOUT_DIALOG (widget), "http://pcsx-df.sourceforge.net/");
- g_signal_connect_data(GTK_OBJECT(widget), "response",
+ g_signal_connect_data(G_OBJECT(widget), "response",
G_CALLBACK(on_about_clicked), NULL, NULL, G_CONNECT_AFTER);
gtk_widget_show (widget);
@@ -301,27 +300,27 @@ main (int argc, char *argv[])
if(pB) free(pB);
widget = gtk_builder_get_object(builder, "CfgWnd");
- g_signal_connect_data(GTK_OBJECT(widget), "destroy",
+ g_signal_connect_data(G_OBJECT(widget), "destroy",
G_CALLBACK(SaveConfig), NULL, NULL, 0);
widget = gtk_builder_get_object(builder, "btn_close");
- g_signal_connect_data(GTK_OBJECT(widget), "clicked",
+ g_signal_connect_data(G_OBJECT(widget), "clicked",
G_CALLBACK(OnConfigClose), NULL, NULL, G_CONNECT_AFTER);
widget = gtk_builder_get_object(builder, "checkFullscreen");
- g_signal_connect_data(GTK_OBJECT(widget), "clicked",
+ g_signal_connect_data(G_OBJECT(widget), "clicked",
G_CALLBACK(on_fullscreen_toggled), NULL, NULL, G_CONNECT_AFTER);
widget = gtk_builder_get_object(builder, "checkUseFixes");
- g_signal_connect_data(GTK_OBJECT(widget), "clicked",
+ g_signal_connect_data(G_OBJECT(widget), "clicked",
G_CALLBACK(on_use_fixes_toggled), NULL, NULL, G_CONNECT_AFTER);
widget = gtk_builder_get_object(builder, "checkSetFPS");
- g_signal_connect_data(GTK_OBJECT(widget), "clicked",
+ g_signal_connect_data(G_OBJECT(widget), "clicked",
G_CALLBACK(on_fps_toggled), NULL, NULL, G_CONNECT_AFTER);
widget = gtk_builder_get_object(builder, "checkAutoFPSLimit");
- g_signal_connect_data(GTK_OBJECT(widget), "clicked",
+ g_signal_connect_data(G_OBJECT(widget), "clicked",
G_CALLBACK(on_fps_toggled), NULL, NULL, G_CONNECT_AFTER);
on_fullscreen_toggled(widget, NULL);
@@ -448,5 +447,5 @@ void SaveConfig(GtkWidget *widget, gpointer user_data)
free(pB);
// Close the window and exit control from the plugin
- gtk_exit (0);
+ exit (0);
}
generated by cgit v1.2.3 (git 2.39.1) at 2026-07-21 08:46:46 +0000