Re: [PATCH] Remove another if (E != NULL) check around free(E)

[Jeremy Huddleston]

On Sep 26, 2011, at 7:58 PM, Matt Turner wrote:

> I wonder if there are any other patterns we haven't seen yet?

Well clang static analyzer should help with that, but I just realized it was 
having issues.  I'll try to fix it tomorrow for tomorrow evening's tinderbox 
run.

--Jeremy

___
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: [Pull Request] Glamor: A 2D rendering acceleration implementation based on OpenGL

[zhigang gong]

On Wed, Sep 28, 2011 at 1:41 AM, Alon Levy  wrote:
> On Tue, Sep 27, 2011 at 09:50:06PM +0800, zhigang gong wrote:
>> Hi Keith,
>>
>> Here is the pull request to merge glamor. Basically, it has three parts.
>> The first part is the 2D rendering acceleration implementation in
>> glamor directory. It supports both OpenGL/GLESv2. The second part is
>> in hw/kdrive/xephyr. This part integrate glamor into Xephyr. And by
>> specify a "-glamor" when invoke the Xephyr then you can use glamor
>> to accelerate the rendering operations. The third part is in
>> hw/xfree86/glamor. This part implements a standalone ddx driver based
>> on glamor, egl and kms. With this glamor driver, you can start up
>> a Xserver over Mesa/EGL directly, without any native window system.
>>
>
> I am not very familiar with either cairo/pixman, just know that it is
> used in spice, and it has a GL backend. There is also clutter, and some
> other open source 2D GL rendering libraries (qt canvas is also interesting,
> although I guess it's C++). How is glamor related to them? (I guess some
> of them don't support EGL, but looking at those who do - clutter certainly,
> runs on my n900, and qt as well I think).

Well, I'm also not very familar with all of the 2D libraries you listed above.
I just try my best to explain the diffence and relationship here. I know
there are many real experts in this mail list. If I'm wrong, please correct
me.

pixman is a pure software 2D rendering library. The rendering target must
be a frame buffer located at normal memory buffer.

Cairo is a 2D graphics library with support for multiple output devices. Cairo
may utilize pixman to do the rendering if possible, for example when you
are using the image surface. When you are using other devices, such as
a xlib, then Cairo will utlize xlib's API to implement its rendering functions.

Glamor is not a general 2D rendering library. It is designed for the X11
 only. So it will not provide any APIs for other usage, it just be used
by Xserver's driver. And if you are using a xserver glamor driver, then
the calling to xlib/xcb library at client side will be routed to glamor
eventually. And one thing is possible that we may utilize cairo's EGL/GL
backend directly in glamor's implementation.

Actually, the glamor's purpose is to build a fully accelerated hardware
independent 2D driver for xserver, although we still have a lot of things to
do to improve its performance.

>
> Alon
>
___
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] glamor: Don't build glamor egl/gbm related code if GLAMOR_DDX disabled

[zhigang gong]

Alan,

I think you tried Xephyr-glamor at first and met the compilation failure.
Here is a patch to fix that, please help to check and review it. Thanks.

As to the coding style and indent problem, I am reading the Xorg
coding style wiki page. And will solve fix them in my the second
pull request. Thanks.

The patch is starting as below:

For Xephyr-glamor, we don't need to enable GLAMOR_DDX and don't
need those egl/gbm interfaces. So we don't check the gbm and egl
for that case, but we still build the corresponding code. Now
fix it.

Signed-off-by: Zhigang Gong 
---
 hw/xfree86/Makefile.am |2 +-
 hw/xfree86/dixmods/Makefile.am |4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/hw/xfree86/Makefile.am b/hw/xfree86/Makefile.am
index f76a361..3f8695e 100644
--- a/hw/xfree86/Makefile.am
+++ b/hw/xfree86/Makefile.am
@@ -27,7 +27,7 @@ if INT10MODULE
 INT10_SUBDIR = int10
 endif

-if GLAMOR
+if GLAMOR_DDX
 GLAMOR_DIR=glamor
 endif

diff --git a/hw/xfree86/dixmods/Makefile.am b/hw/xfree86/dixmods/Makefile.am
index ba4aeb4..5b84704 100644
--- a/hw/xfree86/dixmods/Makefile.am
+++ b/hw/xfree86/dixmods/Makefile.am
@@ -14,7 +14,7 @@ if RECORD
 RECORDMOD = librecord.la
 endif

-if GLAMOR
+if GLAMOR_DDX
 LIBGLAMOR_DIX = libglamor_dix.la
 endif

@@ -39,7 +39,7 @@ INCLUDES = @XORG_INCS@ \
 libdbe_la_LDFLAGS = -avoid-version
 libdbe_la_LIBADD = $(top_builddir)/dbe/libdbe.la
 libdbe_la_SOURCES = dbemodule.c
-if GLAMOR
+if GLAMOR_DDX
 libglamor_dix_la_LDFLAGS = -avoid-version
 libglamor_dix_la_LIBADD = $(top_builddir)/glamor/libglamor.la
 libglamor_dix_la_SOURCES = glamor_module.c $(top_srcdir)/glamor/glamor_egl.c
--
1.7.3.1
___
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] udev: make use of udev_enumerate_add_match_tag() only when it is available

[Keith Packard]

On Wed, 28 Sep 2011 08:29:18 +1000, Peter Hutterer  
wrote:

> Keith, please merge this one directly, I won't take it in my tree (which is
> currently in tatters).

Will do. Thanks!
-- 
keith.pack...@intel.com


pgppYWDp47XGQ.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

[PATCH xf86-video-vmware] Use dixLookupWindow instead of LookupWindow on Xorg 1.5 & later

[Alan Coopersmith]

The LookupWindow function was deprecated in xserver commit ed75b056511ccb4
and removed during the Xorg 1.11 merge window by commit 82a8677d9175732.

Signed-off-by: Alan Coopersmith 
---

Needed for compatibility with the Xorg 1.11 release - only build tested
with Xorg 1.11.1, but I tried to preserve compatibility with older releases,
following the current status quo of this driver, while making it simple to
drop that when it's no longer needed.

 src/vmwarexinerama.c |   32 ++--
 1 files changed, 26 insertions(+), 6 deletions(-)

diff --git a/src/vmwarexinerama.c b/src/vmwarexinerama.c
index 371c7b1..e86df34 100644
--- a/src/vmwarexinerama.c
+++ b/src/vmwarexinerama.c
@@ -46,6 +46,20 @@
 #ifndef HAVE_XORG_SERVER_1_5_0
 #include 
 #include 
+
+/* dixLookupWindow was added in Xorg server 1.5 to replace LookupWindow */
+#ifndef DixGetAttrAccess
+# define DixGetAttrAccess   (1<<4)
+#endif
+
+static inline int
+dixLookupWindow(WindowPtr *pWin, XID id, ClientPtr client, Mask access)
+{
+*pWin = LookupWindow(stuff->window, client);
+if (!*pWin)
+   return BadWindow;
+return Success;
+}
 #endif
 
 
@@ -116,10 +130,12 @@ VMwareXineramaGetState(ClientPtr client)
 ExtensionEntry *ext;
 ScrnInfoPtr pScrn;
 VMWAREPtr pVMWARE;
+int rc;
 
 REQUEST_SIZE_MATCH(xPanoramiXGetStateReq);
-pWin = LookupWindow(stuff->window, client);
-if(!pWin) return BadWindow;
+rc = dixLookupWindow(&pWin, stuff->window, client, DixGetAttrAccess);
+if (rc != Success)
+   return rc;
 
 if (!(ext = CheckExtension(PANORAMIX_PROTOCOL_NAME))) {
return BadMatch;
@@ -167,10 +183,12 @@ VMwareXineramaGetScreenCount(ClientPtr client)
 ExtensionEntry *ext;
 ScrnInfoPtr pScrn;
 VMWAREPtr pVMWARE;
+int rc;
 
 REQUEST_SIZE_MATCH(xPanoramiXGetScreenCountReq);
-pWin = LookupWindow(stuff->window, client);
-if(!pWin) return BadWindow;
+rc = dixLookupWindow(&pWin, stuff->window, client, DixGetAttrAccess);
+if (rc != Success)
+   return rc;
 
 if (!(ext = CheckExtension(PANORAMIX_PROTOCOL_NAME))) {
return BadMatch;
@@ -218,10 +236,12 @@ VMwareXineramaGetScreenSize(ClientPtr client)
 ExtensionEntry *ext;
 ScrnInfoPtr pScrn;
 VMWAREPtr pVMWARE;
+int rc;
 
 REQUEST_SIZE_MATCH(xPanoramiXGetScreenSizeReq);
-pWin = LookupWindow (stuff->window, client);
-if(!pWin)  return BadWindow;
+rc = dixLookupWindow(&pWin, stuff->window, client, DixGetAttrAccess);
+if (rc != Success)
+   return rc;
 
 if (!(ext = CheckExtension(PANORAMIX_PROTOCOL_NAME))) {
return BadMatch;
-- 
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 libXi] Use a separate nclasses variable in XIQueryDevice

[Peter Hutterer]

On Wed, Sep 28, 2011 at 01:33:11AM +0100, Daniel Stone wrote:
> Hi,
> 
> On 23 September 2011 00:08, Peter Hutterer  wrote:
> >         lib->classes = Xmalloc(size_classes((xXIAnyInfo*)ptr, 
> > lib->num_classes));
> 
> I think this should be nclasses instead of lib->num_classes, no?

right, amended, thanks.

Cheers,
  Peter

> 
> With that:
> Reviewed-by: Daniel Stone 
> 
> Cheers,
> Daniel
> 
___
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 v2 2/2] input: allow for max < min for relative axes on InitValuatorAxisStruct

[Daniel Stone]

On Fri, Sep 23, 2011 at 12:13:47PM +1000, Peter Hutterer wrote:
> Relative axes are initialized with 0, -1 but so far this never had any
> effect as all users of this function (for relative axes) just set it to the
> defaults anyway.
> 
> Signed-off-by: Peter Hutterer 

Reviewed-by: Daniel Stone 
___
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 v2 1/2] input: switch InitValuatorAxisStruct to return Bool

[Daniel Stone]

Hi,

On 23 September 2011 03:12, Peter Hutterer  wrote:
> Return errors instead of silently ignoring them.
>
> Signed-off-by: Peter Hutterer 

Reviewed-by: Daniel Stone 

Cheers,
Daniel
___
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 libXi] Use a separate nclasses variable in XIQueryDevice

[Daniel Stone]

Hi,

On 23 September 2011 00:08, Peter Hutterer  wrote:
>         lib->classes = Xmalloc(size_classes((xXIAnyInfo*)ptr, 
> lib->num_classes));

I think this should be nclasses instead of lib->num_classes, no?

With that:
Reviewed-by: Daniel Stone 

Cheers,
Daniel
___
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 evdev 1/1] Support smooth scrolling on REL_WHEEL, REL_HWHEEL and REL_DIAL

[Daniel Stone]

Hi,

On 23 September 2011 00:14, Peter Hutterer  wrote:
> [general reassurance]

Reviewed-by: Daniel Stone 

Cheers,
Daniel
___
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 v2] Input: Add smooth-scrolling support

[Daniel Stone]

Hi,

On 23 September 2011 02:22, Peter Hutterer  wrote:
> +    if (*current_ax != -1 && axnum != *current_ax)
> +    {
> +        ax = &dev->valuator->axes[*current_ax];
> +        if (ax->scroll.type == type &&
> +            (flags & SCROLL_FLAG_PREFERRED) == (ax->scroll.flags & 
> SCROLL_FLAG_PREFERRED))
> +            return FALSE;
> +    }

This will fail if you try to add two non-preferred axes; did you mean
&& instead of ==?

> +    info->increment.integral = (int)axis->scroll.increment;
> +    info->increment.frac = (unsigned int)(axis->scroll.increment * (1UL << 
> 32));
> +    info->sourceid = v->sourceid;

This needs the same * (1UL << 16) * (1UL << 16) treatment, I believe.

> @@ -603,8 +604,10 @@ GetMaximumEventsNum(void) {
>     /* One raw event
>      * One device event
>      * One possible device changed event
> +     * Lots of possible separate button scroll events (horiz + vert)
> +     * Lots of possible separate raw button scroll events (horiz + vert)
>      */
> -    return 3;
> +    return 51;
>  }

