Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Date: Sun, 04 Dec 2005 21:43:46 -0500
From: Jonathan Atkins <jcatki@jcatki.no-ip.org>
Subject: SDL patch: DGA key events

I kept seeing DGA die on me whenever I press a key.
I tracked it down and it seems that the new indirect X via pointers
system messed it up.  It needed to have the pX* pointers well defined to
call, in particular, pXNextEvent.  Also, the X11_TranslateKey function
prototype was changed, but not updated in the dga driver.  perhaps other
files are also affected.

Not sure what releases may suffer from this too.

thanks!
	-Jon Atkins
  • Loading branch information
icculus committed Dec 5, 2005
1 parent 0df6def commit 542d9d5
Showing 1 changed file with 5 additions and 2 deletions.
7 changes: 5 additions & 2 deletions src/video/dga/SDL_dgaevents.c
Expand Up @@ -36,10 +36,13 @@ static char rcsid =
#include "SDL_dgavideo.h"
#include "SDL_dgaevents_c.h"

/* get function pointers... */
#include "../x11/SDL_x11dyn.h"

/* Heheh we're using X11 event code */
extern int X11_Pending(Display *display);
extern void X11_InitKeymap(void);
extern SDL_keysym *X11_TranslateKey(Display *display, XKeyEvent *xkey,
extern SDL_keysym *X11_TranslateKey(Display *display, XIC ic, XKeyEvent *xkey,
KeyCode kc, SDL_keysym *keysym);

static int DGA_DispatchEvent(_THIS)
Expand Down Expand Up @@ -84,7 +87,7 @@ static int DGA_DispatchEvent(_THIS)

SDL_NAME(XDGAKeyEventToXKeyEvent)(&xevent.xkey, &xkey);
posted = SDL_PrivateKeyboard((xevent.type == KeyPress),
X11_TranslateKey(DGA_Display,
X11_TranslateKey(DGA_Display, NULL/*no XIC*/,
&xkey, xkey.keycode,
&keysym));
}
Expand Down

0 comments on commit 542d9d5

Please sign in to comment.