X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?a=blobdiff_plain;f=progs%2Fdemos%2FCallbackMaker%2FCallbackMaker.c;h=e280148298e3eed85fa05e3456cfb307e96248b7;hb=26913c37ab4ecff6a3d43c1e1dfcd58141079e60;hp=b6bb7dcc2a717153e14b03d88f0da226d872dc6a;hpb=f0ba4e97608a444ae0a94e2408ed1a647ee38672;p=freeglut diff --git a/progs/demos/CallbackMaker/CallbackMaker.c b/progs/demos/CallbackMaker/CallbackMaker.c index b6bb7dc..e280148 100644 --- a/progs/demos/CallbackMaker/CallbackMaker.c +++ b/progs/demos/CallbackMaker/CallbackMaker.c @@ -8,6 +8,7 @@ #include #include #include +#include static int sequence_number = 0 ; @@ -80,15 +81,19 @@ Mod2Text(int mods, char *text) if (mods&GLUT_ACTIVE_CTRL) strcat(text,"CTRL"); if (mods&GLUT_ACTIVE_SHIFT) + { if (text[0]) strcat(text,"+SHIFT"); else strcat(text,"SHIFT"); + } if (mods&GLUT_ACTIVE_ALT) + { if (text[0]) strcat(text,"+ALT"); else strcat(text,"ALT"); + } if (!text[0]) strcat(text,"none"); @@ -213,7 +218,7 @@ Display(void) static void Warning(const char *fmt, va_list ap) { - printf("%6d Warning callback:\n"); + printf("%6d Warning callback:\n",++sequence_number); /* print warning message */ vprintf(fmt, ap); @@ -223,10 +228,11 @@ static void Error(const char *fmt, va_list ap) { char dummy_string[STRING_LENGTH]; - printf("%6d Error callback:\n"); + printf("%6d Error callback:\n",++sequence_number); /* print warning message */ vprintf(fmt, ap); + printf("\n"); /* terminate program, after pause for input so user can see */ printf ( "Please enter something to exit: " );