Rename map-to-crtc to map-to-output

xrandr uses "output", let's be consistent there.

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Aaron Plattner <aplattner@nvidia.com>

diff --git a/man/xinput.man b/man/xinput.man
index 085a5fce05207c4a635e7328f27f2d1b9dee8175..f70fe8cccdeec060d0834a5d018487b22f925607 100644 (file)
--- a/man/xinput.man
+++ b/man/xinput.man
@@ -140,9 +140,9 @@ Set the ClientPointer for the client owning \fIwindow\fP to \fImaster\fP.
 \fImaster\fP must specify a master pointer.
 .PP
 .TP 8
 \fImaster\fP must specify a master pointer.
 .PP
 .TP 8

-.B --map-to-crtc \fIdevice\fP \fIcrtc\fP
+.B --map-to-output \fIdevice\fP \fIcrtc\fP

 Restricts the movements of the absolute \fIdevice\fP to the RandR
 Restricts the movements of the absolute \fIdevice\fP to the RandR

-\fIcrtc\fP. The CRTC name must match a currently connected CRTC (see
+\fIcrtc\fP. The output name must match a currently connected output (see

 \fIxrandr(__appmansuffix__)\fP). If the NVIDIA binary driver is
 detected or RandR 1.2 or later is not available, a Xinerama output may be
 specified as "HEAD-N", with N being the Xinerama screen number. This option
 \fIxrandr(__appmansuffix__)\fP). If the NVIDIA binary driver is
 detected or RandR 1.2 or later is not available, a Xinerama output may be
 specified as "HEAD-N", with N being the Xinerama screen number. This option

diff --git a/src/transform.c b/src/transform.c
index c1a065fa152ae762fe4a57ac285da1d62e70554a..cffc3afd089710f00cfc5376189c1e0f59162941 100644 (file)
--- a/src/transform.c
+++ b/src/transform.c
@@ -136,7 +136,7 @@ set_transformation_matrix(Display *dpy, Matrix *m, int offset_x, int offset_y,
 }
 
 static int
 }
 
 static int

-map_crtc_xrandr(Display *dpy, int deviceid, const char *output_name)
+map_output_xrandr(Display *dpy, int deviceid, const char *output_name)

 {
     int i, found = 0;
     int rc = EXIT_FAILURE;
 {
     int i, found = 0;
     int rc = EXIT_FAILURE;


@@ -178,7 +178,7 @@ map_crtc_xrandr(Display *dpy, int deviceid, const char *output_name)
 }
 
 static int
 }
 
 static int

-map_crtc_xinerama(Display *dpy, int deviceid, const char *output_name)
+map_output_xinerama(Display *dpy, int deviceid, const char *output_name)

 {
     const char *prefix = "HEAD-";
     XineramaScreenInfo *screens = NULL;
 {
     const char *prefix = "HEAD-";
     XineramaScreenInfo *screens = NULL;


@@ -229,11 +229,11 @@ out:
 }
 
 int
 }
 
 int

-map_to_crtc(Display *dpy, int argc, char *argv[], char *name, char *desc)
+map_to_output(Display *dpy, int argc, char *argv[], char *name, char *desc)

 {
     int opcode, event, error;
     int maj, min;
 {
     int opcode, event, error;
     int maj, min;

-    char *crtc_name;
+    char *output_name;

     XIDeviceInfo *info;
 
     if (argc < 2)
     XIDeviceInfo *info;
 
     if (argc < 2)


@@ -249,15 +249,15 @@ map_to_crtc(Display *dpy, int argc, char *argv[], char *name, char *desc)
         return EXIT_FAILURE;
     }
 
         return EXIT_FAILURE;
     }
 

-    crtc_name = argv[1];
+    output_name = argv[1];

 
     /* Check for RandR 1.2. Server bug causes the NVIDIA driver to
 
     /* Check for RandR 1.2. Server bug causes the NVIDIA driver to

-     * report with RandR 1.3 support but it doesn't expose RandR CRTCs.
+     * report with RandR 1.3 support but it doesn't expose RandR outputs.

      * Force Xinerama if NV-CONTROL is present */
     if (XQueryExtension(dpy, "NV-CONTROL", &opcode, &event, &error) ||
         !XQueryExtension(dpy, "RANDR", &opcode, &event, &error) ||
         !XRRQueryVersion(dpy, &maj, &min) || (maj * 1000 + min) < 1002)
      * Force Xinerama if NV-CONTROL is present */
     if (XQueryExtension(dpy, "NV-CONTROL", &opcode, &event, &error) ||
         !XQueryExtension(dpy, "RANDR", &opcode, &event, &error) ||
         !XRRQueryVersion(dpy, &maj, &min) || (maj * 1000 + min) < 1002)

-       return map_crtc_xinerama(dpy, info->deviceid, crtc_name);
+       return map_output_xinerama(dpy, info->deviceid, output_name);

     else
     else

-       return map_crtc_xrandr(dpy, info->deviceid, crtc_name);
+       return map_output_xrandr(dpy, info->deviceid, output_name);

 }
 }

diff --git a/src/xinput.c b/src/xinput.c
index 80a1789cee6e980890457b283339bf32c2bc636b..66b967bc1bb3ac76e3eaed02c91bbee48d1ed032 100644 (file)
--- a/src/xinput.c
+++ b/src/xinput.c
@@ -104,9 +104,9 @@ static entry drivers[] =
       "<device>",
       test_xi2,
     },
       "<device>",
       test_xi2,
     },

-    { "map-to-crtc",
-      "<device> <crtc name>",
-      map_to_crtc,
+    { "map-to-output",
+      "<device> <output name>",
+      map_to_output,

     },
 #endif
     { "list-props",
     },
 #endif
     { "list-props",

diff --git a/src/xinput.h b/src/xinput.h
index 94b8f3c3ef09895216b61014c0fbf5f808c60c6e..b420e61c5e9a1e7f62c004a72a1a2b5e9bb97812 100644 (file)
--- a/src/xinput.h
+++ b/src/xinput.h
@@ -77,6 +77,6 @@ int change_attachment( Display* display, int argc, char *argv[], char *prog_name
 int float_device( Display* display, int argc, char *argv[], char *prog_name, char *prog_desc);
 int set_clientpointer( Display* display, int argc, char *argv[], char *prog_name, char *prog_desc);
 int test_xi2( Display* display, int argc, char *argv[], char *prog_name, char *prog_desc);
 int float_device( Display* display, int argc, char *argv[], char *prog_name, char *prog_desc);
 int set_clientpointer( Display* display, int argc, char *argv[], char *prog_name, char *prog_desc);
 int test_xi2( Display* display, int argc, char *argv[], char *prog_name, char *prog_desc);

-int map_to_crtc( Display* display, int argc, char *argv[], char *prog_name, char *prog_desc);
+int map_to_output( Display* display, int argc, char *argv[], char *prog_name, char *prog_desc);

 
 /* end of xinput.h */
 
 /* end of xinput.h */