XLibre/xserver
1
1
Fork 0
mirror of https://github.com/X11Libre/xserver.git synced 2026-04-10 06:03:54 +00:00
Code Issues Packages Projects Releases Wiki Activity
10,560 Commits 314 Branches 34 Tags
5423da9fb2ec0dfeff866f12cf26fbba04ea673d
Commit Graph

10560 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Nicolas Kaiser
5423da9fb2 xkb: remove duplicated include 
Remove duplicated include.

Signed-off-by: Nicolas Kaiser <nikai@nikai.net>
Reviewed-by: Matthieu Herrb <matthieu.herrb@laas.fr>
 2011-04-25 10:45:34 -07:00
Nicolas Kaiser
79b3a7f83d test/xi2: remove duplicated include 
Remove duplicated include.

Signed-off-by: Nicolas Kaiser <nikai@nikai.net>
Reviewed-by: Matthieu Herrb <matthieu.herrb@laas.fr>
 2011-04-25 10:45:34 -07:00
Nicolas Kaiser
a17c30d43e hw/xwin: remove duplicated includes 
Remove duplicated includes.

Signed-off-by: Nicolas Kaiser <nikai@nikai.net>
Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
Reviewed-by: Jon TURNEY <jon.turney@dronecode.org.uk>
 2011-04-25 10:45:29 -07:00
Nicolas Kaiser
c270cfc30c hw/xquartz: remove duplicated includes 
Remove duplicated includes.

Signed-off-by: Nicolas Kaiser <nikai@nikai.net>
Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
 2011-04-24 19:46:07 -07:00
Nicolas Kaiser
50ced6cfa0 hw/xnest: remove duplicated include 
Remove duplicated include.

Signed-off-by: Nicolas Kaiser <nikai@nikai.net>
Reviewed-by: Matthieu Herrb <matthieu.herrb@laas.fr>
 2011-04-24 19:46:06 -07:00
Nicolas Kaiser
387f45a707 hw/xfree86/modes: remove duplicated include 
Remove duplicated include.

Signed-off-by: Nicolas Kaiser <nikai@nikai.net>
Reviewed-by: Matthieu Herrb <matthieu.herrb@laas.fr>
 2011-04-24 19:46:06 -07:00
Nicolas Kaiser
78a9ec125d hw/xfree86/fbdevhw: remove duplicated include 
Remove duplicated include.

Signed-off-by: Nicolas Kaiser <nikai@nikai.net>
Reviewed-by: Matthieu Herrb <matthieu.herrb@laas.fr>
 2011-04-24 19:46:06 -07:00
Nicolas Kaiser
0320db25f9 hw/xfree86/dri: remove duplicated includes 
Remove duplicated includes.

Signed-off-by: Nicolas Kaiser <nikai@nikai.net>
Reviewed-by: Matthieu Herrb <matthieu.herrb@laas.fr>
 2011-04-24 19:46:06 -07:00
Nicolas Kaiser
b56271b954 hw/xfree86/ddc: remove duplicated include 
Remove duplicated include.

Signed-off-by: Nicolas Kaiser <nikai@nikai.net>
Reviewed-by: Matthieu Herrb <matthieu.herrb@laas.fr>
 2011-04-24 19:46:06 -07:00
Nicolas Kaiser
86c0c8b9c5 dix: remove duplicated includes 
Remove duplicated includes.

Signed-off-by: Nicolas Kaiser <nikai@nikai.net>
Reviewed-by: Matthieu Herrb <matthieu.herrb@laas.fr>
 2011-04-24 19:46:06 -07:00
Nicolas Kaiser
9b5046d213 Xi: remove duplicated includes 
Remove duplicated includes.

Signed-off-by: Nicolas Kaiser <nikai@nikai.net>
Reviewed-by: Matthieu Herrb <matthieu.herrb@laas.fr>
 2011-04-24 19:46:05 -07:00
Keith Packard
918a9c99cf Merge remote-tracking branch 'jeremyhu/master' 2011-04-22 11:20:16 -07:00
Aaron Plattner
88c4622b59 linux: Retry VT ioctls while errno == EINTR 
When the smart scheduler is enabled, the VT ioctls (particularly
VT_WAITACTIVE) can be interrupted by the smart scheduler's SIGALRMs.
Previously, this caused the server to immediately continue on to
ScreenInit, almost certainly causing a crash or failure because the X
server that owned the VT hadn't finished cleaning up.  As of commit
7ee965a300, it causes a FatalError
instead.

Retrying the ioctl as long as it fails with errno == EINTR fixes the
problem and allows server regenerations to trigger VT switches that
actually succeed.

Signed-off-by: Aaron Plattner <aplattner@nvidia.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Cyril Brulebois <kibi@debian.org>
Signed-off-by: Keith Packard <keithp@keithp.com>
 2011-04-22 11:14:43 -07:00
