302.17302.17

11 files changed, 32 insertions, 31 deletions

diff --git a/doc/version.mk b/doc/version.mk
index 8863143..527bb7c 100644
--- a/doc/version.mk
+++ b/doc/version.mk
@@ -1 +1 @@
-NVIDIA_VERSION = 302.11
+NVIDIA_VERSION = 302.17
diff --git a/samples/nv-control-dpy.c b/samples/nv-control-dpy.c
index b15c0ed..9feddda 100644
--- a/samples/nv-control-dpy.c
+++ b/samples/nv-control-dpy.c
@@ -877,46 +877,45 @@ int main(int argc, char *argv[])
     
     
     /*
-     * query the TwinViewXineramaInfoOrder
+     * query the nvidiaXineramaInfoOrder
      */
     
-    else if (strcmp(argv[1], "--query-twinview-xinerama-info-order") == 0) {
+    else if (strcmp(argv[1], "--query-nvidia-xinerama-info-order") == 0) {
         
         ret = XNVCTRLQueryTargetStringAttribute
             (dpy, NV_CTRL_TARGET_TYPE_X_SCREEN, screen, 0,
-             NV_CTRL_STRING_TWINVIEW_XINERAMA_INFO_ORDER, &str);
+             NV_CTRL_STRING_NVIDIA_XINERAMA_INFO_ORDER, &str);
         
         if (!ret) {
-            fprintf(stderr, "Failed to query "
-                    "TwinViewXineramaInfoOrder.\n\n");
+            fprintf(stderr, "Failed to query nvidiaXineramaInfoOrder.\n\n");
             return 1;
         }
         
-        printf("TwinViewXineramaInfoOrder: %s\n\n", str);
+        printf("nvidiaXineramaInfoOrder: %s\n\n", str);
     }
     
     
     /*
-     * assign the TwinViewXineramaInfoOrder
+     * assign the nvidiaXineramaInfoOrder
      */
     
