qbit/xenocara
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Upate to libdmx 1.1.2

Browse Source
This commit is contained in:
matthieu 2012-03-10 17:12:22 +00:00
parent 34b36cadec
commit bbff790d0c
20 changed files with 29092 additions and 22289 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

75
lib/libdmx/ChangeLog
View File

@ -1,3 +1,78 @@
commit 9f470c92bc2d194c8abb9154f42864e6c82f43ef
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Wed Mar 7 21:43:10 2012 -0800
libdmx 1.1.2
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
commit 94c2e8ba375d968bd648097a484edac5d1c87c78
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Fri Mar 2 17:38:24 2012 -0800
Stop casting away constness on dmx_extension_name
Fixes gcc warning:
dmx.c: In function 'find_display':
dmx.c:78:1: warning: cast discards qualifiers from pointer target type
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
commit 19bea63b9b39d83da9b4aa277cc1db967a4928bd
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Fri Sep 16 22:06:15 2011 -0700
Strip trailing whitespace
Performed with: find * -type f | xargs perl -i -p -e 's{[ \t]+$}{}'
git diff -w & git diff -b show no diffs from this change
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
commit 1ab0d436ceac0acef0cd97d8b280727b02062cc8
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Tue May 17 20:32:38 2011 -0700
Fix various typos in man pages
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
commit 77701e9139f79db2e66026bebaab265a873b0856
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Wed Feb 2 11:43:46 2011 -0500
config: comment, minor upgrade, quote and layout configure.ac
Group statements per section as per Autoconf standard layout
Quote statements where appropriate.
Autoconf recommends not using dnl instead of # for comments
Use AC_CONFIG_FILES to replace the deprecated AC_OUTPUT with parameters.
Add AC_CONFIG_SRCDIR([Makefile.am])
This helps automated maintenance and release activities.
Details can be found in http://wiki.x.org/wiki/NewModuleGuidelines
commit d970eb0954c0400bdab923c0b9c433b2f33dbe9d
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Fri Jan 28 19:41:37 2011 -0500
config: replace deprecated AM_CONFIG_HEADER with AC_CONFIG_HEADERS
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
commit b865861d72a86024daec36c517a214e75ef4b973
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Thu Jan 27 19:20:39 2011 -0500
config: remove AC_PROG_CC as it overrides AC_PROG_C_C99
XORG_STRICT_OPTION from XORG_DEFAULT_OPTIONS calls
AC_PROG_C_C99. This sets gcc with -std=gnu99.
If AC_PROG_CC macro is called afterwards, it resets CC to gcc.
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
commit 09d2ddd805a00568e4b7f668b0f500a63c350940 commit 09d2ddd805a00568e4b7f668b0f500a63c350940
Author: Alan Coopersmith <alan.coopersmith@oracle.com> Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Thu Oct 28 16:56:29 2010 -0700 Date: Thu Oct 28 16:56:29 2010 -0700

6
lib/libdmx/Makefile.am
View File

@ -1,6 +1,6 @@
# #
# Copyright 2005 Red Hat, Inc. # Copyright 2005 Red Hat, Inc.
# #
# Permission to use, copy, modify, distribute, and sell this software and its # Permission to use, copy, modify, distribute, and sell this software and its
# documentation for any purpose is hereby granted without fee, provided that # documentation for any purpose is hereby granted without fee, provided that
# the above copyright notice appear in all copies and that both that # the above copyright notice appear in all copies and that both that
@ -10,7 +10,7 @@
# specific, written prior permission. Red Hat makes no # specific, written prior permission. Red Hat makes no
# representations about the suitability of this software for any purpose. It # representations about the suitability of this software for any purpose. It
# is provided "as is" without express or implied warranty. # is provided "as is" without express or implied warranty.
# #
# RED HAT DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, # RED HAT DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
# INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO # INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
# EVENT SHALL RED HAT BE LIABLE FOR ANY SPECIAL, INDIRECT OR # EVENT SHALL RED HAT BE LIABLE FOR ANY SPECIAL, INDIRECT OR

37
lib/libdmx/Makefile.in
View File

