Merge branch 'keyword-prefix' into development

Adds $NOPREFIX metacommand. Removes $COLOR metacommand.

# Conflicts:
#	source/qb64.bas

source/ide/ide_global.bas

@@ -122,7 +122,7 @@ listOfKeywords$ = listOfKeywords$ + "_ERRORLINE@_EXIT@_EXPLICIT@_FILEEXISTS@_FLO
 listOfKeywords$ = listOfKeywords$ + "_GLCOPYTEXSUBIMAGE2D@_GLCULLFACE@_GLDELETELISTS@_GLDELETETEXTURES@_GLDEPTHFUNC@_GLDEPTHMASK@_GLDEPTHRANGE@_GLDISABLE@_GLDISABLECLIENTSTATE@_GLDRAWARRAYS@_GLDRAWBUFFER@_GLDRAWELEMENTS@_GLDRAWPIXELS@_GLEDGEFLAG@_GLEDGEFLAGPOINTER@_GLEDGEFLAGV@_GLENABLE@_GLENABLECLIENTSTATE@_GLEND@_GLENDLIST@_GLEVALCOORD1D@_GLEVALCOORD1DV@_GLEVALCOORD1F@_GLEVALCOORD1FV@_GLEVALCOORD2D@_GLEVALCOORD2DV@_GLEVALCOORD2F@_GLEVALCOORD2FV@_GLEVALMESH1@_GLEVALMESH2@_GLEVALPOINT1@_GLEVALPOINT2@_GLFEEDBACKBUFFER@_GLFINISH@_GLFLUSH@_GLFOGF@_GLFOGFV@_GLFOGI@_GLFOGIV@_GLFRONTFACE@_GLFRUSTUM@_GLGENLISTS@_GLGENTEXTURES@_GLGETBOOLEANV@_GLGETCLIPPLANE@_GLGETDOUBLEV@_GLGETERROR@_GLGETFLOATV@_GLGETINTEGERV@_GLGETLIGHTFV@_GLGETLIGHTIV@_GLGETMAPDV@_GLGETMAPFV@_GLGETMAPIV@_GLGETMATERIALFV@_GLGETMATERIALIV@_GLGETPIXELMAPFV@_GLGETPIXELMAPUIV@_GLGETPIXELMAPUSV@_GLGETPOINTERV@_GLGETPOLYGONSTIPPLE@_GLGETSTRING@_GLGETTEXENVFV@_GLGETTEXENVIV@_GLGETTEXGENDV@_GLGETTEXGENFV@_GLGETTEXGENIV@_GLGETTEXIMAGE@_GLGETTEXLEVELPARAMETERFV@_GLGETTEXLEVELPARAMETERIV@_GLGETTEXPARAMETERFV@_GLGETTEXPARAMETERIV@_GLHINT@_GLINDEXMASK@_GLINDEXPOINTER@_GLINDEXD@_GLINDEXDV@_GLINDEXF@_GLINDEXFV@_GLINDEXI@_GLINDEXIV@_GLINDEXS@_GLINDEXSV@_GLINDEXUB@_GLINDEXUBV@_GLINITNAMES@_GLINTERLEAVEDARRAYS@_GLISENABLED@_GLISLIST@_GLISTEXTURE@_GLLIGHTMODELF@_GLLIGHTMODELFV@_GLLIGHTMODELI@_GLLIGHTMODELIV@_GLLIGHTF@_GLLIGHTFV@_GLLIGHTI@_GLLIGHTIV@_GLLINESTIPPLE@_GLLINEWIDTH@_GLLISTBASE@_GLLOADIDENTITY@_GLLOADMATRIXD@_GLLOADMATRIXF@_GLLOADNAME@_GLLOGICOP@_GLMAP1D@_GLMAP1F@_GLMAP2D@_GLMAP2F@_GLMAPGRID1D@_GLMAPGRID1F@_GLMAPGRID2D@_GLMAPGRID2F@_GLMATERIALF@_GLMATERIALFV@_GLMATERIALI@_GLMATERIALIV@_GLMATRIXMODE@_GLMULTMATRIXD@_GLMULTMATRIXF@_GLNEWLIST@_GLNORMAL3B@_GLNORMAL3BV@_GLNORMAL3D@_GLNORMAL3DV@_GLNORMAL3F@_GLNORMAL3FV@_GLNORMAL3I@_GLNORMAL3IV@_GLNORMAL3S@_GLNORMAL3SV@_GLNORMALPOINTER@_GLORTHO@_GLPASSTHROUGH@_GLPIXELMAPFV@_GLPIXELMAPUIV@_GLPIXELMAPUSV@_GLPIXELSTOREF@_GLPIXELSTOREI@_GLPIXELTRANSFERF@_GLPIXELTRANSFERI@_GLPIXELZOOM@_GLPOINTSIZE@_GLPOLYGONMODE@_GLPOLYGONOFFSET@_GLPOLYGONSTIPPLE@"
 listOfKeywords$ = listOfKeywords$ + "_GLPOPATTRIB@_GLPOPCLIENTATTRIB@_GLPOPMATRIX@_GLPOPNAME@_GLPRIORITIZETEXTURES@_GLPUSHATTRIB@_GLPUSHCLIENTATTRIB@_GLPUSHMATRIX@_GLPUSHNAME@_GLRASTERPOS2D@_GLRASTERPOS2DV@_GLRASTERPOS2F@_GLRASTERPOS2FV@_GLRASTERPOS2I@_GLRASTERPOS2IV@_GLRASTERPOS2S@_GLRASTERPOS2SV@_GLRASTERPOS3D@_GLRASTERPOS3DV@_GLRASTERPOS3F@_GLRASTERPOS3FV@_GLRASTERPOS3I@_GLRASTERPOS3IV@_GLRASTERPOS3S@_GLRASTERPOS3SV@_GLRASTERPOS4D@_GLRASTERPOS4DV@_GLRASTERPOS4F@_GLRASTERPOS4FV@_GLRASTERPOS4I@_GLRASTERPOS4IV@_GLRASTERPOS4S@_GLRASTERPOS4SV@_GLREADBUFFER@_GLREADPIXELS@_GLRECTD@_GLRECTDV@_GLRECTF@_GLRECTFV@_GLRECTI@_GLRECTIV@_GLRECTS@_GLRECTSV@_GLRENDERMODE@_GLROTATED@_GLROTATEF@_GLSCALED@_GLSCALEF@_GLSCISSOR@_GLSELECTBUFFER@_GLSHADEMODEL@_GLSTENCILFUNC@_GLSTENCILMASK@_GLSTENCILOP@_GLTEXCOORD1D@_GLTEXCOORD1DV@_GLTEXCOORD1F@_GLTEXCOORD1FV@_GLTEXCOORD1I@_GLTEXCOORD1IV@_GLTEXCOORD1S@_GLTEXCOORD1SV@_GLTEXCOORD2D@_GLTEXCOORD2DV@_GLTEXCOORD2F@_GLTEXCOORD2FV@_GLTEXCOORD2I@_GLTEXCOORD2IV@_GLTEXCOORD2S@_GLTEXCOORD2SV@_GLTEXCOORD3D@_GLTEXCOORD3DV@_GLTEXCOORD3F@_GLTEXCOORD3FV@_GLTEXCOORD3I@_GLTEXCOORD3IV@_GLTEXCOORD3S@_GLTEXCOORD3SV@_GLTEXCOORD4D@_GLTEXCOORD4DV@_GLTEXCOORD4F@_GLTEXCOORD4FV@_GLTEXCOORD4I@_GLTEXCOORD4IV@_GLTEXCOORD4S@_GLTEXCOORD4SV@_GLTEXCOORDPOINTER@_GLTEXENVF@_GLTEXENVFV@_GLTEXENVI@_GLTEXENVIV@_GLTEXGEND@_GLTEXGENDV@_GLTEXGENF@_GLTEXGENFV@_GLTEXGENI@_GLTEXGENIV@_GLTEXIMAGE1D@_GLTEXIMAGE2D@_GLTEXPARAMETERF@_GLTEXPARAMETERFV@_GLTEXPARAMETERI@_GLTEXPARAMETERIV@_GLTEXSUBIMAGE1D@_GLTEXSUBIMAGE2D@_GLTRANSLATED@_GLTRANSLATEF@_GLVERTEX2D@_GLVERTEX2DV@_GLVERTEX2F@_GLVERTEX2FV@_GLVERTEX2I@_GLVERTEX2IV@_GLVERTEX2S@_GLVERTEX2SV@_GLVERTEX3D@_GLVERTEX3DV@_GLVERTEX3F@_GLVERTEX3FV@_GLVERTEX3I@_GLVERTEX3IV@_GLVERTEX3S@_GLVERTEX3SV@_GLVERTEX4D@_GLVERTEX4DV@_GLVERTEX4F@_GLVERTEX4FV@_GLVERTEX4I@_GLVERTEX4IV@_GLVERTEX4S@_GLVERTEX4SV@_GLVERTEXPOINTER@_GLVIEWPORT@SMOOTH@STRETCH@_ANTICLOCKWISE@_BEHIND@_CLEAR@_FILLBACKGROUND@_GLUPERSPECTIVE@_HARDWARE@_HARDWARE1@_KEEPBACKGROUND@_NONE@_OFF@_ONLY@_ONLYBACKGROUND@_ONTOP@_SEAMLESS@_SMOOTH@_SMOOTHSHRUNK@_SMOOTHSTRETCHED@"
 listOfKeywords$ = listOfKeywords$ + "_SOFTWARE@_SQUAREPIXELS@_STRETCH@_ALLOWFULLSCREEN@_ALL@_ECHO@_INSTRREV@_TRIM$@_ACCEPTFILEDROP@_FINISHDROP@_TOTALDROPPEDFILES@_DROPPEDFILE@_DROPPEDFILE$@_SHR@_SHL@"
