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

This commit is contained in:
SND\weimingzhi_cp 2010-07-18 06:44:12 +00:00
parent 8256cc125c
commit 363d5e1035
3 changed files with 162 additions and 243 deletions

View File

@ -1,3 +1,9 @@
July 18, 2010 Wei Mingzhi <whistler_wmz@users.sf.net>
* plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2: Tweaked the config dialog
to make it less confusing.
* plugins/dfxvideo/gpucfg-0.1df/main.c: Likewise.
July 17, 2010 Wei Mingzhi <whistler_wmz@users.sf.net>
* plugins/dfcdrom/cdr-libcdio.c: Include libcdio headers before cdr.h.

View File

@ -75,25 +75,6 @@
<property name="y_options"></property>
</packing>
</child>
<child>
<widget class="GtkComboBox" id="resCombo2">
<property name="visible">True</property>
<property name="active">2</property>
<property name="items" translatable="yes">320x240
640x480
800x600
1024x768
1152x864
1280x1024
1600x1200</property>
</widget>
<packing>
<property name="left_attach">1</property>
<property name="right_attach">2</property>
<property name="x_options">GTK_FILL</property>
<property name="y_options">GTK_FILL</property>
</packing>
</child>
<child>
<widget class="GtkComboBox" id="stretchCombo2">
<property name="visible">True</property>
@ -133,6 +114,49 @@
<property name="y_options">GTK_FILL</property>
</packing>
</child>
<child>
<widget class="GtkHBox" id="hbox2">
<property name="visible">True</property>
<property name="spacing">10</property>
<child>
<widget class="GtkComboBox" id="resCombo2">
<property name="visible">True</property>
<property name="active">2</property>
<property name="items" translatable="yes">320x240
640x480
800x600
1024x768
1152x864
1280x1024
1600x1200</property>
</widget>
<packing>
<property name="position">0</property>
</packing>
</child>
<child>
<widget class="GtkCheckButton" id="checkFullscreen">
<property name="label" translatable="yes">Fullscreen</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="has_tooltip">True</property>
<property name="tooltip" translatable="yes">Toggle windowed/fullscreen mode.</property>
<property name="use_underline">True</property>
<property name="draw_indicator">True</property>
</widget>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
<property name="position">1</property>
</packing>
</child>
</widget>
<packing>
<property name="left_attach">1</property>
<property name="right_attach">2</property>
</packing>
</child>
</widget>
<packing>
<property name="position">0</property>
@ -156,22 +180,6 @@
<property name="position">0</property>
</packing>
</child>
<child>
<widget class="GtkCheckButton" id="checkFullscreen">
<property name="label" translatable="yes">Fullscreen</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="tooltip" translatable="yes">Toggle windowed/fullscreen mode.</property>
<property name="use_underline">True</property>
<property name="draw_indicator">True</property>
</widget>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
<property name="position">1</property>
</packing>
</child>
</widget>
<packing>
<property name="position">1</property>
@ -227,23 +235,6 @@
<property name="position">0</property>
</packing>
</child>
<child>
<widget class="GtkCheckButton" id="checkAutoFPSLimit">
<property name="label" translatable="yes">Autodetect FPS limit</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="tooltip" translatable="yes">Enable this if games display too quickly.</property>
<property name="use_underline">True</property>
<property name="active">True</property>
<property name="draw_indicator">True</property>
</widget>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
<property name="position">1</property>
</packing>
</child>
<child>
<widget class="GtkCheckButton" id="checkFrameSkip">
<property name="label" translatable="yes">Enable frame skipping</property>
@ -257,13 +248,13 @@
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
<property name="position">2</property>
<property name="position">1</property>
</packing>
</child>
<child>
<widget class="GtkTable" id="table2">
<property name="visible">True</property>
<property name="n_columns">2</property>
<property name="n_columns">3</property>
<property name="column_spacing">12</property>
<child>
<widget class="GtkCheckButton" id="checkSetFPS">
@ -271,6 +262,7 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="tooltip" translatable="yes">Enable this if games display too quickly.</property>
<property name="use_underline">True</property>
<property name="draw_indicator">True</property>
</widget>
@ -293,11 +285,27 @@
<property name="y_options"></property>
</packing>
</child>
<child>
<widget class="GtkCheckButton" id="checkAutoFPSLimit">
<property name="label" translatable="yes">Autodetect FPS limit</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="has_tooltip">True</property>
<property name="use_underline">True</property>
<property name="active">True</property>
<property name="draw_indicator">True</property>
</widget>
<packing>
<property name="left_attach">2</property>
<property name="right_attach">3</property>
</packing>
</child>
</widget>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
<property name="position">3</property>
<property name="position">2</property>
</packing>
</child>
</widget>
@ -356,77 +364,16 @@
<child>
<widget class="GtkTable" id="table_fixes">
<property name="visible">True</property>
<property name="n_rows">11</property>
<property name="n_rows">6</property>
<property name="n_columns">2</property>
<property name="column_spacing">16</property>
<child>
<widget class="GtkLabel" id="label22">
<property name="visible">True</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">better g-colors, worse textures</property>
</widget>
<packing>
<property name="left_attach">1</property>
<property name="right_attach">2</property>
<property name="top_attach">9</property>
<property name="bottom_attach">10</property>
<property name="x_options">GTK_FILL</property>
<property name="y_options"></property>
</packing>
</child>
<child>
<widget class="GtkLabel" id="label21">
<property name="visible">True</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">Needed by Dark Forces</property>
</widget>
<packing>
<property name="left_attach">1</property>
<property name="right_attach">2</property>
<property name="top_attach">8</property>
<property name="bottom_attach">9</property>
<property name="x_options">GTK_FILL</property>
<property name="y_options"></property>
</packing>
</child>
<child>
<widget class="GtkCheckButton" id="checkFix10">
<property name="label" translatable="yes">Draw quads with triangles</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="use_underline">True</property>
<property name="draw_indicator">True</property>
</widget>
<packing>
<property name="top_attach">9</property>
<property name="bottom_attach">10</property>
<property name="x_options">GTK_FILL</property>
<property name="y_options"></property>
</packing>
</child>
<child>
<widget class="GtkCheckButton" id="checkFix9">
<property name="label" translatable="yes">Repeated flat tex triangles</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="use_underline">True</property>
<property name="draw_indicator">True</property>
</widget>
<packing>
<property name="top_attach">8</property>
<property name="bottom_attach">9</property>
<property name="x_options">GTK_FILL</property>
<property name="y_options"></property>
</packing>
</child>
<child>
<widget class="GtkCheckButton" id="checkFix5">
<property name="label" translatable="yes">Disable CPU Saving</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="tooltip" translatable="yes">For precise framerate</property>
<property name="use_underline">True</property>
<property name="draw_indicator">True</property>
</widget>
@ -443,6 +390,7 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="tooltip" translatable="yes">Chrono Cross</property>
<property name="use_underline">True</property>
<property name="draw_indicator">True</property>
</widget>
@ -451,42 +399,13 @@
<property name="y_options"></property>
</packing>
</child>
<child>
<widget class="GtkLabel" id="label17">
<property name="visible">True</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">For precise framerate</property>
</widget>
<packing>
<property name="left_attach">1</property>
<property name="right_attach">2</property>
<property name="top_attach">4</property>
<property name="bottom_attach">5</property>
<property name="x_options">GTK_FILL</property>
<property name="y_options"></property>
</packing>
</child>
<child>
<widget class="GtkLabel" id="label18">
<property name="visible">True</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">Better FPS limit in some</property>
</widget>
<packing>
<property name="left_attach">1</property>
<property name="right_attach">2</property>
<property name="top_attach">5</property>
<property name="bottom_attach">6</property>
<property name="x_options">GTK_FILL</property>
<property name="y_options"></property>
</packing>
</child>
<child>
<widget class="GtkCheckButton" id="checkFix6">
<property name="label" translatable="yes">PC FPS calculation</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="tooltip" translatable="yes">Better FPS limit in some</property>
<property name="use_underline">True</property>
<property name="draw_indicator">True</property>
</widget>
@ -497,74 +416,13 @@
<property name="y_options"></property>
</packing>
</child>
<child>
<widget class="GtkLabel" id="label9">
<property name="visible">True</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">Pandemonium 2</property>
</widget>
<packing>
<property name="left_attach">1</property>
<property name="right_attach">2</property>
<property name="top_attach">6</property>
<property name="bottom_attach">7</property>
<property name="x_options">GTK_FILL</property>
<property name="y_options"></property>
</packing>
</child>
<child>
<widget class="GtkCheckButton" id="checkFix7">
<property name="label" translatable="yes">Lazy screen update</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="use_underline">True</property>
<property name="draw_indicator">True</property>
</widget>
<packing>
<property name="top_attach">6</property>
<property name="bottom_attach">7</property>
<property name="x_options">GTK_FILL</property>
<property name="y_options"></property>
</packing>
</child>
<child>
<widget class="GtkLabel" id="label8">
<property name="visible">True</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">Skip every second frame</property>
</widget>
<packing>
<property name="left_attach">1</property>
<property name="right_attach">2</property>
<property name="top_attach">7</property>
<property name="bottom_attach">8</property>
<property name="x_options">GTK_FILL</property>
<property name="y_options"></property>
</packing>
</child>
<child>
<widget class="GtkCheckButton" id="checkFix8">
<property name="label" translatable="yes">Old frame skipping</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="use_underline">True</property>
<property name="draw_indicator">True</property>
</widget>
<packing>
<property name="top_attach">7</property>
<property name="bottom_attach">8</property>
<property name="x_options">GTK_FILL</property>
<property name="y_options"></property>
</packing>
</child>
<child>
<widget class="GtkCheckButton" id="checkFix2">
<property name="label" translatable="yes">Expand screen width</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="tooltip" translatable="yes">Capcom fighting games</property>
<property name="use_underline">True</property>
<property name="draw_indicator">True</property>
</widget>
@ -581,6 +439,7 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="tooltip" translatable="yes">Black screens in Lunar</property>
<property name="use_underline">True</property>
<property name="draw_indicator">True</property>
</widget>
@ -597,6 +456,7 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="tooltip" translatable="yes">Compatibility mode</property>
<property name="use_underline">True</property>
<property name="draw_indicator">True</property>
</widget>
@ -608,10 +468,15 @@
</packing>
</child>
<child>
<widget class="GtkLabel" id="label24">
<widget class="GtkCheckButton" id="checkFix7">
<property name="label" translatable="yes">Lazy screen update</property>
<property name="visible">True</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">Chrono Cross</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="has_tooltip">True</property>
<property name="tooltip" translatable="yes">Pandemonium 2</property>
<property name="use_underline">True</property>
<property name="draw_indicator">True</property>
</widget>
<packing>
<property name="left_attach">1</property>
@ -621,10 +486,15 @@
</packing>
</child>
<child>
<widget class="GtkLabel" id="label25">
<widget class="GtkCheckButton" id="checkFix8">
<property name="label" translatable="yes">Old frame skipping</property>
<property name="visible">True</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">Capcom fighting games</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="has_tooltip">True</property>
<property name="tooltip" translatable="yes">Skip every second frame</property>
<property name="use_underline">True</property>
<property name="draw_indicator">True</property>
</widget>
<packing>
<property name="left_attach">1</property>
@ -636,10 +506,15 @@
</packing>
</child>
<child>
<widget class="GtkLabel" id="label26">
<widget class="GtkCheckButton" id="checkFix9">
<property name="label" translatable="yes">Repeated flat tex triangles</property>
<property name="visible">True</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">Black screens in Lunar</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="has_tooltip">True</property>
<property name="tooltip" translatable="yes">Needed by Dark Forces</property>
<property name="use_underline">True</property>
<property name="draw_indicator">True</property>
</widget>
<packing>
<property name="left_attach">1</property>
@ -651,10 +526,15 @@
</packing>
</child>
<child>
<widget class="GtkLabel" id="label27">
<widget class="GtkCheckButton" id="checkFix10">
<property name="label" translatable="yes">Draw quads with triangles</property>
<property name="visible">True</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">Compatibility mode</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="has_tooltip">True</property>
<property name="tooltip" translatable="yes">better g-colors, worse textures</property>
<property name="use_underline">True</property>
<property name="draw_indicator">True</property>
</widget>
<packing>
<property name="left_attach">1</property>
@ -671,30 +551,22 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="has_tooltip">True</property>
<property name="tooltip" translatable="yes">Toggle busy flags after drawing</property>
<property name="use_underline">True</property>
<property name="draw_indicator">True</property>
</widget>
<packing>
<property name="top_attach">10</property>
<property name="bottom_attach">11</property>
<property name="left_attach">1</property>
<property name="right_attach">2</property>
<property name="top_attach">4</property>
<property name="bottom_attach">5</property>
<property name="x_options">GTK_FILL</property>
<property name="y_options"></property>
</packing>
</child>
<child>
<widget class="GtkLabel" id="label1">
<property name="visible">True</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">Toggle busy flags after drawing</property>
</widget>
<packing>
<property name="left_attach">1</property>
<property name="right_attach">2</property>
<property name="top_attach">10</property>
<property name="bottom_attach">11</property>
<property name="x_options">GTK_FILL</property>
<property name="y_options"></property>
</packing>
<placeholder/>
</child>
</widget>
</child>

