Re: [PATCH xserver 0/2] hw/xwin build fixes after poll changes

2016-07-19 Thread Keith Packard
Jon Turney <jon.tur...@dronecode.org.uk> writes: > I haven't tried building this for MinGW, I guess there might be some more > fixes needed there... > > Jon Turney (2): > hw/xwin: Update for removal of AddEnabledDevice > hw/xwin: Update BlockHandler function signa

[PATCH xf86-video-ati] Adapt to video API 23 [v2]

2016-07-18 Thread Keith Packard
Also deal with drm fd wakeup Block and wakeup handlers lose their pReadmask arguments Signed-off-by: Keith Packard <kei...@keithp.com> --- src/compat-api.h | 5 + src/drmmode_display.c | 22 +- 2 files changed, 26 insertions(+), 1 deletion(-) diff --git

[PATCH xf86-video-ati] Adapt to video API 23

2016-07-18 Thread Keith Packard
Block and wakeup handlers lose their pReadmask arguments Signed-off-by: Keith Packard <kei...@keithp.com> --- src/compat-api.h | 5 + 1 file changed, 5 insertions(+) diff --git a/src/compat-api.h b/src/compat-api.h index b299f83..1039b0e 100644 --- a/src/compat-api.h +++ b/src/compat

Re: [PATCH xserver] FlushAllOutput: Only call FlushCallbacks when actually flushing data

2016-07-18 Thread Keith Packard
Adam Jackson writes: > My epoll branch has been rebased atop that as well. I've rebased a nearly identical branch atop the two poll emulation patches I just sent out in my tree. I think we're ready to merge that code to master now; it should 'just work' on mingw. -- -keith

[PATCH xserver 1/2] os: Add poll emulation for mingw [v2]

2016-07-18 Thread Keith Packard
f --git a/include/xserver_poll.h b/include/xserver_poll.h new file mode 100644 index 000..110d30c --- /dev/null +++ b/include/xserver_poll.h @@ -0,0 +1,55 @@ +/* + * Copyright © 2016 Keith Packard + * + * Permission to use, copy, modify, distribute, and sell this software and its + * documentation

[PATCH xserver 2/2] Switch poll() users to xserver_poll()

2016-07-18 Thread Keith Packard
This uses the wrapper in case we need to emulate poll with select as we do on Windows. Signed-off-by: Keith Packard <kei...@keithp.com> --- hw/dmx/input/lnx-ms.c| 4 ++-- hw/dmx/input/lnx-ps2.c | 4 ++-- hw/kdrive/linux/mouse.c

[PATCH xserver 0/2] Build poll emulation when needed and then use it

2016-07-18 Thread Keith Packard
[PATCH xserver 1/2] os: Add poll emulation for mingw [v2] Adam provided a patch which added poll emulation on top of select. This takes that patch, modifies it slightly, and then builds the code for platforms which don't have a native poll implementation (like mingw). Finally, the patch provides

Re: [PATCH xserver] xfree86: Fix fallback driver sort order for Xorg -configure (v2)

2016-07-12 Thread Keith Packard
esystem that gives you results in ctime order > vesa would be last in the list already, and the first swap would move > vesa to wherever fbdev/modesetting happened to be. Nice. In that case, Reviewed-by: Keith Packard <kei...@keithp.com> -- -keith signature.

Re: [PATCH xserver] xfree86: Fix fallback driver sort order for Xorg -configure (v2)

2016-07-12 Thread Keith Packard
se qsort. > > Note that qsort puts things in ascending order, so somewhat backwardsly > fallbacks are greater than native drivers, and vesa is greater than > modesetting. > > v2: Use strcmp to compare non-fallback drivers so we get a predictable > result if your libc's qsort

Re: [PATCH xserver] xfree86: Fix fallback driver sort order for Xorg -configure

2016-07-12 Thread Keith Packard
Adam Jackson writes: > +static int > +driver_sort(void *_l, void *_r) > +{ > +const char *l = *(const char **)_l; > +const char *r = *(const char **)_r; > +int left = is_fallback(l); > +int right = is_fallback(r); > + > +/* neither is a fallback */ > +if

Re: [PATCH xserver] FlushAllOutput: Only call FlushCallbacks when actually flushing data

2016-07-12 Thread Keith Packard
Adam Jackson writes: > Here's an epoll branch rebased to master, with poll emulation for > Windows, and a pair of proof-of-concept patches at the end to allow > (force) testing on pollful systems: So you're just emulating poll with select, which should work on Windows. that seems

Re: [PATCH xserver] FlushAllOutput: Only call FlushCallbacks when actually flushing data

