X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?a=blobdiff_plain;f=src%2Fx11%2Ffg_spaceball_x11.c;fp=src%2Fx11%2Ffg_spaceball_x11.c;h=155d24b12a3800dade72262419c811c87496fafc;hb=0c5339dad42bcdda8cc4c86b16194f7267578cd2;hp=e8c328a7a524f70824e3e695193cdebb5e802725;hpb=207c3128bf025b5e025bace5c0425d380dd72aa9;p=freeglut diff --git a/src/x11/fg_spaceball_x11.c b/src/x11/fg_spaceball_x11.c index e8c328a..155d24b 100644 --- a/src/x11/fg_spaceball_x11.c +++ b/src/x11/fg_spaceball_x11.c @@ -14,7 +14,7 @@ #include -extern int sball_initialized; +extern int fg_sball_initialized; enum { SPNAV_EVENT_ANY, /* used by spnav_remove_events() */ @@ -56,17 +56,17 @@ void fgPlatformInitializeSpaceball(void) { Window w; - sball_initialized = 1; + fg_sball_initialized = 1; if(!fgStructure.CurrentWindow) { - sball_initialized = -1; + fg_sball_initialized = -1; return; } w = fgStructure.CurrentWindow->Window.Handle; if(spnav_x11_open(fgDisplay.pDisplay.Display, w) == -1) { - sball_initialized = -1; + fg_sball_initialized = -1; return; } } @@ -105,7 +105,7 @@ int fgIsSpaceballXEvent(const XEvent *xev) fgSpaceballSetWindow(fgStructure.CurrentWindow); } - if(sball_initialized != 1) { + if(fg_sball_initialized != 1) { return 0; } @@ -116,9 +116,9 @@ void fgSpaceballHandleXEvent(const XEvent *xev) { spnav_event sev; - if(sball_initialized == 0) { + if(fg_sball_initialized == 0) { fgInitialiseSpaceball(); - if(sball_initialized != 1) { + if(fg_sball_initialized != 1) { return; } }