@ -14,9 +14,9 @@
@SET_MAKE@ @SET_MAKE@
# #
# Copyright 2005 Red Hat, Inc. # Copyright 2005 Red Hat, Inc.
# #
# Permission to use, copy, modify, distribute, and sell this software and its # Permission to use, copy, modify, distribute, and sell this software and its
# documentation for any purpose is hereby granted without fee, provided that # documentation for any purpose is hereby granted without fee, provided that
# the above copyright notice appear in all copies and that both that # the above copyright notice appear in all copies and that both that
@ -26,7 +26,7 @@
# specific, written prior permission. Red Hat makes no # specific, written prior permission. Red Hat makes no
# representations about the suitability of this software for any purpose. It # representations about the suitability of this software for any purpose. It
# is provided "as is" without express or implied warranty. # is provided "as is" without express or implied warranty.
# #
# RED HAT DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, # RED HAT DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
# INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO # INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
# EVENT SHALL RED HAT BE LIABLE FOR ANY SPECIAL, INDIRECT OR # EVENT SHALL RED HAT BE LIABLE FOR ANY SPECIAL, INDIRECT OR
@ -44,9 +44,9 @@ pkgincludedir = $(includedir)/@PACKAGE@
top_builddir = . top_builddir = .
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
INSTALL = @INSTALL@ INSTALL = @INSTALL@
install_sh_DATA = $(install_sh) -c -m 644 install_sh_DATA = ${SHELL} $(install_sh) -c -m 644
install_sh_PROGRAM = $(install_sh) -c install_sh_PROGRAM = ${SHELL} $(install_sh) -c
install_sh_SCRIPT = $(install_sh) -c install_sh_SCRIPT = ${SHELL} $(install_sh) -c
INSTALL_HEADER = $(INSTALL_DATA) INSTALL_HEADER = $(INSTALL_DATA)
transform = $(program_transform_name) transform = $(program_transform_name)
NORMAL_INSTALL = : NORMAL_INSTALL = :
@ -117,6 +117,7 @@ AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@ AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@ AUTOMAKE = @AUTOMAKE@
AWK = @AWK@ AWK = @AWK@
BASE_CFLAGS = @BASE_CFLAGS@
CC = @CC@ CC = @CC@
CCDEPMODE = @CCDEPMODE@ CCDEPMODE = @CCDEPMODE@
CFLAGS = @CFLAGS@ CFLAGS = @CFLAGS@
@ -124,26 +125,22 @@ CHANGELOG_CMD = @CHANGELOG_CMD@
CPP = @CPP@ CPP = @CPP@
CPPFLAGS = @CPPFLAGS@ CPPFLAGS = @CPPFLAGS@
CWARNFLAGS = @CWARNFLAGS@ CWARNFLAGS = @CWARNFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
CXXDEPMODE = @CXXDEPMODE@
CXXFLAGS = @CXXFLAGS@
CYGPATH_W = @CYGPATH_W@ CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@ DEFS = @DEFS@
DEPDIR = @DEPDIR@ DEPDIR = @DEPDIR@
DLLTOOL = @DLLTOOL@
DMX_CFLAGS = @DMX_CFLAGS@ DMX_CFLAGS = @DMX_CFLAGS@
DMX_LIBS = @DMX_LIBS@ DMX_LIBS = @DMX_LIBS@
DRIVER_MAN_DIR = @DRIVER_MAN_DIR@ DRIVER_MAN_DIR = @DRIVER_MAN_DIR@
DRIVER_MAN_SUFFIX = @DRIVER_MAN_SUFFIX@ DRIVER_MAN_SUFFIX = @DRIVER_MAN_SUFFIX@
DSYMUTIL = @DSYMUTIL@ DSYMUTIL = @DSYMUTIL@
ECHO = @ECHO@ DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@ ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@ ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@ ECHO_T = @ECHO_T@
EGREP = @EGREP@ EGREP = @EGREP@
EXEEXT = @EXEEXT@ EXEEXT = @EXEEXT@
F77 = @F77@ FGREP = @FGREP@
FFLAGS = @FFLAGS@
FILE_MAN_DIR = @FILE_MAN_DIR@ FILE_MAN_DIR = @FILE_MAN_DIR@
FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@ FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@
GREP = @GREP@ GREP = @GREP@
@ -152,12 +149,14 @@ INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
LD = @LD@
LDFLAGS = @LDFLAGS@ LDFLAGS = @LDFLAGS@
LIBOBJS = @LIBOBJS@ LIBOBJS = @LIBOBJS@
LIBS = @LIBS@ LIBS = @LIBS@
LIBTOOL = @LIBTOOL@ LIBTOOL = @LIBTOOL@
LIB_MAN_DIR = @LIB_MAN_DIR@ LIB_MAN_DIR = @LIB_MAN_DIR@
LIB_MAN_SUFFIX = @LIB_MAN_SUFFIX@ LIB_MAN_SUFFIX = @LIB_MAN_SUFFIX@
LIPO = @LIPO@
LN_S = @LN_S@ LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@ LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@ MAINT = @MAINT@
@ -165,11 +164,16 @@ MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
MAKEINFO = @MAKEINFO@ MAKEINFO = @MAKEINFO@
MALLOC_ZERO_CFLAGS = @MALLOC_ZERO_CFLAGS@ MALLOC_ZERO_CFLAGS = @MALLOC_ZERO_CFLAGS@
MANIFEST_TOOL = @MANIFEST_TOOL@
MAN_SUBSTS = @MAN_SUBSTS@ MAN_SUBSTS = @MAN_SUBSTS@
MISC_MAN_DIR = @MISC_MAN_DIR@ MISC_MAN_DIR = @MISC_MAN_DIR@
MISC_MAN_SUFFIX = @MISC_MAN_SUFFIX@ MISC_MAN_SUFFIX = @MISC_MAN_SUFFIX@
NM = @NM@
NMEDIT = @NMEDIT@ NMEDIT = @NMEDIT@
OBJDUMP = @OBJDUMP@
OBJEXT = @OBJEXT@ OBJEXT = @OBJEXT@
OTOOL = @OTOOL@
OTOOL64 = @OTOOL64@
PACKAGE = @PACKAGE@ PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_NAME = @PACKAGE_NAME@
@ -182,18 +186,17 @@ RANLIB = @RANLIB@
SED = @SED@ SED = @SED@
SET_MAKE = @SET_MAKE@ SET_MAKE = @SET_MAKE@
SHELL = @SHELL@ SHELL = @SHELL@
STRICT_CFLAGS = @STRICT_CFLAGS@
STRIP = @STRIP@ STRIP = @STRIP@
VERSION = @VERSION@ VERSION = @VERSION@
XMALLOC_ZERO_CFLAGS = @XMALLOC_ZERO_CFLAGS@ XMALLOC_ZERO_CFLAGS = @XMALLOC_ZERO_CFLAGS@
XORG_MAN_PAGE = @XORG_MAN_PAGE@ XORG_MAN_PAGE = @XORG_MAN_PAGE@
XTMALLOC_ZERO_CFLAGS = @XTMALLOC_ZERO_CFLAGS@ XTMALLOC_ZERO_CFLAGS = @XTMALLOC_ZERO_CFLAGS@
ac_ct_AR = @ac_ct_AR@
ac_ct_CC = @ac_ct_CC@ ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@ ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
ac_ct_F77 = @ac_ct_F77@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
am__include = @am__include@ am__include = @am__include@
am__leading_dot = @am__leading_dot@ am__leading_dot = @am__leading_dot@
am__quote = @am__quote@ am__quote = @am__quote@

