2003-11-14 16:54:54 +01:00
|
|
|
/************************************************************
|
|
|
|
Copyright (c) 1993 by Silicon Graphics Computer Systems, Inc.
|
|
|
|
|
|
|
|
Permission to use, copy, modify, and distribute this
|
|
|
|
software and its documentation for any purpose and without
|
|
|
|
fee is hereby granted, provided that the above copyright
|
|
|
|
notice appear in all copies and that both that copyright
|
|
|
|
notice and this permission notice appear in supporting
|
|
|
|
documentation, and that the name of Silicon Graphics not be
|
|
|
|
used in advertising or publicity pertaining to distribution
|
|
|
|
of the software without specific prior written permission.
|
|
|
|
Silicon Graphics makes no representation about the suitability
|
|
|
|
of this software for any purpose. It is provided "as is"
|
|
|
|
without any express or implied warranty.
|
|
|
|
|
|
|
|
SILICON GRAPHICS DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS
|
|
|
|
SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
|
|
|
|
AND FITNESS FOR A PARTICULAR PURPOSE. IN NO EVENT SHALL SILICON
|
|
|
|
GRAPHICS BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL
|
|
|
|
DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
|
|
|
|
DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
|
|
|
|
OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH
|
|
|
|
THE USE OR PERFORMANCE OF THIS SOFTWARE.
|
|
|
|
|
|
|
|
********************************************************/
|
|
|
|
|
2005-07-03 09:02:09 +02:00
|
|
|
#ifdef HAVE_DIX_CONFIG_H
|
|
|
|
#include <dix-config.h>
|
|
|
|
#endif
|
|
|
|
|
2005-08-31 16:58:09 +02:00
|
|
|
#include <xkb-config.h>
|
|
|
|
|
2003-11-14 16:54:54 +01:00
|
|
|
#include <stdio.h>
|
|
|
|
#include <ctype.h>
|
|
|
|
#include <X11/X.h>
|
|
|
|
#include <X11/Xos.h>
|
|
|
|
#include <X11/Xproto.h>
|
|
|
|
#include <X11/keysym.h>
|
|
|
|
#include <X11/extensions/XKM.h>
|
|
|
|
#include "inputstr.h"
|
|
|
|
#include "scrnintstr.h"
|
|
|
|
#include "windowstr.h"
|
|
|
|
#define XKBSRV_NEED_FILE_FUNCS
|
2007-03-18 21:31:19 +01:00
|
|
|
#include <xkbsrv.h>
|
2005-04-20 14:25:48 +02:00
|
|
|
#include <X11/extensions/XI.h>
|
2003-11-25 20:29:01 +01:00
|
|
|
#include "xkb.h"
|
2003-11-14 16:54:54 +01:00
|
|
|
|
2008-07-23 19:38:38 +02:00
|
|
|
#if defined(CSRG_BASED) || defined(linux) || defined(__GNU__)
|
2003-11-14 16:54:54 +01:00
|
|
|
#include <paths.h>
|
|
|
|
#endif
|
|
|
|
|
|
|
|
/*
|
|
|
|
* If XKM_OUTPUT_DIR specifies a path without a leading slash, it is
|
|
|
|
* relative to the top-level XKB configuration directory.
|
|
|
|
* Making the server write to a subdirectory of that directory
|
|
|
|
* requires some work in the general case (install procedure
|
|
|
|
* has to create links to /var or somesuch on many machines),
|
|
|
|
* so we just compile into /usr/tmp for now.
|
|
|
|
*/
|
|
|
|
#ifndef XKM_OUTPUT_DIR
|
|
|
|
#define XKM_OUTPUT_DIR "compiled/"
|
|
|
|
#endif
|
|
|
|
|
|
|
|
#define PRE_ERROR_MSG "\"The XKEYBOARD keymap compiler (xkbcomp) reports:\""
|
|
|
|
#define ERROR_PREFIX "\"> \""
|
|
|
|
#define POST_ERROR_MSG1 "\"Errors from xkbcomp are not fatal to the X server\""
|
|
|
|
#define POST_ERROR_MSG2 "\"End of messages from xkbcomp\""
|
|
|
|
|
2007-06-29 00:59:05 +02:00
|
|
|
#if defined(WIN32)
|
2005-01-09 16:29:45 +01:00
|
|
|
#define PATHSEPARATOR "\\"
|
|
|
|
#else
|
|
|
|
#define PATHSEPARATOR "/"
|
|
|
|
#endif
|
|
|
|
|
2004-11-15 16:06:51 +01:00
|
|
|
#ifdef WIN32
|
2004-11-15 19:13:41 +01:00
|
|
|
|
2005-04-20 18:40:52 +02:00
|
|
|
#include <X11/Xwindows.h>
|
2005-01-09 18:35:47 +01:00
|
|
|
const char*
|
2004-11-15 16:06:51 +01:00
|
|
|
Win32TempDir()
|
|
|
|
{
|
2005-01-09 16:29:45 +01:00
|
|
|
static char buffer[PATH_MAX];
|
2004-11-22 16:00:04 +01:00
|
|
|
if (GetTempPath(sizeof(buffer), buffer))
|
|
|
|
{
|
2005-01-09 16:29:45 +01:00
|
|
|
int len;
|
2004-11-22 16:00:04 +01:00
|
|
|
buffer[sizeof(buffer)-1] = 0;
|
|
|
|
len = strlen(buffer);
|
|
|
|
if (len > 0)
|
|
|
|
if (buffer[len-1] == '\\')
|
|
|
|
buffer[len-1] = 0;
|
|
|
|
return buffer;
|
|
|
|
}
|
|
|
|
if (getenv("TEMP") != NULL)
|
2004-11-15 16:06:51 +01:00
|
|
|
return getenv("TEMP");
|
2004-11-22 16:00:04 +01:00
|
|
|
else if (getenv("TMP") != NULL)
|
2004-11-15 16:06:51 +01:00
|
|
|
return getenv("TEMP");
|
2004-11-22 16:00:04 +01:00
|
|
|
else
|
2004-11-15 16:06:51 +01:00
|
|
|
return "/tmp";
|
|
|
|
}
|
2004-11-15 19:13:41 +01:00
|
|
|
|
2005-01-09 18:35:47 +01:00
|
|
|
int
|
2004-11-15 19:13:41 +01:00
|
|
|
Win32System(const char *cmdline)
|
|
|
|
{
|
|
|
|
STARTUPINFO si;
|
|
|
|
PROCESS_INFORMATION pi;
|
|
|
|
DWORD dwExitCode;
|
2010-06-06 22:19:03 +02:00
|
|
|
char *cmd = strdup(cmdline);
|
2004-11-15 19:13:41 +01:00
|
|
|
|
|
|
|
ZeroMemory( &si, sizeof(si) );
|
|
|
|
si.cb = sizeof(si);
|
|
|
|
ZeroMemory( &pi, sizeof(pi) );
|
|
|
|
|
|
|
|
if (!CreateProcess(NULL, cmd, NULL, NULL, FALSE, 0, NULL, NULL, &si, &pi))
|
|
|
|
{
|
2004-12-24 15:40:28 +01:00
|
|
|
LPVOID buffer;
|
|
|
|
if (!FormatMessage(
|
|
|
|
FORMAT_MESSAGE_ALLOCATE_BUFFER |
|
|
|
|
FORMAT_MESSAGE_FROM_SYSTEM |
|
|
|
|
FORMAT_MESSAGE_IGNORE_INSERTS,
|
|
|
|
NULL,
|
|
|
|
GetLastError(),
|
|
|
|
MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT),
|
|
|
|
(LPTSTR) &buffer,
|
|
|
|
0,
|
|
|
|
NULL ))
|
|
|
|
{
|
2007-09-26 07:53:37 +02:00
|
|
|
ErrorF("[xkb] Starting '%s' failed!\n", cmdline);
|
2004-12-24 15:40:28 +01:00
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
2007-09-26 07:53:37 +02:00
|
|
|
ErrorF("[xkb] Starting '%s' failed: %s", cmdline, (char *)buffer);
|
2004-12-24 15:40:28 +01:00
|
|
|
LocalFree(buffer);
|
|
|
|
}
|
|
|
|
|
2010-05-05 20:44:06 +02:00
|
|
|
free(cmd);
|
2004-12-24 15:40:28 +01:00
|
|
|
return -1;
|
2004-11-15 19:13:41 +01:00
|
|
|
}
|
2005-04-20 18:40:52 +02:00
|
|
|
/* Wait until child process exits. */
|
2004-11-15 19:13:41 +01:00
|
|
|
WaitForSingleObject( pi.hProcess, INFINITE );
|
|
|
|
|
|
|
|
GetExitCodeProcess( pi.hProcess, &dwExitCode);
|
|
|
|
|
2005-04-20 18:40:52 +02:00
|
|
|
/* Close process and thread handles. */
|
2004-11-15 19:13:41 +01:00
|
|
|
CloseHandle( pi.hProcess );
|
|
|
|
CloseHandle( pi.hThread );
|
2010-05-05 20:44:06 +02:00
|
|
|
free(cmd);
|
2004-11-15 19:13:41 +01:00
|
|
|
|
|
|
|
return dwExitCode;
|
|
|
|
}
|
|
|
|
#undef System
|
|
|
|
#define System(x) Win32System(x)
|
2004-11-15 16:06:51 +01:00
|
|
|
#endif
|
|
|
|
|
2003-11-14 16:54:54 +01:00
|
|
|
static void
|
2003-11-25 20:29:01 +01:00
|
|
|
OutputDirectory(
|
2005-01-09 16:29:45 +01:00
|
|
|
char* outdir,
|
|
|
|
size_t size)
|
2003-11-14 16:54:54 +01:00
|
|
|
{
|
|
|
|
#ifndef WIN32
|
2009-09-29 19:05:06 +02:00
|
|
|
/* Can we write an xkm and then open it too? */
|
|
|
|
if (access(XKM_OUTPUT_DIR, W_OK | X_OK) == 0 && (strlen(XKM_OUTPUT_DIR) < size))
|
2005-08-22 23:47:59 +02:00
|
|
|
{
|
2003-11-14 16:54:54 +01:00
|
|
|
(void) strcpy (outdir, XKM_OUTPUT_DIR);
|
|
|
|
} else
|
2008-02-03 13:30:22 +01:00
|
|
|
#else
|
2005-01-09 16:29:45 +01:00
|
|
|
if (strlen(Win32TempDir()) + 1 < size)
|
|
|
|
{
|
|
|
|
(void) strcpy(outdir, Win32TempDir());
|
|
|
|
(void) strcat(outdir, "\\");
|
|
|
|
} else
|
2003-11-14 16:54:54 +01:00
|
|
|
#endif
|
2005-08-22 23:47:59 +02:00
|
|
|
if (strlen("/tmp/") < size)
|
2005-01-09 16:29:45 +01:00
|
|
|
{
|
|
|
|
(void) strcpy (outdir, "/tmp/");
|
2003-11-14 16:54:54 +01:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2008-07-18 15:29:35 +02:00
|
|
|
static Bool
|
2003-11-14 16:54:54 +01:00
|
|
|
XkbDDXCompileKeymapByNames( XkbDescPtr xkb,
|
|
|
|
XkbComponentNamesPtr names,
|
|
|
|
unsigned want,
|
|
|
|
unsigned need,
|
|
|
|
char * nameRtrn,
|
|
|
|
int nameRtrnLen)
|
|
|
|
{
|
2008-11-25 23:12:26 +01:00
|
|
|
FILE * out;
|
|
|
|
char *buf = NULL, keymap[PATH_MAX], xkm_output_dir[PATH_MAX];
|
|
|
|
|
|
|
|
const char *emptystring = "";
|
2010-05-12 20:54:51 +02:00
|
|
|
char *xkbbasedirflag = NULL;
|
2008-11-25 23:12:26 +01:00
|
|
|
const char *xkbbindir = emptystring;
|
|
|
|
const char *xkbbindirsep = emptystring;
|
2005-02-01 19:14:01 +01:00
|
|
|
|
2003-11-14 16:54:54 +01:00
|
|
|
#ifdef WIN32
|
2008-11-25 23:12:26 +01:00
|
|
|
/* WIN32 has no popen. The input must be stored in a file which is
|
|
|
|
used as input for xkbcomp. xkbcomp does not read from stdin. */
|
|
|
|
char tmpname[PATH_MAX];
|
|
|
|
const char *xkmfile = tmpname;
|
|
|
|
#else
|
|
|
|
const char *xkmfile = "-";
|
|
|
|
#endif
|
2008-11-19 22:44:26 +01:00
|
|
|
|
|
|
|
snprintf(keymap, sizeof(keymap), "server-%s", display);
|
2003-11-14 16:54:54 +01:00
|
|
|
|
2005-01-09 16:29:45 +01:00
|
|
|
OutputDirectory(xkm_output_dir, sizeof(xkm_output_dir));
|
2008-11-25 23:12:26 +01:00
|
|
|
|
2003-11-14 16:54:54 +01:00
|
|
|
#ifdef WIN32
|
2004-11-15 16:06:51 +01:00
|
|
|
strcpy(tmpname, Win32TempDir());
|
|
|
|
strcat(tmpname, "\\xkb_XXXXXX");
|
2003-11-14 16:54:54 +01:00
|
|
|
(void) mktemp(tmpname);
|
|
|
|
#endif
|
2008-11-25 23:12:26 +01:00
|
|
|
|
|
|
|
if (XkbBaseDirectory != NULL) {
|
2010-11-28 05:09:04 +01:00
|
|
|
if (asprintf(&xkbbasedirflag, "\"-R%s\"", XkbBaseDirectory) == -1)
|
|
|
|
xkbbasedirflag = NULL;
|
2003-11-14 16:54:54 +01:00
|
|
|
}
|
2008-11-25 23:12:26 +01:00
|
|
|
|
|
|
|
if (XkbBinDirectory != NULL) {
|
|
|
|
int ld = strlen(XkbBinDirectory);
|
|
|
|
int lps = strlen(PATHSEPARATOR);
|
|
|
|
|
|
|
|
xkbbindir = XkbBinDirectory;
|
|
|
|
|
|
|
|
if ((ld >= lps) &&
|
|
|
|
(strcmp(xkbbindir + ld - lps, PATHSEPARATOR) != 0)) {
|
|
|
|
xkbbindirsep = PATHSEPARATOR;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2010-11-28 05:09:04 +01:00
|
|
|
if (asprintf(&buf,
|
|
|
|
"\"%s%sxkbcomp\" -w %d %s -xkm \"%s\" "
|
2008-11-25 23:12:26 +01:00
|
|
|
"-em1 %s -emp %s -eml %s \"%s%s.xkm\"",
|
2010-11-28 05:09:04 +01:00
|
|
|
xkbbindir, xkbbindirsep,
|
|
|
|
((xkbDebugFlags < 2) ? 1 :
|
|
|
|
((xkbDebugFlags > 10) ? 10 : (int) xkbDebugFlags)),
|
|
|
|
xkbbasedirflag ? xkbbasedirflag : "", xkmfile,
|
|
|
|
PRE_ERROR_MSG, ERROR_PREFIX, POST_ERROR_MSG1,
|
|
|
|
xkm_output_dir, keymap) == -1)
|
|
|
|
buf = NULL;
|
2008-11-25 23:12:26 +01:00
|
|
|
|
2010-05-12 20:54:51 +02:00
|
|
|
free(xkbbasedirflag);
|
2010-06-06 22:19:03 +02:00
|
|
|
|
|
|
|
if (!buf) {
|
|
|
|
LogMessage(X_ERROR, "XKB: Could not invoke xkbcomp: not enough memory\n");
|
|
|
|
return FALSE;
|
|
|
|
}
|
2005-01-09 16:29:45 +01:00
|
|
|
|
2003-11-14 16:54:54 +01:00
|
|
|
#ifndef WIN32
|
2003-11-14 17:49:22 +01:00
|
|
|
out= Popen(buf,"w");
|
2003-11-14 16:54:54 +01:00
|
|
|
#else
|
|
|
|
out= fopen(tmpname, "w");
|
|
|
|
#endif
|
2005-01-09 16:29:45 +01:00
|
|
|
|
2003-11-14 16:54:54 +01:00
|
|
|
if (out!=NULL) {
|
|
|
|
#ifdef DEBUG
|
|
|
|
if (xkbDebugFlags) {
|
2007-09-26 07:53:37 +02:00
|
|
|
ErrorF("[xkb] XkbDDXCompileKeymapByNames compiling keymap:\n");
|
2008-02-03 13:43:18 +01:00
|
|
|
XkbWriteXKBKeymapForNames(stderr,names,xkb,want,need);
|
2003-11-14 16:54:54 +01:00
|
|
|
}
|
|
|
|
#endif
|
2008-02-03 13:43:18 +01:00
|
|
|
XkbWriteXKBKeymapForNames(out,names,xkb,want,need);
|
2003-11-14 16:54:54 +01:00
|
|
|
#ifndef WIN32
|
2003-11-14 17:49:22 +01:00
|
|
|
if (Pclose(out)==0)
|
2003-11-14 16:54:54 +01:00
|
|
|
#else
|
2004-12-24 15:40:28 +01:00
|
|
|
if (fclose(out)==0 && System(buf) >= 0)
|
2003-11-14 16:54:54 +01:00
|
|
|
#endif
|
|
|
|
{
|
2008-02-03 13:30:22 +01:00
|
|
|
if (xkbDebugFlags)
|
2008-03-04 08:41:10 +01:00
|
|
|
DebugF("[xkb] xkb executes: %s\n",buf);
|
2003-11-14 16:54:54 +01:00
|
|
|
if (nameRtrn) {
|
|
|
|
strncpy(nameRtrn,keymap,nameRtrnLen);
|
|
|
|
nameRtrn[nameRtrnLen-1]= '\0';
|
|
|
|
}
|
2010-11-08 23:35:33 +01:00
|
|
|
free(buf);
|
2010-01-15 01:07:38 +01:00
|
|
|
return TRUE;
|
2003-11-14 16:54:54 +01:00
|
|
|
}
|
|
|
|
else
|
2008-05-07 21:24:19 +02:00
|
|
|
LogMessage(X_ERROR, "Error compiling keymap (%s)\n", keymap);
|
2004-12-24 15:40:28 +01:00
|
|
|
#ifdef WIN32
|
|
|
|
/* remove the temporary file */
|
|
|
|
unlink(tmpname);
|
2003-11-14 16:54:54 +01:00
|
|
|
#endif
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
#ifndef WIN32
|
2008-05-07 21:24:19 +02:00
|
|
|
LogMessage(X_ERROR, "XKB: Could not invoke xkbcomp\n");
|
2003-11-14 16:54:54 +01:00
|
|
|
#else
|
2008-05-07 21:24:19 +02:00
|
|
|
LogMessage(X_ERROR, "Could not open file %s\n", tmpname);
|
2003-11-14 16:54:54 +01:00
|
|
|
#endif
|
|
|
|
}
|
|
|
|
if (nameRtrn)
|
|
|
|
nameRtrn[0]= '\0';
|
2010-11-08 23:35:33 +01:00
|
|
|
free(buf);
|
2010-01-15 01:07:38 +01:00
|
|
|
return FALSE;
|
2003-11-14 16:54:54 +01:00
|
|
|
}
|
|
|
|
|
2007-03-18 21:31:19 +01:00
|
|
|
static FILE *
|
2003-11-14 16:54:54 +01:00
|
|
|
XkbDDXOpenConfigFile(char *mapName,char *fileNameRtrn,int fileNameRtrnLen)
|
|
|
|
{
|
|
|
|
char buf[PATH_MAX],xkm_output_dir[PATH_MAX];
|
|
|
|
FILE * file;
|
|
|
|
|
|
|
|
buf[0]= '\0';
|
|
|
|
if (mapName!=NULL) {
|
2005-01-09 16:29:45 +01:00
|
|
|
OutputDirectory(xkm_output_dir, sizeof(xkm_output_dir));
|
2004-11-15 16:06:51 +01:00
|
|
|
if ((XkbBaseDirectory!=NULL)&&(xkm_output_dir[0]!='/')
|
|
|
|
#ifdef WIN32
|
|
|
|
&&(!isalpha(xkm_output_dir[0]) || xkm_output_dir[1]!=':')
|
|
|
|
#endif
|
|
|
|
) {
|
2003-11-14 16:54:54 +01:00
|
|
|
if (strlen(XkbBaseDirectory)+strlen(xkm_output_dir)
|
|
|
|
+strlen(mapName)+6 <= PATH_MAX)
|
|
|
|
{
|
|
|
|
sprintf(buf,"%s/%s%s.xkm",XkbBaseDirectory,
|
|
|
|
xkm_output_dir,mapName);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else if (strlen(xkm_output_dir)+strlen(mapName)+5 <= PATH_MAX)
|
|
|
|
sprintf(buf,"%s%s.xkm",xkm_output_dir,mapName);
|
|
|
|
if (buf[0] != '\0')
|
2003-11-25 20:29:01 +01:00
|
|
|
file= fopen(buf,"rb");
|
2003-11-14 16:54:54 +01:00
|
|
|
else file= NULL;
|
|
|
|
}
|
|
|
|
else file= NULL;
|
|
|
|
if ((fileNameRtrn!=NULL)&&(fileNameRtrnLen>0)) {
|
|
|
|
strncpy(fileNameRtrn,buf,fileNameRtrnLen);
|
|
|
|
buf[fileNameRtrnLen-1]= '\0';
|
|
|
|
}
|
|
|
|
return file;
|
|
|
|
}
|
|
|
|
|
Rework symbol visibility for easier maintenance
Save in a few special cases, _X_EXPORT should not be used in C source
files. Instead, it should be used in headers, and the proper C source
include that header. Some special cases are symbols that need to be
shared between modules, but not expected to be used by external drivers,
and symbols that are accessible via LoaderSymbol/dlopen.
This patch also adds conditionally some new sdk header files, depending
on extensions enabled. These files were added to match pattern for
other extensions/modules, that is, have the headers "deciding" symbol
visibility in the sdk. These headers are:
o Xext/panoramiXsrv.h, Xext/panoramiX.h
o fbpict.h (unconditionally)
o vidmodeproc.h
o mioverlay.h (unconditionally, used only by xaa)
o xfixes.h (unconditionally, symbols required by dri2)
LoaderSymbol and similar functions now don't have different prototypes,
in loaderProcs.h and xf86Module.h, so that both headers can be included,
without the need of defining IN_LOADER.
xf86NewInputDevice() device prototype readded to xf86Xinput.h, but
not exported (and with a comment about it).
2008-12-03 08:43:34 +01:00
|
|
|
unsigned
|
2003-11-14 16:54:54 +01:00
|
|
|
XkbDDXLoadKeymapByNames( DeviceIntPtr keybd,
|
|
|
|
XkbComponentNamesPtr names,
|
|
|
|
unsigned want,
|
|
|
|
unsigned need,
|
2008-02-16 19:01:18 +01:00
|
|
|
XkbDescPtr * xkbRtrn,
|
2003-11-14 16:54:54 +01:00
|
|
|
char * nameRtrn,
|
|
|
|
int nameRtrnLen)
|
|
|
|
{
|
2008-02-16 19:01:18 +01:00
|
|
|
XkbDescPtr xkb;
|
2003-11-14 16:54:54 +01:00
|
|
|
FILE * file;
|
|
|
|
char fileName[PATH_MAX];
|
|
|
|
unsigned missing;
|
|
|
|
|
2008-02-16 19:01:18 +01:00
|
|
|
*xkbRtrn = NULL;
|
2003-11-14 16:54:54 +01:00
|
|
|
if ((keybd==NULL)||(keybd->key==NULL)||(keybd->key->xkbInfo==NULL))
|
|
|
|
xkb= NULL;
|
|
|
|
else xkb= keybd->key->xkbInfo->desc;
|
|
|
|
if ((names->keycodes==NULL)&&(names->types==NULL)&&
|
|
|
|
(names->compat==NULL)&&(names->symbols==NULL)&&
|
|
|
|
(names->geometry==NULL)) {
|
2008-05-07 21:24:19 +02:00
|
|
|
LogMessage(X_ERROR, "XKB: No components provided for device %s\n",
|
2008-06-26 00:06:49 +02:00
|
|
|
keybd->name ? keybd->name : "(unnamed keyboard)");
|
2008-02-03 13:48:57 +01:00
|
|
|
return 0;
|
2003-11-14 16:54:54 +01:00
|
|
|
}
|
|
|
|
else if (!XkbDDXCompileKeymapByNames(xkb,names,want,need,
|
2008-02-16 19:01:18 +01:00
|
|
|
nameRtrn,nameRtrnLen)){
|
2008-05-07 21:24:19 +02:00
|
|
|
LogMessage(X_ERROR, "XKB: Couldn't compile keymap\n");
|
2003-11-14 16:54:54 +01:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
file= XkbDDXOpenConfigFile(nameRtrn,fileName,PATH_MAX);
|
|
|
|
if (file==NULL) {
|
2003-11-25 20:29:01 +01:00
|
|
|
LogMessage(X_ERROR, "Couldn't open compiled keymap file %s\n",fileName);
|
2003-11-14 16:54:54 +01:00
|
|
|
return 0;
|
|
|
|
}
|
2008-02-16 19:01:18 +01:00
|
|
|
missing= XkmReadFile(file,need,want,xkbRtrn);
|
|
|
|
if (*xkbRtrn==NULL) {
|
2003-11-25 20:29:01 +01:00
|
|
|
LogMessage(X_ERROR, "Error loading keymap %s\n",fileName);
|
2003-11-14 16:54:54 +01:00
|
|
|
fclose(file);
|
|
|
|
(void) unlink (fileName);
|
|
|
|
return 0;
|
|
|
|
}
|
2008-05-07 21:24:19 +02:00
|
|
|
else {
|
2008-02-16 19:01:18 +01:00
|
|
|
DebugF("Loaded XKB keymap %s, defined=0x%x\n",fileName,(*xkbRtrn)->defined);
|
2003-11-14 16:54:54 +01:00
|
|
|
}
|
|
|
|
fclose(file);
|
|
|
|
(void) unlink (fileName);
|
|
|
|
return (need|want)&(~missing);
|
|
|
|
}
|
|
|
|
|
Rework symbol visibility for easier maintenance
Save in a few special cases, _X_EXPORT should not be used in C source
files. Instead, it should be used in headers, and the proper C source
include that header. Some special cases are symbols that need to be
shared between modules, but not expected to be used by external drivers,
and symbols that are accessible via LoaderSymbol/dlopen.
This patch also adds conditionally some new sdk header files, depending
on extensions enabled. These files were added to match pattern for
other extensions/modules, that is, have the headers "deciding" symbol
visibility in the sdk. These headers are:
o Xext/panoramiXsrv.h, Xext/panoramiX.h
o fbpict.h (unconditionally)
o vidmodeproc.h
o mioverlay.h (unconditionally, used only by xaa)
o xfixes.h (unconditionally, symbols required by dri2)
LoaderSymbol and similar functions now don't have different prototypes,
in loaderProcs.h and xf86Module.h, so that both headers can be included,
without the need of defining IN_LOADER.
xf86NewInputDevice() device prototype readded to xf86Xinput.h, but
not exported (and with a comment about it).
2008-12-03 08:43:34 +01:00
|
|
|
Bool
|
2003-11-14 16:54:54 +01:00
|
|
|
XkbDDXNamesFromRules( DeviceIntPtr keybd,
|
|
|
|
char * rules_name,
|
|
|
|
XkbRF_VarDefsPtr defs,
|
|
|
|
XkbComponentNamesPtr names)
|
|
|
|
{
|
|
|
|
char buf[PATH_MAX];
|
|
|
|
FILE * file;
|
|
|
|
Bool complete;
|
|
|
|
XkbRF_RulesPtr rules;
|
|
|
|
|
|
|
|
if (!rules_name)
|
2010-01-15 01:07:38 +01:00
|
|
|
return FALSE;
|
2008-05-07 21:24:19 +02:00
|
|
|
|
|
|
|
if (strlen(XkbBaseDirectory) + strlen(rules_name) + 8 > PATH_MAX) {
|
|
|
|
LogMessage(X_ERROR, "XKB: Rules name is too long\n");
|
2010-01-15 01:07:38 +01:00
|
|
|
return FALSE;
|
2003-11-14 16:54:54 +01:00
|
|
|
}
|
2008-05-07 21:24:19 +02:00
|
|
|
sprintf(buf,"%s/rules/%s", XkbBaseDirectory, rules_name);
|
|
|
|
|
|
|
|
file = fopen(buf, "r");
|
|
|
|
if (!file) {
|
2008-05-14 01:39:30 +02:00
|
|
|
LogMessage(X_ERROR, "XKB: Couldn't open rules file %s\n", buf);
|
2010-01-15 01:07:38 +01:00
|
|
|
return FALSE;
|
2008-05-07 21:24:19 +02:00
|
|
|
}
|
|
|
|
|
2008-07-18 15:27:57 +02:00
|
|
|
rules = XkbRF_Create();
|
2008-05-07 21:24:19 +02:00
|
|
|
if (!rules) {
|
|
|
|
LogMessage(X_ERROR, "XKB: Couldn't create rules struct\n");
|
2003-11-14 16:54:54 +01:00
|
|
|
fclose(file);
|
2010-01-15 01:07:38 +01:00
|
|
|
return FALSE;
|
2003-11-14 16:54:54 +01:00
|
|
|
}
|
2008-05-07 21:24:19 +02:00
|
|
|
|
|
|
|
if (!XkbRF_LoadRules(file, rules)) {
|
|
|
|
LogMessage(X_ERROR, "XKB: Couldn't parse rules file %s\n", rules_name);
|
2003-11-14 16:54:54 +01:00
|
|
|
fclose(file);
|
2010-01-15 01:07:38 +01:00
|
|
|
XkbRF_Free(rules,TRUE);
|
|
|
|
return FALSE;
|
2003-11-14 16:54:54 +01:00
|
|
|
}
|
2008-05-07 21:24:19 +02:00
|
|
|
|
|
|
|
memset(names, 0, sizeof(*names));
|
|
|
|
complete = XkbRF_GetComponents(rules,defs,names);
|
2003-11-14 16:54:54 +01:00
|
|
|
fclose(file);
|
2010-01-15 01:07:38 +01:00
|
|
|
XkbRF_Free(rules, TRUE);
|
2003-11-14 17:49:22 +01:00
|
|
|
|
2008-05-07 21:24:19 +02:00
|
|
|
if (!complete)
|
|
|
|
LogMessage(X_ERROR, "XKB: Rules returned no components\n");
|
2003-11-14 17:49:22 +01:00
|
|
|
|
2008-05-07 21:24:19 +02:00
|
|
|
return complete;
|
|
|
|
}
|
2008-12-26 08:38:25 +01:00
|
|
|
|
|
|
|
XkbDescPtr
|
|
|
|
XkbCompileKeymap(DeviceIntPtr dev, XkbRMLVOSet *rmlvo)
|
|
|
|
{
|
|
|
|
XkbComponentNamesRec kccgst;
|
|
|
|
XkbRF_VarDefsRec mlvo;
|
|
|
|
XkbDescPtr xkb;
|
|
|
|
char name[PATH_MAX];
|
|
|
|
|
|
|
|
if (!dev || !rmlvo) {
|
|
|
|
LogMessage(X_ERROR, "XKB: No device or RMLVO specified\n");
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
mlvo.model = rmlvo->model;
|
|
|
|
mlvo.layout = rmlvo->layout;
|
|
|
|
mlvo.variant = rmlvo->variant;
|
|
|
|
mlvo.options = rmlvo->options;
|
|
|
|
|
|
|
|
/* XDNFR already logs for us. */
|
|
|
|
if (!XkbDDXNamesFromRules(dev, rmlvo->rules, &mlvo, &kccgst))
|
|
|
|
return NULL;
|
|
|
|
|
|
|
|
/* XDLKBN too, but it might return 0 as well as allocating. */
|
|
|
|
if (!XkbDDXLoadKeymapByNames(dev, &kccgst, XkmAllIndicesMask, 0, &xkb, name,
|
|
|
|
PATH_MAX)) {
|
|
|
|
if (xkb)
|
|
|
|
XkbFreeKeyboard(xkb, 0, TRUE);
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
return xkb;
|
|
|
|
}
|