mirror of
https://github.com/X11Libre/xserver.git
synced 2026-09-29 21:46:40 +00:00
Merge branch 'master' into mpx
Conflicts: Xi/exevents.c dix/devices.c dix/getevents.c include/dix.h mi/mieq.c
This commit is contained in:
Peter Hutterer
commit
f367285fd5
755 changed files with 16266 additions and 5261 deletions
|
|
@ -23,7 +23,6 @@ OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH
|
|||
THE USE OR PERFORMANCE OF THIS SOFTWARE.
|
||||
|
||||
********************************************************/
|
||||
/* $XFree86$ */
|
||||
|
||||
#ifdef HAVE_DIX_CONFIG_H
|
||||
#include <dix-config.h>
|
||||
|
|
|
|||
|
|
@ -23,7 +23,6 @@ OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH
|
|||
THE USE OR PERFORMANCE OF THIS SOFTWARE.
|
||||
|
||||
********************************************************/
|
||||
/* $XFree86$ */
|
||||
|
||||
#ifdef HAVE_DIX_CONFIG_H
|
||||
#include <dix-config.h>
|
||||
|
|
|
|||
|
|
@ -23,7 +23,6 @@ OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH
|
|||
THE USE OR PERFORMANCE OF THIS SOFTWARE.
|
||||
|
||||
********************************************************/
|
||||
/* $XFree86$ */
|
||||
|
||||
#ifdef HAVE_DIX_CONFIG_H
|
||||
#include <dix-config.h>
|
||||
|
|
|
|||
|
|
@ -23,7 +23,6 @@ OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH
|
|||
THE USE OR PERFORMANCE OF THIS SOFTWARE.
|
||||
|
||||
********************************************************/
|
||||
/* $XFree86$ */
|
||||
|
||||
#ifdef HAVE_DIX_CONFIG_H
|
||||
#include <dix-config.h>
|
||||
|
|
|
|||
|
|
@ -77,7 +77,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
|
|||
#define POST_ERROR_MSG1 "\"Errors from xkbcomp are not fatal to the X server\""
|
||||
#define POST_ERROR_MSG2 "\"End of messages from xkbcomp\""
|
||||
|
||||
#if defined(__UNIXOS2__) || defined(WIN32)
|
||||
#if defined(WIN32)
|
||||
#define PATHSEPARATOR "\\"
|
||||
#else
|
||||
#define PATHSEPARATOR "/"
|
||||
|
|
@ -239,20 +239,8 @@ char *cmd = NULL,file[PATH_MAX],xkm_output_dir[PATH_MAX],*map,*outFile;
|
|||
OutputDirectory(xkm_output_dir, sizeof(xkm_output_dir));
|
||||
|
||||
if (XkbBaseDirectory!=NULL) {
|
||||
#ifndef __UNIXOS2__
|
||||
char *xkbbasedir = XkbBaseDirectory;
|
||||
char *xkbbindir = XkbBinDirectory;
|
||||
#else
|
||||
/* relocate the basedir and replace the slashes with backslashes */
|
||||
char *xkbbasedir = (char*)__XOS2RedirRoot(XkbBaseDirectory);
|
||||
char *xkbbindir = (char*)__XOS2RedirRoot(XkbBinDirectory);
|
||||
int i;
|
||||
|
||||
for (i=0; i<strlen(xkbbasedir); i++)
|
||||
if (xkbbasedir[i]=='/') xkbbasedir[i]='\\';
|
||||
for (i=0; i<strlen(xkbbindir); i++)
|
||||
if (xkbbindir[i]=='/') xkbbindir[i]='\\';
|
||||
#endif
|
||||
|
||||
cmd = Xprintf("\"%s" PATHSEPARATOR "xkbcomp\" -w %d \"-R%s\" -xkm %s%s -em1 %s -emp %s -eml %s keymap/%s \"%s%s.xkm\"",
|
||||
xkbbindir,
|
||||
|
|
@ -338,18 +326,8 @@ char tmpname[PATH_MAX];
|
|||
for xkbcomp. xkbcomp does not read from stdin. */
|
||||
char *xkmfile = tmpname;
|
||||
#endif
|
||||
#ifndef __UNIXOS2__
|
||||
char *xkbbasedir = XkbBaseDirectory;
|
||||
char *xkbbindir = XkbBinDirectory;
|
||||
#else
|
||||
int i;
|
||||
char *xkbbasedir = (char*)__XOS2RedirRoot(XkbBaseDirectory);
|
||||
char *xkbbindir = (char*)__XOS2RedirRoot(XkbBinDirectory);
|
||||
for (i=0; i<strlen(xkbbasedir); i++)
|
||||
if (xkbbasedir[i]=='/') xkbbasedir[i]='\\';
|
||||
for (i=0; i<strlen(xkbbindir); i++)
|
||||
if (xkbbindir[i]=='/') xkbbindir[i]='\\';
|
||||
#endif
|
||||
|
||||
buf = Xprintf(
|
||||
"\"%s" PATHSEPARATOR "xkbcomp\" -w %d \"-R%s\" -xkm \"%s\" -em1 %s -emp %s -eml %s \"%s%s.xkm\"",
|
||||
|
|
|
|||
|
|
@ -847,7 +847,7 @@ XkbProcessArguments(int argc,char *argv[],int i)
|
|||
}
|
||||
else if (strncmp(argv[i], "-xkbdir", 7) == 0) {
|
||||
if(++i < argc) {
|
||||
#if !defined(WIN32) && !defined(__UNIXOS2__) && !defined(__CYGWIN__)
|
||||
#if !defined(WIN32) && !defined(__CYGWIN__)
|
||||
if (getuid() != geteuid()) {
|
||||
LogMessage(X_WARNING, "-xkbdir is not available for setuid X servers\n");
|
||||
return -1;
|
||||
|
|
|
|||
|
|
@ -23,7 +23,6 @@ OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH
|
|||
THE USE OR PERFORMANCE OF THIS SOFTWARE.
|
||||
|
||||
********************************************************/
|
||||
/* $XFree86$ */
|
||||
|
||||
#ifdef HAVE_DIX_CONFIG_H
|
||||
#include <dix-config.h>
|
||||
|
|
|
|||
|
|
@ -1003,9 +1003,8 @@ XkbCopyKeymap(XkbDescPtr src, XkbDescPtr dst, Bool sendNotifies)
|
|||
if (!tmp)
|
||||
return FALSE;
|
||||
dst->map->types = tmp;
|
||||
bzero(dst->map->types +
|
||||
(dst->map->num_types * sizeof(XkbKeyTypeRec)),
|
||||
(src->map->num_types - dst->map->size_types) *
|
||||
bzero(dst->map->types + dst->map->num_types,
|
||||
(src->map->num_types - dst->map->num_types) *
|
||||
sizeof(XkbKeyTypeRec));
|
||||
}
|
||||
else {
|
||||
|
|
|
|||
|
|
@ -1,4 +1,3 @@
|
|||
/* $Xorg: xkbout.c,v 1.3 2000/08/17 19:46:44 cpqbld Exp $ */
|
||||
/************************************************************
|
||||
Copyright (c) 1994 by Silicon Graphics Computer Systems, Inc.
|
||||
|
||||
|
|
@ -24,7 +23,6 @@
|
|||
THE USE OR PERFORMANCE OF THIS SOFTWARE.
|
||||
|
||||
********************************************************/
|
||||
/* $XFree86: xc/lib/xkbfile/xkbout.c,v 3.9 2001/10/28 03:32:47 tsi Exp $ */
|
||||
|
||||
#ifdef HAVE_DIX_CONFIG_H
|
||||
#include <dix-config.h>
|
||||
|
|
|
|||
|
|
@ -1,4 +1,3 @@
|
|||
/* $Xorg: xkbtext.c,v 1.3 2000/08/17 19:46:44 cpqbld Exp $ */
|
||||
/************************************************************
|
||||
Copyright (c) 1994 by Silicon Graphics Computer Systems, Inc.
|
||||
|
||||
|
|
@ -24,7 +23,6 @@
|
|||
THE USE OR PERFORMANCE OF THIS SOFTWARE.
|
||||
|
||||
********************************************************/
|
||||
/* $XFree86: xc/lib/xkbfile/xkbtext.c,v 3.11 2002/12/21 18:49:02 paulo Exp $ */
|
||||
|
||||
#ifdef HAVE_DIX_CONFIG_H
|
||||
#include <dix-config.h>
|
||||
|
|
|
|||
Loading…
Reference in a new issue