10626
lib/libdmx/aclocal.m4 vendored
View File

File diff suppressed because it is too large Load Diff

4
lib/libdmx/config.h.in
View File

@ -30,6 +30,10 @@
/* Define to 1 if you have the <unistd.h> header file. */ /* Define to 1 if you have the <unistd.h> header file. */
#undef HAVE_UNISTD_H #undef HAVE_UNISTD_H
/* Define to the sub-directory in which libtool stores uninstalled libraries.
*/
#undef LT_OBJDIR
/* Name of package */ /* Name of package */
#undef PACKAGE #undef PACKAGE

30303
lib/libdmx/configure vendored
View File

File diff suppressed because it is too large Load Diff

74
lib/libdmx/configure.ac
View File

@ -1,50 +1,50 @@
# Copyright 2005 Red Hat, Inc.
#
# Permission to use, copy, modify, distribute, and sell this software and its
# documentation for any purpose is hereby granted without fee, provided that
# the above copyright notice appear in all copies and that both that
# copyright notice and this permission notice appear in supporting
# documentation, and that the name of Red Hat not be used in
# advertising or publicity pertaining to distribution of the software without
# specific, written prior permission. Red Hat makes no
# representations about the suitability of this software for any purpose. It
# is provided "as is" without express or implied warranty.
#
# RED HAT DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
# INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
# EVENT SHALL RED HAT BE LIABLE FOR ANY SPECIAL, INDIRECT OR
# CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
# DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
# TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
# PERFORMANCE OF THIS SOFTWARE.
#
dnl Copyright 2005 Red Hat, Inc. # Initialize Autoconf
dnl
dnl Permission to use, copy, modify, distribute, and sell this software and its
dnl documentation for any purpose is hereby granted without fee, provided that
dnl the above copyright notice appear in all copies and that both that
dnl copyright notice and this permission notice appear in supporting
dnl documentation, and that the name of Red Hat not be used in
dnl advertising or publicity pertaining to distribution of the software without
dnl specific, written prior permission. Red Hat makes no
dnl representations about the suitability of this software for any purpose. It
dnl is provided "as is" without express or implied warranty.
dnl
dnl RED HAT DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
dnl INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
dnl EVENT SHALL RED HAT BE LIABLE FOR ANY SPECIAL, INDIRECT OR
dnl CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
dnl DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
dnl TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
dnl PERFORMANCE OF THIS SOFTWARE.
dnl
dnl Process this file with autoconf to create configure.
AC_PREREQ([2.60]) AC_PREREQ([2.60])
AC_INIT([libdmx], [1.1.2],
AC_INIT([libdmx], [1.1.1],
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], [libdmx]) [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], [libdmx])
AC_CONFIG_SRCDIR([Makefile.am])
AC_CONFIG_HEADERS([config.h])
# Initialize Automake
AM_INIT_AUTOMAKE([foreign dist-bzip2]) AM_INIT_AUTOMAKE([foreign dist-bzip2])
AM_MAINTAINER_MODE AM_MAINTAINER_MODE
# Initialize libtool
AC_PROG_LIBTOOL
# Require X.Org macros 1.8 or later for MAN_SUBSTS set by XORG_MANPAGE_SECTIONS # Require X.Org macros 1.8 or later for MAN_SUBSTS set by XORG_MANPAGE_SECTIONS
m4_ifndef([XORG_MACROS_VERSION], m4_ifndef([XORG_MACROS_VERSION],
[m4_fatal([must install xorg-macros 1.8 or later before running autoconf/autogen])]) [m4_fatal([must install xorg-macros 1.8 or later before running autoconf/autogen])])
XORG_MACROS_VERSION(1.8) XORG_MACROS_VERSION(1.8)
XORG_DEFAULT_OPTIONS XORG_DEFAULT_OPTIONS
AM_CONFIG_HEADER(config.h)
# Check for progs
AC_PROG_CC
AC_PROG_LIBTOOL
# Check for dependencies
PKG_CHECK_MODULES(DMX, x11 xext xextproto [dmxproto >= 2.2.99.1])
XORG_CHECK_MALLOC_ZERO XORG_CHECK_MALLOC_ZERO
AC_OUTPUT([Makefile # Obtain compiler/linker options for depedencies
src/Makefile PKG_CHECK_MODULES(DMX, x11 xext xextproto [dmxproto >= 2.2.99.1])
man/Makefile
dmx.pc]) AC_CONFIG_FILES([Makefile
src/Makefile
man/Makefile
dmx.pc])
AC_OUTPUT

2
lib/libdmx/include/X11/extensions/dmxext.h
View File

