Skip to content

Commit

Permalink
Use hs_GLUT_getProcAddress to load font symbols
Browse files Browse the repository at this point in the history
  • Loading branch information
@RyanGlScott @svenpanne
RyanGlScott authored and svenpanne committed May 12, 2016
1 parent f28dd1b commit 1b47ba6
Show file tree
Hide file tree
Showing 2 changed files with 174 additions and 65 deletions.
2 changes: 0 additions & 2 deletions GLUT.cabal
View file
Expand Up @@ -105,8 +105,6 @@ library
cc-options: "-DUSE_DLSYM"
if os(darwin)
frameworks: GLUT
else
extra-libraries: glut

This comment has been minimized.

Sign in to view

Copy link
@nomeata

nomeata May 6, 2017

What is the reason for this change? By not using extra-libraries, the binaries produced will not visibly link libglut, which confuses distribution packaging scripts:
http://bugs.debian.org/861976

Not that this could not be worked around, but ideally, Debian would just continue using extra-libraries here. Would that work? Would you be willing to add a flag for that?

This comment has been minimized.

Sign in to view

Copy link
@svenpanne

svenpanne May 7, 2017

Member

The reason for dynamically linking at runtime is that requiring one of the various GLUT libraries out there at link time is that the latter turned out to be a major PITA over the years. You would e.g. need the right GLUT library on the stackage builders, hope that no distro changes its mind about the name/version of its GLUT (compiled stuff stopped working because of this for no good reason) etc. After I switched to the current scheme, the amount of issues dropped considerably, and I think this is in general the way to go for binding native libraries.

What one really wants to specify is: For compiling the library or compiling any program using it, you don't need anything special at all. For running a program containing that library, you need one of several dynamic libraries. Can you specify this in .cabal files? AFAIK, you can't. The right way IMHO is that distro packagers add a runtime dependency for their shipped flavor of GLUT to the Haskell GLUT package.

Regarding a patch: If it involves a runtime dependency and/or making the dynamic loading more flexible, this would be OK. If it involves adding some kind of compile-time dependency: Nope...

executable BOGLGP01-OnYourOwn1
if !flag(BuildExamples)
Expand Down
237 changes: 174 additions & 63 deletions cbits/HsGLUT.c
View file
Expand Up @@ -10,68 +10,6 @@
*
* -------------------------------------------------------------------------- */

#if defined(_MSC_VER) || defined(__CYGWIN__) || defined(__MINGW32__) || defined(__WATCOMC__)

#define GLUT_STROKE_ROMAN ((void *)0x0000)
#define GLUT_STROKE_MONO_ROMAN ((void *)0x0001)
#define GLUT_BITMAP_9_BY_15 ((void *)0x0002)
#define GLUT_BITMAP_8_BY_13 ((void *)0x0003)
#define GLUT_BITMAP_TIMES_ROMAN_10 ((void *)0x0004)
#define GLUT_BITMAP_TIMES_ROMAN_24 ((void *)0x0005)
#define GLUT_BITMAP_HELVETICA_10 ((void *)0x0006)
#define GLUT_BITMAP_HELVETICA_12 ((void *)0x0007)
#define GLUT_BITMAP_HELVETICA_18 ((void *)0x0008)

#else

extern void* glutStrokeRoman;
extern void* glutStrokeMonoRoman;
extern void* glutBitmap9By15;
extern void* glutBitmap8By13;
extern void* glutBitmapTimesRoman10;
extern void* glutBitmapTimesRoman24;
extern void* glutBitmapHelvetica10;
extern void* glutBitmapHelvetica12;
extern void* glutBitmapHelvetica18;

#define GLUT_STROKE_ROMAN ((void *)&glutStrokeRoman)
#define GLUT_STROKE_MONO_ROMAN ((void *)&glutStrokeMonoRoman)
#define GLUT_BITMAP_9_BY_15 ((void *)&glutBitmap9By15)
#define GLUT_BITMAP_8_BY_13 ((void *)&glutBitmap8By13)
#define GLUT_BITMAP_TIMES_ROMAN_10 ((void *)&glutBitmapTimesRoman10)
#define GLUT_BITMAP_TIMES_ROMAN_24 ((void *)&glutBitmapTimesRoman24)
#define GLUT_BITMAP_HELVETICA_10 ((void *)&glutBitmapHelvetica10)
#define GLUT_BITMAP_HELVETICA_12 ((void *)&glutBitmapHelvetica12)
#define GLUT_BITMAP_HELVETICA_18 ((void *)&glutBitmapHelvetica18)

#endif

void*
hs_GLUT_marshalBitmapFont(int fontID)
{
switch (fontID) {
case 0 : return GLUT_BITMAP_8_BY_13;
case 1 : return GLUT_BITMAP_9_BY_15;
case 2 : return GLUT_BITMAP_TIMES_ROMAN_10;
case 3 : return GLUT_BITMAP_TIMES_ROMAN_24;
case 4 : return GLUT_BITMAP_HELVETICA_10;
case 5 : return GLUT_BITMAP_HELVETICA_12;
case 6 : return GLUT_BITMAP_HELVETICA_18;
}
return (void*)0;
}

void*
hs_GLUT_marshalStrokeFont(int fontID)
{
switch (fontID) {
case 0 : return GLUT_STROKE_ROMAN;
case 1 : return GLUT_STROKE_MONO_ROMAN;
}
return (void*)0;
}

