On Sun, Jun 19, 2011 at 9:01 PM, Peter Hutterer
<peter.hutte...@who-t.net> wrote:
> Preparation work for NVIDIA TwinView support.
>
> Signed-off-by: Peter Hutterer <peter.hutte...@who-t.net>
> ---
> tools/xsetwacom.c | 22 ++++++++++++++--------
> 1 files changed, 14 insertions(+), 8 deletions(-)
>
> diff --git a/tools/xsetwacom.c b/tools/xsetwacom.c
> index 9b5b12f..47518ee 100644
> --- a/tools/xsetwacom.c
> +++ b/tools/xsetwacom.c
> @@ -1963,7 +1963,7 @@ static void _set_matrix_prop(Display *dpy, XDevice
> *dev, const float fmatrix[9])
> XFlush(dpy);
> }
>
> -static void set_output(Display *dpy, XDevice *dev, param_t *param, int argc,
> char **argv)
> +static void set_output_xrandr(Display *dpy, XDevice *dev, param_t *param,
> int argc, char **argv)
> {
> int min, maj;
> int i, found = 0;
> @@ -1972,13 +1972,6 @@ static void set_output(Display *dpy, XDevice *dev,
> param_t *param, int argc, cha
> XRROutputInfo *output_info;
> XRRCrtcInfo *crtc_info;
>
> - if (argc != param->arg_count)
> - {
> - fprintf(stderr, "'%s' requires exactly %d value(s).\n",
> param->name,
> - param->arg_count);
> - return;
> - }
> -
> output_name = argv[0];
>
> if (!XRRQueryExtension(dpy, &maj, &min)) /* using min/maj as dummy */
> @@ -2053,6 +2046,19 @@ static void set_output(Display *dpy, XDevice *dev,
> param_t *param, int argc, cha
> XRRFreeScreenResources(res);
> }
>
> +static void set_output(Display *dpy, XDevice *dev, param_t *param, int argc,
> char **argv)
> +{
> + if (argc != param->arg_count)
> + {
> + fprintf(stderr, "'%s' requires exactly %d value(s).\n",
> param->name,
> + param->arg_count);
> + return;
> + }
> +
> + set_output_xrandr(dpy, dev, param, argc, argv);
> +}
> +
> +
> static void get_all(Display *dpy, XDevice *dev, param_t *param, int argc,
> char **argv)
> {
> param_t *p = parameters;
> --
> 1.7.5.4
>
>
> ------------------------------------------------------------------------------
> EditLive Enterprise is the world's most technically advanced content
> authoring tool. Experience the power of Track Changes, Inline Image
> Editing and ensure content is compliant with Accessibility Checking.
> http://p.sf.net/sfu/ephox-dev2dev
> _______________________________________________
> Linuxwacom-devel mailing list
> Linuxwacom-devel@lists.sourceforge.net
> https://lists.sourceforge.net/lists/listinfo/linuxwacom-devel
>
Tested-by: Jason Gerecke <killert...@gmail.com>
Jason
---
Day xee-nee-svsh duu-'ushtlh-ts'it;
nuu-wee-ya' duu-xan' 'vm-nvshtlh-ts'it.
Huu-chan xuu naa~-gha.
------------------------------------------------------------------------------
Simplify data backup and recovery for your virtual environment with vRanger.
Installation's a snap, and flexible recovery options mean your data is safe,
secure and there when you need it. Data protection magic?
Nope - It's vRanger. Get your free trial download today.
http://p.sf.net/sfu/quest-sfdev2dev
_______________________________________________
Linuxwacom-devel mailing list
Linuxwacom-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/linuxwacom-devel