@ -87,7 +87,7 @@ typedef enum {
} DMXInputEnum; } DMXInputEnum;
/** Client-library input information structure, returned by /** Client-library input information structure, returned by
* #DMXGetInputAttributes. */ * #DMXGetInputAttributes. */
typedef struct { typedef struct {
DMXInputEnum inputType; DMXInputEnum inputType;
int physicalScreen; int physicalScreen;

10136
lib/libdmx/ltmain.sh
View File

File diff suppressed because it is too large Load Diff

4
lib/libdmx/man/DMXAddInput.man
View File

@ -82,8 +82,8 @@ typedef struct {
.fi .fi
.PP .PP
.I inputType .I inputType
may bave the value may have the value
.B DmxConsoleInputType " or " DmxBackendInputType . .B DMXConsoleInputType " or " DMXBackendInputType .
.PP .PP
For console devices, For console devices,
.I name .I name

6
lib/libdmx/man/DMXAddScreen.man
View File

@ -55,9 +55,9 @@ screen number for the attached screen.
The information stored in The information stored in
.I mask " and " attr .I mask " and " attr
is identical to that used by the is identical to that used by the
.BR DMXChangeScreenAttributes (__libmansuffix__) .BR DMXChangeScreensAttributes (__libmansuffix__)
and and
.BR DMXGetScreenAttribues (__libmansuffix__) .BR DMXGetScreenAttributes (__libmansuffix__)
functions. functions.
.SH "RETURN VALUE" .SH "RETURN VALUE"
.B DMXAddScreen() .B DMXAddScreen()
@ -98,5 +98,5 @@ API, this function uses
for both input and output. for both input and output.
.SH "SEE ALSO" .SH "SEE ALSO"
.BR DMXRemoveScreen "(__libmansuffix__), " .BR DMXRemoveScreen "(__libmansuffix__), "
.BR DMXChangeScreenAttributes "(__libmansuffix__), " DMXGetScreenAttributes "(__libmansuffix__), " .BR DMXChangeScreensAttributes "(__libmansuffix__), " DMXGetScreenAttributes "(__libmansuffix__), "
.BR DMX "(__libmansuffix__), " Xdmx (1) .BR DMX "(__libmansuffix__), " Xdmx (1)

2
lib/libdmx/man/DMXChangeDesktopAttributes.man
View File

@ -77,7 +77,7 @@ is not specified, the current values will be used. If
.I shiftX " or " shiftY .I shiftX " or " shiftY
is not specified, 0 will be used. is not specified, 0 will be used.
.PP .PP
All coordinants are in the global DMX coordinant system. If Xinerama is All coordinates are in the global DMX coordinate system. If Xinerama is
not active, an error will be generated. not active, an error will be generated.
.SH "RETURN VALUE" .SH "RETURN VALUE"
.B DMXChangeDesktopAttributes() .B DMXChangeDesktopAttributes()

2
lib/libdmx/man/DMXForceWindowCreation.man
View File

@ -41,7 +41,7 @@ forces the immediate creation of the window requested.
returns returns
.B True .B True
unless there is a protocol error. unless there is a protocol error.
.B DMXForceWindwoCreation() .B DMXForceWindowCreation()
can generate can generate
.B BadWindow .B BadWindow
errors. errors.

4
lib/libdmx/man/DMXGetInputAttributes.man
View File

@ -38,7 +38,7 @@ returns information about the input device specified with
.IR id . .IR id .
This information cannot be This information cannot be
obtained from the obtained from the
.BR XListInputDeivices (__libmansuffix__) .BR XListInputDevices (__libmansuffix__)
call. call.
.I id .I id
is the same as that used by the is the same as that used by the
@ -74,7 +74,7 @@ For local devices, all other fields returned, except
.I isCore " and " sendsCore , .I isCore " and " sendsCore ,
are invalid. are invalid.
.PP .PP
For console devices, For console devices,
.I physicalScreen " and " physicalID .I physicalScreen " and " physicalID
will be invalid, and will be invalid, and
.I name .I name

6
lib/libdmx/man/DMXGetScreenAttributes.man
View File

@ -83,14 +83,14 @@ coordinate system. Otherwise, these values are set to 0.
are a geometry specification (see are a geometry specification (see
.BR X (7x)) .BR X (7x))
for the location of the DMX screen on the back-end screen. The for the location of the DMX screen on the back-end screen. The
coordinant system of the back-end display is used for these values. coordinate system of the back-end display is used for these values.
.PP .PP
.IR rootWindowWidth ", " rootWindowHeight ", " .IR rootWindowWidth ", " rootWindowHeight ", "
.IR rootWindowXoffset ", and " rootWindowYoffset .IR rootWindowXoffset ", and " rootWindowYoffset
are a geometry specification (see are a geometry specification (see
.BR X (7x)) .BR X (7x))
for the location of the root window on the screen window. The for the location of the root window on the screen window. The
coordinant system of the screen window is used. In most cases, the root coordinate system of the screen window is used. In most cases, the root
window will have the same geometry as the DMX screen window, and will window will have the same geometry as the DMX screen window, and will
occupy the same area of the back-end display. (This would not be the occupy the same area of the back-end display. (This would not be the
case, for example, if automatic projector alignment is used.) case, for example, if automatic projector alignment is used.)
@ -106,5 +106,5 @@ can generate
errors. errors.
.SH "SEE ALSO" .SH "SEE ALSO"
.BR DMXGetScreenCount "(__libmansuffix__), " .BR DMXGetScreenCount "(__libmansuffix__), "
.BR DMXChangeScreenAttributes "(__libmansuffix__), " .BR DMXChangeScreensAttributes "(__libmansuffix__), "
.BR DMX "(__libmansuffix__), " Xdmx (1) .BR DMX "(__libmansuffix__), " Xdmx (1)

4
lib/libdmx/man/DMXGetScreenCount.man
View File

@ -61,6 +61,6 @@ composite back-end screens that the
.BR Xdmx (1) .BR Xdmx (1)
server is using. server is using.
.SH "SEE ALSO" .SH "SEE ALSO"
.BR DMXGetScreenAttribtues "(__libmansuffix__), " .BR DMXGetScreenAttributes "(__libmansuffix__), "
.BR DMXChangeScreenAttributes "(__libmansuffix__), " .BR DMXChangeScreensAttributes "(__libmansuffix__), "
.BR DMX "(__libmansuffix__), " Xdmx (1) .BR DMX "(__libmansuffix__), " Xdmx (1)

4
lib/libdmx/man/Makefile.am
View File

@ -1,5 +1,5 @@
# Copyright 2005 Red Hat, Inc. # Copyright 2005 Red Hat, Inc.
# #
# Permission to use, copy, modify, distribute, and sell this software and its # Permission to use, copy, modify, distribute, and sell this software and its
# documentation for any purpose is hereby granted without fee, provided that # documentation for any purpose is hereby granted without fee, provided that
# the above copyright notice appear in all copies and that both that # the above copyright notice appear in all copies and that both that
@ -9,7 +9,7 @@
# specific, written prior permission. Red Hat makes no representations about # specific, written prior permission. Red Hat makes no representations about
# the suitability of this software for any purpose. It is provided "as is" without # the suitability of this software for any purpose. It is provided "as is" without
# express or implied warranty. # express or implied warranty.
# #
# RED HAT DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, # RED HAT DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
# INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO # INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
# EVENT SHALL RED HAT BE LIABLE FOR ANY SPECIAL, INDIRECT OR # EVENT SHALL RED HAT BE LIABLE FOR ANY SPECIAL, INDIRECT OR

35
lib/libdmx/man/Makefile.in
View File

@ -15,7 +15,7 @@
@SET_MAKE@ @SET_MAKE@
# Copyright 2005 Red Hat, Inc. # Copyright 2005 Red Hat, Inc.
# #
# Permission to use, copy, modify, distribute, and sell this software and its # Permission to use, copy, modify, distribute, and sell this software and its
# documentation for any purpose is hereby granted without fee, provided that # documentation for any purpose is hereby granted without fee, provided that
# the above copyright notice appear in all copies and that both that # the above copyright notice appear in all copies and that both that
@ -25,7 +25,7 @@
# specific, written prior permission. Red Hat makes no representations about # specific, written prior permission. Red Hat makes no representations about
# the suitability of this software for any purpose. It is provided "as is" without # the suitability of this software for any purpose. It is provided "as is" without
# express or implied warranty. # express or implied warranty.
# #
# RED HAT DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, # RED HAT DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
# INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO # INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
# EVENT SHALL RED HAT BE LIABLE FOR ANY SPECIAL, INDIRECT OR # EVENT SHALL RED HAT BE LIABLE FOR ANY SPECIAL, INDIRECT OR
@ -44,9 +44,9 @@ pkgincludedir = $(includedir)/@PACKAGE@
top_builddir = .. top_builddir = ..
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
INSTALL = @INSTALL@ INSTALL = @INSTALL@
install_sh_DATA = $(install_sh) -c -m 644 install_sh_DATA = ${SHELL} $(install_sh) -c -m 644
install_sh_PROGRAM = $(install_sh) -c install_sh_PROGRAM = ${SHELL} $(install_sh) -c
install_sh_SCRIPT = $(install_sh) -c install_sh_SCRIPT = ${SHELL} $(install_sh) -c
INSTALL_HEADER = $(INSTALL_DATA) INSTALL_HEADER = $(INSTALL_DATA)
transform = $(program_transform_name) transform = $(program_transform_name)
NORMAL_INSTALL = : NORMAL_INSTALL = :
@ -92,6 +92,7 @@ AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@ AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@ AUTOMAKE = @AUTOMAKE@
AWK = @AWK@ AWK = @AWK@
BASE_CFLAGS = @BASE_CFLAGS@
CC = @CC@ CC = @CC@
CCDEPMODE = @CCDEPMODE@ CCDEPMODE = @CCDEPMODE@
CFLAGS = @CFLAGS@ CFLAGS = @CFLAGS@
@ -99,26 +100,22 @@ CHANGELOG_CMD = @CHANGELOG_CMD@
CPP = @CPP@ CPP = @CPP@
CPPFLAGS = @CPPFLAGS@ CPPFLAGS = @CPPFLAGS@
CWARNFLAGS = @CWARNFLAGS@ CWARNFLAGS = @CWARNFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
CXXDEPMODE = @CXXDEPMODE@
CXXFLAGS = @CXXFLAGS@
CYGPATH_W = @CYGPATH_W@ CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@ DEFS = @DEFS@
DEPDIR = @DEPDIR@ DEPDIR = @DEPDIR@
DLLTOOL = @DLLTOOL@
DMX_CFLAGS = @DMX_CFLAGS@ DMX_CFLAGS = @DMX_CFLAGS@
DMX_LIBS = @DMX_LIBS@ DMX_LIBS = @DMX_LIBS@
DRIVER_MAN_DIR = @DRIVER_MAN_DIR@ DRIVER_MAN_DIR = @DRIVER_MAN_DIR@
DRIVER_MAN_SUFFIX = @DRIVER_MAN_SUFFIX@ DRIVER_MAN_SUFFIX = @DRIVER_MAN_SUFFIX@
DSYMUTIL = @DSYMUTIL@ DSYMUTIL = @DSYMUTIL@
ECHO = @ECHO@ DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@ ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@ ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@ ECHO_T = @ECHO_T@
EGREP = @EGREP@ EGREP = @EGREP@
EXEEXT = @EXEEXT@ EXEEXT = @EXEEXT@
F77 = @F77@ FGREP = @FGREP@
FFLAGS = @FFLAGS@
FILE_MAN_DIR = @FILE_MAN_DIR@ FILE_MAN_DIR = @FILE_MAN_DIR@
FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@ FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@
GREP = @GREP@ GREP = @GREP@
@ -127,12 +124,14 @@ INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
LD = @LD@
LDFLAGS = @LDFLAGS@ LDFLAGS = @LDFLAGS@
LIBOBJS = @LIBOBJS@ LIBOBJS = @LIBOBJS@
LIBS = @LIBS@ LIBS = @LIBS@
LIBTOOL = @LIBTOOL@ LIBTOOL = @LIBTOOL@
LIB_MAN_DIR = @LIB_MAN_DIR@ LIB_MAN_DIR = @LIB_MAN_DIR@
LIB_MAN_SUFFIX = @LIB_MAN_SUFFIX@ LIB_MAN_SUFFIX = @LIB_MAN_SUFFIX@
LIPO = @LIPO@
LN_S = @LN_S@ LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@ LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@ MAINT = @MAINT@
@ -140,11 +139,16 @@ MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
MAKEINFO = @MAKEINFO@ MAKEINFO = @MAKEINFO@
MALLOC_ZERO_CFLAGS = @MALLOC_ZERO_CFLAGS@ MALLOC_ZERO_CFLAGS = @MALLOC_ZERO_CFLAGS@
MANIFEST_TOOL = @MANIFEST_TOOL@
MAN_SUBSTS = @MAN_SUBSTS@ MAN_SUBSTS = @MAN_SUBSTS@
MISC_MAN_DIR = @MISC_MAN_DIR@ MISC_MAN_DIR = @MISC_MAN_DIR@
MISC_MAN_SUFFIX = @MISC_MAN_SUFFIX@ MISC_MAN_SUFFIX = @MISC_MAN_SUFFIX@
NM = @NM@
NMEDIT = @NMEDIT@ NMEDIT = @NMEDIT@
OBJDUMP = @OBJDUMP@
OBJEXT = @OBJEXT@ OBJEXT = @OBJEXT@
OTOOL = @OTOOL@
OTOOL64 = @OTOOL64@
PACKAGE = @PACKAGE@ PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_NAME = @PACKAGE_NAME@
@ -157,18 +161,17 @@ RANLIB = @RANLIB@
SED = @SED@ SED = @SED@
SET_MAKE = @SET_MAKE@ SET_MAKE = @SET_MAKE@
SHELL = @SHELL@ SHELL = @SHELL@
STRICT_CFLAGS = @STRICT_CFLAGS@
STRIP = @STRIP@ STRIP = @STRIP@
VERSION = @VERSION@ VERSION = @VERSION@
XMALLOC_ZERO_CFLAGS = @XMALLOC_ZERO_CFLAGS@ XMALLOC_ZERO_CFLAGS = @XMALLOC_ZERO_CFLAGS@
XORG_MAN_PAGE = @XORG_MAN_PAGE@ XORG_MAN_PAGE = @XORG_MAN_PAGE@
XTMALLOC_ZERO_CFLAGS = @XTMALLOC_ZERO_CFLAGS@ XTMALLOC_ZERO_CFLAGS = @XTMALLOC_ZERO_CFLAGS@
ac_ct_AR = @ac_ct_AR@
ac_ct_CC = @ac_ct_CC@ ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@ ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
ac_ct_F77 = @ac_ct_F77@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
am__include = @am__include@ am__include = @am__include@
am__leading_dot = @am__leading_dot@ am__leading_dot = @am__leading_dot@
am__quote = @am__quote@ am__quote = @am__quote@

31
lib/libdmx/src/Makefile.in
View File

@ -24,9 +24,9 @@ pkgincludedir = $(includedir)/@PACKAGE@
top_builddir = .. top_builddir = ..
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
INSTALL = @INSTALL@ INSTALL = @INSTALL@
install_sh_DATA = $(install_sh) -c -m 644 install_sh_DATA = ${SHELL} $(install_sh) -c -m 644
install_sh_PROGRAM = $(install_sh) -c install_sh_PROGRAM = ${SHELL} $(install_sh) -c
install_sh_SCRIPT = $(install_sh) -c install_sh_SCRIPT = ${SHELL} $(install_sh) -c
INSTALL_HEADER = $(INSTALL_DATA) INSTALL_HEADER = $(INSTALL_DATA)
transform = $(program_transform_name) transform = $(program_transform_name)
NORMAL_INSTALL = : NORMAL_INSTALL = :
@ -93,6 +93,7 @@ AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@ AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@ AUTOMAKE = @AUTOMAKE@
AWK = @AWK@ AWK = @AWK@
BASE_CFLAGS = @BASE_CFLAGS@
CC = @CC@ CC = @CC@
CCDEPMODE = @CCDEPMODE@ CCDEPMODE = @CCDEPMODE@
CFLAGS = @CFLAGS@ CFLAGS = @CFLAGS@
@ -100,26 +101,22 @@ CHANGELOG_CMD = @CHANGELOG_CMD@
CPP = @CPP@ CPP = @CPP@
CPPFLAGS = @CPPFLAGS@ CPPFLAGS = @CPPFLAGS@
CWARNFLAGS = @CWARNFLAGS@ CWARNFLAGS = @CWARNFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
CXXDEPMODE = @CXXDEPMODE@
CXXFLAGS = @CXXFLAGS@
CYGPATH_W = @CYGPATH_W@ CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@ DEFS = @DEFS@
DEPDIR = @DEPDIR@ DEPDIR = @DEPDIR@
DLLTOOL = @DLLTOOL@
DMX_CFLAGS = @DMX_CFLAGS@ DMX_CFLAGS = @DMX_CFLAGS@
DMX_LIBS = @DMX_LIBS@ DMX_LIBS = @DMX_LIBS@
DRIVER_MAN_DIR = @DRIVER_MAN_DIR@ DRIVER_MAN_DIR = @DRIVER_MAN_DIR@
DRIVER_MAN_SUFFIX = @DRIVER_MAN_SUFFIX@ DRIVER_MAN_SUFFIX = @DRIVER_MAN_SUFFIX@
DSYMUTIL = @DSYMUTIL@ DSYMUTIL = @DSYMUTIL@
ECHO = @ECHO@ DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@ ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@ ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@ ECHO_T = @ECHO_T@
EGREP = @EGREP@ EGREP = @EGREP@
EXEEXT = @EXEEXT@ EXEEXT = @EXEEXT@
F77 = @F77@ FGREP = @FGREP@
FFLAGS = @FFLAGS@
FILE_MAN_DIR = @FILE_MAN_DIR@ FILE_MAN_DIR = @FILE_MAN_DIR@
FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@ FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@
GREP = @GREP@ GREP = @GREP@
@ -128,12 +125,14 @@ INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
LD = @LD@
LDFLAGS = @LDFLAGS@ LDFLAGS = @LDFLAGS@
LIBOBJS = @LIBOBJS@ LIBOBJS = @LIBOBJS@
LIBS = @LIBS@ LIBS = @LIBS@
LIBTOOL = @LIBTOOL@ LIBTOOL = @LIBTOOL@
LIB_MAN_DIR = @LIB_MAN_DIR@ LIB_MAN_DIR = @LIB_MAN_DIR@
LIB_MAN_SUFFIX = @LIB_MAN_SUFFIX@ LIB_MAN_SUFFIX = @LIB_MAN_SUFFIX@
LIPO = @LIPO@
LN_S = @LN_S@ LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@ LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@ MAINT = @MAINT@
@ -141,11 +140,16 @@ MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
MAKEINFO = @MAKEINFO@ MAKEINFO = @MAKEINFO@
MALLOC_ZERO_CFLAGS = @MALLOC_ZERO_CFLAGS@ MALLOC_ZERO_CFLAGS = @MALLOC_ZERO_CFLAGS@
MANIFEST_TOOL = @MANIFEST_TOOL@
MAN_SUBSTS = @MAN_SUBSTS@ MAN_SUBSTS = @MAN_SUBSTS@
MISC_MAN_DIR = @MISC_MAN_DIR@ MISC_MAN_DIR = @MISC_MAN_DIR@
MISC_MAN_SUFFIX = @MISC_MAN_SUFFIX@ MISC_MAN_SUFFIX = @MISC_MAN_SUFFIX@
NM = @NM@
NMEDIT = @NMEDIT@ NMEDIT = @NMEDIT@
OBJDUMP = @OBJDUMP@
OBJEXT = @OBJEXT@ OBJEXT = @OBJEXT@
OTOOL = @OTOOL@
OTOOL64 = @OTOOL64@
PACKAGE = @PACKAGE@ PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_NAME = @PACKAGE_NAME@
@ -158,18 +162,17 @@ RANLIB = @RANLIB@
SED = @SED@ SED = @SED@
SET_MAKE = @SET_MAKE@ SET_MAKE = @SET_MAKE@
SHELL = @SHELL@ SHELL = @SHELL@
STRICT_CFLAGS = @STRICT_CFLAGS@
STRIP = @STRIP@ STRIP = @STRIP@
VERSION = @VERSION@ VERSION = @VERSION@
XMALLOC_ZERO_CFLAGS = @XMALLOC_ZERO_CFLAGS@ XMALLOC_ZERO_CFLAGS = @XMALLOC_ZERO_CFLAGS@
XORG_MAN_PAGE = @XORG_MAN_PAGE@ XORG_MAN_PAGE = @XORG_MAN_PAGE@
XTMALLOC_ZERO_CFLAGS = @XTMALLOC_ZERO_CFLAGS@ XTMALLOC_ZERO_CFLAGS = @XTMALLOC_ZERO_CFLAGS@
ac_ct_AR = @ac_ct_AR@
ac_ct_CC = @ac_ct_CC@ ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@ ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
ac_ct_F77 = @ac_ct_F77@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
am__include = @am__include@ am__include = @am__include@
am__leading_dot = @am__leading_dot@ am__leading_dot = @am__leading_dot@
am__quote = @am__quote@ am__quote = @am__quote@

20
lib/libdmx/src/dmx.c
View File

@ -76,7 +76,7 @@ static /* const */ XExtensionHooks dmx_extension_hooks = {
}; };
static XEXT_GENERATE_FIND_DISPLAY(find_display, dmx_extension_info, static XEXT_GENERATE_FIND_DISPLAY(find_display, dmx_extension_info,
(char *)dmx_extension_name, dmx_extension_name,
&dmx_extension_hooks, &dmx_extension_hooks,
0, NULL) 0, NULL)
@ -251,7 +251,7 @@ Bool DMXGetScreenAttributes(Display *dpy, int physical_screen,
_XReadPad(dpy, attr->displayName, rep.displayNameLength); _XReadPad(dpy, attr->displayName, rep.displayNameLength);
attr->displayName[rep.displayNameLength] = '\0'; attr->displayName[rep.displayNameLength] = '\0';
attr->logicalScreen = rep.logicalScreen; attr->logicalScreen = rep.logicalScreen;
attr->screenWindowWidth = rep.screenWindowWidth; attr->screenWindowWidth = rep.screenWindowWidth;
attr->screenWindowHeight = rep.screenWindowHeight; attr->screenWindowHeight = rep.screenWindowHeight;
attr->screenWindowXoffset = rep.screenWindowXoffset; attr->screenWindowXoffset = rep.screenWindowXoffset;
@ -293,7 +293,7 @@ static int _DMXDumpScreenAttributes(Display *dpy,
unsigned long value_list[32]; unsigned long value_list[32];
unsigned long *value = value_list; unsigned long *value = value_list;
int count = 0; int count = 0;
for (i = 0; i < 32; i++) { for (i = 0; i < 32; i++) {
if (mask & (1 << i)) { if (mask & (1 << i)) {
*value++ = _DMXGetScreenAttribute(i, attr); *value++ = _DMXGetScreenAttribute(i, attr);
@ -383,7 +383,7 @@ int DMXChangeScreensAttributes(Display *dpy,
if (i < mask_count) mask = masks[i]; if (i < mask_count) mask = masks[i];
req->length += _DMXDumpScreenAttributes(dpy, mask, attrs + i); req->length += _DMXDumpScreenAttributes(dpy, mask, attrs + i);
} }
if (!_XReply(dpy, (xReply *)&rep, 0, xFalse)) { if (!_XReply(dpy, (xReply *)&rep, 0, xFalse)) {
UnlockDisplay(dpy); UnlockDisplay(dpy);
SyncHandle(); SyncHandle();
@ -518,7 +518,7 @@ Bool DMXGetWindowAttributes(Display *dpy, Window window,
_XRead(dpy, (char *)windows, rep.screenCount * sizeof(*windows)); _XRead(dpy, (char *)windows, rep.screenCount * sizeof(*windows));
_XRead(dpy, (char *)pos, rep.screenCount * sizeof(*pos)); _XRead(dpy, (char *)pos, rep.screenCount * sizeof(*pos));
_XRead(dpy, (char *)vis, rep.screenCount * sizeof(*vis)); _XRead(dpy, (char *)vis, rep.screenCount * sizeof(*vis));
*screen_count = rep.screenCount; *screen_count = rep.screenCount;
for (current = 0; for (current = 0;
current < rep.screenCount && current < (unsigned)available_count; current < rep.screenCount && current < (unsigned)available_count;
@ -590,7 +590,7 @@ static int _DMXDumpDesktopAttributes(Display *dpy,
unsigned long value_list[32]; unsigned long value_list[32];
unsigned long *value = value_list; unsigned long *value = value_list;
int count = 0; int count = 0;
for (i = 0; i < 32; i++) { for (i = 0; i < 32; i++) {
if (mask & (1 << i)) { if (mask & (1 << i)) {
*value++ = _DMXGetDesktopAttribute(i, attr); *value++ = _DMXGetDesktopAttribute(i, attr);
@ -606,7 +606,7 @@ static int _DMXDumpDesktopAttributes(Display *dpy,
* Available in DMX Protocol Version 2.0 */ * Available in DMX Protocol Version 2.0 */
int DMXChangeDesktopAttributes(Display *dpy, int DMXChangeDesktopAttributes(Display *dpy,
unsigned int mask, unsigned int mask,
DMXDesktopAttributes *attr) DMXDesktopAttributes *attr)
{ {
XExtDisplayInfo *info = find_display(dpy); XExtDisplayInfo *info = find_display(dpy);
xDMXChangeDesktopAttributesReply rep; xDMXChangeDesktopAttributesReply rep;
@ -620,7 +620,7 @@ int DMXChangeDesktopAttributes(Display *dpy,
req->dmxReqType = X_DMXChangeDesktopAttributes; req->dmxReqType = X_DMXChangeDesktopAttributes;
req->valueMask = mask; req->valueMask = mask;
req->length +=_DMXDumpDesktopAttributes(dpy, mask, attr); req->length +=_DMXDumpDesktopAttributes(dpy, mask, attr);
if (!_XReply(dpy, (xReply *)&rep, 0, xFalse)) { if (!_XReply(dpy, (xReply *)&rep, 0, xFalse)) {
UnlockDisplay(dpy); UnlockDisplay(dpy);
SyncHandle(); SyncHandle();
@ -754,7 +754,7 @@ Bool DMXAddBackendInput(Display *dpy, int screen, int sendsCore, int *newId)
unsigned int mask = (DMXInputType unsigned int mask = (DMXInputType
| DMXInputPhysicalScreen | DMXInputPhysicalScreen
| DMXInputSendsCore); | DMXInputSendsCore);
attr.inputType = DMXBackendInputType; attr.inputType = DMXBackendInputType;
attr.physicalScreen = screen; attr.physicalScreen = screen;
attr.sendsCore = sendsCore; attr.sendsCore = sendsCore;
@ -769,7 +769,7 @@ Bool DMXAddConsoleInput(Display *dpy, const char *name, int sendsCore,
DMXInputAttributes attr; DMXInputAttributes attr;
unsigned int mask = (DMXInputType unsigned int mask = (DMXInputType
| DMXInputSendsCore); | DMXInputSendsCore);
attr.inputType = DMXConsoleInputType; attr.inputType = DMXConsoleInputType;
attr.physicalScreen = 0; attr.physicalScreen = 0;
attr.sendsCore = sendsCore; attr.sendsCore = sendsCore;