andreacavalli/xserver-multidpi
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge remote branch 'jturney/master'

Browse Source
This commit is contained in:
Keith Packard 2010-03-21 15:24:06 -07:00
commit 95ca39b981
21 changed files with 40 additions and 271 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
configure.ac
View File

@ -1829,6 +1829,7 @@ AC_MSG_RESULT([$XWIN])
if test "x$XWIN" = xyes; then if test "x$XWIN" = xyes; then
PKG_CHECK_EXISTS($WINDOWSWMPROTO, [WINDOWSWM=yes], [WINDOWSWM=no]) PKG_CHECK_EXISTS($WINDOWSWMPROTO, [WINDOWSWM=yes], [WINDOWSWM=no])
AC_DEFINE_DIR(SYSCONFDIR, sysconfdir, [Location of system.XWinrc]) AC_DEFINE_DIR(SYSCONFDIR, sysconfdir, [Location of system.XWinrc])
AC_DEFINE_DIR(DEFAULT_LOGDIR, logdir, [Default log location])
AC_DEFINE_UNQUOTED(XORG_VERSION_CURRENT, [$VENDOR_RELEASE], [Current Xorg version]) AC_DEFINE_UNQUOTED(XORG_VERSION_CURRENT, [$VENDOR_RELEASE], [Current Xorg version])
AC_DEFINE_UNQUOTED(__VENDORDWEBSUPPORT__, ["$VENDOR_WEB"], [Vendor web address for support]) AC_DEFINE_UNQUOTED(__VENDORDWEBSUPPORT__, ["$VENDOR_WEB"], [Vendor web address for support])
AC_CHECK_TOOL(WINDRES, windres) AC_CHECK_TOOL(WINDRES, windres)

2
dix/registry.c
View File

@ -313,7 +313,7 @@ dixResetRegistry(void)
fclose(fh); fclose(fh);
fh = fopen(FILENAME, "r"); fh = fopen(FILENAME, "r");
if (!fh) if (!fh)
LogMessage(X_WARNING, "Failed to open protocol names file " FILENAME); LogMessage(X_WARNING, "Failed to open protocol names file " FILENAME "\n");
/* Add built-in resources */ /* Add built-in resources */
RegisterResourceName(RT_NONE, "NONE"); RegisterResourceName(RT_NONE, "NONE");

24
hw/xwin/InitOutput.c
View File

@ -1,3 +1,4 @@
/* /*
Copyright 1993, 1998 The Open Group Copyright 1993, 1998 The Open Group
@ -68,7 +69,7 @@ extern int g_iLastScreen;
extern char * g_pszCommandLine; extern char * g_pszCommandLine;
extern Bool g_fSilentFatalError; extern Bool g_fSilentFatalError;
extern char * g_pszLogFile; extern const char * g_pszLogFile;
extern Bool g_fLogFileChanged; extern Bool g_fLogFileChanged;
extern int g_iLogVerbose; extern int g_iLogVerbose;
Bool g_fLogInited; Bool g_fLogInited;
@ -243,7 +244,7 @@ ddxGiveUp (void)
#endif #endif
if (!g_fLogInited) { if (!g_fLogInited) {
LogInit (g_pszLogFile, NULL); g_pszLogFile = LogInit (g_pszLogFile, NULL);
g_fLogInited = TRUE; g_fLogInited = TRUE;
} }
LogClose (); LogClose ();
@ -361,11 +362,11 @@ winCheckMount(void)
continue; continue;
level = curlevel; level = curlevel;
if ((winCheckMntOpt(ent, "binary") == NULL) || if ((winCheckMntOpt(ent, "binary") == NULL) &&
(winCheckMntOpt(ent, "binmode") == NULL)) (winCheckMntOpt(ent, "binmode") == NULL))
binary = 0; binary = FALSE;
else else
binary = 1; binary = TRUE;
} }
if (endmntent(mnt) != 1) if (endmntent(mnt) != 1)
@ -688,9 +689,6 @@ OsVendorInit (void)
/* Re-initialize global variables on server reset */ /* Re-initialize global variables on server reset */
winInitializeGlobals (); winInitializeGlobals ();
LogInit (NULL, NULL);
LogSetParameter (XLOG_VERBOSITY, g_iLogVerbose);
winFixupPaths(); winFixupPaths();
#ifdef DDXOSVERRORF #ifdef DDXOSVERRORF
@ -705,7 +703,7 @@ OsVendorInit (void)
* avoid the second call * avoid the second call
*/ */
g_fLogInited = TRUE; g_fLogInited = TRUE;
LogInit (g_pszLogFile, NULL); g_pszLogFile = LogInit (g_pszLogFile, NULL);
} }
LogSetParameter (XLOG_FLUSH, 1); LogSetParameter (XLOG_FLUSH, 1);
LogSetParameter (XLOG_VERBOSITY, g_iLogVerbose); LogSetParameter (XLOG_VERBOSITY, g_iLogVerbose);
@ -926,7 +924,7 @@ ddxUseMsg(void)
/* Log file will not be opened for UseMsg unless we open it now */ /* Log file will not be opened for UseMsg unless we open it now */
if (!g_fLogInited) { if (!g_fLogInited) {
LogInit (g_pszLogFile, NULL); g_pszLogFile = LogInit (g_pszLogFile, NULL);
g_fLogInited = TRUE; g_fLogInited = TRUE;
} }
LogClose (); LogClose ();
@ -934,9 +932,9 @@ ddxUseMsg(void)
/* Notify user where UseMsg text can be found.*/ /* Notify user where UseMsg text can be found.*/
if (!g_fNoHelpMessageBox) if (!g_fNoHelpMessageBox)
winMessageBoxF ("The " PROJECT_NAME " help text has been printed to " winMessageBoxF ("The " PROJECT_NAME " help text has been printed to "
"/tmp/XWin.log.\n" "%s.\n"
"Please open /tmp/XWin.log to read the help text.\n", "Please open %s to read the help text.\n",
MB_ICONINFORMATION); MB_ICONINFORMATION, g_pszLogFile, g_pszLogFile);
} }
/* See Porting Layer Definition - p. 20 */ /* See Porting Layer Definition - p. 20 */