Hmm, I've seen up to 100 fairly easily.

> +static int
> +emulate_scroll_button_events(InternalEvent *events,
> +                             DeviceIntPtr dev,
> +                             int axis,
> +                             const ValuatorMask *mask,
> +                             ValuatorMask *last,
> +                             CARD32 ms,
> +                             int max_events)
> +{
> +    AxisInfoPtr ax;
> +    double delta;
> +    double incr;
> +    int num_events = 0;
> +    double total;
> +    int b;
> +
> +    if (dev->valuator->axes[axis].scroll.type == SCROLL_TYPE_NONE)
> +        return 0;
> +
> +    if (!valuator_mask_isset(mask, axis))
> +        return 0;
> +
> +    ax = &dev->valuator->axes[axis];
> +    incr = ax->scroll.increment;
> +
> +    if (!valuator_mask_isset(last, axis))
> +    {
> +        valuator_mask_set_double(last, axis, valuator_mask_get_double(mask, 
> axis));
> +        return 0;
> +    }
> +
> +    delta = valuator_mask_get_double(mask, axis) - 
> valuator_mask_get_double(last, axis);

I think this really needs to be:
delta = valuator_mask_get_double(mask, axis);
if (valuator_mask_isset(last, axis))
delta -= valuator_mask_get_double(last, axis);

On the grounds that a single event with a scroll axis with an incr of
1.0 and a value of 10.0 should generate 10 scroll button events.  But
with this, we won't generate anything until the second event comes in,
no?

> @@ -1193,7 +1288,12 @@ GetPointerEvents(InternalEvent *events, DeviceIntPtr 
> pDev, int type,
>                  int buttons, int flags, const ValuatorMask *mask_in)
>  {
>     CARD32 ms = GetTimeInMillis();
> -    int num_events = 0;
> +    int num_events = 0, nev_tmp;
> +    int h_scroll_axis = pDev->valuator->h_scroll_axis;
> +    int v_scroll_axis = pDev->valuator->v_scroll_axis;
> +    ValuatorMask mask;
> +    ValuatorMask scroll;
> +    int i;
> [...]
> +
> +    /* Now turn the smooth-scrolling axes back into emulated button presses
> +     * for legacy clients, based on the integer delta between before and now 
> */
> +    for (i = 0; i < valuator_mask_size(&mask); i++) {
> +        if (!valuator_mask_isset(&mask, i))
> +            continue;
> +
> +        valuator_mask_set_double(&scroll, i, pDev->last.valuators[i]);

Don't you need a valuator_mask_zero(&scroll) before using it?

> +        /* fill_pointer_events() generates four events: one normal and one 
> raw
> +         * event each for the emulated button press and release both. */
> +        if (num_events + 4 >= GetMaximumEventsNum())
> +            break;
> +
> +        nev_tmp = emulate_scroll_button_events(events, pDev, i, &scroll,
> +                                               pDev->last.scroll, ms,
> +                                               GetMaximumEventsNum() - 
> num_events);

So with this comment, you should probably either
s/fill_pointer_events/emulate_scroll_button_events/, or just bin the
comment and the conditional as well, and have
emulate_scroll_button_events catch max_events <= 0 and just do
nothing.

(I think the comment in emulate_scroll_button_events about
fill_pointer_events wants revisiting too, strictly speaking.)

Other than that:
Reviewed-by: Daniel Stone 

Cheers,
Daniel
___
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 v2 xserver 2/2] Xinput: use appropriate copyright markup for a multi licensed doc

[Peter Hutterer]

On Tue, Sep 27, 2011 at 09:14:18AM -0400, Gaetan Nadon wrote:
> Removed a duplicate paragraph.
> 
> Signed-off-by: Gaetan Nadon 

Acked-by: Peter Hutterer 

I won't merge this into my tree, please send a pull request for this.

Cheers,
  Peter

> ---
> 
> PDF output
> =
> 
> Copyright © 1989, 1990, 1991 Hewlett-Packard Company
> 
> Permission to use, copy, modify, and distribute this documentation for any 
> purpose and without fee is hereby granted, provided that the above
> copyright notice and this permission notice appear in all copies. 
> Hewlett-Packard makes no representations about the suitability for any purpose
> of the information in this document. It is provided "as is" without express 
> or implied warranty. This document is only a draft stan- dard of the X
> Consortium and is therefore subject to change.
> 
> Copyright © 1989, 1990, 1991 X Consortium
> 
> 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 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 X CONSORTIUM 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 the X Consortium shall not be 
> used in advertising or otherwise to promote the sale, use or other
> dealings in this Software without prior written authorization from the X 
> Consortium.
> 
> X Window System is a trademark of The Open Group.
> 
> 
>  doc/Xinput.xml |   19 ++-
>  1 files changed, 6 insertions(+), 13 deletions(-)
> 
> diff --git a/doc/Xinput.xml b/doc/Xinput.xml
> index 87c6d7f..0a7ec8d 100644
> --- a/doc/Xinput.xml
> +++ b/doc/Xinput.xml
> @@ -16,16 +16,9 @@
>
> 
> X server version &xserver.version;
> -   X Consortium Standard
> -   1989Hewlett-Packard 
> Company
> -   1990Hewlett-Packard 
> Company
> -   1991Hewlett-Packard 
> Company
> -
> -   1989X Consortium
> -   1990X Consortium
> -   1991X Consortium
> -   X Consortium
> -   X Version 11, Release 6.7
> +   198919901991
> + Hewlett-Packard Company
> +   
>  
>  
>  
> @@ -37,11 +30,11 @@ Hewlett-Packard makes no representations about the 
> suitability for any purpose o
>  document. It is provided "as is" without express or implied warranty. This 
> document is only a draft stan-
>  dard of the X Consortium and is therefore subject to change.
>  
> +
>  
> +
> +Copyright © 1989, 1990, 1991 X Consortium
>  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:
> -
> -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 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 X CONSORTIUM 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.
> -- 
> 1.7.4.1
___
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] udev: make use of udev_enumerate_add_match_tag() only when it is available

[Peter Hutterer]

On Tue, Sep 27, 2011 at 06:04:06PM +0100, Dave Airlie wrote:
> From: Lennart Poettering 
> 
> udev_enumerate_add_match_tag() and udev_monitor_filter_add_match_tag()
> are mostly optimizations, hence simply skip these calls if they are not
> available in the installed version of libudev.
> 
> This should fix the build on older versions of udev.
> 
> [airlied: fixes tinderbox failures on RHEL6]
> 
> Signed-off-by: Lennart Poettering 
> Reviewed-by: Dave Airlie 
> Tested-by: Dave Airlie 

Reviewed-by: Peter Hutterer 

Keith, please merge this one directly, I won't take it in my tree (which is
currently in tatters).

Cheers,
  Peter

> ---
>  config/udev.c   |4 
>  configure.ac|9 +
>  include/dix-config.h.in |6 ++
>  3 files changed, 19 insertions(+), 0 deletions(-)
> 
> diff --git a/config/udev.c b/config/udev.c
> index 1ba0d50..e2b3726 100644
> --- a/config/udev.c
> +++ b/config/udev.c
> @@ -285,8 +285,10 @@ config_udev_init(void)
>  udev_monitor_filter_add_match_subsystem_devtype(udev_monitor, "input", 
> NULL);
>  udev_monitor_filter_add_match_subsystem_devtype(udev_monitor, "tty", 
> NULL); /* For Wacom serial devices */
>  
> +#ifdef HAVE_UDEV_MONITOR_FILTER_ADD_MATCH_TAG
>  if (SeatId && strcmp(SeatId, "seat0"))
>  udev_monitor_filter_add_match_tag(udev_monitor, SeatId);
> +#endif
>  
>  if (udev_monitor_enable_receiving(udev_monitor)) {
>  ErrorF("config/udev: failed to bind the udev monitor\n");
> @@ -300,8 +302,10 @@ config_udev_init(void)
>  udev_enumerate_add_match_subsystem(enumerate, "input");
>  udev_enumerate_add_match_subsystem(enumerate, "tty");
>  
> +#ifdef HAVE_UDEV_ENUMERATE_ADD_MATCH_TAG
>  if (SeatId && strcmp(SeatId, "seat0"))
>  udev_enumerate_add_match_tag(enumerate, SeatId);
> +#endif
>  
>  udev_enumerate_scan_devices(enumerate);
>  devices = udev_enumerate_get_list_entry(enumerate);
> diff --git a/configure.ac b/configure.ac
> index b0d2643..30716fb 100644
> --- a/configure.ac
> +++ b/configure.ac
> @@ -822,6 +822,15 @@ if test "x$CONFIG_UDEV" = xyes; then
>   AC_MSG_ERROR([udev configuration API requested, but libudev is 
> not installed])
>   fi
>   AC_DEFINE(CONFIG_UDEV, 1, [Use libudev for input hotplug])
> +
> + SAVE_LIBS=$LIBS
> + SAVE_CFLAGS=$CFLAGS
> + CFLAGS=$UDEV_CFLAGS
> + LIBS=$UDEV_LIBS
> + AC_CHECK_FUNCS([udev_monitor_filter_add_match_tag])
> + AC_CHECK_FUNCS([udev_enumerate_add_match_tag])
> + LIBS=$SAVE_LIBS
> + CFLAGS=$SAVE_CFLAGS
>  fi
>  
>  dnl HAVE_DBUS is true if we actually have the D-Bus library, whereas
> diff --git a/include/dix-config.h.in b/include/dix-config.h.in
> index 5facb11..2dcaf6b 100644
> --- a/include/dix-config.h.in
> +++ b/include/dix-config.h.in
> @@ -402,6 +402,12 @@
>  /* Use libudev for input hotplug */
>  #undef CONFIG_UDEV
>  
> +/* Use udev_monitor_filter_add_match_tag() */
> +#undef HAVE_UDEV_MONITOR_FILTER_ADD_MATCH_TAG
> +
> +/* Use udev_enumerate_add_match_tag() */
> +#undef HAVE_UDEV_ENUMERATE_ADD_MATCH_TAG
> +
>  /* Use D-Bus for input hotplug */
>  #undef CONFIG_NEED_DBUS
>  
> -- 
> 1.7.6.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
> 
___
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:libxtrans 10/10] Convert a bunch of sprintf calls to snprintf

[Alan Coopersmith]

Signed-off-by: Alan Coopersmith 
---
 Xtranslcl.c  |   32 +++-
 Xtranssock.c |6 +++---
 2 files changed, 22 insertions(+), 16 deletions(-)

diff --git a/Xtranslcl.c b/Xtranslcl.c
index e5b3833..8466ddc 100644
--- a/Xtranslcl.c
+++ b/Xtranslcl.c
@@ -322,12 +322,14 @@ TRANS(PTSOpenClient)(XtransConnInfo ciptr, char *port)
 #else
 if (port && *port ) {
if( *port == '/' ) { /* A full pathname */
-   (void) sprintf(server_path, "%s", port);
-   } else {
-   (void) sprintf(server_path, "%s%s", PTSNODENAME, port);
-   }
+   snprintf(server_path, sizeof(server_path), "%s", port);
+   } else {
+   snprintf(server_path, sizeof(server_path), "%s%s",
+PTSNODENAME, port);
+   }
 } else {
-   (void) sprintf(server_path, "%s%d", PTSNODENAME, getpid());
+   snprintf(server_path, sizeof(server_path), "%s%d",
+PTSNODENAME, getpid());
 }
 
 
@@ -1275,12 +1277,14 @@ TRANS(PTSReopenServer)(XtransConnInfo ciptr, int fd, 
char *port)
 #else
 if (port && *port ) {
if( *port == '/' ) { /* A full pathname */
-   (void) sprintf(server_path, "%s", port);
-   } else {
-   (void) sprintf(server_path, "%s%s", PTSNODENAME, port);
-   }
+   snprintf(server_path, sizeof(server_path), "%s", port);
+   } else {
+   snprintf(server_path, sizeof(server_path), "%s%s",
+PTSNODENAME, port);
+   }
 } else {
-   (void) sprintf(server_path, "%s%ld", PTSNODENAME, (long)getpid());
+   snprintf(server_path, sizeof(server_path), "%s%ld",
+   PTSNODENAME, (long)getpid());
 }
 
 if (TRANS(FillAddrInfo) (ciptr, server_path, server_path) == 0)
