Added correct include files to files,

No longer modify cmap if the device is truecolor (messes up dual monitors
	with vt switching)

diff --git a/src/glut/fbdev/callback.c b/src/glut/fbdev/callback.c
index 37373672d369e9a94523eb51baaf75a23a3ea050..946c8d8c133327514be1eff542541cfa9b8d8b7d 100644 (file)
--- a/src/glut/fbdev/callback.c
+++ b/src/glut/fbdev/callback.c
@@ -24,6 +24,8 @@
  * Written by Sean D'Epagnier (c) 2006
  */
 
+#include <stdlib.h>
+
 #include <GL/glut.h>
 
 #include "internal.h"

diff --git a/src/glut/fbdev/colormap.c b/src/glut/fbdev/colormap.c
index 89556ef4a5c75ba73ac009f73d7982d595e1880e..3a81f93657dbe3f1a9586c59becf73c88810e762 100644 (file)
--- a/src/glut/fbdev/colormap.c
+++ b/src/glut/fbdev/colormap.c
@@ -24,6 +24,7 @@
  * Written by Sean D'Epagnier (c) 2006
  */
 
+#include <stdio.h>
 #include <stdlib.h>
 
 #include <linux/fb.h>
@@ -37,7 +38,7 @@
 #define TORMAP(x)(unsigned short)((x<0?0:x>1?1:x)*(GLfloat)(REVERSECMAPSIZE-1))
 #define FROMCMAP(x) (GLfloat)x / (GLfloat)((1<<16) - 1)
 
-static struct fb_cmap ColorMap;
+static struct fb_cmap ColorMap, OriginalColorMap;
 
 unsigned short RedColorMap[256], GreenColorMap[256], BlueColorMap[256];
 

diff --git a/src/glut/fbdev/cursor.c b/src/glut/fbdev/cursor.c
index 88386956a44357eb6118e9a0bb8b421708f112cf..6cd087e93c899ce03206a78045944e4c2baa53b9 100644 (file)
--- a/src/glut/fbdev/cursor.c
+++ b/src/glut/fbdev/cursor.c
@@ -28,8 +28,10 @@
    to render the cursor, this is faster, it would be good to use a hardware
    cursor if it exists instead */
 
+#include <stdio.h>
 #include <stdlib.h>
 #include <inttypes.h>
+#include <string.h>
 
 #include <linux/fb.h>
 

diff --git a/src/glut/fbdev/ext.c b/src/glut/fbdev/ext.c
index 4a3c185a16dc2b1d6ff569e817dcbede067529ca..65953e705b94e52129f26203337af50cca2da2cf 100644 (file)
--- a/src/glut/fbdev/ext.c
+++ b/src/glut/fbdev/ext.c
@@ -24,6 +24,8 @@
  * Written by Sean D'Epagnier (c) 2006
  */
 
+#include <stdio.h>
+
 #include <GL/gl.h>
 #include <GL/glut.h>
 

diff --git a/src/glut/fbdev/fbdev.c b/src/glut/fbdev/fbdev.c
index ce6419816dde1f7c5c9c50c68fb5a441134d0ed0..7b46d545920658339f9f269282b2814b005acb99 100644 (file)
--- a/src/glut/fbdev/fbdev.c
+++ b/src/glut/fbdev/fbdev.c
@@ -571,7 +571,8 @@ void SetVideoMode(void)
    }
 
    /* initialize colormap */
-   LoadColorMap();
+   if(FixedInfo.visual != FB_VISUAL_TRUECOLOR)
+      LoadColorMap();
 }
 
 void CreateBuffer()
@@ -786,6 +787,7 @@ void glutDestroyWindow(int win)
    glFBDevDestroyContext(Context);
    glFBDevDestroyBuffer(Buffer);
    glFBDevDestroyVisual(Visual);
+  
    Visual = NULL;
 }
 

diff --git a/src/glut/fbdev/gamemode.c b/src/glut/fbdev/gamemode.c
index 9f32d9d7e8208da5cced00483363f0f5b65dd11a..30be36af7af802f6f3a30831be9ee3e2e9cbd32b 100644 (file)
--- a/src/glut/fbdev/gamemode.c
+++ b/src/glut/fbdev/gamemode.c
@@ -24,6 +24,7 @@
  * Written by Sean D'Epagnier (c) 2006
  */
 
+#include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 

diff --git a/src/glut/fbdev/input.c b/src/glut/fbdev/input.c
index 2528a74a1058268ab1da72e115ff11595c15cb5d..d09de22ed7eae8b0309cb6dbc7cc60ca50988c0b 100644 (file)
--- a/src/glut/fbdev/input.c
+++ b/src/glut/fbdev/input.c
@@ -53,7 +53,7 @@
 int GpmMouse;
 #endif
 
-int CurrentVT;
+int CurrentVT = 0;
 int ConsoleFD = -1;
 
 int KeyboardModifiers;
@@ -529,14 +529,14 @@ static void VTSwitchHandler(int sig)
       /* this is a hack to turn the cursor off */
       ioctl(FrameBufferFD, FBIOPUT_VSCREENINFO, &VarInfo);
 
-      RestoreColorMap();
+      if(FixedInfo.visual != FB_VISUAL_TRUECOLOR)
+         RestoreColorMap();
 
       Active = 1;
       Visible = 1;
       VisibleSwitch = 1;
 
       Redisplay = 1;
-
       break;
    }
 }

diff --git a/src/glut/fbdev/internal.h b/src/glut/fbdev/internal.h
index 082cd4f6f3a1f40dc0223d19d05428437819415d..8801cc9f6c3a6c9072089d0c2cca331587406240 100644 (file)
--- a/src/glut/fbdev/internal.h
+++ b/src/glut/fbdev/internal.h
@@ -72,14 +72,13 @@ extern GLFBDevVisualPtr Visual;
 #define REVERSECMAPSIZE (1<<REVERSECMAPSIZELOG)
 
 extern unsigned short RedColorMap[256],
-                        GreenColorMap[256],
-                        BlueColorMap[256];
+                      GreenColorMap[256],
+                      BlueColorMap[256];
 extern unsigned char ReverseColorMap[REVERSECMAPSIZE]
                                     [REVERSECMAPSIZE]
                                     [REVERSECMAPSIZE];
-void LoadOldColorMap(void);
+
 void LoadColorMap(void);
-void UnloadColorMap(void);
 void RestoreColorMap(void);
 
 /* --- mouse --- */

diff --git a/src/glut/fbdev/menu.c b/src/glut/fbdev/menu.c
index f5a5ef754345db5ca8b9437d4160665bd715459e..18cd58d6a2d9464dd102605f58b355039ff75f88 100644 (file)
--- a/src/glut/fbdev/menu.c
+++ b/src/glut/fbdev/menu.c
@@ -25,6 +25,8 @@
  */
 
 #include <stdlib.h>
+#include <stdio.h>
+#include <string.h>
 
 #include <linux/fb.h>
 

diff --git a/src/glut/fbdev/state.c b/src/glut/fbdev/state.c
index bca675c52c48acddb5b332c19ae01550771151d9..212a04aa0288342f740d6cb511fdc398d08544d3 100644 (file)
--- a/src/glut/fbdev/state.c
+++ b/src/glut/fbdev/state.c
@@ -24,6 +24,7 @@
  * Written by Sean D'Epagnier (c) 2006
  */
 
+#include <string.h>
 #include <sys/time.h>
 
 #include <linux/fb.h>