diff options
author | Sean D'Epagnier <geckosenator@freedesktop.org> | 2006-11-21 09:35:49 +0000 |
---|---|---|
committer | Sean D'Epagnier <geckosenator@freedesktop.org> | 2006-11-21 09:35:49 +0000 |
commit | 0570fcfd93a29dcd9d41bc709edd78a7c1b4e1e7 (patch) | |
tree | 142c1e827670f35d68cf95a4f85f329c6794a24c | |
parent | 0337e5635f8d18fdf9dac734141e5302db6d1d49 (diff) | |
download | external_mesa3d-0570fcfd93a29dcd9d41bc709edd78a7c1b4e1e7.zip external_mesa3d-0570fcfd93a29dcd9d41bc709edd78a7c1b4e1e7.tar.gz external_mesa3d-0570fcfd93a29dcd9d41bc709edd78a7c1b4e1e7.tar.bz2 |
Added correct include files to files,
No longer modify cmap if the device is truecolor (messes up dual monitors
with vt switching)
-rw-r--r-- | src/glut/fbdev/callback.c | 2 | ||||
-rw-r--r-- | src/glut/fbdev/colormap.c | 3 | ||||
-rw-r--r-- | src/glut/fbdev/cursor.c | 2 | ||||
-rw-r--r-- | src/glut/fbdev/ext.c | 2 | ||||
-rw-r--r-- | src/glut/fbdev/fbdev.c | 4 | ||||
-rw-r--r-- | src/glut/fbdev/gamemode.c | 1 | ||||
-rw-r--r-- | src/glut/fbdev/input.c | 6 | ||||
-rw-r--r-- | src/glut/fbdev/internal.h | 7 | ||||
-rw-r--r-- | src/glut/fbdev/menu.c | 2 | ||||
-rw-r--r-- | src/glut/fbdev/state.c | 1 |
10 files changed, 21 insertions, 9 deletions
diff --git a/src/glut/fbdev/callback.c b/src/glut/fbdev/callback.c index 3737367..946c8d8 100644 --- 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 89556ef..3a81f93 100644 --- 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 8838695..6cd087e 100644 --- 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 4a3c185..65953e7 100644 --- 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 ce64198..7b46d54 100644 --- 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 9f32d9d..30be36a 100644 --- 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 2528a74..d09de22 100644 --- 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 082cd4f..8801cc9 100644 --- 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 f5a5ef7..18cd58d 100644 --- 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 bca675c..212a04a 100644 --- 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> |