337.19337.19

13 files changed, 48 insertions, 24 deletions

diff --git a/doc/nvidia-settings.1.m4 b/doc/nvidia-settings.1.m4
index 6bdd997..917a48b 100644
--- a/doc/nvidia-settings.1.m4
+++ b/doc/nvidia-settings.1.m4
@@ -344,6 +344,31 @@ See the output of
 .fi
 for lists of targets for each target type.
 .PP
+To enable support for the "GPUGraphicsClockOffset" and "GPUMemoryTransferRateOffset" attributes, ensure that the "Coolbits" X configuration option includes the value "8" in the bitmask.
+For more details, refer to the documentation of the "Coolbits" option in the NVIDIA driver README.
+Query the "GPUPerfModes" string attribute to see a list of the available performance modes:
+.PP
+.nf
+
+	nvidia\-settings \-\-query GPUPerfModes 
+
+.fi
+.PP
+Each performance mode is presented as a comma-separated list of "token=value" pairs.
+Each set of performance mode tokens is separated by a ";".
+The "perf" token indicates the performance level.
+The "*editable" tokens indicate which domains within the performance level can have an offset applied. 
+The "GPUGraphicsClockOffset" and "GPUMemoryTransferRateOffset" attributes map respectively to the "nvclock" and "memtransferrate" tokens of performance levels in the "GPUPerfModes" string.
+.PP
+Note that the clock manipulation attributes "GPUGraphicsClockOffset" and "GPUMemoryTransferRateOffset" apply to the offsets of specific performance levels.
+The performance level is specified in square brackets after the attribute name.
+For example, to query the "GPUGraphicsClockOffset" for performance level 2:
+.PP
+.nf
+
+	nvidia\-settings \-\-query GPUGraphicsClockOffset[2]
+
+.fi
 The
 .B \-\-assign
 option can be used to assign a new value to an attribute.
@@ -359,6 +384,7 @@ For example:
         nvidia\-settings \-\-assign FSAA=2
         nvidia\-settings \-\-assign [CRT\-1]/DigitalVibrance=9
         nvidia\-settings \-\-assign [gpu:0]/DigitalVibrance=0
+        nvidia\-settings \-\-assign [gpu:0]/GPUGraphicsClockOffset[2]=10
 .fi
 .PP
 Multiple queries and assignments may be specified on the command line for a single invocation of
diff --git a/doc/version.mk b/doc/version.mk
index 64bf1a5..5b4f9bc 100644
--- a/doc/version.mk
+++ b/doc/version.mk
@@ -1 +1 @@
-NVIDIA_VERSION = 337.12
+NVIDIA_VERSION = 337.19
diff --git a/samples/version.mk b/samples/version.mk
index 64bf1a5..5b4f9bc 100644
--- a/samples/version.mk
+++ b/samples/version.mk
@@ -1 +1 @@
-NVIDIA_VERSION = 337.12
+NVIDIA_VERSION = 337.19
diff --git a/src/XF86Config-parser/Flags.c b/src/XF86Config-parser/Flags.c
index 3413edc..5d8d324 100644
--- a/src/XF86Config-parser/Flags.c
+++ b/src/XF86Config-parser/Flags.c
@@ -537,8 +537,6 @@ char *xconfigValidateComposite(XConfigPtr config,
         { "Xinerama", xinerama_enabled && !gop->xinerama_plus_composite_works },
         { "Overlay",  overlay_enabled },
         { "CIOverlay", cioverlay_enabled },
-        { "UBB", ubb_enabled },
-        { "Stereo", stereo_enabled },
     };
 
     /*
diff --git a/src/gtk+-2.x/ctkcolorcontrols.c b/src/gtk+-2.x/ctkcolorcontrols.c
index a429a93..1252889 100644
--- a/src/gtk+-2.x/ctkcolorcontrols.c
+++ b/src/gtk+-2.x/ctkcolorcontrols.c
@@ -319,7 +319,7 @@ static void setup_reset_button(CtkColorControls *ctk_color_controls)
 
     /* The color space menu is always available */
     color_space_menu = CTK_DROP_DOWN_MENU(ctk_color_controls->color_space_menu);
