d6cbd4511e
This is the biggest "visibility" patch. Instead of doing a "export" symbol on demand, export everything in the sdk, so that if some module fails due to an unresolved symbol, it is because it is using a symbol not in the sdk. Most exported symbols shouldn't really be made visible, neither advertised in the sdk, as they are only used by a single shared object. Symbols in the sdk (or referenced in sdk macros), but not defined anywhere include: XkbBuildCoreState() XkbInitialMap XkbXIUnsupported XkbCheckActionVMods() XkbSendCompatNotify() XkbDDXFakePointerButton() XkbDDXApplyConfig() _XkbStrCaseCmp() _XkbErrMessages[] _XkbErrCode _XkbErrLocation _XkbErrData XkbAccessXDetailText() XkbNKNDetailMaskText() XkbLookupGroupAndLevel() XkbInitAtoms() XkbGetOrderedDrawables() XkbFreeOrderedDrawables() XkbConvertXkbComponents() XkbWriteXKBSemantics() XkbWriteXKBLayout() XkbWriteXKBKeymap() XkbWriteXKBFile() XkbWriteCFile() XkbWriteXKMFile() XkbWriteToServer() XkbMergeFile() XkmFindTOCEntry() XkmReadFileSection() XkmReadFileSectionName() InitExtInput() xf86CheckButton() xf86SwitchCoreDevice() RamDacSetGamma() RamDacRestoreDACValues() xf86Bpp xf86ConfigPix24 xf86MouseCflags[] xf86SupportedMouseTypes[] xf86NumMouseTypes xf86ChangeBusIndex() xf86EntityEnter() xf86EntityLeave() xf86WrapperInit() xf86RingBell() xf86findOptionBoolean() xf86debugListOptions() LoadSubModuleLocal() LoaderSymbolLocal() getInt10Rec() xf86CurrentScreen xf86ReallocatePciResources() xf86NewSerialNumber() xf86RandRSetInitialMode() fbCompositeSolidMask_nx1xn fbCompositeSolidMask_nx8888x0565C fbCompositeSolidMask_nx8888x8888C fbCompositeSolidMask_nx8x0565 fbCompositeSolidMask_nx8x0888 fbCompositeSolidMask_nx8x8888 fbCompositeSrc_0565x0565 fbCompositeSrc_8888x0565 fbCompositeSrc_8888x0888 fbCompositeSrc_8888x8888 fbCompositeSrcAdd_1000x1000 fbCompositeSrcAdd_8000x8000 fbCompositeSrcAdd_8888x8888 fbGeneration fbIn fbOver fbOver24 fbOverlayGeneration fbRasterizeEdges fbRestoreAreas fbSaveAreas composeFunctions VBEBuildVbeModeList() VBECalcVbeModeIndex() TIramdac3030CalculateMNPForClock() shadowBufPtr shadowFindBuf() miRRGetScreenInfo() RRSetScreenConfig() RRModePruneUnused() PixmanImageFromPicture() extern int miPointerGetMotionEvents() miClipPicture() miRasterizeTriangle() fbPush1toN() fbInitializeBackingStore() ddxBeforeReset() SetupSprite() InitSprite() DGADeliverEvent() SPECIAL CASES o defined as _X_INTERNAL xf86NewInputDevice() o defined as static fbGCPrivateKey fbOverlayScreenPrivateKey fbScreenPrivateKey fbWinPrivateKey o defined in libXfont.so, but declared in xorg/dixfont.h GetGlyphs() QueryGlyphExtents() QueryTextExtents() ParseGlyphCachingMode() InitGlyphCaching() SetGlyphCachingMode()
432 lines
11 KiB
C
432 lines
11 KiB
C
/************************************************************
|
|
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.
|
|
|
|
********************************************************/
|
|
|
|
#ifdef HAVE_DIX_CONFIG_H
|
|
#include <dix-config.h>
|
|
#endif
|
|
|
|
#ifdef HAVE_XKB_CONFIG_H
|
|
#include <xkb-config.h>
|
|
#endif
|
|
|
|
#include <stdio.h>
|
|
#include <ctype.h>
|
|
#define NEED_EVENTS 1
|
|
#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
|
|
#include <xkbsrv.h>
|
|
#include <X11/extensions/XI.h>
|
|
#include "xkb.h"
|
|
|
|
#if defined(CSRG_BASED) || defined(linux) || defined(__GNU__)
|
|
#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\""
|
|
|
|
#if defined(WIN32)
|
|
#define PATHSEPARATOR "\\"
|
|
#else
|
|
#define PATHSEPARATOR "/"
|
|
#endif
|
|
|
|
#ifdef WIN32
|
|
|
|
#include <X11/Xwindows.h>
|
|
const char*
|
|
Win32TempDir()
|
|
{
|
|
static char buffer[PATH_MAX];
|
|
if (GetTempPath(sizeof(buffer), buffer))
|
|
{
|
|
int len;
|
|
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)
|
|
return getenv("TEMP");
|
|
else if (getenv("TMP") != NULL)
|
|
return getenv("TEMP");
|
|
else
|
|
return "/tmp";
|
|
}
|
|
|
|
int
|
|
Win32System(const char *cmdline)
|
|
{
|
|
STARTUPINFO si;
|
|
PROCESS_INFORMATION pi;
|
|
DWORD dwExitCode;
|
|
char *cmd = xstrdup(cmdline);
|
|
|
|
ZeroMemory( &si, sizeof(si) );
|
|
si.cb = sizeof(si);
|
|
ZeroMemory( &pi, sizeof(pi) );
|
|
|
|
if (!CreateProcess(NULL, cmd, NULL, NULL, FALSE, 0, NULL, NULL, &si, &pi))
|
|
{
|
|
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 ))
|
|
{
|
|
ErrorF("[xkb] Starting '%s' failed!\n", cmdline);
|
|
}
|
|
else
|
|
{
|
|
ErrorF("[xkb] Starting '%s' failed: %s", cmdline, (char *)buffer);
|
|
LocalFree(buffer);
|
|
}
|
|
|
|
xfree(cmd);
|
|
return -1;
|
|
}
|
|
/* Wait until child process exits. */
|
|
WaitForSingleObject( pi.hProcess, INFINITE );
|
|
|
|
GetExitCodeProcess( pi.hProcess, &dwExitCode);
|
|
|
|
/* Close process and thread handles. */
|
|
CloseHandle( pi.hProcess );
|
|
CloseHandle( pi.hThread );
|
|
xfree(cmd);
|
|
|
|
return dwExitCode;
|
|
}
|
|
#undef System
|
|
#define System(x) Win32System(x)
|
|
#endif
|
|
|
|
static void
|
|
OutputDirectory(
|
|
char* outdir,
|
|
size_t size)
|
|
{
|
|
#ifndef WIN32
|
|
if (getuid() == 0 && (strlen(XKM_OUTPUT_DIR) < size))
|
|
{
|
|
/* if server running as root it *may* be able to write */
|
|
/* FIXME: check whether directory is writable at all */
|
|
(void) strcpy (outdir, XKM_OUTPUT_DIR);
|
|
} else
|
|
#else
|
|
if (strlen(Win32TempDir()) + 1 < size)
|
|
{
|
|
(void) strcpy(outdir, Win32TempDir());
|
|
(void) strcat(outdir, "\\");
|
|
} else
|
|
#endif
|
|
if (strlen("/tmp/") < size)
|
|
{
|
|
(void) strcpy (outdir, "/tmp/");
|
|
}
|
|
}
|
|
|
|
static Bool
|
|
XkbDDXCompileKeymapByNames( XkbDescPtr xkb,
|
|
XkbComponentNamesPtr names,
|
|
unsigned want,
|
|
unsigned need,
|
|
char * nameRtrn,
|
|
int nameRtrnLen)
|
|
{
|
|
FILE * out;
|
|
char *buf = NULL, keymap[PATH_MAX], xkm_output_dir[PATH_MAX];
|
|
|
|
const char *emptystring = "";
|
|
const char *xkbbasedirflag = emptystring;
|
|
const char *xkbbindir = emptystring;
|
|
const char *xkbbindirsep = emptystring;
|
|
|
|
#ifdef WIN32
|
|
/* 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
|
|
|
|
snprintf(keymap, sizeof(keymap), "server-%s", display);
|
|
|
|
XkbEnsureSafeMapName(keymap);
|
|
OutputDirectory(xkm_output_dir, sizeof(xkm_output_dir));
|
|
|
|
#ifdef WIN32
|
|
strcpy(tmpname, Win32TempDir());
|
|
strcat(tmpname, "\\xkb_XXXXXX");
|
|
(void) mktemp(tmpname);
|
|
#endif
|
|
|
|
if (XkbBaseDirectory != NULL) {
|
|
xkbbasedirflag = Xprintf("\"-R%s\"", XkbBaseDirectory);
|
|
}
|
|
|
|
if (XkbBinDirectory != NULL) {
|
|
int ld = strlen(XkbBinDirectory);
|
|
int lps = strlen(PATHSEPARATOR);
|
|
|
|
xkbbindir = XkbBinDirectory;
|
|
|
|
if ((ld >= lps) &&
|
|
(strcmp(xkbbindir + ld - lps, PATHSEPARATOR) != 0)) {
|
|
xkbbindirsep = PATHSEPARATOR;
|
|
}
|
|
}
|
|
|
|
buf = Xprintf("\"%s%sxkbcomp\" -w %d %s -xkm \"%s\" "
|
|
"-em1 %s -emp %s -eml %s \"%s%s.xkm\"",
|
|
xkbbindir, xkbbindirsep,
|
|
( (xkbDebugFlags < 2) ? 1 :
|
|
((xkbDebugFlags > 10) ? 10 : (int)xkbDebugFlags) ),
|
|
xkbbasedirflag, xkmfile,
|
|
PRE_ERROR_MSG, ERROR_PREFIX, POST_ERROR_MSG1,
|
|
xkm_output_dir, keymap);
|
|
|
|
if (xkbbasedirflag != emptystring) {
|
|
xfree(xkbbasedirflag);
|
|
}
|
|
|
|
#ifndef WIN32
|
|
out= Popen(buf,"w");
|
|
#else
|
|
out= fopen(tmpname, "w");
|
|
#endif
|
|
|
|
if (out!=NULL) {
|
|
#ifdef DEBUG
|
|
if (xkbDebugFlags) {
|
|
ErrorF("[xkb] XkbDDXCompileKeymapByNames compiling keymap:\n");
|
|
XkbWriteXKBKeymapForNames(stderr,names,xkb,want,need);
|
|
}
|
|
#endif
|
|
XkbWriteXKBKeymapForNames(out,names,xkb,want,need);
|
|
#ifndef WIN32
|
|
if (Pclose(out)==0)
|
|
#else
|
|
if (fclose(out)==0 && System(buf) >= 0)
|
|
#endif
|
|
{
|
|
if (xkbDebugFlags)
|
|
DebugF("[xkb] xkb executes: %s\n",buf);
|
|
if (nameRtrn) {
|
|
strncpy(nameRtrn,keymap,nameRtrnLen);
|
|
nameRtrn[nameRtrnLen-1]= '\0';
|
|
}
|
|
if (buf != NULL)
|
|
xfree (buf);
|
|
return True;
|
|
}
|
|
else
|
|
LogMessage(X_ERROR, "Error compiling keymap (%s)\n", keymap);
|
|
#ifdef WIN32
|
|
/* remove the temporary file */
|
|
unlink(tmpname);
|
|
#endif
|
|
}
|
|
else {
|
|
#ifndef WIN32
|
|
LogMessage(X_ERROR, "XKB: Could not invoke xkbcomp\n");
|
|
#else
|
|
LogMessage(X_ERROR, "Could not open file %s\n", tmpname);
|
|
#endif
|
|
}
|
|
if (nameRtrn)
|
|
nameRtrn[0]= '\0';
|
|
if (buf != NULL)
|
|
xfree (buf);
|
|
return False;
|
|
}
|
|
|
|
static FILE *
|
|
XkbDDXOpenConfigFile(char *mapName,char *fileNameRtrn,int fileNameRtrnLen)
|
|
{
|
|
char buf[PATH_MAX],xkm_output_dir[PATH_MAX];
|
|
FILE * file;
|
|
|
|
buf[0]= '\0';
|
|
if (mapName!=NULL) {
|
|
OutputDirectory(xkm_output_dir, sizeof(xkm_output_dir));
|
|
if ((XkbBaseDirectory!=NULL)&&(xkm_output_dir[0]!='/')
|
|
#ifdef WIN32
|
|
&&(!isalpha(xkm_output_dir[0]) || xkm_output_dir[1]!=':')
|
|
#endif
|
|
) {
|
|
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')
|
|
file= fopen(buf,"rb");
|
|
else file= NULL;
|
|
}
|
|
else file= NULL;
|
|
if ((fileNameRtrn!=NULL)&&(fileNameRtrnLen>0)) {
|
|
strncpy(fileNameRtrn,buf,fileNameRtrnLen);
|
|
buf[fileNameRtrnLen-1]= '\0';
|
|
}
|
|
return file;
|
|
}
|
|
|
|
_X_EXPORT unsigned
|
|
XkbDDXLoadKeymapByNames( DeviceIntPtr keybd,
|
|
XkbComponentNamesPtr names,
|
|
unsigned want,
|
|
unsigned need,
|
|
XkbDescPtr * xkbRtrn,
|
|
char * nameRtrn,
|
|
int nameRtrnLen)
|
|
{
|
|
XkbDescPtr xkb;
|
|
FILE * file;
|
|
char fileName[PATH_MAX];
|
|
unsigned missing;
|
|
|
|
*xkbRtrn = NULL;
|
|
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)) {
|
|
LogMessage(X_ERROR, "XKB: No components provided for device %s\n",
|
|
keybd->name ? keybd->name : "(unnamed keyboard)");
|
|
return 0;
|
|
}
|
|
else if (!XkbDDXCompileKeymapByNames(xkb,names,want,need,
|
|
nameRtrn,nameRtrnLen)){
|
|
LogMessage(X_ERROR, "XKB: Couldn't compile keymap\n");
|
|
return 0;
|
|
}
|
|
file= XkbDDXOpenConfigFile(nameRtrn,fileName,PATH_MAX);
|
|
if (file==NULL) {
|
|
LogMessage(X_ERROR, "Couldn't open compiled keymap file %s\n",fileName);
|
|
return 0;
|
|
}
|
|
missing= XkmReadFile(file,need,want,xkbRtrn);
|
|
if (*xkbRtrn==NULL) {
|
|
LogMessage(X_ERROR, "Error loading keymap %s\n",fileName);
|
|
fclose(file);
|
|
(void) unlink (fileName);
|
|
return 0;
|
|
}
|
|
else {
|
|
DebugF("Loaded XKB keymap %s, defined=0x%x\n",fileName,(*xkbRtrn)->defined);
|
|
}
|
|
fclose(file);
|
|
(void) unlink (fileName);
|
|
return (need|want)&(~missing);
|
|
}
|
|
|
|
_X_EXPORT Bool
|
|
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)
|
|
return False;
|
|
|
|
if (strlen(XkbBaseDirectory) + strlen(rules_name) + 8 > PATH_MAX) {
|
|
LogMessage(X_ERROR, "XKB: Rules name is too long\n");
|
|
return False;
|
|
}
|
|
sprintf(buf,"%s/rules/%s", XkbBaseDirectory, rules_name);
|
|
|
|
file = fopen(buf, "r");
|
|
if (!file) {
|
|
LogMessage(X_ERROR, "XKB: Couldn't open rules file %s\n", buf);
|
|
return False;
|
|
}
|
|
|
|
rules = XkbRF_Create(0, 0);
|
|
if (!rules) {
|
|
LogMessage(X_ERROR, "XKB: Couldn't create rules struct\n");
|
|
fclose(file);
|
|
return False;
|
|
}
|
|
|
|
if (!XkbRF_LoadRules(file, rules)) {
|
|
LogMessage(X_ERROR, "XKB: Couldn't parse rules file %s\n", rules_name);
|
|
fclose(file);
|
|
XkbRF_Free(rules,True);
|
|
return False;
|
|
}
|
|
|
|
memset(names, 0, sizeof(*names));
|
|
complete = XkbRF_GetComponents(rules,defs,names);
|
|
fclose(file);
|
|
XkbRF_Free(rules, True);
|
|
|
|
if (!complete)
|
|
LogMessage(X_ERROR, "XKB: Rules returned no components\n");
|
|
|
|
return complete;
|
|
}
|