/* -------------------------------------------------------------------------- */
#if defined(USE_GETPROCADDRESS)

#define WIN32_LEAN_AND_MEAN
Expand Down Expand Up @@ -153,7 +91,7 @@ hs_GLUT_getProcAddress(const char *name)
if (firstTime) {
firstTime = 0;
/* Get a handle for our executable. */
handle = dlopen(NULL, RTLD_LAZY);
handle = dlopen("libglut.so", RTLD_LAZY);
}

return handle ? dlsym(handle, name) : NULL;
Expand All @@ -165,3 +103,176 @@ hs_GLUT_getProcAddress(const char *name)
#error "Don't know how to retrieve GLUT entries"

#endif

/* -------------------------------------------------------------------------- */
#if defined(_MSC_VER) || defined(__CYGWIN__) || defined(__MINGW32__) || defined(__WATCOMC__)

void*
hs_GLUT_glutStrokeRoman(void)
{
return ((void *)0x0000);
}

void*
hs_GLUT_glutStrokeMonoRoman(void)
{
return ((void *)0x0001);
}

void*
hs_GLUT_glutBitmap9By15(void)
{
return ((void *)0x0002);
}

void*
hs_GLUT_glutBitmap8By13(void)
{
return ((void *)0x0003);
}

void*
hs_GLUT_glutBitmapTimesRoman10(void)
{
return ((void *)0x0004);
}

void*
hs_GLUT_glutBitmapTimesRoman24(void)
{
return ((void *)0x0005);
}

void*
hs_GLUT_glutBitmapHelvetica10(void)
{
return ((void *)0x0006);
}

void*
hs_GLUT_glutBitmapHelvetica12(void)
{
return ((void *)0x0007);
}

void*
hs_GLUT_glutBitmapHelvetica18(void)
{
return ((void *)0x0008);
}

#else

void*
hs_GLUT_glutStrokeRoman(void)
{
return hs_GLUT_getProcAddress("glutStrokeRoman");
}

void*
hs_GLUT_glutStrokeMonoRoman(void)
{
return hs_GLUT_getProcAddress("glutStrokeMonoRoman");
}

void*
hs_GLUT_glutBitmap9By15(void)
{
return hs_GLUT_getProcAddress("glutBitmap9By15");
}

void*
hs_GLUT_glutBitmap8By13(void)
{
return hs_GLUT_getProcAddress("glutBitmap8By13");
}

void*
hs_GLUT_glutBitmapTimesRoman10(void)
{
return hs_GLUT_getProcAddress("glutBitmapTimesRoman10");
}

void*
hs_GLUT_glutBitmapTimesRoman24(void)
{
return hs_GLUT_getProcAddress("glutBitmapTimesRoman24");
}

void*
hs_GLUT_glutBitmapHelvetica10(void)
{
return hs_GLUT_getProcAddress("glutBitmapHelvetica10");
}

void*
hs_GLUT_glutBitmapHelvetica12(void)
{
return hs_GLUT_getProcAddress("glutBitmapHelvetica12");
}

void*
hs_GLUT_glutBitmapHelvetica18(void)
{
return hs_GLUT_getProcAddress("glutBitmapHelvetica18");
}

#endif

void*
hs_GLUT_marshalBitmapFont(int fontID)
{
static int firstTime = 1;
static void *h_glutBitmap9By15 = NULL;
static void *h_glutBitmap8By13 = NULL;
static void *h_glutBitmapTimesRoman10 = NULL;
static void *h_glutBitmapTimesRoman24 = NULL;
static void *h_glutBitmapHelvetica10 = NULL;
static void *h_glutBitmapHelvetica12 = NULL;
static void *h_glutBitmapHelvetica18 = NULL;


if (firstTime) {
firstTime = 0;

h_glutBitmap9By15 = hs_GLUT_glutBitmap9By15();
h_glutBitmap8By13 = hs_GLUT_glutBitmap8By13();
h_glutBitmapTimesRoman10 = hs_GLUT_glutBitmapTimesRoman10();
h_glutBitmapTimesRoman24 = hs_GLUT_glutBitmapTimesRoman24();
h_glutBitmapHelvetica10 = hs_GLUT_glutBitmapHelvetica10();
h_glutBitmapHelvetica12 = hs_GLUT_glutBitmapHelvetica12();
h_glutBitmapHelvetica18 = hs_GLUT_glutBitmapHelvetica18();
}

switch (fontID) {
case 0 : return h_glutBitmap8By13;
case 1 : return h_glutBitmap9By15;
case 2 : return h_glutBitmapTimesRoman10;
case 3 : return h_glutBitmapTimesRoman24;
case 4 : return h_glutBitmapHelvetica10;
case 5 : return h_glutBitmapHelvetica12;
case 6 : return h_glutBitmapHelvetica18;
}
return (void*)0;
}

void*
hs_GLUT_marshalStrokeFont(int fontID)
{
static int firstTime = 1;
static void *h_glutStrokeRoman = NULL;
static void *h_glutStrokeMonoRoman = NULL;

if (firstTime) {
firstTime = 0;

h_glutStrokeRoman = hs_GLUT_glutStrokeRoman();
h_glutStrokeMonoRoman = hs_GLUT_glutStrokeMonoRoman();
}

switch (fontID) {
case 0 : return h_glutStrokeRoman;
case 1 : return h_glutStrokeMonoRoman;
}
return (void*)0;
}

0 comments on commit 1b47ba6

Please sign in to comment.