Emulation/pcsxr
1
0
Fork 0
mirror of https://github.com/iCatButler/pcsxr.git synced 2024-05-20 12:57:43 -04:00
Code Issues Packages Projects Releases Wiki Activity

* Add configuration UI for PGXP.

Browse source 
* Clean generated files with `make clean`
This commit is contained in:
Stelios Tsampas 2017-07-17 23:22:35 +03:00
parent 7a43668f9d
commit f48b5b2ac3
10 changed files with 397 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

85
gui/ConfDlg.c
View file

@ -845,6 +845,7 @@ static void FindNetPlugin() {
}
GtkWidget *CpuDlg;
GtkWidget *PgxpDlg;
GList *psxglist;
char *psxtypes[] = {
"NTSC",
@ -1033,5 +1034,87 @@ void OnConf_Cpu() {
G_CALLBACK(OnCpu_Clicked), builder, (GClosureNotify)g_object_unref, G_CONNECT_AFTER);
}
void OnConf_Pgxp() {
//When a different mode is selected, display some informational text
static void OnPgxp_ModeChanged(GtkWidget *widget, gpointer user_data) {
uint8_t mode;
mode = gtk_combo_box_get_active(GTK_COMBO_BOX(
gtk_builder_get_object(builder, "PGXP_Mode")));
switch (mode) {
case 0:
gtk_label_set_text(GTK_LABEL(gtk_builder_get_object(builder, "PGXP_Mode_title")),
_("Disabled"));
gtk_label_set_text(GTK_LABEL(gtk_builder_get_object(builder, "PGXP_Mode_description")),
_("PGXP is not mirroring any functions currently."));
break;
case 1:
gtk_label_set_text(GTK_LABEL(gtk_builder_get_object(builder, "PGXP_Mode_title")),
_("Memory operations only"));
gtk_label_set_text(GTK_LABEL(gtk_builder_get_object(builder, "PGXP_Mode_description")),
_("PGXP is mirroring load, store and processor transfer operations of the CPU and GTE."));
break;
case 2:
gtk_label_set_text(GTK_LABEL(gtk_builder_get_object(builder, "PGXP_Mode_title")),
_("Memory and CPU arithmetic operations"));
gtk_label_set_text(GTK_LABEL(gtk_builder_get_object(builder, "PGXP_Mode_description")),
_("PGXP is mirroring load, store and transfer operations of the CPU and GTE and arithmetic/logic functions of the PSX CPU.\n(WARNING: This mode is currently unfinished and may cause incorrect behaviour in some games)."));
break;
default:
gtk_label_set_text(GTK_LABEL(gtk_builder_get_object(builder, "PGXP_Mode_title")),
_("Error"));
gtk_label_set_text(GTK_LABEL(gtk_builder_get_object(builder, "PGXP_Mode_description")),
_("Unknown mode."));
}
}
static void OnPgxp_Clicked(GtkDialog *dialog, gint arg1, gpointer user_data) {
Config.PGXP_GTE = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(
gtk_builder_get_object(builder, "PGXP_GTE")));
Config.PGXP_Cache = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(
gtk_builder_get_object(builder, "PGXP_Cache")));
Config.PGXP_Texture = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(
gtk_builder_get_object(builder, "PGXP_Texture")));
Config.PGXP_Mode = gtk_combo_box_get_active(GTK_COMBO_BOX(
gtk_builder_get_object(builder, "PGXP_Mode")));
EmuSetPGXPMode(Config.PGXP_Mode);
SaveConfig();
gtk_widget_destroy(PgxpDlg);
PgxpDlg = NULL;
}
void OnConf_Pgxp() {
GtkWidget *widget;
char buf[25];
builder = gtk_builder_new();
if (!gtk_builder_add_from_resource(builder, "/org/pcsxr/gui/pcsxr.ui", NULL)) {
g_warning("Error: interface could not be loaded!");
return;
}
PgxpDlg = GTK_WIDGET(gtk_builder_get_object(builder, "PgxpDlg"));
gtk_window_set_default_size(GTK_WINDOW(PgxpDlg), 320, 320);
gtk_widget_show (PgxpDlg);
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(
gtk_builder_get_object(builder, "PGXP_GTE")), Config.PGXP_GTE);
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(
gtk_builder_get_object(builder, "PGXP_Cache")), Config.PGXP_Cache);
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(
gtk_builder_get_object(builder, "PGXP_Texture")), Config.PGXP_Texture);
gtk_combo_box_set_active(GTK_COMBO_BOX(
gtk_builder_get_object(builder, "PGXP_Mode")), Config.PGXP_Mode);
OnPgxp_ModeChanged(NULL, NULL);
g_signal_connect_data(G_OBJECT(gtk_builder_get_object(builder, "PGXP_Mode")), "changed",
G_CALLBACK(OnPgxp_ModeChanged), builder, NULL, G_CONNECT_AFTER);
g_signal_connect_data(G_OBJECT(PgxpDlg), "response",
G_CALLBACK(OnPgxp_Clicked), builder, (GClosureNotify)g_object_unref, G_CONNECT_AFTER);
}

