Re: Bug#696965: [PATCH] support for HW_SKIP_CONSOLE breaks use by blind people
Michal Suchanek (31/12/2012):
> why is that patch needed?
>
> It is quite non-obvious why would dummy driver require a console
> under any circumstances. It does not render anything anywhere so
> does not use console for anything.
The commit message probably {c,sh}ould include some bits of the
initial bug report (http://bugs.debian.org/696965); that should answer
your question.
Mraw,
KiBi.
signature.asc
Description: Digital 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: anongit down?
Trevor Woerner (02/02/2012): > Just wondering if I missed an announcement somewhere but I haven't > been able to access anongit.freedesktop.org for the last couple hours. Until it's fixed, you can put that in your ~/.gitconfig: [url "ssh://git.freedesktop.org/git"] insteadOf = "git://anongit.freedesktop.org" Mraw, KiBi. signature.asc Description: Digital signature ___ xorg-devel@lists.x.org: X.Org development Archives: http://lists.x.org/archives/xorg-devel Info: http://lists.x.org/mailman/listinfo/xorg-devel
Re: [PATCH] UngrabAllDevices: Don't kill clients if not told to
Daniel Stone (19/01/2012):
> The kill_client argument to UngrabAllClients specifies if we want to
> kill the client holding the grab or just deactivate the grab.
>
> Signed-off-by: Daniel Stone
> Reported-by: Julien Cristau
Reviewed-by: Cyril Brulebois
> ---
> dix/grabs.c |3 ++-
> 1 files changed, 2 insertions(+), 1 deletions(-)
>
> diff --git a/dix/grabs.c b/dix/grabs.c
> index 701470c..cc2c946 100644
> --- a/dix/grabs.c
> +++ b/dix/grabs.c
> @@ -195,7 +195,8 @@ UngrabAllDevices(Bool kill_client)
> client = clients[CLIENT_ID(dev->deviceGrab.grab->resource)];
> if (!client || client->clientGone)
> dev->deviceGrab.DeactivateGrab(dev);
> -CloseDownClient(client);
> +if (kill_client)
> +CloseDownClient(client);
> }
>
> ErrorF("End list of ungrabbed devices\n");
Mraw,
KiBi.
signature.asc
Description: Digital 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 SECURITY] XKB: Workaround for CVE-2012-0064: Stop calling UngrabAllDevices().
The introduction of XKB debugging functions in the following commit: | commit 7d2543a3cb3089241982ce4f8984fd723d5312a1 | Author: Daniel Stone | Date: Wed Dec 29 12:03:01 2010 + | | XKB: Add debug key actions for grabs & window tree leads to the ability of bypassing X screen locking programs with key combinations like: Ctrl+Alt+KP_Multiply (Multiply key on the numpad). As a quick workaround, stop calling UngrabAllDevices(). On a side note, it doesn't seem to care much about its kill_client parameter, which is only used to decide which message should be ErrorF()'d. This is a candidate for the 1.11 branch. Signed-off-by: Cyril Brulebois --- hw/xfree86/dixmods/xkbPrivate.c |2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) FWIW in Debian, I chose to revert the commit entirely until the proper course of action is discussed here. I checked this patch on top of 1.11.3.901 though. In Cc, Daniel and Peter for their tags on the commit, and Jeremy for an advanced notice for 1.11. diff --git a/hw/xfree86/dixmods/xkbPrivate.c b/hw/xfree86/dixmods/xkbPrivate.c index 06d1c2b..c6e75c5 100644 --- a/hw/xfree86/dixmods/xkbPrivate.c +++ b/hw/xfree86/dixmods/xkbPrivate.c @@ -38,10 +38,12 @@ XkbDDXPrivate(DeviceIntPtr dev,KeyCode key,XkbAction *act) PrintDeviceGrabInfo(tmp); xf86Msg(X_INFO, "End list of active device grabs\n"); } +#if 0 else if (strcasecmp(msgbuf, "ungrab")==0) UngrabAllDevices(FALSE); else if (strcasecmp(msgbuf, "clsgrb")==0) UngrabAllDevices(TRUE); +#endif else if (strcasecmp(msgbuf, "prwins")==0) PrintWindowTree(); } -- 1.7.8.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: [PATCH 1.12] A coding style for the server
James Cloos (18/01/2012): > The final indent command should be documented not only in the commit log > but also in a README file. That should help encourage those who submit > patches based on the tar releases also to maintain the resulting coding > style. > > Emacs and vim cookies matching the chosen style would be most useful. Oh yeah. Mraw, KiBi. signature.asc Description: Digital signature ___ xorg-devel@lists.x.org: X.Org development Archives: http://lists.x.org/archives/xorg-devel Info: http://lists.x.org/mailman/listinfo/xorg-devel
Re: [PATCH modular 2/2] build.sh: replace expr substr function with colon operator
Gaetan Nadon (16/01/2012): > Not all Bourne shell implementation have "substr" Maybe better written as: case foo in bar) … ;; esac? Mraw, KiBi. signature.asc Description: Digital signature ___ xorg-devel@lists.x.org: X.Org development Archives: http://lists.x.org/archives/xorg-devel Info: http://lists.x.org/mailman/listinfo/xorg-devel
Re: [PATCH] linux: Fix error message when /dev/tty0 fails to open
Chad Versace (13/01/2012):
> When attempting to open the console device during initialization, X first
> tries to open /dev/tty0 in write-only mode, and if that fails it attempts
> to open /dev/vc/0. If both attempts fail, the error message below is
> logged. The message is incorrect because the errno is that resulting from
> the failure to open /dev/vc/0.
>
> xf86OpenConsole: Cannot open /dev/tty0 ({strerror(errno)})
>
> On a machine in which /dev/tty0 does exist but /dev/vc/0 does not, such as
> my machine, the log misleadingly says:
>
> Fatal server error:
> [ 3167.976] xf86OpenConsole: Cannot open /dev/tty0 (No such file or
> directory)
>
> This patch fixes the log to report the correct errno for each device. The
> result is this log snippet:
>
> [ 3755.177] (WW) xf86OpenConsole: Failed to open /dev/tty0 for writing
> (Permission denied)
> [ 3755.177] (WW) xf86OpenConsole: Failed to open /dev/vc/0 for writing
> (No such file or directory)
> [ 3755.177]
> Fatal server error:
> [ 3755.177] xf86OpenConsole: Failed to open console device
Looks like a nice improvement.
Acked-by: Cyril Brulebois
Mraw,
KiBi.
signature.asc
Description: Digital signature
___
xorg-devel@lists.x.org: X.Org development
Archives: http://lists.x.org/archives/xorg-devel
Info: http://lists.x.org/mailman/listinfo/xorg-devel
Re: [PATCH s3virge] Do not use deprecated xf86PciInfo.h
Tormod Volden (08/01/2012): > From: Tormod Volden Looks reasonable. Reviewed-by: Cyril Brulebois Mraw, KiBi. signature.asc Description: Digital signature ___ xorg-devel@lists.x.org: X.Org development Archives: http://lists.x.org/archives/xorg-devel Info: http://lists.x.org/mailman/listinfo/xorg-devel
Re: [PATCH:xscope] Mark panic() as _X_NORETURN
Alan Coopersmith (06/01/2012): > Makes the dependency on x11proto explicit - it was already needed for > the X11 headers included in various files, but now needs to be at least > 7.0.17 for the _X_NORETURN definition in Xfuncproto.h > > Signed-off-by: Alan Coopersmith Reviewed-by: Cyril Brulebois Mraw, KiBi. signature.asc Description: Digital 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: Some patches for xts
Aaron Plattner (05/01/2012): > To git+ssh://git.freedesktop.org/git/xorg/test/xts >141d7e2..7032632 master -> master Cheers; I guess I should put xorg-test@ in Cc for further patch reviews? > > Are there any plans to update what got copied from tet 3.3? > > Interesting. I have no plans to do that. Do you know if there are > any major benefits over what we have here? Not at all, I just stumbled upon it while following a link in one of the README/COPYING/whatever file mentioned in the series. Mraw, KiBi. signature.asc Description: Digital signature ___ xorg-devel@lists.x.org: X.Org development Archives: http://lists.x.org/archives/xorg-devel Info: http://lists.x.org/mailman/listinfo/xorg-devel
Re: [PATCH:xts 1/6] configure.ac: Quote argument to m4_pattern_forbid.
Aaron Plattner (05/01/2012): > On 12/22/2011 04:23 PM, Cyril Brulebois wrote: > >Without this, configure spits out: > > ./configure: line 12801: ac_fn_c_check_member: command not found > > ./configure: line 12815: ac_fn_c_check_type: command not found > > I'm confused. It looks like the argument is already quoted and this > change just adds the ^ and $ anchors. I don't see these > ac_fn_c_check_* errors unless I manually remove the [] quoting. Hmm, 35f6e2daf13a2d4430cc778a1bb5b382255fd404 fixed the quoting issue… I guess I probably failed at rebasing this patch (probably against an older tree) on top of master. > Did this commit message get copied from xserver commit > 8c51b886400c5962b31ff565771be1b01a3ca8fb ? Yes. > This seems fine as a standalone change. I might repost it properly later on, then. You can skip this patch in this series in the meanwhile. Sorry for the confusion. Mraw, KiBi. signature.asc Description: Digital signature ___ xorg-devel@lists.x.org: X.Org development Archives: http://lists.x.org/archives/xorg-devel Info: http://lists.x.org/mailman/listinfo/xorg-devel
Re: [PATCH] Change autogen.sh scripts to respect NOCONFIGURE
Gaetan Nadon (05/01/2012): > > #!/bin/sh > > exec xorg-autogen.sh "$@" > > Note that I will also have to update configure.ac in each module to > mandate the latest version of xorg-macros (as usual): > XORG_MACROS_VERSION(1.17) So you'll have a check in configure.ac to make sure xorg-macros has xorg-autogen.sh, so that autogen.sh can run it? autogen.sh is what triggers autoreconf and the look at configure.ac; chicken, egg. Mraw, KiBi. signature.asc Description: Digital signature ___ xorg-devel@lists.x.org: X.Org development Archives: http://lists.x.org/archives/xorg-devel Info: http://lists.x.org/mailman/listinfo/xorg-devel
Re: [PATCH] xfree86: split warning about missing identifier or input driver
Peter Hutterer (05/01/2012): > Check for identifier first and bail if it's missing (also remove the current > identifier check after we've already bailed due to missing identifiers) > > If a driver is missing, warn but also say that we may have added this device > already. I see too many bugreports with incorrectly shortened log files. > > Signed-off-by: Peter Hutterer Reviewed-by: Cyril Brulebois > helpful as people think they are, posting a cut-down log with only the error > about mouse0 not beeing added (despite the success messages for the matching > event file) is too common. Here's me hoping that that note may make people > look twice at what they're cutting out of the log. True that.. Mraw, KiBi. signature.asc Description: Digital signature ___ xorg-devel@lists.x.org: X.Org development Archives: http://lists.x.org/archives/xorg-devel Info: http://lists.x.org/mailman/listinfo/xorg-devel
Re: [PATCH] Change autogen.sh scripts to respect NOCONFIGURE
Colin Walters (04/01/2012): > Background: I'm trying hard to bring continuous integration and testing > to the FOSS stack between linux and gnome-shell. That means building > from git, not manual integration via tarballs. The current xorg > autogen.sh scripts just need one minor tweak to match the ones we use in > GNOME. I've been slowly massaging and harmonizing the ad-hoc > autogen.sh/bootstrap scripts found in various modules. In the meanwhile, that would achieve the same effect without any patching: -./autogen.sh +autoreconf -vfi Mraw, KiBi. signature.asc Description: Digital 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: [driver/xf86-input-vmmouse] build problem from git sources
Hi Trevor, Trevor Woerner (04/01/2012): > I'm trying to build the project sources on a fresh machine using the > modular build.sh procedure. Currently I'm experiencing a build failure > in driver/xf86-input-vmmouse and can't figure out how to fix it. http://thread.gmane.org/gmane.comp.freedesktop.xorg.devel/26565 Mraw, KiBi. signature.asc Description: Digital signature ___ xorg-devel@lists.x.org: X.Org development Archives: http://lists.x.org/archives/xorg-devel Info: http://lists.x.org/mailman/listinfo/xorg-devel
Re: [PATCH synaptics] Constify priv->device
Daniel Stone (04/01/2012): > Fixes a compiler warning due to discarding the const qualifier as it > comes back from the option code. > > Signed-off-by: Daniel Stone Reminds me of <1325553573-13476-1-git-send-email-peter.hutte...@who-t.net>: http://article.gmane.org/gmane.comp.freedesktop.xorg.devel/27704 Mraw, KiBi. signature.asc Description: Digital signature ___ xorg-devel@lists.x.org: X.Org development Archives: http://lists.x.org/archives/xorg-devel Info: http://lists.x.org/mailman/listinfo/xorg-devel
Re: [PATCH synaptics 3/3] test: fix build error introduced in 9f9b55ab55ed5
Peter Hutterer (03/01/2012): > Bad search/replace, ended up in two xf86SetStrOption declarations which > differed on ABIs < 14. > > Fixes https://bugs.freedesktop.org/show_bug.cgi?id=44335 > > Signed-off-by: Peter Hutterer Reviewed-by: Cyril Brulebois Tested-by: Cyril Brulebois Thanks. Mraw, KiBi. signature.asc Description: Digital signature ___ xorg-devel@lists.x.org: X.Org development Archives: http://lists.x.org/archives/xorg-devel Info: http://lists.x.org/mailman/listinfo/xorg-devel
Re: [PATCH intel-gpu-tools 0/4] Upgrade module configuration and packaging
Gaetan Nadon (02/01/2012): > This patch adds some missing packaging files and sets some basic > infrastructure common to all xorg modules which saves maintenance in > the long run. True that. Acked-by: Cyril Brulebois (I noticed it when updating the packaging for Debian, but I figured you would pop up with patches. ;-)) Mraw, KiBi. signature.asc Description: Digital 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-input-evdev 2/2] Fix missing src/udev.c in the tarballs.
src/udev.c was added in 683a55e504f4fc2d1c847c54986439a0c61b2f20 but wasn't added to the SOURCES variable in src/Makefile.am, resulting in a missing file in the tarballs. Signed-off-by: Cyril Brulebois --- src/Makefile.am |3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) Not sure we want to ship this file in the tarballs, but it appeared in the Debian diff, so let's propose a patch for that. diff --git a/src/Makefile.am b/src/Makefile.am index cca1b0c..6795969 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -39,5 +39,6 @@ AM_CPPFLAGS =-I$(top_srcdir)/include emuThird.c \ emuWheel.c \ draglock.c \ - apple.c + apple.c \ + udev.c -- 1.7.7.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
[PATCH:xf86-input-evdev 1/2] configure.ac: Fix udev/libudev dependency.
In 683a55e504f4fc2d1c847c54986439a0c61b2f20, a dependency on libudev was added, but documented in configure.ac as a dependency on udev (which also happens to ship a pkg-config file). Signed-off-by: Cyril Brulebois --- configure.ac |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) Too bad I only saw this while preparing the final build with the Debian packaging… diff --git a/configure.ac b/configure.ac index 57690c4..47f70b4 100644 --- a/configure.ac +++ b/configure.ac @@ -46,7 +46,7 @@ XORG_DEFAULT_OPTIONS # Obtain compiler/linker options from server and required extensions PKG_CHECK_MODULES(XORG, [xorg-server >= 1.10] xproto inputproto) -PKG_CHECK_MODULES(UDEV, udev) +PKG_CHECK_MODULES(UDEV, libudev) PKG_CHECK_MODULES(XI22, [inputproto >= 2.1.99.3] [xorg-server >= 1.11.99.901], HAVE_XI22="yes", HAVE_XI22="no") -- 1.7.7.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: Drivers needing releases
Peter Hutterer (30/12/2011): > the input ABI should be done OK, thanks. > but I won't be able to get driver releases out until early next year. > I'm only only sporadically right now, sorry. If you need to, please > feel free to create snapshots of the drivers. I'll start uploading drivers to experimental, and will try and look into snapshots (RCs?) for the drivers which need it. Mraw, KiBi. signature.asc Description: Digital 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
[PULL] Build fixes for ia64, mips, and mipsel
Hi Keith. The following changes since commit c065f7b16329e30cb976359e0a807c2adaf50123: Version 1.11.99.2 (1.12 snapshot 2) (2011-12-17 17:22:45 -0800) are available in the git repository at: git://people.freedesktop.org/~kibi/xserver master Cyril Brulebois (1): linux/ia64: Fix regression after domain I/O support code removal. Julien Cristau (1): os: don't ignore failure from dladdr hw/xfree86/common/compiler.h | 19 --- os/backtrace.c |6 +- 2 files changed, 5 insertions(+), 20 deletions(-) Branch based on top of 1.11.99.2, which is what I tested specifically (yay mips over qemu and its build time over 5 hours), but applies to/can be merged into current master trivially. Mraw, KiBi. signature.asc Description: Digital signature ___ xorg-devel@lists.x.org: X.Org development Archives: http://lists.x.org/archives/xorg-devel Info: http://lists.x.org/mailman/listinfo/xorg-devel
Re: [PATCH] os: don't ignore failure from dladdr
Julien Cristau (30/12/2011):
> If dladdr returns 0, don't go and use the returned Dl_info, it may
> contain garbage.
>
> X.Org bug#44315 <https://bugs.freedesktop.org/show_bug.cgi?id=44315>
>
> Reported-and-tested-by: Cyril Brulebois
> Signed-off-by: Julien Cristau
> ---
> os/backtrace.c |6 +-
> 1 files changed, 5 insertions(+), 1 deletions(-)
>
> diff --git a/os/backtrace.c b/os/backtrace.c
> index 58b4b1f..298bf18 100644
> --- a/os/backtrace.c
> +++ b/os/backtrace.c
> @@ -46,7 +46,11 @@ void xorg_backtrace(void)
> ErrorF("\nBacktrace:\n");
> size = backtrace(array, 64);
> for (i = 0; i < size; i++) {
> - dladdr(array[i], &info);
> + int rc = dladdr(array[i], &info);
> + if (rc == 0) {
> + ErrorF("%d: ?? [%p]\n", i, array[i]);
> + continue;
> + }
> mod = (info.dli_fname && *info.dli_fname) ? info.dli_fname : "(vdso)";
> if (info.dli_saddr)
> ErrorF("%d: %s (%s+0x%lx) [%p]\n", i, mod,
> --
Reviewed-by: Cyril Brulebois
I'll probably propose that commit along with the ia64 build fix for a
pull later today.
Mraw,
KiBi.
signature.asc
Description: Digital signature
___
xorg-devel@lists.x.org: X.Org development
Archives: http://lists.x.org/archives/xorg-devel
Info: http://lists.x.org/mailman/listinfo/xorg-devel
Re: [PATCH] test: Add unit test for mieq
Jeremy Huddleston (17/10/2011): > Signed-off-by: Jeremy Huddleston I've opened https://bugs.freedesktop.org/44315 to track the failure of this check on mips and mipsel. Mraw, KiBi. signature.asc Description: Digital 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] linux/i64: Fix regression after domain I/O support code removal.
Side effect of aa0bfb0f133481c57762012e8e30c05ffa151423: | CCLD Xorg | sdksyms.o:(.data.rel+0x27d8): undefined reference to `outl' | collect2: ld returned 1 exit status Since the linux/ia64 domain I/O support code got removed in that commit, there's no reason to keep on declaring those functions (inb, inl, inw, outb, outl, outw). Bugzilla: https://bugs.freedesktop.org/43985 Signed-off-by: Cyril Brulebois --- hw/xfree86/common/compiler.h | 19 --- 1 files changed, 0 insertions(+), 19 deletions(-) v2: Yes, we can remove all of them, confirmed passing make && make check when applied to 1.11.99.2 (1.12 RC1 wants newer input proto, which I don't have right now in that ia64 chroot). (BTW, there's already “X-Mailer: iPad Mail (9A405)” in your mail headers, there's no need for a “Sent from my iPad” ad…) diff --git a/hw/xfree86/common/compiler.h b/hw/xfree86/common/compiler.h index 9e00d75..34e60c5 100644 --- a/hw/xfree86/common/compiler.h +++ b/hw/xfree86/common/compiler.h @@ -397,25 +397,6 @@ extern _X_EXPORT unsigned int inl(unsigned int port); #include #endif /* __NetBSD__ */ -# elif defined(linux) && defined(__ia64__) - -#include - -#include - -#undef outb -#undef outw -#undef outl -#undef inb -#undef inw -#undef inl -extern _X_EXPORT void outb(unsigned long port, unsigned char val); -extern _X_EXPORT void outw(unsigned long port, unsigned short val); -extern _X_EXPORT void outl(unsigned long port, unsigned int val); -extern _X_EXPORT unsigned int inb(unsigned long port); -extern _X_EXPORT unsigned int inw(unsigned long port); -extern _X_EXPORT unsigned int inl(unsigned long port); - # elif (defined(linux) || defined(__FreeBSD__)) && defined(__amd64__) #include -- 1.7.7.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: Drivers needing releases
Alan Coopersmith (28/12/2011): > Xorg server release candidates, like the recent 1.12 RC 1, tend > to get tested more when users can build drivers that work with > them. A number of drivers have needed changes to adjust to the > changes in the Xserver ABI, and haven't had tarballs/releases made > since those changes went in. Yeah, I planned to wait until rc1 goes out to ask for the same thing. :-) On a side note, Peter, should we expect input ABI to be bumped again for 1.12, or are we done with input-related changes? Mraw, KiBi. signature.asc Description: Digital 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
[PULL] One tiny doc patch
Hi Keith.
The following changes since commit cf96183122a85e3376e560f0360b38b5676e57a9:
xorg.conf.man: Fix bad whatis entry. (2011-12-22 16:00:31 +0100)
are available in the git repository at:
git://people.freedesktop.org/~kibi/xserver master
I was waiting for the ia64 build fix to get r-b'd, but since that's been
lagging, here's a tiny patch. I also have a regression on mips{,el} to
report, but I'm still waiting for the bisect to finish. (A build in qemu
takes roughly 6 hours…)
Mraw,
KiBi.
signature.asc
Description: Digital signature
___
xorg-devel@lists.x.org: X.Org development
Archives: http://lists.x.org/archives/xorg-devel
Info: http://lists.x.org/mailman/listinfo/xorg-devel
Re: [PATCH] Fix build regression on ia64.
Jeremy Huddleston (24/12/2011): > Right ... I understand how it works around the issue ... my concern is > that I don't think this is the fix. Why is it happening only for outl > (ie why isnt it happening for outb or others)... I think all 6 should > not be exported... perhaps all 6 should not be declared... Given how painful sdksyms* is, I guess the fix would be killing that entirely. In the meanwhile… Mraw, KiBi. signature.asc Description: Digital 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] Fix build regression on ia64.
Regression introduced in aa0bfb0f133481c57762012e8e30c05ffa151423: | CCLD Xorg | sdksyms.o:(.data.rel+0x27d8): undefined reference to `outl' | collect2: ld returned 1 exit status Explanation: outl was still declared on linux ia64, but no longer defined. Fix that by no longer declaring it. Bugzilla: https://bugs.freedesktop.org/43985 Signed-off-by: Cyril Brulebois --- hw/xfree86/common/compiler.h |1 - 1 files changed, 0 insertions(+), 1 deletions(-) Cc: author, reviewers of the guilty commit. Maybe that line a few lines above could go away accordingly BTW: #undef outl diff --git a/hw/xfree86/common/compiler.h b/hw/xfree86/common/compiler.h index 9e00d75..3d7fabb 100644 --- a/hw/xfree86/common/compiler.h +++ b/hw/xfree86/common/compiler.h @@ -411,7 +411,6 @@ extern _X_EXPORT unsigned int inl(unsigned int port); #undef inl extern _X_EXPORT void outb(unsigned long port, unsigned char val); extern _X_EXPORT void outw(unsigned long port, unsigned short val); -extern _X_EXPORT void outl(unsigned long port, unsigned int val); extern _X_EXPORT unsigned int inb(unsigned long port); extern _X_EXPORT unsigned int inw(unsigned long port); extern _X_EXPORT unsigned int inl(unsigned long port); -- 1.7.7.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
[PATCH:xts 2/6] configure.ac: Require libXau.
It is used in several places, without an explicit dependency.
Signed-off-by: Cyril Brulebois
---
configure.ac |2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/configure.ac b/configure.ac
index b2dbfc1..6eee6d1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -62,7 +62,7 @@ AC_SUBST(CFLAGS_FOR_BUILD)
LDFLAGS_FOR_BUILD=${LDFLAGS_FOR_BUILD-${LDFLAGS}}
AC_SUBST(LDFLAGS_FOR_BUILD)
-PKG_CHECK_MODULES([XTS], [x11 xext xi xtst])
+PKG_CHECK_MODULES([XTS], [x11 xext xi xtst xau])
PKG_CHECK_MODULES([XT], [x11 xext xt xtst])
dnl PKG_CHECK_MODULES([XAW], [x11 xext xt xtst xaw7])
--
1.7.7.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
[PATCH:xts 5/6] xts-config: Fix “Use of qw(...) as parentheses” warning.
In Perl before 5.14, the following syntax was happily accepted:
foreach my $foo qw(bar baz)
but that's been deprecated and that now generates a warning:
Use of qw(...) as parentheses is deprecated at ./xts5/bin/xts-config line 118.
The correct form has always been:
foreach my $foo (qw(bar baz))
and that's compatible with older Perl releases, so let's use that.
Reference:
http://perldoc.perl.org/perl5140delta.html
Signed-off-by: Cyril Brulebois
---
xts5/bin/xts-config.in |4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/xts5/bin/xts-config.in b/xts5/bin/xts-config.in
index 4d00510..3d10c13 100755
--- a/xts5/bin/xts-config.in
+++ b/xts5/bin/xts-config.in
@@ -109,13 +109,13 @@ BEGIN
$::vars{"XT_PIXMAP_DEPTHS"} =~ s/,?\s+/ /g;
- foreach my $var qw(TET_EXEC_IN_PLACE XT_EXTENSIONS
+ foreach my $var (qw(TET_EXEC_IN_PLACE XT_EXTENSIONS
XT_DOES_BACKING_STORE XT_DOES_SAVE_UNDERS
XT_POSIX_SYSTEM XT_TCP XT_LOCAL
XT_SAVE_SERVER_IMAGE XT_OPTION_NO_CHECK
XT_OPTION_NO_TRACE
XT_DEBUG_OVERRIDE_REDIRECT XT_DEBUG_PAUSE_AFTER
XT_DEBUG_PIXMAP_ONLY XT_DEBUG_WINDOW_ONLY
- XT_DEBUG_DEFAULT_DEPTHS XT_DEBUG_NO_PIXCHECK)
+ XT_DEBUG_DEFAULT_DEPTHS XT_DEBUG_NO_PIXCHECK))
{
$::vars{$var} = ucfirst (lc $::vars{$var}) if exists
$::vars{$var};
}
--
1.7.7.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
[PATCH:xts 1/6] configure.ac: Quote argument to m4_pattern_forbid.
Without this, configure spits out: ./configure: line 12801: ac_fn_c_check_member: command not found ./configure: line 12815: ac_fn_c_check_type: command not found Also anchor the pattern to make it stricter. Signed-off-by: Cyril Brulebois --- configure.ac |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/configure.ac b/configure.ac index f3b7893..b2dbfc1 100644 --- a/configure.ac +++ b/configure.ac @@ -75,7 +75,7 @@ AC_DEFINE([XT_X_RELEASE], [6], [The X11 Release, e.g. 6 for X11R6]) AC_DEFINE([XTESTEXTENSION], [1], [Build tests using the XTEST extension]) AC_DEFINE([INPUTEXTENSION], [1], [Build tests using the XI extension]) -m4_pattern_forbid([XTRANS_CONNECTION_FLAGS]) +m4_pattern_forbid([^XTRANS_CONNECTION_FLAGS$]) # Transport selection macro from xtrans.m4 XTRANS_CONNECTION_FLAGS -- 1.7.7.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
Some patches for xts
Hi, this series should be somehow easy to review. That one might be a bit controversial, but I'm proposing it anyway, just in case: [PATCH:xts 6/6] Remove old files from the TET3 import. I was also tempted to merge Artistic and Licence into COPYING, but there are *tons* of references in source files, so shrug… BTW, it looks like TET is still alive: http://tetworks.opengroup.org/tet/ Are there any plans to update what got copied from tet 3.3? Mraw, KiBi. ___ 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:xts 3/6] README: Document libXau as a dependency.
Signed-off-by: Cyril Brulebois --- README |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/README b/README index d3baf50..1e31380 100644 --- a/README +++ b/README @@ -21,7 +21,7 @@ Eventually there will be a tarball release when it is stabilized. Requirements -Required libraries: libX11, libXext, libXi, libXtst +Required libraries: libX11, libXau, libXext, libXi, libXtst Required utilities: xdpyinfo, xset, perl, bdftopcf, mkfontdir -- 1.7.7.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
[PATCH:xts 4/6] README: Improve two sentences.
Signed-off-by: Cyril Brulebois --- README |4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README b/README index 1e31380..89fbf49 100644 --- a/README +++ b/README @@ -13,7 +13,7 @@ the ugliness of building and running the tests. Downloading --- -Currently xts it is only available from a git repository. +Currently xts is only available from a git repository: $ git clone git://anongit.freedesktop.org/git/xorg/test/xts @@ -31,7 +31,7 @@ pkg-config(1) for details on the latter. Build and Install - -The build and install are now straightforward: +The build and install steps are now straightforward: $ ./autogen.sh # using a git checkout $ ./configure # using a tarball -- 1.7.7.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
[PATCH:xf86-video-dummy] dummy 0.3.5
Signed-off-by: Cyril Brulebois --- configure.ac |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) I concur with Antoine, time to release that driver. NACKers? diff --git a/configure.ac b/configure.ac index e3623f9..d92e22a 100644 --- a/configure.ac +++ b/configure.ac @@ -23,7 +23,7 @@ # Initialize Autoconf AC_PREREQ([2.60]) AC_INIT([xf86-video-dummy], -[0.3.4], +[0.3.5], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], [xf86-video-dummy]) AC_CONFIG_SRCDIR([Makefile.am]) -- 1.7.7.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
[PATCH:libXi] configure.ac: Fix a typo in comments.
Signed-off-by: Cyril Brulebois --- configure.ac |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/configure.ac b/configure.ac index 79ba97e..481cf44 100644 --- a/configure.ac +++ b/configure.ac @@ -27,7 +27,7 @@ XORG_CHECK_SGML_DOCTOOLS(1.8) XORG_WITH_ASCIIDOC(8.4.5) XORG_CHECK_MALLOC_ZERO -# Obtain compiler/linker options for depedencies +# Obtain compiler/linker options for dependencies PKG_CHECK_MODULES(XI, [xproto >= 7.0.13] [x11 >= 1.4.99.1] [xextproto >= 7.0.3] [xext >= 1.0.99.1] [inputproto >= 2.1.99.3]) # Check for xmlto and asciidoc for man page conversion -- 1.7.7.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
[PATCH:inputproto] specs: Fix tiny typo.
Signed-off-by: Cyril Brulebois --- specs/XI2proto.txt |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/specs/XI2proto.txt b/specs/XI2proto.txt index 8b79210..46895d8 100644 --- a/specs/XI2proto.txt +++ b/specs/XI2proto.txt @@ -2390,7 +2390,7 @@ require the client to announce XI 2.2 support in the XIQueryVersion request. considered the owner of the event. C receives a TouchBegin event, but does not receive a TouchOwnership event. ** When the touchpoint moves, C will receive a TouchUpdate event. Event - delivery to I is be subject to the synchronous delivery mechanism. The + delivery to I is subject to the synchronous delivery mechanism. The emulated motion notify event is queued in the server while the device is frozen. ** I may assert ownership by calling XIAllowEvents on Y with any mode other -- 1.7.7.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
[PATCH:xf86-input-synaptics] Revert: "eventcomm: replace synaptics-custom TEST_BIT with server's BitIsOn."
This commit reverts 13543b156d78bc4d01a19844a5ee8f283269621b
As seen in Debian's #648488, this switch causes a regression on
PowerPC, especially seen on iBook G4 with appletouch. Take a defensive
stance and revert back to a working state until things have been figured
out and fixed properly.
Since things have evolved and since that revert triggers a lot of
conflicts, the following method was applied:
- manual reintroduction of the 3 removed macros: OFF, LONG, TEST_BIT
- coccinelle semantic patch to revert from BitIsOn to TEST_BIT
Coccinelle semantic patch:
@@
expression a,b;
@@
-BitIsOn(a,b)
+TEST_BIT(b,a)
Bugzilla: http://bugs.debian.org/648488
Bugzilla: http://bugs.freedesktop.org/43728
Signed-off-by: Cyril Brulebois
---
src/eventcomm.c | 43 +++
1 files changed, 23 insertions(+), 20 deletions(-)
diff --git a/src/eventcomm.c b/src/eventcomm.c
index 9cabd14..4939958 100644
--- a/src/eventcomm.c
+++ b/src/eventcomm.c
@@ -47,6 +47,9 @@
#define LONG_BITS (sizeof(long) * 8)
#define NBITS(x) (((x) + LONG_BITS - 1) / LONG_BITS)
+#define OFF(x) ((x) % LONG_BITS)
+#define LONG(x) ((x) / LONG_BITS)
+#define TEST_BIT(bit, array) ((array[LONG(bit)] >> OFF(bit)) & 1)
/**
* Protocol-specific data.
@@ -119,16 +122,16 @@ event_query_is_touchpad(int fd, BOOL test_grab)
SYSCALL(rc = ioctl(fd, EVIOCGBIT(0, sizeof(evbits)), evbits));
if (rc < 0)
goto unwind;
-if (!BitIsOn(evbits, EV_SYN) ||
- !BitIsOn(evbits, EV_ABS) ||
- !BitIsOn(evbits, EV_KEY))
+if (!TEST_BIT(EV_SYN, evbits) ||
+ !TEST_BIT(EV_ABS, evbits) ||
+ !TEST_BIT(EV_KEY, evbits))
goto unwind;
SYSCALL(rc = ioctl(fd, EVIOCGBIT(EV_ABS, sizeof(absbits)), absbits));
if (rc < 0)
goto unwind;
-if (!BitIsOn(absbits, ABS_X) ||
- !BitIsOn(absbits, ABS_Y))
+if (!TEST_BIT(ABS_X, absbits) ||
+ !TEST_BIT(ABS_Y, absbits))
goto unwind;
SYSCALL(rc = ioctl(fd, EVIOCGBIT(EV_KEY, sizeof(keybits)), keybits));
@@ -136,12 +139,12 @@ event_query_is_touchpad(int fd, BOOL test_grab)
goto unwind;
/* we expect touchpad either report raw pressure or touches */
-if (!BitIsOn(absbits, ABS_PRESSURE) && !BitIsOn(keybits, BTN_TOUCH))
+if (!TEST_BIT(ABS_PRESSURE, absbits) && !TEST_BIT(BTN_TOUCH, keybits))
goto unwind;
/* all Synaptics-like touchpad report BTN_TOOL_FINGER */
-if (!BitIsOn(keybits, BTN_TOOL_FINGER))
+if (!TEST_BIT(BTN_TOOL_FINGER, keybits))
goto unwind;
-if (BitIsOn(keybits, BTN_TOOL_PEN))
+if (TEST_BIT(BTN_TOOL_PEN, keybits))
goto unwind;/* Don't match wacom tablets */
ret = TRUE;
@@ -266,8 +269,8 @@ event_query_axis_ranges(InputInfoPtr pInfo)
SYSCALL(rc = ioctl(pInfo->fd, EVIOCGBIT(EV_ABS, sizeof(absbits)),
absbits));
if (rc >= 0)
{
- priv->has_pressure = (BitIsOn(absbits, ABS_PRESSURE) != 0);
- priv->has_width = (BitIsOn(absbits, ABS_TOOL_WIDTH) != 0);
+ priv->has_pressure = (TEST_BIT(ABS_PRESSURE, absbits) != 0);
+ priv->has_width = (TEST_BIT(ABS_TOOL_WIDTH, absbits) != 0);
}
else
xf86IDrvMsg(pInfo, X_ERROR, "failed to query ABS bits (%s)\n",
strerror(errno));
@@ -284,16 +287,16 @@ event_query_axis_ranges(InputInfoPtr pInfo)
SYSCALL(rc = ioctl(pInfo->fd, EVIOCGBIT(EV_KEY, sizeof(keybits)),
keybits));
if (rc >= 0)
{
- priv->has_left = (BitIsOn(keybits, BTN_LEFT) != 0);
- priv->has_right = (BitIsOn(keybits, BTN_RIGHT) != 0);
- priv->has_middle = (BitIsOn(keybits, BTN_MIDDLE) != 0);
- priv->has_double = (BitIsOn(keybits, BTN_TOOL_DOUBLETAP) != 0);
- priv->has_triple = (BitIsOn(keybits, BTN_TOOL_TRIPLETAP) != 0);
-
- if ((BitIsOn(keybits, BTN_0) != 0) ||
- (BitIsOn(keybits, BTN_1) != 0) ||
- (BitIsOn(keybits, BTN_2) != 0) ||
- (BitIsOn(keybits, BTN_3) != 0))
+ priv->has_left = (TEST_BIT(BTN_LEFT, keybits) != 0);
+ priv->has_right = (TEST_BIT(BTN_RIGHT, keybits) != 0);
+ priv->has_middle = (TEST_BIT(BTN_MIDDLE, keybits) != 0);
+ priv->has_double = (TEST_BIT(BTN_TOOL_DOUBLETAP, keybits) != 0);
+ priv->has_triple = (TEST_BIT(BTN_TOOL_TRIPLETAP, keybits) != 0);
+
+ if ((TEST_BIT(BTN_0, keybits) != 0) ||
+ (TEST_BIT(BTN_1, keybits) != 0) ||
+ (TEST_BIT(BTN_2, keybits) != 0) ||
+ (TEST_BIT(BTN_3, keybits) != 0))
priv->has_scrollbuttons = 1;
}
--
1.7.7.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
[PATCH] xorg.conf.man: Fix bad whatis entry.
Debian's QA tool “lintian” reported a bad whatis entry for the xorg.conf(.d) manpages. It comes with the following pointers: For manual pages that document multiple programs, functions, files, or other things, the part before "\-" should list each separated by a comma and a space. […] Refer to the lexgrog(1) manual page, the groff_man(7) manual page, and the groff_mdoc(7) manual page for details. Indeed, the current situation is: $ whatis xorg.conf; whatis xorg.conf.d xorg.conf (5)- (unknown subject) xorg.conf.d (5) - (unknown subject) With this patch: xorg.conf (5)- configuration files for Xorg X server xorg.conf.d (5) - configuration files for Xorg X server Signed-off-by: Cyril Brulebois --- hw/xfree86/man/xorg.conf.man |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/hw/xfree86/man/xorg.conf.man b/hw/xfree86/man/xorg.conf.man index 996798f..5790185 100644 --- a/hw/xfree86/man/xorg.conf.man +++ b/hw/xfree86/man/xorg.conf.man @@ -2,7 +2,7 @@ .ds q \N'34' .TH __xconfigfile__ __filemansuffix__ __vendorversion__ .SH NAME -__xconfigfile__ and __xconfigdir__ \- configuration files for +__xconfigfile__, __xconfigdir__ \- configuration files for __xservername__ X server .SH INTRODUCTION .B __xservername__ -- 1.7.7.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 synaptics] man: note that a PS/2 device is not supported
Peter Hutterer (05/09/2011): > If all we see is a PS/2 Mouse or similar, then the kernel doesn't give us > the required bits to provide all the functionality we want. Note that in the > man-page. > > Signed-off-by: Peter Hutterer Reviewed-by: Cyril Brulebois Mraw, KiBi. signature.asc Description: Digital 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
[PULL] 2 tiny commits
Hi Keith. The following changes since commit 0caeef6146bee5fb1827ab25db191685dde9d4b4: Version bumped to 1.11 (2011-08-26 16:46:13 -0700) are available in the git repository at: git://people.freedesktop.org/~kibi/xserver master Cyril Brulebois (2): configure.ac: Fix help string for mitshm. render: Replace __inline with inline. configure.ac|2 +- render/mipict.c |6 +- 2 files changed, 2 insertions(+), 6 deletions(-) #29109 is still open (--disable-mitshm is broken) but the patch there is insufficient and I have no extra time to handle that right now. For the curious: | make[3]: Entering directory `/home/cbrulebois/debian-x/xserver/xorg-server.git/hw/dmx' | CCLD Xdmx | picture.c:772: error: undefined reference to 'XaceHook' | render.c:2047: error: undefined reference to 'XaceHook' | render.c:2013: error: undefined reference to 'XaceHook' | render.c:1978: error: undefined reference to 'XaceHook' | dispatch.c:2205: error: undefined reference to 'XaceCensorImage' | dispatch.c:2166: error: undefined reference to 'XaceCensorImage' | dispatch.c:430: error: undefined reference to 'XaceHookDispatch' | dispatch.c:433: error: undefined reference to 'XaceHookAuditEnd' | property.c:104: error: undefined reference to 'XaceHookPropertyAccess' | property.c:351: error: undefined reference to 'XaceHookPropertyAccess' | property.c:287: error: undefined reference to 'XaceHookPropertyAccess' | property.c:604: error: undefined reference to 'XaceHookPropertyAccess' | selection.c:84: error: undefined reference to 'XaceHookSelectionAccess' | selection.c:206: error: undefined reference to 'XaceHookSelectionAccess' | collect2: ld returned 1 exit status | make[3]: *** [Xdmx] Error 1 Mraw, KiBi. signature.asc Description: Digital signature ___ xorg-devel@lists.x.org: X.Org development Archives: http://lists.x.org/archives/xorg-devel Info: http://lists.x.org/mailman/listinfo/xorg-devel
Re: [PATCH] fb: Fix memcpy abuse
Keith Packard (23/08/2011): > I've merged a fix to master today; I'd love to get a bit of testing > before I finish the (slightly delayed) 1.11 release. Sorry I didn't make it before 1.11; it's in unstable now though, so any regression should be reported soon enough, and possibly be fixable for the first stable bugfix release. Mraw, KiBi. signature.asc Description: Digital signature ___ xorg-devel@lists.x.org: X.Org development Archives: http://lists.x.org/archives/xorg-devel Info: http://lists.x.org/mailman/listinfo/xorg-devel
Re: [PATCH xinput 1/2] man: update missing copyrights
Peter Hutterer (06/07/2011): > Signed-off-by: Peter Hutterer Reviewed-by: Cyril Brulebois for both. Mraw, KiBi. signature.asc Description: Digital 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: dri2 patchset
Chris Wilson (12/06/2011): > I was playing some more with flipping pixmaps in the pageflip handler and > found a couple of issues with the way DRI2 revokes all the buffers after > the Pixmap is swapped on a Window. Been running the series for hours, on top of 1.10.x, with intel driver, kernel 2.6.39, mesa master-ish. xfwm4 and everything I can run inside are OK. A quick test with a guest account and compiz, mplayer, and rotating cube, and wobbly windows, in a second server instance seemed to run just fine. lspci says: 00:02.0 VGA compatible controller: Intel Corporation Mobile 4 Series Chipset Integrated Graphics Controller (rev 07) Mraw, KiBi. signature.asc Description: Digital signature ___ xorg-devel@lists.x.org: X.Org development Archives: http://lists.x.org/archives/xorg-devel Info: http://lists.x.org/mailman/listinfo/xorg-devel
Re: [PATCH 23/37] DRI2: Remove prototype for DRI2DestroyDrawable
Daniel Stone (28/06/2011): > DRI2DestroyDrawable() was still being _X_EXPORTed, but hasn't existed > since 1da1f33f last year. > > Signed-off-by: Daniel Stone Reviewed-by: Cyril Brulebois Mraw, KiBi. signature.asc Description: Digital signature ___ xorg-devel@lists.x.org: X.Org development Archives: http://lists.x.org/archives/xorg-devel Info: http://lists.x.org/mailman/listinfo/xorg-devel
Re: [PATCH 22/37] XFree86: DRI: Don't use per-target CFLAGS
Daniel Stone (28/06/2011): > AM_CFLAGS will suffice, given we only have one target in this directory. > > Signed-off-by: Daniel Stone Reviewed-by: Cyril Brulebois Mraw, KiBi. signature.asc Description: Digital signature ___ xorg-devel@lists.x.org: X.Org development Archives: http://lists.x.org/archives/xorg-devel Info: http://lists.x.org/mailman/listinfo/xorg-devel
Re: [PATCH 04/37] Replace INITARGS with void
Daniel Stone (28/06/2011): > From: Tomas Carnecky > > It was defined to void anyway. Everyone but panoramix used INITARGS, but > PanoramiXExtensionInit() had hardcoded argc/argv. Replace that with void > as well. > > Signed-off-by: Tomas Carnecky > Reviewed-by: Daniel Stone Reviewed-by: Cyril Brulebois Mraw, KiBi. signature.asc Description: Digital signature ___ xorg-devel@lists.x.org: X.Org development Archives: http://lists.x.org/archives/xorg-devel Info: http://lists.x.org/mailman/listinfo/xorg-devel
Re: [PATCH 03/37] Xinerama: Fix ExtensionInit prototype
Daniel Stone (28/06/2011): > Huh, so I guess INITARGS used to be int argc, char *argv then. Either > way, it's now void, so fix that ... > > Signed-off-by: Daniel Stone (Oops, first reply went to Daniel only.) Reviewed-by: Cyril Brulebois Mraw, KiBi. signature.asc Description: Digital signature ___ xorg-devel@lists.x.org: X.Org development Archives: http://lists.x.org/archives/xorg-devel Info: http://lists.x.org/mailman/listinfo/xorg-devel
Re: [PATCH 02/37] Make extension.h self-contained, remove C++ externs
Daniel Stone (28/06/2011): > externsion.h required bits from Xfuncproto.h and dixstruct.h, but > included neither; fix that. > > It also had _XFUNCPROTOBEGIN and _XFUNCPROTOEND wrappers, which is a bit > pointless for a server-only library, as it's only needed for C++. Reviewed-by: Cyril Brulebois Mraw, KiBi. signature.asc Description: Digital signature ___ xorg-devel@lists.x.org: X.Org development Archives: http://lists.x.org/archives/xorg-devel Info: http://lists.x.org/mailman/listinfo/xorg-devel
Re: [PATCH 01/37] Add a common ARRAY_SIZE macro to dix.h
Daniel Stone (28/06/2011): > Does what it says on the box, replacing those from Xi/ and glx/. > > Signed-off-by: Daniel Stone Reviewed-by: Cyril Brulebois Mraw, KiBi. signature.asc Description: Digital signature ___ xorg-devel@lists.x.org: X.Org development Archives: http://lists.x.org/archives/xorg-devel Info: http://lists.x.org/mailman/listinfo/xorg-devel
Re: [PATCH 5/6] KDrive: Remove useless miPointerUpdateSprite call
Daniel Stone (22/06/2011): > miPointerUpdateSprite is already called from mieqProcessInputEvents, so > calling it by hand immediately after isn't massively helpful. > > Signed-off-by: Daniel Stone Reviewed-by: Cyril Brulebois Mraw, KiBi. signature.asc Description: Digital signature ___ xorg-devel@lists.x.org: X.Org development Archives: http://lists.x.org/archives/xorg-devel Info: http://lists.x.org/mailman/listinfo/xorg-devel
Re: [PATCH 4/6] DMX: Remove useless miPointerUpdateSprite call
Daniel Stone (22/06/2011): > miPointerUpdateSprite is already called from mieqProcessInputEvents, so > calling it by hand immediately after isn't massively helpful. Reviewed-by: Cyril Brulebois Mraw, KiBi. signature.asc Description: Digital signature ___ xorg-devel@lists.x.org: X.Org development Archives: http://lists.x.org/archives/xorg-devel Info: http://lists.x.org/mailman/listinfo/xorg-devel
Re: [PATCH 3/6] XWin: Remove executable bit from headers
Daniel Stone (22/06/2011): > Headers don't really need to be mode 0755. > > Signed-off-by: Daniel Stone oh yeah. Reviewed-by: Cyril Brulebois Mraw, KiBi. signature.asc Description: Digital 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-v4l] Bump version for development.
Signed-off-by: Cyril Brulebois --- configure.ac |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) The version number wasn't bumped after 0.2.0; given the big changes from Mauro Carvalho Chehab to support V4L2, having 0.3.0 as the next version number looks reasonable, so bump version number accordingly. diff --git a/configure.ac b/configure.ac index c490919..ac4d611 100644 --- a/configure.ac +++ b/configure.ac @@ -23,7 +23,7 @@ # Initialize Autoconf AC_PREREQ([2.60]) AC_INIT([xf86-video-v4l], -[0.2.0], +[0.2.99], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], [xf86-video-v4l]) AC_CONFIG_SRCDIR([Makefile.am]) -- 1.7.5.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 synaptics] conf: fix snippet to ignore /dev/input/mouse* on Linux
Dan Nicholson (27/06/2011): > Seems right. In fact, I only have /dev/input/mouse0 on my system. > Reviewed-by: Dan Nicholson Reviewed-by: Cyril Brulebois Mraw, KiBi. signature.asc Description: Digital 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 v2][xdm] Implement ConsoleKit support.
Since ConsoleKit 0.4.2, the sessions created by ck-launch-session are no longer marked as local and active. This means that distributions can't simply call ck-launch-session in Xsession.d anymore to get an active local ConsoleKit session. Instead, XDM must create the session directly, providing info such as the UID of the user and the tty used to log in (like GDM does). It's important that locally logged in users get active local ConsoleKit sessions because that's used by PolicyKit to determine whether certain actions are allowed or not (according to a set of policies, of course). As an example of how this can be used, UDisks can automount devices for locally logged in users without a password prompt with their default PolicyKit policy. This patch allows XDM to create a ConsoleKit session. This is disabled at build time by default, you need to enable it with --with-consolekit. It relies on a very lightweight library called libck-connector (which is distributed with ConsoleKit) to do the DBus magic required for the creation of the active local session. openSUSE bug #528829 <http://bugzilla.novell.com/show_bug.cgi?id=528829> X.Org bug #17325 <http://bugs.freedesktop.org/show_bug.cgi?id=17325> Signed-off-by: Takashi Iwai Tested-by: Cyril Brulebois Signed-off-by: Cyril Brulebois --- configure.ac | 12 ++ include/dm.h |3 ++ man/xdm.man|6 +++ xdm/resource.c | 13 ++- xdm/session.c | 102 5 files changed, 135 insertions(+), 1 deletions(-) To recap, Takashi Iwai seems to be the author, and also agreed to have the patch pushed upstream (https://bugzilla.novell.com/show_bug.cgi?id=528829#c3); Fernando and Stefan “only” passed it on (but feel free to correct that, I can add your S-o-b). Thanks for passing on the patch anyway! And finally I made some modifications and tested it, hence the tags. From v1, mostly: - configure.ac: redone to follow Dan's excellent comments. Tests I performed: - even with ck-connector's devel files available, ./configure defaults to no ck support; same result with an explicit --without-consolekit - without ck-connector's devel files, ./configure --with-consolekit bails out since it doesn't find ck through pkg-config. - with ck-connector's devel files, ./configure --with-consolekit builds xdm with ck support, and the xdm binary gets an extra NEEDED entry: libck-connector.so.0 Consequently: - distros enabling ck support will have an extra dependency on the libck-connector library; - they also might want to add a dependency on the consolekit daemon; if it can't be contacted while starting the session, that session dies right away and one gets back the xdm prompt. It's still possible to start xdm with -noconsolekit though, in which case sessions can be started without consolekit. [ At least that last point should be in the commit message, I think. ] Run-time tests performed with xfce4: Without active, local ck support, one can't shut down, restart, suspend or hibernate. With ck support, all that becomes possible (again…). diff --git a/configure.ac b/configure.ac index 0c7..4fc0531 100644 --- a/configure.ac +++ b/configure.ac @@ -358,6 +358,18 @@ PKG_CHECK_MODULES(DMCP, xdmcp) PKG_CHECK_MODULES(XLIB, x11) PKG_CHECK_MODULES(AUTH, xau) +# ConsoleKit support +AC_ARG_WITH(consolekit, + AS_HELP_STRING([--with-consolekit], [Use ConsoleKit]), + [USE_CONSOLEKIT=$withval], + [USE_CONSOLEKIT=no]) +if test x"$USE_CONSOLEKIT" != xno; then + PKG_CHECK_MODULES(CK_CONNECTOR, ck-connector) + AC_DEFINE([USE_CONSOLEKIT], 1, [Define to 1 to use ConsoleKit]) + XDM_CFLAGS="$XDM_CFLAGS $CK_CONNECTOR_CFLAGS" + XDM_LIBS="$XDM_LIBS $CK_CONNECTOR_LIBS" +fi + # # Greeter # diff --git a/include/dm.h b/include/dm.h index 316dd46..b81d735 100644 --- a/include/dm.h +++ b/include/dm.h @@ -325,6 +325,9 @@ extern char *randomFile; extern char*prngdSocket; extern int prngdPort; # endif +# ifdef USE_CONSOLEKIT +extern int use_consolekit; +# endif extern char*greeterLib; extern char*willing; diff --git a/man/xdm.man b/man/xdm.man index 9590c1a..fb50349 100644 --- a/man/xdm.man +++ b/man/xdm.man @@ -48,6 +48,8 @@ xdm \- X Display Manager with support for XDMCP, host chooser ] [ .B \-session .I session_program +] [ +.B \-noconsolekit ] .SH DESCRIPTION .I Xdm @@ -215,6 +217,10 @@ indicates the program to run as the session after the user has logged in. .IP "\fB\-xrm\fP \fIresource_specification\fP" Allows an arbitrary resource to be specified, as in most X Toolkit applications. +.IP "\fB\-noconsolekit\fP" +Specifies ``false'' as the value for the \fBDisplayManager.consoleKit\fP +resource. +This suppresses the session management using ConsoleKit. .SH RESOURCES At many stages t
Re: [PATCH xserver] XWinrc: replace hard coded section number with __filemansuffix__
Gaetan Nadon (18/06/2011): > Signed-off-by: Gaetan Nadon > --- > hw/xwin/man/XWinrc.man |2 +- > 1 files changed, 1 insertions(+), 1 deletions(-) > > diff --git a/hw/xwin/man/XWinrc.man b/hw/xwin/man/XWinrc.man > index 5c1fb97..e4c454f 100644 > --- a/hw/xwin/man/XWinrc.man > +++ b/hw/xwin/man/XWinrc.man > @@ -1,4 +1,4 @@ > -.TH XWIN 5 __vendorversion__ > +.TH XWIN __filemansuffix__ __vendorversion__ Reviewed-by: Cyril Brulebois Mraw, KiBi. signature.asc Description: Digital 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
[PULL] Killing some unused-but-set-variable warnings
Hi Keith, and welcome back! Cyril Brulebois (16/06/2011): > Hi Peter, > > please consider this pull request, but beware: it needs a newer xproto > that what's currently released, due to xorg-sgml-doctools fun. Given > we're already past-rc1, it's probably not too good to get that merged > before new xproto is released. I'll try to look into new > xorg-sgml-doctools and xproto soon. > > If you feel it's the way to go, I'll just follow-up to this mail once > xproto is out, so that this part can get merged. xproto is now fixed, so the required 7.0.22 is released; please pull the changes below: > The following changes since commit d9bda34d0df576d155e1d682d5e2a382b8e1ffda: > > test: fix memset size for WindowRec (#37801) (2011-06-02 23:21:26 -0700) > > are available in the git repository at: > git://anongit.freedesktop.org/~kibi/xserver master > > Cyril Brulebois (9): > Xext: Fix buggy checks. > configure: Bump dependency on xproto. > fb: Simplify logic, get rid of set but unused variable. > fb: Mark some variables as unused. > miext: Mark some variables as unused. > xfixes: Mark some variables as unused. > xfixes: Remove unused variable. > hw/dmx: Stop using variables for text widgets. > dmx/examples: Fix missing key_click_percent assignment. > > Xext/xvmc.c| 11 ++- > configure.ac |2 +- > fb/fb24_32.c |4 ++-- > fb/fbarc.c |9 +++-- > fb/fbfill.c|6 +++--- > fb/fbgc.c |4 ++-- > fb/fbpush.c|2 +- > hw/dmx/config/xdmxconfig.c |8 > hw/dmx/examples/xbell.c|3 +-- > miext/shadow/shpacked.c|2 +- > miext/shadow/shplanar.c|2 +- > miext/shadow/shplanar8.c |2 +- > miext/shadow/shrotate.c|2 +- > miext/shadow/shrotpack.h |2 +- > miext/shadow/shrotpackYX.h |2 +- > xfixes/cursor.c|4 ++-- > xfixes/region.c|2 -- > 17 files changed, 31 insertions(+), 36 deletions(-) Thanks. Mraw, KiBi. signature.asc Description: Digital 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: Build fixes (was Anything more for xproto 7.0.22?)
Hi Gaetan, Gaetan Nadon (09/06/2011): > I have submitted a patch for xorg-sgml-doctools so that this situation > no longer occurs. I also need to release a patch for the 21 modules > with DocBook. In any case, don't let that hold the release of the > package. There is no impact to the end user, he won't be able to > install the package anyway if he does not have write permission. I just had a quick look, and make distcheck is indeed happy now, thanks! [I still have to deploy cross-references in all Debian packages though, but that's another story. ;-)] Mraw, KiBi. signature.asc Description: Digital 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: [maybe-PULL] Killing some unused-but-set-variable warnings
Peter Hutterer (16/06/2011): > do all of them require the new xproto? afaict, only the ones "mark > variable unused" do, the others should be good to merge as-is. If you > could separate those out, I'd be happy to pull them and leave the > others until xproto has been released. correct, although I think time would be better be spent on getting xproto ready (which should be my next move). > also - you mention xorg-sgml-doctools fun but I don't see the association > here (cursory glance only), aren't these all compiler hints? see http://lists.x.org/archives/xorg-devel/2011-June/023153.html and some mails before that for an explanation of the dependency between releasing xproto and xorg-sgml-doctools :) Mraw, KiBi. signature.asc Description: Digital signature ___ xorg-devel@lists.x.org: X.Org development Archives: http://lists.x.org/archives/xorg-devel Info: http://lists.x.org/mailman/listinfo/xorg-devel
Re: [PATCH xts] xts5: Switch from K&R to ANSI prototypes.
Aaron Plattner (10/06/2011): > Style in this module is no space between the name and the parenthesis. ITYM “““style”””. Feel free to adjust and commit; I was just trying not to let wh's reply unanswered, and I think I stopped caring about “style” 2 weeks ago or so. ;) Mraw, KiBi. signature.asc Description: Digital 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
[maybe-PULL] Killing some unused-but-set-variable warnings
Hi Peter, please consider this pull request, but beware: it needs a newer xproto that what's currently released, due to xorg-sgml-doctools fun. Given we're already past-rc1, it's probably not too good to get that merged before new xproto is released. I'll try to look into new xorg-sgml-doctools and xproto soon. If you feel it's the way to go, I'll just follow-up to this mail once xproto is out, so that this part can get merged. The following changes since commit d9bda34d0df576d155e1d682d5e2a382b8e1ffda: test: fix memset size for WindowRec (#37801) (2011-06-02 23:21:26 -0700) are available in the git repository at: git://anongit.freedesktop.org/~kibi/xserver master Cyril Brulebois (9): Xext: Fix buggy checks. configure: Bump dependency on xproto. fb: Simplify logic, get rid of set but unused variable. fb: Mark some variables as unused. miext: Mark some variables as unused. xfixes: Mark some variables as unused. xfixes: Remove unused variable. hw/dmx: Stop using variables for text widgets. dmx/examples: Fix missing key_click_percent assignment. Xext/xvmc.c| 11 ++- configure.ac |2 +- fb/fb24_32.c |4 ++-- fb/fbarc.c |9 +++-- fb/fbfill.c|6 +++--- fb/fbgc.c |4 ++-- fb/fbpush.c|2 +- hw/dmx/config/xdmxconfig.c |8 hw/dmx/examples/xbell.c|3 +-- miext/shadow/shpacked.c|2 +- miext/shadow/shplanar.c|2 +- miext/shadow/shplanar8.c |2 +- miext/shadow/shrotate.c|2 +- miext/shadow/shrotpack.h |2 +- miext/shadow/shrotpackYX.h |2 +- xfixes/cursor.c|4 ++-- xfixes/region.c|2 -- 17 files changed, 31 insertions(+), 36 deletions(-) Mraw, KiBi. signature.asc Description: Digital 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: Coping with -Wunused-but-set-variable, second round, v2
Jeremy Huddleston (03/06/2011): > LOL. You don't actually need to include my Disgusted-by tag ;) That > was more just me wanting to express the my urge to vomit at the mess > of macro-foo we put up with in some areas of the codebase Was just kidding, thanks for the last r-b on IRC. Mraw, KiBi. signature.asc Description: Digital signature ___ xorg-devel@lists.x.org: X.Org development Archives: http://lists.x.org/archives/xorg-devel Info: http://lists.x.org/mailman/listinfo/xorg-devel
Re: [PATCH xf86-video-mga 1/9] include unistd.h for usleep()
Nicolas Kaiser (08/06/2011): > Silences compile warning > "src/mga_vga.c:65: warning: implicit declaration of function 'usleep'" > > Additionally silences Gentoo QA warning > * QA Notice: Package has poor programming practices which may compile > *fine but exhibit random runtime failures. > > Signed-off-by: Nicolas Kaiser Reviewed-by: Cyril Brulebois Mraw, KiBi. signature.asc Description: Digital signature ___ xorg-devel@lists.x.org: X.Org development Archives: http://lists.x.org/archives/xorg-devel Info: http://lists.x.org/mailman/listinfo/xorg-devel
Re: [PATCH:ico] Replace local checks for gcc with _X_NORETURN from xproto 7.0.17
Alan Coopersmith (08/06/2011): > Also declare icoFatal as static since it's only used in this one file. > > Signed-off-by: Alan Coopersmith Reviewed-by: Cyril Brulebois Mraw, KiBi. signature.asc Description: Digital signature ___ xorg-devel@lists.x.org: X.Org development Archives: http://lists.x.org/archives/xorg-devel Info: http://lists.x.org/mailman/listinfo/xorg-devel
Re: [PATCH 1/7] man: Fix typo.
Alan Coopersmith (06/06/2011): > While I've heard "disconnects" used as a noun, in this case it should > be consistent with the other uses, so the change is good. Thanks, I'll amend the commit to mention that instead (with that = “consistency++”). Mraw, KiBi. signature.asc Description: Digital signature ___ xorg-devel@lists.x.org: X.Org development Archives: http://lists.x.org/archives/xorg-devel Info: http://lists.x.org/mailman/listinfo/xorg-devel
Re: [PATCH 01/14] doc: Fix typo.
Jamey Sharp (05/06/2011): > I've commented on patches 4 and 10. Amended locally, thanks. (D'oh @ 10…) > Otherwise, for patches 1-12: > > Reviewed-by: Jamey Sharp [and Alan and Daniel…] I'll post a follow-up for 14 in a moment. Thanks everyone. Mraw, KiBi. signature.asc Description: Digital 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
[PULL] xkb case check fixes for master
Hi Keith, the following changes since commit feab04397de2684568ded8f299cac9f44f8b: XQuartz: AIGLX: Remove unnecessary includes in indirect.c (2011-06-03 16:01:18 -0400) are available in the git repository at: git://people.freedesktop.org/~kibi/xserver master Cyril Brulebois (3): xkb: Fix case checks for Latin 1. xkb: Fix case checks for Latin 2. xkb: Fix case checks for Latin 4. xkb/xkbfmisc.c |7 --- 1 files changed, 4 insertions(+), 3 deletions(-) Mraw, KiBi. signature.asc Description: Digital signature ___ xorg-devel@lists.x.org: X.Org development Archives: http://lists.x.org/archives/xorg-devel Info: http://lists.x.org/mailman/listinfo/xorg-devel
Re: [PATCH 2/3] xkb: Fix case checks for Latin 2.
Hello Daniel,
Daniel Stone (06/06/2011):
> On Sun, Jun 05, 2011 at 03:27:08AM +0200, Cyril Brulebois wrote:
> > Those ones were getting _XkbKSLower for no reasons:
> > XK_ogonek: U+02DB OGONEK
> > XK_doubleacute: U+02DD DOUBLE ACUTE ACCENT
>
> I think this one also needs a check to exclude XK_breve.
keysymdef.h has:
| #define XK_Aogonek 0x01a1 /* U+0104 LATIN CAPITAL
LETTER A WITH OGONEK */
| #define XK_breve 0x01a2 /* U+02D8 BREVE */
| #define XK_Lstroke 0x01a3 /* U+0141 LATIN CAPITAL
LETTER L WITH STROKE */
xkbfmisc.c has:
| case 1: /* latin 2 */
| if (((ks>=XK_Aogonek)&&(ks<=XK_Zabovedot)&&(ks!=XK_breve))||
| ((ks>=XK_Racute)&&(ks<=XK_Tcedilla))) {
| rtrn|= _XkbKSUpper;
| }
So I think it's covered already?
> Otherwise, for all three patches:
> Reviewed-by: Daniel Stone
Thanks for reviewing.
Mraw,
KiBi.
signature.asc
Description: Digital signature
___
xorg-devel@lists.x.org: X.Org development
Archives: http://lists.x.org/archives/xorg-devel
Info: http://lists.x.org/mailman/listinfo/xorg-devel
Re: [PATCH xproto] Fix sorting by codepoint in Latin 2.
Alan Coopersmith (04/06/2011): > On 06/ 4/11 06:26 PM, Cyril Brulebois wrote: > > Sort performed by calling “sort -k 3” on the part between #ifdef > > XK_LATIN8 and #endif. > > > > Signed-off-by: Cyril Brulebois > > --- > > keysymdef.h |2 +- > > 1 files changed, 1 insertions(+), 1 deletions(-) > > > > diff --git a/keysymdef.h b/keysymdef.h > > index 1a07d83..73b5533 100644 > > --- a/keysymdef.h > > +++ b/keysymdef.h > > @@ -782,9 +782,9 @@ SOFTWARE. > > #define XK_nacute0x01f1 /* U+0144 LATIN SMALL > > LETTER N WITH ACUTE */ > > #define XK_ncaron0x01f2 /* U+0148 LATIN SMALL > > LETTER N WITH CARON */ > > #define XK_odoubleacute 0x01f5 /* U+0151 LATIN SMALL > > LETTER O WITH DOUBLE ACUTE */ > > -#define XK_udoubleacute 0x01fb /* U+0171 LATIN SMALL > > LETTER U WITH DOUBLE ACUTE */ > > #define XK_rcaron0x01f8 /* U+0159 LATIN SMALL > > LETTER R WITH CARON */ > > #define XK_uring 0x01f9 /* U+016F LATIN SMALL > > LETTER U WITH RING ABOVE */ > > +#define XK_udoubleacute 0x01fb /* U+0171 LATIN SMALL > > LETTER U WITH DOUBLE ACUTE */ > > #define XK_tcedilla 0x01fe /* U+0163 LATIN SMALL > > LETTER T WITH CEDILLA */ > > #define XK_abovedot 0x01ff /* U+02D9 DOT ABOVE */ > > #endif /* XK_LATIN2 */ > > Reviewed-by: Alan Coopersmith Thanks, pushed: d8920f7..951295c master -> master Mraw, KiBi. signature.asc Description: Digital signature ___ xorg-devel@lists.x.org: X.Org development Archives: http://lists.x.org/archives/xorg-devel Info: http://lists.x.org/mailman/listinfo/xorg-devel
Re: [PATCH 2/7] man: Build proper sentences for various options.
James Cloos (05/06/2011): > Most (all?) of those depend on whether the option is part of the > sentence. You change would be correct if the option is a noun > which is the object of the verb, but not if the sentence is > an imperitive description separate from the option. > > Most man pages use the latter style. That's something but… > Xserver(1) is the only man page I've found (with just a quick check) > which does not use that style. > > Perhaps patching that one would be the better fix. all I see is that patching a few lines made the manpage itself somewhat consistent. (ISTR two options after my patch remain with some bits of context, which doesn't look too bad IMHO.) > Also, one could argue that the first would should be titlecased; > ie s/disable/Disable/ et al. I'm probably not going to propose a patch to change everything to the other style, with case changes in addition. Mraw, KiBi. signature.asc Description: Digital signature ___ xorg-devel@lists.x.org: X.Org development Archives: http://lists.x.org/archives/xorg-devel Info: http://lists.x.org/mailman/listinfo/xorg-devel
Re: [PATCH 6/7] man: Avoid single quotes.
James Cloos (05/06/2011): > The actual bug is that ' has a special meaning when it the first > character of a line in 'roff. > > If you move the last word of the previous line down in front of > the word 'unscaled' the 's are interpreted properly. If that's deemed an acceptable solution I'll probably do that. > The other similar uses in that page use the idiom '\fBunscaled\fR' > rather than just 'unscaled'. Perhaps that one should, too. I noticed that. If we go the way you proposed, that renders patch 7/7 kind of moot. Thanks for your reviews, by the way. Mraw, KiBi. signature.asc Description: Digital signature ___ xorg-devel@lists.x.org: X.Org development Archives: http://lists.x.org/archives/xorg-devel Info: http://lists.x.org/mailman/listinfo/xorg-devel
Re: [PATCH 5/7] man: Clarify what FPE means.
James Cloos (05/06/2011): > Normal style is to put the abbreviation in parentheses in such cases, > not the spelled-out term. > > So this would be better: > > -and each symlink destination will be added as a local fontfile FPE. > +and each symlink destination will be added as a local fontfile Font Path > Element (FPE). I thought about that but apparently got distracted or something. Amended locally, thanks. Mraw, KiBi. signature.asc Description: Digital 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 14/14] doc: Try to mention all parameters [FIXME].
The FIXME in the title is intentional, a hunk needs some intel: a description of the 3 last parameters to the InitStringFeedbackClassDeviceStruct() function. Thanks already! Signed-off-by: Cyril Brulebois --- doc/Xinput.xml | 10 +++--- 1 files changed, 7 insertions(+), 3 deletions(-) diff --git a/doc/Xinput.xml b/doc/Xinput.xml index 4f79f34..b229381 100644 --- a/doc/Xinput.xml +++ b/doc/Xinput.xml @@ -504,7 +504,8 @@ have buttons. This function is provided to allocate and initialize a ValuatorClassRec, and -should be called for extension devices that have valuators. It is passed the +should be called for extension devices that have valuators. It is passed +a pointer to the device, the number of axes of motion reported by the device, the address of the motion history procedure for the device, the size of the motion history buffer, and the mode (Absolute or Relative) of the device. It returns FALSE if @@ -543,7 +544,7 @@ the InitValuatorClassDeviceStruct function, but is not initialized. InitValuatorAxisStruct should be called once for each axis of motion reported by the device. Each -invocation should be passed the axis number (starting with 0), the +invocation should be passed a pointer to the device, the axis number (starting with 0), the minimum value for that axis, the maximum value for that axis, and the resolution of the device in counts per meter. If the device reports relative motion, 0 should be reported as the minimum and maximum values. @@ -688,6 +689,7 @@ multiple feedbacks of the same type. This function is provided to allocate and initialize a BellFeedbackClassRec, and should be called for extension devices that have a bell. It is passed a pointer to the device, +a pointer to the procedure that sounds the bell, and a pointer to the device control procedure. It returns FALSE if the allocation fails, and has the following parameters: @@ -708,7 +710,9 @@ This function is provided to allocate and initialize a StringFeedbackClassRec, and should be called for extension devices that have a display upon which a string can be displayed. It is passed a pointer to the device, -and a pointer to the device control procedure. +a pointer to the device control procedure, + +and three more parameters to be documented. It returns FALSE if the allocation fails, and has the following parameters: Bool -- 1.7.5.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
[PATCH 13/14] doc: Convert an \fP pair into appropriate tags.
Signed-off-by: Cyril Brulebois --- doc/Xinput.xml |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/doc/Xinput.xml b/doc/Xinput.xml index 6f43810..4f79f34 100644 --- a/doc/Xinput.xml +++ b/doc/Xinput.xml @@ -1077,7 +1077,7 @@ valuator0 through valuator5 - the values of the valuators. In order to pass this information to the input extension library, two 32-byte wire events must be generated by DDX. The first has an event type of -DeviceKeyPress, and the second has an event type of \fPDeviceValuator\fP. +DeviceKeyPress, and the second has an event type of DeviceValuator. -- 1.7.5.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
[PATCH 12/14] doc: Try to avoid repetitions.
Signed-off-by: Cyril Brulebois --- doc/Xinput.xml |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/doc/Xinput.xml b/doc/Xinput.xml index f35b9be..6f43810 100644 --- a/doc/Xinput.xml +++ b/doc/Xinput.xml @@ -1020,7 +1020,7 @@ initialized. -The data structures that define these +The data structures that describe these events are defined in the file extensions/include/XIproto.h. Other input extension constants needed by DDX are defined in the file extensions/include/XI.h. -- 1.7.5.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
[PATCH 11/14] doc: Kiss K&R good bye, with love.
Signed-off-by: Cyril Brulebois
---
doc/Xinput.xml | 129 ++-
1 files changed, 70 insertions(+), 59 deletions(-)
diff --git a/doc/Xinput.xml b/doc/Xinput.xml
index d41ddfc..f35b9be 100644
--- a/doc/Xinput.xml
+++ b/doc/Xinput.xml
@@ -289,9 +289,7 @@ shown below.
-Bool extproc (dev, mode)
-DeviceIntPtr dev;
-int mode;
+Bool extproc (DeviceIntPtr dev, int mode)
{
LocalDevice *localdev = (LocalDevice *) dev->devicePrivate;
@@ -459,10 +457,11 @@ Its parameters are:
Bool
-InitKeyClassDeviceStruct(dev, pKeySyms, pModifiers)
-DeviceIntPtr dev;
-KeySymsPtr pKeySyms;
-CARD8 pModifiers[];
+InitKeyClassDeviceStruct(
+DeviceIntPtr dev,
+KeySymsPtr pKeySyms,
+CARD8 pModifiers[]
+);
@@ -486,10 +485,11 @@ allocated. Its parameters are:
Bool
-InitButtonClassDeviceStruct(dev, numButtons, map)
-register DeviceIntPtr dev;
-int numButtons;
-CARD8 *map;
+InitButtonClassDeviceStruct(
+register DeviceIntPtr dev,
+int numButtons,
+CARD8 *map
+);
@@ -514,12 +514,13 @@ the ValuatorClassRec could not be allocated. Its
parameters are:
Bool
-InitValuatorClassDeviceStruct(dev, numAxes, motionProc, numMotionEvents, mode)
-DeviceIntPtr dev;
-int (*motionProc)();
-int numAxes;
-int numMotionEvents;
-int mode;
+InitValuatorClassDeviceStruct(
+DeviceIntPtr dev,
+int numAxes,
+int (*motionProc)(),
+int numMotionEvents,
+int mode
+);
@@ -548,12 +549,13 @@ resolution of the device in counts per meter. If the
device reports
relative motion, 0 should be reported as the minimum and maximum values.
InitValuatorAxisStruct has the following parameters:
-InitValuatorAxisStruct(dev, axnum, minval, maxval, resolution)
-DeviceIntPtr dev;
-int axnum;
-int minval;
-int maxval;
-int resolution;
+InitValuatorAxisStruct(
+DeviceIntPtr dev,
+int axnum,
+int minval,
+int maxval,
+int resolution
+);
@@ -573,8 +575,9 @@ pointer to the device, and returns FALSE if the allocation
fails.
It has the following parameter:
Bool
-InitFocusClassDeviceStruct(dev)
-DeviceIntPtr dev;
+InitFocusClassDeviceStruct(
+DeviceIntPtr dev
+);
@@ -595,8 +598,9 @@ It is passed a pointer to the device, and returns FALSE if
the allocation fails.
It has the following parameter:
Bool
-InitProximityClassDeviceStruct(dev)
-DeviceIntPtr dev;
+InitProximityClassDeviceStruct(
+DeviceIntPtr dev
+);
@@ -617,10 +621,11 @@ and a pointer to the device control procedure.
It returns FALSE if the allocation fails, and has the following parameters:
Bool
-InitKbdFeedbackClassDeviceStruct(dev, bellProc, controlProc)
-DeviceIntPtr dev;
-void (*bellProc)();
-void (*controlProc)();
+InitKbdFeedbackClassDeviceStruct(
+DeviceIntPtr dev,
+void (*bellProc)(),
+void (*controlProc)()
+);
The DIX entry point InitKeyboardDeviceStruct calls this routine for the
core X keyboard. It must be called explicitly for extension devices
@@ -640,9 +645,10 @@ and a pointer to the device control procedure.
It returns FALSE if the allocation fails, and has the following parameters:
Bool
-InitPtrFeedbackClassDeviceStruct(dev, controlProc)
-DeviceIntPtr dev;
-void (*controlProc)();
+InitPtrFeedbackClassDeviceStruct(
+DeviceIntPtr dev,
+void (*controlProc)()
+);
@@ -663,9 +669,10 @@ and a pointer to the device control procedure.
It returns FALSE if the allocation fails, and has the following parameters:
Bool
-InitLedFeedbackClassDeviceStruct(dev, controlProc)
-DeviceIntPtr dev;
-void (*controlProc)();
+InitLedFeedbackClassDeviceStruct(
+DeviceIntPtr dev,
+void (*controlProc)()
+);
@@ -685,10 +692,11 @@ and a pointer to the device control procedure.
It returns FALSE if the allocation fails, and has the following parameters:
Bool
-InitBellFeedbackClassDeviceStruct(dev, bellProc, controlProc)
-DeviceIntPtr dev;
-void (*bellProc)();
-void (*controlProc)();
+InitBellFeedbackClassDeviceStruct(
+DeviceIntPtr dev,
+void (*bellProc)(),
+void (*controlProc)()
+);
@@ -704,13 +712,13 @@ and a pointer to the device control procedure.
It returns FALSE if the allocation fails, and has the following parameters:
Bool
-InitStringFeedbackClassDeviceStruct(dev, controlProc, max_symbols,
- num_symbols_supported, symbols)
-DeviceIntPtr dev;
-void (*controlProc)();
-int max_symbols;
-int num_symbols_supported;
-KeySym *symbols;
+InitStringFeedbackClassDeviceStruct(
+DeviceIntPtr dev,
+void (*controlProc)(),
+int max_symbols,
+int num_symbols_supported,
+KeySym *symbols
+);
@@ -727,9 +735,10 @@ and a pointer to the device control procedure.
It returns FALSE if the allocation fails, and has the following parameters:
Bool
-InitIntegerFeedbackClassDeviceStruct(dev, controlP
[PATCH 10/14] doc: Fix ponctuation.
Signed-off-by: Cyril Brulebois --- doc/Xinput.xml |6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/doc/Xinput.xml b/doc/Xinput.xml index ab488c8..d41ddfc 100644 --- a/doc/Xinput.xml +++ b/doc/Xinput.xml @@ -426,7 +426,7 @@ FocusClass - the device can be focused. -FeedbackClass - the device supports some kind of feedback +FeedbackClass - the device supports some kind of feedback. @@ -708,7 +708,7 @@ InitStringFeedbackClassDeviceStruct(dev, controlProc, max_symbols, num_symbols_supported, symbols) DeviceIntPtr dev; void (*controlProc)(); -int max_symbols: +int max_symbols; int num_symbols_supported; KeySym *symbols; @@ -1041,7 +1041,7 @@ deviceid - the identifier of the device that generated the event. -device_state - the state of any modifiers on the device that generated the event +device_state - the state of any modifiers on the device that generated the event. -- 1.7.5.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
[PATCH 09/14] doc: Fix extraneous >
It looks like it serves no special purpose. Signed-off-by: Cyril Brulebois --- doc/Xinput.xml |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/doc/Xinput.xml b/doc/Xinput.xml index f74a068..ab488c8 100644 --- a/doc/Xinput.xml +++ b/doc/Xinput.xml @@ -368,7 +368,7 @@ server to begin checking for available input from this device. ->From InitAndStartDevices, EnableDevice is called for all devices that have +From InitAndStartDevices, EnableDevice is called for all devices that have the "inited" and "startup" fields in the DeviceIntRec set to TRUE. The "inited" field is set by InitAndStartDevices to the value returned by the deviceproc when called with a mode value of DEVICE_INIT. The "startup" -- 1.7.5.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
[PATCH 08/14] doc: Fix grammar and typos.
Signed-off-by: Cyril Brulebois --- doc/Xinput.xml |6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/doc/Xinput.xml b/doc/Xinput.xml index 821e300..f74a068 100644 --- a/doc/Xinput.xml +++ b/doc/Xinput.xml @@ -67,7 +67,7 @@ The functionality is implemented by routines that typically reside in the server source tree directory extensions/server/xinput. This extension includes functions to enable and disable input extension devices, -select input, grab and focus those device, query and change key +select input, grab and focus those devices, query and change key and button mappings, and others. The only input extension requirements for the device-dependent part of X are that the input devices be correctly initialized and input events from those devices be correctly @@ -452,7 +452,7 @@ This function is provided to allocate and initialize a KeyClassRec, and should be called for extension devices that have keys. It is passed a pointer to the device, and pointers to arrays of keysyms and modifiers reported by the device. It returns FALSE if the KeyClassRec could not be allocated, -or if the maps for the keysyms and and modifiers could not be allocated. +or if the maps for the keysyms and modifiers could not be allocated. Its parameters are: @@ -911,7 +911,7 @@ such a device. The default implementation is to always return a BadMatch error. If the -implementation does not support any input devices that are allow their +implementation does not support any input devices that allow their valuators to be set, the default implementation may be left unchanged. -- 1.7.5.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
[PATCH 07/14] doc: Fix alignment.
Signed-off-by: Cyril Brulebois --- doc/Xinput.xml |6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/doc/Xinput.xml b/doc/Xinput.xml index 1ae7afe..821e300 100644 --- a/doc/Xinput.xml +++ b/doc/Xinput.xml @@ -1084,7 +1084,7 @@ The following code fragment shows how the two wire events could be initialized: deviceKeyButtonPointer *xev = (deviceKeyButtonPointer *) xE; deviceValuator *xv; -xev->type = DeviceKeyPress;/* defined by input extension */ +xev->type = DeviceKeyPress; /* defined by input extension */ xev->detail = keycode; /* key pressed on this device */ xev->time = timestamp; /* same as for core events*/ xev->rootX = pointerx; /* x location of core pointer */ @@ -1099,7 +1099,7 @@ The following code fragment shows how the two wire events could be initialized: /**/ /**/ -xev->deviceid = dev->id | MORE_EVENTS;/* sending more than 1*/ +xev->deviceid = dev->id | MORE_EVENTS; /* sending more than 1 */ /**/ /* Fields in the second 32-byte wire event: */ @@ -1158,7 +1158,7 @@ The following code fragment shows how the two wire events could be initialized: /**/ /**/ -xev->deviceid = dev->id | MORE_EVENTS;/* sending more than 1*/ +xev->deviceid = dev->id | MORE_EVENTS; /* sending more than 1 */ /**/ /* Fields in the second 32-byte wire event: */ -- 1.7.5.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
[PATCH 06/14] doc/dtrace: Provide a better description for sequenceNumber.
Signed-off-by: Cyril Brulebois --- doc/dtrace/Xserver-DTrace.xml |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/doc/dtrace/Xserver-DTrace.xml b/doc/dtrace/Xserver-DTrace.xml index 992bed9..7cbff98 100644 --- a/doc/dtrace/Xserver-DTrace.xml +++ b/doc/dtrace/Xserver-DTrace.xml @@ -302,7 +302,7 @@ DEALINGS IN THE SOFTWARE. sequenceNumber uint32_t - Number of X request in this connection + Sequence number of X request in this connection -- 1.7.5.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
[PATCH 05/14] doc/dtrace: Fix typo.
Signed-off-by: Cyril Brulebois --- doc/dtrace/Xserver-DTrace.xml |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/doc/dtrace/Xserver-DTrace.xml b/doc/dtrace/Xserver-DTrace.xml index 69cd30e..992bed9 100644 --- a/doc/dtrace/Xserver-DTrace.xml +++ b/doc/dtrace/Xserver-DTrace.xml @@ -302,7 +302,7 @@ DEALINGS IN THE SOFTWARE. sequenceNumber uint32_t - Number of X request in in this connection + Number of X request in this connection -- 1.7.5.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
[PATCH 02/14] doc: Mention higher than 2.6 kernels.
3.x kernels are on their way. Signed-off-by: Cyril Brulebois --- doc/c-extensions |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/doc/c-extensions b/doc/c-extensions index 96f582d..44b4d5f 100644 --- a/doc/c-extensions +++ b/doc/c-extensions @@ -45,7 +45,7 @@ be C99, but even gcc+glibc doesn't implement that yet. Unix-like systems are assumed to be at least as good as UNIX03. Linux systems must be at least 2.4 or later. As a practical matter -though, 2.4 kernels never receive any testing. Use 2.6 already. +though, 2.4 kernels never receive any testing. Use 2.6 or higher already. TODO: Solaris. -- 1.7.5.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
[PATCH 01/14] doc: Fix typo.
Signed-off-by: Cyril Brulebois --- doc/c-extensions |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/doc/c-extensions b/doc/c-extensions index eb33e27..96f582d 100644 --- a/doc/c-extensions +++ b/doc/c-extensions @@ -21,7 +21,7 @@ extensions, although the results may not be optimal. table. * _X_INTERNAL: like _X_HIDDEN, but attempt to ensure that this function is never called from another module. -* _X_INLINE: inline this functon if possible (generally obeyed unless +* _X_INLINE: inline this function if possible (generally obeyed unless disabling optimisations). * _X_DEPRECATED: warn on use of this function. -- 1.7.5.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
[PATCH 03/14] doc: Get rid of RCS tags.
Signed-off-by: Cyril Brulebois --- doc/smartsched |6 -- 1 files changed, 0 insertions(+), 6 deletions(-) diff --git a/doc/smartsched b/doc/smartsched index 057a759..bd76274 100644 --- a/doc/smartsched +++ b/doc/smartsched @@ -196,9 +196,3 @@ updated in three ways: The effect of these changes is to both improve interactive application response and benchmark numbers at the same time. - - - - - -$XFree86: $ -- 1.7.5.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
[PATCH 04/14] doc: Fix grammar and typos.
Signed-off-by: Cyril Brulebois --- doc/smartsched |8 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/doc/smartsched b/doc/smartsched index bd76274..4ef6db2 100644 --- a/doc/smartsched +++ b/doc/smartsched @@ -73,13 +73,13 @@ With a single client executing a stream of requests: Dispatch calls ReadRequestFromClient which reads a buffer (4K) full of requests from the client - The server executes requests from this buffer until it emptys, + The server executes requests from this buffer until it empties, in two stages -- 10 requests at a time are executed in the inner Dispatch loop, a buffer full of requests are executed because WaitForSomething immediately returns if any clients have complete requests pending in their input queues. - When the buffer finally emptys, the next call to ReadRequest + When the buffer finally empties, the next call to ReadRequest FromClient will return zero and Dispatch will go back to WaitForSomething; now that the client has no requests pending, WaitForSomething will block in select again. If the client @@ -104,7 +104,7 @@ into select; ReadRequestFromClient causes the server to yield when the client request buffer doesn't contain a complete request. When that buffer is executed quickly, the server spends a lot of time in select discovering that the same client again has input ready. Thus -the server also runs busy clients less efficiently than is would be +the server also runs busy clients less efficiently than it would be possible. What to do. @@ -191,7 +191,7 @@ updated in three ways: return to normal priority. 3.Clients which receive user input are praised by having - their priority rased until they reach some maximal + their priority raised until they reach some maximal value, above normal priority. The effect of these changes is to both improve interactive application -- 1.7.5.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
[PATCH 7/7] man: Improve quotes vs. macros consistency.
Signed-off-by: Cyril Brulebois --- man/Xserver.man |8 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/man/Xserver.man b/man/Xserver.man index b173f87..02ba073 100644 --- a/man/Xserver.man +++ b/man/Xserver.man @@ -502,9 +502,9 @@ You can specify a special kind of font path in the form \fBcatalogue:\fR. The directory specified after the catalogue: prefix will be scanned for symlinks and each symlink destination will be added as a local fontfile FPE (Font Path Element). .PP -The symlink can be suffixed by attributes such as '\fBunscaled\fR', which +The symlink can be suffixed by attributes such as "\fBunscaled\fR", which will be passed through to the underlying fontfile FPE. The only exception is -the newly introduced '\fBpri\fR' attribute, which will be used for ordering +the newly introduced "\fBpri\fR" attribute, which will be used for ordering the font paths specified by the symlinks. An example configuration: @@ -518,8 +518,8 @@ An example configuration: .fi This will add /usr/share/X11/fonts/misc as the first FPE with the attribute -"unscaled", second FPE will be /usr/share/X11/fonts/75dpi, also with -the attribute "unscaled" etc. This is functionally equivalent to setting +"\fBunscaled\fR", second FPE will be /usr/share/X11/fonts/75dpi, also with +the attribute "\fBunscaled\fR" etc. This is functionally equivalent to setting the following font path: .nf -- 1.7.5.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
[PATCH 6/7] man: Avoid single quotes.
Use double quotes instead, the target paragraph was rendered this way: | This will add /usr/share/X11/fonts/misc as the first FPE with the | attribute the attribute unscaled etc. This is functionally equivalent | to setting the following font path: Signed-off-by: Cyril Brulebois --- man/Xserver.man |4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/man/Xserver.man b/man/Xserver.man index 34b0016..b173f87 100644 --- a/man/Xserver.man +++ b/man/Xserver.man @@ -518,8 +518,8 @@ An example configuration: .fi This will add /usr/share/X11/fonts/misc as the first FPE with the attribute -'unscaled', second FPE will be /usr/share/X11/fonts/75dpi, also with -the attribute unscaled etc. This is functionally equivalent to setting +"unscaled", second FPE will be /usr/share/X11/fonts/75dpi, also with +the attribute "unscaled" etc. This is functionally equivalent to setting the following font path: .nf -- 1.7.5.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
[PATCH 1/7] man: Fix typo.
As far as I can tell, disconnect is a verb, not a noun. Signed-off-by: Cyril Brulebois --- man/Xserver.man |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/man/Xserver.man b/man/Xserver.man index b725949..2c016c2 100644 --- a/man/Xserver.man +++ b/man/Xserver.man @@ -89,7 +89,7 @@ This option exists primarily for running test suites remotely. .B \-audit \fIlevel\fP sets the audit trail level. The default level is 1, meaning only connection rejections are reported. Level 2 additionally reports all successful -connections and disconnects. Level 4 enables messages from the +connections and disconnections. Level 4 enables messages from the SECURITY extension, if present, including generation and revocation of authorizations and violations of the security policy. Level 0 turns off the audit trail. -- 1.7.5.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
[PATCH 5/7] man: Clarify what FPE means.
Signed-off-by: Cyril Brulebois --- man/Xserver.man |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/man/Xserver.man b/man/Xserver.man index 8ad4af9..34b0016 100644 --- a/man/Xserver.man +++ b/man/Xserver.man @@ -500,7 +500,7 @@ after the server has started. .SH "FONTPATH.D" You can specify a special kind of font path in the form \fBcatalogue:\fR. The directory specified after the catalogue: prefix will be scanned for symlinks -and each symlink destination will be added as a local fontfile FPE. +and each symlink destination will be added as a local fontfile FPE (Font Path Element). .PP The symlink can be suffixed by attributes such as '\fBunscaled\fR', which will be passed through to the underlying fontfile FPE. The only exception is -- 1.7.5.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
[PATCH 4/7] man: Fix extraneous escaping for TCP/IP.
That resulted in the “TCPIP” string instead of “TCP/IP”. Signed-off-by: Cyril Brulebois --- man/Xserver.man |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/man/Xserver.man b/man/Xserver.man index 204caf4..8ad4af9 100644 --- a/man/Xserver.man +++ b/man/Xserver.man @@ -393,7 +393,7 @@ elapse between autorepeat-generated keystrokes). loads keyboard description in \fIfilename\fP on server startup. .SH "NETWORK CONNECTIONS" The X server supports client connections via a platform-dependent subset of -the following transport types: TCP\/IP, Unix Domain sockets, DECnet, +the following transport types: TCP/IP, Unix Domain sockets, DECnet, and several varieties of SVR4 local connections. See the DISPLAY NAMES section of the \fIX\fP(__miscmansuffix__) manual page to learn how to specify which transport type clients should try to use. -- 1.7.5.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
[PATCH 3/7] man: Fix case for MIT-unspecified.
include/site.h says that COMPILEDDISPLAYCLASS is MIT-unspecified, rather than MIT-Unspecified. Fix the manpage accordingly. Signed-off-by: Cyril Brulebois --- man/Xserver.man |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/man/Xserver.man b/man/Xserver.man index d239cf3..204caf4 100644 --- a/man/Xserver.man +++ b/man/Xserver.man @@ -356,7 +356,7 @@ ends. .B \-class \fIdisplay-class\fP XDMCP has an additional display qualifier used in resource lookup for display-specific options. This option sets that value, by default it -is "MIT-Unspecified" (not a very useful value). +is "MIT-unspecified" (not a very useful value). .TP 8 .B \-cookie \fIxdm-auth-bits\fP When testing XDM-AUTHENTICATION-1, a private key is shared between the -- 1.7.5.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
[PATCH 2/7] man: Build proper sentences for various options.
Signed-off-by: Cyril Brulebois --- man/Xserver.man | 12 ++-- 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/man/Xserver.man b/man/Xserver.man index 2c016c2..d239cf3 100644 --- a/man/Xserver.man +++ b/man/Xserver.man @@ -174,7 +174,7 @@ sets the maximum big request to MB. .TP 8 .B \-nocursor -disable the display of the pointer cursor. +disables the display of the pointer cursor. .TP 8 .B \-nolisten \fItrans-type\fP disables a transport type. For example, TCP/IP connections can be disabled @@ -321,11 +321,11 @@ enables XDMCP and sends Query packets to the specified .IR hostname . .TP 8 .B \-broadcast -enable XDMCP and broadcasts BroadcastQuery packets to the network. The +enables XDMCP and broadcasts BroadcastQuery packets to the network. The first responding display manager will be chosen for the session. .TP 8 .B \-multicast [\fIaddress\fP [\fIhop count\fP]] -Enable XDMCP and multicast BroadcastQuery packets to the network. +enables XDMCP and multicasts BroadcastQuery packets to the network. The first responding display manager is chosen for the session. If an address is specified, the multicast is sent to that address. If no address is specified, the multicast is sent to the default XDMCP IPv6 @@ -335,7 +335,7 @@ is set to a maximum of 1 hop, to prevent the multicast from being routed beyond the local network. .TP 8 .B \-indirect \fIhostname\fP -enables XDMCP and send IndirectQuery packets to the specified +enables XDMCP and sends IndirectQuery packets to the specified .IR hostname . .TP 8 .B \-port \fIport-number\fP @@ -364,7 +364,7 @@ server and the manager. This option sets the value of that private data (not that it is very private, being on the command line!). .TP 8 .B \-displayID \fIdisplay-id\fP -Yet another XDMCP specific value, this one allows the display manager to +is yet another XDMCP specific value, which allows the display manager to identify each display so that it can locate the shared key. .SH XKEYBOARD OPTIONS X servers that support the XKEYBOARD (a.k.a. \*qXKB\*q) extension accept the @@ -377,7 +377,7 @@ relative path from the XKB base directory. The default XKB base directory is enables(+) or disables(-) AccessX key sequences. .TP 8 .B \-xkbdir \fIdirectory\fP -base directory for keyboard layout files. This option is not available +sets the base directory for keyboard layout files. This option is not available for setuid X servers (i.e., when the X server's real and effective uids are different). .TP 8 -- 1.7.5.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
[PATCH 2/4] x86emu: Silence compiler warnings.
Both if/else match, so usage of ip32 or ip16 will only happen after the
proper one has been initialized.
As a consequence, let's silence those warnings by initializing both
variables to 0:
| CC ops.lo
| ops.c: In function 'x86emuOp_call_near_IMM':
| ops.c:9701:39: warning: 'ip32' may be used uninitialized in this function
[-Wuninitialized]
| ops.c:9704:39: warning: 'ip16' may be used uninitialized in this function
[-Wuninitialized]
Signed-off-by: Cyril Brulebois
---
hw/xfree86/x86emu/ops.c |4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/hw/xfree86/x86emu/ops.c b/hw/xfree86/x86emu/ops.c
index 5d3cac1..792c65a 100644
--- a/hw/xfree86/x86emu/ops.c
+++ b/hw/xfree86/x86emu/ops.c
@@ -9679,8 +9679,8 @@ Handles opcode 0xe8
/
static void x86emuOp_call_near_IMM(u8 X86EMU_UNUSED(op1))
{
-s16 ip16;
-s32 ip32;
+s16 ip16 = 0;
+s32 ip32 = 0;
START_OF_INSTR();
DECODE_PRINTF("CALL\t");
--
1.7.5.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
[PATCH 3/4] sdksyms.dep: Enable silent rules for sdksyms.sh
Signed-off-by: Cyril Brulebois --- hw/xfree86/loader/Makefile.am |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/hw/xfree86/loader/Makefile.am b/hw/xfree86/loader/Makefile.am index 0e5b304..054dca9 100644 --- a/hw/xfree86/loader/Makefile.am +++ b/hw/xfree86/loader/Makefile.am @@ -27,7 +27,7 @@ libloader_la_LIBADD = $(DLOPEN_LIBS) CLEANFILES = sdksyms.c sdksyms.dep sdksyms.dep sdksyms.c: sdksyms.sh $(top_builddir)/include/do-not-use-config.h - CPP='$(CPP)' AWK='$(AWK)' $(srcdir)/sdksyms.sh $(top_srcdir) $(AM_CFLAGS) $(CFLAGS) $(INCLUDES) + $(AM_V_GEN)CPP='$(CPP)' AWK='$(AWK)' $(srcdir)/sdksyms.sh $(top_srcdir) $(AM_CFLAGS) $(CFLAGS) $(INCLUDES) SDKSYMS_DEP = sdksyms.dep include $(SDKSYMS_DEP) -- 1.7.5.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
[PATCH 1/4] configure.ac: Fix help string for mitshm.
Pasting from ./configure --help's output, one would get: | configure: WARNING: unrecognized options: --disable-shm Fix the help string to include the previously missing “mit” bits. Signed-off-by: Cyril Brulebois --- configure.ac |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) http://bugs.freedesktop.org/show_bug.cgi?id=29109 remains but that probably shouldn't be a reason not to fix the help string. diff --git a/configure.ac b/configure.ac index 22566c9..a47e3bf 100644 --- a/configure.ac +++ b/configure.ac @@ -608,7 +608,7 @@ AC_ARG_WITH(khronos-spec-dir, AS_HELP_STRING([--with-khronos-spec-dir=PATH], [Pa dnl Extensions. AC_ARG_ENABLE(registry, AS_HELP_STRING([--disable-registry], [Build string registry module (default: enabled)]), [XREGISTRY=$enableval], [XREGISTRY=yes]) AC_ARG_ENABLE(composite, AS_HELP_STRING([--disable-composite], [Build Composite extension (default: enabled)]), [COMPOSITE=$enableval], [COMPOSITE=yes]) -AC_ARG_ENABLE(mitshm, AS_HELP_STRING([--disable-shm], [Build SHM extension (default: enabled)]), [MITSHM=$enableval], [MITSHM=yes]) +AC_ARG_ENABLE(mitshm, AS_HELP_STRING([--disable-mitshm], [Build SHM extension (default: enabled)]), [MITSHM=$enableval], [MITSHM=yes]) AC_ARG_ENABLE(xres, AS_HELP_STRING([--disable-xres], [Build XRes extension (default: enabled)]), [RES=$enableval], [RES=yes]) AC_ARG_ENABLE(record, AS_HELP_STRING([--disable-record], [Build Record extension (default: enabled)]), [RECORD=$enableval], [RECORD=yes]) AC_ARG_ENABLE(xv, AS_HELP_STRING([--disable-xv], [Build Xv extension (default: enabled)]), [XV=$enableval], [XV=yes]) -- 1.7.5.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
[PATCH 4/4] render: Replace __inline with inline.
Also remove traces from the past.
Signed-off-by: Cyril Brulebois
---
render/mipict.c |6 +-
1 files changed, 1 insertions(+), 5 deletions(-)
diff --git a/render/mipict.c b/render/mipict.c
index 08b2fa7..9a44c27 100644
--- a/render/mipict.c
+++ b/render/mipict.c
@@ -33,10 +33,6 @@
#include "picturestr.h"
#include "mipict.h"
-#ifndef __GNUC__
-#define __inline
-#endif
-
int
miCreatePicture (PicturePtr pPicture)
{
@@ -307,7 +303,7 @@ miClipPictureReg (pixman_region16_t * pRegion,
return pixman_region_not_empty(pRegion);
}
-static __inline Bool
+static inline Bool
miClipPictureSrc (RegionPtrpRegion,
PicturePtrpPicture,
int dx,
--
1.7.5.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: Build fixes (was Anything more for xproto 7.0.22?)
Gaetan Nadon (04/06/2011):
> I never used DESTDIR with distcheck. I don't know if it makes sense or
> not. I tried any way, just to see what happens. The building of
> x11proto.pdf failed.
>
> [warning] /usr/bin/fop: Unable to locate fop in
> /home/nadon/xorg/src/proto/x11proto/tmp/usr/share/java
>
> Somehow $DESTDIR is used in front of /usr/share/java. That makes think
> your build did not have DESTDIR set when running distcheck as you would
> get the same error I had, in theory.
I never used DESTDIR for distcheck either, but since I'm not building as
root (!), *something* in there has to come into play and stop automake
from trying to install to the “bare” location. A non-root make install
with default settings just can't work.
Some doc about distcheck is found here:
http://www.gnu.org/software/automake/manual/automake.html#Preparing-Distributions
Looking at the log:
| test -d xproto-7.0.21/_build || exit 0; \
| dc_install_base=`CDPATH="${ZSH_VERSION+.}:" && cd
| xproto-7.0.21/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \
| && dc_destdir="${TMPDIR-/tmp}/am-dc-$$/" \
| && am__cwd=`pwd` \
| && CDPATH="${ZSH_VERSION+.}:" && cd xproto-7.0.21/_build \
| && ../configure --srcdir=.. --prefix="$dc_install_base" \
|\
| && make \
| && make dvi \
| && make check \
| && make install \
So it's assumed --prefix will do everything, and no DESTDIR is used at
this point (it's checked later that setting DESTDIR works though).
That's why the “let's ask xorg-sgml-doctools for the prefix” dance and
its direct use breaks distcheck. Unless one has a user-specific (as
opposed to system-wide) xorg-sgml-doctools, with appropriate permissions
on the target directory.
Mraw,
KiBi.
signature.asc
Description: Digital 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
