304.64304.64

10 files changed, 69 insertions, 27 deletions

diff --git a/doc/version.mk b/doc/version.mk
index 3fda853..98a4fa5 100644
--- a/doc/version.mk
+++ b/doc/version.mk
@@ -1 +1 @@
-NVIDIA_VERSION = 304.60
+NVIDIA_VERSION = 304.64
diff --git a/samples/version.mk b/samples/version.mk
index 3fda853..98a4fa5 100644
--- a/samples/version.mk
+++ b/samples/version.mk
@@ -1 +1 @@
-NVIDIA_VERSION = 304.60
+NVIDIA_VERSION = 304.64
diff --git a/src/gtk+-2.x/ctkcolorcorrection.c b/src/gtk+-2.x/ctkcolorcorrection.c
index 456dedb..1185c33 100644
--- a/src/gtk+-2.x/ctkcolorcorrection.c
+++ b/src/gtk+-2.x/ctkcolorcorrection.c
@@ -1019,13 +1019,28 @@ GtkTextBuffer *ctk_color_correction_create_help(GtkTextTagTable *table,
     
     gtk_text_buffer_get_iter_at_offset(b, &i, 0);
     
-    ctk_help_title(b, &i, "%s Help", title);
+    ctk_color_correction_tab_help(b, &i, title, randr);
+    
+    ctk_help_heading(b, &i, "Reset Hardware Defaults");
+    ctk_help_para(b, &i, __resest_button_help);
+
+    ctk_help_finish(b);
+
+    return b;
+}
+
+
+void ctk_color_correction_tab_help(GtkTextBuffer *b, GtkTextIter *i,
+                                   const gchar *title,
+                                   gboolean randr)
+{
+    ctk_help_title(b, i, "%s Help", title);
 
-    ctk_help_heading(b, &i, "Active Color Channel");
-    ctk_help_para(b, &i, __active_color_help);
+    ctk_help_heading(b, i, "Active Color Channel");
+    ctk_help_para(b, i, __active_color_help);
 
-    ctk_help_heading(b, &i, "Brightness, Contrast and Gamma");
-    ctk_help_para(b, &i, "The Brightness, Contrast and Gamma sliders "
+    ctk_help_heading(b, i, "Brightness, Contrast and Gamma");
+    ctk_help_para(b, i, "The Brightness, Contrast and Gamma sliders "
                   "allow you to adjust the brightness, contrast, "
                   "or gamma values for the selected color channel(s).  This "
                   "helps you to compensate "
@@ -1036,28 +1051,21 @@ GtkTextBuffer *ctk_color_correction_create_help(GtkTextTagTable *table,
                   "as photographs) when they are displayed on your "
                   "monitor.");
 
-    ctk_help_para(b, &i, "Also, many 3D-accelerated games may appear too "
+    ctk_help_para(b, i, "Also, many 3D-accelerated games may appear too "
                   "dark to play.  Increasing the brightness and/or gamma "
                   "value equally across all channels will make these games "
                   "appear brighter, making them more playable.");
-    
-    ctk_help_para(b, &i, __color_curve_help);
+
+    ctk_help_para(b, i, __color_curve_help);
 
     if (randr) {
-        ctk_help_para(b, &i, "The %s tab uses the RandR extension to "
+        ctk_help_para(b, i, "The %s tab uses the RandR extension to "
                       "manipulate an RandR CRTC's gamma ramp.", title);
     } else {
-        ctk_help_para(b, &i, "The %s page uses the XF86VidMode extension "
+        ctk_help_para(b, i, "The %s page uses the XF86VidMode extension "
                       "to manipulate the X screen's gamma ramps", title);
     }
 
-    ctk_help_heading(b, &i, "Confirm Current Changes");
-    ctk_help_para(b, &i, __confirm_button_help);
-    
-    ctk_help_heading(b, &i, "Reset Hardware Defaults");
-    ctk_help_para(b, &i, __resest_button_help);
-
-    ctk_help_finish(b);
-
-    return b;
+    ctk_help_heading(b, i, "Confirm Current Changes");
+    ctk_help_para(b, i, __confirm_button_help);
 }
diff --git a/src/gtk+-2.x/ctkcolorcorrection.h b/src/gtk+-2.x/ctkcolorcorrection.h
index 53cb36e..c9dfe48 100644
--- a/src/gtk+-2.x/ctkcolorcorrection.h
+++ b/src/gtk+-2.x/ctkcolorcorrection.h
@@ -82,6 +82,9 @@ GtkWidget*  ctk_color_correction_new       (NvCtrlAttributeHandle *,
 GtkTextBuffer *ctk_color_correction_create_help(GtkTextTagTable *,
                                                 const gchar *title,
                                                 gboolean randr);
+void ctk_color_correction_tab_help(GtkTextBuffer *b, GtkTextIter *i,
+                                   const gchar *title,
+                                   gboolean randr);
 G_END_DECLS
 
 #endif /* __CTK_COLOR_CORRECTION_H__ */
diff --git a/src/gtk+-2.x/ctkdisplayconfig.c b/src/gtk+-2.x/ctkdisplayconfig.c
index e3908a7..29d2ff2 100644
--- a/src/gtk+-2.x/ctkdisplayconfig.c
+++ b/src/gtk+-2.x/ctkdisplayconfig.c
@@ -1696,6 +1696,18 @@ GtkWidget* ctk_display_config_new(NvCtrlAttributeHandle *handle,
         gtk_box_pack_start(GTK_BOX(ctk_object), vbox, FALSE, FALSE, 0);
         ctk_object->display_page = vbox;
 
+        /* Info on how to drag X screens around */
+        hbox = gtk_hbox_new(FALSE, 5);
+        gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 5);
+
+        label = gtk_label_new("");
+        labels = g_slist_append(labels, label);
+        gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, TRUE, 5);
+
+        label = gtk_label_new("(CTRL-Click + Drag to move X screens)");
+        gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, TRUE, 5);
+        ctk_object->box_screen_drag_info_display = hbox;
+
         /* Display Configuration */
         label = gtk_label_new("Configuration:");
         labels = g_slist_append(labels, label);
@@ -1817,7 +1829,7 @@ GtkWidget* ctk_display_config_new(NvCtrlAttributeHandle *handle,
 
         label = gtk_label_new("(CTRL-Click + Drag to move X screens)");
         gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, TRUE, 5);
-        ctk_object->box_screen_drag_info = hbox;
+        ctk_object->box_screen_drag_info_screen = hbox;
 
         /* X screen virtual size */
         label = gtk_label_new("Virtual Size:");
@@ -2327,6 +2339,7 @@ static void setup_selected_item_dropdown(CtkDisplayConfig *ctk_object)
     }
 
     gtk_widget_set_sensitive(ctk_object->mnu_selected_item, True);
+    gtk_widget_show(ctk_object->mnu_selected_item);
 
     menu = generate_selected_item_dropdown(ctk_object, display, screen,
                                            &cur_idx);
@@ -3261,6 +3274,12 @@ static void setup_display_page(CtkDisplayConfig *ctk_object)
     /* Enable display widgets and setup widget information */
     gtk_widget_set_sensitive(ctk_object->display_page, True);
 
+    if (display->gpu->layout->num_screens > 1) {
+        gtk_widget_show(ctk_object->box_screen_drag_info_display);
+    } else {
+        gtk_widget_hide(ctk_object->box_screen_drag_info_display);
+    }
+
     setup_display_config(ctk_object);
     setup_display_modename(ctk_object);
     setup_display_resolution_dropdown(ctk_object);
@@ -3759,9 +3778,9 @@ static void setup_screen_page(CtkDisplayConfig *ctk_object)
     gtk_widget_set_sensitive(ctk_object->screen_page, True);
 
     if (screen->layout->num_screens > 1) {
-        gtk_widget_show(ctk_object->box_screen_drag_info);
+        gtk_widget_show(ctk_object->box_screen_drag_info_screen);
     } else {
-        gtk_widget_hide(ctk_object->box_screen_drag_info);
+        gtk_widget_hide(ctk_object->box_screen_drag_info_screen);
     }
 
     setup_screen_virtual_size(ctk_object);
diff --git a/src/gtk+-2.x/ctkdisplayconfig.h b/src/gtk+-2.x/ctkdisplayconfig.h
index c90c0d5..c8372e6 100644
--- a/src/gtk+-2.x/ctkdisplayconfig.h
+++ b/src/gtk+-2.x/ctkdisplayconfig.h
@@ -100,6 +100,8 @@ typedef struct _CtkDisplayConfig
     GtkWidget *mnu_display_config_twinview;
 
     /* Display - Settings */
+    GtkWidget *box_screen_drag_info_display;
+
     GtkWidget *box_display_resolution;
     GtkWidget *mnu_display_resolution;
     nvModeLinePtr *resolution_table;
@@ -130,7 +132,7 @@ typedef struct _CtkDisplayConfig
     GtkWidget *screen_page;
 
     /* X Screen - Settings */
-    GtkWidget *box_screen_drag_info;
+    GtkWidget *box_screen_drag_info_screen;
 
     GtkWidget *box_screen_virtual_size;
     GtkWidget *txt_screen_virtual_size;
diff --git a/src/gtk+-2.x/ctkdisplaydevice.c b/src/gtk+-2.x/ctkdisplaydevice.c
index 79e177f..0ffbee2 100644
--- a/src/gtk+-2.x/ctkdisplaydevice.c
+++ b/src/gtk+-2.x/ctkdisplaydevice.c
@@ -248,6 +248,7 @@ GtkWidget* ctk_display_device_new(NvCtrlAttributeHandle *handle,
     ctk_object->ctk_event_gpu = ctk_event_gpu;
     ctk_object->ctk_config = ctk_config;
     ctk_object->name = g_strdup(name);
+    ctk_object->color_correction_available = FALSE;
 
     gtk_box_set_spacing(GTK_BOX(object), 10);
 
@@ -517,6 +518,10 @@ GtkTextBuffer *ctk_display_device_create_help(GtkTextTagTable *table,
     add_image_sliders_help
         (CTK_IMAGE_SLIDERS(ctk_object->image_sliders), b, &i);
 
+    if (ctk_object->color_correction_available) {
+        ctk_color_correction_tab_help(b, &i, "X Server Color Correction", TRUE);
+    }
+
     td = gtk_tooltips_data_get(GTK_WIDGET(ctk_object->reset_button));
     ctk_help_reset_hardware_defaults(b, &i, td->tip_text);
 
@@ -892,6 +897,8 @@ static void add_color_correction_tab(CtkDisplayDevice *ctk_object,
     if (ctk_color_correction == NULL) {
         return;
     }
+    ctk_object->color_correction_tab = ctk_color_correction;
+    ctk_object->color_correction_available = TRUE;
 
     box = gtk_hbox_new(FALSE, 0);
     gtk_container_set_border_width(GTK_CONTAINER(box), FRAME_PADDING);
diff --git a/src/gtk+-2.x/ctkdisplaydevice.h b/src/gtk+-2.x/ctkdisplaydevice.h
index 0715bc8..e1e27ff 100644
--- a/src/gtk+-2.x/ctkdisplaydevice.h
+++ b/src/gtk+-2.x/ctkdisplaydevice.h
@@ -71,6 +71,9 @@ struct _CtkDisplayDevice
     GtkWidget *edid;
     GtkWidget *dithering_controls;
     GtkWidget *color_controls;
+    GtkWidget *color_correction_tab;
+
+    gboolean color_correction_available;
 
     InfoEntry *info_entries;
     int num_info_entries;
diff --git a/src/version.mk b/src/version.mk
index 3fda853..98a4fa5 100644
--- a/src/version.mk
+++ b/src/version.mk
@@ -1 +1 @@
-NVIDIA_VERSION = 304.60
+NVIDIA_VERSION = 304.64
diff --git a/version.mk b/version.mk
index 3fda853..98a4fa5 100644
--- a/version.mk
+++ b/version.mk
@@ -1 +1 @@
-NVIDIA_VERSION = 304.60
+NVIDIA_VERSION = 304.64