Commit Graph

32 Commits

Author SHA1 Message Date
Peter Hutterer
4f2cd0ed96 Merge branch 'master' into mpx
This merge reverts Magnus' device coorindate scaling changes. MPX core event
generation is very different, so we can't scale in GetPointerEvents.

Conflicts:

	Xi/opendev.c
	dix/devices.c
	dix/dixfonts.c
	dix/getevents.c
	dix/resource.c
	dix/window.c
	hw/xfree86/common/xf86Xinput.c
	mi/mipointer.c
	xkb/ddxBeep.c
	xkb/ddxCtrls.c
	xkb/ddxKeyClick.c
	xkb/ddxList.c
	xkb/ddxLoad.c
	xkb/xkb.c
	xkb/xkbAccessX.c
	xkb/xkbEvents.c
	xkb/xkbInit.c
	xkb/xkbPrKeyEv.c
	xkb/xkbUtils.c
2008-03-04 18:11:10 +10:30
Daniel Stone
fbd7768946 XKB: Ditch XkbFileInfo
Sorry about the megacommit, but this touches on a lot of stuff.

Get rid of XkbFileInfo, which was pretty seriously redundant, and move the
only useful thing it had (defined) into XkbDescRec.  defined will be removed
pretty soon anyway.  Is the compat map pointer non-NULL? Then you have a
compat map, congratulations! Anyhow, I digress.

All functions that took an XkbFileInfoPtr now take an XkbDescPtr, _except_
XkmReadFile, which returns an XkbDescPtr *, because people want to deal in
XkbDescPtrs, not XkbDescRecs.
2008-02-17 22:52:08 +02:00
Daniel Stone
ab79110a84 XKB: Remove support for pre-built keymaps
Don't load prebuilt keymaps anymore.
2008-02-17 22:52:07 +02:00
Daniel Stone
1332343910 XKB: Remove usage of client-side types
Since we're no longer sharing with Xlib, don't pass Displays and XPointers
everywhere.
2008-02-17 22:52:07 +02:00
Daniel Stone
534fc5140b XKB: Remove a bunch of mad ifdefs
We have SEEK_SET and size_t, seriously.  Also use DebugF instead of
ifdef DEBUG, and ditch a couple of random bits that were never used.
2008-02-17 22:52:07 +02:00
Peter Hutterer
bfc89c0355 xkb: unify ErrorFs. Prefix all with [xkb].
Output for XkbUseMsg intentionally skipped.
2007-09-26 15:23:37 +09:30
Adam Jackson
f7f3fe7fe7 Remove the remnants of OS/2 support.
This has never worked in any modular server release, and as far as I know
was never tested in 6.7 through 6.9.
2007-06-28 18:59:05 -04: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
9c7440bdf5 xkb: remove the world's most staggeringly broken vendor workaround
Certain versions of LynxOS needed to sleep up to five seconds for closing a
pipe to actually, y'know, be useful.
2006-10-02 20:58:33 +03:00
Adam Jackson
0aaac95b0d Remove RCS tags. Fix Xprint makefile braindamage. 2006-07-21 17:56:00 -04:00
Kristian Høgsberg
287336f3c9 Teach xkb how to optionally run xkbcomp from $bindir instead of
$datadir/xkb.
2005-09-01 19:56:14 +00:00
Kristian Høgsberg
a65c579613 Include xkb-config.h if we have it so we pick up the paths defined there. 2005-08-31 14:58:09 +00:00
Alan Coopersmith
b076020140 If MAKE_XKM_OUTPUT_DIR is defined, call trans_mkdir to create directory if
it doesn't already exist. (ported from Solaris Xsun bug #5039004)
When BuildLikeSun is set, define MAKE_XKM_OUTPUT_DIR and set the xkb output
    directory to /var/run/xkb.
2005-08-22 21:47:59 +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
Alexander Gottwald
db5bd04097 Fix includes right throughout the Xserver tree:
apply changes to windows specific includes
Fix includes right throughout the Xserver tree:
apply changes to Xdmcp.h
2005-04-20 16:40:52 +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
Alexander Gottwald
2f0bdf77dd xc/programs/Xserver/xkb/ddxLoad.c
Bugzilla #2245 (https://bugs.freedesktop.org/show_bug.cgi?id=2245)
    attachment #1649 (https://bugs.freedesktop.org/attachment.cgi?id=1649):
    cleanup the generation of xkbcomp command lines. Allocate them
    dynamicly and remove unmaintainable length calculation.
2005-02-01 18:14:01 +00:00
Alexander Gottwald
fe4e74241f xc/programs/Xserver/xkb/ddxList.c
//bugs.freedesktop.org/show_bug.cgi?id=2245) attachment #1647
    (https://bugs.freedesktop.org/attachment.cgi?id=1647): export
    Win32System and Win32TempDir remove #ifdef WIN32 block for building
    xkbcomp commandline create win32 tempfile in system tempdir use
    PATH_MAX*4 for commandline buffer unlink tmpfile again
2005-01-09 17:35:47 +00:00
Alexander Gottwald
ba25f7e8dc //bugs.freedesktop.org/show_bug.cgi?id=2245) attachment #1645
(https://bugs.freedesktop.org/attachment.cgi?id=1645): cleanup some
    #ifdef __UNIXOS2__ and WIN32 blocks. make OutputDirectory check the
    size of the buffer quote all file and pathnames in the xkbcomp
    commandline use PATH_MAX*4 for commandline buffer
2005-01-09 15:29:45 +00:00
Alexander Gottwald
83e13e21c8 Print error message if CreateProcess fails Simplify popen simulation code
for WIN32 Remove temporary file after executing xkbcomp
2004-12-24 14:40:28 +00:00
Alexander Gottwald
bb43f234c5 Use GetTempPath for finding a place where to store temporary files on
Windows
2004-11-22 15:00:04 +00:00
Alexander Gottwald
e6bc551e34 Use CreateProcess instead of system() to spawn xkbcomp on windows. system()
can not handle spaces in the path component. Quoted all filenames on
    the commandline.
2004-11-15 18:13:41 +00:00
Alexander Gottwald
9826b83826 Bufzilla #1802, http://freedesktop.org/bugzilla/show_bug.cgi?id=1802 Added
mingw (Win32) port
2004-11-15 15:06:51 +00:00
Egbert Eich
522c878fca Removing unneeded private FreeType2 symbol.
Updating to EDID 1.3. (Bugzilla# 1490, Jay Cotton, Egbert Eich).
Removing unneeded code.
Fixed KGA handling for i810. KGA handling for chips derived from C&T chips
    is slightly different. The changes make the code consistent with the
    C&T (chips) and i740 drivers.
2004-11-02 08:54:53 +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