-    else if ((strcmp(argv[1], "--assign-twinview-xinerama-info-order")== 0)
+    else if ((strcmp(argv[1], "--assign-nvidia-xinerama-info-order")== 0)
              && argv[2]) {
         
         ret = XNVCTRLSetStringAttribute
             (dpy,
              screen,
              0,
-             NV_CTRL_STRING_TWINVIEW_XINERAMA_INFO_ORDER,
+             NV_CTRL_STRING_NVIDIA_XINERAMA_INFO_ORDER,
              argv[2]);
         
         if (!ret) {
             fprintf(stderr, "Failed to assign "
-                    "TwinViewXineramaInfoOrder = \"%s\".\n\n", argv[2]);
+                    "nvidiaXineramaInfoOrder = \"%s\".\n\n", argv[2]);
             return 1;
         }
         
-        printf("assigned TwinViewXineramaInfoOrder: \"%s\"\n\n",
+        printf("assigned nvidiaXineramaInfoOrder: \"%s\"\n\n",
                argv[2]);
     }
 
@@ -1371,11 +1370,11 @@ int main(int argc, char *argv[])
         
         printf("  --probe-dpys: probe GPUs for new display devices\n\n");
         
-        printf("  --query-twinview-xinerama-info-order: query the "
-               "TwinViewXineramaInfoOrder.\n\n");
+        printf("  --query-nvidia-xinerama-info-order: query the "
+               "nvidiaXineramaInfoOrder.\n\n");
         
-        printf("  --assign-twinview-xinerama-info-order [order]: assign the "
-               "TwinViewXineramaInfoOrder.\n\n");
+        printf("  --assign-nvidia-xinerama-info-order [order]: assign the "
+               "nvidiaXineramaInfoOrder.\n\n");
 
         printf("  --max-screen-size: query the maximum screen size "
                "on all GPUs in the system\n\n");
diff --git a/samples/nv-control-info.c b/samples/nv-control-info.c
index 777a3a7..4fba32a 100644
--- a/samples/nv-control-info.c
+++ b/samples/nv-control-info.c
@@ -350,7 +350,7 @@ static AttrEntry attr_str_table[] = {
     MAKE_ENTRY(NV_CTRL_STRING_VALID_HORIZ_SYNC_RANGES),
     MAKE_ENTRY(NV_CTRL_STRING_VALID_VERT_REFRESH_RANGES),
     MAKE_ENTRY(NV_CTRL_STRING_XINERAMA_SCREEN_INFO),
-    MAKE_ENTRY(NV_CTRL_STRING_TWINVIEW_XINERAMA_INFO_ORDER),
+    MAKE_ENTRY(NV_CTRL_STRING_NVIDIA_XINERAMA_INFO_ORDER),
     MAKE_ENTRY(NV_CTRL_STRING_SLI_MODE),
     MAKE_ENTRY(NV_CTRL_STRING_PERFORMANCE_MODES),
     MAKE_ENTRY(NV_CTRL_STRING_VCSC_FAN_STATUS),
diff --git a/samples/version.mk b/samples/version.mk
index 8863143..527bb7c 100644
--- a/samples/version.mk
+++ b/samples/version.mk
@@ -1 +1 @@
-NVIDIA_VERSION = 302.11
+NVIDIA_VERSION = 302.17
diff --git a/src/gtk+-2.x/ctkdisplayconfig-utils.c b/src/gtk+-2.x/ctkdisplayconfig-utils.c
index 7ed3d49..04156ef 100644
--- a/src/gtk+-2.x/ctkdisplayconfig-utils.c
+++ b/src/gtk+-2.x/ctkdisplayconfig-utils.c
@@ -2822,7 +2822,7 @@ static Bool layout_add_screen_from_server(nvLayoutPtr layout,
         /* Query & parse the screen's primary display */
         screen->primaryDisplay = NULL;
         ret = NvCtrlGetStringAttribute(screen->handle,
-                                       NV_CTRL_STRING_TWINVIEW_XINERAMA_INFO_ORDER,
+                                       NV_CTRL_STRING_NVIDIA_XINERAMA_INFO_ORDER,
                                        &primary_str);
 
         if (ret == NvCtrlSuccess && primary_str) {
diff --git a/src/gtk+-2.x/ctkdisplayconfig.c b/src/gtk+-2.x/ctkdisplayconfig.c
index 26ca46e..813aef8 100644
--- a/src/gtk+-2.x/ctkdisplayconfig.c
+++ b/src/gtk+-2.x/ctkdisplayconfig.c
@@ -399,7 +399,7 @@ static void register_layout_events(CtkDisplayConfig *ctk_object)
         if (!screen->handle) continue;
 
         g_signal_connect(G_OBJECT(screen->ctk_event),
-                         CTK_EVENT_NAME(NV_CTRL_STRING_TWINVIEW_XINERAMA_INFO_ORDER),
+                         CTK_EVENT_NAME(NV_CTRL_STRING_NVIDIA_XINERAMA_INFO_ORDER),
                          G_CALLBACK(display_config_attribute_changed),
                          (gpointer) ctk_object);
 
@@ -6538,7 +6538,7 @@ static void apply_clicked(GtkWidget *widget, gpointer user_data)
 
         if (screen->primaryDisplay && ctk_object->primary_display_changed) {
             ret = NvCtrlSetStringAttribute(screen->handle,
-                                           NV_CTRL_STRING_TWINVIEW_XINERAMA_INFO_ORDER,
+                                           NV_CTRL_STRING_NVIDIA_XINERAMA_INFO_ORDER,
                                            screen->primaryDisplay->typeIdName,
                                            NULL);
             if (ret != NvCtrlSuccess) {
@@ -6548,7 +6548,7 @@ static void apply_clicked(GtkWidget *widget, gpointer user_data)
             } else {
                 /* Make sure other parts of nvidia-settings get updated */
                 ctk_event_emit_string(screen->ctk_event, 0,
-                                      NV_CTRL_STRING_TWINVIEW_XINERAMA_INFO_ORDER);
+                                      NV_CTRL_STRING_NVIDIA_XINERAMA_INFO_ORDER);
                 ctk_object->primary_display_changed = FALSE;
             }
         }
@@ -6981,11 +6981,11 @@ static int add_screen_to_xconfig(CtkDisplayConfig *ctk_object,
             xconfigAddNewOption(&conf_screen->options, "Stereo", buf);
         }
 
-        /* Set the TwinviewXineramaInfoOrder option */
+        /* Set the nvidiaXineramaInfoOrder option */
 
         if (screen->primaryDisplay) {
             xconfigAddNewOption(&conf_screen->options,
-                                "TwinViewXineramaInfoOrder",
+                                "nvidiaXineramaInfoOrder",
                                 screen->primaryDisplay->typeIdName);
         }
 
diff --git a/src/gtk+-2.x/ctkevent.c b/src/gtk+-2.x/ctkevent.c
index f26ad4d..70eb3f5 100644
--- a/src/gtk+-2.x/ctkevent.c
+++ b/src/gtk+-2.x/ctkevent.c
@@ -374,7 +374,7 @@ static void ctk_event_class_init(CtkEventClass *ctk_event_class)
     MAKE_STRING_SIGNAL(NV_CTRL_STRING_VALID_HORIZ_SYNC_RANGES);
     MAKE_STRING_SIGNAL(NV_CTRL_STRING_VALID_VERT_REFRESH_RANGES);
     MAKE_STRING_SIGNAL(NV_CTRL_STRING_XINERAMA_SCREEN_INFO);
-    MAKE_STRING_SIGNAL(NV_CTRL_STRING_TWINVIEW_XINERAMA_INFO_ORDER);
+    MAKE_STRING_SIGNAL(NV_CTRL_STRING_NVIDIA_XINERAMA_INFO_ORDER);
     MAKE_STRING_SIGNAL(NV_CTRL_STRING_SLI_MODE);
     MAKE_STRING_SIGNAL(NV_CTRL_STRING_PERFORMANCE_MODES);
     MAKE_STRING_SIGNAL(NV_CTRL_STRING_GVIO_VIDEO_FORMAT_NAME);
diff --git a/src/libXNVCtrl/NVCtrl.h b/src/libXNVCtrl/NVCtrl.h
index b749c85..1bb62ce 100644
--- a/src/libXNVCtrl/NVCtrl.h
+++ b/src/libXNVCtrl/NVCtrl.h
@@ -3546,12 +3546,14 @@
 /*
  * NV_CTRL_STRING_TWINVIEW_XINERAMA_INFO_ORDER - used to specify the
  * order that display devices will be returned via Xinerama when
- * TwinViewXineramaInfo is enabled.  Follows the same syntax as the
- * TwinViewXineramaInfoOrder X config option.
+ * nvidiaXineramaInfo is enabled.  Follows the same syntax as the
+ * nvidiaXineramaInfoOrder X config option.
  */
 
-#define NV_CTRL_STRING_TWINVIEW_XINERAMA_INFO_ORDER            27   /* RW-- */
+#define NV_CTRL_STRING_NVIDIA_XINERAMA_INFO_ORDER              27   /* RW-- */
 
+#define NV_CTRL_STRING_TWINVIEW_XINERAMA_INFO_ORDER \
+    NV_CTRL_STRING_NVIDIA_XINERAMA_INFO_ORDER /* for backwards compatibility: */
 
 /*
  * NV_CTRL_STRING_SLI_MODE - returns a string describing the current
diff --git a/src/parse.c b/src/parse.c
index 496931a..bb4a296 100644
--- a/src/parse.c
+++ b/src/parse.c
@@ -302,7 +302,7 @@ AttributeTableEntry attributeTable[] = {
     { "SynchronousPaletteUpdates",  NV_CTRL_SYNCHRONOUS_PALETTE_UPDATES,   0,     "Controls whether colormap updates are synchronized with X rendering." },
     { "CurrentMetaModeID",          NV_CTRL_CURRENT_METAMODE_ID,           N,     "The ID of the current MetaMode." },
     { "CurrentMetaMode",            NV_CTRL_STRING_CURRENT_METAMODE_VERSION_2, S|N, "Controls the current MetaMode." },
-    { "XineramaInfoOrder",          NV_CTRL_STRING_TWINVIEW_XINERAMA_INFO_ORDER, S|N, "Controls the TwinViewXineramaInfoOrder." },
+    { "XineramaInfoOrder",          NV_CTRL_STRING_NVIDIA_XINERAMA_INFO_ORDER, S|N, "Controls the nvidiaXineramaInfoOrder." },
 
     /* TV */
     { "TVOverScan",      NV_CTRL_TV_OVERSCAN,       0, "Adjusts the amount of overscan on the specified display device." },
diff --git a/src/version.mk b/src/version.mk
index 8863143..527bb7c 100644
--- a/src/version.mk
+++ b/src/version.mk
@@ -1 +1 @@
-NVIDIA_VERSION = 302.11
+NVIDIA_VERSION = 302.17
diff --git a/version.mk b/version.mk
index 8863143..527bb7c 100644
--- a/version.mk
+++ b/version.mk
@@ -1 +1 @@
-NVIDIA_VERSION = 302.11
+NVIDIA_VERSION = 302.17