2
gui/Makefile.am
View file

@ -77,3 +77,5 @@ GtkResources.h: pcsxr.gresource.xml $(pcsxr_gresource)
pcsxr_LDADD = \
../libpcsxcore/libpcsxcore.a \
$(GTK3_LIBS) -lpthread -lz -lm -lXext -lXtst
CLEANFILES = pcsxr.gresource.xml GtkResources.c GtkResources.h

294
gui/data/pcsxr.ui
View file

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- Generated with glade 3.19.0 -->
<!-- Generated with glade 3.20.0 -->
<interface>
<requires lib="gtk+" version="3.14"/>
<object class="GtkAboutDialog" id="AboutDlg">
@ -32,6 +32,9 @@
</child>
</object>
</child>
<child>
<placeholder/>
</child>
</object>
<object class="GtkDialog" id="CheatListDlg">
<property name="can_focus">False</property>
@ -214,6 +217,9 @@
<action-widgets>
<action-widget response="0">closbutton1</action-widget>
</action-widgets>
<child>
<placeholder/>
</child>
</object>
<object class="GtkDialog" id="ConfDlg">
<property name="can_focus">False</property>
@ -919,6 +925,9 @@
<action-widgets>
<action-widget response="-6">btn_ConfClose</action-widget>
</action-widgets>
<child>
<placeholder/>
</child>
</object>
<object class="GtkDialog" id="McdsDlg">
<property name="can_focus">False</property>
@ -1731,6 +1740,9 @@
<action-widgets>
<action-widget response="-5">McdClose</action-widget>
</action-widgets>
<child>
<placeholder/>
</child>
</object>
<object class="GtkDialog" id="MemViewDlg">
<property name="can_focus">False</property>
@ -2013,6 +2025,9 @@
<action-widgets>
<action-widget response="0">memview_close</action-widget>
</action-widgets>
<child>
<placeholder/>
</child>
</object>
<object class="GtkDialog" id="NetDlg">
<property name="can_focus">False</property>
@ -2169,6 +2184,9 @@
<action-widgets>
<action-widget response="-6">closebutton2</action-widget>
</action-widgets>
<child>
<placeholder/>
</child>
</object>
<object class="GtkImage" id="image1">
<property name="visible">True</property>
@ -2239,7 +2257,6 @@
<object class="GtkImage" id="image2">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0.49000000953674316</property>
<property name="icon_name">pcsxr-cd-open</property>
<property name="icon_size">1</property>
</object>
@ -2303,6 +2320,12 @@
<property name="icon_name">pcsxr-plugin-sio1</property>
<property name="icon_size">1</property>
</object>
<object class="GtkImage" id="image43">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="icon_name">pcsxr-pgxp</property>
<property name="icon_size">1</property>
</object>
<object class="GtkImage" id="image5">
<property name="visible">True</property>
<property name="can_focus">False</property>
@ -2835,6 +2858,23 @@
<property name="can_focus">False</property>
</object>
</child>
<child>
<object class="GtkImageMenuItem" id="pgxp1">
<property name="label" translatable="yes">_PGXP...</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="use_underline">True</property>
<property name="image">image43</property>
<property name="use_stock">False</property>
<signal name="activate" handler="OnConf_Pgxp" swapped="no"/>
</object>
</child>
<child>
<object class="GtkSeparatorMenuItem" id="separator10">
<property name="visible">True</property>
<property name="can_focus">False</property>
</object>
</child>
<child>
<object class="GtkImageMenuItem" id="cpu1">
<property name="label" translatable="yes">_CPU...</property>
@ -3128,6 +3168,9 @@
</child>
</object>
</child>
<child type="titlebar">
<placeholder/>
</child>
</object>
<object class="GtkListStore" id="liststore1">
<columns>
@ -3745,6 +3788,9 @@
<action-widgets>
<action-widget response="0">closebutton</action-widget>
</action-widgets>
<child>
<placeholder/>
</child>
</object>
<object class="GtkListStore" id="liststore5">
<columns>
@ -4417,5 +4463,249 @@
<action-widgets>
<action-widget response="-6">closebutton1</action-widget>
</action-widgets>
<child>
<placeholder/>
</child>
</object>
<object class="GtkListStore" id="liststore6">
<columns>
<!-- column-name item -->
<column type="gchararray"/>
</columns>
<data>
<row>
<col id="0" translatable="yes">Disabled</col>
</row>
<row>
<col id="0" translatable="yes">Memory only</col>
</row>
<row>
<col id="0" translatable="yes">Memory + Cpu logic</col>
</row>
</data>
</object>
<object class="GtkDialog" id="PgxpDlg">
<property name="can_focus">False</property>
<property name="title" translatable="yes">Configure PGXP</property>
<property name="resizable">False</property>
<property name="modal">True</property>
<property name="window_position">center-on-parent</property>
<property name="type_hint">dialog</property>
<child internal-child="vbox">
<object class="GtkBox">
<property name="can_focus">False</property>
<property name="orientation">vertical</property>
<child internal-child="action_area">
<object class="GtkButtonBox">
<property name="can_focus">False</property>
<property name="layout_style">end</property>
<child>
<object class="GtkButton" id="PgxpDlg_close">
<property name="label">gtk-close</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="use_stock">True</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
<property name="position">0</property>
</packing>
</child>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
<property name="position">1</property>
</packing>
</child>
<child>
<object class="GtkBox">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="orientation">vertical</property>
<property name="spacing">5</property>
<child>
<object class="GtkFrame" id="PgxpDlg_Options">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label_xalign">0</property>
<child>
<object class="GtkAlignment">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="left_padding">12</property>
<child>
<object class="GtkBox">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="orientation">vertical</property>
<child>
<object class="GtkCheckButton" id="PGXP_GTE">
<property name="label" translatable="yes">Enable PGXP GTE vertex creation</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="draw_indicator">True</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkCheckButton" id="PGXP_Cache">
<property name="label" translatable="yes">Enable vertex caching.</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="draw_indicator">True</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
<child>
<object class="GtkCheckButton" id="PGXP_Texture">
<property name="label" translatable="yes">Enable perspective correct texturing.</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="draw_indicator">True</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">2</property>
</packing>
</child>
</object>
</child>
</object>
</child>
<child type="label">
<object class="GtkLabel">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">Options</property>
<attributes>
<attribute name="weight" value="bold"/>
</attributes>
</object>
</child>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkFrame" id="PgxpDlg_Mode">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label_xalign">0</property>
<child>
<object class="GtkAlignment">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="left_padding">12</property>
<child>
<object class="GtkBox">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="orientation">vertical</property>
<property name="baseline_position">top</property>
<child>
<object class="GtkComboBox" id="PGXP_Mode">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="margin_left">40</property>
<property name="margin_right">40</property>
<property name="model">liststore6</property>
<child>
<object class="GtkCellRendererText" id="cellrenderertext6"/>
<attributes>
<attribute name="text">0</attribute>
</attributes>
</child>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkLabel" id="PGXP_Mode_title">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="halign">start</property>
<property name="margin_top">4</property>
<property name="margin_bottom">4</property>
<attributes>
<attribute name="weight" value="bold"/>
</attributes>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
<child>
<object class="GtkLabel" id="PGXP_Mode_description">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="margin_right">10</property>
<property name="wrap">True</property>
<property name="max_width_chars">20</property>
</object>
<packing>
<property name="expand">True</property>
<property name="fill">True</property>
<property name="position">2</property>
</packing>
</child>
</object>
</child>
</object>
</child>
<child type="label">
<object class="GtkLabel">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">Select PGXP Mode</property>
<attributes>
<attribute name="weight" value="bold"/>
</attributes>
</object>
</child>
</object>
<packing>
<property name="expand">True</property>
<property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
</object>
<packing>
<property name="expand">True</property>
<property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
</object>
</child>
<action-widgets>
<action-widget response="0">PgxpDlg_close</action-widget>
</action-widgets>
<child>
<placeholder/>
</child>
</object>
</interface>