@@ -1314,12 +1318,14 @@ TRANS(NAMEDReopenServer)(XtransConnInfo ciptr, int fd 
_X_UNUSED, char *port)
 #else
 if ( port && *port ) {
if( *port == '/' ) { /* A full pathname */
-   (void) sprintf(server_path, "%s", port);
+   snprintf(server_path, sizeof(server_path),"%s", port);
} else {
-   (void) sprintf(server_path, "%s%s", NAMEDNODENAME, port);
+   snprintf(server_path, sizeof(server_path), "%s%s",
+NAMEDNODENAME, port);
}
 } else {
-   (void) sprintf(server_path, "%s%ld", NAMEDNODENAME, (long)getpid());
+   snprintf(server_path, sizeof(server_path), "%s%ld",
+   NAMEDNODENAME, (long)getpid());
 }
 
 if (TRANS(FillAddrInfo) (ciptr, server_path, server_path) == 0)
diff --git a/Xtranssock.c b/Xtranssock.c
index 1275196..955516d 100644
--- a/Xtranssock.c
+++ b/Xtranssock.c
@@ -840,7 +840,7 @@ set_sun_path(const char *port, const char *upath, char 
*path, int abstract)
 
 if (strlen(port) + strlen(upath) > maxlen)
return -1;
-sprintf(path, "%s%s%s", at, upath, port);
+snprintf(path, sizeof(s.sun_path), "%s%s%s", at, upath, port);
 return 0;
 }
 #endif
@@ -960,7 +960,7 @@ TRANS(SocketINETCreateListener) (XtransConnInfo ciptr, char 
*port, unsigned int
 {
/* fixup the server port address */
tmpport = X_TCP_PORT + strtol (port, (char**)NULL, 10);
-   sprintf (portbuf,"%lu", tmpport);
+   snprintf (portbuf, sizeof(portbuf), "%lu", tmpport);
port = portbuf;
 }
 #endif
@@ -1457,7 +1457,7 @@ TRANS(SocketINETConnect) (XtransConnInfo ciptr, char 
*host, char *port)
 if (is_numeric (port))
 {
long tmpport = X_TCP_PORT + strtol (port, (char**)NULL, 10);
-   sprintf (portbuf, "%lu", tmpport);
+   snprintf (portbuf, sizeof(portbuf), "%lu", tmpport);
port = portbuf;
 }
 #endif
-- 
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:libxtrans 09/10] Add const attributes to fix gcc -Wwrite-strings warnings

[Alan Coopersmith]

Signed-off-by: Alan Coopersmith 
---
 Xtrans.c |7 ---
 Xtrans.h |2 +-
 Xtransint.h  |4 ++--
 Xtranslcl.c  |8 
 Xtranssock.c |   10 +-
 Xtransutil.c |2 +-
 6 files changed, 17 insertions(+), 16 deletions(-)

diff --git a/Xtrans.c b/Xtrans.c
index 379cf33..522e543 100644
--- a/Xtrans.c
+++ b/Xtrans.c
@@ -150,7 +150,7 @@ TRANS(FreeConnInfo) (XtransConnInfo ciptr)
 #define PROTOBUFSIZE   20
 
 static Xtransport *
-TRANS(SelectTransport) (char *protocol)
+TRANS(SelectTransport) (const char *protocol)
 
 {
 char   protobuf[PROTOBUFSIZE];
@@ -203,7 +203,8 @@ TRANS(ParseAddress) (char *address, char **protocol, char 
**host, char **port)
  */
 
 char   *mybuf, *tmpptr;
-char   *_protocol, *_host, *_port;
+const char *_protocol;
+char   *_host, *_port;
 char   hostnamebuf[256];
 int_host_len;
 
@@ -759,7 +760,7 @@ TRANS(CreateListener) (XtransConnInfo ciptr, char *port, 
unsigned int flags)
 }
 
 int
