Merge commit 'origin/master' into gallium-0.2

[mesa.git] / src / glut / dos / bitmap.c

diff --git a/src/glut/dos/bitmap.c b/src/glut/dos/bitmap.c
index 11d539a19a552ee9ac89aa7ceab2a60d25e46f7d..6d6b91e1c7bd544c202395f8816946a4efbe73de 100644 (file)
--- a/src/glut/dos/bitmap.c
+++ b/src/glut/dos/bitmap.c
@@ -1,56 +1,115 @@
+/*
+ * DOS/DJGPP Mesa Utility Toolkit
+ * Version:  1.0
+ *
+ * Copyright (C) 2005  Daniel Borca   All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * DANIEL BORCA BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+ * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
 
-/* Copyright (c) Mark J. Kilgard, 1994. */
+ 
+#include "internal.h"
 
-/* This program is freely distributable without licensing fees
-   and is provided without guarantee or warrantee expressed or
-   implied. This program is -not- in the public domain. */
 
-#include "glutbitmap.h"
+void APIENTRY
+glutBitmapCharacter (void *font, int c)
+{
+   const GLUTBitmapFont *bfp = _glut_font(font);
+   const GLUTBitmapChar *bcp;
+
+   if (c >= bfp->num || !(bcp = bfp->table[c]))
+      return;
+
+   glPushClientAttrib(GL_CLIENT_PIXEL_STORE_BIT);
+
+   glPixelStorei(GL_UNPACK_SWAP_BYTES, GL_FALSE);
+   glPixelStorei(GL_UNPACK_LSB_FIRST, GL_FALSE);
+   glPixelStorei(GL_UNPACK_ROW_LENGTH, 0);
+   glPixelStorei(GL_UNPACK_SKIP_ROWS, 0);
+   glPixelStorei(GL_UNPACK_SKIP_PIXELS, 0);
+   glPixelStorei(GL_UNPACK_ALIGNMENT, 1);
+   glBitmap(bcp->width, bcp->height, bcp->xorig, bcp->yorig,
+            bcp->xmove, 0, bcp->bitmap);
+
+   glPopClientAttrib();
+}
+
+
+void APIENTRY
+glutBitmapString (void *font, const unsigned char *string)
+{
+   const GLUTBitmapFont *bfp = _glut_font(font);
+   const GLUTBitmapChar *bcp;
+   unsigned char c;
+
+   glPushClientAttrib(GL_CLIENT_PIXEL_STORE_BIT);
+
+   glPixelStorei(GL_UNPACK_SWAP_BYTES, GL_FALSE);
+   glPixelStorei(GL_UNPACK_LSB_FIRST, GL_FALSE);
+   glPixelStorei(GL_UNPACK_ROW_LENGTH, 0);
+   glPixelStorei(GL_UNPACK_SKIP_ROWS, 0);
+   glPixelStorei(GL_UNPACK_SKIP_PIXELS, 0);
+   glPixelStorei(GL_UNPACK_ALIGNMENT, 1);
+
+   while ((c = *(string++))) {
+      if (c < bfp->num && (bcp = bfp->table[c]))
+         glBitmap(bcp->width, bcp->height, bcp->xorig,
+                  bcp->yorig, bcp->xmove, 0, bcp->bitmap);
+   }
+
+   glPopClientAttrib();
+}
 
-void APIENTRY 
-glutBitmapCharacter(GLUTbitmapFont font, int c)
+
+int APIENTRY
+glutBitmapWidth (void *font, int c)
+{
+   const GLUTBitmapFont *bfp = _glut_font(font);
+   const GLUTBitmapChar *bcp;
+
+   if (c >= bfp->num || !(bcp = bfp->table[c]))
+      return 0;
+
+   return bcp->xmove;
+}
+
+
+int APIENTRY
+glutBitmapLength (void *font, const unsigned char *string)
 {
-  const BitmapCharRec *ch;
-  BitmapFontPtr fontinfo;
-  GLint swapbytes, lsbfirst, rowlength;
-  GLint skiprows, skippixels, alignment;
-
-#if defined(_WIN32)
-  fontinfo = (BitmapFontPtr) __glutFont(font);
-#else
-  fontinfo = (BitmapFontPtr) font;
-#endif
-
-  if (c < fontinfo->first ||
-    c >= fontinfo->first + fontinfo->num_chars)
-    return;
-  ch = fontinfo->ch[c - fontinfo->first];
-  if (ch) {
-    /* Save current modes. */
-    glGetIntegerv(GL_UNPACK_SWAP_BYTES, &swapbytes);
-    glGetIntegerv(GL_UNPACK_LSB_FIRST, &lsbfirst);
-    glGetIntegerv(GL_UNPACK_ROW_LENGTH, &rowlength);
-    glGetIntegerv(GL_UNPACK_SKIP_ROWS, &skiprows);
-    glGetIntegerv(GL_UNPACK_SKIP_PIXELS, &skippixels);
-    glGetIntegerv(GL_UNPACK_ALIGNMENT, &alignment);
-    /* Little endian machines (DEC Alpha for example) could
-       benefit from setting GL_UNPACK_LSB_FIRST to GL_TRUE
-       instead of GL_FALSE, but this would require changing the
-       generated bitmaps too. */
-    glPixelStorei(GL_UNPACK_SWAP_BYTES, GL_FALSE);
-    glPixelStorei(GL_UNPACK_LSB_FIRST, GL_FALSE);
-    glPixelStorei(GL_UNPACK_ROW_LENGTH, 0);
-    glPixelStorei(GL_UNPACK_SKIP_ROWS, 0);
-    glPixelStorei(GL_UNPACK_SKIP_PIXELS, 0);
-    glPixelStorei(GL_UNPACK_ALIGNMENT, 1);
-    glBitmap(ch->width, ch->height, ch->xorig, ch->yorig,
-      ch->advance, 0, ch->bitmap);
-    /* Restore saved modes. */
-    glPixelStorei(GL_UNPACK_SWAP_BYTES, swapbytes);
-    glPixelStorei(GL_UNPACK_LSB_FIRST, lsbfirst);
-    glPixelStorei(GL_UNPACK_ROW_LENGTH, rowlength);
-    glPixelStorei(GL_UNPACK_SKIP_ROWS, skiprows);
-    glPixelStorei(GL_UNPACK_SKIP_PIXELS, skippixels);
-    glPixelStorei(GL_UNPACK_ALIGNMENT, alignment);
-  }
+   const GLUTBitmapFont *bfp = _glut_font(font);
+   const GLUTBitmapChar *bcp;
+   unsigned char c;
+   int length = 0;
+
+   while ((c = *(string++))) {
+      if (c < bfp->num && (bcp = bfp->table[c]))
+         length += bcp->xmove;
+   }
+
+   return length;
+}
+
+
+int APIENTRY
+glutBitmapHeight (void *font)
+{
+   const GLUTBitmapFont *bfp = _glut_font(font);
+
+   return bfp->height;
 }