-listOfKeywords$ = listOfKeywords$ + "_DEFLATE$@_INFLATE$@_READBIT@_RESETBIT@_SETBIT@_TOGGLEBIT@$ASSERTS@_ASSERT@_CAPSLOCK@_NUMLOCK@_SCROLLLOCK@_TOGGLE@_CONSOLEFONT@_CONSOLECURSOR@_CONSOLEINPUT@_CINP@"
+listOfKeywords$ = listOfKeywords$ + "_DEFLATE$@_INFLATE$@_READBIT@_RESETBIT@_SETBIT@_TOGGLEBIT@$ASSERTS@_ASSERT@_CAPSLOCK@_NUMLOCK@_SCROLLLOCK@_TOGGLE@_CONSOLEFONT@_CONSOLECURSOR@_CONSOLEINPUT@_CINP@$NOPREFIX@"
 
 'IDE MODULE: shared data & definitions
 '---------------------------------------------------

source/ide/ide_methods.bas

@@ -2401,12 +2401,12 @@ FUNCTION ide2 (ignore)
                 a2$ = UCASE$(a2$)
                 'check if F1 is in help links
                 fh = FREEFILE
-                OPEN "internal\help\links.bin" FOR INPUT AS #fh
+                OPEN "internal\help\links.bin" FOR BINARY AS #fh
                 lnks = 0: lnks$ = CHR$(0)
                 DO UNTIL EOF(fh)
                     LINE INPUT #fh, l$
                     c = INSTR(l$, ","): l1$ = LEFT$(l$, c - 1): l2$ = RIGHT$(l$, LEN(l$) - c)