2016-07-11 Thread Keith Packard
Peter Harris writes: > The number of fds in fd_set isn't really fixed. FD_SETSIZE is user > controlled, so I can't imagine a problem with massaging fd_set into C99 > variable-length-array form: > > typedef struct xfd_set { > u_int fd_count; > SOCKET

Re: [PATCH xserver] FlushAllOutput: Only call FlushCallbacks when actually flushing data

2016-07-08 Thread Keith Packard
Adam Jackson writes: > Still not cool with committing code that we _know_ will break a > supported platform. I wasn't aware of any platform this would break? Am I missing something? -- -keith signature.asc Description: PGP signature

Re: [PATCH xserver] FlushAllOutput: Only call FlushCallbacks when actually flushing data

2016-07-08 Thread Keith Packard
Adam Jackson writes: > Still not cool with committing code that we _know_ will break a > supported platform. Oh, right, windows. Hrm. Suggestions welcome, but I suspect the only workable solution will be to write some windows-specific code that does the wait for multiple objects

Re: [PATCH xserver] FlushAllOutput: Only call FlushCallbacks when actually flushing data

2016-07-08 Thread Keith Packard
Keith Packard <kei...@keithp.com> writes: > It should, however, be sufficient to simply move the callback in > FlushAllOutput after the check for 'newoutput'; newoutput should only > ever be set if there is output to deliver. It'd also be awesome to get the epoll patches

Re: [PATCH xserver] FlushAllOutput: Only call FlushCallbacks when actually flushing data

2016-07-08 Thread Keith Packard
Michel Dänzer writes: > From: Michel Dänzer > > The unnecessary FlushCallback calls could cause significant performance > degradation with compositing. Yeah, we do need a flush callback in drivers to ensure that damage events aren't sent without the

Re: Hiding keyboard state

2016-07-08 Thread &quot;Keith Packard"
> But I don't think this is a huge issue for us anyway because we don't > want to support simultaneous input from non-xpra clients, and if > applications modify the keyboard state programmatically.. things are > likely to get out of sync no matter what we do. Cool. > Just a thought: could this

Re: [PATCH xserver 3/3] dri2: Don't make reference to noClientException

2016-06-28 Thread Keith Packard
Adam Jackson writes: > noClientException is now never filled in with a meaningful value, it's > always -1. The sole caller of this function disregards the error value > in any case. Sounds like we should just remove it from the client structure then? -- -keith signature.asc

Re: Hiding keyboard state

2016-06-21 Thread Keith Packard
Antoine Martin writes: > This may cause us problems with xpra: we use XQueryKeymap to see which > keys are down when trying to synchronize remote and local keyboard > state, in particular for the modifiers. The new query code returns the current state of the keyboard as

Re: [PATCH xserver 0/5] Fix ephyr events. Add ephyr/glamor resize

2016-06-20 Thread Keith Packard
Adam Jackson writes: > Series is: > > Reviewed-by: Adam Jackson Merged. a134d1e..828887b master -> master -- -keith signature.asc Description: PGP signature ___ xorg-devel@lists.x.org: X.Org development

Re: Hiding keyboard state

2016-06-20 Thread Keith Packard
Ran Benita writes: > The QueryDeviceState request from xinput (XQueryDeviceState(3) in xlib) > also exposes the logical state of the keys. This patch only touches the > old QueryKeymap request. Is xinput not relevant for some reason? (There > might also be similar request in

Re: Disabling RECORD by default

2016-06-20 Thread Keith Packard
Adam Jackson writes: > Does this imply that XDMCP users don't deserve accessibility, since we > can't get a peer gid from a TCP socket? Seems suboptimal. Without additional work, you would have to choose between security or functionality. With a little work, one can imagine

Re: Disabling RECORD by default

2016-06-15 Thread Keith Packard
Peter Hutterer writes: > but note that syndaemon is a common user of RECORD, if it is disabled we > fall back to regular querying of the keyboard state with all its > drawbacks (unnecessary wakeups, missing of some key events, etc.) Ok, I'm back revisiting this and

Re: [PATCH xserver] glamor: Use DestroyPixmap instead of FreePicture for glyph atlas pixmap

2016-06-14 Thread Keith Packard
Michel Dänzer <mic...@daenzer.net> writes: >> Signed-off-by: Keith Packard <kei...@keithp.com> > > Reviewed-by: Michel Dänzer <michel.daen...@amd.com> Thanks. Merged. edd24aa..2d6230e master -> master -- -keith signatu

Re: [PATCH xserver 3/5] ephyr: Handle window resize when using glamor

2016-06-14 Thread Keith Packard
Michel Dänzer writes: > Couldn't the existing screen pixmap be modified, instead of creating a > new one, as is done in Xorg drivers? Not easily -- glamor doesn't expose an API for this. Given that all we'd be saving is the pixmap header, I'd say that this change is the

[PATCH xserver] kdrive: Only enable threaded input if we have input devices

2016-06-14 Thread Keith Packard
When there aren't any devices, the input thread is going to be pretty lonely, so don't bother to even start it. Signed-off-by: Keith Packard <kei...@keithp.com> --- hw/kdrive/src/kinput.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/hw/kdrive/src/kinput.c b/hw/kdri

[PATCH xserver] glamor: Use DestroyPixmap instead of FreePicture for glyph atlas pixmap

2016-06-14 Thread Keith Packard
Nice of FreePicture to take a void * instead of a PicturPtr so that this error wasn't caught by the compiler. Noticed when resetting the X server left a dangling pixmap around. Signed-off-by: Keith Packard <kei...@keithp.com> --- glamor/glamor_composite_glyphs.c | 2 +- 1 file chan

Re: switching the server to poll/epoll

2016-06-14 Thread Keith Packard
Adam Jackson writes: > Okay, that makes sense. I'm still a little wary of it, because I don't > trust myself to remember the BlockHandler wrapping order and therefore > worry that actions triggered in ephyrXcbHandleEvent might not be safe > to do while we're halfway unwound.

[PATCH xserver 5/5] ephyr: Process only the last expose or configure available from the server

2016-06-14 Thread Keith Packard
-by: Keith Packard <kei...@keithp.com> --- hw/kdrive/ephyr/ephyr.c | 27 ++- 1 file changed, 22 insertions(+), 5 deletions(-) diff --git a/hw/kdrive/ephyr/ephyr.c b/hw/kdrive/ephyr/ephyr.c index 015aef5..d7948e8 100644 --- a/hw/kdrive/ephyr/ephyr.c +++ b/hw/kdrive/ephyr/e

[PATCH xserver 4/5] ephyr: Process queued X events before blocking [v2]

2016-06-14 Thread Keith Packard
the event queue. v2: use a work proc to clear the event queue rather than doing it in the block handler directly. Signed-off-by: Keith Packard <kei...@keithp.com> --- hw/kdrive/ephyr/ephyr.c | 52 +++-- hw/kdrive/ephyr/hostx.

[PATCH xserver 0/5] Fix ephyr events. Add ephyr/glamor resize

2016-06-14 Thread Keith Packard
Here's a short subset of the 'epoll' branch which changes the event processing in ephyr so that any events left queued in xcb by server execution will get processed before the server blocks. In doing this work, I discovered that ephyr didn't handle window resize when using glamor. And, configure

[PATCH xserver 3/5] ephyr: Handle window resize when using glamor

2016-06-14 Thread Keith Packard
the window heirarchy and reset any windows pointing at the old pixmap. I could easily be convinced that this TraverseTree should be moved to miSetScreenPixmap. Signed-off-by: Keith Packard <kei...@keithp.com> --- hw/kdrive/ephyr/ephyr.c | 16 ++-- hw/kdrive/ephyr/hostx.

[PATCH xserver 1/5] dix: Call screen block/wakeup handlers closest to blocking [v3]

2016-06-14 Thread Keith Packard
. As the screen block handler is now called last, we have to use that instead of a registered block/wakeup handler to make sure the GL rendering is done before we copy it to the front buffer. Signed-off-by: Keith Packard <kei...@keithp.com> Reviewed-by: Adam Jackson <a...@redhat.com&

[PATCH xserver 2/5] ephyr: Don't configure window while responding to configure events

2016-06-14 Thread Keith Packard
This leads to and endless sequence of window resizes. Signed-off-by: Keith Packard <kei...@keithp.com> --- hw/kdrive/ephyr/ephyr.c | 2 ++ hw/kdrive/ephyr/hostx.c | 8 hw/kdrive/ephyr/hostx.h | 3 +++ 3 files changed, 13 insertions(+) diff --git a/hw/kdrive/ephyr/ephyr.c b/hw/

Re: switching the server to poll/epoll

2016-06-13 Thread Keith Packard
Adam Jackson writes: > You've still got the glamor glClientWaitSync patch in this series. My > reading of Michel and Eric's comments is that the 3D driver is properly > responsible for this, so it should be dropped before merging. Even if > we were to keep this workaround, it

Re: switching the server to poll/epoll

2016-06-11 Thread Keith Packard
Adam Jackson writes: > This series breaks the build at a few points. "Move ETEST macro from > io.c to osdep.h" needs to happen before "InputThreadFillPipe doesn't > need select or poll", since the latter uses ETEST. Swapped those two patches. > Everything between > "Switch

Re: [PATCH xserver 2/4] xace: Remove the audit hooks and tune dispatch

2016-06-10 Thread Keith Packard
th XACE enabled (on my laptop, n=1) > this improves x11perf -noop from 45M/s to 60M/s with what's currently > in git. Atop the epoll branch it's even better, 50M/s to 68M/s. Reviewed-by: Keith Packard <kei...@keithp.com> -- -keith signature.asc Description: PGP signature __

Re: switching the server to poll/epoll

2016-06-10 Thread Keith Packard
Adam Jackson writes: > Protip: git rebase -i -x make master Thanks. Will do. I spent a bunch of time re-ordering stuff to make it more understandable, and not enough time testing the individual patches. -- -keith signature.asc Description: PGP signature

Re: [PATCH xserver] glamor: Limit outstanding drawing queue with glClientWaitSync

2016-06-07 Thread Keith Packard
Eric Anholt writes: > vc4 just waits until you don't have too many (5, arbitrarily) execs > outstanding before submitting another one. I think this is a problem of > the Intel driver, not glamor. We ran into it with Intel on cairo-gl, > too, and I should have just fixed it in

Re: [PATCH xserver] os: Do timers under input lock, not blocked signals

2016-06-07 Thread Keith Packard
Peter Hutterer <peter.hutte...@who-t.net> writes: >> Signed-off-by: Keith Packard <kei...@keithp.com> > > Reviewed-by: Peter Hutterer <peter.hutte...@who-t.net> Merged. 88e981e..8174daa master -> master -- -keith signatu

Re: [PATCH mouse] bsd: Don't try to use SIGIO for input ABI >= 23

2016-06-07 Thread Keith Packard
Adam Jackson writes: > I suppose. The code is almost certainly broken as-is though, I can't > imagine trying to do both sigio and threaded input on the same fd would > go well (or be in any way reasonable to support). Looking usbSigioReadInput, xf86AddEnabledDevice and

Re: [PATCH mouse] bsd: Don't try to use SIGIO for input ABI >= 23

2016-06-07 Thread Keith Packard
Adam Jackson writes: > That said we're not masking sigio off from the input thread, which is > probably also worth fixing. I hope this does what you mean: InputThreadDoWork(void *arg) { sigset_t set; /* Don't handle any signals on this thread */ sigfillset();

Re: [PATCH mouse] bsd: Don't try to use SIGIO for input ABI >= 23

2016-06-07 Thread Keith Packard
Adam Jackson writes: > That certainly would be a less icky solution though, will send an update. Might be better to leave it for someone able to test the result? -- -keith signature.asc Description: PGP signature ___

Re: [PATCH xserver 3/5] dri1: Hide the SIGIO details from drivers

2016-06-07 Thread Keith Packard
Adam Jackson <a...@redhat.com> writes: > Yes. The motion is to get the definitions ahead of their use without a > forward decl, since dri.h no longer exposes them. Seems fine to me then. Acked-by: Keith Packard <kei...@keithp.com> -- -keith signature.asc Descript

Re: [PATCH xserver 5/5] dix: Update some comments to reflect the new non-SIGIO input model

2016-06-07 Thread Keith Packard
Adam Jackson <a...@redhat.com> writes: > Signed-off-by: Adam Jackson <a...@redhat.com> Reviewed-by: Keith Packard <kei...@keithp.com> -- -keith signature.asc Description: PGP signature ___ xorg-devel@lists.x.org: X.Org devel

Re: [PATCH xserver 4/5] xfree86: Undocument UseSIGIO in xorg.conf

2016-06-07 Thread Keith Packard
d-off-by: Adam Jackson <a...@redhat.com> Acked-by: Keith Packard <kei...@keithp.com> -- -keith signature.asc Description: PGP signature ___ xorg-devel@lists.x.org: X.Org development Archives: http://lists.x.org/archives/xorg-devel Info: https://lists.x.org/mailman/listinfo/xorg-devel

Re: [PATCH xserver 3/5] dri1: Hide the SIGIO details from drivers

2016-06-07 Thread Keith Packard
Adam Jackson writes: > Not being used, and not likely to be useful. This patch looks like you've just moved code around in the file; are there differences in the new code which require this motion? It's pretty hard to review as-is. -- -keith signature.asc Description: PGP

Re: [PATCH xserver 2/5] dmx: Remove SIGIO input support here too

2016-06-07 Thread Keith Packard
pair that and keep SIGIO working on this one niche DDX, > just rip it out and use the thread model like everyone else. > > Signed-off-by: Adam Jackson <a...@redhat.com> Acked-by: Keith Packard <kei...@keithp.com> -- -keith signature.asc Description: PGP signature _

Re: [PATCH xserver 1/5] dix: Use OsSignal() not signal()

2016-06-07 Thread Keith Packard
Adam Jackson <a...@redhat.com> writes: > As the man page for the latter states: > > The effects of signal() in a multithreaded process are unspecified. > > We already have an interface to call sigaction() instead, use it. Lgtm. Reviewed-by: Keith Packard <kei...

Re: [PATCH mouse] bsd: Don't try to use SIGIO for input ABI >= 23

2016-06-07 Thread Keith Packard
Adam Jackson writes: > Signed-off-by: Adam Jackson > --- > src/bsd_mouse.c | 2 ++ > 1 file changed, 2 insertions(+) > > diff --git a/src/bsd_mouse.c b/src/bsd_mouse.c > index a2c8ec7..dc628d4 100644 > --- a/src/bsd_mouse.c > +++ b/src/bsd_mouse.c > @@ -546,8

Re: [PATCH xserver] glamor: Limit outstanding drawing queue with glClientWaitSync

2016-06-07 Thread Keith Packard
Michel Dänzer writes: > Is this about x11perf by any chance? I was seeing long lag with that as > well, which turned out to be because we weren't correctly synchronizing > with the hardware for XGetImage. x11perf only does XGetImage once per run of the test; without some

Re: [PATCH xserver] glamor: Limit outstanding drawing queue with glClientWaitSync

2016-06-06 Thread Keith Packard
Michel Dänzer writes: > I wrote an eerily similar patch a while ago, but the problem turned out > to be in the GL or kernel driver. Are you sure that's not the case for > you? I'm seeing a long lag when running benchmarks that don't ever need to synchronize with the

Re: [PATCH xserver 1/4] xfree86/modes: Assign xf86_config->cursor in xf86_load_cursor_image v2

2016-06-05 Thread Keith Packard
Sorry 'bout these four emails -- just a slip of the fingers. -- -keith signature.asc Description: PGP signature ___ xorg-devel@lists.x.org: X.Org development Archives: http://lists.x.org/archives/xorg-devel Info:

[PATCH xserver] glamor: Limit outstanding drawing queue with glClientWaitSync

2016-06-04 Thread Keith Packard
in the block handler. This should let the device continue to process any operations queued since the previous block handler invocation and not slow down drawing too much. Signed-off-by: Keith Packard <kei...@keithp.com> --- glamor/glamor.c | 7 +++ glamor/glamor_priv.h | 2 ++ 2

[PATCH xserver 2/4] glamor: Cannot use copies when accessing outside of composite source

2016-06-04 Thread Keith Packard
ixes rendercheck regressions from the commit above. Reviewed-by: Keith Packard <kei...@keithp.com> --- glamor/glamor_render.c | 27 +++ 1 file changed, 15 insertions(+), 12 deletions(-) diff --git a/glamor/glamor_render.c b/glamor/glamor_render.c index 165bced..64141

[PATCH xserver 1/4] xfree86/modes: Assign xf86_config->cursor in xf86_load_cursor_image v2

2016-06-04 Thread Keith Packard
n(scrn)) v2: Set xf86_config->cursor at the beginning of xf86_load_cursor_image instead of at the end. Reviewed-by: Keith Packard <kei...@keithp.com> --- hw/xfree86/modes/xf86Cursors.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hw/xfree86/modes/xf86Cursors

[PATCH xserver 4/4] xfree86/modes: Remove xf86_reload_cursors v2

2016-06-04 Thread Keith Packard
From: Michel Dänzer No longer needed now that xf86CursorResetCursor is getting called for each CRTC configuration change. v2: Keep xf86_reload_cursors as a deprecated empty inline function until all drivers stop calling it. (Adam Jackson) Reviewed-by: Adam Jackson

[PATCH xserver 3/4] os: Use strtok instead of xstrtokenize in ComputeLocalClient

2016-06-04 Thread Keith Packard
From: Michel Dänzer Fixes leaking the memory pointed to by the members of the array returned by xstrtokenize. Reviewed-by: Adam Jackson --- os/access.c | 9 + 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/os/access.c

[PATCH xserver] ephyr: Process queued X events before blocking

2016-06-04 Thread Keith Packard
If we end up reading all pending X events in the course of other server execution, then our notify FD callback won't get invoked and we won't process them. Fix this by clearing the pending event queue before blocking in the server. Signed-off-by: Keith Packard <kei...@keithp.com> --- hw/

Re: [PATCH xserver] glamor: Cannot use copies when accessing outside of composite source

2016-06-02 Thread Keith Packard
Hans de Goede writes: > If you want a real-world test point firefox to: > > https://lkml.org/lkml/2015/8/25/738 > > At least that is broken for me (skylake igpu + modesetting driver) > and this patch fixes it. Yes, Michel asked me to merge that patch a couple of days ago

Re: [PULL xserver] Reviewed fixes and xf86_reload_cursors removal

2016-06-02 Thread Keith Packard
Michel Dänzer writes: >> Michel Dänzer (4): >> xfree86/modes: Assign xf86_config->cursor in xf86_load_cursor_image v2 >> glamor: Cannot use copies when accessing outside of composite source >> os: Use strtok instead of xstrtokenize in ComputeLocalClient >>

Re: switching the server to poll/epoll

2016-06-02 Thread Keith Packard
And yet more changes to my poll/epoll work. Peter and I discovered that the threaded input code wasn't doing locking correctly, which was easy enough to fix on master, but required a bit more work with the new ospoll interface. That's all cleaned up now. The series is longer now; I've found a

Re: [PATCH xserver] os: Initialize NotifyFds earlier in startup

2016-06-01 Thread Keith Packard
Peter Hutterer <peter.hutte...@who-t.net> writes: > On Tue, May 31, 2016 at 09:40:13AM -0700, Keith Packard wrote: >> If the server calls AbortServer during the first-time initialization >> (which can happen if you start the server on an already using >> DISPLAY), t

Re: [PATCH xserver] os: Lock input while messing with input device list

2016-06-01 Thread Keith Packard
Peter Hutterer <peter.hutte...@who-t.net> writes: >> Signed-off-by: Keith Packard <kei...@keithp.com> > > Reviewed-by: Peter Hutterer <peter.hutte...@who-t.net> Merged. -- -keith signature.asc Description: PGP signature

Re: [PATCH xserver] dix: Don't update current time in the middle of input event processing

2016-06-01 Thread Keith Packard
Peter Hutterer <peter.hutte...@who-t.net> writes: >> cc: Chase Douglas <chase.doug...@canonical.com> >> cc: Peter Hutterer <peter.hutte...@who-t.net> >> cc: Adam Jackson <a...@redhat.com> >> Signed-off-by: Keith Packard <kei...@keithp.com>

Re: [PATCH 2/3] Support XINPUT ABI version 23 (threaded input)

2016-05-31 Thread Keith Packard
Peter Hutterer writes: > this looks like a rebase gone wrong Oh so very wrong. The end result didn't differ, and I didn't look closely at the individual patches. Bits merged back into place and resent. -- -keith signature.asc Description: PGP signature

[PATCH xf86-input-evdev 2/3] Support XINPUT ABI version 23 (threaded input)

2016-05-31 Thread Keith Packard
Use input_lock/input_unlock calls instead of SIGIO functions Signed-off-by: Keith Packard <kei...@keithp.com> --- src/emuMB.c| 13 ++--- src/emuThird.c | 13 ++--- src/evdev.h| 4 3 files changed, 24 insertions(+), 6 deletions(-) diff --git a/src/emuMB.c

[PATCH xf86-input-evdev 1/3] Report errors when attempting to write keyboard controls

2016-05-31 Thread Keith Packard
This is mostly to eliminate a compiler warning. Signed-off-by: Keith Packard <kei...@keithp.com> --- src/evdev.c | 5 - 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/evdev.c b/src/evdev.c index 341db61..5ace238 100644 --- a/src/evdev.c +++ b/src/evdev.c @@ -1108,6 +

[PATCH xf86-input-evdev 3/3] Support XINPUT ABI 24 (remove select mask from block/wakeup handlers)

2016-05-31 Thread Keith Packard
The evdev driver wasn't using the select mask arguments, so this change just involves adjusting the argument lists. Signed-off-by: Keith Packard <kei...@keithp.com> --- src/emuMB.c | 8 ++-- src/evdev.h | 12 ++-- 2 files changed, 12 insertions(+), 8 deletions(-) diff --git

[PATCH xserver] os: Initialize NotifyFds earlier in startup

2016-05-31 Thread Keith Packard
-by: Keith Packard <kei...@keithp.com> --- os/osinit.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/os/osinit.c b/os/osinit.c index 54b39a0..629fef5 100644 --- a/os/osinit.c +++ b/os/osinit.c @@ -195,6 +195,7 @@ OsInit(void) #ifdef BUSFAULT busfault_init();

[PATCH 2/3] Support XINPUT ABI version 23 (threaded input)

2016-05-31 Thread Keith Packard
Use input_lock/input_unlock calls instead of SIGIO functions Signed-off-by: Keith Packard <kei...@keithp.com> --- src/emuMB.c| 23 ++- src/emuThird.c | 5 ++--- src/evdev.h| 8 ++-- 3 files changed, 22 insertions(+), 14 deletions(-) diff --git a/src/emu

[PATCH 1/3] Report errors when attempting to write keyboard controls

2016-05-31 Thread Keith Packard
This is mostly to eliminate a compiler warning. Signed-off-by: Keith Packard <kei...@keithp.com> --- src/evdev.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/evdev.c b/src/evdev.c index 341db61..4cdfacd 100644 --- a/src/evdev.c +++ b/src/evdev.c @@ -1122,7 +

[PATCH 3/3] Support XINPUT ABI 24 (remove select mask from block/wakeup handlers)

2016-05-31 Thread Keith Packard
The evdev driver wasn't using the select mask arguments, so this change just involves adjusting the argument lists. Signed-off-by: Keith Packard <kei...@keithp.com> --- src/emuMB.c | 6 ++ src/evdev.h | 12 ++-- 2 files changed, 12 insertions(+), 6 deletions(-) diff --git

[PATCH xserver] os: Lock input while messing with input device list

2016-05-31 Thread Keith Packard
after removing a device. Signed-off-by: Keith Packard <kei...@keithp.com> --- os/inputthread.c | 14 +++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/os/inputthread.c b/os/inputthread.c index 390b66b..40a0443 100644 --- a/os/inputthread.c +++ b/os/inputthread.c @@ -

Re: [PATCH xf86-input-mouse] Support input ABI version 23 and 24

2016-05-30 Thread Keith Packard
Peter Hutterer writes: > yeah, but until the server bits are merged there is still a chance that the > patches change and I'd rather not have to worry about that. Sure, two patches sent to the list. I'd love to get review on the proposed server API changes for version

[PATCH xf86-input-mouse 1/2] Support ABI_XINPUT_VERSION 23 (use input_lock/input_unlock)

2016-05-30 Thread Keith Packard
This makes using input_lock/input_unlock conditional on the ABI version so that we don't get compiler warnings when compiling with the newer server bits. Signed-off-by: Keith Packard <kei...@keithp.com> --- src/mouse.c | 24 1 file changed, 24 insertions(+) diff

[PATCH xf86-input-mouse 2/2] Support ABI_XINPUT_VERSION 24 (remove LastSelectMask from block/wakeup)

2016-05-30 Thread Keith Packard
The block and wakeup handler API is changing so that the FD_SET type isn't visible outside the OS layer anymore. The mouse driver didn't need that argument anyways, so the change is just to adjust the APIs to avoid compiler warnings. Signed-off-by: Keith Packard <kei...@keithp.com> --

Re: [PATCH xf86-input-mouse] Support input ABI version 23 and 24

2016-05-30 Thread Keith Packard
Peter Hutterer <peter.hutte...@who-t.net> writes: > On Mon, May 30, 2016 at 01:42:20AM -0700, Keith Packard wrote: >> Version 23 has threaded input, so locking uses input_lock/input_unlock >> instead of xf86BlockSIGIO/xf86UnblockSIGIO. >> >> Version 24 remove

Re: [PATCH xserver 17/23] os: Add ospoll interface

2016-05-30 Thread Keith Packard
Emil Velikov writes: > Amazing. On behalf of anyone who has to deal with the Windows side of > things - thank you. I'd love to see this working on Windows -- I think it could use either WSAPoll or select; neither of those depend on FD values at all. > Side note:

Re: [PATCH xserver] dix: Don't update current time in the middle of input event processing

2016-05-30 Thread Keith Packard
Michel Dänzer writes: > Tested-by: Michel Dänzer > > Thank you for restoring sanity to my GNOME session! Just don't ask how long it took to discover where the problem was... -- -keith signature.asc Description: PGP signature

Re: [PATCH libXfont 4/4] fstrans: Remove unused foo() function

2016-05-30 Thread Keith Packard
Jeremy Huddleston Sequoia <jerem...@apple.com> writes: > The point of it seems to have been to silence an unused function warning, but > there's no point if we're just transitioning that to another unused function > warning. Sigh. It worked once for me. Reviewed-by: Kei

Re: [PATCH xf86-input-libinput] Switch to xf86AddEnabledDevice if we have the input thread

2016-05-30 Thread Keith Packard
t loop. > > Now with the input thread we can use xf86AddEnabledDevice and let the server > decide what is best from there. > > Signed-off-by: Peter Hutterer <peter.hutte...@who-t.net> This patch is strangely familiar. Reviewed-by: Keith Packard <kei...@keithp.com> -

[PATCH xf86-input-mouse] Support input ABI version 23 and 24

2016-05-30 Thread Keith Packard
Version 23 has threaded input, so locking uses input_lock/input_unlock instead of xf86BlockSIGIO/xf86UnblockSIGIO. Version 24 removes the FD_SET arguments from block and wakeup handlers Signed-off-by: Keith Packard <kei...@keithp.com> --- src/mouse.

[PATCH xf86-input-keyboard] Use xf86AddEnabledDevice with threaded input

2016-05-30 Thread Keith Packard
We couldn't use SIGIO input for keyboard processing, but we can use threaded input. Signed-off-by: Keith Packard <kei...@keithp.com> --- src/kbd.c | 16 +++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/src/kbd.c b/src/kbd.c index e378dcc..3063d27 100644 ---

[PATCH xf86-input-libinput] Use xf86AddEnabledDevice instead of AddEnabledDevice when threaded [v3]

2016-05-30 Thread Keith Packard
, which can't get removed from the server until a few more patches past the threaded input change are merged. v3: remove reference to XI86_SIGNAL_IO, which was presumably a planned change to the xf86AddEnabledDevice path to make that not use SIGIO. Signed-off-by: Keith Packard <

[PATCH xf86-input-libinput] Use xf86AddEnabledDevice instead of AddEnabledDevice when threaded [v2]

2016-05-30 Thread Keith Packard
, which can't get removed from the server until a few more patches past the threaded input change are merged. Signed-off-by: Keith Packard <kei...@keithp.com> --- src/xf86libinput.c | 15 +++ 1 file changed, 15 insertions(+) diff --git a/src/xf86libinput.c b/src/xf86libinput.c

Re: [PATCH xserver 17/23] os: Add ospoll interface

2016-05-30 Thread Keith Packard
Julien Cristau writes: >> #define X_NOTIFY_READ POLLIN >> #define X_NOTIFY_WRITE POLLOUT >> #define X_NOTIFY_OTHER (!(POLLIN|POLLOUT)) >> > I guess you mean ~(POLLIN|POLLOUT). Yes, thanks. I've actually reconsidered and decided to make an interface which doesn't use

Re: [PATCH xserver] glamor: Cannot use copies when accessing outside of composite source

2016-05-30 Thread Keith Packard
Michel Dänzer <mic...@daenzer.net> writes: > [ Unknown signature status ] > On 30.05.2016 12:29, Keith Packard wrote: >> Michel Dänzer <mic...@daenzer.net> writes: >> >>> Let's take things one step at a time, get my patch in as is (which >>> bri

Re: [PATCH xserver] dix: Remove bogus input_mutex and input_mutex_count definitions from globals.c

2016-05-30 Thread Keith Packard
Peter Hutterer writes: > did you need the __thread for the one in os/inputthread.c? Nope, it's only modified under the lock. > Reviewed-by: Peter Hutterer otherwise Thanks. -- -keith signature.asc Description: PGP signature

Re: [PATCH xserver] glamor: Cannot use copies when accessing outside of composite source

2016-05-29 Thread Keith Packard
Michel Dänzer writes: > Let's take things one step at a time, get my patch in as is (which > brings us back to where we were before using copies wrt correctness) and > then yours on top? If that makes it easier for you to reason about, then it seems fine to me. -- -keith

Re: [PATCH xserver] os: fix input_mutex_count off-by-one in input_force_unlock

2016-05-29 Thread Keith Packard
Peter Hutterer <peter.hutte...@who-t.net> writes: >> Signed-off-by: Keith Packard <kei...@keithp.com> > > Reviewed-by: Peter Hutterer <peter.hutte...@who-t.net> Merged. -- -keith signature.asc Description: PGP signature

Re: xserver: Branch 'master' - 10 commits

2016-05-29 Thread Keith Packard
Peter Hutterer writes: > with that, Reviewed-by: Peter Hutterer Merged (in two patches, sorry for the typo!) -- -keith signature.asc Description: PGP signature ___ xorg-devel@lists.x.org: X.Org

Re: [PATCH xserver] Add ax_pthread.m4 to m4/

2016-05-29 Thread Keith Packard
Peter Hutterer <peter.hutte...@who-t.net> writes: > On Sat, May 28, 2016 at 04:51:46PM -0700, Keith Packard wrote: >> Threaded input requires AX_PTHREAD, which is provided by this file. >> >> Signed-off-by: Keith Packard <kei...@keithp.com> > > Acked-by: P

Re: [PATCH xserver] xfree86: Remove event reading code from xf86Wakeup

2016-05-29 Thread Keith Packard
Peter Hutterer <peter.hutte...@who-t.net> writes: >> Signed-off-by: Keith Packard <kei...@keithp.com> > > Reviewed-by: Peter Hutterer <peter.hutte...@who-t.net> Merged. -- -keith signature.asc Description: PGP signature

[PATCH xf86-input-libinput] Use xf86AddEnabledDevice instead of AddEnabledDevice when XI86_SIGNAL_IO

2016-05-29 Thread Keith Packard
This lets the xfree86 layer change to the NotifyFd interface without affecting the driver. Signed-off-by: Keith Packard <kei...@keithp.com> --- configure.ac | 8 src/xf86libinput.c | 11 +++ 2 files changed, 19 insertions(+) diff --git a/configure.ac b/configure.ac

[PATCH xserver] xfree86: Provide xf86BlockSIGIO and xf86ReleaseSIGIO as wrappers for input mutex

2016-05-29 Thread Keith Packard
. Signed-off-by: Keith Packard <kei...@keithp.com> --- hw/xfree86/common/xf86.h | 4 hw/xfree86/os-support/shared/sigio.c | 10 +- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/hw/xfree86/common/xf86.h b/hw/xfree86/common/xf86.h index adb5601..e54c811

[PATCH xserver] dix: Remove bogus input_mutex and input_mutex_count definitions from globals.c

2016-05-29 Thread Keith Packard
These are local to inputthread.c; the ones in globals.c aren't declared in any header file. Signed-off-by: Keith Packard <kei...@keithp.com> --- dix/globals.c | 9 - 1 file changed, 9 deletions(-) diff --git a/dix/globals.c b/dix/globals.c index e313930..f36a938 100644 ---

Re: [PATCH xserver 1/2] xwayland: Move sprite invalidation logic into mipointer

2016-05-29 Thread Keith Packard
Emil Velikov writes: > - Seems like the exports from mi/ are remnants from the separate > (non-builtin) extmod days. > > Not 100% sure though. Can anyone please shed some light ? _X_EXPORT is intended to mark the boundary between 'internal' bits of the server and

Re: [PATCH xserver 17/23] os: Add ospoll interface

2016-05-29 Thread Keith Packard
Emil Velikov writes: > There's two things which I should have mentioned: > - How does one have poll.h when poll() is missing - Cygwin may have > the header, although I'm not sure about other Windows based > implementations (the mingw and msvc ones). I'd expect

[PATCH xserver] os: fix input_mutex_count off-by-one in input_force_unlock

2016-05-29 Thread Keith Packard
-by: Keith Packard <kei...@keithp.com> --- os/inputthread.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/os/inputthread.c b/os/inputthread.c index b6bbf35..390b66b 100644 --- a/os/inputthread.c +++ b/os/inputthread.c @@ -109,9 +109,10 @@ void input_force_unloc

<    2   3   4   5   6   7   8   9   10   11   >