-    history = color_space_menu->current_selected_item;
+    history = ctk_drop_down_menu_get_current_value(color_space_menu);
 
     val = ctk_color_controls->color_space_table[history];
     if (val != NV_CTRL_COLOR_SPACE_RGB) {
@@ -330,7 +330,7 @@ static void setup_reset_button(CtkColorControls *ctk_color_controls)
     if (GTK_WIDGET_SENSITIVE(ctk_color_controls->color_range_menu)) {
         color_range_menu = 
             CTK_DROP_DOWN_MENU(ctk_color_controls->color_range_menu);
-        history = color_range_menu->current_selected_item; 
+        history = ctk_drop_down_menu_get_current_value(color_range_menu);
         val = ctk_color_controls->color_range_table[history];
         if (val != NV_CTRL_COLOR_RANGE_FULL) {
             goto enable;
diff --git a/src/gtk+-2.x/ctkdropdownmenu.h b/src/gtk+-2.x/ctkdropdownmenu.h
index b0cdc9d..31d24eb 100644
--- a/src/gtk+-2.x/ctkdropdownmenu.h
+++ b/src/gtk+-2.x/ctkdropdownmenu.h
@@ -73,8 +73,6 @@ struct _CtkDropDownMenu
     gint num_entries;
     gint current_selected_item;
 
-    // currently selected item in the drop down
-    GtkWidget *current_selected_item_widget;
     CtkDropDownMenuValue *values;
 };
 
diff --git a/src/gtk+-2.x/ctkmultisample.c b/src/gtk+-2.x/ctkmultisample.c
index 4b674f8..ffb0d55 100644
--- a/src/gtk+-2.x/ctkmultisample.c
+++ b/src/gtk+-2.x/ctkmultisample.c
@@ -848,12 +848,10 @@ static void fsaa_setting_menu_changed(GtkObject *object, gpointer user_data)
     gint idx;
     gboolean override;
     gboolean enhance;
-    
-    CTK_DROP_DOWN_MENU(ctk_multisample->fsaa_menu)->current_selected_item_widget
-        = GTK_WIDGET(object);
+
     idx = ctk_drop_down_menu_get_current_value
-        (CTK_DROP_DOWN_MENU(ctk_multisample->fsaa_menu)); 
-    
+        (CTK_DROP_DOWN_MENU(ctk_multisample->fsaa_menu));
+
     /* The FSAA dropdown menu is setup this way:
      *
      * 0 == app
@@ -1005,7 +1003,8 @@ static void update_fxaa_from_fsaa_change(CtkMultisample *ctk_multisample,
     gboolean fxaa_value;
 
     /* The FSAA dropdown menu is: 0 == app, 1 == override, 2 == enhance */
-    gint fsaa_idx = CTK_DROP_DOWN_MENU(fsaa_menu)->current_selected_item;
+    gint fsaa_idx =
+        ctk_drop_down_menu_get_current_value(CTK_DROP_DOWN_MENU(fsaa_menu));
     
     if (fsaa_value != NV_CTRL_FSAA_MODE_NONE) {
         g_signal_handlers_block_by_func(G_OBJECT(fxaa_checkbox),
@@ -1043,7 +1042,8 @@ static void update_fsaa_from_fxaa_change (CtkMultisample *ctk_multisample,
     GtkWidget *fsaa_menu = ctk_multisample->fsaa_menu;
 
     /* The FSAA dropdown menu is: 0 == app, 1 == override, 2 == enhance */
-    gint fsaa_idx = CTK_DROP_DOWN_MENU(fsaa_menu)->current_selected_item;
+    gint fsaa_idx =
+        ctk_drop_down_menu_get_current_value(CTK_DROP_DOWN_MENU(fsaa_menu));
     
     gint fsaa_val;
 
diff --git a/src/gtk+-2.x/ctkpowermizer.c b/src/gtk+-2.x/ctkpowermizer.c
index d3dba6a..9bfee62 100644
--- a/src/gtk+-2.x/ctkpowermizer.c
+++ b/src/gtk+-2.x/ctkpowermizer.c
@@ -283,7 +283,7 @@ static void post_set_attribute_offset_value(CtkPowermizer *ctk_powermizer,
     }
 
     ctk_config_statusbar_message(ctk_powermizer->ctk_config,
-                                 "The %s offset set to %d.", str, val);
+                                 "%s offset set to %d.", str, val);
 }
 
 
@@ -308,8 +308,6 @@ static void enable_perf_level_editing_toggled(GtkWidget *widget,
         switch (result) {
         case GTK_RESPONSE_ACCEPT:
             ctk_powermizer->license_accepted = TRUE;
-            gtk_widget_set_sensitive(ctk_powermizer->editable_perf_level_table,
-                                     TRUE);
             break;
         case GTK_RESPONSE_REJECT:
         default:
@@ -326,6 +324,8 @@ static void enable_perf_level_editing_toggled(GtkWidget *widget,
             return;
         }
     }
+    gtk_widget_set_sensitive(ctk_powermizer->editable_perf_level_table,
+                             enabled);
 }
 
 
diff --git a/src/libXNVCtrl/version.mk b/src/libXNVCtrl/version.mk
index 64bf1a5..5b4f9bc 100644
--- a/src/libXNVCtrl/version.mk
+++ b/src/libXNVCtrl/version.mk
@@ -1 +1 @@
-NVIDIA_VERSION = 337.12
+NVIDIA_VERSION = 337.19
diff --git a/src/option-table.h b/src/option-table.h
index df5994b..528e28c 100644
--- a/src/option-table.h
+++ b/src/option-table.h
@@ -180,9 +180,9 @@ static const NVGetoptOption __options[] = {
       "option or when loading an ~/.nvidia-settings-rc file), nvidia-settings "
       "identifies one or more targets on which to query/assign the attribute.\n"
       "\n"
-      "'--list-targets-only' will cause nvidia-settings to list the targets on "
-      " which the query/assign operation would have been performed, without "
-      "actually performing the operation(s), and exit." },
+      "The '--list-targets-only' option will cause nvidia-settings to list the "
+      "targets on which the query/assign operation would have been performed, "
+      "without actually performing the operation(s), and exit." },
 
     { "write-config", 'w', NVGETOPT_IS_BOOLEAN | NVGETOPT_HELP_ALWAYS, NULL,
       "Save the configuration file on exit (enabled by default)." },
diff --git a/src/parse.c b/src/parse.c
index c2fa7e0..fa189eb 100644
--- a/src/parse.c
+++ b/src/parse.c
@@ -143,6 +143,8 @@ const AttributeTableEntry attributeTable[] = {
     { "GPUMemoryInterface",               NV_CTRL_GPU_MEMORY_BUS_WIDTH,                 INT_ATTR, {0,0,0,0,1,0}, { .int_flags = {0,0,0,0,0,0,0} }, "Returns bus bandwidth of the GPU's memory interface." },
     { "GPUCoreTemp",                      NV_CTRL_GPU_CORE_TEMPERATURE,                 INT_ATTR, {0,0,0,0,1,0}, { .int_flags = {0,0,0,0,0,0,0} }, "Reports the current core temperature in Celsius of the GPU driving the X screen." },
     { "GPUAmbientTemp",                   NV_CTRL_AMBIENT_TEMPERATURE,                  INT_ATTR, {0,0,0,0,1,0}, { .int_flags = {0,0,0,0,0,0,0} }, "Reports the current temperature in Celsius of the immediate neighborhood of the GPU driving the X screen." },
+    { "GPUGraphicsClockOffset",           NV_CTRL_GPU_NVCLOCK_OFFSET,                   INT_ATTR, {0,0,0,1,1,0}, { .int_flags = {0,0,0,0,0,0,0} }, "This is the offset amount, in MHz, to over- or under-clock the Graphics Clock.  Specify the performance level in square brackets after the attribute name.  E.g., 'GPUGraphicsClockOffset[2]'." },
+    { "GPUMemoryTransferRateOffset",      NV_CTRL_GPU_MEM_TRANSFER_RATE_OFFSET,         INT_ATTR, {0,0,0,1,1,0}, { .int_flags = {0,0,0,0,0,0,0} }, "This is the offset amount, in MHz, to over- or under-clock the Memory Transfer Rate.  Specify the performance level in square brackets after the attribute name.  E.g., 'GPUMemoryTransferRateOffset[2]'." },
     { "GPUOverclockingState",             NV_CTRL_GPU_OVERCLOCKING_STATE,               INT_ATTR, {0,0,0,0,1,0}, { .int_flags = {0,0,0,0,0,0,0} }, "The current overclocking state; the value of this attribute controls the availability of additional overclocking attributes.  Note that this attribute is unavailable unless overclocking support has been enabled by the system administrator." },
     { "GPU2DClockFreqs",                  NV_CTRL_GPU_2D_CLOCK_FREQS,                   INT_ATTR, {0,0,0,0,1,0}, { .int_flags = {0,0,1,0,0,0,0} }, "The GPU and memory clock frequencies when operating in 2D mode.  New clock frequencies are tested before being applied, and may be rejected.  Note that if the target clocks are too aggressive, their testing may render the system unresponsive.  Also note that while this attribute may always be queried, it cannot be set unless GPUOverclockingState is set to MANUAL.  Since the target clocks may be rejected, the requester should read this attribute after the set to determine success or failure." },
     { "GPU3DClockFreqs",                  NV_CTRL_GPU_3D_CLOCK_FREQS,                   INT_ATTR, {0,0,0,0,1,0}, { .int_flags = {0,0,1,0,0,0,0} }, "The GPU and memory clock frequencies  when operating in 3D mode.  New clock frequencies are tested before being applied, and may be rejected.  Note that if the target clocks are too aggressive, their testing may render the system unresponsive.  Also note that while this attribute may always be queried, it cannot be set unless GPUOverclockingState is set to MANUAL.  Since the target clocks may be rejected, the requester should read this attribute after the set to determine success or failure." },
diff --git a/src/version.mk b/src/version.mk
index 64bf1a5..5b4f9bc 100644
--- a/src/version.mk
+++ b/src/version.mk
@@ -1 +1 @@
-NVIDIA_VERSION = 337.12
+NVIDIA_VERSION = 337.19
diff --git a/version.mk b/version.mk
index 64bf1a5..5b4f9bc 100644
--- a/version.mk
+++ b/version.mk
@@ -1 +1 @@
-NVIDIA_VERSION = 337.12
+NVIDIA_VERSION = 337.19