-                    IF a2$ = UCASE$(l1$) THEN
+                    IF a2$ = UCASE$(l1$) OR (qb64prefix_set = 1 AND LEFT$(l1$, 1) = "_" AND a2$ = MID$(l1$, 2)) THEN
                         IF INSTR(lnks$, CHR$(0) + l2$ + CHR$(0)) = 0 THEN
                             lnks = lnks + 1
                             IF l2$ = l1$ THEN
@@ -4952,7 +4952,7 @@ FUNCTION ide2 (ignore)
 
                     'Add all linked pages to download list (if not already in list)
                     fh = FREEFILE
-                    OPEN "internal\help\links.bin" FOR INPUT AS #fh
+                    OPEN "internal\help\links.bin" FOR BINARY AS #fh
                     DO UNTIL EOF(fh)
                         LINE INPUT #fh, l$
                         IF LEN(l$) THEN
@@ -8651,7 +8651,8 @@ SUB ideshowtext
                     NEXT
                     IF comment = 0 AND LEFT$(checkKeyword$, 1) = "?" THEN isKeyword = 1: GOTO setOldChar
                     checkKeyword$ = UCASE$(checkKeyword$)
-                    IF INSTR(listOfKeywords$, "@" + checkKeyword$ + "@") > 0 THEN
+                    IF INSTR(listOfKeywords$, "@" + checkKeyword$ + "@") > 0 OR _
+                       (qb64prefix_set = 1 AND INSTR(listOfKeywords$, "@_" + checkKeyword$ + "@") > 0) THEN
                         'special cases
                         IF checkKeyword$ = "$END" THEN
                             IF UCASE$(MID$(a2$, m, 7)) = "$END IF" THEN checkKeyword$ = "$END IF"
