frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote branch 'jeremyhu/master'

This commit is contained in:
Keith Packard 2010-03-15 08:26:58 -07:00
parent 5f169f5493 5172253bae
commit df9b6f16b2
4 changed files with 16 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
hw/xquartz/GL/capabilities.c
View File

@ -31,6 +31,10 @@
#include "capabilities.h" #include "capabilities.h"
#define Cursor X_Cursor
#include "os.h"
#undef Cursor
static void handleBufferModes(struct glCapabilitiesConfig *c, GLint bufferModes) { static void handleBufferModes(struct glCapabilitiesConfig *c, GLint bufferModes) {
if(bufferModes & kCGLStereoscopicBit) { if(bufferModes & kCGLStereoscopicBit) {
c->stereo = true; c->stereo = true;

2
hw/xquartz/GL/indirect.c
View File

@ -471,7 +471,7 @@ static int __glXAquaContextForceCurrent(__GLXcontext *baseContext)
} }
/* Drawing surface notification callbacks */ /* Drawing surface notification callbacks */
static GLboolean __glXAquaDrawableSwapBuffers(__GLXdrawable *base) { static GLboolean __glXAquaDrawableSwapBuffers(ClientPtr client, __GLXdrawable *base) {
CGLError err; CGLError err;
__GLXAquaDrawable *drawable; __GLXAquaDrawable *drawable;

6
hw/xquartz/darwin.c
View File

@ -45,6 +45,7 @@
#include "site.h" #include "site.h"
#include "globals.h" #include "globals.h"
#include "dix.h" #include "dix.h"
#include "xkbsrv.h"
#include <X11/extensions/XI.h> #include <X11/extensions/XI.h>
#include <X11/extensions/XIproto.h> #include <X11/extensions/XIproto.h>
@ -461,6 +462,11 @@ int DarwinParseModifierList(const char *constmodifiers, int separatelr)
*/ */
void InitInput( int argc, char **argv ) void InitInput( int argc, char **argv )
{ {
XkbRMLVOSet rmlvo = { .rules = "base", .model = "empty", .layout = "empty",
.variant = NULL, .options = NULL };
/* We need to really have rules... or something... */
XkbSetRulesDflts(&rmlvo);
darwinKeyboard = AddInputDevice(serverClient, DarwinKeybdProc, TRUE); darwinKeyboard = AddInputDevice(serverClient, DarwinKeybdProc, TRUE);
RegisterKeyboardDevice( darwinKeyboard ); RegisterKeyboardDevice( darwinKeyboard );
darwinKeyboard->name = strdup("keyboard"); darwinKeyboard->name = strdup("keyboard");

16
hw/xquartz/quartzKeyboard.c
View File

@ -301,9 +301,6 @@ void DarwinKeyboardInit(DeviceIntPtr pDev) {
// for a kIOHIDParamConnectType connection. // for a kIOHIDParamConnectType connection.
assert(darwinParamConnect = NXOpenEventStatus()); assert(darwinParamConnect = NXOpenEventStatus());
/* We need to really have rules... or something... */
//XkbSetRulesDflts("base", "pc105", "us", NULL, NULL);
InitKeyboardDeviceStruct(pDev, NULL, DarwinKeyboardBell, DarwinChangeKeyboardControl); InitKeyboardDeviceStruct(pDev, NULL, DarwinKeyboardBell, DarwinChangeKeyboardControl);
DarwinKeyboardReloadHandler(); DarwinKeyboardReloadHandler();
@ -775,12 +772,9 @@ Bool QuartzReadSystemKeymap(darwinKeyboardInfo *info) {
#endif #endif
} }
// There seems to be an issue with this in 1.5+, shift-space is not if (k[3] == k[2]) k[3] = NoSymbol;
// producing space, it's sending NoSymbol... ? if (k[1] == k[0]) k[1] = NoSymbol;
//if (k[3] == k[2]) k[3] = NoSymbol; if (k[0] == k[2] && k[1] == k[3]) k[2] = k[3] = NoSymbol;
//if (k[1] == k[0]) k[1] = NoSymbol;
//if (k[0] == k[2] && k[1] == k[3]) k[2] = k[3] = NoSymbol;
//if (k[3] == k[0] && k[2] == k[1] && k[2] == NoSymbol) k[3] = NoSymbol;
} }
/* Fix up some things that are normally missing.. */ /* Fix up some things that are normally missing.. */
@ -791,7 +785,7 @@ Bool QuartzReadSystemKeymap(darwinKeyboardInfo *info) {
if (k[0] == NoSymbol && k[1] == NoSymbol if (k[0] == NoSymbol && k[1] == NoSymbol
&& k[2] == NoSymbol && k[3] == NoSymbol) && k[2] == NoSymbol && k[3] == NoSymbol)
k[0] = k[1] = k[2] = k[3] = known_keys[i].keysym; k[0] = known_keys[i].keysym;
} }
} }
@ -804,7 +798,7 @@ Bool QuartzReadSystemKeymap(darwinKeyboardInfo *info) {
k = info->keyMap + known_numeric_keys[i].keycode * GLYPHS_PER_KEY; k = info->keyMap + known_numeric_keys[i].keycode * GLYPHS_PER_KEY;
if (k[0] == known_numeric_keys[i].normal) if (k[0] == known_numeric_keys[i].normal)
k[0] = k[1] = k[2] = k[3] = known_numeric_keys[i].keypad; k[0] = known_numeric_keys[i].keypad;
} }
} }