Daniel Stone
f34b9a20b0
XKB: Be a tiny bit more conservative with type allocation
...
Make sure size_types will _always_ be 0 if we don't have any types.
2007-03-21 02:04:44 +02:00
Adam Jackson
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
Daniel Stone
760a38c4c7
XkbCopyKeymap: fix copy-and-waste accident
...
When we reallocated modmap, we accidentally clobbered syms with the
result, leaving syms definitely too small, and modmap also potentially too
small (as well as not actually allocated anymore).
2007-02-05 03:43:10 +02:00
Daniel Stone
329f641727
XkbCopyKeymap: make sure sym_interpret is always valid
...
Make sure we're not copying sym_interpret across from an empty source.
2006-12-24 06:28:52 +02:00
Daniel Stone
ec84f72d07
XkbCopyKeymap: always initialise map and preserve
...
If we don't have map or preserve in the source map, make sure the
destination is initialised to NULL, and freed if it's a valid type.
2006-12-08 21:31:51 +02:00
Daniel Stone
389275d240
XkbCopyKeymap: don't iterate broken types, or dereference null pointers
...
Don't iterate invalid destination types (>= num_types) when coping key
types.
Don't free key_aliases if it's NULL (theoretical, but sure).
Make sure dst's label_font gets allocated if it's NULL.
(Thanks, Chris Lee.)
2006-11-08 15:29:16 +02:00
Daniel Stone
d9a5e3e964
XkbCopyKeymap: be more careful with levels, allocate compat/geom
...
Take various extra precautions with copying levels across (thanks Chris
Lee for a gdb session), including allocating when we don't already have a
coherent map.
Only free type components if they're present.
Allocate geometry and compat components if we don't already have them in
the dest map.
2006-11-02 00:45:23 +02:00
Daniel Stone
562096a012
XkbCopyKeymap: increment shapes and outlines when copying
...
Remember to increment the source and destination shapes when copying,
instead of just endlessly copying the first one.
2006-10-23 02:49:22 +03:00
Daniel Stone
a484ba1527
XkbCopyKeymap: copy server vmods, and name atoms
...
Copy server->vmods, and all the atoms in names.
2006-10-15 23:47:34 +03:00
Daniel Stone
a05044cfc1
xkb: better support of XkbDfltXIId
...
XKB.h specifies that XkbDfltXIId should be used where the client doesn't
care about the device identifier. We take this to mean core devices,
where practical.
2006-10-14 22:14:56 +03:00
Daniel Stone
93302452e7
XkbCopyKeymap: add geometry support
...
Add a first cut at geometry support, which seems to generally work.
2006-10-14 15:54:12 +03:00
Daniel Stone
bd3d93be82
xkb: remove random broken vendor workarounds
2006-10-08 23:21:12 +03:00
Daniel Stone
3c98cebb6e
Merge branch 'input-hotplug' of git+ssh://git.freedesktop.org/git/xorg/xserver into input-hotplug
2006-10-02 02:18:17 +03:00
Ivan Pascal
fa1ac94178
xkb: fix wrapping when switching between groups
...
Use XkbCharToInt as that's what we're doing.
2006-10-02 02:17:14 +03:00
Zephaniah E. Hull
5893375786
Warning fix, and a syntax fix in a #if 0 section of code.
2006-09-10 15:50:51 -04:00
Daniel Stone
629798c73a
XkbCopyKeymap/SrvXkbCopyKeymap: free geom harder, add cheery comments
...
Unconditionally free geometry when copying the keymap (so we have none on
core, oh well), add a couple of heartening comments.
2006-09-07 15:17:04 +03:00
Daniel Stone
0eb7299f44
[PATCH] XkbCopyKeymap: still more range fixes
...
Make sure we don't stomp preserve if it doesn't already exist, and fix a
couple of range-related thinkos in level name copying.
2006-08-29 15:17:56 +03:00
Daniel Stone
db1ab1bdb2
XkbCopyKeymap: fix various range issues
...
Fix a bunch of range issues caused by incorrect assumptions (e.g. that the
design was at least halfway sensible), and copy types by hand, instead of
just blindly memcpy()ing the lot, since it itself cleverly contains a ton
of allocated pointers.
2006-08-24 23:33:59 +03:00
Daniel Stone
33af05d58f
XkbCopyKeymap: use correct range for MapNotify
...
We haven't copied {min,max}_key_code by the time the notifies run, so use
src instead of dst to determine number of keys, et al.
2006-08-23 19:05:50 +03:00
Daniel Stone
6323a11d0d
XkbCopyKeymap: optionally send NewKeyboardNotify/MapNotify events
...
Optionally send a NewKeyboardNotify or MapNotify event when copying the
keymap; modify GetKeyboardValuatorEvents to make use of this.
2006-08-23 18:53:04 +03:00
Daniel Stone
8f8487ff99
xkb/gkve: copy XKB map, not pointer-assign
...
Write a new function to copy an XKB map (does everything but geometry at
the moment), and use that instead of nasty pointer assignments.
2006-08-23 14:33:41 +03:00
Adam Jackson
0aaac95b0d
Remove RCS tags. Fix Xprint makefile braindamage.
2006-07-21 17:56:00 -04:00
Daniel Stone
fd8bde8bb0
Remove -xkbmap argument.
2006-05-29 11:14:03 +00:00
Daniel Stone
66500819b1
Bug #1358 : Make ISO_Prev_Group cycle/wrap as ISO_Next_Group does.
2006-04-03 11:37:30 +00:00
Daniel Stone
aae4238360
Fix two glaring unconditional-NULL-dereferences.
2006-03-25 20:17:58 +00:00
Daniel Stone
0bb669638f
Change <X11/misc.h> and <X11/os.h> to "misc.h" and "os.h".
2005-07-03 08:53:54 +00:00
Daniel Stone
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
Daniel Stone
9b1debcdb6
Change all misc.h and os.h references to <X11/foo.h>.
2005-07-01 22:43:43 +00:00
Daniel Stone
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
Egbert Eich
2fb5886200
Merging XORG-CURRENT into trunk
2004-04-23 19:54:30 +00:00
Egbert Eich
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
Egbert Eich
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
Egbert Eich
df0313d35b
readding XFree86's cvs IDs
2004-02-26 13:36:15 +00:00
Egbert Eich
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
Kaleb Keithley
adc7f9a4eb
XFree86 4.3.99.16 Bring the tree up to date for the Cygwin folks
2003-11-25 19:29:01 +00:00
Kaleb Keithley
d568221710
XFree86 4.3.0.1
2003-11-14 16:49:22 +00:00
Kaleb Keithley
ded6147bfb
R6.6 is the Xorg base-line
2003-11-14 15:54:54 +00:00