3
plugins/bladesio1/Makefile.am
View file

@ -38,3 +38,6 @@ GtkResources.h: bladesio1.gresource.xml $(bladesio1_gresource)
#glade_DATA = sio1.ui
#gladedir = $(datadir)/psemu/
EXTRA_DIST = $(glade_DATA)
CLEANFILES = bladesio1.gresource.xml GtkResources.c GtkResources.h

3
plugins/dfcdrom/Makefile.am
View file

@ -53,3 +53,6 @@ GtkResources.h: dfcdrom.gresource.xml $(dfcdrom_gresource)
#glade_DATA = cdrcfg-0.1df/dfcdrom.ui
#gladedir = $(datadir)/psemu/
EXTRA_DIST = $(glade_DATA)
CLEANFILES = dfcdrom.gresource.xml GtkResources.c GtkResources.h

2
plugins/dfinput/Makefile.am
View file

@ -39,3 +39,5 @@ GtkResources.h: dfinput.gresource.xml $(dfinput_gresource)
#glade_DATA = dfinput.ui
#gladedir = $(datadir)/psemu/
EXTRA_DIST = $(glade_DATA)
CLEANFILES = dfinput.gresource.xml GtkResources.c GtkResources.h

2
plugins/dfnet/Makefile.am
View file

@ -38,3 +38,5 @@ GtkResources.h: dfnet.gresource.xml $(dfnet_gresource)
#glade_DATA = dfnet.ui
#gladedir = $(datadir)/psemu/
EXTRA_DIST = $(glade_DATA)
CLEANFILES = dfnet.gresource.xml GtkResources.c GtkResources.h

3
plugins/dfsound/Makefile.am
View file

@ -74,3 +74,6 @@ GtkResources.h: dfsound.gresource.xml $(dfsound_gresource)
#glade_DATA = spucfg-0.1df/dfsound.ui
#gladedir = $(datadir)/psemu/
EXTRA_DIST = $(glade_DATA)
CLEANFILES = dfsound.gresource.xml GtkResources.c GtkResources.h

3
plugins/dfxvideo/Makefile.am
View file

@ -52,3 +52,6 @@ GtkResources.h: dfxvideo.gresource.xml $(dfxvideo_gresource)
#glade_DATA = gpucfg-0.1df/dfxvideo.ui
#gladedir = $(datadir)/psemu/
EXTRA_DIST = $(glade_DATA)
CLEANFILES = dfxvideo.gresource.xml GtkResources.c GtkResources.h

3
plugins/peopsxgl/Makefile.am
View file

@ -52,3 +52,6 @@ GtkResources.h: peopsxgl.gresource.xml $(peopsxgl_gresource)
#glade_DATA = gpucfg/peopsxgl.ui
#gladedir = $(datadir)/psemu/
EXTRA_DIST = $(glade_DATA)
CLEANFILES = peopsxgl.gresource.xml GtkResources.c GtkResources.h