0b729051c0
Merge branch 'master' into mpx
...
Conflicts:
Xi/extinit.c
Xi/grabdev.c
Xi/setmode.c
Xi/ungrdev.c
dix/devices.c
dix/events.c
dix/getevents.c
include/dix.h
mi/midispcur.c
mi/misprite.c
xkb/xkbActions.c
xkb/xkbEvents.c
xkb/xkbPrKeyEv.c
2007-11-07 15:37:23 +10:30
a52c9b2a59
Merge branch 'master' into XACE-SELINUX
...
Conflicts:
dix/dispatch.c
dix/property.c
hw/xfree86/common/xf86VidMode.c
include/xkbsrv.h
render/glyph.c
xkb/xkbActions.c
2007-11-05 19:08:36 -05:00
59774af86b
XKB: Remove usage of alloca
...
alloca has no way to return failure, and instead can possibly arbitrarily
overflow the stack. Let's avoid that one.
2007-11-05 14:34:41 +00:00
a5cf3f21f7
registry: Register XKB extension protocol names.
2007-10-15 14:27:32 -04:00
8b54865720
xace: add hooks + new access codes: XKB extension.
...
Removes "LookupKeyboardDevice" and "LookupPointerDevice" in favor of
inputInfo.keyboard and inputInfo.pointer, respectively; all use cases
are non-XI compliant anyway.
2007-09-28 13:34:18 -04:00
bfc89c0355
xkb: unify ErrorFs. Prefix all with [xkb].
...
Output for XkbUseMsg intentionally skipped.
2007-09-26 15:23:37 +09:30
021fc5cb2c
Static markup and dead code cull over xkb/.
...
The former <X11/extensions/XKBsrv.h> has been pulled into the server now as
include/xkbsrv.h, and the world updated to look for it in the new place,
since it made no sense to define server API in an extension header. Any
further work along this line will need to do similar things with XKBgeom.h
and friends.
2007-03-20 18:37:02 -04:00
de5a4c6374
xkb: note that we allow full xi interaction
...
We now allow maps to be set (etc) on different keyboards, so stop putting
XkbXI_KeyboardsMask in unsupported.
2006-11-02 04:18:33 +02:00
6dd4fc4652
xkb: fix virtual modmap size computation
...
Compute virtual modmap size bounded by nVModMapKeys-1, rather than
nVModMapKeys.
This is sort of a best guess. The other way seems a little more
logical, but also leads to segfaults pretty quickly if you hammer
GetMap hard enough. So let's try this one.
2006-10-16 00:22:00 +03:00
ad355fecee
xkb: make sure we set the map on the right device, not necessarily core
...
Forgot that all XKB requests took a device spec: the comparison of
'if working on the core keyboard, does this device send core events; or,
is this device the core keyboard?' was broken. Instead, what we want is
'if working on the core keyboard, does this device send core events; or,
is this device the one we're working on?'.
2006-10-15 21:59:06 +03:00
4493acb88c
xkb: add FIXMEs to procedures which need to act on all core devices
...
Add FIXME comments above request handlers which need to act on all core-sending
devices if called on the core keyboard.
2006-10-08 17:51:03 +03:00
3686cd0fbf
xkb: make XkbSetControls work on all core-sending devices
2006-10-06 17:20:42 +03:00
7b4dc171b0
xkb: remove unused #ifndef
2006-10-06 16:26:54 +03:00
ab56f0c5b5
xkb: simplify core device loop in GetKeyboardByName
2006-10-06 16:12:36 +03:00
4b6e2f12f7
xkb: make LatchLockGroup work on all core-sending devices
...
Apply the settings to all devices sending core events, if we're working on the
core keyboard.
2006-10-06 16:08:21 +03:00
ebf9b3bbbb
xkb: update all core-sending keyboards on GetKeyboardByName
...
Update the keymaps of all keyboards which send core events on
GetKeyboardByName; still a few other procedures which need this treatment.
2006-10-06 14:17:59 +03:00
0aaac95b0d
Remove RCS tags. Fix Xprint makefile braindamage.
2006-07-21 17:56:00 -04:00
df6da66525
Simplify the unsupported XI function list.
2006-06-01 20:56:39 +00:00
6aadd454e7
Fix stupid thinko.
2006-04-10 10:11:19 +00:00
1357af2474
Coverity #340 : Fix potential NULL dereference. Clean up proliferation of
...
'register int n' in loops of ProcXkbGetNames.
2006-04-09 17:39:10 +00:00
47bdc9528c
Coverity #844 , #845 , #846 : Fix memory leaks.
2006-04-07 16:07:50 +00:00
5c0a2088e2
Bug #6428 : Fix off-by-one error when walking off the end of the vmodmap
...
list.
2006-04-01 21:49:44 +00:00
b3570dd94a
Remove INITARGS braindamage, change to void; add XkbExtensionInit prototype
...
to xkb.h. Explicitly initialise nTypes in xkb.c.
2006-03-25 22:37:58 +00:00
0bb669638f
Change <X11/misc.h> and <X11/os.h> to "misc.h" and "os.h".
2005-07-03 08:53:54 +00:00
e03198972c
Add Xtrans definitions (FONT_t, TRANS_CLIENT) to clean up warnings.
...
Add XSERV_t, TRANS_SERVER, TRANS_REOPEN to quash warnings.
Add #include <dix-config.h> or <xorg-config.h>, as appropriate, to all
source files in the xserver/xorg tree, predicated on defines of
HAVE_{DIX,XORG}_CONFIG_H. Change all Xfont includes to
<X11/fonts/foo.h>.
2005-07-03 07:02:09 +00:00
9b1debcdb6
Change all misc.h and os.h references to <X11/foo.h>.
2005-07-01 22:43:43 +00:00
292c4cff26
Fix includes right throughout the Xserver tree:
...
change "foo.h" to <X11/foo.h> for core headers, e.g. X.h, Xpoll.h;
change "foo.h", "extensions/foo.h" and "X11/foo.h" to
<X11/extensions/foo.h> for extension headers, e.g. Xv.h;
change "foo.[ch]" to <X11/Xtrans/foo.[ch]> for Xtrans files.
2005-04-20 12:25:48 +00:00
2fb5886200
Merging XORG-CURRENT into trunk
2004-04-23 19:54:30 +00:00
dae90c3af9
Importing vendor version xf86-4_4_99_1 on Sun Mar 14 00:26:39 PST 2004
2004-03-14 08:34:49 +00:00
867451f1ab
Importing vendor version xf86-4_4_0 on Wed Mar 3 04:09:24 PST 2004
2004-03-03 12:12:50 +00:00
df0313d35b
readding XFree86's cvs IDs
2004-02-26 13:36:15 +00:00
147aae87fd
Importing vendor version xf86-4_3_99_903 on Wed Feb 26 01:21:00 PST 2004
2004-02-26 09:23:53 +00:00
3c64b65d80
Importing vendor version xf86-012804-2330 on Thu Jan 29 00:06:33 PST 2004
2004-01-29 08:08:57 +00:00
adc7f9a4eb
XFree86 4.3.99.16 Bring the tree up to date for the Cygwin folks
2003-11-25 19:29:01 +00:00
d568221710
XFree86 4.3.0.1
2003-11-14 16:49:22 +00:00
ded6147bfb
R6.6 is the Xorg base-line
2003-11-14 15:54:54 +00:00
Peter Hutterer
Eamon Walsh
Daniel Stone
Adam Jackson
Adam Jackson
Egbert Eich
Kaleb Keithley