@@ -13763,12 +13764,12 @@ SUB IdeMakeContextualMenu
     IF LEN(a2$) > 0 THEN
         'check if F1 is in help links
         fh = FREEFILE
-        OPEN "internal\help\links.bin" FOR INPUT AS #fh
+        OPEN "internal\help\links.bin" FOR BINARY AS #fh
         lnks = 0: lnks$ = CHR$(0)
         DO UNTIL EOF(fh)
             LINE INPUT #fh, l$
             c = INSTR(l$, ","): l1$ = LEFT$(l$, c - 1): l2$ = RIGHT$(l$, LEN(l$) - c)
-            IF a2$ = UCASE$(l1$) THEN
+            IF a2$ = UCASE$(l1$) OR (qb64prefix_set = 1 AND LEFT$(l1$, 1) = "_" AND a2$ = MID$(l1$, 2)) THEN
                 IF INSTR(lnks$, CHR$(0) + l2$ + CHR$(0)) = 0 THEN
                     lnks = lnks + 1
                     EXIT DO

source/subs_functions/extensions/opengl/opengl_methods.bas

@@ -71,7 +71,7 @@ SUB gl_scan_header
 
     d = 0: a2$ = ""
     h = FREEFILE
-    OPEN "internal\c\parts\core\gl_header_for_parsing\gl.h" FOR INPUT AS #h
+    OPEN "internal\c\parts\core\gl_header_for_parsing\gl.h" FOR BINARY AS #h
     DO UNTIL EOF(h)
         LINE INPUT #h, a$
         IF LEN(a$) THEN
@@ -332,9 +332,9 @@ SUB gl_include_content
 
     'add constants
     FOR d = 1 TO GL_DEFINES_LAST
-        IF ASC(GL_DEFINES(d)) <> 95 THEN
-            GL_DEFINES(d) = "_" + GL_DEFINES(d)
-        END IF
+        'IF ASC(GL_DEFINES(d)) <> 95 THEN
+        '    GL_DEFINES(d) = "_" + GL_DEFINES(d)
+        'END IF
         constlast = constlast + 1
         IF constlast > constmax THEN
             constmax = constmax * 2
@@ -350,8 +350,8 @@ SUB gl_include_content
             REDIM _PRESERVE constdefined(constmax) AS LONG
         END IF
         i = constlast
-        constname(i) = GL_DEFINES(d)
-        constcname(i) = GL_DEFINES(d)
+        constname(i) = qb64prefix$ + GL_DEFINES(d)
+        constcname(i) = qb64prefix$ + GL_DEFINES(d)
         constnamesymbol(i) = "&&"
         consttype(i) = INTEGER64TYPE - ISPOINTER
         constinteger(i) = GL_DEFINES_VALUE(d)
@@ -379,6 +379,7 @@ SUB gl_include_content
         clearid
         id.ccall = 1 '*** important for handling string returns correctly ***
         id.n = RTRIM$(g.cn)
+        IF qb64prefix_set = 1 THEN id.n = MID$(RTRIM$(g.cn), 2)
         s = g.subfunc
         id.subfunc = s
         id.callname = RTRIM$(g.callname)
@@ -394,7 +395,7 @@ SUB gl_include_content
     'SUB gluPerspective (BYVAL fovy#, BYVAL aspect#, BYVAL zNear#, BYVAL zFar#)
     reginternalsubfunc = 1
     clearid
-    id.n = "_gluPerspective"
+    id.n = qb64prefix$ + "gluPerspective"
     id.subfunc = 2 'sub
     id.callname = "gluPerspective"
     id.args = 4