1
hw/xwin/Makefile.am
View File

@ -109,7 +109,6 @@ SRCS = InitInput.c \
winconfig.h \ winconfig.h \
win.h \ win.h \
winkeybd.h \ winkeybd.h \
winkeymap.h \
winkeynames.h \ winkeynames.h \
winlayouts.h \ winlayouts.h \
winmessages.h \ winmessages.h \

2
hw/xwin/win.h
View File

@ -196,7 +196,7 @@
* Windows headers * Windows headers
*/ */
#include "winms.h" #include "winms.h"
#include "./winresource.h" #include "winresource.h"
/* /*

2
hw/xwin/winauth.c
View File

@ -122,7 +122,7 @@ GenerateAuthorization(
*/ */
Bool Bool
winGenerateAuthorization () winGenerateAuthorization (void)
{ {
Bool fFreeAuth = FALSE; Bool fFreeAuth = FALSE;
SecurityAuthorizationPtr pAuth = NULL; SecurityAuthorizationPtr pAuth = NULL;

2
hw/xwin/winclipboardthread.c
View File

@ -453,7 +453,7 @@ winClipboardErrorHandler (Display *pDisplay, XErrorEvent *pErr)
static int static int
winClipboardIOErrorHandler (Display *pDisplay) winClipboardIOErrorHandler (Display *pDisplay)
{ {
ErrorF ("\nwinClipboardIOErrorHandler!\n\n"); ErrorF ("winClipboardIOErrorHandler!\n\n");
/* Restart at the main entry point */ /* Restart at the main entry point */
longjmp (g_jmpEntry, WIN_JMP_ERROR_IO); longjmp (g_jmpEntry, WIN_JMP_ERROR_IO);

2
hw/xwin/winconfig.c
View File

@ -330,7 +330,7 @@ winConfigKeyboard (DeviceIntPtr pDevice)
const char regtempl[] = const char regtempl[] =
"SYSTEM\\CurrentControlSet\\Control\\Keyboard Layouts\\"; "SYSTEM\\CurrentControlSet\\Control\\Keyboard Layouts\\";
char *regpath; char *regpath;
char lname[256]; unsigned char lname[256];
DWORD namesize = sizeof(lname); DWORD namesize = sizeof(lname);
regpath = malloc(sizeof(regtempl) + KL_NAMELENGTH + 1); regpath = malloc(sizeof(regtempl) + KL_NAMELENGTH + 1);

9
hw/xwin/winerror.c
View File

@ -41,8 +41,9 @@
/* References to external symbols */ /* References to external symbols */
extern char * g_pszCommandLine; extern char * g_pszCommandLine;
extern char * g_pszLogFile; extern const char * g_pszLogFile;
extern Bool g_fSilentFatalError; extern Bool g_fSilentFatalError;
extern Bool g_fLogInited;
#ifdef DDXOSVERRORF #ifdef DDXOSVERRORF
@ -87,6 +88,12 @@ OsVendorFatalError (void)
if (g_fSilentFatalError) if (g_fSilentFatalError)
return; return;
if (!g_fLogInited) {
g_fLogInited = TRUE;
g_pszLogFile = LogInit (g_pszLogFile, NULL);
}
LogClose ();
winMessageBoxF ( winMessageBoxF (
"A fatal error has occurred and " PROJECT_NAME " will now exit.\n" \ "A fatal error has occurred and " PROJECT_NAME " will now exit.\n" \
"Please open %s for more information.\n", "Please open %s for more information.\n",

4
hw/xwin/winglobals.c
View File

@ -69,9 +69,9 @@ Bool g_fAuthEnabled = FALSE;
HICON g_hIconX = NULL; HICON g_hIconX = NULL;
HICON g_hSmallIconX = NULL; HICON g_hSmallIconX = NULL;
#ifndef RELOCATE_PROJECTROOT #ifndef RELOCATE_PROJECTROOT
char * g_pszLogFile = "/tmp/XWin.log"; const char * g_pszLogFile = DEFAULT_LOGDIR "/XWin.%s.log";
#else #else
char * g_pszLogFile = "XWin.log"; const char * g_pszLogFile = "XWin.log";
Bool g_fLogFileChanged = FALSE; Bool g_fLogFileChanged = FALSE;
#endif #endif
int g_iLogVerbose = 2; int g_iLogVerbose = 2;

86
hw/xwin/winkeybd.c
View File

@ -48,9 +48,6 @@ static Bool g_winKeyState[NUM_KEYCODES];
* Local prototypes * Local prototypes
*/ */
static void
winGetKeyMappings (KeySymsPtr pKeySyms, CARD8 *pModMap);
static void static void
winKeybdBell (int iPercent, DeviceIntPtr pDeviceInt, winKeybdBell (int iPercent, DeviceIntPtr pDeviceInt,
pointer pCtrl, int iClass); pointer pCtrl, int iClass);
@ -119,89 +116,6 @@ winTranslateKey (WPARAM wParam, LPARAM lParam, int *piScanCode)
} }
/*
* We call this function from winKeybdProc when we are
* initializing the keyboard.
*/
static void
winGetKeyMappings (KeySymsPtr pKeySyms, CARD8 *pModMap)
{
int i;
KeySym *pMap = map;
KeySym *pKeySym;
/*
* Initialize all key states to up... which may not be true
* but it is close enough.
*/
ZeroMemory (g_winKeyState, sizeof (g_winKeyState[0]) * NUM_KEYCODES);
/* MAP_LENGTH is defined in Xserver/include/input.h to be 256 */
for (i = 0; i < MAP_LENGTH; i++)
pModMap[i] = NoSymbol; /* make sure it is restored */
/* Loop through all valid entries in the key symbol table */
for (pKeySym = pMap, i = MIN_KEYCODE;
i < (MIN_KEYCODE + NUM_KEYCODES);
i++, pKeySym += GLYPHS_PER_KEY)
{
switch (*pKeySym)
{
case XK_Shift_L:
case XK_Shift_R:
pModMap[i] = ShiftMask;
break;
case XK_Control_L:
case XK_Control_R:
pModMap[i] = ControlMask;
break;
case XK_Caps_Lock:
pModMap[i] = LockMask;
break;
case XK_Alt_L:
case XK_Alt_R:
pModMap[i] = AltMask;
break;
case XK_Num_Lock:
pModMap[i] = NumLockMask;
break;
case XK_Scroll_Lock:
pModMap[i] = ScrollLockMask;
break;
#if 0
case XK_Super_L:
case XK_Super_R:
pModMap[i] = Mod4Mask;
break;
#else
/* Hirigana/Katakana toggle */
case XK_Kana_Lock:
case XK_Kana_Shift:
pModMap[i] = KanaMask;
break;
#endif
/* alternate toggle for multinational support */
case XK_Mode_switch:
pModMap[i] = AltLangMask;
break;
}
}
pKeySyms->map = (KeySym *) pMap;
pKeySyms->mapWidth = GLYPHS_PER_KEY;
pKeySyms->minKeyCode = MIN_KEYCODE;
pKeySyms->maxKeyCode = MAX_KEYCODE;
}
/* Ring the keyboard bell (system speaker on PCs) */ /* Ring the keyboard bell (system speaker on PCs) */
static void static void
winKeybdBell (int iPercent, DeviceIntPtr pDeviceInt, winKeybdBell (int iPercent, DeviceIntPtr pDeviceInt,

8
hw/xwin/winkeybd.h
View File

@ -35,14 +35,6 @@
*/ */
#include "winkeynames.h" #include "winkeynames.h"
/*
* Include the standard ASCII keymap.
*
* This header declares a static KeySym array called 'map'.
*/
#include "winkeymap.h"
#define WIN_KEYMAP_COLS 3 #define WIN_KEYMAP_COLS 3
/* Rows 160 through 165 correspond to software-generated codes, which /* Rows 160 through 165 correspond to software-generated codes, which

136
hw/xwin/winkeymap.h
View File

@ -1,136 +0,0 @@
/*
*
* For Scancodes see notes in winkeynames.h !!!!
*
*/
static KeySym map[NUM_KEYCODES * GLYPHS_PER_KEY] = {
/* 0x00 */ NoSymbol, NoSymbol, NoSymbol, NoSymbol,
/* 0x01 */ XK_Escape, NoSymbol, NoSymbol, NoSymbol,
/* 0x02 */ XK_1, XK_exclam, NoSymbol, NoSymbol,
/* 0x03 */ XK_2, XK_at, NoSymbol, NoSymbol,
/* 0x04 */ XK_3, XK_numbersign, NoSymbol, NoSymbol,
/* 0x05 */ XK_4, XK_dollar, NoSymbol, NoSymbol,
/* 0x06 */ XK_5, XK_percent, NoSymbol, NoSymbol,
/* 0x07 */ XK_6, XK_asciicircum, NoSymbol, NoSymbol,
/* 0x08 */ XK_7, XK_ampersand, NoSymbol, NoSymbol,
/* 0x09 */ XK_8, XK_asterisk, NoSymbol, NoSymbol,
/* 0x0a */ XK_9, XK_parenleft, NoSymbol, NoSymbol,
/* 0x0b */ XK_0, XK_parenright, NoSymbol, NoSymbol,
/* 0x0c */ XK_minus, XK_underscore, NoSymbol, NoSymbol,
/* 0x0d */ XK_equal, XK_plus, NoSymbol, NoSymbol,
/* 0x0e */ XK_BackSpace, NoSymbol, NoSymbol, NoSymbol,
/* 0x0f */ XK_Tab, XK_ISO_Left_Tab,NoSymbol, NoSymbol,
/* 0x10 */ XK_Q, NoSymbol, NoSymbol, NoSymbol,
/* 0x11 */ XK_W, NoSymbol, NoSymbol, NoSymbol,
/* 0x12 */ XK_E, NoSymbol, NoSymbol, NoSymbol,
/* 0x13 */ XK_R, NoSymbol, NoSymbol, NoSymbol,
/* 0x14 */ XK_T, NoSymbol, NoSymbol, NoSymbol,
/* 0x15 */ XK_Y, NoSymbol, NoSymbol, NoSymbol,
/* 0x16 */ XK_U, NoSymbol, NoSymbol, NoSymbol,
/* 0x17 */ XK_I, NoSymbol, NoSymbol, NoSymbol,
/* 0x18 */ XK_O, NoSymbol, NoSymbol, NoSymbol,
/* 0x19 */ XK_P, NoSymbol, NoSymbol, NoSymbol,
/* 0x1a */ XK_bracketleft, XK_braceleft, NoSymbol, NoSymbol,
/* 0x1b */ XK_bracketright,XK_braceright, NoSymbol, NoSymbol,
/* 0x1c */ XK_Return, NoSymbol, NoSymbol, NoSymbol,
/* 0x1d */ XK_Control_L, NoSymbol, NoSymbol, NoSymbol,
/* 0x1e */ XK_A, NoSymbol, NoSymbol, NoSymbol,
/* 0x1f */ XK_S, NoSymbol, NoSymbol, NoSymbol,
/* 0x20 */ XK_D, NoSymbol, NoSymbol, NoSymbol,
/* 0x21 */ XK_F, NoSymbol, NoSymbol, NoSymbol,
/* 0x22 */ XK_G, NoSymbol, NoSymbol, NoSymbol,
/* 0x23 */ XK_H, NoSymbol, NoSymbol, NoSymbol,
/* 0x24 */ XK_J, NoSymbol, NoSymbol, NoSymbol,
/* 0x25 */ XK_K, NoSymbol, NoSymbol, NoSymbol,
/* 0x26 */ XK_L, NoSymbol, NoSymbol, NoSymbol,
/* 0x27 */ XK_semicolon, XK_colon, NoSymbol, NoSymbol,
/* 0x28 */ XK_quoteright, XK_quotedbl, NoSymbol, NoSymbol,
/* 0x29 */ XK_quoteleft, XK_asciitilde, NoSymbol, NoSymbol,
/* 0x2a */ XK_Shift_L, NoSymbol, NoSymbol, NoSymbol,
/* 0x2b */ XK_backslash, XK_bar, NoSymbol, NoSymbol,
/* 0x2c */ XK_Z, NoSymbol, NoSymbol, NoSymbol,
/* 0x2d */ XK_X, NoSymbol, NoSymbol, NoSymbol,
/* 0x2e */ XK_C, NoSymbol, NoSymbol, NoSymbol,
/* 0x2f */ XK_V, NoSymbol, NoSymbol, NoSymbol,
/* 0x30 */ XK_B, NoSymbol, NoSymbol, NoSymbol,
/* 0x31 */ XK_N, NoSymbol, NoSymbol, NoSymbol,
/* 0x32 */ XK_M, NoSymbol, NoSymbol, NoSymbol,
/* 0x33 */ XK_comma, XK_less, NoSymbol, NoSymbol,
/* 0x34 */ XK_period, XK_greater, NoSymbol, NoSymbol,
/* 0x35 */ XK_slash, XK_question, NoSymbol, NoSymbol,
/* 0x36 */ XK_Shift_R, NoSymbol, NoSymbol, NoSymbol,
/* 0x37 */ XK_KP_Multiply, NoSymbol, NoSymbol, NoSymbol,
/* 0x38 */ XK_Alt_L, XK_Meta_L, NoSymbol, NoSymbol,
/* 0x39 */ XK_space, NoSymbol, NoSymbol, NoSymbol,
/* 0x3a */ XK_Caps_Lock, NoSymbol, NoSymbol, NoSymbol,
/* 0x3b */ XK_F1, NoSymbol, NoSymbol, NoSymbol,
/* 0x3c */ XK_F2, NoSymbol, NoSymbol, NoSymbol,
/* 0x3d */ XK_F3, NoSymbol, NoSymbol, NoSymbol,
/* 0x3e */ XK_F4, NoSymbol, NoSymbol, NoSymbol,
/* 0x3f */ XK_F5, NoSymbol, NoSymbol, NoSymbol,
/* 0x40 */ XK_F6, NoSymbol, NoSymbol, NoSymbol,
/* 0x41 */ XK_F7, NoSymbol, NoSymbol, NoSymbol,
/* 0x42 */ XK_F8, NoSymbol, NoSymbol, NoSymbol,
/* 0x43 */ XK_F9, NoSymbol, NoSymbol, NoSymbol,
/* 0x44 */ XK_F10, NoSymbol, NoSymbol, NoSymbol,
/* 0x45 */ XK_Num_Lock, NoSymbol, NoSymbol, NoSymbol,
/* 0x46 */ XK_Scroll_Lock, NoSymbol, NoSymbol, NoSymbol,
/* 0x47 */ XK_KP_Home, XK_KP_7, NoSymbol, NoSymbol,
/* 0x48 */ XK_KP_Up, XK_KP_8, NoSymbol, NoSymbol,
/* 0x49 */ XK_KP_Prior, XK_KP_9, NoSymbol, NoSymbol,
/* 0x4a */ XK_KP_Subtract, NoSymbol, NoSymbol, NoSymbol,
/* 0x4b */ XK_KP_Left, XK_KP_4, NoSymbol, NoSymbol,
/* 0x4c */ XK_KP_Begin, XK_KP_5, NoSymbol, NoSymbol,
/* 0x4d */ XK_KP_Right, XK_KP_6, NoSymbol, NoSymbol,
/* 0x4e */ XK_KP_Add, NoSymbol, NoSymbol, NoSymbol,
/* 0x4f */ XK_KP_End, XK_KP_1, NoSymbol, NoSymbol,
/* 0x50 */ XK_KP_Down, XK_KP_2, NoSymbol, NoSymbol,
/* 0x51 */ XK_KP_Next, XK_KP_3, NoSymbol, NoSymbol,
/* 0x52 */ XK_KP_Insert, XK_KP_0, NoSymbol, NoSymbol,
/* 0x53 */ XK_KP_Delete, XK_KP_Decimal, NoSymbol, NoSymbol,
/* 0x54 */ XK_Sys_Req, NoSymbol, NoSymbol, NoSymbol,
/* 0x55 */ NoSymbol, NoSymbol, NoSymbol, NoSymbol,
/* 0x56 */ XK_less, XK_greater, NoSymbol, NoSymbol,
/* 0x57 */ XK_F11, NoSymbol, NoSymbol, NoSymbol,
/* 0x58 */ XK_F12, NoSymbol, NoSymbol, NoSymbol,
/* 0x59 */ XK_Home, NoSymbol, NoSymbol, NoSymbol,
/* 0x5a */ XK_Up, NoSymbol, NoSymbol, NoSymbol,
/* 0x5b */ XK_Prior, NoSymbol, NoSymbol, NoSymbol,
/* 0x5c */ XK_Left, NoSymbol, NoSymbol, NoSymbol,
/* 0x5d */ XK_Begin, NoSymbol, NoSymbol, NoSymbol,
/* 0x5e */ XK_Right, NoSymbol, NoSymbol, NoSymbol,
/* 0x5f */ XK_End, NoSymbol, NoSymbol, NoSymbol,
/* 0x60 */ XK_Down, NoSymbol, NoSymbol, NoSymbol,
/* 0x61 */ XK_Next, NoSymbol, NoSymbol, NoSymbol,
/* 0x62 */ XK_Insert, NoSymbol, NoSymbol, NoSymbol,
/* 0x63 */ XK_Delete, NoSymbol, NoSymbol, NoSymbol,
/* 0x64 */ XK_KP_Enter, NoSymbol, NoSymbol, NoSymbol,
/* 0x65 */ XK_Control_R, NoSymbol, NoSymbol, NoSymbol,
/* 0x66 */ XK_Pause, NoSymbol, NoSymbol, NoSymbol,
/* 0x67 */ XK_Print, NoSymbol, NoSymbol, NoSymbol,
/* 0x68 */ XK_KP_Divide, NoSymbol, NoSymbol, NoSymbol,
/* 0x69 */ XK_Alt_R, XK_Meta_R, NoSymbol, NoSymbol,
/* 0x6a */ XK_Break, NoSymbol, NoSymbol, NoSymbol,
/* 0x6b */ XK_Meta_L, NoSymbol, NoSymbol, NoSymbol,
/* 0x6c */ XK_Meta_R, NoSymbol, NoSymbol, NoSymbol,
/* 0x6d */ XK_Menu, NoSymbol, NoSymbol, NoSymbol,
/* 0x6e */ XK_F13, NoSymbol, NoSymbol, NoSymbol,
/* 0x6f */ XK_F14, NoSymbol, NoSymbol, NoSymbol,
/* 0x70 */ XK_F15, NoSymbol, NoSymbol, NoSymbol,
/* 0x71 */ XK_F16, NoSymbol, NoSymbol, NoSymbol,
/* 0x72 */ XK_F17, NoSymbol, NoSymbol, NoSymbol,
/* 0x73 */ XK_backslash, XK_underscore, NoSymbol, NoSymbol,
/* 0x74 */ NoSymbol, NoSymbol, NoSymbol, NoSymbol,
/* 0x75 */ NoSymbol, NoSymbol, NoSymbol, NoSymbol,
/* 0x76 */ NoSymbol, NoSymbol, NoSymbol, NoSymbol,
/* 0x77 */ NoSymbol, NoSymbol, NoSymbol, NoSymbol,
/* 0x78 */ NoSymbol, NoSymbol, NoSymbol, NoSymbol,
/* 0x79 */ XK_Henkan, XK_Mode_switch, NoSymbol, NoSymbol,
/* 0x7a */ NoSymbol, NoSymbol, NoSymbol, NoSymbol,
/* 0x7b */ XK_Muhenkan, NoSymbol, NoSymbol, NoSymbol,
/* 0x7c */ NoSymbol, NoSymbol, NoSymbol, NoSymbol,
/* 0x7d */ XK_backslash, XK_bar, NoSymbol, NoSymbol,
/* 0x7e */ NoSymbol, NoSymbol, NoSymbol, NoSymbol,
/* 0x7f */ NoSymbol, NoSymbol, NoSymbol, NoSymbol,
};

8
hw/xwin/winmultiwindowwm.c
View File

@ -944,7 +944,7 @@ winMultiWindowXMsgProc (void *pArg)
if (pProcArg->pDisplay == NULL) if (pProcArg->pDisplay == NULL)
{ {
ErrorF ("winMultiWindowXMsgProc - Could not open display, try: %d, " ErrorF ("winMultiWindowXMsgProc - Could not open display, try: %d, "
"sleeping: %d\n\f", "sleeping: %d\n",
iRetries + 1, WIN_CONNECT_DELAY); iRetries + 1, WIN_CONNECT_DELAY);
++iRetries; ++iRetries;
sleep (WIN_CONNECT_DELAY); sleep (WIN_CONNECT_DELAY);
@ -1327,7 +1327,7 @@ winInitMultiWindowWM (WMInfoPtr pWMInfo, WMProcArgPtr pProcArg)
if (pWMInfo->pDisplay == NULL) if (pWMInfo->pDisplay == NULL)
{ {
ErrorF ("winInitMultiWindowWM - Could not open display, try: %d, " ErrorF ("winInitMultiWindowWM - Could not open display, try: %d, "
"sleeping: %d\n\f", "sleeping: %d\n",
iRetries + 1, WIN_CONNECT_DELAY); iRetries + 1, WIN_CONNECT_DELAY);
++iRetries; ++iRetries;
sleep (WIN_CONNECT_DELAY); sleep (WIN_CONNECT_DELAY);
@ -1430,7 +1430,7 @@ winMultiWindowWMErrorHandler (Display *pDisplay, XErrorEvent *pErr)
static int static int
winMultiWindowWMIOErrorHandler (Display *pDisplay) winMultiWindowWMIOErrorHandler (Display *pDisplay)
{ {
ErrorF ("\nwinMultiWindowWMIOErrorHandler!\n\n"); ErrorF ("winMultiWindowWMIOErrorHandler!\n\n");
if (g_shutdown) if (g_shutdown)
pthread_exit(NULL); pthread_exit(NULL);
@ -1470,7 +1470,7 @@ winMultiWindowXMsgProcErrorHandler (Display *pDisplay, XErrorEvent *pErr)
static int static int
winMultiWindowXMsgProcIOErrorHandler (Display *pDisplay) winMultiWindowXMsgProcIOErrorHandler (Display *pDisplay)
{ {
ErrorF ("\nwinMultiWindowXMsgProcIOErrorHandler!\n\n"); ErrorF ("winMultiWindowXMsgProcIOErrorHandler!\n\n");
/* Restart at the main entry point */ /* Restart at the main entry point */
longjmp (g_jmpXMsgProcEntry, WIN_JMP_ERROR_IO); longjmp (g_jmpXMsgProcEntry, WIN_JMP_ERROR_IO);

2
hw/xwin/winprocarg.c
View File

@ -53,7 +53,7 @@ extern Bool g_fUnicodeClipboard;
extern Bool g_fClipboard; extern Bool g_fClipboard;
#endif #endif
extern int g_iLogVerbose; extern int g_iLogVerbose;
extern char * g_pszLogFile; extern const char * g_pszLogFile;
#ifdef RELOCATE_PROJECTROOT #ifdef RELOCATE_PROJECTROOT
extern Bool g_fLogFileChanged; extern Bool g_fLogFileChanged;
#endif #endif

2
hw/xwin/winscrinit.c
View File

@ -246,7 +246,7 @@ winScreenInit (int index,
dixScreenOrigins[index].x = pScreenInfo->dwInitialX - GetSystemMetrics(SM_XVIRTUALSCREEN); dixScreenOrigins[index].x = pScreenInfo->dwInitialX - GetSystemMetrics(SM_XVIRTUALSCREEN);
dixScreenOrigins[index].y = pScreenInfo->dwInitialY - GetSystemMetrics(SM_YVIRTUALSCREEN); dixScreenOrigins[index].y = pScreenInfo->dwInitialY - GetSystemMetrics(SM_YVIRTUALSCREEN);
ErrorF("Screen %d added at XINERAMA coordinate (%d,%d).\n", ErrorF("Screen %d added at virtual desktop coordinate (%d,%d).\n",
index, dixScreenOrigins[index].x, dixScreenOrigins[index].y); index, dixScreenOrigins[index].x, dixScreenOrigins[index].y);
#if CYGDEBUG || YES #if CYGDEBUG || YES

4
hw/xwin/winshaddd.c
View File

@ -42,7 +42,7 @@
*/ */
extern HWND g_hDlgExit; extern HWND g_hDlgExit;
extern char *g_pszLogFile; extern const char *g_pszLogFile;
/* /*
* FIXME: Headers are broken, DEFINE_GUID doesn't work correctly, * FIXME: Headers are broken, DEFINE_GUID doesn't work correctly,
@ -651,7 +651,7 @@ winShadowUpdateDD (ScreenPtr pScreen,
"pixmap header to point to the new address. If you get " "pixmap header to point to the new address. If you get "
"this message and "PROJECT_NAME" freezes or crashes " "this message and "PROJECT_NAME" freezes or crashes "
"after this message then send a problem report and your " "after this message then send a problem report and your "
"%s file to " BUILDERADDR, g_pszLogFile); "%s file to " BUILDERADDR "\n", g_pszLogFile);
/* Location of shadow framebuffer has changed */ /* Location of shadow framebuffer has changed */
pScreenInfo->pfb = pScreenPriv->pddsdShadow->lpSurface; pScreenInfo->pfb = pScreenPriv->pddsdShadow->lpSurface;

2
hw/xwin/winshadddnl.c
View File

@ -554,7 +554,7 @@ winFinishCreateWindowsWindowDDNL (WindowPtr pWin)
int iWidth, iHeight; int iWidth, iHeight;
int iX, iY; int iX, iY;
winDebug ("\nwinFinishCreateWindowsWindowDDNL!\n\n"); winDebug ("winFinishCreateWindowsWindowDDNL!\n\n");
iX = pWin->drawable.x + GetSystemMetrics (SM_XVIRTUALSCREEN); iX = pWin->drawable.x + GetSystemMetrics (SM_XVIRTUALSCREEN);
iY = pWin->drawable.y + GetSystemMetrics (SM_YVIRTUALSCREEN); iY = pWin->drawable.y + GetSystemMetrics (SM_YVIRTUALSCREEN);

10
hw/xwin/winwindowswm.c
View File

@ -81,7 +81,7 @@ make_box (int x, int y, int w, int h)
} }
void void
winWindowsWMExtensionInit () winWindowsWMExtensionInit (void)
{ {
ExtensionEntry* extEntry; ExtensionEntry* extEntry;
@ -326,14 +326,6 @@ winWindowsWMSendEvent (int type, unsigned int mask, int which, int arg,
} }
} }
/* Safe to call from any thread. */
unsigned int
WindowsWMSelectedEvents (void)
{
return eventMask;
}
/* general utility functions */ /* general utility functions */
static int static int

2
include/xwin-config.h.in
View File

@ -32,3 +32,5 @@
/* Location of system.XWinrc */ /* Location of system.XWinrc */
#undef SYSCONFDIR #undef SYSCONFDIR
/* Default log location */
#undef DEFAULT_LOGDIR

2
os/osdep.h
View File

@ -200,7 +200,7 @@ extern int *ConnectionTranslation;
#else #else
extern int GetConnectionTranslation(int conn); extern int GetConnectionTranslation(int conn);
extern void SetConnectionTranslation(int conn, int client); extern void SetConnectionTranslation(int conn, int client);
extern void ClearConnectionTranslation(); extern void ClearConnectionTranslation(void);
#endif #endif
extern Bool NewOutputPending; extern Bool NewOutputPending;