-TRANS(NoListen) (char * protocol)
+TRANS(NoListen) (const char * protocol)
 
 {
Xtransport *trans;
diff --git a/Xtrans.h b/Xtrans.h
index 582b21c..2945b2a 100644
--- a/Xtrans.h
+++ b/Xtrans.h
@@ -304,7 +304,7 @@ int TRANS(CreateListener)(
 );
 
 int TRANS(NoListen) (
-char*   /* protocol*/
+const char* /* protocol*/
 );
 
 int TRANS(ResetListener)(
diff --git a/Xtransint.h b/Xtransint.h
index 1052777..3bce8dc 100644
--- a/Xtransint.h
+++ b/Xtransint.h
@@ -144,7 +144,7 @@ struct _XtransConnInfo {
 
 
 typedef struct _Xtransport {
-char   *TransName;
+const char *TransName;
 intflags;
 
 #ifdef TRANS_CLIENT
@@ -159,7 +159,7 @@ typedef struct _Xtransport {
 #endif /* TRANS_CLIENT */
 
 #ifdef TRANS_SERVER
-char **nolisten;
+const char **  nolisten;
 XtransConnInfo (*OpenCOTSServer)(
struct _Xtransport *,   /* transport */
char *, /* protocol */
diff --git a/Xtranslcl.c b/Xtranslcl.c
index 7acc907..e5b3833 100644
--- a/Xtranslcl.c
+++ b/Xtranslcl.c
@@ -1382,7 +1382,7 @@ TRANS(SCOReopenServer)(XtransConnInfo ciptr, int fd, char 
*port)
  */
 
 typedef struct _LOCALtrans2dev {
-char   *transname;
+const char *transname;
 
 #ifdef TRANS_CLIENT
 
@@ -1643,7 +1643,7 @@ static LOCALtrans2dev LOCALtrans2devtab[] = {
 
 #define NUMTRANSPORTS  (sizeof(LOCALtrans2devtab)/sizeof(LOCALtrans2dev))
 
-static char*XLOCAL=NULL;
+static const char  *XLOCAL=NULL;
 static char*workingXLOCAL=NULL;
 static char*freeXLOCAL=NULL;
 
@@ -1658,7 +1658,7 @@ staticchar*freeXLOCAL=NULL;
 #endif
 
 static void
-TRANS(LocalInitTransports)(char *protocol)
+TRANS(LocalInitTransports)(const char *protocol)
 
 {
 prmsg(3,"LocalInitTransports(%s)\n", protocol);
@@ -2318,7 +2318,7 @@ TRANS(LocalCloseForCloning)(XtransConnInfo ciptr)
  */
 
 #ifdef TRANS_SERVER
-static char * local_aliases[] = {
+static const char * local_aliases[] = {
 # ifdef LOCAL_TRANS_PTS
   "pts",
 # endif
diff --git a/Xtranssock.c b/Xtranssock.c
index 775a7f9..1275196 100644
--- a/Xtranssock.c
+++ b/Xtranssock.c
@@ -172,7 +172,7 @@ from the copyright holders.
  */
 
 typedef struct _Sockettrans2dev {
-char   *transname;
+const char *transname;
 intfamily;
 intdevcotsname;
 intdevcltsname;
@@ -254,7 +254,7 @@ static int TRANS(SocketINETClose) (XtransConnInfo ciptr);
  */
 
 static int
-TRANS(SocketSelectFamily) (int first, char *family)
+TRANS(SocketSelectFamily) (int first, const char *family)
 
 {
 int i;
@@ -538,8 +538,8 @@ TRANS(SocketReopen) (int i _X_UNUSED, int type, int fd, 
char *port)
 #ifdef TRANS_CLIENT
 
 static XtransConnInfo
-TRANS(SocketOpenCOTSClientBase) (char *transname, char *protocol,
-   char *host, char *port, int previndex)
+TRANS(SocketOpenCOTSClientBase) (const char *transname, const char *protocol,
+  const char *host, const char *port, int previndex)
 {
 XtransConnInfo ciptr;
 inti = previndex;
@@ -2248,7 +2248,7 @@ TRANS(SocketUNIXCloseForCloning) (XtransConnInfo ciptr)
 
 #ifdef TCPCONN
 # ifdef TRANS_SERVER
-static char* tcp_nolisten[] = {
+static const char* tcp_nolisten[] = {
"inet",
 #if defined(IPv6) && defined(AF_INET6)
"inet6",
diff --git a/Xtransutil.c b/Xtransutil.c
index bf52b37..5dd2453 100644
--- a/Xtransutil.c
+++ b/Xtransutil.c
@@ -242,7 +242,7 @@ TRANS(GetMyNetworkId) (XtransConnInfo ciptr)
 char   *addr = ciptr->addr;
 char   hostnamebuf[256];
 char   *networkId = NULL;
-char   *transName = ciptr->transptr->TransName;
+const char *transName = ciptr->transptr->TransName;
 
 if (gethostname (hostnamebuf, sizeof (hostnamebuf)) < 0)
 {
-- 
1.7.3.2

___
xorg-devel@lists.x.org: X.Or

[PATCH:libxtrans 08/10] Fix warning: unused variable 'tmpport' with various configurations

[Alan Coopersmith]

Signed-off-by: Alan Coopersmith 
---
 Xtranssock.c |5 ++---
 1 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/Xtranssock.c b/Xtranssock.c
index 268c599..775a7f9 100644
--- a/Xtranssock.c
+++ b/Xtranssock.c
@@ -1433,7 +1433,6 @@ TRANS(SocketINETConnect) (XtransConnInfo ciptr, char 
*host, char *port)
 char   portbuf[PORTBUFSIZE];
 #endif
 
-long   tmpport;
 char   hostnamebuf[256];   /* tmp space */
 
 prmsg (2,"SocketINETConnect(%d,%s,%s)\n", ciptr->fd, host, port);
@@ -1457,7 +1456,7 @@ TRANS(SocketINETConnect) (XtransConnInfo ciptr, char 
*host, char *port)
 
 if (is_numeric (port))
 {
-   tmpport = X_TCP_PORT + strtol (port, (char**)NULL, 10);
+   long tmpport = X_TCP_PORT + strtol (port, (char**)NULL, 10);
sprintf (portbuf, "%lu", tmpport);
port = portbuf;
 }
@@ -1667,7 +1666,7 @@ TRANS(SocketINETConnect) (XtransConnInfo ciptr, char 
*host, char *port)
}
sockname.sin_port = htons (servp->s_port);
} else {
-   tmpport = strtol (port, (char**)NULL, 10);
+   long tmpport = strtol (port, (char**)NULL, 10);
if (tmpport < 1024 || tmpport > USHRT_MAX)
return TRANS_CONNECT_FAILED;
sockname.sin_port = htons (((unsigned short) tmpport));
-- 
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:libxtrans 07/10] Add _X_UNUSED attributes to silence unused parameter warnings

[Alan Coopersmith]

Not all the transport variants use all the arguments to every function,
but as long as one transport type needs it, they all get the args passed.

Signed-off-by: Alan Coopersmith 
---
 Xtransint.h  |4 
 Xtranslcl.c  |   20 ++--
 Xtranssock.c |2 +-
 Xtransutil.c |2 +-
 4 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/Xtransint.h b/Xtransint.h
index bfd79d6..1052777 100644
--- a/Xtransint.h
+++ b/Xtransint.h
@@ -78,6 +78,10 @@ from The Open Group.
 
 #include "Xtrans.h"
 
+#ifndef _X_UNUSED  /* Defined in Xfuncproto.h in xproto >= 7.0.22 */
+# define _X_UNUSED  /* */
+#endif
+
 #ifdef XTRANSDEBUG
 # include 
 #endif /* XTRANSDEBUG */
diff --git a/Xtranslcl.c b/Xtranslcl.c
index af935b0..7acc907 100644
--- a/Xtranslcl.c
+++ b/Xtranslcl.c
@@ -123,7 +123,7 @@ static int TRANS(LocalClose)(XtransConnInfo ciptr);
 /* Type Not Supported */
 
 static int
-TRANS(OpenFail)(XtransConnInfo ciptr, char *port)
+TRANS(OpenFail)(XtransConnInfo ciptr _X_UNUSED, char *port _X_UNUSED)
 
 {
 return -1;
@@ -132,7 +132,7 @@ TRANS(OpenFail)(XtransConnInfo ciptr, char *port)
 #ifdef TRANS_REOPEN
 
 static int
-TRANS(ReopenFail)(XtransConnInfo ciptr, int fd, char *port)
+TRANS(ReopenFail)(XtransConnInfo ciptr _X_UNUSED, int fd _X_UNUSED, char *port 
_X_UNUSED)
 
 {
 return 0;
@@ -221,7 +221,7 @@ extern char *ptsname(
 int
 );
 
-static void _dummy(int sig)
+static void _dummy(int sig _X_UNUSED)
 
 {
 }
@@ -1299,7 +1299,7 @@ TRANS(PTSReopenServer)(XtransConnInfo ciptr, int fd, char 
*port)
 #ifdef LOCAL_TRANS_NAMED
 
 static int
-TRANS(NAMEDReopenServer)(XtransConnInfo ciptr, int fd, char *port)
+TRANS(NAMEDReopenServer)(XtransConnInfo ciptr, int fd _X_UNUSED, char *port)
 
 {
 #ifdef NAMEDNODENAME
@@ -1866,7 +1866,7 @@ TRANS(LocalOpenClient)(int type, char *protocol, char 
*host, char *port)
 #ifdef TRANS_SERVER
 
 static XtransConnInfo
-TRANS(LocalOpenServer)(int type, char *protocol, char *host, char *port)
+TRANS(LocalOpenServer)(int type, char *protocol, char *host _X_UNUSED, char 
*port)
 
 {
 inti;
@@ -1981,7 +1981,7 @@ TRANS(LocalReopenServer)(int type, int index, int fd, 
char *port)
 #ifdef TRANS_CLIENT
 
 static XtransConnInfo
-TRANS(LocalOpenCOTSClient)(Xtransport *thistrans, char *protocol,
+TRANS(LocalOpenCOTSClient)(Xtransport *thistrans _X_UNUSED, char *protocol,
   char *host, char *port)
 
 {
@@ -2040,7 +2040,7 @@ TRANS(LocalOpenCOTSServer)(Xtransport *thistrans, char 
*protocol,
 #ifdef TRANS_CLIENT
 
 static XtransConnInfo
-TRANS(LocalOpenCLTSClient)(Xtransport *thistrans, char *protocol,
+TRANS(LocalOpenCLTSClient)(Xtransport *thistrans _X_UNUSED, char *protocol,
   char *host, char *port)
 
 {
@@ -2055,7 +2055,7 @@ TRANS(LocalOpenCLTSClient)(Xtransport *thistrans, char 
*protocol,
 #ifdef TRANS_SERVER
 
 static XtransConnInfo
-TRANS(LocalOpenCLTSServer)(Xtransport *thistrans, char *protocol,
+TRANS(LocalOpenCLTSServer)(Xtransport *thistrans _X_UNUSED, char *protocol,
   char *host, char *port)
 
 {
@@ -2134,7 +2134,7 @@ TRANS(LocalSetOption)(XtransConnInfo ciptr, int option, 
int arg)
 #ifdef TRANS_SERVER
 
 static int
-TRANS(LocalCreateListener)(XtransConnInfo ciptr, char *port, unsigned int 
flags)
+TRANS(LocalCreateListener)(XtransConnInfo ciptr, char *port, unsigned int 
flags _X_UNUSED)
 
 {
 prmsg(2,"LocalCreateListener(%p->%d,%s)\n",ciptr,ciptr->fd,port);
@@ -2199,7 +2199,7 @@ TRANS(LocalAccept)(XtransConnInfo ciptr, int *status)
 #ifdef TRANS_CLIENT
 
 static int
-TRANS(LocalConnect)(XtransConnInfo ciptr, char *host, char *port)
+TRANS(LocalConnect)(XtransConnInfo ciptr, char *host _X_UNUSED, char *port)
 
 {
 prmsg(2,"LocalConnect(%p->%d,%s)\n", ciptr, ciptr->fd, port);
diff --git a/Xtranssock.c b/Xtranssock.c
index c2d69e6..268c599 100644
--- a/Xtranssock.c
+++ b/Xtranssock.c
@@ -453,7 +453,7 @@ TRANS(SocketOpen) (int i, int type)
 #ifdef TRANS_REOPEN
 
 static XtransConnInfo
-TRANS(SocketReopen) (int i, int type, int fd, char *port)
+TRANS(SocketReopen) (int i _X_UNUSED, int type, int fd, char *port)
 
 {
 XtransConnInfo ciptr;
diff --git a/Xtransutil.c b/Xtransutil.c
index 3cb01c5..bf52b37 100644
--- a/Xtransutil.c
+++ b/Xtransutil.c
@@ -316,7 +316,7 @@ int
 void
 #endif
 #endif
-nameserver_lost(int sig)
+nameserver_lost(int sig _X_UNUSED)
 {
   nameserver_timedout = 1;
   longjmp (env, -1);
-- 
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:libxtrans 06/10] Mark __xtransname strings for debug messages as const char *

[Alan Coopersmith]

Signed-off-by: Alan Coopersmith 
---
 Xtrans.h |   18 +-
 1 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/Xtrans.h b/Xtrans.h
index 6f8f909..582b21c 100644
--- a/Xtrans.h
+++ b/Xtrans.h
@@ -70,14 +70,14 @@ from The Open Group.
 #ifdef X11_t
 #define TRANS(func) _X11Trans##func
 #ifdef XTRANSDEBUG
-static char* __xtransname = "_X11Trans";
+static const char *__xtransname = "_X11Trans";
 #endif
 #endif /* X11_t */
 
 #ifdef XSERV_t
 #define TRANS(func) _XSERVTrans##func
 #ifdef XTRANSDEBUG
-static char* __xtransname = "_XSERVTrans";
+static const char *__xtransname = "_XSERVTrans";
 #endif
 #define X11_t
 #endif /* XSERV_t */
@@ -85,35 +85,35 @@ static char* __xtransname = "_XSERVTrans";
 #ifdef XIM_t
 #define TRANS(func) _XimXTrans##func
 #ifdef XTRANSDEBUG
-static char* __xtransname = "_XimTrans";
+static const char *__xtransname = "_XimTrans";
 #endif
 #endif /* XIM_t */
 
 #ifdef FS_t
 #define TRANS(func) _FSTrans##func
 #ifdef XTRANSDEBUG
-static char* __xtransname = "_FSTrans";
+static const char *__xtransname = "_FSTrans";
 #endif
 #endif /* FS_t */
 
 #ifdef FONT_t
 #define TRANS(func) _FontTrans##func
 #ifdef XTRANSDEBUG
-static char* __xtransname = "_FontTrans";
+static const char *__xtransname = "_FontTrans";
 #endif
 #endif /* FONT_t */
 
 #ifdef ICE_t
 #define TRANS(func) _IceTrans##func
 #ifdef XTRANSDEBUG
-static char* __xtransname = "_IceTrans";
+static const char *__xtransname = "_IceTrans";
 #endif
 #endif /* ICE_t */
 
 #ifdef TEST_t
 #define TRANS(func) _TESTTrans##func
 #ifdef XTRANSDEBUG
-static char* __xtransname = "_TESTTrans";
+static const char *__xtransname = "_TESTTrans";
 #endif
 #endif /* TEST_t */
 
@@ -121,14 +121,14 @@ static char* __xtransname = "_TESTTrans";
 #define TRANS(func) _LBXPROXYTrans##func
 #define X11_t  /* The server defines this - so should the LBX proxy */
 #ifdef XTRANSDEBUG
-static char* __xtransname = "_LBXPROXYTrans";
+static const char *__xtransname = "_LBXPROXYTrans";
 #endif
 #endif /* LBXPROXY_t */
 
 #if !defined(TRANS)
 #define TRANS(func) _XTrans##func
 #ifdef XTRANSDEBUG
-static char* __xtransname = "_XTrans";
+static const char *__xtransname = "_XTrans";
 #endif
 #endif /* !TRANS */
 
-- 
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:libxtrans 05/10] Fix unused variable warnings

[Alan Coopersmith]

Signed-off-by: Alan Coopersmith 
---
 Xtranslcl.c  |1 -
 Xtranssock.c |9 +
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/Xtranslcl.c b/Xtranslcl.c
index 8be8a58..af935b0 100644
--- a/Xtranslcl.c
+++ b/Xtranslcl.c
@@ -840,7 +840,6 @@ static int
 TRANS(NAMEDResetListener) (XtransConnInfo ciptr)
 
 {
-  int status = TRANS_RESET_NOOP;
   struct sockaddr_un  *sockname=(struct sockaddr_un *) ciptr->addr;
   struct stat statb;
 
diff --git a/Xtranssock.c b/Xtranssock.c
index 27a939d..c2d69e6 100644
--- a/Xtranssock.c
+++ b/Xtranssock.c
@@ -1419,15 +1419,16 @@ TRANS(SocketINETConnect) (XtransConnInfo ciptr, char 
*host, char *port)
 struct addrinfohints;
 char   ntopbuf[INET6_ADDRSTRLEN];
 intresetonce = 0;
-#endif
+#else
 struct sockaddr_in sockname;
+struct hostent *hostp;
+struct servent *servp;
+unsigned long  tmpaddr;
+#endif
 #ifdef XTHREADS_NEEDS_BYNAMEPARAMS
 _Xgethostbynameparams hparams;
 _Xgetservbynameparams sparams;
 #endif
-struct hostent *hostp;
-struct servent *servp;
-unsigned long  tmpaddr;
 #ifdef X11_t
 char   portbuf[PORTBUFSIZE];
 #endif
-- 
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:libxtrans 04/10] Fix warning: ISO C90 forbids mixed declarations and code

[Alan Coopersmith]

Signed-off-by: Alan Coopersmith 
---
 Xtranslcl.c |4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Xtranslcl.c b/Xtranslcl.c
index 1ec0641..8be8a58 100644
--- a/Xtranslcl.c
+++ b/Xtranslcl.c
@@ -732,12 +732,12 @@ TRANS(NAMEDOpenClient)(XtransConnInfo ciptr, char *port)
 static int
 TRANS(NAMEDOpenPipe)(const char *server_path)
 {
-prmsg(2,"NAMEDOpenPipe(%s)\n", server_path);
-
 intfd, pipefd[2];
 struct statsbuf;
 intmode;
 
+prmsg(2,"NAMEDOpenPipe(%s)\n", server_path);
+
 #ifdef HAS_STICKY_DIR_BIT
 mode = 01777;
 #else
-- 
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:libxtrans 03/10] Fix printf format string warnings

[Alan Coopersmith]

Now that prmsg lets arguments types actually be checked, fix
the warnings found.

Signed-off-by: Alan Coopersmith 
---
 Xtranslcl.c  |   34 +-
 Xtranssock.c |2 +-
 Xtransutil.c |2 +-
 3 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/Xtranslcl.c b/Xtranslcl.c
index 24c43e5..1ec0641 100644
--- a/Xtranslcl.c
+++ b/Xtranslcl.c
@@ -871,7 +871,7 @@ TRANS(NAMEDAccept)(XtransConnInfo ciptr, XtransConnInfo 
newciptr, int *status)
 {
 struct strrecvfd str;
 
-prmsg(2,"NAMEDAccept(%x->%d)\n", ciptr, ciptr->fd);
+prmsg(2,"NAMEDAccept(%p->%d)\n", ciptr, ciptr->fd);
 
 if( ioctl(ciptr->fd, I_RECVFD, &str ) < 0 ) {
prmsg(1, "NAMEDAccept: ioctl(I_RECVFD) failed, errno=%d\n", errno);
@@ -1812,7 +1812,7 @@ TRANS(LocalOpenClient)(int type, char *protocol, char 
*host, char *port)
 
 if( (ciptr=(XtransConnInfo)xcalloc(1,sizeof(struct _XtransConnInfo))) == 
NULL )
 {
-   prmsg(1,"LocalOpenClient: calloc(1,%d) failed\n",
+   prmsg(1,"LocalOpenClient: calloc(1,%lu) failed\n",
  sizeof(struct _XtransConnInfo));
return NULL;
 }
@@ -1886,7 +1886,7 @@ TRANS(LocalOpenServer)(int type, char *protocol, char 
*host, char *port)
 
 if( (ciptr=(XtransConnInfo)xcalloc(1,sizeof(struct _XtransConnInfo))) == 
NULL )
 {
-   prmsg(1,"LocalOpenServer: calloc(1,%d) failed\n",
+   prmsg(1,"LocalOpenServer: calloc(1,%lu) failed\n",
  sizeof(struct _XtransConnInfo));
return NULL;
 }
@@ -1940,7 +1940,7 @@ TRANS(LocalReopenServer)(int type, int index, int fd, 
char *port)
 
 if( (ciptr=(XtransConnInfo)xcalloc(1,sizeof(struct _XtransConnInfo))) == 
NULL )
 {
-   prmsg(1,"LocalReopenServer: calloc(1,%d) failed\n",
+   prmsg(1,"LocalReopenServer: calloc(1,%lu) failed\n",
  sizeof(struct _XtransConnInfo));
return NULL;
 }
@@ -2138,7 +2138,7 @@ static int
 TRANS(LocalCreateListener)(XtransConnInfo ciptr, char *port, unsigned int 
flags)
 
 {
-prmsg(2,"LocalCreateListener(%x->%d,%s)\n",ciptr,ciptr->fd,port);
+prmsg(2,"LocalCreateListener(%p->%d,%s)\n",ciptr,ciptr->fd,port);
 
 return 0;
 }
@@ -2149,7 +2149,7 @@ TRANS(LocalResetListener)(XtransConnInfo ciptr)
 {
 LOCALtrans2dev *transptr;
 
-prmsg(2,"LocalResetListener(%x)\n",ciptr);
+prmsg(2,"LocalResetListener(%p)\n",ciptr);
 
 transptr=(LOCALtrans2dev *)ciptr->priv;
 if (transptr->devreset != NULL) {
@@ -2166,13 +2166,13 @@ TRANS(LocalAccept)(XtransConnInfo ciptr, int *status)
 XtransConnInfo newciptr;
 LOCALtrans2dev *transptr;
 
-prmsg(2,"LocalAccept(%x->%d)\n", ciptr, ciptr->fd);
+prmsg(2,"LocalAccept(%p->%d)\n", ciptr, ciptr->fd);
 
 transptr=(LOCALtrans2dev *)ciptr->priv;
 
 if( (newciptr=(XtransConnInfo)xcalloc(1,sizeof(struct 
_XtransConnInfo)))==NULL )
 {
-   prmsg(1,"LocalAccept: calloc(1,%d) failed\n",
+   prmsg(1,"LocalAccept: calloc(1,%lu) failed\n",
  sizeof(struct _XtransConnInfo));
*status = TRANS_ACCEPT_BAD_MALLOC;
return NULL;
@@ -2203,7 +2203,7 @@ static int
 TRANS(LocalConnect)(XtransConnInfo ciptr, char *host, char *port)
 
 {
-prmsg(2,"LocalConnect(%x->%d,%s)\n", ciptr, ciptr->fd, port);
+prmsg(2,"LocalConnect(%p->%d,%s)\n", ciptr, ciptr->fd, port);
 
 return 0;
 }
@@ -2215,7 +2215,7 @@ static int
 TRANS(LocalBytesReadable)(XtransConnInfo ciptr, BytesReadable_t *pend )
 
 {
-prmsg(2,"LocalBytesReadable(%x->%d,%x)\n", ciptr, ciptr->fd, pend);
+prmsg(2,"LocalBytesReadable(%p->%d,%p)\n", ciptr, ciptr->fd, pend);
 
 #if defined(SCO325)
 return ioctl(ciptr->fd, I_NREAD, (char *)pend);
@@ -2228,7 +2228,7 @@ static int
 TRANS(LocalRead)(XtransConnInfo ciptr, char *buf, int size)
 
 {
-prmsg(2,"LocalRead(%d,%x,%d)\n", ciptr->fd, buf, size );
+prmsg(2,"LocalRead(%d,%p,%d)\n", ciptr->fd, buf, size );
 
 return read(ciptr->fd,buf,size);
 }
@@ -2237,7 +2237,7 @@ static int
 TRANS(LocalWrite)(XtransConnInfo ciptr, char *buf, int size)
 
 {
-prmsg(2,"LocalWrite(%d,%x,%d)\n", ciptr->fd, buf, size );
+prmsg(2,"LocalWrite(%d,%p,%d)\n", ciptr->fd, buf, size );
 
 return write(ciptr->fd,buf,size);
 }
@@ -2246,7 +2246,7 @@ static int
 TRANS(LocalReadv)(XtransConnInfo ciptr, struct iovec *buf, int size)
 
 {
-prmsg(2,"LocalReadv(%d,%x,%d)\n", ciptr->fd, buf, size );
+prmsg(2,"LocalReadv(%d,%p,%d)\n", ciptr->fd, buf, size );
 
 return READV(ciptr,buf,size);
 }
@@ -2255,7 +2255,7 @@ static int
 TRANS(LocalWritev)(XtransConnInfo ciptr, struct iovec *buf, int size)
 
 {
-prmsg(2,"LocalWritev(%d,%x,%d)\n", ciptr->fd, buf, size );
+prmsg(2,"LocalWritev(%d,%p,%d)\n", ciptr->fd, buf, size );
 
 return WRITEV(ciptr,buf,size);
 }
@@ -2264,7 +2264,7 @@ static int
 TRANS(LocalDisconnect)(XtransConnInfo ciptr)
 
 {
-prmsg(2,"LocalDisconnect(%x->%d)\n", ciptr, ciptr->fd);
+prmsg(2,"LocalDisconnect(%p->%d)\n", ciptr, ciptr->fd);
 
 ret

[PATCH:libxtrans 01/10] Fix warnings about static functions declared but never defined

[Alan Coopersmith]

Add #define XTRANS_TRANSPORT_C to transport.c and check for it
before making static function declarations and other bits needed
only when compiling the Xtrans code itself, not from other sources
that include the Xtransint.h header for the struct definitions.

Signed-off-by: Alan Coopersmith 
---
 Xtransint.h |7 ++-
 transport.c |3 +++
 2 files changed, 9 insertions(+), 1 deletions(-)

diff --git a/Xtransint.h b/Xtransint.h
index 787d721..47d98ba 100644
--- a/Xtransint.h
+++ b/Xtransint.h
@@ -68,7 +68,7 @@ from The Open Group.
  * message.
  */
 
-#ifndef XTRANSDEBUG
+#if !defined(XTRANSDEBUG) && defined(XTRANS_TRANSPORT_C)
 #  define XTRANSDEBUG 1
 #endif
 
@@ -307,6 +307,9 @@ typedef struct _Xtransport_table {
 /* Flags to preserve when setting others */
 #define TRANS_KEEPFLAGS(TRANS_NOUNLINK|TRANS_ABSTRACT)
 
+#ifdef XTRANS_TRANSPORT_C /* only provide static function prototypes when
+building the transport.c file that has them in */
+
 #ifdef __clang__
 /* Not all clients make use of all provided statics */
 #pragma clang diagnostic push
@@ -421,4 +424,6 @@ static int trans_mkdir (
 #define PRMSG(lvl,x,a,b,c) ((void)0)
 #endif /* XTRANSDEBUG */
 
+#endif /* XTRANS_TRANSPORT_C */
+
 #endif /* _XTRANSINT_H_ */
diff --git a/transport.c b/transport.c
index 0013b01..c14057d 100644
--- a/transport.c
+++ b/transport.c
@@ -53,6 +53,9 @@ from The Open Group.
 #define xrealloc(_ptr,_size)   realloc(_ptr,_size)
 #define xfree(_ptr)free(_ptr)
 
+#define XTRANS_TRANSPORT_C  /* used to flag Xtransint.h that it's being used
+  here, not just #included in another file */
+
 #include "Xtransint.h"
 
 #ifdef __clang__
-- 
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:libxtrans 00/10] Warning cleanups

[Alan Coopersmith]

These greatly reduce the warning noise generated by the libxtrans code
when building the X server, libX11, and other modules using libxtrans.

Alan Coopersmith (10):
  Fix warnings about static functions declared but never defined
  Convert PRMSG macro to prmsg inline function
  Fix printf format string warnings
  Fix warning: ISO C90 forbids mixed declarations and code
  Fix unused variable warnings
  Mark __xtransname strings for debug messages as const char *
  Add _X_UNUSED attributes to silence unused parameter warnings
  Fix warning: unused variable 'tmpport' with various configurations
  Add const attributes to fix gcc -Wwrite-strings warnings
  Convert a bunch of sprintf calls to snprintf

 Xtrans.c |  135 +++---
 Xtrans.h |   20 ++--
 Xtransint.h  |  115 ++
 Xtranslcl.c  |  369 -
 Xtranssock.c |  336 +
 Xtranstli.c  |  283 +---
 Xtransutil.c |   59 +-
 transport.c  |3 +
 8 files changed, 650 insertions(+), 670 deletions(-)

-- 
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 keyboard] Remove calls to xf86IsPc98()

[Alan Coopersmith]

On 09/25/11 04:56 PM, Peter Hutterer wrote:

This call is being removed from the server and this isn't work keeping
ifdefs around for.

Signed-off-by: Peter Hutterer


Tested here and seems to work well, so I pushed, thanks.

To ssh://git.freedesktop.org/git/xorg/driver/xf86-input-keyboard
   38e4def..20beb15  master -> master

--
-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] Add additional compose sequences for pound sterling and yen (lower case)

[James Cloos]

> "HdG" == Hans de Goede  writes:

HdG> Thanks, looks good. One remark for consistency with the other
HdG> currency symbols as well as gtk's compose table, it might be
HdG> good to also add sequences for dollar cent using capital C.

[for the benefit of the archives -JimC]

They were added and reverted because they are already used for
the character U+20A1 COLON SIGN [₡].

-JimC
-- 
James Cloos  OpenPGP: 1024D/ED7DAEA6
___
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: [Mesa-dev] [PATCH] RFC: refactor out dri2 proto code into libdri2

[Rob Clark]

On Tue, Sep 27, 2011 at 12:22 PM, Eric Anholt  wrote:
> On Thu, 22 Sep 2011 15:36:07 -0500, Rob Clark  wrote:
>> Since I was working on some extensions to DRI2 protocol for handling
>> video, it occurred to me that it might be easier to extend the
>> protocol if there weren't N different copies of dri2.c floating around
>> in various different src trees..  also, for video, with one or two
>> other small extensions (ie. standard way to mmap() GEM buffers), I
>> think it should eventually be possible for DRI2 to be directly used
>> by end applications (ie. for sw video decoders, etc).  So refactoring
>> this out into a shared library pretty much seemed like the right-
>> thing-to-do.
>>
>> This patch updates mesa to remove two nearly identical copies of DRI2
>> protocol code.  The error, wire->event, and event->wire stuff is split
>> out into some callbacks, as this was really the only differences
>> between the two copies of dri2.c (and also, other than name changes,
>> the main difference between what is in mesa and vaapi).  Also, from
>> looking at the git history, it appears that these callbacks are the
>> main place where there have been any changes to this code in the last
>> couple years.
>>
>> Temporary home for libdri2 tree is here:
>>
>>   git://people.freedesktop.org/~robclark/libdri2
>>
>> Eventually I can make patches for libva and libvdpau.. but I started
>> with mesa because that was something I actually had a way to test.
>
> Splitting out the code is definitely better than the copy and paste
> disaster we had before.
>
> I'd rather see us move to using XCB instead even more.  But for that, I
> had issues with wiring up the event handling bits (which wants to
> intercept events inside the GL and not expose them to the client).
>

I'd started to look at the XCB DRI2 code.. but what I managed to find
(and maybe I wasn't looking in the right place) was somewhat
incomplete.. and I didn't want to figure out enough of XCB to add
additional messages ;-)

But long term, I suppose underneath the libdri2 API we can replace the
proto building/parsing stuff with XCB?  I guess it won't be as
asynchronousy with req/reply stuff split out, but I'm not entirely
sure if that is something that would hugely benefit mesa anyways.

BR,
-R
___
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: Building DRI-disabled drivers with DRI-enabled xserver

[Daniel Stone]

Hi,

On 27 September 2011 19:05, Julien Cristau  wrote:
> On Mon, Sep 26, 2011 at 19:22:31 -0400, Matt Turner wrote:
>> It seems impossible currently to build DDXs with --disable-dri against
>> an X server built with DRI. The X server's xorg-server.h file defines
>> XF86DRI, which is included by the DDX's config.h files.
>>
>> In config.h, if --enable-dri is passed, XF86DRI is defined to 1. With
>> --disable-dri, /* #undef XF86DRI */ is added, which doesn't negate the
>> definition provided by xorg-server.h, and causes build failures later
>> on.
>>
>> Is this intended? We've had a bug about it in Gentoo for a while [1]
>> and it seems to cover xf86-video-{tdfx,sis,ati,intel,mga,r128,savage}.
>>
>> The autoconf manual [2] seems to say there's no way to put #undef XXX
>> into config.h. What's the solution here?
>>
> Sounds like we should just drop this option from the drivers.

Well, either that or just use a different symbol name that doesn't
clash, given that XF86DRI indicates that support exists in the server,
independent of the driver's build options.  I guess you'd need an
autoconf check that XF86DRI is defined in xorg-server.h still though.

Cheers,
Daniel
___
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: [Pull Request] Glamor: A 2D rendering acceleration implementation based on OpenGL

[Alan Coopersmith]

[Fixed cc to xorg-devel instead of xorg, since xorg is for discussing usage,
 xorg-devel where we discuss changes to the code - the same goes for the IRC
 channels btw.]

Well, you request reviews by mailing xorg-devel and asking for them, not
skipping straight to "This is ready to merge to master, pull it in."

Just a quick glance through git log -p output on a local pull of that branch
shows it's not ready for merging - there's tons of highlighted whitespace
errors and some obvious style inconsistencies with the existing code base,
as well as with itself.  (Some files switch back and forth between different
amounts of space per indent level between different functions or even in the
same function.)

It would also be nice if it built, but my attempt to do so fails with:
 "glamor_ddx.c", line 34: cannot find include file: 
which suggests more work is needed on the configure.ac checks.

-alan-

On 09/27/11 09:19 AM, zhigang gong wrote:

Alan,

Thanks for your comments.Yes, I agree with you that glamor need more reviews
before it can be merged in. Because of some historic reason, glamor hasn't
been developed in a open way. I want to change it from now on. Actually
I discussed with Keith and Eric last week, and as some how glamor is
a standalone module and will not affect too many other parts, Keith suggested
me to submit this pull request soon, and ask comments from community.


On Tue, Sep 27, 2011 at 11:39 PM, Alan Coopersmith
  wrote:

On 09/27/11 06:50 AM, zhigang gong wrote:


  [Over 225 commits]
  47 files changed, 10484 insertions(+), 14 deletions(-)


That's a huge amount of change without any Reviewed-by: tags, which
makes it seem very premature for requesting a Pull, especially as it's
the first time xorg-devel has really ever heard of this project.

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





--
-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: Building DRI-disabled drivers with DRI-enabled xserver

[Julien Cristau]

On Mon, Sep 26, 2011 at 19:22:31 -0400, Matt Turner wrote:

> Hi,
> 
> It seems impossible currently to build DDXs with --disable-dri against
> an X server built with DRI. The X server's xorg-server.h file defines
> XF86DRI, which is included by the DDX's config.h files.
> 
> In config.h, if --enable-dri is passed, XF86DRI is defined to 1. With
> --disable-dri, /* #undef XF86DRI */ is added, which doesn't negate the
> definition provided by xorg-server.h, and causes build failures later
> on.
> 
> Is this intended? We've had a bug about it in Gentoo for a while [1]
> and it seems to cover xf86-video-{tdfx,sis,ati,intel,mga,r128,savage}.
> 
> The autoconf manual [2] seems to say there's no way to put #undef XXX
> into config.h. What's the solution here?
> 
Sounds like we should just drop this option from the drivers.

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] PciTag is unused when using libpciaccess

[Julien Cristau]

On Mon, Sep 26, 2011 at 21:32:52 +0200, Mark Kettenis wrote:

> This should be the right thing to do regardless whether the pci bus
> cleanup gets committed.
> 
> Signed-off-by: Mark Kettenis 
> ---
>  src/ct_driver.h |2 ++
>  1 files changed, 2 insertions(+), 0 deletions(-)
> 
Reviewed-by: Julien Cristau 

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 util/modular] build.sh: aiptek, acecad and penmount are unmaintained

[Julien Cristau]

On Tue, Sep 27, 2011 at 09:22:46 -0400, Gaetan Nadon wrote:

> Julien,
> 
> I recall you ship penmount once a year. Is it actually working?

The only thing I'm able to check is whether it builds.
http://bugs.debian.org/cgi-bin/pkgreport.cgi?archive=both;src=xserver-xorg-input-penmount
doesn't show any actual report from users, just build failures for old
server API changes.

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: [Mesa-dev] Reminder: FOSDEM2012 speakers due Okt 1st.

[Daniel Vetter]

On Mon, Sep 26, 2011 at 07:21:42AM +0200, Luc Verhaegen wrote:
> As stated in an email sent a week and a half ago, i need 6 "we will be 
> there nomatter what" speakers for FOSDEM this year before i go and talk
> to the FOSDEM organizers.
> 
> So far we have:
> * Martin Peres - Nouveau
> * Alon Levy - Xspice
> * Chris Wilson - Cairo
> 
> Only half the amount needed, with 5 days left. Surely we can do better 
> than that for X/Mesa/Wayland/Anything graphics.

Chris convinced me to fry myself giving a talk about cool new stuff heading
towards kernel drm and how much of this is driven by the needs of SoC's.
Topics could include: dma buffer sharing work by Linaro, drm overlay
support, who controls a device (drm, v4l, fb?), perhaps also how tightly
integrated UMA designs like Sandybridge will need better drm<->core mm
integration and what great stuff we could do with this. gpu scheduling
also fits into here. I'll see what makes a good fit and shows best what
awesome stuff is currently going on in opens source graphics.

Cheers, Daniel
-- 
Daniel Vetter
Mail: dan...@ffwll.ch
Mobile: +41 (0)79 365 57 48
___
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] edid: Add quirk for Acer Aspire One 110

[Ross Burton]

At least one revision of the AAO reports a 190x110mm maximum size but a
451x113mm mode.

X.Org Bug 41141 
---
 hw/xfree86/modes/xf86EdidModes.c |5 +
 1 files changed, 5 insertions(+), 0 deletions(-)

diff --git a/hw/xfree86/modes/xf86EdidModes.c b/hw/xfree86/modes/xf86EdidModes.c
index 9ff2f0d..86065f8 100644
--- a/hw/xfree86/modes/xf86EdidModes.c
+++ b/hw/xfree86/modes/xf86EdidModes.c
@@ -165,6 +165,11 @@ static Bool quirk_detailed_use_maximum_size (int 
scrnIndex, xf86MonPtr DDC)
DDC->vendor.prod_id == 6400)
return TRUE;
 
+/* Bug #41141: Acer Aspire One */
+if (memcmp (DDC->vendor.name, "LGD", 4) == 0 &&
+   DDC->vendor.prod_id == 0x7f01)
+   return TRUE;
+
 return FALSE;
 }
 
-- 
1.7.6.3

___
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: [Mesa-dev] Reminder: FOSDEM2012 speakers due Okt 1st.

[Ilyes Gouta]

Hi,

Come on guys, we need a "Wayland state of the art" talk! Please :)

-Ilyes
On Sep 26, 2011 8:45 AM, "Luc Verhaegen"  wrote:
> On Mon, Sep 26, 2011 at 09:14:05AM +0200, Luc Verhaegen wrote:
>> On Mon, Sep 26, 2011 at 09:09:57AM +0200, Kai-Uwe Behrmann wrote:
>> > Am 26.09.11, 07:21 +0200 schrieb Luc Verhaegen:
>> >> * Martin Peres - Nouveau
>> >> * Alon Levy - Xspice
>> >> * Chris Wilson - Cairo
>> >>
>> >> Only half the amount needed, with 5 days left. Surely we can do better
>> >> than that for X/Mesa/Wayland/Anything graphics.
>> >
>> > I can talk about ICC colour management on top of a compositing window
>> > manager. The talk would cover CompICC and the X Color Management spec.
>> >
>> > kind regards
>> > Kai-Uwe Behrmann
>>
>> Great stuff :)
>>
>> Luc Verhaegen.
>
> To clarify, since Kai-Uwe wondered whether ICC would fit into an "Xorg
> track" at FOSDEM: anything related to X/Graphics drivers/Wayland/...
> goes.
>
> Also, the exact topic does not need to be (fully) clear yet, all i need
> to know now is that you are definitely coming, and that you would be
> happy to talk about something that somewhat fits into this possible
> devroom.
>
> I would also like to know now which general topic, or topics, you could
> talk about, so i have something to show for with the FOSDEM organizers.
> If, by the time the FOSDEM schedule needs to be completed, you decide
> that you have something completely to talk about in this DevRoom, then
> that is just fine.
>
> Luc Verhaegen.
> ___
> mesa-dev mailing list
> mesa-...@lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/mesa-dev
___
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] Add additional compose sequences for pound sterling and yen (lower case)

[Hans de Goede]

Hi,

On 09/26/2011 01:32 AM, Jeremy Huddleston wrote:


https://bugs.freedesktop.org/show_bug.cgi?id=1013

Signed-off-by: Jeremy Huddleston
---
  nls/en_US.UTF-8/Compose.pre |4 
  1 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/nls/en_US.UTF-8/Compose.pre b/nls/en_US.UTF-8/Compose.pre
index fb64cb9..0e82dcb 100644
--- a/nls/en_US.UTF-8/Compose.pre
+++ b/nls/en_US.UTF-8/Compose.pre
@@ -180,9 +180,13 @@ XCOMM "₵" U20b5 CEDI SIGN
 : "¢"   cent # CENT SIGN
 : "¢"   cent # CENT SIGN
 : "£"   sterling # POUND SIGN
+: "£"   sterling # POUND SIGN
+: "£"   sterling # POUND SIGN
 : "£"   sterling # POUND SIGN
 : "¥"   yen # YEN SIGN
+: "¥"   yen # YEN SIGN
 : "¥"   yen # YEN SIGN
+: "¥"   yen # YEN SIGN

  XCOMM Long S
 : "ſ"   U017f # LATIN SMALL 
LETTER LONG S


Thanks, looks good. One remark for consistency with the other currency
symbols as well as gtk's compose table, it might be good to also add
sequences for dollar cent using capital C.

Regards,

Hans
___
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: [Mesa-dev] [PATCH] RFC: refactor out dri2 proto code into libdri2

[Eric Anholt]

On Thu, 22 Sep 2011 15:36:07 -0500, Rob Clark  wrote:
> Since I was working on some extensions to DRI2 protocol for handling
> video, it occurred to me that it might be easier to extend the
> protocol if there weren't N different copies of dri2.c floating around
> in various different src trees..  also, for video, with one or two
> other small extensions (ie. standard way to mmap() GEM buffers), I
> think it should eventually be possible for DRI2 to be directly used
> by end applications (ie. for sw video decoders, etc).  So refactoring
> this out into a shared library pretty much seemed like the right-
> thing-to-do.
> 
> This patch updates mesa to remove two nearly identical copies of DRI2
> protocol code.  The error, wire->event, and event->wire stuff is split
> out into some callbacks, as this was really the only differences
> between the two copies of dri2.c (and also, other than name changes,
> the main difference between what is in mesa and vaapi).  Also, from
> looking at the git history, it appears that these callbacks are the
> main place where there have been any changes to this code in the last
> couple years.
> 
> Temporary home for libdri2 tree is here:
> 
>   git://people.freedesktop.org/~robclark/libdri2
> 
> Eventually I can make patches for libva and libvdpau.. but I started
> with mesa because that was something I actually had a way to test.

Splitting out the code is definitely better than the copy and paste
disaster we had before.

I'd rather see us move to using XCB instead even more.  But for that, I
had issues with wiring up the event handling bits (which wants to
intercept events inside the GL and not expose them to the client).


pgp5Um71fUub9.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: [Pull Request] Glamor: A 2D rendering acceleration implementation based on OpenGL

[Alan Coopersmith]

On 09/27/11 10:14 AM, Keith Packard wrote:

On Tue, 27 Sep 2011 08:39:33 -0700, Alan 
Coopersmith  wrote:

On 09/27/11 06:50 AM, zhigang gong wrote:

   [Over 225 commits]
   47 files changed, 10484 insertions(+), 14 deletions(-)


That's a huge amount of change without any Reviewed-by: tags, which
makes it seem very premature for requesting a Pull, especially as it's
the first time xorg-devel has really ever heard of this project.


I'd like opinions on what kind of process we should follow for projects
like this. It's something like a Linux "staging" driver at this point,
clearly not ready for use in production systems, but something that
might become useful if more people worked on it.



For starters, we should probably take this discussion to xorg-devel (cc'ed)
instead of the xorg list the request was originally incorrectly sent to.

--
-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] udev: make use of udev_enumerate_add_match_tag() only when it is available

[Dave Airlie]

From: Lennart Poettering 

udev_enumerate_add_match_tag() and udev_monitor_filter_add_match_tag()
are mostly optimizations, hence simply skip these calls if they are not
available in the installed version of libudev.

This should fix the build on older versions of udev.

[airlied: fixes tinderbox failures on RHEL6]

Signed-off-by: Lennart Poettering 
Reviewed-by: Dave Airlie 
Tested-by: Dave Airlie 
---
 config/udev.c   |4 
 configure.ac|9 +
 include/dix-config.h.in |6 ++
 3 files changed, 19 insertions(+), 0 deletions(-)

diff --git a/config/udev.c b/config/udev.c
index 1ba0d50..e2b3726 100644
--- a/config/udev.c
+++ b/config/udev.c
@@ -285,8 +285,10 @@ config_udev_init(void)
 udev_monitor_filter_add_match_subsystem_devtype(udev_monitor, "input", 
NULL);
 udev_monitor_filter_add_match_subsystem_devtype(udev_monitor, "tty", 
NULL); /* For Wacom serial devices */
 
+#ifdef HAVE_UDEV_MONITOR_FILTER_ADD_MATCH_TAG
 if (SeatId && strcmp(SeatId, "seat0"))
 udev_monitor_filter_add_match_tag(udev_monitor, SeatId);
+#endif
 
 if (udev_monitor_enable_receiving(udev_monitor)) {
 ErrorF("config/udev: failed to bind the udev monitor\n");
@@ -300,8 +302,10 @@ config_udev_init(void)
 udev_enumerate_add_match_subsystem(enumerate, "input");
 udev_enumerate_add_match_subsystem(enumerate, "tty");
 
+#ifdef HAVE_UDEV_ENUMERATE_ADD_MATCH_TAG
 if (SeatId && strcmp(SeatId, "seat0"))
 udev_enumerate_add_match_tag(enumerate, SeatId);
+#endif
 
 udev_enumerate_scan_devices(enumerate);
 devices = udev_enumerate_get_list_entry(enumerate);
diff --git a/configure.ac b/configure.ac
index b0d2643..30716fb 100644
--- a/configure.ac
+++ b/configure.ac
@@ -822,6 +822,15 @@ if test "x$CONFIG_UDEV" = xyes; then
AC_MSG_ERROR([udev configuration API requested, but libudev is 
not installed])
fi
AC_DEFINE(CONFIG_UDEV, 1, [Use libudev for input hotplug])
+
+   SAVE_LIBS=$LIBS
+   SAVE_CFLAGS=$CFLAGS
+   CFLAGS=$UDEV_CFLAGS
+   LIBS=$UDEV_LIBS
+   AC_CHECK_FUNCS([udev_monitor_filter_add_match_tag])
+   AC_CHECK_FUNCS([udev_enumerate_add_match_tag])
+   LIBS=$SAVE_LIBS
+   CFLAGS=$SAVE_CFLAGS
 fi
 
 dnl HAVE_DBUS is true if we actually have the D-Bus library, whereas
diff --git a/include/dix-config.h.in b/include/dix-config.h.in
index 5facb11..2dcaf6b 100644
--- a/include/dix-config.h.in
+++ b/include/dix-config.h.in
@@ -402,6 +402,12 @@
 /* Use libudev for input hotplug */
 #undef CONFIG_UDEV
 
+/* Use udev_monitor_filter_add_match_tag() */
+#undef HAVE_UDEV_MONITOR_FILTER_ADD_MATCH_TAG
+
+/* Use udev_enumerate_add_match_tag() */
+#undef HAVE_UDEV_ENUMERATE_ADD_MATCH_TAG
+
 /* Use D-Bus for input hotplug */
 #undef CONFIG_NEED_DBUS
 
-- 
1.7.6.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] fix doPolyText use-after-free issue

[Alan Hourihane]

dixfonts: Don't overwrite local c variable until new_closure is safely
initialized.

Signed-off-by: Alan Hourihane 

diff --git a/dix/dixfonts.c b/dix/dixfonts.c
index fbac124..d2bcb84 100644
--- a/dix/dixfonts.c
+++ b/dix/dixfonts.c
@@ -1302,31 +1302,30 @@ doPolyText(ClientPtr client, PTclosurePtr c)
 goto bail;
 }
 *new_closure = *c;
-c = new_closure;
 
-len = c->endReq - c->pElt;
-c->data = malloc(len);
-if (!c->data)
+len = new_closure->endReq - new_closure->pElt;
+new_closure->data = malloc(len);
+if (!new_closure->data)
 {
-free(c);
+free(new_closure);
 err = BadAlloc;
 goto bail;
 }
-memmove(c->data, c->pElt, len);
-c->pElt = c->data;
-c->endReq = c->pElt + len;
+memmove(new_closure->data, new_closure->pElt, len);
+new_closure->pElt = new_closure->data;
+new_closure->endReq = new_closure->pElt + len;
 
 /* Step 2 */
 
-pGC = GetScratchGC(c->pGC->depth, c->pGC->pScreen);
+pGC = GetScratchGC(new_closure->pGC->depth,
new_closure->pGC->pScreen);
 if (!pGC)
 {
-free(c->data);
-free(c);
+free(new_closure->data);
+free(new_closure);
 err = BadAlloc;
 goto bail;
 }
-if ((err = CopyGC(c->pGC, pGC, GCFunction |
+if ((err = CopyGC(new_closure->pGC, pGC, GCFunction |
   GCPlaneMask | GCForeground |
   GCBackground | GCFillStyle |
   GCTile | GCStipple |
@@ -1337,15 +1336,16 @@ doPolyText(ClientPtr client, PTclosurePtr c)
   Success)
 {
 FreeScratchGC(pGC);
-free(c->data);
-free(c);
+free(new_closure->data);
+free(new_closure);
 err = BadAlloc;
 goto bail;
 }
+c = new_closure;
 origGC = c->pGC;
 c->pGC = pGC;
 ValidateGC(c->pDraw, c->pGC);
-
+
 ClientSleep(client, (ClientSleepProcPtr)doPolyText, c);
 
 /* Set up to perform steps 3 and 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 util/modular] build.sh: aiptek, acecad and penmount are unmaintained

[Gaetan Nadon]

On Tue, 2011-09-27 at 15:28 +0200, Julien Cristau wrote:

> On Tue, Sep 27, 2011 at 09:22:46 -0400, Gaetan Nadon wrote:
> 
> > Julien,
> > 
> > I recall you ship penmount once a year. Is it actually working?
> 
> The only thing I'm able to check is whether it builds.
> http://bugs.debian.org/cgi-bin/pkgreport.cgi?archive=both;src=xserver-xorg-input-penmount
> doesn't show any actual report from users, just build failures for old
> server API changes.
> 
> Cheers,
> Julien


Thanks

Reviewed-by: Gaetan Nadon 



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

[PATCH xserver] autoconf: autoreconf of xserver produces warnings #38185

[Gaetan Nadon]

From: Christopher Yeleighton 

https://bugs.freedesktop.org/show_bug.cgi?id=38185

warning: AC_LANG_CONFTEST: no AC_LANG_SOURCE call detected

This warning was introduced in autoconf version 2.68.

Reviewed-by & Tested-by: Jon TURNEY 
Signed-off-by: Gaetan Nadon 
---
 configure.ac |8 ++--
 1 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/configure.ac b/configure.ac
index b0d2643..6e65161 100644
--- a/configure.ac
+++ b/configure.ac
@@ -723,7 +723,7 @@ case $host_os in
AC_CACHE_CHECK([whether to build 
Xquartz],xorg_cv_Carbon_framework,[
save_LDFLAGS=$LDFLAGS
LDFLAGS="$LDFLAGS -framework Carbon"
-   AC_LINK_IFELSE([char FSFindFolder(); int main() 
{ FSFindFolder(); return 0;}],
+   AC_LINK_IFELSE([AC_LANG_SOURCE([[char 
FSFindFolder(); int main() { FSFindFolder(); return 0;}]])],
   [xorg_cv_Carbon_framework=yes],
   [xorg_cv_Carbon_framework=no])
LDFLAGS=$save_LDFLAGS])
@@ -875,10 +875,12 @@ AC_DEFINE_UNQUOTED([USE_SIGIO_BY_DEFAULT], 
[$USE_SIGIO_BY_DEFAULT_VALUE],
 
 AC_MSG_CHECKING([for glibc...])
 AC_PREPROC_IFELSE([
+AC_LANG_SOURCE([[
 #include 
 #ifndef __GLIBC__
 #error
 #endif
+]])
 ], glibc=yes, glibc=no)
 AC_MSG_RESULT([$glibc])
 
@@ -904,9 +906,10 @@ if ! test "x$have_clock_gettime" = xno; then
 fi
 
 AC_RUN_IFELSE([
+AC_LANG_SOURCE([[
 #include 
 
-int main(int argc, char *argv[[]]) {
+int main(int argc, char *argv[]) {
 struct timespec tp;
 
 if (clock_gettime(CLOCK_MONOTONIC, &tp) == 0)
@@ -914,6 +917,7 @@ int main(int argc, char *argv[[]]) {
 else
 return 1;
 }
+]])
 ], [MONOTONIC_CLOCK=yes], [MONOTONIC_CLOCK=no],
[MONOTONIC_CLOCK="cross compiling"])
 
-- 
1.7.4.1

___
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 util/modular] build.sh: aiptek, acecad and penmount are unmaintained

[Gaetan Nadon]

On Tue, 2011-09-27 at 11:19 +1000, Peter Hutterer wrote:

> Remove them from the build script, they may not work against the server.
> 
> Signed-off-by: Peter Hutterer 
> ---
>  build.sh |3 ---
>  1 files changed, 0 insertions(+), 3 deletions(-)
> 
> diff --git a/build.sh b/build.sh
> index 59c4d80..0c20175 100755
> --- a/build.sh
> +++ b/build.sh
> @@ -748,7 +748,6 @@ build_driver_input() {
>  # Some drivers are only buildable on some OS'es
>  case $HOST_OS in
>   Linux)
> - build driver xf86-input-aiptek
>   build driver xf86-input-evdev
>   build driver xf86-input-joystick
>   ;;
> @@ -768,10 +767,8 @@ build_driver_input() {
>   ;;
>  esac
>  
> -build driver xf86-input-acecad
>  build driver xf86-input-keyboard
>  build driver xf86-input-mouse
> -build driver xf86-input-penmount


Julien,

I recall you ship penmount once a year. Is it actually working?

Otherwise I am ok with the patch.

Any jh moduleet to update?

>  build driver xf86-input-synaptics
>  build driver xf86-input-void
>  }




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

[PATCH v2 xserver 2/2] Xinput: use appropriate copyright markup for a multi licensed doc

[Gaetan Nadon]

Removed a duplicate paragraph.

Signed-off-by: Gaetan Nadon 
---

PDF output
=

Copyright © 1989, 1990, 1991 Hewlett-Packard Company

Permission to use, copy, modify, and distribute this documentation for any 
purpose and without fee is hereby granted, provided that the above
copyright notice and this permission notice appear in all copies. 
Hewlett-Packard makes no representations about the suitability for any purpose
of the information in this document. It is provided "as is" without express or 
implied warranty. This document is only a draft stan- dard of the X
Consortium and is therefore subject to change.

Copyright © 1989, 1990, 1991 X Consortium

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 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 X CONSORTIUM 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 the X Consortium shall not be 
used in advertising or otherwise to promote the sale, use or other
dealings in this Software without prior written authorization from the X 
Consortium.

X Window System is a trademark of The Open Group.


 doc/Xinput.xml |   19 ++-
 1 files changed, 6 insertions(+), 13 deletions(-)

diff --git a/doc/Xinput.xml b/doc/Xinput.xml
index 87c6d7f..0a7ec8d 100644
--- a/doc/Xinput.xml
+++ b/doc/Xinput.xml
@@ -16,16 +16,9 @@
   

X server version &xserver.version;
-   X Consortium Standard
-   1989Hewlett-Packard 
Company
-   1990Hewlett-Packard 
Company
-   1991Hewlett-Packard 
Company
-
-   1989X Consortium
-   1990X Consortium
-   1991X Consortium
-   X Consortium
-   X Version 11, Release 6.7
+   198919901991
+ Hewlett-Packard Company
+   
 
 
 
@@ -37,11 +30,11 @@ Hewlett-Packard makes no representations about the 
suitability for any purpose o
 document. It is provided "as is" without express or implied warranty. This 
document is only a draft stan-
 dard of the X Consortium and is therefore subject to change.
 
+
 
+
+Copyright © 1989, 1990, 1991 X Consortium
 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:
-
-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 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 X 
CONSORTIUM 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.
-- 
1.7.4.1

___
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] autoconf: autoreconf of xserver produces warnings #38185

[Jon TURNEY]

On 25/09/2011 00:21, Gaetan Nadon wrote:
> From: Christopher Yeleighton 
> 
> 
> https://bugs.freedesktop.org/show_bug.cgi?id=38185
> 
> warning: AC_LANG_CONFTEST: no AC_LANG_SOURCE call detected
> 
> Signed-off-by: Gaetan Nadon 
> ---
>  configure.ac |8 ++--
>  1 files changed, 6 insertions(+), 2 deletions(-)
> 
> diff --git a/configure.ac b/configure.ac

Reviewed-by & Tested-by: Jon TURNEY 

The commit message should probably mention that this warning was added in
autoconf-2.68
___
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 2/2] Xinput: use appropriate copyright markup for a multi licensed doc

[Gaetan Nadon]

On Mon, 2011-09-26 at 12:44 -0700, Alan Coopersmith wrote:

> On 09/24/11 02:21 PM, Gaetan Nadon wrote:
> > Signed-off-by: Gaetan Nadon
> > ---
> >   doc/Xinput.xml |   18 ++
> >   1 files changed, 6 insertions(+), 12 deletions(-)
> >
> > diff --git a/doc/Xinput.xml b/doc/Xinput.xml
> > index 87c6d7f..b88707f 100644
> > --- a/doc/Xinput.xml
> > +++ b/doc/Xinput.xml
> > @@ -16,16 +16,9 @@
> > 
> >  
> >  X server version&xserver.version;
> > -X Consortium Standard
> > -1989Hewlett-Packard 
> > Company
> > -1990Hewlett-Packard 
> > Company
> > -1991Hewlett-Packard 
> > Company
> > -
> > -1989X Consortium
> > -1990X Consortium
> > -1991X Consortium
> > -X Consortium
> > -X Version 11, Release 6.7
> > +198919901991
> > +Hewlett-Packard Company
> > +
> >
> >   
> >
> > @@ -37,13 +30,14 @@ Hewlett-Packard makes no representations about the 
> > suitability for any purpose o
> >   document. It is provided "as is" without express or implied warranty. 
> > This document is only a draft stan-
> >   dard of the X Consortium and is therefore subject to change.
> >   
> > +
> >
> > +
> >   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:
> >
> > +Copyright © 1989, 1990, 1991 X 
> > Consortium
> >   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 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 X CONSORTIUM 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 the X Consortium 
> > shall not be used in advertising or otherwise to promote the sale, use or 
> > other dealings in this Software without prior written authorization from 
> > the X Consortium.
> 
> That doesn't look quite right - the "Permission is hereby granted, ... 
> subject 
> to the following conditions:" paragraph is duplicated (with no conditions 
> after
> the first one), and you seem to have accidentally removed one of the 
> conditions
> ("The above [notices] shall be included") in the second instance.






Pdf Before (added new lines for readability)
===

Copyright © 1989 Hewlett-Packard Company
Copyright © 1990 Hewlett-Packard Company
Copyright © 1991 Hewlett-Packard Company
Copyright © 1989 X Consortium
Copyright © 1990 X Consortium
Copyright © 1991 X Consortium

Permission to use, copy, modify, and distribute this
documentation for any purpose and without fee is hereby granted,
provided that the above
copyright notice and this permission notice appear in all
copies. Hewlett-Packard makes no representations about the
suitability for any purpose
of the information in this document. It is provided "as is"
without express or implied warranty. This document is only a
draft stan- dard of the X
Consortium and is therefore subject to change.

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:

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 with

Re: [PATCH: scrnsaverproto] Fix id attributes, linkend and olinks

[Gaetan Nadon]

On Mon, 2011-09-26 at 19:03 -0600, Matt Dew wrote:

> 
> 
> > Are you considering adding "xrefstyle" with pageabbrev to all xref links?
> > If so, consider this suggestion to put it in the customization layer.
> > http://lists.oasis-open.org/archives/docbook-apps/200405/msg00121.html
> > This attribute was meant to override the default in a few instances.
> >
> > Consider that we might want to change the xrefstyle at later point in time
> 
> After looking into it some more and thinking about it, here's what I'm 
> thinking.
> 
> External links = olink
> internal links = xref
> 
> xrefs and olinks,  there's a docbook 5 path. It requires some sed-lovin' 
> no matter what we do.
> 
> I like that we can style xrefs. Should we, at some point in the future, 
> decide xref is a pain and we'd prefer link,  it's sed-able. No great pain.
> 
> If no objections, this is the path I'm going,

It looks like the best solution to me. Have a look at the Apache docs.
They use olinks and it'd be interesting to see what they use for
internal links.

> Matt
> 




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: scrnsaverproto] Fix id attributes, linkend and olinks

[Gaetan Nadon]

On Mon, 2011-09-26 at 18:38 -0600, Matt Dew wrote:

> On 09/25/2011 11:55 AM, Gaetan Nadon wrote:
> > On Sat, 2011-09-24 at 20:23 -0600, Matt Dew wrote:
> >> ---
> >>   specs/saver.xml |   30 +++---
> >>   1 files changed, 15 insertions(+), 15 deletions(-)
> >>
> >> diff --git a/specs/saver.xml b/specs/saver.xml
> >> index b1e6f95..bcdd3a0 100644
> >> --- a/specs/saver.xml
> >> +++ b/specs/saver.xml
> >> @@ -39,7 +39,7 @@ implied warranty.
> >>   
> >>   
> >>
> >> -
> >> +
> >>   Introduction
> >>   
> >>   The X Window System provides support for changing the image on a display 
> >> screen
> >> @@ -464,7 +464,7 @@ window attributes.
> >>   
> >>   
> >>
> >> -
> >> +
> >>   Events
> >>   
> >>   The Screen Saver extension adds one event:
> >> @@ -649,7 +649,7 @@ SETofSCREENSAVEREVENT
> >>   
> >>   
> >>
> >> -
> >> +
> >>   Events
> >>
> >>   
> >> @@ -673,7 +673,7 @@ SETofSCREENSAVEREVENT
> >>   
> >>   
> >>
> >> -
> >> +
> >>   Inter-Client Communications Conventions
> >>   
> >>   Screen saver clients should create at least one resource value whose
> >> @@ -705,7 +705,7 @@ The include file for this extension is
> >>   
> >>
> >>
> >> -
> >> +
> >>   
> >> BoolXScreenSaverQueryExtension
> >>   Display*display
> >> @@ -728,7 +728,7 @@ no additional errors are defined by this extension, 
> >> the results
> >>   oferror_base  are not defined.
> >>   
> >>
> >> -
> >> +
> >>   
> >> StatusXScreenSaverQueryVersion
> >>   Display*display
> >> @@ -753,14 +753,14 @@ set and 0 is returned.
> >>   
> >>   This routine allocates and returns an
> >>   XScreenSaverInfo  structure
> >> -for use in calls toXScreenSaverQueryInfo.
> >> +for use in calls to >> xrefstyle='select: title pageabbrev'/>.
> > Are you considering adding "xrefstyle" with pageabbrev to all xref links?
> > If so, consider this suggestion to put it in the customization layer.
> 
> No, there are places where it doesn't make sense.  A lot of links are 
> very close to the target so a page # feels unnecessary.  Same page, 
> sometimes the very preceeding or next paragraph so it doesn't make sense 
> to do it everywhere.
> 
> 
> > http://lists.oasis-open.org/archives/docbook-apps/200405/msg00121.html
> > This attribute was meant to override the default in a few instances.
> >
> > Consider that we might want to change the xrefstyle at later point in time.
> >
> 
> Yep, everything I do is with the thought that style can and will change 
> in the future.
> 
> >>   All fields in the
> >>   structure are initialized to zero.  If insufficient memory is available,
> >>   NULL is returned.  The results of this routine can be released
> >> -usingXFree.
> >> +using >> targetptr='XFree'>XFree.
> > I assume that libX11 xfree will be changed to XFree.
> 
> Yep.
> 
> 
> >>   
> >>
> >> -
> >> +
> >>   
> >> StatusXScreenSaverQueryInfo
> >>   Display*display
> >> @@ -795,7 +795,7 @@ description of the fields.  If the extension is not 
> >> supported,
> >>   is returned.
> >>   
> >>
> >> -
> >> +
> >>   
> >> voidXScreenSaverSelectInput
> >>   Display*display
> >> @@ -832,7 +832,7 @@ See the definition of the
> >>   of the allowed event masks.
> >>   
> >>
> >> -
> >> +
> >>   
> >> voidXScreenSaverSetAttributes
> >>   Display*dpy
> >> @@ -858,7 +858,7 @@ of theScreenSaverSetAttributes  
> >> request for a
> >>   description of each of the arguments.
> >>   
> >>
> >> -
> >> +
> >>   
> >> voidXScreenSaverUnsetAttributes
> >>   Display*display
> >> @@ -872,7 +872,7 @@ extension, this routine instructs the server to discard
> >>   any previous screen saver window attributes set by this client.
> >>   
> >>
> >> -
> >> +
> >>   
> >> StatusXScreenSaverRegister
> >>   Display*display
> >> @@ -891,7 +891,7 @@ is encountered and the property is not changed, 
> >> otherwise it returns
> >>   non-zero.
> >>   
> >>
> >> -
> >> +
> >>   
> >> StatusXScreenSaverUnregister
> >>   Display*display
> >> @@ -906,7 +906,7 @@ It returns zero if an error is encountered and the 
> >> property is changed,
> >>   otherwise it returns non-zero.
> >>   
> >>
> >> -
> >> +
> >>   
> >> StatusXScreenSaverGetRegistered
> >>   Display*display
> >
> >
> 

Reviewed-by: Gaetan Nadon 


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: [Mesa-dev] Reminder: FOSDEM2012 speakers due Okt 1st.

[Luc Verhaegen]

On Mon, Sep 26, 2011 at 06:51:39PM +0200, Daniel Vetter wrote:
> On Mon, Sep 26, 2011 at 07:21:42AM +0200, Luc Verhaegen wrote:
> > As stated in an email sent a week and a half ago, i need 6 "we will be 
> > there nomatter what" speakers for FOSDEM this year before i go and talk
> > to the FOSDEM organizers.
> > 
> > So far we have:
> > * Martin Peres - Nouveau
> > * Alon Levy - Xspice
> > * Chris Wilson - Cairo
> > 
> > Only half the amount needed, with 5 days left. Surely we can do better 
> > than that for X/Mesa/Wayland/Anything graphics.
> 
> Chris convinced me to fry myself giving a talk about cool new stuff heading
> towards kernel drm and how much of this is driven by the needs of SoC's.
> Topics could include: dma buffer sharing work by Linaro, drm overlay
> support, who controls a device (drm, v4l, fb?), perhaps also how tightly
> integrated UMA designs like Sandybridge will need better drm<->core mm
> integration and what great stuff we could do with this. gpu scheduling
> also fits into here. I'll see what makes a good fit and shows best what
> awesome stuff is currently going on in opens source graphics.
> 
> Cheers, Daniel

Great, thanks a lot.

One more needed...

Luc Verhaegen.


___
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