View File

@ -60,6 +60,18 @@ void set_widget_sensitive(GtkWidget *widget, gpointer user_data)
gtk_widget_set_sensitive (widget, (int)user_data);
}
void on_fullscreen_toggled(GtkWidget *widget, gpointer user_data)
{
GtkWidget *check, *resCombo2;
GladeXML *xml;
xml = (GladeXML*) user_data;
check = glade_xml_get_widget(xml, "checkFullscreen");
resCombo2 = glade_xml_get_widget(xml, "resCombo2");
set_widget_sensitive(resCombo2, !gtk_toggle_button_get_active(check));
}
void on_use_fixes_toggled(GtkWidget *widget, gpointer user_data)
{
GtkWidget *check, *table_fixes;
@ -74,6 +86,21 @@ void on_use_fixes_toggled(GtkWidget *widget, gpointer user_data)
(void *)gtk_toggle_button_get_active (check));
}
void on_fps_toggled(GtkWidget *widget, gpointer user_data)
{
GtkWidget *checkSetFPS, *checkAutoFPSLimit, *entryFPS;
GladeXML *xml;
xml = (GladeXML*) user_data;
checkSetFPS = glade_xml_get_widget(xml, "checkSetFPS");
checkAutoFPSLimit = glade_xml_get_widget(xml, "checkAutoFPSLimit");
entryFPS = glade_xml_get_widget(xml, "entryFPS");
set_widget_sensitive(entryFPS,
gtk_toggle_button_get_active(checkSetFPS) && !gtk_toggle_button_get_active(checkAutoFPSLimit));
set_widget_sensitive(checkAutoFPSLimit, gtk_toggle_button_get_active(checkSetFPS));
}
void OnConfigClose(GtkWidget *widget, gpointer user_data)
{
GladeXML *xml = (GladeXML *)user_data;
@ -226,7 +253,7 @@ main (int argc, char *argv[])
val = set_limit (p, len, 0, 1);
}
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON (glade_xml_get_widget(xml, "checkAutoFPSLimit")), val);
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON (glade_xml_get_widget(xml, "checkSetFPS")), val);
val=0;
if(pB)
@ -235,7 +262,7 @@ main (int argc, char *argv[])
val = set_limit (p, len, 1, 2);
}
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON (glade_xml_get_widget(xml, "checkSetFPS")), !(val-1));
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON (glade_xml_get_widget(xml, "checkAutoFPSLimit")), (val-1));
val=0;
if(pB)
@ -291,11 +318,25 @@ main (int argc, char *argv[])
g_signal_connect_data(GTK_OBJECT(widget), "clicked",
GTK_SIGNAL_FUNC(OnConfigClose), xml, NULL, G_CONNECT_AFTER);
widget = glade_xml_get_widget(xml, "checkFullscreen");
g_signal_connect_data(GTK_OBJECT(widget), "clicked",
GTK_SIGNAL_FUNC(on_fullscreen_toggled), xml, NULL, G_CONNECT_AFTER);
widget = glade_xml_get_widget(xml, "checkUseFixes");
g_signal_connect_data(GTK_OBJECT(widget), "clicked",
GTK_SIGNAL_FUNC(on_use_fixes_toggled), xml, NULL, G_CONNECT_AFTER);
on_use_fixes_toggled (widget, (gpointer) xml);
widget = glade_xml_get_widget(xml, "checkSetFPS");
g_signal_connect_data(GTK_OBJECT(widget), "clicked",
GTK_SIGNAL_FUNC(on_fps_toggled), xml, NULL, G_CONNECT_AFTER);
widget = glade_xml_get_widget(xml, "checkAutoFPSLimit");
g_signal_connect_data(GTK_OBJECT(widget), "clicked",
GTK_SIGNAL_FUNC(on_fps_toggled), xml, NULL, G_CONNECT_AFTER);
on_fullscreen_toggled(widget, (gpointer) xml);
on_fps_toggled(widget, (gpointer) xml);
on_use_fixes_toggled(widget, (gpointer) xml);
gtk_main ();
return 0;
@ -381,11 +422,11 @@ void SaveConfig(GtkWidget *widget, gpointer user_data)
val = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (glade_xml_get_widget (xml, "checkShowFPS")));
SetCfgVal(pB,"\nShowFPS",val);
val = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (glade_xml_get_widget (xml, "checkAutoFPSLimit")));
val = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (glade_xml_get_widget (xml, "checkSetFPS")));
SetCfgVal(pB,"\nUseFrameLimit",val);
val = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (glade_xml_get_widget (xml, "checkSetFPS")));
SetCfgVal(pB,"\nFPSDetection",(!val)+1);
val = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (glade_xml_get_widget (xml, "checkAutoFPSLimit")));
SetCfgVal(pB,"\nFPSDetection",val+1);
val = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (glade_xml_get_widget (xml, "checkFrameSkip")));
SetCfgVal(pB,"\nUseFrameSkip",val);