Keith Packard
302bdc3c96 Merge remote-tracking branch 'whot/for-keith' 2011-04-22 10:48:37 -07:00
Jeremy Huddleston
5f496bc919 XQuartz: Do translation and handoff of NSEvent to X11 in a separate serial queue 
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
 2011-04-22 02:20:59 -07:00
Jeremy Huddleston
72bd232b11 XQuartz: Send tablet proximity events with tilt and pressure 
<rdar://problem/6257569>

Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
 2011-04-22 01:24:44 -07:00
Jeremy Huddleston
034538ea9b XQuartz: Use dispatch_async to handoff the FD 
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
 2011-04-21 23:56:18 -07:00
Jeremy Huddleston
ca7b9e6c81 configure.ac: Add check for libdispatch when building for darwin 
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
 2011-04-21 23:56:18 -07:00
Jeremy Huddleston
3960115dbc XQuartz: Fix prototypes for thread functions 
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
 2011-04-21 23:56:18 -07:00
Jeremy Huddleston
7524dbd061 XQuartz: Make the DarwinProcessFDAdditionQueue_thread wait 3 seconds to allow xinitrc to catch up 
Previously, we weren't always waiting the full three seconds.  This should
be better, but is still sub-optimal.  We really want to start processing
these once a WM has been started.

http://xquartz.macosforge.org/trac/ticket/416

Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
 2011-04-21 23:56:18 -07:00
Peter Hutterer
6f97fe5df1 dix: improve control flow in QueryTrackers 
If the velocity is 0, skip the remainder.
If we're not in range, skip the remainder.

No functional change.

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Jamey Sharp <jamey@minilop.net>
 2011-04-21 16:05:16 +10:00
Peter Hutterer
a0eda8cd36 dix: rename a bunch of variables to be more self-explanatory 
i → used_offset
iveloc → initial_velocity
res → result
vdiff → velocity_diff
vfac → velocity_factor
tmp → tracker_velocity

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
Reviewed-by: Jamey Sharp <jamey@minilop.net>
Reviewed-by: Simon Thum <simon.thum@gmx.de>
 2011-04-21 14:45:09 +10:00
Peter Hutterer
e490190590 dix: reduce scope of tmp and mult. 
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
Reviewed-by: Jamey Sharp <jamey@minilop.net>
Reviewed-by: Simon Thum <simon.thum@gmx.de>
 2011-04-21 14:22:52 +10:00
Peter Hutterer
81c6e79f42 dix: reduce the work done by ApplySoftening 
We can modify fdx/fdy in-place rather than requiring dx/dy as well. And the
decision to soften can be made in the caller (unless decided by the velocity
state).

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
Reviewed-by: Jamey Sharp <jamey@minilop.net>
Reviewed-by: Simon Thum <simon.thum@gmx.de>
 2011-04-21 14:22:30 +10:00
Peter Hutterer
5870d507ce dix: split softening and constant deceleration into two functions 
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
Reviewed-by: Jamey Sharp <jamey@minilop.net>
Reviewed-by: Simon Thum <simon.thum@gmx.de>
 2011-04-21 14:22:19 +10:00
Peter Hutterer
8ae90552f9 dix: use single return statement in ApplySimpleSoftening 
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
Reviewed-by: Jamey Sharp <jamey@minilop.net>
Reviewed-by: Simon Thum <simon.thum@gmx.de>
 2011-04-21 14:21:30 +10:00
Peter Hutterer
c45f4cc6bd dix: rename od, d to prev_delta, delta 
And res to result.

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
Reviewed-by: Jamey Sharp <jamey@minilop.net>
Reviewed-by: Simon Thum <simon.thum@gmx.de>
 2011-04-21 14:21:26 +10:00
Peter Hutterer
5ffe06bada dix: Don't use short as bool 
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
Reviewed-by: Jamey Sharp <jamey@minilop.net>
Reviewed-by: Simon Thum <simon.thum@gmx.de>
 2011-04-21 14:20:11 +10:00
Peter Hutterer
97c1967689 dix: rename "res" to "result" for improved readability 
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
Reviewed-by: Jamey Sharp <jamey@minilop.net>
Reviewed-by: Simon Thum <simon.thum@gmx.de>
 2011-04-21 14:19:51 +10:00
Peter Hutterer
1c162ebcab dix: change ProcessVelocityData2D to BOOL. 
Don't confuse users with a return type of short, that's even less indicative
that it returns 0/non-0 than "int".

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
Reviewed-by: Jamey Sharp <jamey@minilop.net>
 2011-04-21 14:17:55 +10:00
Peter Hutterer
70b76286db dix: add some more documentation to ptraccel code 
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
Reviewed-by: Jamey Sharp <jamey@minilop.net>
Reviewed-by: Simon Thum <simon.thum@gmx.de>
 2011-04-21 14:15:49 +10:00
Peter Hutterer
6b3a4cc6af dix: don't pass the index for a tracker around, pass the tracker 
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
Reviewed-by: Jamey Sharp <jamey@minilop.net>
Reviewed-by: Simon Thum <simon.thum@gmx.de>
 2011-04-21 14:13:51 +10:00
