date:20101122

[PATCH:libX11] Mark atom names argument to XInternAtoms as const

2010-11-22 Thread Alan Coopersmith

Updates code  docs for XInternAtoms.

The single atom name argument to XInternAtom was already const char *
in the code, but not the docs, so updated it in the docs too.

Signed-off-by: Alan Coopersmith alan.coopersm...@oracle.com
---
 include/X11/Xlib.h|2 +-
 man/XInternAtom.man   |8 
 specs/libX11/CH04.xml |4 ++--
 src/IntAtom.c |4 ++--
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/include/X11/Xlib.h b/include/X11/Xlib.h
index 5c6c770..b0d7d4d 100644
--- a/include/X11/Xlib.h
+++ b/include/X11/Xlib.h
@@ -1548,7 +1548,7 @@ extern Atom XInternAtom(
 );
 extern Status XInternAtoms(
 Display*   /* dpy */,
-char** /* names */,
+_Xconst char** /* names */,
 int/* count */,
 Bool   /* onlyIfExists */,
 Atom*  /* atoms_return */
diff --git a/man/XInternAtom.man b/man/XInternAtom.man
index 237ed91..44aa68a 100644
--- a/man/XInternAtom.man
+++ b/man/XInternAtom.man
@@ -144,11 +144,11 @@
 XInternAtom, XInternAtoms, XGetAtomName, XGetAtomNames \- create or return 
atom names
 .SH SYNTAX
 .HP
-Atom XInternAtom\^(\^Display *\fIdisplay\fP\^, char *\fIatom_name\fP\^, Bool
-\fIonly_if_exists\fP\^); 
+Atom XInternAtom\^(\^Display *\fIdisplay\fP\^, const char *\fIatom_name\fP\^,
+Bool \fIonly_if_exists\fP\^);
 .HP
-Status XInternAtoms\^(\^Display *\fIdisplay\fP\^, char **\fInames\fP\^, int
-\fIcount\fP\^, Bool \fIonly_if_exists\fP\^, Atom *\fIatoms_return\fP\^); 
+Status XInternAtoms\^(\^Display *\fIdisplay\fP\^, const char **\fInames\fP\^,
+int \fIcount\fP\^, Bool \fIonly_if_exists\fP\^, Atom *\fIatoms_return\fP\^);
 .HP
 char *XGetAtomName\^(\^Display *\fIdisplay\fP\^, Atom \fIatom\fP\^); 
 .HP
diff --git a/specs/libX11/CH04.xml b/specs/libX11/CH04.xml
index 8a3e8c5..e2bca72 100644
--- a/specs/libX11/CH04.xml
+++ b/specs/libX11/CH04.xml
@@ -1054,7 +1054,7 @@ To return an atom for a given name, use
 funcprototype
   funcdefAtom functionXInternAtom/function/funcdef
   paramdefDisplayparameter *display/parameter/paramdef
-  paramdefcharparameter *atom_name/parameter/paramdef
+  paramdefconst charparameter *atom_name/parameter/paramdef
   paramdefBoolparameter only_if_exists/parameter/paramdef
 /funcprototype
 /funcsynopsis
@@ -1136,7 +1136,7 @@ To return atoms for an array of names, use
 funcprototype
   funcdefStatus functionXInternAtoms/function/funcdef
   paramdefDisplayparameter *display/parameter/paramdef
-  paramdefcharparameter **names/parameter/paramdef
+  paramdefconst charparameter **names/parameter/paramdef
   paramdefintparameter count/parameter/paramdef
   paramdefBoolparameter only_if_exists/parameter/paramdef
   paramdefAtomparameter *atoms_return/parameter/paramdef
diff --git a/src/IntAtom.c b/src/IntAtom.c
index 7a56258..80d78c0 100644
--- a/src/IntAtom.c
+++ b/src/IntAtom.c
@@ -190,7 +190,7 @@ XInternAtom (
 typedef struct {
 unsigned long start_seq;
 unsigned long stop_seq;
-char **names;
+const char **names;
 Atom *atoms;
 int count;
 Status status;
@@ -239,7 +239,7 @@ Bool _XIntAtomHandler(
 Status
 XInternAtoms (
 Display *dpy,
-char **names,
+const char **names,
 int count,
 Bool onlyIfExists,
 Atom *atoms_return)
-- 
1.7.3.2

___
xorg-devel@lists.x.org: X.Org development
Archives: http://lists.x.org/archives/xorg-devel
Info: http://lists.x.org/mailman/listinfo/xorg-devel

Where to free screen pixmap driver private?

2010-11-22 Thread fancy fang

Dear all,
   If I use driver pixmap, the screen pixmap also has an allocated
driver private. However, when xorg terminates, the driver DestroyPixmap can
not be executed. So, the screen pixmap driver private can not be freed. Is
this a bug? Can anyone explain it?  Thanks a lot!

Best wishes,
Fancy Fang
___
xorg-devel@lists.x.org: X.Org development
Archives: http://lists.x.org/archives/xorg-devel
Info: http://lists.x.org/mailman/listinfo/xorg-devel

Re: tiling support in EXA

2010-11-22 Thread fancy fang

Thanks a lot! This is very useful.

Best wishes,

Fancy

2010/10/20 Alex Deucher alexdeuc...@gmail.com

 On Tue, Oct 19, 2010 at 9:58 PM, fancy fang fancyfl...@gmail.com wrote:
  Hello, all
   CreatePixmap2 was added to ExaDriverRec for drivers with tiling
  support. I can not understand what the tiling means. Anyone can explain
 for
  me? Thanks a lot!

 Tiling is a method of laying out data in the framebuffer to maximize
 cache locality and memoy bandwidth.  See this post for a more detailed
 description:
 http://www.phoronix.com/forums/showpost.php?p=131301postcount=37

 Alex

 
  Best wishes,
 
  Fancy
 
  ___
  xorg-devel@lists.x.org: X.Org development
  Archives: http://lists.x.org/archives/xorg-devel
  Info: http://lists.x.org/mailman/listinfo/xorg-devel
 

___
xorg-devel@lists.x.org: X.Org development
Archives: http://lists.x.org/archives/xorg-devel
Info: http://lists.x.org/mailman/listinfo/xorg-devel

Re: [PATCH:libfontenc] Fail configure if zlib.h -lz not found

2010-11-22 Thread Dan Nicholson

On Sun, Nov 21, 2010 at 6:28 PM, Alan Coopersmith
alan.coopersm...@oracle.com wrote:
 Dan Nicholson wrote:
 On Sun, Nov 21, 2010 at 2:59 PM, Rémi Cardona r...@gentoo.org wrote:
 Le 20/11/2010 07:04, Alan Coopersmith a écrit :
  # zlib
 -
 -AC_CHECK_LIB(z, gzclose)
 +AC_CHECK_HEADER([zlib.h], [],
 +                AC_MSG_FAILURE([zlib.h is required to compile 
 libfontenc]))
 +AC_CHECK_LIB(z, gzclose, [],
 +             AC_MSG_FAILURE([zlib is required to compile libfontenc]))
 Any chance we could start using pkg-config to pick up zlib
 libs/includes? If memory serves, the .pc file was included upstream 2 or
 3 years ago.

 Yeah, looks like it's been there since 2006 in the 1.2.3.1 release.

 http://zlib.net/ChangeLog.txt

 I guess that's why I'd never noticed it, since we're still shipping 1.2.3.
 I'll poke our maintainers to update, and won't object if someone on a system
 that has the .pc file wants to work on that change for the next release.

Weird, Fedora 13 is still shipping 1.2.3, too. It's probably safest to
have the fallback for random old hosts anyway. Something like:

PKG_CHECK_MODULES([ZLIB], [zlib], [],
[AC_CHECK_HEADERS([zlib.h], [],
[AC_MSG_FAILURE([zlib.h is required to compile libfontenc])])
AC_CHECK_LIB(z, gzclose, [ZLIB_LIBS=-lz],
[AC_MSG_FAILURE([zlib.h is required to compile libfontenc])])])

--
Dan
___
xorg-devel@lists.x.org: X.Org development
Archives: http://lists.x.org/archives/xorg-devel
Info: http://lists.x.org/mailman/listinfo/xorg-devel

[PATCH RESEND app-xdm 0/9] Review xdm configuration - Part 4

2010-11-22 Thread Gaetan Nadon

This set reworks selinux, pam, arc4random and dev/random
consistently using pre-searched system libs in $LIBS.
Comment and relocate some config fragments.

Gaetan Nadon (9):
  config: isolating -lselinux to a single target is not required
  config: upgrade the checking for PAM support
  config: upgrade the checking for SELinux support
  config: integrate check for arc4random in appropriate sections
  config: rework check for random number generator
  config: comment libxtrans macros as they are order sensitive
  config: relocate AC_FUNC_FORK in section Check for system library
functions
  config: relocate key_setnet in section Check for header files
  config: use AM_V_GEN instead of customized macros for AM_SILENT_RULES

 Makefile.am|4 +-
 config/Makefile.am |2 +-
 configure.ac   |  129 ---
 cpprules.in|9 +---
 dm.c   |6 +-
 dm.h   |6 +-
 dm_auth.h  |2 +-
 genauth.c  |   12 ++--
 greet.h|6 +-
 greeter/Login.h|2 +-
 greeter/greet.c|   22 
 greeter/verify.c   |8 ++--
 resource.c |6 +-
 session.c  |   34 +++---
 14 files changed, 107 insertions(+), 141 deletions(-)

___
xorg-devel@lists.x.org: X.Org development
Archives: http://lists.x.org/archives/xorg-devel
Info: http://lists.x.org/mailman/listinfo/xorg-devel

[PATCH app-xdm 1/9] config: isolating -lselinux to a single target is not required

2010-11-22 Thread Gaetan Nadon

Due to previous patches, -lselinux, if installed on the configured system,
is included in $LIBS already.

Signed-off-by: Gaetan Nadon mems...@videotron.ca
---
 configure.ac |6 --
 1 files changed, 0 insertions(+), 6 deletions(-)

diff --git a/configure.ac b/configure.ac
index 80b936c..e2e15f6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -137,16 +137,12 @@ use_selinux_default=no
 AC_ARG_WITH(selinux, AC_HELP_STRING([--with-selinux],[Add support for 
selinux]),
[USE_SELINUX=$withval], [USE_SELINUX=$use_selinux_default])
 if test x$USE_SELINUX != xno ; then
-   old_LIBS=$LIBS
-   LIBS=
AC_SEARCH_LIBS(is_selinux_enabled,[selinux])
AC_CHECK_FUNC(is_selinux_enabled,
[AC_DEFINE(HAVE_SELINUX,1,[Add support for selinux])],
[if test x$USE_SELINUX != xtry ; then
AC_MSG_ERROR([selinux support requested, but 
is_selinux_enabled not found.])
 fi])
-   XDM_OS_LIBS=$XDM_OS_LIBS $LIBS
-   LIBS=$old_LIBS
 fi
 
 # FIXME: Find better test for which OS'es use su -m  - for now, just try to
@@ -306,8 +302,6 @@ AC_SUBST(SHELL_CMD)
 
 PKG_CHECK_MODULES(XDM, xmu x11 xau)
 
-XDM_LIBS=$XDM_LIBS $XDM_OS_LIBS
-
 PKG_CHECK_EXISTS(xinerama, [
AC_DEFINE([USE_XINERAMA], 1, 
[Define to 1 to use XINERAMA in greeter  chooser])
-- 
1.6.0.4

___
xorg-devel@lists.x.org: X.Org development
Archives: http://lists.x.org/archives/xorg-devel
Info: http://lists.x.org/mailman/listinfo/xorg-devel

[PATCH app-xdm 2/9] config: upgrade the checking for PAM support

2010-11-22 Thread Gaetan Nadon

Use AC_CHECK_FUNCS to get the consistent #define HAVE_xxx
Use auto rather than try for consistency with other modules.
Update help string to mention default value.
Unchanged: if configured --with-pam and -lpam is misisng,
abort the configuration.

Signed-off-by: Gaetan Nadon mems...@videotron.ca
---
 configure.ac |   20 ++--
 dm.h |4 ++--
 greet.h  |6 +++---
 greeter/Login.h  |2 +-
 greeter/greet.c  |   22 +++---
 greeter/verify.c |8 
 session.c|   22 +++---
 7 files changed, 42 insertions(+), 42 deletions(-)

diff --git a/configure.ac b/configure.ac
index e2e15f6..3e6bc01 100644
--- a/configure.ac
+++ b/configure.ac
@@ -119,17 +119,17 @@ AC_CHECK_DECL(key_setnet,
 #include rpc/key_prot.h
 ])
 
-# Check for PAM support
-use_pam_default=try
-AC_ARG_WITH(pam, AC_HELP_STRING([--with-pam],[Use PAM for authentication]),
-   [USE_PAM=$withval], [USE_PAM=$use_pam_default])
+# Check for pluggable authentication modules (PAM) support
+AC_ARG_WITH(pam, AS_HELP_STRING([--with-pam],
+   [Use PAM for authentication (default is autodected)]),
+   [USE_PAM=$withval], [USE_PAM=auto])
 if test x$USE_PAM != xno ; then
-   AC_SEARCH_LIBS(pam_open_session,[pam])
-   AC_CHECK_FUNC(pam_open_session, 
-   [AC_DEFINE(USE_PAM,1,[Use PAM for authentication])],
-   [if test x$USE_PAM != xtry ; then
-   AC_MSG_ERROR([PAM support requested, but 
pam_open_session not found.])
-fi])
+AC_SEARCH_LIBS([pam_open_session], [pam],
+   [AC_CHECK_FUNCS([pam_open_session])],
+   [AS_IF([test x$USE_PAM = xyes],
+   [AC_MSG_ERROR([PAM support requested, but pam_open_session not 
found.])]
+   )]
+)
 fi
 
 use_selinux_default=no
diff --git a/dm.h b/dm.h
index 6633248..7c67906 100644
--- a/dm.h
+++ b/dm.h
@@ -104,7 +104,7 @@ typedef union wait  waitType;
 #  endif
 # endif /* X_NOT_POSIX */
 
-# ifdef USE_PAM
+# ifdef HAVE_PAM_OPEN_SESSION
 #  include security/pam_appl.h
 # endif
 
@@ -421,7 +421,7 @@ extern void LoadSessionResources (struct display *d);
 extern void ReinitResources (void);
 
 /* in session.c */
-# ifdef USE_PAM
+# ifdef HAVE_PAM_OPEN_SESSION
 extern pam_handle_t **thepamhp(void);
 extern pam_handle_t *thepamh(void);
 # endif
diff --git a/greet.h b/greet.h
index 6b6689e..e5dbb01 100644
--- a/greet.h
+++ b/greet.h
@@ -85,7 +85,7 @@ struct dlfuncs {
 void (*_endpwent)(void);
 #endif
 char *(*_crypt)(CRYPT_ARGS);
-#ifdef USE_PAM
+#ifdef HAVE_PAM_OPEN_SESSION
 pam_handle_t **(*_thepamhp)(void);
 #endif
 };
@@ -169,7 +169,7 @@ extern  struct passwd   
*(*__xdm_getpwnam)(GETPWNAM_ARGS);
 extern  void(*__xdm_endpwent)(void);
 # endif
 extern char*(*__xdm_crypt)(CRYPT_ARGS);
-# ifdef USE_PAM
+# ifdef HAVE_PAM_OPEN_SESSION
 extern  pam_handle_t**(*__xdm_thepamhp)(void);
 # endif
 
@@ -211,7 +211,7 @@ extern  pam_handle_t**(*__xdm_thepamhp)(void);
 #  define  endpwent(*__xdm_endpwent)
 # endif
 # define   crypt   (*__xdm_crypt)
-# ifdef USE_PAM
+# ifdef HAVE_PAM_OPEN_SESSION
 #  define  thepamhp(*__xdm_thepamhp)
 # endif
 
diff --git a/greeter/Login.h b/greeter/Login.h
index 22529a5..01e79cb 100644
--- a/greeter/Login.h
+++ b/greeter/Login.h
@@ -155,7 +155,7 @@ from The Open Group.
 # include pwd.h
 # include limits.h
 
-# ifdef USE_PAM
+# ifdef HAVE_PAM_OPEN_SESSION
 #  define NAME_LEN PAM_MAX_RESP_SIZE
 #  define PASSWORD_LEN PAM_MAX_RESP_SIZE
 # endif
diff --git a/greeter/greet.c b/greeter/greet.c
index d8ebb41..8200417 100644
--- a/greeter/greet.c
+++ b/greeter/greet.c
@@ -130,7 +130,7 @@ struct passwd   *(*__xdm_getpwnam)(GETPWNAM_ARGS) = NULL;
 void   (*__xdm_endpwent)(void) = NULL;
 # endif
 char *(*__xdm_crypt)(CRYPT_ARGS) = NULL;
-# ifdef USE_PAM
+# ifdef HAVE_PAM_OPEN_SESSION
 pam_handle_t **(*__xdm_thepamhp)(void) = NULL;
 # endif
 
@@ -146,7 +146,7 @@ pam_handle_t **(*__xdm_thepamhp)(void) = NULL;
 extern Display *dpy;
 
 static int done, code;
-#ifndef USE_PAM
+#ifndef HAVE_PAM_OPEN_SESSION
 static charname[NAME_LEN], password[PASSWORD_LEN];
 #endif
 static Widget  toplevel;
@@ -154,7 +154,7 @@ static Widget   login;
 static XtAppContextcontext;
 static XtIntervalIdpingTimeout;
 
-#ifdef USE_PAM
+#ifdef HAVE_PAM_OPEN_SESSION
 static int pamconv(int num_msg,
 # ifndef sun
   const
@@ -200,7 +200,7 @@ GreetDone (
data-name, strlen (data-passwd));
 switch (status) {
 case NOTIFY_OK:
-#ifndef USE_PAM
+#ifndef HAVE_PAM_OPEN_SESSION
strncpy (name, data-name, sizeof(name));
name[sizeof(name)-1] = '\0';
strncpy (password, data-passwd, sizeof(password));
@@ -225,7 +225,7 @@ GreetDone (
done = 1;
break;
 }
-#ifndef USE_PAM
+#ifndef HAVE_PAM_OPEN_SESSION
 if (done) {
bzero (data-name, NAME_LEN);

[PATCH app-xdm 5/9] config: rework check for random number generator

2010-11-22 Thread Gaetan Nadon

Following a similar pattern to PAM and SELinux checks.
Unchanged: if a user has requested the use of a random device
and none can be found, the configuration aborts.

Signed-off-by: Gaetan Nadon mems...@videotron.ca
---
 configure.ac |   36 +++-
 1 files changed, 15 insertions(+), 21 deletions(-)

diff --git a/configure.ac b/configure.ac
index 03e6e53..4d9f198 100644
--- a/configure.ac
+++ b/configure.ac
@@ -171,28 +171,22 @@ case $host_os in
 esac
 AC_SUBST(SU)
 
-# Check for /dev/random or /dev/urandom
-AC_ARG_WITH(random-device, 
-   AC_HELP_STRING([--with-random-device\[=pathname\]],
-   [Use pathname as a source of randomness]),
-   RANDOM_DEVICE=$withval, RANDOM_DEVICE=try)
-
-if test x$RANDOM_DEVICE = xyes -o x$RANDOM_DEVICE = xtry ; then
-   AC_CHECK_FILE([/dev/urandom], [RANDOM_DEVICE=/dev/urandom],
-   AC_CHECK_FILE([/dev/random], [RANDOM_DEVICE=/dev/random]))
-   if test x$RANDOM_DEVICE = xyes ; then
-   AC_MSG_ERROR([random device support requested, but no random 
device was found.])
-   else 
-   if test x$RANDOM_DEVICE = xtry ; then
-   RANDOM_DEVICE=no
-   fi
-   fi
+# Define a configure option to locate a special file (/dev/random or 
/dev/urandom)
+# that serves as a random or a pseudorandom number generator
+AC_ARG_WITH(random-device, 
AS_HELP_STRING([--with-random-device\[=pathname\]],
+   [Use pathname as a source of randomness (default is auto-detected)]),
+   [USE_DEVICE=$withval], [USE_DEVICE=auto])
+if test x$USE_DEVICE != xno ; then
+AC_CHECK_FILE([/dev/urandom], [DEV_RANDOM=/dev/urandom],
+[AC_CHECK_FILE([/dev/random], [DEV_RANDOM=/dev/random],
+   [AS_IF([test x$USE_DEVICE = xyes],
+   [AC_MSG_ERROR([random device support requested, but no random 
device was found.])]
+   )]
+   )]
+)
 fi
-
-if test x$RANDOM_DEVICE != xno ; then
-   AC_DEFINE_UNQUOTED(DEV_RANDOM,$RANDOM_DEVICE,
-   [Define to device that provides random data source])
-   DEV_RANDOM=$RANDOM_DEVICE
+if test x$DEV_RANDOM != x ; then
+AC_DEFINE_UNQUOTED(DEV_RANDOM,$DEV_RANDOM, [Define to device that 
provides random data source])
 fi
 AC_SUBST(DEV_RANDOM)
 
-- 
1.6.0.4

___
xorg-devel@lists.x.org: X.Org development
Archives: http://lists.x.org/archives/xorg-devel
Info: http://lists.x.org/mailman/listinfo/xorg-devel

[PATCH app-xdm 6/9] config: comment libxtrans macros as they are order sensitive

2010-11-22 Thread Gaetan Nadon

XTRANS_SECURE_RPC_FLAGS must be called after XTRANS_CONNECTION_FLAGS
which finds libraries like -lsockect, -lnsl or -lws32_32.

The found libraries are pre-pended to $LIBS which is not obvious.

Signed-off-by: Gaetan Nadon mems...@videotron.ca
---
 configure.ac |4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/configure.ac b/configure.ac
index 4d9f198..70d5676 100644
--- a/configure.ac
+++ b/configure.ac
@@ -107,8 +107,10 @@ CHOOSER_CFLAGS=$CHOOSER_CFLAGS
 
 AC_FUNC_FORK
 
+# Find needed libraries for TCP sockets (pre-pended in $LIBS)
 XTRANS_CONNECTION_FLAGS
-dnl Sets $SECURE_RPC to yes or no
+
+# Sets $SECURE_RPC to yes or no using libraries found above from $LIBS
 XTRANS_SECURE_RPC_FLAGS
 AM_CONDITIONAL(HAS_SECURE_RPC, test x$SECURE_RPC = xyes)
 
-- 
1.6.0.4

___
xorg-devel@lists.x.org: X.Org development
Archives: http://lists.x.org/archives/xorg-devel
Info: http://lists.x.org/mailman/listinfo/xorg-devel

[PATCH app-xdm 7/9] config: relocate AC_FUNC_FORK in section Check for system library functions

2010-11-22 Thread Gaetan Nadon

No configuration changes.

Signed-off-by: Gaetan Nadon mems...@videotron.ca
---
 configure.ac |   10 ++
 1 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/configure.ac b/configure.ac
index 70d5676..59bc5ee 100644
--- a/configure.ac
+++ b/configure.ac
@@ -88,16 +88,12 @@ AC_CHECK_HEADERS([grp.h syslog.h sys/param.h])
 # Checks for typedefs, structures, and compiler characteristics.
 AC_TYPE_SIGNAL
 
-#--
-#  Check for system library functions
-#
+# Check for system library functions
 # Required system libraries have been searched for and are listed in $LIBS
-#--
+AC_FUNC_FORK
 AC_CHECK_FUNCS([daemon sigaction openlog asprintf setproctitle setusercontext \
 mkstemp getifaddrs getspnam arc4random])
 
-#--
-
 m4_ifdef([AM_SILENT_RULES],[HAVE_AM_SILENT_RULES=yes])
 AM_CONDITIONAL(HAVE_AM_SILENT_RULES, test x$HAVE_AM_SILENT_RULES != x)
 
@@ -105,8 +101,6 @@ XDM_CFLAGS=$XDM_CFLAGS
 GREETER_CFLAGS=$GREETER_CFLAGS
 CHOOSER_CFLAGS=$CHOOSER_CFLAGS
 
-AC_FUNC_FORK
-
 # Find needed libraries for TCP sockets (pre-pended in $LIBS)
 XTRANS_CONNECTION_FLAGS
 
-- 
1.6.0.4

___
xorg-devel@lists.x.org: X.Org development
Archives: http://lists.x.org/archives/xorg-devel
Info: http://lists.x.org/mailman/listinfo/xorg-devel

[PATCH app-xdm 8/9] config: relocate key_setnet in section Check for header files

2010-11-22 Thread Gaetan Nadon

No configuration changes

Signed-off-by: Gaetan Nadon mems...@videotron.ca
---
 configure.ac |   16 +++-
 1 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/configure.ac b/configure.ac
index 59bc5ee..7781034 100644
--- a/configure.ac
+++ b/configure.ac
@@ -84,6 +84,13 @@ AC_SEARCH_LIBS(crypt, crypt)
 
 # Checks for header files.
 AC_CHECK_HEADERS([grp.h syslog.h sys/param.h])
+AC_CHECK_DECL(key_setnet,
+   AC_DEFINE(HAVE_DECL_KEY_SETNET,1,
+[Define to 1 if your headers define the key_setnet() function.]),
+   [],[
+#include rpc/rpc.h
+#include rpc/key_prot.h
+])
 
 # Checks for typedefs, structures, and compiler characteristics.
 AC_TYPE_SIGNAL
@@ -108,15 +115,6 @@ XTRANS_CONNECTION_FLAGS
 XTRANS_SECURE_RPC_FLAGS
 AM_CONDITIONAL(HAS_SECURE_RPC, test x$SECURE_RPC = xyes)
 
-dnl Is key_setnet defined in a header file?
-AC_CHECK_DECL(key_setnet, 
-   AC_DEFINE(HAVE_DECL_KEY_SETNET,1,
-[Define to 1 if your headers define the key_setnet() function.]),
-   [],[
-#include rpc/rpc.h
-#include rpc/key_prot.h
-])
-
 # Check for pluggable authentication modules (PAM) support
 AC_ARG_WITH(pam, AS_HELP_STRING([--with-pam],
[Use PAM for authentication (default is autodected)]),
-- 
1.6.0.4

___
xorg-devel@lists.x.org: X.Org development
Archives: http://lists.x.org/archives/xorg-devel
Info: http://lists.x.org/mailman/listinfo/xorg-devel

[PATCH app-xdm 9/9] config: use AM_V_GEN instead of customized macros for AM_SILENT_RULES

2010-11-22 Thread Gaetan Nadon

Signed-off-by: Gaetan Nadon mems...@videotron.ca
---
 config/Makefile.am |2 +-
 configure.ac   |3 ---
 cpprules.in|9 +
 3 files changed, 2 insertions(+), 12 deletions(-)

diff --git a/config/Makefile.am b/config/Makefile.am
index d13645f..30e22ea 100644
--- a/config/Makefile.am
+++ b/config/Makefile.am
@@ -59,4 +59,4 @@ CPP_FILES_FLAGS = -DBINDIR=$(bindir) 
-DDEFAULTVT=$(DEFAULTVT) \
 -DSHELL_CMD=$(SHELL_CMD) $(MKTEMP_DEFINES)
 
 Xservers.ws: $(srcdir)/Xservers.ws.cpp
-   $(cpp_verbose)$(RAWCPP) $(RAWCPPFLAGS) $(CPP_FILES_FLAGS)  
$(srcdir)/Xservers.ws.cpp | $(CPP_SED_MAGIC)  $@
+   $(AM_V_GEN)$(RAWCPP) $(RAWCPPFLAGS) $(CPP_FILES_FLAGS)  
$(srcdir)/Xservers.ws.cpp | $(CPP_SED_MAGIC)  $@
diff --git a/configure.ac b/configure.ac
index 7781034..66ea73a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -101,9 +101,6 @@ AC_FUNC_FORK
 AC_CHECK_FUNCS([daemon sigaction openlog asprintf setproctitle setusercontext \
 mkstemp getifaddrs getspnam arc4random])
 
-m4_ifdef([AM_SILENT_RULES],[HAVE_AM_SILENT_RULES=yes])
-AM_CONDITIONAL(HAVE_AM_SILENT_RULES, test x$HAVE_AM_SILENT_RULES != x)
-
 XDM_CFLAGS=$XDM_CFLAGS
 GREETER_CFLAGS=$GREETER_CFLAGS
 CHOOSER_CFLAGS=$CHOOSER_CFLAGS
diff --git a/cpprules.in b/cpprules.in
index eb7ef5e..c6daca3 100644
--- a/cpprules.in
+++ b/cpprules.in
@@ -22,12 +22,5 @@ CPP_SED_MAGIC = $(SED) -e '/^\#  *[0-9][0-9]*  *.*$$/d' \
-e '/^[ ]*XHASH/s/XHASH/\#/' \
-e '/\...@\@$$/s/\...@\@$$/\\/'
 
-if HAVE_AM_SILENT_RULES
-# Support for automake 1.11 AM_SILENT_RULES
-cpp_verbose = $(cpp_verbose_$(V))
-cpp_verbose_ = $(cpp_verbose_$(AM_DEFAULT_VERBOSITY))
-cpp_verbose_0 = @echo   CPP$@;
-endif HAVE_AM_SILENT_RULES
-
 .cpp:
-   $(cpp_verbose)$(RAWCPP) $(RAWCPPFLAGS) $(CPP_FILES_FLAGS)  $ | 
$(CPP_SED_MAGIC)  $@
+   $(AM_V_GEN)$(RAWCPP) $(RAWCPPFLAGS) $(CPP_FILES_FLAGS)  $ | 
$(CPP_SED_MAGIC)  $@
-- 
1.6.0.4

___
xorg-devel@lists.x.org: X.Org development
Archives: http://lists.x.org/archives/xorg-devel
Info: http://lists.x.org/mailman/listinfo/xorg-devel

[PATCH app-xdm 00/16] Review xdm configuration - Part 5

2010-11-22 Thread Gaetan Nadon

This series refactors common header files in an include directory
and moves each target in its own directory.

Gaetan Nadon (7):
  config: move man pages into their own directory
  config: move chooser into its own directory
  config: move xdmshell into its own directory
  config: move common headers into the include directory
  config: mv xdm in its own directory
  config: move appdefault makefile to app-defaults dir.
  config: AM_PROG_CC_C_O is no longer needed

 .gitignore   |2 -
 Makefile.am  |  143 +++---
 app-defaults/Makefile.am |1 +
 chooser/.gitignore   |1 +
 chooser/Makefile.am  |   16 
 chooser.c = chooser/chooser.c   |0
 configure.ac |   12 +++-
 greeter/Makefile.am  |3 +-
 include/Makefile.am  |6 ++
 dm.h = include/dm.h |0
 dm_auth.h = include/dm_auth.h   |0
 dm_error.h = include/dm_error.h |0
 dm_socket.h = include/dm_socket.h   |0
 greet.h = include/greet.h   |0
 man/Makefile.am  |   55 +
 xdm.man.cpp = man/xdm.man   |0
 xdmshell.man.cpp = man/xdmshell.man |0
 xdm/.gitignore   |1 +
 xdm/Makefile.am  |   79 +++
 access.c = xdm/access.c |0
 auth.c = xdm/auth.c |0
 choose.c = xdm/choose.c |0
 daemon.c = xdm/daemon.c |0
 dm.c = xdm/dm.c |0
 dpylist.c = xdm/dpylist.c   |0
 error.c = xdm/error.c   |0
 file.c = xdm/file.c |0
 genauth.c = xdm/genauth.c   |0
 krb5auth.c = xdm/krb5auth.c |0
 mitauth.c = xdm/mitauth.c   |0
 netaddr.c = xdm/netaddr.c   |0
 policy.c = xdm/policy.c |0
 prngc.c = xdm/prngc.c   |0
 protodpy.c = xdm/protodpy.c |0
 reset.c = xdm/reset.c   |0
 resource.c = xdm/resource.c |0
 rpcauth.c = xdm/rpcauth.c   |0
 server.c = xdm/server.c |0
 session.c = xdm/session.c   |0
 socket.c = xdm/socket.c |0
 streams.c = xdm/streams.c   |0
 util.c = xdm/util.c |0
 xdmauth.c = xdm/xdmauth.c   |0
 xdmcp.c = xdm/xdmcp.c   |0
 xdmshell/.gitignore  |1 +
 xdmshell/Makefile.am |   23 ++
 xdmshell.c = xdmshell/xdmshell.c|0
 47 files changed, 205 insertions(+), 138 deletions(-)
 create mode 100644 app-defaults/Makefile.am
 create mode 100644 chooser/.gitignore
 create mode 100644 chooser/Makefile.am
 rename chooser.c = chooser/chooser.c (100%)
 create mode 100644 include/Makefile.am
 rename dm.h = include/dm.h (100%)
 rename dm_auth.h = include/dm_auth.h (100%)
 rename dm_error.h = include/dm_error.h (100%)
 rename dm_socket.h = include/dm_socket.h (100%)
 rename greet.h = include/greet.h (100%)
 create mode 100644 man/Makefile.am
 rename xdm.man.cpp = man/xdm.man (100%)
 rename xdmshell.man.cpp = man/xdmshell.man (100%)
 create mode 100644 xdm/.gitignore
 create mode 100644 xdm/Makefile.am
 rename access.c = xdm/access.c (100%)
 rename auth.c = xdm/auth.c (100%)
 rename choose.c = xdm/choose.c (100%)
 rename daemon.c = xdm/daemon.c (100%)
 rename dm.c = xdm/dm.c (100%)
 rename dpylist.c = xdm/dpylist.c (100%)
 rename error.c = xdm/error.c (100%)
 rename file.c = xdm/file.c (100%)
 rename genauth.c = xdm/genauth.c (100%)
 rename krb5auth.c = xdm/krb5auth.c (100%)
 rename mitauth.c = xdm/mitauth.c (100%)
 rename netaddr.c = xdm/netaddr.c (100%)
 rename policy.c = xdm/policy.c (100%)
 rename prngc.c = xdm/prngc.c (100%)
 rename protodpy.c = xdm/protodpy.c (100%)
 rename reset.c = xdm/reset.c (100%)
 rename resource.c = xdm/resource.c (100%)
 rename rpcauth.c = xdm/rpcauth.c (100%)
 rename server.c = xdm/server.c (100%)
 rename session.c = xdm/session.c (100%)
 rename socket.c = xdm/socket.c (100%)
 rename streams.c = xdm/streams.c (100%)
 rename util.c = xdm/util.c (100%)
 rename xdmauth.c = xdm/xdmauth.c (100%)
 rename xdmcp.c = xdm/xdmcp.c (100%)
 create mode 100644 xdmshell/.gitignore
 create mode 100644 xdmshell/Makefile.am
 rename xdmshell.c = xdmshell/xdmshell.c (100%)

___
xorg-devel@lists.x.org: X.Org development
Archives: http://lists.x.org/archives/xorg-devel
Info: http://lists.x.org/mailman/listinfo/xorg-devel

[PATCH app-xdm 1/5] config: move man pages into their own directory

2010-11-22 Thread Gaetan Nadon

Replace lowercase $(xdmlibdir) with $(XXDMLIBDIR)

Signed-off-by: Gaetan Nadon mems...@videotron.ca
---
 Makefile.am  |   37 ++-
 configure.ac |6 +++-
 man/Makefile.am  |   55 ++
 xdm.man.cpp = man/xdm.man   |0
 xdmshell.man.cpp = man/xdmshell.man |0
 5 files changed, 63 insertions(+), 35 deletions(-)
 create mode 100644 man/Makefile.am
 rename xdm.man.cpp = man/xdm.man (100%)
 rename xdmshell.man.cpp = man/xdmshell.man (100%)

diff --git a/Makefile.am b/Makefile.am
index b5c6859..de77c8b 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -19,20 +19,15 @@
 #  TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 #  PERFORMANCE OF THIS SOFTWARE.
 
-SUBDIRS = config greeter
+SUBDIRS = config greeter man
 
 bin_PROGRAMS = xdm
 noinst_PROGRAMS =
 
-appman_PRE = xdm.man.cpp
-noinst_man_PRE =
-
 if INSTALL_XDMSHELL
 bin_PROGRAMS += xdmshell
-appman_PRE += xdmshell.man.cpp
 else
 noinst_PROGRAMS += xdmshell
-noinst_man_PRE += xdmshell.man.cpp
 endif
 
 xdmlibdir = $(XDMLIBDIR)
@@ -97,34 +92,6 @@ xdm_SOURCES += krb5auth.c
 endif
 
 #
-#  xdm man page 
-#
-
-appmandir = $(APP_MAN_DIR)
-appman_DATA = $(appman_PRE:man.c...@app_man_suffix@)
-noinst_DATA = $(noinst_man_PRE:man.c...@app_man_suffix@)
-
-MAINTAINERCLEANFILES = ChangeLog INSTALL
-CLEANFILES = $(appman_DATA) $(noinst_DATA)
-EXTRA_DIST = $(appman_PRE) $(noinst_man_PRE)
-SUFFIXES   = .$(APP_MAN_SUFFIX) .man.cpp
-
-MAN_SUBSTS +=  -e 's|CHOOSERPATH|$(xdmlibdir)/chooser|g' \
-   -e 's|XDMLOGDIR|$(XDMLOGDIR)|g' \
-   -e 's|XDMDIR|$(XDMCONFIGDIR)|g' \
-   -e 's|BINDIR|$(bindir)|g' \
-   -e 's|XDMPIDDIR|$(XDMPIDDIR)|g' \
-   -e 's|XDMXAUTHDIR|$(XDMXAUTHDIR)|g' \
-   -e 's|DEF_USER_PATH|$(DEF_USER_PATH)|g' \
-   -e 's|DEF_SYSTEM_PATH|$(DEF_SYSTEM_PATH)|g' \
-   -e 's|DEF_GREETER_LIB|$(DEF_GREETER_LIB)|g' \
-   -e 's|DEV_RANDOM|$(DEV_RANDOM)|g' \
-   -e 's|ARC4_RANDOM|$(HAVE_ARC4RANDOM)|g'
-
-.man.cpp.$(APP_MAN_SUFFIX):
-   $(AM_V_GEN)$(SED) $(MAN_SUBSTS)  $  $@
-
-#
 #  xdmshell
 #
 xdmshell_CFLAGS = $(XDMSHELL_CFLAGS) -DBINDIR=\$(bindir)\
@@ -161,6 +128,8 @@ lint:
(cd greeter  $(MAKE) $(AM_MAKEFLAGS) lint)
 endif LINT
 
+MAINTAINERCLEANFILES = ChangeLog INSTALL
+
 .PHONY: ChangeLog INSTALL
 
 INSTALL:
diff --git a/configure.ac b/configure.ac
index 66ea73a..e94ee98 100644
--- a/configure.ac
+++ b/configure.ac
@@ -536,4 +536,8 @@ AC_SUBST(appdefaultdir)
 
 AC_SUBST(MKTEMP_COMMAND)
 
-AC_OUTPUT([Makefile config/Makefile greeter/Makefile])
+AC_CONFIG_FILES([Makefile
+   config/Makefile
+   greeter/Makefile
+   man/Makefile])
+AC_OUTPUT
diff --git a/man/Makefile.am b/man/Makefile.am
new file mode 100644
index 000..b71409c
--- /dev/null
+++ b/man/Makefile.am
@@ -0,0 +1,55 @@
+#
+# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+#
+# Permission is hereby granted, free of charge, to any person obtaining a
+# copy of this software and associated documentation files (the Software),
+# to deal in the Software without restriction, including without limitation
+# the rights to use, copy, modify, merge, publish, distribute, sublicense,
+# and/or sell copies of the Software, and to permit persons to whom the
+# Software is furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice (including the next
+# paragraph) shall be included in all copies or substantial portions of the
+# Software.
+#
+# THE SOFTWARE IS PROVIDED AS IS, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+# DEALINGS IN THE SOFTWARE.
+#
+
+appmandir = $(APP_MAN_DIR)
+appman_PRE = xdm.man
+appman_DATA = $(appman_PRE:man=$(APP_MAN_SUFFIX))
+
+xdmlmandir = $(APP_MAN_DIR)
+xdmlman_PRE = xdmshell.man
+
+if INSTALL_XDMSHELL
+xdmlman_DATA = $(xdmlman_PRE:man=$(APP_MAN_SUFFIX))
+else
+noinst_DATA = $(xdmlman_PRE:man=$(APP_MAN_SUFFIX))
+endif
+
+EXTRA_DIST = $(appman_PRE) $(xdmlman_PRE)
+CLEANFILES = $(appman_DATA) $(xdmlman_DATA) $(noinst_DATA)
+SUFFIXES = .$(APP_MAN_SUFFIX) .man
+
+# String replacements in MAN_SUBSTS now come from xorg-macros.m4 via configure
+MAN_SUBSTS +=  -e 's|CHOOSERPATH|$(XDMLIBDIR)/chooser|g' \
+   -e 's|XDMLOGDIR|$(XDMLOGDIR)|g' \
+   -e 's|XDMDIR|$(XDMCONFIGDIR)|g' \
+   -e 's|BINDIR|$(bindir)|g' \
+   -e 's|XDMPIDDIR|$(XDMPIDDIR)|g' \
+   -e 's|XDMXAUTHDIR|$(XDMXAUTHDIR)|g' \
+

[PATCH app-xdm 2/5] config: move chooser into its own directory

2010-11-22 Thread Gaetan Nadon

Prevents the use of per target flags.
Clearly shows which libraries and compiler options apply.

Signed-off-by: Gaetan Nadon mems...@videotron.ca
---
 .gitignore |1 -
 Makefile.am|   23 +--
 chooser/.gitignore |1 +
 chooser/Makefile.am|   16 
 chooser.c = chooser/chooser.c |0
 configure.ac   |1 +
 6 files changed, 23 insertions(+), 19 deletions(-)
 create mode 100644 chooser/.gitignore
 create mode 100644 chooser/Makefile.am
 rename chooser.c = chooser/chooser.c (100%)

diff --git a/.gitignore b/.gitignore
index 380859f..dfb5a53 100644
--- a/.gitignore
+++ b/.gitignore
@@ -76,6 +76,5 @@ core
 #  Edit the following section as needed
 # For example, !report.pc overrides *.pc. See 'man gitignore'
 # 
-chooser
 xdm
 xdmshell
diff --git a/Makefile.am b/Makefile.am
index de77c8b..7b0796d 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,6 +1,6 @@
-# 
+#
 #  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
@@ -10,7 +10,7 @@
 #  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
@@ -19,7 +19,7 @@
 #  TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 #  PERFORMANCE OF THIS SOFTWARE.
 
-SUBDIRS = config greeter man
+SUBDIRS = chooser config greeter man
 
 bin_PROGRAMS = xdm
 noinst_PROGRAMS =
@@ -30,9 +30,6 @@ else
 noinst_PROGRAMS += xdmshell
 endif
 
-xdmlibdir = $(XDMLIBDIR)
-xdmlib_PROGRAMS = chooser
-
 AM_CFLAGS = $(CWARNFLAGS)
 
 #
@@ -100,16 +97,6 @@ xdmshell_CFLAGS = $(XDMSHELL_CFLAGS) 
-DBINDIR=\$(bindir)\
 xdmshell_SOURCES = \
 xdmshell.c
 
-#
-#  chooser
-#
-
-chooser_CFLAGS = $(CHOOSER_CFLAGS)
-chooser_LDADD = $(CHOOSER_LIBS)
-
-chooser_SOURCES =  \
-   chooser.c
-
 # App default files
 
 # This ensures distcheck is performed in a location where user has write access
@@ -124,8 +111,8 @@ ALL_LINT_FLAGS=$(LINT_FLAGS) $(DEFS) $(DEFAULT_INCLUDES) 
$(INCLUDES) \
 lint:
$(LINT) $(ALL_LINT_FLAGS) $(xdm_CFLAGS) $(xdm_SOURCES) $(xdm_LIBS)
$(LINT) $(ALL_LINT_FLAGS) $(xdmshell_CFLAGS) $(xdmshell_SOURCES)
-   $(LINT) $(ALL_LINT_FLAGS) $(chooser_CFLAGS) $(chooser_SOURCES) 
$(chooser_LDADD)
(cd greeter  $(MAKE) $(AM_MAKEFLAGS) lint)
+   (cd chooser  $(MAKE) $(AM_MAKEFLAGS) lint)
 endif LINT
 
 MAINTAINERCLEANFILES = ChangeLog INSTALL
diff --git a/chooser/.gitignore b/chooser/.gitignore
new file mode 100644
index 000..8abd804
--- /dev/null
+++ b/chooser/.gitignore
@@ -0,0 +1 @@
+chooser
diff --git a/chooser/Makefile.am b/chooser/Makefile.am
new file mode 100644
index 000..8374bbe
--- /dev/null
+++ b/chooser/Makefile.am
@@ -0,0 +1,16 @@
+xdmlibdir = $(XDMLIBDIR)
+xdmlib_PROGRAMS = chooser
+
+AM_CPPFLAGS = -I$(top_srcdir)
+AM_CFLAGS = $(CWARNFLAGS) $(CHOOSER_CFLAGS)
+AM_LDFLAGS = $(CHOOSER_LIBS)
+
+chooser_SOURCES = chooser.c
+
+if LINT
+ALL_LINT_FLAGS=$(LINT_FLAGS) $(DEFS) $(DEFAULT_INCLUDES) \
+   $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS)
+
+lint:
+   $(LINT) $(ALL_LINT_FLAGS) $(chooser_SOURCES) $(AM_LDFLAGS)
+endif LINT
diff --git a/chooser.c b/chooser/chooser.c
similarity index 100%
rename from chooser.c
rename to chooser/chooser.c
diff --git a/configure.ac b/configure.ac
index e94ee98..c185d3a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -537,6 +537,7 @@ AC_SUBST(appdefaultdir)
 AC_SUBST(MKTEMP_COMMAND)
 
 AC_CONFIG_FILES([Makefile
+   chooser/Makefile
config/Makefile
greeter/Makefile
man/Makefile])
-- 
1.6.0.4

___
xorg-devel@lists.x.org: X.Org development
Archives: http://lists.x.org/archives/xorg-devel
Info: http://lists.x.org/mailman/listinfo/xorg-devel

[PATCH app-xdm 3/5] config: move xdmshell into its own directory

2010-11-22 Thread Gaetan Nadon

Prevents the use of per target flags.
Clearly shows which libraries and compiler options apply.

Signed-off-by: Gaetan Nadon mems...@videotron.ca
---
 .gitignore|1 -
 Makefile.am   |   21 ++---
 configure.ac  |3 ++-
 xdmshell/.gitignore   |1 +
 xdmshell/Makefile.am  |   23 +++
 xdmshell.c = xdmshell/xdmshell.c |0
 6 files changed, 28 insertions(+), 21 deletions(-)
 create mode 100644 xdmshell/.gitignore
 create mode 100644 xdmshell/Makefile.am
 rename xdmshell.c = xdmshell/xdmshell.c (100%)

diff --git a/.gitignore b/.gitignore
index dfb5a53..38a8090 100644
--- a/.gitignore
+++ b/.gitignore
@@ -77,4 +77,3 @@ core
 # For example, !report.pc overrides *.pc. See 'man gitignore'
 # 
 xdm
-xdmshell
diff --git a/Makefile.am b/Makefile.am
index 7b0796d..42c58d1 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -19,17 +19,9 @@
 #  TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 #  PERFORMANCE OF THIS SOFTWARE.
 
-SUBDIRS = chooser config greeter man
+SUBDIRS = chooser config greeter man xdmshell
 
 bin_PROGRAMS = xdm
-noinst_PROGRAMS =
-
-if INSTALL_XDMSHELL
-bin_PROGRAMS += xdmshell
-else
-noinst_PROGRAMS += xdmshell
-endif
-
 AM_CFLAGS = $(CWARNFLAGS)
 
 #
@@ -88,15 +80,6 @@ if HAS_KERBEROS_FIVE
 xdm_SOURCES += krb5auth.c
 endif
 
-#
-#  xdmshell
-#
-xdmshell_CFLAGS = $(XDMSHELL_CFLAGS) -DBINDIR=\$(bindir)\
-
-
-xdmshell_SOURCES = \
-xdmshell.c
-
 # App default files
 
 # This ensures distcheck is performed in a location where user has write access
@@ -110,7 +93,7 @@ ALL_LINT_FLAGS=$(LINT_FLAGS) $(DEFS) $(DEFAULT_INCLUDES) 
$(INCLUDES) \
 
 lint:
$(LINT) $(ALL_LINT_FLAGS) $(xdm_CFLAGS) $(xdm_SOURCES) $(xdm_LIBS)
-   $(LINT) $(ALL_LINT_FLAGS) $(xdmshell_CFLAGS) $(xdmshell_SOURCES)
+   (cd xdmshell  $(MAKE) $(AM_MAKEFLAGS) lint)
(cd greeter  $(MAKE) $(AM_MAKEFLAGS) lint)
(cd chooser  $(MAKE) $(AM_MAKEFLAGS) lint)
 endif LINT
diff --git a/configure.ac b/configure.ac
index c185d3a..e3ac7a4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -540,5 +540,6 @@ AC_CONFIG_FILES([Makefile
chooser/Makefile
config/Makefile
greeter/Makefile
-   man/Makefile])
+   man/Makefile
+   xdmshell/Makefile])
 AC_OUTPUT
diff --git a/xdmshell/.gitignore b/xdmshell/.gitignore
new file mode 100644
index 000..9a70585
--- /dev/null
+++ b/xdmshell/.gitignore
@@ -0,0 +1 @@
+xdmshell
diff --git a/xdmshell/Makefile.am b/xdmshell/Makefile.am
new file mode 100644
index 000..137d74a
--- /dev/null
+++ b/xdmshell/Makefile.am
@@ -0,0 +1,23 @@
+
+if INSTALL_XDMSHELL
+bin_PROGRAMS = xdmshell
+else
+noinst_PROGRAMS = xdmshell
+endif
+
+AM_CPPFLAGS = -I$(top_srcdir)
+AM_CFLAGS =\
+   $(CWARNFLAGS)   \
+   $(XDMSHELL_CFLAGS)  \
+   -DBINDIR=\$(bindir)\
+
+xdmshell_SOURCES = xdmshell.c
+
+if LINT
+ALL_LINT_FLAGS=$(LINT_FLAGS) $(DEFS) $(DEFAULT_INCLUDES) \
+   $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS)
+
+lint:
+   $(LINT) $(ALL_LINT_FLAGS) $(xdmshell_SOURCES)
+endif LINT
+
diff --git a/xdmshell.c b/xdmshell/xdmshell.c
similarity index 100%
rename from xdmshell.c
rename to xdmshell/xdmshell.c
-- 
1.6.0.4

___
xorg-devel@lists.x.org: X.Org development
Archives: http://lists.x.org/archives/xorg-devel
Info: http://lists.x.org/mailman/listinfo/xorg-devel

[PATCH app-xdm 5/5] config: mv xdm in its own directory

2010-11-22 Thread Gaetan Nadon

Prevents the use of per target flags.
Clearly shows which libraries and compiler options apply.

Signed-off-by: Gaetan Nadon mems...@videotron.ca
---
 .gitignore   |5 +--
 Makefile.am  |   60 +--
 configure.ac |1 +
 xdm/.gitignore   |1 +
 xdm/Makefile.am  |   79 ++
 access.c = xdm/access.c |0
 auth.c = xdm/auth.c |0
 choose.c = xdm/choose.c |0
 daemon.c = xdm/daemon.c |0
 dm.c = xdm/dm.c |0
 dpylist.c = xdm/dpylist.c   |0
 error.c = xdm/error.c   |0
 file.c = xdm/file.c |0
 genauth.c = xdm/genauth.c   |0
 krb5auth.c = xdm/krb5auth.c |0
 mitauth.c = xdm/mitauth.c   |0
 netaddr.c = xdm/netaddr.c   |0
 policy.c = xdm/policy.c |0
 prngc.c = xdm/prngc.c   |0
 protodpy.c = xdm/protodpy.c |0
 reset.c = xdm/reset.c   |0
 resource.c = xdm/resource.c |0
 rpcauth.c = xdm/rpcauth.c   |0
 server.c = xdm/server.c |0
 session.c = xdm/session.c   |0
 socket.c = xdm/socket.c |0
 streams.c = xdm/streams.c   |0
 util.c = xdm/util.c |0
 xdmauth.c = xdm/xdmauth.c   |0
 xdmcp.c = xdm/xdmcp.c   |0
 30 files changed, 85 insertions(+), 61 deletions(-)
 create mode 100644 xdm/.gitignore
 create mode 100644 xdm/Makefile.am
 rename access.c = xdm/access.c (100%)
 rename auth.c = xdm/auth.c (100%)
 rename choose.c = xdm/choose.c (100%)
 rename daemon.c = xdm/daemon.c (100%)
 rename dm.c = xdm/dm.c (100%)
 rename dpylist.c = xdm/dpylist.c (100%)
 rename error.c = xdm/error.c (100%)
 rename file.c = xdm/file.c (100%)
 rename genauth.c = xdm/genauth.c (100%)
 rename krb5auth.c = xdm/krb5auth.c (100%)
 rename mitauth.c = xdm/mitauth.c (100%)
 rename netaddr.c = xdm/netaddr.c (100%)
 rename policy.c = xdm/policy.c (100%)
 rename prngc.c = xdm/prngc.c (100%)
 rename protodpy.c = xdm/protodpy.c (100%)
 rename reset.c = xdm/reset.c (100%)
 rename resource.c = xdm/resource.c (100%)
 rename rpcauth.c = xdm/rpcauth.c (100%)
 rename server.c = xdm/server.c (100%)
 rename session.c = xdm/session.c (100%)
 rename socket.c = xdm/socket.c (100%)
 rename streams.c = xdm/streams.c (100%)
 rename util.c = xdm/util.c (100%)
 rename xdmauth.c = xdm/xdmauth.c (100%)
 rename xdmcp.c = xdm/xdmcp.c (100%)

diff --git a/.gitignore b/.gitignore
index 38a8090..fbf6b92 100644
--- a/.gitignore
+++ b/.gitignore
@@ -71,9 +71,8 @@ core
 *.tar.bz2
 *.tar.gz
 #
-#  Add  Override patterns for xdm 
+#  Add  Override patterns for xdm
 #
 #  Edit the following section as needed
 # For example, !report.pc overrides *.pc. See 'man gitignore'
-# 
-xdm
+#
diff --git a/Makefile.am b/Makefile.am
index c750ea5..90fc161 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -19,64 +19,7 @@
 #  TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 #  PERFORMANCE OF THIS SOFTWARE.
 
-SUBDIRS = chooser config greeter include man xdmshell
-
-bin_PROGRAMS = xdm
-AM_CPPFLAGS = -I$(top_srcdir)/include
-AM_CFLAGS = $(CWARNFLAGS)
-
-#
-# xdm
-#
-
-xdm_CFLAGS = $(XDM_CFLAGS)
-# The xdm binary needs to export symbols so that they can be used from
-# libXdmGreet.so loaded through a dlopen call from session.c
-xdm_LDFLAGS =  -export-dynamic
-xdm_LDADD = $(XDM_LIBS)
-
-xdm_SOURCES =  \
-auth.c \
-daemon.c \
-server.c \
-dpylist.c \
-dm.c \
-error.c \
-file.c \
-netaddr.c \
-reset.c \
-resource.c \
-protodpy.c \
-policy.c \
-session.c \
-socket.c \
-streams.c \
-util.c \
-xdmcp.c \
-mitauth.c \
-genauth.c \
-access.c \
-choose.c
-
-if HAS_XDM_AUTH
-xdm_CFLAGS +=  -DHASXDMAUTH
-xdm_SOURCES += xdmauth.c
-endif
-
-if !HAVE_ARC4RANDOM
-xdm_SOURCES += prngc.c
-endif
-
-if HAS_SECURE_RPC
-xdm_CFLAGS += -DSECURE_RPC
-xdm_SOURCES += rpcauth.c
-endif
-
-if HAS_KERBEROS_FIVE
-xdm_SOURCES += krb5auth.c
-endif
-
-# App default files
+SUBDIRS = chooser config greeter include man xdm xdmshell
 
 # This ensures distcheck is performed in a location where user has write access
 DISTCHECK_CONFIGURE_FLAGS = --with-appdefaultdir=\$${datadir}/X11/app-defaults
@@ -89,6 +32,7 @@ ALL_LINT_FLAGS=$(LINT_FLAGS) $(DEFS) $(DEFAULT_INCLUDES) 
$(INCLUDES) \
 
 lint:
$(LINT) $(ALL_LINT_FLAGS) $(xdm_CFLAGS) $(xdm_SOURCES) $(xdm_LIBS)
+   (cd xdm  $(MAKE) $(AM_MAKEFLAGS) lint)
(cd xdmshell  $(MAKE) $(AM_MAKEFLAGS) lint)
(cd greeter  $(MAKE) $(AM_MAKEFLAGS) lint)
(cd chooser  $(MAKE) $(AM_MAKEFLAGS) lint)
diff --git a/configure.ac b/configure.ac
index a690ff7..dd90d51 100644
--- a/configure.ac
+++ b/configure.ac
@@ -542,5 +542,6 @@ AC_CONFIG_FILES([Makefile
greeter/Makefile
include/Makefile
man/Makefile
+

[PATCH app-xdm 6/7] config: move appdefault makefile to app-defaults dir.

2010-11-22 Thread Gaetan Nadon

For this package it is best not to break the pattern
of each directory having its own makefile.

Signed-off-by: Gaetan Nadon mems...@videotron.ca
---
 Makefile.am  |8 +++-
 app-defaults/Makefile.am |1 +
 configure.ac |1 +
 3 files changed, 5 insertions(+), 5 deletions(-)
 create mode 100644 app-defaults/Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 90fc161..0bd7ca9 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -19,13 +19,13 @@
 #  TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 #  PERFORMANCE OF THIS SOFTWARE.
 
-SUBDIRS = chooser config greeter include man xdm xdmshell
+SUBDIRS = app-defaults chooser config greeter include man xdm xdmshell
+
+ACLOCAL_AMFLAGS = -I m4
 
 # This ensures distcheck is performed in a location where user has write access
 DISTCHECK_CONFIGURE_FLAGS = --with-appdefaultdir=\$${datadir}/X11/app-defaults
 
-dist_appdefault_DATA = app-defaults/Chooser
-
 if LINT
 ALL_LINT_FLAGS=$(LINT_FLAGS) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
$(AM_CPPFLAGS) $(CPPFLAGS)
@@ -49,5 +49,3 @@ ChangeLog:
$(CHANGELOG_CMD)
 
 dist-hook: ChangeLog INSTALL
-
-ACLOCAL_AMFLAGS = -I m4
diff --git a/app-defaults/Makefile.am b/app-defaults/Makefile.am
new file mode 100644
index 000..3f93873
--- /dev/null
+++ b/app-defaults/Makefile.am
@@ -0,0 +1 @@
+dist_appdefault_DATA = Chooser
diff --git a/configure.ac b/configure.ac
index dd90d51..41220d1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -537,6 +537,7 @@ AC_SUBST(appdefaultdir)
 AC_SUBST(MKTEMP_COMMAND)
 
 AC_CONFIG_FILES([Makefile
+   app-defaults/Makefile
chooser/Makefile
config/Makefile
greeter/Makefile
-- 
1.6.0.4

___
xorg-devel@lists.x.org: X.Org development
Archives: http://lists.x.org/archives/xorg-devel
Info: http://lists.x.org/mailman/listinfo/xorg-devel

[PATCH app-xdm 7/7] config: AM_PROG_CC_C_O is no longer needed

2010-11-22 Thread Gaetan Nadon

All per-target flags have been removed now that each target
sits in its own directory.

Signed-off-by: Gaetan Nadon mems...@videotron.ca
---
 configure.ac |1 -
 1 files changed, 0 insertions(+), 1 deletions(-)

diff --git a/configure.ac b/configure.ac
index 41220d1..8b90cb6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -32,7 +32,6 @@ AC_CONFIG_HEADERS(config.h)
 # Initialize Automake
 AM_INIT_AUTOMAKE([foreign dist-bzip2])
 AM_MAINTAINER_MODE
-AM_PROG_CC_C_O
 
 # Initialize libtool
 AC_DISABLE_STATIC
-- 
1.6.0.4

___
xorg-devel@lists.x.org: X.Org development
Archives: http://lists.x.org/archives/xorg-devel
Info: http://lists.x.org/mailman/listinfo/xorg-devel

Re: [PATCH RESEND app-xdm 0/9] Review xdm configuration - Part 4

2010-11-22 Thread Mikhail Gusarov


Twas brillig at 10:32:10 22.11.2010 UTC-05 when mems...@videotron.ca did gyre 
and gimble:

 GN This set reworks selinux, pam, arc4random and dev/random
 GN consistently using pre-searched system libs in $LIBS.  Comment and
 GN relocate some config fragments.

For the series: Reviewed-by: Mikhail Gusarov dotted...@dottedmag.net

-- 
  http://fossarchy.blogspot.com/


pgpwHQklLOShP.pgp
Description: PGP signature
___
xorg-devel@lists.x.org: X.Org development
Archives: http://lists.x.org/archives/xorg-devel
Info: http://lists.x.org/mailman/listinfo/xorg-devel

Re: [PATCH] test: compare byte padding macros against the expected bytes.

2010-11-22 Thread Julien Cristau

On Fri, Nov 19, 2010 at 11:26:13 +1000, Peter Hutterer wrote:

 We calculate the expected bytes for each value, let's use it.
 
 Signed-off-by: Peter Hutterer peter.hutte...@who-t.net
 ---
  test/input.c |3 +++
  1 files changed, 3 insertions(+), 0 deletions(-)
 
Reviewed-by: Julien Cristau jcris...@debian.org

Cheers,
Julien
___
xorg-devel@lists.x.org: X.Org development
Archives: http://lists.x.org/archives/xorg-devel
Info: http://lists.x.org/mailman/listinfo/xorg-devel

Re: [PATCH] test: reduce range of byte-padding macro tests.

2010-11-22 Thread Julien Cristau

On Fri, Nov 19, 2010 at 11:38:03 +1000, Peter Hutterer wrote:

 Byte padding and conversion is interesting for the rage of 0-8 bytes, and
 then interesting towards the end of the valid range (INT_MAX - 7 and INT_MAX
 - 3).
 
 Signed-off-by: Peter Hutterer peter.hutte...@who-t.net
 ---
 This significantly speeds up make check and I figured if the byte padding
 goes wrong somewhere at bit 18271, we have other problems…
 
  test/input.c |   71 
 --
  1 files changed, 54 insertions(+), 17 deletions(-)
 
 diff --git a/test/input.c b/test/input.c
 index 13a441e..4ccfaff 100644
 --- a/test/input.c
 +++ b/test/input.c
 @@ -683,45 +683,82 @@ static void dix_grab_matching(void)
  g_assert(rc == TRUE);
  }
  
 -static void include_byte_padding_macros(void)
 +static void test_bits_to_byte(int i)
  {
 -int i;
 -g_test_message(Testing bits_to_bytes());
 -
 -/* the macros don't provide overflow protection */
 -for (i = 0; i  INT_MAX - 7; i++)
 -{
  int expected_bytes;
  expected_bytes = (i + 7)/8;
  
  g_assert(bits_to_bytes(i) = i/8);
  g_assert((bits_to_bytes(i) * 8) - i = 7);
  g_assert(expected_bytes == bits_to_bytes(i));
 -}
 +}
  
 -g_test_message(Testing bytes_to_int32());
 -for (i = 0; i  INT_MAX - 3; i++)
 -{
 +static void test_bytes_to_int32(int i)
 +{
  int expected_4byte;
  expected_4byte = (i + 3)/4;
  
  g_assert(bytes_to_int32(i) = i);
  g_assert((bytes_to_int32(i) * 4) - i = 3);
  g_assert(expected_4byte == bytes_to_int32(i));
 -}
 -
 -g_test_message(Testing pad_to_int32);
 +}
  
 -for (i = 0; i  INT_MAX - 3; i++)
 -{
 +static void test_pad_to_int32(int i)
 +{
  int expected_bytes;
  expected_bytes = ((i + 3)/4) * 4;
  
  g_assert(pad_to_int32(i) = i);
  g_assert(pad_to_int32(i) - i = 3);
  g_assert(expected_bytes == pad_to_int32(i));
 -}
 +}
 +static void include_byte_padding_macros(void)
 +{
 +g_test_message(Testing bits_to_bytes());
 +
 +/* the macros don't provide overflow protection */
 +test_bits_to_byte(0);
 +test_bits_to_byte(1);
 +test_bits_to_byte(2);
 +test_bits_to_byte(7);
 +test_bits_to_byte(8);
 +test_bits_to_byte(0xFF);
 +test_bits_to_byte(0x100);
 +test_bits_to_byte(INT_MAX - 9);
 +test_bits_to_byte(INT_MAX - 8);
 +
 +g_test_message(Testing bytes_to_int32());
 +
 +test_bytes_to_int32(0);
 +test_bytes_to_int32(1);
 +test_bytes_to_int32(2);
 +test_bytes_to_int32(7);
 +test_bytes_to_int32(8);
 +test_bytes_to_int32(0xFF);
 +test_bytes_to_int32(0x100);
 +test_bytes_to_int32(0x);
 +test_bytes_to_int32(0x1);
 +test_bytes_to_int32(0xFF);
 +test_bytes_to_int32(0x100);
 +test_bytes_to_int32(INT_MAX - 4);
 +test_bytes_to_int32(INT_MAX - 3);
 +
This changes the max for bytes_to_int32 from INT_MAX - 4 to INT_MAX - 3?
Should still work, but might be worth mentioning in the commit message.

 +g_test_message(Testing pad_to_int32);
  
 +test_pad_to_int32(0);
 +test_pad_to_int32(0);
 +test_pad_to_int32(1);
 +test_pad_to_int32(2);
 +test_pad_to_int32(7);
 +test_pad_to_int32(8);
 +test_pad_to_int32(0xFF);
 +test_pad_to_int32(0x100);
 +test_pad_to_int32(0x);
 +test_pad_to_int32(0x1);
 +test_pad_to_int32(0xFF);
 +test_pad_to_int32(0x100);
 +test_pad_to_int32(INT_MAX - 4);
 +test_pad_to_int32(INT_MAX - 3);

Same here.

  }
  
  static void xi_unregister_handlers(void)

Other than that,
Reviewed-by: Julien Cristau jcris...@debian.org

Cheers,
Julien
___
xorg-devel@lists.x.org: X.Org development
Archives: http://lists.x.org/archives/xorg-devel
Info: http://lists.x.org/mailman/listinfo/xorg-devel

Re: [PATCH app-xdm 2/9] config: upgrade the checking for PAM support

2010-11-22 Thread Alan Coopersmith

Gaetan Nadon wrote:
 + [Use PAM for authentication (default is autodected)]),

s/autodected/autodetected/

 -# ifdef USE_PAM
 +# ifdef HAVE_PAM_OPEN_SESSION

USE_PAM really does seem more descriptive in this case than
HAVE_PAM_OPEN_SESSION though, since it's the whole framework
we care about (and a build-time option to disable), not just
the presence of one function.

-- 
-Alan Coopersmith-alan.coopersm...@oracle.com
 Oracle Solaris Platform Engineering: X Window System

___
xorg-devel@lists.x.org: X.Org development
Archives: http://lists.x.org/archives/xorg-devel
Info: http://lists.x.org/mailman/listinfo/xorg-devel

Re: [PATCH app-xdm 4/9] config: integrate check for arc4random in appropriate sections

2010-11-22 Thread Alan Coopersmith

Gaetan Nadon wrote:
 The AC_SEARCH_LIBS is done in Check for libraries section.
 Move AC_SUBST and AM_CONDITIONAL over there as well.
 Move AC_CHECK_FUNCS for arc4random to library functions section
 No function change.
 
 Signed-off-by: Gaetan Nadon mems...@videotron.ca

Reviewed-by: Alan Coopersmith alan.coopersm...@oracle.com

-- 
-Alan Coopersmith-alan.coopersm...@oracle.com
 Oracle Solaris Platform Engineering: X Window System

___
xorg-devel@lists.x.org: X.Org development
Archives: http://lists.x.org/archives/xorg-devel
Info: http://lists.x.org/mailman/listinfo/xorg-devel

Re: [PATCH app-xdm 5/9] config: rework check for random number generator

2010-11-22 Thread Alan Coopersmith

Gaetan Nadon wrote:
 Following a similar pattern to PAM and SELinux checks.
 Unchanged: if a user has requested the use of a random device
 and none can be found, the configuration aborts.
 
 Signed-off-by: Gaetan Nadon mems...@videotron.ca
 ---
  configure.ac |   36 +++-
  1 files changed, 15 insertions(+), 21 deletions(-)
 
 diff --git a/configure.ac b/configure.ac
 index 03e6e53..4d9f198 100644
 --- a/configure.ac
 +++ b/configure.ac
 @@ -171,28 +171,22 @@ case $host_os in
  esac
  AC_SUBST(SU)
  
 -# Check for /dev/random or /dev/urandom
 -AC_ARG_WITH(random-device, 
 - AC_HELP_STRING([--with-random-device\[=pathname\]],
 - [Use pathname as a source of randomness]),
 - RANDOM_DEVICE=$withval, RANDOM_DEVICE=try)
 -
 -if test x$RANDOM_DEVICE = xyes -o x$RANDOM_DEVICE = xtry ; then
 - AC_CHECK_FILE([/dev/urandom], [RANDOM_DEVICE=/dev/urandom],
 - AC_CHECK_FILE([/dev/random], [RANDOM_DEVICE=/dev/random]))
 - if test x$RANDOM_DEVICE = xyes ; then
 - AC_MSG_ERROR([random device support requested, but no random 
 device was found.])
 - else 
 - if test x$RANDOM_DEVICE = xtry ; then
 - RANDOM_DEVICE=no
 - fi
 - fi
 +# Define a configure option to locate a special file (/dev/random or 
 /dev/urandom)
 +# that serves as a random or a pseudorandom number generator
 +AC_ARG_WITH(random-device, 
 AS_HELP_STRING([--with-random-device\[=pathname\]],
 + [Use pathname as a source of randomness (default is auto-detected)]),
 + [USE_DEVICE=$withval], [USE_DEVICE=auto])
 +if test x$USE_DEVICE != xno ; then
 +AC_CHECK_FILE([/dev/urandom], [DEV_RANDOM=/dev/urandom],
 +[AC_CHECK_FILE([/dev/random], [DEV_RANDOM=/dev/random],
 + [AS_IF([test x$USE_DEVICE = xyes],
 + [AC_MSG_ERROR([random device support requested, but no random 
 device was found.])]
 + )]
 + )]
 +)
  fi
 -
 -if test x$RANDOM_DEVICE != xno ; then
 - AC_DEFINE_UNQUOTED(DEV_RANDOM,$RANDOM_DEVICE,
 - [Define to device that provides random data source])
 - DEV_RANDOM=$RANDOM_DEVICE
 +if test x$DEV_RANDOM != x ; then
 +AC_DEFINE_UNQUOTED(DEV_RANDOM,$DEV_RANDOM, [Define to device that 
 provides random data source])
  fi
  AC_SUBST(DEV_RANDOM)
  

Am I missing something or does this never set DEV_RANDOM to the
--with-random-device argument if it's set to a specific device name?

-- 
-Alan Coopersmith-alan.coopersm...@oracle.com
 Oracle Solaris Platform Engineering: X Window System

___
xorg-devel@lists.x.org: X.Org development
Archives: http://lists.x.org/archives/xorg-devel
Info: http://lists.x.org/mailman/listinfo/xorg-devel

Re: [PATCH app-xdm 7/9] config: relocate AC_FUNC_FORK in section Check for system library functions

2010-11-22 Thread Alan Coopersmith

Gaetan Nadon wrote:
 No configuration changes.
 
 Signed-off-by: Gaetan Nadon mems...@videotron.ca
 ---
  configure.ac |   10 ++
  1 files changed, 2 insertions(+), 8 deletions(-)
 
 diff --git a/configure.ac b/configure.ac
 index 70d5676..59bc5ee 100644
 --- a/configure.ac
 +++ b/configure.ac
 @@ -88,16 +88,12 @@ AC_CHECK_HEADERS([grp.h syslog.h sys/param.h])
  # Checks for typedefs, structures, and compiler characteristics.
  AC_TYPE_SIGNAL
  
 -#--
 -#Check for system library functions
 -#
 +# Check for system library functions
  # Required system libraries have been searched for and are listed in $LIBS
 -#--
 +AC_FUNC_FORK
  AC_CHECK_FUNCS([daemon sigaction openlog asprintf setproctitle 
 setusercontext \
  mkstemp getifaddrs getspnam arc4random])
  
 -#--
 -
  m4_ifdef([AM_SILENT_RULES],[HAVE_AM_SILENT_RULES=yes])
  AM_CONDITIONAL(HAVE_AM_SILENT_RULES, test x$HAVE_AM_SILENT_RULES != x)
  
 @@ -105,8 +101,6 @@ XDM_CFLAGS=$XDM_CFLAGS
  GREETER_CFLAGS=$GREETER_CFLAGS
  CHOOSER_CFLAGS=$CHOOSER_CFLAGS
  
 -AC_FUNC_FORK
 -
  # Find needed libraries for TCP sockets (pre-pended in $LIBS)
  XTRANS_CONNECTION_FLAGS
  

Reviewed-by: Alan Coopersmith alan.coopersm...@oracle.com

-- 
-Alan Coopersmith-alan.coopersm...@oracle.com
 Oracle Solaris Platform Engineering: X Window System

___
xorg-devel@lists.x.org: X.Org development
Archives: http://lists.x.org/archives/xorg-devel
Info: http://lists.x.org/mailman/listinfo/xorg-devel

Re: [PATCH app-xdm 6/9] config: comment libxtrans macros as they are order sensitive

2010-11-22 Thread Alan Coopersmith

Gaetan Nadon wrote:
 XTRANS_SECURE_RPC_FLAGS must be called after XTRANS_CONNECTION_FLAGS
 which finds libraries like -lsockect, -lnsl or -lws32_32.

s/-lsockect/-lsocket/

 The found libraries are pre-pended to $LIBS which is not obvious.
 
 Signed-off-by: Gaetan Nadon mems...@videotron.ca
 ---
  configure.ac |4 +++-
  1 files changed, 3 insertions(+), 1 deletions(-)
 
 diff --git a/configure.ac b/configure.ac
 index 4d9f198..70d5676 100644
 --- a/configure.ac
 +++ b/configure.ac
 @@ -107,8 +107,10 @@ CHOOSER_CFLAGS=$CHOOSER_CFLAGS
  
  AC_FUNC_FORK
  
 +# Find needed libraries for TCP sockets (pre-pended in $LIBS)
  XTRANS_CONNECTION_FLAGS
 -dnl Sets $SECURE_RPC to yes or no
 +
 +# Sets $SECURE_RPC to yes or no using libraries found above from $LIBS
  XTRANS_SECURE_RPC_FLAGS
  AM_CONDITIONAL(HAS_SECURE_RPC, test x$SECURE_RPC = xyes)
  

Reviewed-by: Alan Coopersmith alan.coopersm...@oracle.com

-- 
-Alan Coopersmith-alan.coopersm...@oracle.com
 Oracle Solaris Platform Engineering: X Window System

___
xorg-devel@lists.x.org: X.Org development
Archives: http://lists.x.org/archives/xorg-devel
Info: http://lists.x.org/mailman/listinfo/xorg-devel

Re: [PATCH app-xdm 9/9] config: use AM_V_GEN instead of customized macros for AM_SILENT_RULES

2010-11-22 Thread Alan Coopersmith

Gaetan Nadon wrote:
 Signed-off-by: Gaetan Nadon mems...@videotron.ca
 ---
  config/Makefile.am |2 +-
  configure.ac   |3 ---
  cpprules.in|9 +
  3 files changed, 2 insertions(+), 12 deletions(-)
 
 diff --git a/config/Makefile.am b/config/Makefile.am
 index d13645f..30e22ea 100644
 --- a/config/Makefile.am
 +++ b/config/Makefile.am
 @@ -59,4 +59,4 @@ CPP_FILES_FLAGS = -DBINDIR=$(bindir) 
 -DDEFAULTVT=$(DEFAULTVT) \
  -DSHELL_CMD=$(SHELL_CMD) $(MKTEMP_DEFINES)
  
  Xservers.ws: $(srcdir)/Xservers.ws.cpp
 - $(cpp_verbose)$(RAWCPP) $(RAWCPPFLAGS) $(CPP_FILES_FLAGS)  
 $(srcdir)/Xservers.ws.cpp | $(CPP_SED_MAGIC)  $@
 + $(AM_V_GEN)$(RAWCPP) $(RAWCPPFLAGS) $(CPP_FILES_FLAGS)  
 $(srcdir)/Xservers.ws.cpp | $(CPP_SED_MAGIC)  $@
 diff --git a/configure.ac b/configure.ac
 index 7781034..66ea73a 100644
 --- a/configure.ac
 +++ b/configure.ac
 @@ -101,9 +101,6 @@ AC_FUNC_FORK
  AC_CHECK_FUNCS([daemon sigaction openlog asprintf setproctitle 
 setusercontext \
  mkstemp getifaddrs getspnam arc4random])
  
 -m4_ifdef([AM_SILENT_RULES],[HAVE_AM_SILENT_RULES=yes])
 -AM_CONDITIONAL(HAVE_AM_SILENT_RULES, test x$HAVE_AM_SILENT_RULES != x)
 -
  XDM_CFLAGS=$XDM_CFLAGS
  GREETER_CFLAGS=$GREETER_CFLAGS
  CHOOSER_CFLAGS=$CHOOSER_CFLAGS
 diff --git a/cpprules.in b/cpprules.in
 index eb7ef5e..c6daca3 100644
 --- a/cpprules.in
 +++ b/cpprules.in
 @@ -22,12 +22,5 @@ CPP_SED_MAGIC = $(SED) -e '/^\#  *[0-9][0-9]*  *.*$$/d' \
 -e '/^[ ]*XHASH/s/XHASH/\#/' \
 -e '/\...@\@$$/s/\...@\@$$/\\/'
  
 -if HAVE_AM_SILENT_RULES
 -# Support for automake 1.11 AM_SILENT_RULES
 -cpp_verbose = $(cpp_verbose_$(V))
 -cpp_verbose_ = $(cpp_verbose_$(AM_DEFAULT_VERBOSITY))
 -cpp_verbose_0 = @echo   CPP$@;
 -endif HAVE_AM_SILENT_RULES
 -
  .cpp:
 - $(cpp_verbose)$(RAWCPP) $(RAWCPPFLAGS) $(CPP_FILES_FLAGS)  $ | 
 $(CPP_SED_MAGIC)  $@
 + $(AM_V_GEN)$(RAWCPP) $(RAWCPPFLAGS) $(CPP_FILES_FLAGS)  $ | 
 $(CPP_SED_MAGIC)  $@

Reviewed-by: Alan Coopersmith alan.coopersm...@oracle.com

-- 
-Alan Coopersmith-alan.coopersm...@oracle.com
 Oracle Solaris Platform Engineering: X Window System

___
xorg-devel@lists.x.org: X.Org development
Archives: http://lists.x.org/archives/xorg-devel
Info: http://lists.x.org/mailman/listinfo/xorg-devel

Re: [PATCH app-xdm 2/5] config: move chooser into its own directory

2010-11-22 Thread Alan Coopersmith

Gaetan Nadon wrote:
 Prevents the use of per target flags.
 Clearly shows which libraries and compiler options apply.
 
 Signed-off-by: Gaetan Nadon mems...@videotron.ca
 ---
  .gitignore |1 -
  Makefile.am|   23 +--
  chooser/.gitignore |1 +
  chooser/Makefile.am|   16 
  chooser.c = chooser/chooser.c |0
  configure.ac   |1 +
  6 files changed, 23 insertions(+), 19 deletions(-)
  create mode 100644 chooser/.gitignore
  create mode 100644 chooser/Makefile.am
  rename chooser.c = chooser/chooser.c (100%)
 
 diff --git a/.gitignore b/.gitignore
 index 380859f..dfb5a53 100644
 --- a/.gitignore
 +++ b/.gitignore
 @@ -76,6 +76,5 @@ core
  #Edit the following section as needed
  # For example, !report.pc overrides *.pc. See 'man gitignore'
  # 
 -chooser
  xdm
  xdmshell
 diff --git a/Makefile.am b/Makefile.am
 index de77c8b..7b0796d 100644
 --- a/Makefile.am
 +++ b/Makefile.am
 @@ -1,6 +1,6 @@
 -# 
 +#
  #  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
 @@ -10,7 +10,7 @@
  #  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
 @@ -19,7 +19,7 @@
  #  TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
  #  PERFORMANCE OF THIS SOFTWARE.
  
 -SUBDIRS = config greeter man
 +SUBDIRS = chooser config greeter man
  
  bin_PROGRAMS = xdm
  noinst_PROGRAMS =
 @@ -30,9 +30,6 @@ else
  noinst_PROGRAMS += xdmshell
  endif
  
 -xdmlibdir = $(XDMLIBDIR)
 -xdmlib_PROGRAMS = chooser
 -
  AM_CFLAGS = $(CWARNFLAGS)
  
  #
 @@ -100,16 +97,6 @@ xdmshell_CFLAGS = $(XDMSHELL_CFLAGS) 
 -DBINDIR=\$(bindir)\
  xdmshell_SOURCES =   \
  xdmshell.c
  
 -#
 -#  chooser
 -#
 -
 -chooser_CFLAGS = $(CHOOSER_CFLAGS)
 -chooser_LDADD = $(CHOOSER_LIBS)
 -
 -chooser_SOURCES =\
 - chooser.c
 -
  # App default files
  
  # This ensures distcheck is performed in a location where user has write 
 access
 @@ -124,8 +111,8 @@ ALL_LINT_FLAGS=$(LINT_FLAGS) $(DEFS) $(DEFAULT_INCLUDES) 
 $(INCLUDES) \
  lint:
   $(LINT) $(ALL_LINT_FLAGS) $(xdm_CFLAGS) $(xdm_SOURCES) $(xdm_LIBS)
   $(LINT) $(ALL_LINT_FLAGS) $(xdmshell_CFLAGS) $(xdmshell_SOURCES)
 - $(LINT) $(ALL_LINT_FLAGS) $(chooser_CFLAGS) $(chooser_SOURCES) 
 $(chooser_LDADD)
   (cd greeter  $(MAKE) $(AM_MAKEFLAGS) lint)
 + (cd chooser  $(MAKE) $(AM_MAKEFLAGS) lint)
  endif LINT
  
  MAINTAINERCLEANFILES = ChangeLog INSTALL
 diff --git a/chooser/.gitignore b/chooser/.gitignore
 new file mode 100644
 index 000..8abd804
 --- /dev/null
 +++ b/chooser/.gitignore
 @@ -0,0 +1 @@
 +chooser
 diff --git a/chooser/Makefile.am b/chooser/Makefile.am
 new file mode 100644
 index 000..8374bbe
 --- /dev/null
 +++ b/chooser/Makefile.am
 @@ -0,0 +1,16 @@
 +xdmlibdir = $(XDMLIBDIR)
 +xdmlib_PROGRAMS = chooser
 +
 +AM_CPPFLAGS = -I$(top_srcdir)
 +AM_CFLAGS = $(CWARNFLAGS) $(CHOOSER_CFLAGS)
 +AM_LDFLAGS = $(CHOOSER_LIBS)
 +
 +chooser_SOURCES = chooser.c
 +
 +if LINT
 +ALL_LINT_FLAGS=$(LINT_FLAGS) $(DEFS) $(DEFAULT_INCLUDES) \
 + $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS)
 +
 +lint:
 + $(LINT) $(ALL_LINT_FLAGS) $(chooser_SOURCES) $(AM_LDFLAGS)
 +endif LINT
 diff --git a/chooser.c b/chooser/chooser.c
 similarity index 100%
 rename from chooser.c
 rename to chooser/chooser.c
 diff --git a/configure.ac b/configure.ac
 index e94ee98..c185d3a 100644
 --- a/configure.ac
 +++ b/configure.ac
 @@ -537,6 +537,7 @@ AC_SUBST(appdefaultdir)
  AC_SUBST(MKTEMP_COMMAND)
  
  AC_CONFIG_FILES([Makefile
 + chooser/Makefile
   config/Makefile
   greeter/Makefile
   man/Makefile])

Reviewed-by: Alan Coopersmith alan.coopersm...@oracle.com

-- 
-Alan Coopersmith-alan.coopersm...@oracle.com
 Oracle Solaris Platform Engineering: X Window System

___
xorg-devel@lists.x.org: X.Org development
Archives: http://lists.x.org/archives/xorg-devel
Info: http://lists.x.org/mailman/listinfo/xorg-devel

Re: [PATCH app-xdm 3/5] config: move xdmshell into its own directory

2010-11-22 Thread Alan Coopersmith

Gaetan Nadon wrote:
 Prevents the use of per target flags.
 Clearly shows which libraries and compiler options apply.
 
 Signed-off-by: Gaetan Nadon mems...@videotron.ca

Reviewed-by: Alan Coopersmith alan.coopersm...@oracle.com

-- 
-Alan Coopersmith-alan.coopersm...@oracle.com
 Oracle Solaris Platform Engineering: X Window System

___
xorg-devel@lists.x.org: X.Org development
Archives: http://lists.x.org/archives/xorg-devel
Info: http://lists.x.org/mailman/listinfo/xorg-devel

Re: [PATCH app-xdm 4/5] config: move common headers into the include directory

2010-11-22 Thread Alan Coopersmith

Gaetan Nadon wrote:
 They provide interfaces to multiple executables
 
 Signed-off-by: Gaetan Nadon mems...@videotron.ca
 ---
  Makefile.am|   10 +++---
  chooser/Makefile.am|2 +-
  configure.ac   |1 +
  greeter/Makefile.am|3 ++-
  include/Makefile.am|6 ++
  dm.h = include/dm.h   |0
  dm_auth.h = include/dm_auth.h |0
  dm_error.h = include/dm_error.h   |0
  dm_socket.h = include/dm_socket.h |0
  greet.h = include/greet.h |0
  xdmshell/Makefile.am   |2 +-
  11 files changed, 14 insertions(+), 10 deletions(-)
  create mode 100644 include/Makefile.am
  rename dm.h = include/dm.h (100%)
  rename dm_auth.h = include/dm_auth.h (100%)
  rename dm_error.h = include/dm_error.h (100%)
  rename dm_socket.h = include/dm_socket.h (100%)
  rename greet.h = include/greet.h (100%)

Reviewed-by: Alan Coopersmith alan.coopersm...@oracle.com

-- 
-Alan Coopersmith-alan.coopersm...@oracle.com
 Oracle Solaris Platform Engineering: X Window System

___
xorg-devel@lists.x.org: X.Org development
Archives: http://lists.x.org/archives/xorg-devel
Info: http://lists.x.org/mailman/listinfo/xorg-devel

Re: [PATCH xserver (rev2) 1/9] Create/Destroy/Trigger/Reset Fence Sync objects

2010-11-22 Thread Adam Jackson

Reviewed-by: Adam Jackson a...@redhat.com

for the series.

- ajax


signature.asc
Description: This is a digitally signed message part
___
xorg-devel@lists.x.org: X.Org development
Archives: http://lists.x.org/archives/xorg-devel
Info: http://lists.x.org/mailman/listinfo/xorg-devel

xinput/evdev switch events+state

2010-11-22 Thread Rafi Rubin

-BEGIN PGP SIGNED MESSAGE-
Hash: SHA1

Some tablets (such as dell and hp) report hinge rotation as EV_SW events.  Does
it make sense to handle events and state in the X evdev driver and xinput?

Rafi
-BEGIN PGP SIGNATURE-
Version: GnuPG v1.4.10 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/

iQIcBAEBAgAGBQJM6rwdAAoJEPILXytRLnK2GwQP/0kNCqWgZJWTGv9Y+Xfhv2Nf
iba/QLjHJ4uzam5VFsEKJ7GolRaPVyF02RiaVgow8zgOxqmNKJMGmBvbi1ZEYEMy
FOcQaUYd2b6k7N2eAixzxsLHPqvCjwwY5oDJIq26ypTehFJuBZP6glDQffkcmsXh
LZNg+FEWMTLm9mfY+hlkRPgPRkZl6dCdsWlKDKoUpkAQ2xpf9g1u6CgJ1Z112Afd
CL7ebuepzTRXGvKFPwN+sq5nZrGnpSA9grWvkTSKILxvveEU9YIojjzTKxILBoDi
oDobmnnrBHyxnqAkxClssFOP6p76d/91o6iAhPMUxV8tdwuA5en8oq7HqP2c9r7m
vtit1aGqyqWHrBOBriQG/er7xDby5Wqtkq8Sf2ZlrD78LMmWUHU8man+jxdws9CZ
u5gkTwi9ZQ+7kJtFR6CczFxB3Nd/POgxsQYeUIWE2xCkM3jtlcZFDbYLCPWwR5wT
WNVJ55ygRD412uXLOTdsVMmIVJAk/zUIatXLUrMKk2sRp1JyGE6XTM6NebZDIQWY
cDwB3FuiMQ6WHwjoeMlZBwrE1+HHenub7rLdf3TrgyxSKl4ycrdnjuidzoSrDp41
wuwMD5tyJxCVGqR23x61svaIsVjYu2CBiNgWsnfaPImK4hS7gdqKdMc9UbuRtnKZ
3fmfFXcm1a/JkbqtrCkJ
=woaB
-END PGP SIGNATURE-
___
xorg-devel@lists.x.org: X.Org development
Archives: http://lists.x.org/archives/xorg-devel
Info: http://lists.x.org/mailman/listinfo/xorg-devel

[PATCH xinit] Minor typo

2010-11-22 Thread Matthieu Herrb


From: Tom Doherty t...@singlesecond.com
Date: Mon, 22 Nov 2010 21:27:13 +0100
Subject: [PATCH] Minor typo.

Signed-off-by: Matthieu Herrb matthieu.he...@laas.fr
---
 xinit.c |2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/xinit.c b/xinit.c
index dd4e0a2..1aafbd9 100644
--- a/xinit.c
+++ b/xinit.c
@@ -620,7 +620,7 @@ shutdown(void)
 if (!processTimeout(10, X server to shut down))
 return;
 
-Errorx(X server slow to shut down, senging KILL signal);
+Errorx(X server slow to shut down, sending KILL signal);
 
 if (killpg(serverpid, SIGKILL)  0) {
 if (errno == ESRCH)
-- 
1.7.3.2


-- 
Matthieu Herrb
___
xorg-devel@lists.x.org: X.Org development
Archives: http://lists.x.org/archives/xorg-devel
Info: http://lists.x.org/mailman/listinfo/xorg-devel

Re: [PATCH xinit] Minor typo

2010-11-22 Thread Alan Coopersmith

Matthieu Herrb wrote:
 From: Tom Doherty t...@singlesecond.com
 Date: Mon, 22 Nov 2010 21:27:13 +0100
 Subject: [PATCH] Minor typo.
 
 Signed-off-by: Matthieu Herrb matthieu.he...@laas.fr
 ---
  xinit.c |2 +-
  1 files changed, 1 insertions(+), 1 deletions(-)
 
 diff --git a/xinit.c b/xinit.c
 index dd4e0a2..1aafbd9 100644
 --- a/xinit.c
 +++ b/xinit.c
 @@ -620,7 +620,7 @@ shutdown(void)
  if (!processTimeout(10, X server to shut down))
  return;
  
 -Errorx(X server slow to shut down, senging KILL signal);
 +Errorx(X server slow to shut down, sending KILL signal);
  
  if (killpg(serverpid, SIGKILL)  0) {
  if (errno == ESRCH)

Reviewed-by: Alan Coopersmith alan.coopersm...@oracle.com

-- 
-Alan Coopersmith-alan.coopersm...@oracle.com
 Oracle Solaris Platform Engineering: X Window System

___
xorg-devel@lists.x.org: X.Org development
Archives: http://lists.x.org/archives/xorg-devel
Info: http://lists.x.org/mailman/listinfo/xorg-devel

Re: [PATCH app-xdm 7/7] config: AM_PROG_CC_C_O is no longer needed

2010-11-22 Thread Alan Coopersmith

Gaetan Nadon wrote:
 All per-target flags have been removed now that each target
 sits in its own directory.
 
 Signed-off-by: Gaetan Nadon mems...@videotron.ca
 ---
  configure.ac |1 -
  1 files changed, 0 insertions(+), 1 deletions(-)
 
 diff --git a/configure.ac b/configure.ac
 index 41220d1..8b90cb6 100644
 --- a/configure.ac
 +++ b/configure.ac
 @@ -32,7 +32,6 @@ AC_CONFIG_HEADERS(config.h)
  # Initialize Automake
  AM_INIT_AUTOMAKE([foreign dist-bzip2])
  AM_MAINTAINER_MODE
 -AM_PROG_CC_C_O
  
  # Initialize libtool
  AC_DISABLE_STATIC

Reviewed-by: Alan Coopersmith alan.coopersm...@oracle.com

-- 
-Alan Coopersmith-alan.coopersm...@oracle.com
 Oracle Solaris Platform Engineering: X Window System

___
xorg-devel@lists.x.org: X.Org development
Archives: http://lists.x.org/archives/xorg-devel
Info: http://lists.x.org/mailman/listinfo/xorg-devel

Re: [PATCH app-xdm 6/7] config: move appdefault makefile to app-defaults dir.

2010-11-22 Thread Alan Coopersmith

Gaetan Nadon wrote:
 For this package it is best not to break the pattern
 of each directory having its own makefile.
 
 Signed-off-by: Gaetan Nadon mems...@videotron.ca
 ---
  Makefile.am  |8 +++-
  app-defaults/Makefile.am |1 +
  configure.ac |1 +
  3 files changed, 5 insertions(+), 5 deletions(-)
  create mode 100644 app-defaults/Makefile.am

Reviewed-by: Alan Coopersmith alan.coopersm...@oracle.com

-- 
-Alan Coopersmith-alan.coopersm...@oracle.com
 Oracle Solaris Platform Engineering: X Window System

___
xorg-devel@lists.x.org: X.Org development
Archives: http://lists.x.org/archives/xorg-devel
Info: http://lists.x.org/mailman/listinfo/xorg-devel

Re: [PATCH app-xdm 5/5] config: mv xdm in its own directory

2010-11-22 Thread Alan Coopersmith

Gaetan Nadon wrote:
 Prevents the use of per target flags.
 Clearly shows which libraries and compiler options apply.
 
 Signed-off-by: Gaetan Nadon mems...@videotron.ca
 ---
  .gitignore   |5 +--
  Makefile.am  |   60 +--
  configure.ac |1 +
  xdm/.gitignore   |1 +
  xdm/Makefile.am  |   79 
 ++
  access.c = xdm/access.c |0
  auth.c = xdm/auth.c |0
  choose.c = xdm/choose.c |0
  daemon.c = xdm/daemon.c |0
  dm.c = xdm/dm.c |0
  dpylist.c = xdm/dpylist.c   |0
  error.c = xdm/error.c   |0
  file.c = xdm/file.c |0
  genauth.c = xdm/genauth.c   |0
  krb5auth.c = xdm/krb5auth.c |0
  mitauth.c = xdm/mitauth.c   |0
  netaddr.c = xdm/netaddr.c   |0
  policy.c = xdm/policy.c |0
  prngc.c = xdm/prngc.c   |0
  protodpy.c = xdm/protodpy.c |0
  reset.c = xdm/reset.c   |0
  resource.c = xdm/resource.c |0
  rpcauth.c = xdm/rpcauth.c   |0
  server.c = xdm/server.c |0
  session.c = xdm/session.c   |0
  socket.c = xdm/socket.c |0
  streams.c = xdm/streams.c   |0
  util.c = xdm/util.c |0
  xdmauth.c = xdm/xdmauth.c   |0
  xdmcp.c = xdm/xdmcp.c   |0


Reviewed-by: Alan Coopersmith alan.coopersm...@oracle.com

-- 
-Alan Coopersmith-alan.coopersm...@oracle.com
 Oracle Solaris Platform Engineering: X Window System

___
xorg-devel@lists.x.org: X.Org development
Archives: http://lists.x.org/archives/xorg-devel
Info: http://lists.x.org/mailman/listinfo/xorg-devel

Re: [PATCH app-xdm 1/5] config: move man pages into their own directory

2010-11-22 Thread Alan Coopersmith

Gaetan Nadon wrote:
 Replace lowercase $(xdmlibdir) with $(XXDMLIBDIR)

s/XXDM/XDM/

Other than that,
Reviewed-by: Alan Coopersmith alan.coopersm...@oracle.com

-- 
-Alan Coopersmith-alan.coopersm...@oracle.com
 Oracle Solaris Platform Engineering: X Window System

___
xorg-devel@lists.x.org: X.Org development
Archives: http://lists.x.org/archives/xorg-devel
Info: http://lists.x.org/mailman/listinfo/xorg-devel

[PATCH] xfree86: Remove the xf8_16bpp overlay module

2010-11-22 Thread Adam Jackson

Only one (marginal) driver was using it, and it's been fixed to just
implement it directly.

Signed-off-by: Adam Jackson a...@redhat.com
---
 configure.ac|1 -
 hw/xfree86/Makefile.am  |4 +-
 hw/xfree86/xf8_16bpp/Makefile.am|   11 -
 hw/xfree86/xf8_16bpp/cfb8_16.h  |   37 
 hw/xfree86/xf8_16bpp/xf8_16module.c |   78 ---
 5 files changed, 2 insertions(+), 129 deletions(-)
 delete mode 100644 hw/xfree86/xf8_16bpp/Makefile.am
 delete mode 100644 hw/xfree86/xf8_16bpp/cfb8_16.h
 delete mode 100644 hw/xfree86/xf8_16bpp/xf8_16module.c

diff --git a/configure.ac b/configure.ac
index bd027cd..abbe981 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2238,7 +2238,6 @@ hw/xfree86/vbe/Makefile
 hw/xfree86/vgahw/Makefile
 hw/xfree86/x86emu/Makefile
 hw/xfree86/xaa/Makefile
-hw/xfree86/xf8_16bpp/Makefile
 hw/xfree86/utils/Makefile
 hw/xfree86/utils/cvt/Makefile
 hw/xfree86/utils/gtf/Makefile
diff --git a/hw/xfree86/Makefile.am b/hw/xfree86/Makefile.am
index 116113b..575481e 100644
--- a/hw/xfree86/Makefile.am
+++ b/hw/xfree86/Makefile.am
@@ -32,12 +32,12 @@ DOC_SUBDIR = doc
 
 SUBDIRS = common ddc i2c x86emu $(INT10_SUBDIR) fbdevhw os-support parser \
  ramdac shadowfb $(VBE_SUBDIR) $(VGAHW_SUBDIR) $(XAA_SUBDIR) \
- xf8_16bpp loader dixmods exa modes \
+ loader dixmods exa modes \
  $(DRI_SUBDIR) $(DRI2_SUBDIR) $(XF86UTILS_SUBDIR) $(DOC_SUBDIR)
 
 DIST_SUBDIRS = common ddc i2c x86emu int10 fbdevhw os-support \
parser ramdac shadowfb vbe vgahw xaa \
-   xf8_16bpp loader dixmods dri dri2 exa modes \
+   loader dixmods dri dri2 exa modes \
   utils doc
 
 bin_PROGRAMS = Xorg
diff --git a/hw/xfree86/xf8_16bpp/Makefile.am b/hw/xfree86/xf8_16bpp/Makefile.am
deleted file mode 100644
index 3c5b8c9..000
--- a/hw/xfree86/xf8_16bpp/Makefile.am
+++ /dev/null
@@ -1,11 +0,0 @@
-module_LTLIBRARIES = libxf8_16bpp.la
-
-sdk_HEADERS = cfb8_16.h
-
-INCLUDES = $(XORG_INCS) -I$(top_srcdir)/fb
-
-AM_CFLAGS = $(DIX_CFLAGS) $(XORG_CFLAGS)
-
-libxf8_16bpp_la_LDFLAGS = -avoid-version
-
-libxf8_16bpp_la_SOURCES = xf8_16module.c
diff --git a/hw/xfree86/xf8_16bpp/cfb8_16.h b/hw/xfree86/xf8_16bpp/cfb8_16.h
deleted file mode 100644
index b6ab955..000
--- a/hw/xfree86/xf8_16bpp/cfb8_16.h
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Copyright 2006 Adam Jackson.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the Software),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice (including the next
- * paragraph) shall be included in all copies or substantial portions of the
- * Software.
- *
- * THE SOFTWARE IS PROVIDED AS IS, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
- * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
- * DEALINGS IN THE SOFTWARE.
- */
-
-#ifndef _CFB8_16_H
-#define _CFB8_16_H
-
-#include regionstr.h
-#include windowstr.h
-
-/* this has to stay misnamed for ABI reasons */
-
-extern _X_EXPORT Bool
-cfb8_16ScreenInit(ScreenPtr pScreen, pointer pbits16, pointer pbits8,
-  int xsize, int ysize, int dpix, int dpiy,
-  int width16, int width8);
-
-#endif /* _CFB8_16_H */
diff --git a/hw/xfree86/xf8_16bpp/xf8_16module.c 
b/hw/xfree86/xf8_16bpp/xf8_16module.c
deleted file mode 100644
index 6a4529a..000
--- a/hw/xfree86/xf8_16bpp/xf8_16module.c
+++ /dev/null
@@ -1,78 +0,0 @@
-/*
- * Copyright 2006 Adam Jackson.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the Software),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice (including the next
- * paragraph) shall be included in all copies or substantial portions of the
- * Software.
- *
- * THE SOFTWARE IS PROVIDED AS IS, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A

Re: [PATCH:libX11] Mark atom names argument to XInternAtoms as const

2010-11-22 Thread Peter Hutterer

On Mon, Nov 22, 2010 at 12:04:04AM -0800, Alan Coopersmith wrote:
 Updates code  docs for XInternAtoms.
 
 The single atom name argument to XInternAtom was already const char *
 in the code, but not the docs, so updated it in the docs too.
 
 Signed-off-by: Alan Coopersmith alan.coopersm...@oracle.com

Reviewed-by: Peter Hutterer peter.hutte...@who-t.net

Cheers,
  Peter

 ---
  include/X11/Xlib.h|2 +-
  man/XInternAtom.man   |8 
  specs/libX11/CH04.xml |4 ++--
  src/IntAtom.c |4 ++--
  4 files changed, 9 insertions(+), 9 deletions(-)
 
 diff --git a/include/X11/Xlib.h b/include/X11/Xlib.h
 index 5c6c770..b0d7d4d 100644
 --- a/include/X11/Xlib.h
 +++ b/include/X11/Xlib.h
 @@ -1548,7 +1548,7 @@ extern Atom XInternAtom(
  );
  extern Status XInternAtoms(
  Display* /* dpy */,
 -char**   /* names */,
 +_Xconst char**   /* names */,
  int  /* count */,
  Bool /* onlyIfExists */,
  Atom*/* atoms_return */
 diff --git a/man/XInternAtom.man b/man/XInternAtom.man
 index 237ed91..44aa68a 100644
 --- a/man/XInternAtom.man
 +++ b/man/XInternAtom.man
 @@ -144,11 +144,11 @@
  XInternAtom, XInternAtoms, XGetAtomName, XGetAtomNames \- create or return 
 atom names
  .SH SYNTAX
  .HP
 -Atom XInternAtom\^(\^Display *\fIdisplay\fP\^, char *\fIatom_name\fP\^, Bool
 -\fIonly_if_exists\fP\^); 
 +Atom XInternAtom\^(\^Display *\fIdisplay\fP\^, const char *\fIatom_name\fP\^,
 +Bool \fIonly_if_exists\fP\^);
  .HP
 -Status XInternAtoms\^(\^Display *\fIdisplay\fP\^, char **\fInames\fP\^, int
 -\fIcount\fP\^, Bool \fIonly_if_exists\fP\^, Atom *\fIatoms_return\fP\^); 
 +Status XInternAtoms\^(\^Display *\fIdisplay\fP\^, const char **\fInames\fP\^,
 +int \fIcount\fP\^, Bool \fIonly_if_exists\fP\^, Atom *\fIatoms_return\fP\^);
  .HP
  char *XGetAtomName\^(\^Display *\fIdisplay\fP\^, Atom \fIatom\fP\^); 
  .HP
 diff --git a/specs/libX11/CH04.xml b/specs/libX11/CH04.xml
 index 8a3e8c5..e2bca72 100644
 --- a/specs/libX11/CH04.xml
 +++ b/specs/libX11/CH04.xml
 @@ -1054,7 +1054,7 @@ To return an atom for a given name, use
  funcprototype
funcdefAtom functionXInternAtom/function/funcdef
paramdefDisplayparameter *display/parameter/paramdef
 -  paramdefcharparameter *atom_name/parameter/paramdef
 +  paramdefconst charparameter *atom_name/parameter/paramdef
paramdefBoolparameter only_if_exists/parameter/paramdef
  /funcprototype
  /funcsynopsis
 @@ -1136,7 +1136,7 @@ To return atoms for an array of names, use
  funcprototype
funcdefStatus functionXInternAtoms/function/funcdef
paramdefDisplayparameter *display/parameter/paramdef
 -  paramdefcharparameter **names/parameter/paramdef
 +  paramdefconst charparameter **names/parameter/paramdef
paramdefintparameter count/parameter/paramdef
paramdefBoolparameter only_if_exists/parameter/paramdef
paramdefAtomparameter *atoms_return/parameter/paramdef
 diff --git a/src/IntAtom.c b/src/IntAtom.c
 index 7a56258..80d78c0 100644
 --- a/src/IntAtom.c
 +++ b/src/IntAtom.c
 @@ -190,7 +190,7 @@ XInternAtom (
  typedef struct {
  unsigned long start_seq;
  unsigned long stop_seq;
 -char **names;
 +const char **names;
  Atom *atoms;
  int count;
  Status status;
 @@ -239,7 +239,7 @@ Bool _XIntAtomHandler(
  Status
  XInternAtoms (
  Display *dpy,
 -char **names,
 +const char **names,
  int count,
  Bool onlyIfExists,
  Atom *atoms_return)
 -- 
 1.7.3.2
___
xorg-devel@lists.x.org: X.Org development
Archives: http://lists.x.org/archives/xorg-devel
Info: http://lists.x.org/mailman/listinfo/xorg-devel

Re: [PATCH] glx: Remove swap barrier and hyperpipe support

2010-11-22 Thread Mario Kleiner


On 11/19/2010 07:52 PM, Adam Jackson wrote:

Never implemented in any open source driver.  The implementation
assumed explicit DDX driver knowledge of how the client-side driver
worked, since at the time the server's GL renderer was not a DRI driver.
But now, it is, so any implementation of these should be done with
additional DRI driver API, like the swap control extension.


I assume this is only about removing the current unused implementation, 
not about removing support completely from the xserver, right?


At some point i'd like to implement some dri2 support for at least swap 
groups and possibly swap barriers. With multi-head cards like the amd 
eyefinity stuff (6 crtc's) we will need swap groups et al. to make good 
use of so many heads.


As the x-server's dri2/ddx part is responsible for swap scheduling in 
dri2, i assume there will be some need for interaction between the 
client and server. I was hoping to tinker with this stuff within maybe a 
year or so.


thanks,
-mario



Signed-off-by: Adam Jacksona...@redhat.com
---
  glx/Makefile.am  |1 -
  glx/g_disptab.h  |   52 --
  glx/glxcmds.c|  233 --
  glx/glxcmdsswap.c|1 -
  glx/glxdri.c |1 -
  glx/glxdri2.c|1 -
  glx/glxdriswrast.c   |1 -
  glx/glxext.c |   19 +
  glx/glxscreens.c |   27 --
  glx/glxscreens.h |   18 
  glx/indirect_table.c |1 -
  glx/xfont.c  |1 -
  hw/xquartz/GL/indirect.c |2 -
  hw/xwin/glx/indirect.c   |2 -
  14 files changed, 1 insertions(+), 359 deletions(-)
  delete mode 100644 glx/g_disptab.h

diff --git a/glx/Makefile.am b/glx/Makefile.am
index 9d9fa3c..d708872 100644
--- a/glx/Makefile.am
+++ b/glx/Makefile.am
@@ -68,7 +68,6 @@ libglx_la_SOURCES = \
indirect_program.c \
indirect_table.h \
indirect_texture_compression.c \
-g_disptab.h \
  glxbyteorder.h \
  glxcmds.c \
  glxcmdsswap.c \
diff --git a/glx/g_disptab.h b/glx/g_disptab.h
deleted file mode 100644
index 9b4308b..000
--- a/glx/g_disptab.h
+++ /dev/null
@@ -1,52 +0,0 @@
-/* DO NOT EDIT - THIS FILE IS AUTOMATICALLY GENERATED */
-#ifdef HAVE_DIX_CONFIG_H
-#includedix-config.h
-#endif
-
-#ifndef _GLX_g_disptab_h_
-#define _GLX_g_disptab_h_
-/*
- * SGI FREE SOFTWARE LICENSE B (Version 2.0, Sept. 18, 2008)
- * Copyright (C) 1991-2000 Silicon Graphics, Inc. All Rights Reserved.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the Software),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice including the dates of first publication and
- * either this permission notice or a reference to
- * http://oss.sgi.com/projects/FreeB/
- * shall be included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED AS IS, WITHOUT WARRANTY OF ANY KIND, EXPRESS
- * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
- * SILICON GRAPHICS, INC. BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF
- * OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- *
- * Except as contained in this notice, the name of Silicon Graphics, Inc.
- * shall not be used in advertising or otherwise to promote the sale, use or
- * other dealings in this Software without prior written authorization from
- * Silicon Graphics, Inc.
- */
-
-extern int __glXDisp_BindSwapBarrierSGIX(__GLXclientState *cl, GLbyte *pc);
-extern int __glXDisp_QueryMaxSwapBarriersSGIX(__GLXclientState *cl, GLbyte 
*pc);
-extern int __glXDisp_QueryHyperpipeNetworkSGIX(__GLXclientState *cl, GLbyte 
*pc);
-extern int __glXDisp_DestroyHyperpipeConfigSGIX (__GLXclientState *cl, GLbyte 
*pc);
-extern int __glXDisp_QueryHyperpipeConfigSGIX(__GLXclientState *cl, GLbyte 
*pc);
-extern int __glXDisp_HyperpipeConfigSGIX(__GLXclientState *cl, GLbyte *pc);
-
-extern int __glXDispSwap_BindSwapBarrierSGIX(__GLXclientState *cl, GLbyte *pc);
-extern int __glXDispSwap_QueryMaxSwapBarriersSGIX(__GLXclientState *cl, GLbyte 
*pc);
-extern int __glXDispSwap_QueryHyperpipeNetworkSGIX(__GLXclientState *cl, 
GLbyte *pc);
-extern int __glXDispSwap_DestroyHyperpipeConfigSGIX (__GLXclientState *cl, 
GLbyte *pc);
-extern int __glXDispSwap_QueryHyperpipeConfigSGIX(__GLXclientState *cl, GLbyte 
*pc);
-extern int __glXDispSwap_HyperpipeConfigSGIX(__GLXclientState *cl, GLbyte *pc);
-
-#endif

[PATCH libICE docs] Add top-level target for documentation.

2010-11-22 Thread Trevor Woerner

From: Trevor Woerner twoer...@gmail.com

Builds user and developer documentation/specifications.

Signed-off-by: Trevor Woerner twoer...@gmail.com
---
 Makefile.am |7 ++-
 1 files changed, 6 insertions(+), 1 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index c2110ec..d0102e8 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -5,7 +5,7 @@ pkgconfig_DATA = ice.pc
 
 MAINTAINERCLEANFILES = ChangeLog INSTALL
 
-.PHONY: ChangeLog INSTALL
+.PHONY: ChangeLog INSTALL documents
 
 INSTALL:
$(INSTALL_CMD)
@@ -15,6 +15,11 @@ ChangeLog:
 
 dist-hook: ChangeLog INSTALL
 
+# Generically invoked from build.sh --cmd make documents
+# Builds User's documentation and Developer's documentation/specifications
+documents:
+   cd specs  $(MAKE) $(AM_MAKEFLAGS) install
+
 if LINT
 lint:
(cd src  $(MAKE) $(MFLAGS) lint)
-- 
1.7.3.2.245.g03276

___
xorg-devel@lists.x.org: X.Org development
Archives: http://lists.x.org/archives/xorg-devel
Info: http://lists.x.org/mailman/listinfo/xorg-devel

Re: xinput/evdev switch events+state

2010-11-22 Thread Peter Hutterer

On Mon, Nov 22, 2010 at 01:53:22PM -0500, Rafi Rubin wrote:
 Some tablets (such as dell and hp) report hinge rotation as EV_SW events.  
 Does
 it make sense to handle events and state in the X evdev driver and xinput?

yes, but I don't think button events are the right method for this. in the
XI2 development cycle I played around with a SwitchClass for this purpose
but dropped it for XI 2.0 for lack of time.

IMO a protocol addition for this class would be the best solution.
 
Cheers,
  Peter

___
xorg-devel@lists.x.org: X.Org development
Archives: http://lists.x.org/archives/xorg-devel
Info: http://lists.x.org/mailman/listinfo/xorg-devel

Re: [PATCH] glx: Remove swap barrier and hyperpipe support

2010-11-22 Thread Adam Jackson

On Mon, 2010-11-22 at 23:16 +0100, Mario Kleiner wrote:
 On 11/19/2010 07:52 PM, Adam Jackson wrote:
  Never implemented in any open source driver.  The implementation
  assumed explicit DDX driver knowledge of how the client-side driver
  worked, since at the time the server's GL renderer was not a DRI driver.
  But now, it is, so any implementation of these should be done with
  additional DRI driver API, like the swap control extension.
 
 I assume this is only about removing the current unused implementation, 
 not about removing support completely from the xserver, right?

Well, at the moment those two things are equivalent: the only support in
the X server is these hooks, which are not filled in by any driver.

If there were a working implementation that'd be great.

- ajax


signature.asc
Description: This is a digitally signed message part
___
xorg-devel@lists.x.org: X.Org development
Archives: http://lists.x.org/archives/xorg-devel
Info: http://lists.x.org/mailman/listinfo/xorg-devel

Re: [PATCH libICE docs] Add top-level target for documentation.

2010-11-22 Thread Julien Cristau

On Mon, Nov 22, 2010 at 17:26:38 -0500, Trevor Woerner wrote:

 From: Trevor Woerner twoer...@gmail.com
 
 Builds user and developer documentation/specifications.
 
 Signed-off-by: Trevor Woerner twoer...@gmail.com
 ---
  Makefile.am |7 ++-
  1 files changed, 6 insertions(+), 1 deletions(-)
 
 diff --git a/Makefile.am b/Makefile.am
 index c2110ec..d0102e8 100644
 --- a/Makefile.am
 +++ b/Makefile.am
 @@ -5,7 +5,7 @@ pkgconfig_DATA = ice.pc
  
  MAINTAINERCLEANFILES = ChangeLog INSTALL
  
 -.PHONY: ChangeLog INSTALL
 +.PHONY: ChangeLog INSTALL documents
  
  INSTALL:
   $(INSTALL_CMD)
 @@ -15,6 +15,11 @@ ChangeLog:
  
  dist-hook: ChangeLog INSTALL
  
 +# Generically invoked from build.sh --cmd make documents
 +# Builds User's documentation and Developer's documentation/specifications
 +documents:
 + cd specs  $(MAKE) $(AM_MAKEFLAGS) install
 +

I don't think it's a good idea for a target named 'documents' to install
stuff.  Call it install-specs or something if it's needed, but I'm not
sure what this buys you over 'make -C specs install'.

Cheers,
Julien
___
xorg-devel@lists.x.org: X.Org development
Archives: http://lists.x.org/archives/xorg-devel
Info: http://lists.x.org/mailman/listinfo/xorg-devel

Re: [PATCH libICE docs] Add top-level target for documentation.

2010-11-22 Thread Trevor Woerner

On Mon, Nov 22, 2010 at 7:21 PM, Gaetan Nadon mems...@videotron.ca wrote:
 On Mon, 2010-11-22 at 17:26 -0500, Trevor Woerner wrote:
 -.PHONY: ChangeLog INSTALL
 +.PHONY: ChangeLog INSTALL documents

 I don't think it should be a PHONY target, documents is not a file.
 It's like the lint target.

I thought this is exactly the sort of scenario where a PHONY target is
used. From info make:

A phony target is one that is not really the name of a file. It is
just a name for some commands to be executed when you make an explicit
request.

In other words, when you're done performing make documents you don't
actually end up with a file called documents the way you would if
you did, say, a make hello in a hello world project. make
documents is just a way to invoke this set of commands from within
the Makefile.
___
xorg-devel@lists.x.org: X.Org development
Archives: http://lists.x.org/archives/xorg-devel
Info: http://lists.x.org/mailman/listinfo/xorg-devel

[PATCH 1/6] dix: replace a manual valuator check with valuator_get_mode().

2010-11-22 Thread Peter Hutterer

This check was missing the OutOfProximity mask and resulted in the wrong
bits being set in InternalEvents.

Signed-off-by: Peter Hutterer peter.hutte...@who-t.net
---
 dix/getevents.c |2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/dix/getevents.c b/dix/getevents.c
index 06a0da0..5f4fb66 100644
--- a/dix/getevents.c
+++ b/dix/getevents.c
@@ -210,7 +210,7 @@ set_valuators(DeviceIntPtr dev, DeviceEvent* event, 
ValuatorMask *mask)
 if (valuator_mask_isset(mask, i))
 {
 SetBit(event-valuators.mask, i);
-if (dev-valuator-axes[i].mode == Absolute)
+if (valuator_get_mode(dev, i) == Absolute)
 SetBit(event-valuators.mode, i);
 event-valuators.data[i] = valuator_mask_get(mask, i);
 event-valuators.data_frac[i] =
-- 
1.7.3.2

___
xorg-devel@lists.x.org: X.Org development
Archives: http://lists.x.org/archives/xorg-devel
Info: http://lists.x.org/mailman/listinfo/xorg-devel

[PATCH 2/6] dix: when comparing axis modes, compare the bits, not the bytes.

2010-11-22 Thread Peter Hutterer

The DeviceEvent's mode field is a set of bits for each valuator, not bytes.

Signed-off-by: Peter Hutterer peter.hutte...@who-t.net
---
 dix/eventconvert.c |2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/dix/eventconvert.c b/dix/eventconvert.c
index 46eb4ff..b92169e 100644
--- a/dix/eventconvert.c
+++ b/dix/eventconvert.c
@@ -327,7 +327,7 @@ countValuators(DeviceEvent *ev, int *first)
 /* Assume mode of 0th valuator matches XI1 device mode. Stop when the
  * event mode changes since XI1 can't handle mixed mode devices.
  */
-if (ev-valuators.mode[i] != ev-valuators.mode[0])
+if (BitIsOn(ev-valuators.mode, i) != BitIsOn(ev-valuators.mode, 0))
 break;
 
 if (BitIsOn(ev-valuators.mask, i))
-- 
1.7.3.2

___
xorg-devel@lists.x.org: X.Org development
Archives: http://lists.x.org/archives/xorg-devel
Info: http://lists.x.org/mailman/listinfo/xorg-devel

[PATCH 3/6] dix: when converting to XI 1.x events, use the first_valuator's device mode

2010-11-22 Thread Peter Hutterer

Don't stop processing events when a valuator's mode doesn't match the 0th
valuator's mode. Instead, start with the first_valuator in the event and
keep stacking them on until the first valuator with a different mode is hit.

Signed-off-by: Peter Hutterer peter.hutte...@who-t.net
---
 dix/eventconvert.c |   14 --
 1 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/dix/eventconvert.c b/dix/eventconvert.c
index b92169e..dd17898 100644
--- a/dix/eventconvert.c
+++ b/dix/eventconvert.c
@@ -324,14 +324,16 @@ countValuators(DeviceEvent *ev, int *first)
 
 for (i = 0; i  sizeof(ev-valuators.mask) * 8; i++)
 {
-/* Assume mode of 0th valuator matches XI1 device mode. Stop when the
- * event mode changes since XI1 can't handle mixed mode devices.
- */
-if (BitIsOn(ev-valuators.mode, i) != BitIsOn(ev-valuators.mode, 0))
-break;
-
 if (BitIsOn(ev-valuators.mask, i))
 {
+/* Assume mode of first_valuator matches XI1 device mode. Stop 
when the
+ * event mode changes since XI1 can't handle mixed mode devices.
+ */
+if (first_valuator  -1 
+ BitIsOn(ev-valuators.mode, i) !=
+ BitIsOn(ev-valuators.mode, first_valuator))
+break;
+
 if (first_valuator == -1)
 first_valuator = i;
 last_valuator = i;
-- 
1.7.3.2

___
xorg-devel@lists.x.org: X.Org development
Archives: http://lists.x.org/archives/xorg-devel
Info: http://lists.x.org/mailman/listinfo/xorg-devel

[PATCH 4/6] dix: GetProximityEvents needs to check up to the last valuator

2010-11-22 Thread Peter Hutterer

valuator_mask_size() returns the highest valuator set as opposed to the
number of set bits (which obviously changes as we unset valuators).

Signed-off-by: Peter Hutterer peter.hutte...@who-t.net
---
 dix/getevents.c |2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/dix/getevents.c b/dix/getevents.c
index 5f4fb66..f80e87c 100644
--- a/dix/getevents.c
+++ b/dix/getevents.c
@@ -1248,7 +1248,7 @@ GetProximityEvents(EventList *events, DeviceIntPtr pDev, 
int type, const Valuato
 valuator_mask_copy(mask, mask_in);
 
 /* ignore relative axes for proximity. */
-for (i = 0; i  valuator_mask_num_valuators(mask); i++)
+for (i = 0; i  valuator_mask_size(mask); i++)
 {
 if (valuator_mask_isset(mask, i) 
 valuator_get_mode(pDev, i) == Relative)
-- 
1.7.3.2

___
xorg-devel@lists.x.org: X.Org development
Archives: http://lists.x.org/archives/xorg-devel
Info: http://lists.x.org/mailman/listinfo/xorg-devel

[PATCH 5/6] dix: fix typo, set the second valuator with the y-axis data.

2010-11-22 Thread Peter Hutterer

Signed-off-by: Peter Hutterer peter.hutte...@who-t.net
Tested-by: Jeremy Huddleston jerem...@apple.com
---
 dix/getevents.c |2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/dix/getevents.c b/dix/getevents.c
index f80e87c..f19c991 100644
--- a/dix/getevents.c
+++ b/dix/getevents.c
@@ -1186,7 +1186,7 @@ GetPointerEvents(EventList *events, DeviceIntPtr pDev, 
int type, int buttons,
 if (valuator_mask_isset(mask, 0))
 valuator_mask_set(mask, 0, x);
 if (valuator_mask_isset(mask, 1))
-valuator_mask_set(mask, 0, y);
+valuator_mask_set(mask, 1, y);
 
 clipValuators(pDev, mask);
 
-- 
1.7.3.2

___
xorg-devel@lists.x.org: X.Org development
Archives: http://lists.x.org/archives/xorg-devel
Info: http://lists.x.org/mailman/listinfo/xorg-devel

[PATCH 6/6] dix: add a fixme about a corner-case that should probably be fixed.

2010-11-22 Thread Peter Hutterer

Signed-off-by: Peter Hutterer peter.hutte...@who-t.net
---
 dix/getevents.c |4 
 1 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/dix/getevents.c b/dix/getevents.c
index f19c991..0d59290 100644
--- a/dix/getevents.c
+++ b/dix/getevents.c
@@ -1255,6 +1255,10 @@ GetProximityEvents(EventList *events, DeviceIntPtr pDev, 
int type, const Valuato
 valuator_mask_unset(mask, i);
 }
 
+/* FIXME: posting proximity events with relative valuators only results
+ * in an empty event, EventToXI() will fail to convert → no event sent
+ * to client. */
+
 events = UpdateFromMaster(events, pDev, DEVCHANGE_POINTER_EVENT, 
num_events);
 
 event = (DeviceEvent *) events-event;
-- 
1.7.3.2

___
xorg-devel@lists.x.org: X.Org development
Archives: http://lists.x.org/archives/xorg-devel
Info: http://lists.x.org/mailman/listinfo/xorg-devel

Re: [PATCH] Build libxf86config with -fPIC.

2010-11-22 Thread Peter Hutterer

On Mon, Nov 15, 2010 at 04:11:11PM -0800, Dan Nicholson wrote:
 On Mon, Nov 15, 2010 at 10:38 AM, Julien Cristau jcris...@debian.org wrote:
  On Mon, Nov 15, 2010 at 13:28:34 -0500, Gaetan Nadon wrote:
 
  On Mon, 2010-11-15 at 15:35 +0100, Julien Cristau wrote:
 
   If you want to install it as a shared library you also want to track
   its
   ABI and give it a SONAME, which is more work.  Shipping it as a PIC
   static lib which you don't have to be as careful with possible ABI
   breaks, but you can still embed it in something like a python module
   (which must be PIC).
  
 
  This is an important point. We are waisting time trying to guess what
  this patch is for.
 
  Oh, I know what it's for, it's needed for pyxf86config.  I just don't
  think anyone is prepared to commit to a stable ABI for libxf86config, so
  installing it as a shared library may not be the best plan.
 
 IMO, just because you decided to make the library shared doesn't mean
 you've suddenly agreed to any more ABI stability than before.

the big difference is compile-time vs. run-time ABI stability.

which especially in the case of a distribution can make a difference because
once you compile a lib from package A into package B, what happens to A
doesn't matter until you recompile B too. with a shared library, updating A
can break B.

(that of course doesn't mean it's the right thing to do, it's just how it
is)

Cheers,
  Peter


 However, I think you can make a libtool library (bringing in PIC
 magic) and have it be static only. In addition to the diff I sent
 earlier, add:
 
 libxf86config_la_LDFLAGS = -static
 
 A little testing with a dummy project shows this works.
 
___
xorg-devel@lists.x.org: X.Org development
Archives: http://lists.x.org/archives/xorg-devel
Info: http://lists.x.org/mailman/listinfo/xorg-devel

Re: [RFC XI 2.1 - inputproto] Various fixes in response to Peter Hutterer's review

2010-11-22 Thread Peter Hutterer

On Fri, Nov 19, 2010 at 01:52:39PM -0500, Chase Douglas wrote:
 ---
 Normally I'd just squash this in and make a v2 patch, but this is the most
 important part of the MT work and it's easier to review separately :). I'll
 squash later.
 
  XI2.h|3 +++
  XI2proto.txt |   39 ---
  2 files changed, 35 insertions(+), 7 deletions(-)
 
 diff --git a/XI2.h b/XI2.h
 index 5d407ea..4995c43 100644
 --- a/XI2.h
 +++ b/XI2.h
 @@ -193,4 +193,7 @@
  #define XI_TouchEndMask  (1  XI_TouchEnd)
  #define XI_TouchMotionMask   (1  XI_TouchMotion)
  
 +/* Convenience compound masks */
 +#define XI_TouchMask (XI_TouchBegin | XI_TouchEnd | 
 XI_TouchMotion)
 +
  #endif /* _XI2_H_ */
 diff --git a/XI2proto.txt b/XI2proto.txt
 index fd47643..6976683 100644
 --- a/XI2proto.txt
 +++ b/XI2proto.txt
 @@ -197,11 +197,29 @@ stage is optional. Within this document, the term 
 touch sequence is used to
  describe the above chain of events. A client wishing to receive touch events
  must register for all three touch events simultaneously.
  
 -Touch events are sent to all clients registered for them on any window in the
 -window tree from the root window to the child window directly under the 
 touch.
 -
  A touch event is not delivered according to the device hierarchy. All touch
 -events are sent only through their originating slave devices.
 +events are sent only through their originating slave devices. However,
 +dependent touch devices will only emit touch events if they are attached to a
 +master device. This is due to the touch delivery being dependent on the
 +location of a cursor.

it is still not clear why you don't want to route touch events through the
master device (other than that leaving it in the SD alone is easier to
implement). is there a list of pros and cons for both approaches?

especially in the case of touch-based pointer emulation, when the master
will send events caused by the slave device. so some events have to be
routed either way.

 +
 +Touch events are broadcast to all clients registered for touch events on a
 +set of windows. The window set is determined at the beginning of each touch
 +and depend on whether the touch device is a direct or dependent device.

s/depend/depends

 +
 +Direct device window sets contain the windows from the root to the child
 +in which the touch originated.

Window sets for direct device touches ... is a bit easier to read IMO

 +
 +Dependent device window sets depend on whether other touches are active. If
 +other touches are active, the window set of the other touches is used. In 
 this
 +manner, all dependent device touch events are sent to the same set of 
 windows.
 +If no other touches are active, a new window set is created for the touch. 
 The
 +set is formed in the same manner as direct devices, but location used is the
 +cursor position of the attached master device. If the touch device is 
 floating
 +it will not emit any touch events for the new touch.

I would reword this a bit, I found the above a bit confusing. How about
something like this:
For the first dependent touch on a device, the window set is the current
window underneath the pointer position up to the root window.
For subsequent touches on this device, the window set is identical to the
window set of the first touch. Once all touches have been released, the
window set is reset and re-calculated on the first subsequent touch.



 +
 +The delivery of touch events is not changed by any modifications to the 
 window
 +hierarchy after the window set has been determined for the touch.

  
  A device that sends touch events may also generate pointer events on demand.
  The decision of which touch events are converted into pointer events is
 @@ -1696,9 +1714,9 @@ EVENTHEADER { type:   BYTE
  selection of the hotspot of a touchpoint is implementation dependent and
  may not be the logical center of the touch.
  
 -Touch tracking IDs are always provided through one of the touch axis
 -valuators. Its value is always provided in every touch event. Tracking 
 IDs
 -are represented as unsigned 32-bit values and are required to increase in
 +Touch tracking IDs are provided in the detail field of touch events. Its
 +value is always provided in every touch event. Tracking IDs are
 +represented as unsigned 32-bit values and are required to increase in
  value for each new touch. Values will wrap back to 0 upon reaching the
  numerical limit of IDs.

s/are required to/must/

feel free to squash typo corrections etc. in with previous commits, they're
not semantical changes after all.

Cheers,
  Peter
  
 @@ -1860,3 +1878,10 @@ require the client to announce XI 2.1 support in the 
 XIQueryVersion request.
  ⊳ DRV calls the respective input driver API with the touch sequence
data. The touch sequence emulating a pointer has the respective flag
set. DRV

55 matches

Mail list logo