X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?a=blobdiff_plain;ds=sidebyside;f=src%2Ffreeglut_init.c;h=194248a4ded782932f9fc5aff23e32275535ccd7;hb=20c326dd70f34697350611e53ad6fe5435b5240f;hp=bbe9ec8e17c8bedbcfdb4c4425511665f1d27cb5;hpb=d4846df601fa224353c65fa332f603a85735b5d8;p=freeglut

diff --git a/src/freeglut_init.c b/src/freeglut_init.c
index bbe9ec8..194248a 100644
--- a/src/freeglut_init.c
+++ b/src/freeglut_init.c
@@ -86,6 +86,7 @@ SFG_State fgState = { { -1, -1, GL_FALSE },  /* Position */
                       GL_FALSE,               /* JoysticksInitialised */
                       0,                      /* NumActiveJoysticks */
                       GL_FALSE,               /* InputDevsInitialised */
+                      0,                      /* MouseWheelTicks */
                       1,                      /* AuxiliaryBufferNumber */
                       4,                      /* SampleNumber */
                       1,                      /* MajorVersion */
@@ -210,27 +211,27 @@ static int fghNetWMSupported(void)
 /*  Check if "hint" is present in "property" for "window". */
 int fgHintPresent(Window window, Atom property, Atom hint)
 {
-  Atom ** atoms_ptr;
+  Atom *atoms;
   int number_of_atoms;
   int supported;
   int i;
 
   supported = 0;
 
-  atoms_ptr = malloc(sizeof(Atom *));
   number_of_atoms = fghGetWindowProperty(window,
 					 property,
 					 XA_ATOM,
-					 (unsigned char **) atoms_ptr);
+					 (unsigned char **) &atoms);
   for (i = 0; i < number_of_atoms; i++)
-    {
-      if ((*atoms_ptr)[i] == hint)
+  {
+      if (atoms[i] == hint)
       {
           supported = 1;
           break;
       }
-    }
+  }
 
+  XFree(atoms);
   return supported;
 }
 
@@ -313,7 +314,7 @@ static void fghInitialize( const char* displayName )
 
     /* What we need to do is to initialize the fgDisplay global structure here. */
     fgDisplay.Instance = GetModuleHandle( NULL );
-    fgDisplay.DisplayName=strdup(displayName);
+    fgDisplay.DisplayName= displayName ? strdup(displayName) : 0 ;
     atom = GetClassInfo( fgDisplay.Instance, _T("FREEGLUT"), &wc );
 
     if( atom == 0 )
@@ -442,6 +443,8 @@ void fgDeinitialize( void )
     fgState.JoysticksInitialised = GL_FALSE;
     fgState.InputDevsInitialised = GL_FALSE;
 
+	fgState.MouseWheelTicks = 0;
+
     fgState.MajorVersion = 1;
     fgState.MinorVersion = 0;
     fgState.ContextFlags = 0;