Peter Hutterer
9e8645cacf dix: CalcTracker only uses the tracker, thus only pass the tracker. 
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
Reviewed-by: Jamey Sharp <jamey@minilop.net>
Reviewed-by: Simon Thum <simon.thum@gmx.de>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
 2011-04-21 14:00:44 +10:00
Peter Hutterer
62f4bef82d dix: use single return statement in DoGetDirection 
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
Reviewed-by: Jamey Sharp <jamey@minilop.net>
Reviewed-by: Simon Thum <simon.thum@gmx.de>
 2011-04-21 13:58:55 +10:00
Peter Hutterer
5f8edbe47e dix: use single return value in GetDirection 
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
Reviewed-by: Jamey Sharp <jamey@minilop.net>
Reviewed-by: Simon Thum <simon.thum@gmx.de>
 2011-04-21 13:55:49 +10:00
Peter Hutterer
afaa178125 dix: document GetDirection 
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
Reviewed-by: Jamey Sharp <jamey@minilop.net>
Reviewed-by: Simon Thum <simon.thum@gmx.de>
 2011-04-21 13:49:38 +10:00
Peter Hutterer
df90db892d dix: document DoGetDirection's maths 
This is the best explanation I can come up with, but it seems to hold true
for my example values.

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
Reviewed-by: Jamey Sharp <jamey@minilop.net>
Reviewed-by: Simon Thum <simon.thum@gmx.de>
 2011-04-21 13:48:41 +10:00
Peter Hutterer
7513190ec7 dix: improve comment, directions flagged are 45° each 
The two directions returned by this calculation are always the two boundary
conditions. Since we don't do quadrants but octants, the flagged ones are
45° each. e.g. an angle of 35° flags E and NE.

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Jamey Sharp <jamey@minilop.net>
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
 2011-04-21 13:48:11 +10:00
Peter Hutterer
e804ae85fe dix: improve readbility of DoGetDirection. 
Use enums for the direction bits, not hardcoded bitfield values that are
added up.

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
Reviewed-by: Jamey Sharp <jamey@minilop.net>
Reviewed-by: Simon Thum <simon.thum@gmx.de>
 2011-04-21 13:48:01 +10:00
Peter Hutterer
709b291972 dix: only use a single return where only one is needed. 
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
Reviewed-by: Jamey Sharp <jamey@minilop.net>
Reviewed-by: Simon Thum <simon.thum@gmx.de>
 2011-04-21 13:47:52 +10:00
Peter Hutterer
8c528c667d dix: fix typo in direction calculation 
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
Reviewed-by: Jamey Sharp <jamey@minilop.net>
Reviewed-by: Simon Thum <simon.thum@gmx.de>
 2011-04-21 13:47:42 +10:00
Peter Hutterer
47f8cba6f3 xfree86: removed unused "event" variable in xf86PostMotionEventM 
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
 2011-04-21 13:43:53 +10:00
Peter Hutterer
c6212a3e5d dix: silence compiler warning 
resource.c: In function 'AddResource':
resource.c:493:3: warning: format '%lx' expects type 'long unsigned int',
but argument 3 has type 'RESTYPE'

RESTYPE is uint32_t, not long.

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
 2011-04-21 13:43:46 +10:00
Peter Hutterer
196d679bed test: remove glib dependency 
The few features from the glib test suite we used can be replaced with
assert and printf. This patch is a simple replacement for these two
    g_assert → assert
    g_test_message → printf

g_test_init is removed and so is g_test_bug_base. g_test_run replaced with a
simple return 0.

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Acked-by: Tiago Vignatti <tiago.vignatti@nokia.com>
Acked-by: Gaetan Nadon <memsize@videotron.ca>
 2011-04-21 13:43:43 +10:00
Peter Hutterer
071a6ac4d0 input: remove GetKeyboardValuatorEvents, this is now unnecessary. 
GetKeyboardValuatorEvents handles NULL valuator masks already, so the
GetKeyboardEvents wrapper is not needed. Rename GKVE to GKE.

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
 2011-04-18 13:05:46 +10:00
Peter Hutterer
91a735328c test: add some XIPassiveGrab protocol testing. 
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Acked-by: Daniel Stone <daniel@fooishbar.org>
 2011-04-18 13:05:04 +10:00
Peter Hutterer
60b08e013d Xi: don't swap the status byte in the XIPassiveGrab replies 
Reported-by: Julien Cristau <jcristau@debian.org>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
 2011-04-18 13:04:47 +10:00
Peter Hutterer
a3f37f3698 Xi: exit with error value if CheckGrabValues failed. 
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
 2011-04-18 13:04:44 +10:00
Peter Hutterer
f4d9ff73b1 Xi: fix reply swapping function check for XIPassiveGrabDevice 
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
 2011-04-18 13:04:42 +10:00
Peter Hutterer
2a49ffa3c9 Xi: return the bad device ID if a passive grab fails with BadDevice. 
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
 2011-04-18 13:04:39 +10:00