summaryrefslogtreecommitdiff
path: root/src/glut
diff options
context:
space:
mode:
authorJon Taylor <taylorj@ggi-project.org>1999-08-22 08:56:50 +0000
committerJon Taylor <taylorj@ggi-project.org>1999-08-22 08:56:50 +0000
commit72fc9a527d29b731969bc5c94c51467f32f5a2e9 (patch)
treed8d36ac41de8f046ff9c2c007bb110140b402f5e /src/glut
parent14c53fe1d5490b94138ca570890f734641e99dac (diff)
*** empty log message ***
Diffstat (limited to 'src/glut')
-rw-r--r--src/glut/ggi/ggiglut.c39
1 files changed, 23 insertions, 16 deletions
diff --git a/src/glut/ggi/ggiglut.c b/src/glut/ggi/ggiglut.c
index f9ca0a71fda..31658c79ff3 100644
--- a/src/glut/ggi/ggiglut.c
+++ b/src/glut/ggi/ggiglut.c
@@ -51,10 +51,14 @@ static ggi_visual_t __glut_vis;
static GGIMesaContext __glut_ctx;
-static int __glut_width = WIDTH;
-static int __glut_height = HEIGHT;
-static ggi_graphtype __glut_gt_rgb = GRAPHTYPE_RGB;
-static ggi_graphtype __glut_gt_index = GRAPHTYPE_INDEX;
+//static int __glut_width = WIDTH;
+//static int __glut_height = HEIGHT;
+//static ggi_graphtype __glut_gt_rgb = GRAPHTYPE_RGB;
+//static ggi_graphtype __glut_gt_index = GRAPHTYPE_INDEX;
+static int __glut_width = GGI_AUTO;
+static int __glut_height = GGI_AUTO;
+static ggi_graphtype __glut_gt_rgb = GT_AUTO;
+static ggi_graphtype __glut_gt_index = GT_8BIT;
static int __glut_init = GL_FALSE;
static int mousex = WIDTH / 2;
@@ -120,7 +124,6 @@ void glut_ggiDEBUG(char *format, ...)
vfprintf(stderr, format, args);
va_end(args);
}
-
}
void glutInit(int *argc, char **argv)
@@ -159,10 +162,7 @@ void glutInit(int *argc, char **argv)
case 24: gt = GT_24BIT; break;
case 32: gt = GT_32BIT; break;
default:
- glut_ggiDEBUG("\"%s\" bits per pixel?\n",
- argv[i+1]);
-
- exit(1);
+ ggiPanic("\"%s\" bits per pixel?\n", argv[i+1]);
}
__glut_gt_rgb = __glut_gt_index = gt;
REMOVE;
@@ -171,8 +171,8 @@ void glutInit(int *argc, char **argv)
else
if (strcmp(argv[i], "-size") == 0 && (i + 2) < (*argc))
{
- __glut_width=atoi(argv[i+1]);
- __glut_height=atoi(argv[i+2]);
+ __glut_width = atoi(argv[i + 1]);
+ __glut_height = atoi(argv[i + 2]);
REMOVE;
REMOVE;
REMOVE;
@@ -180,13 +180,13 @@ void glutInit(int *argc, char **argv)
}
}
- if (ggiInit()<0)
+ if (ggiInit() < 0)
{
ggiPanic("ggiInit() failed!\n");
}
- __glut_init=GL_TRUE;
+ __glut_init = GL_TRUE;
- #undef REMOVE
+#undef REMOVE
}
void glutInitWindowPosition(int x, int y)
@@ -266,11 +266,17 @@ int glutCreateWindow(const char *title)
ggiPanic("GGIMesaSetVisual failed!\n");
}
+ __glut_width = mode.visible.x;
+ __glut_height = mode.visible.y;
+
+ mousex = mode.visible.x / 2;
+ mousey = mode.visible.y / 2;
+
GGIMesaMakeCurrent(__glut_ctx);
if (__glut_reshape)
__glut_reshape(__glut_width, __glut_height);
-
+
return GL_TRUE;
}
@@ -491,8 +497,9 @@ void glutMainLoop(void)
ggi_event ev;
ggi_event_mask evmask = (emKeyPress | emKeyRepeat | emPtrMove | emPtrButton);
+
ggiSetEventMask(__glut_vis, evmask);
-
+
glutPostRedisplay();
if (__glut_visibility)