d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix the type of the color args for VGLMouseFreeze(), VGLBitmapPutChar(),

Browse Source 
VGLBitmapString() and VGLSetBorder() so as to not truncate to 8 bits.

Complete the corresponding fix for VGLGetXY() and VGLPutXY() (parts
of the man page were out of date).
This commit is contained in:
bde 2019-03-24 20:36:35 +00:00
parent 59d01ed5c0
commit c8b259dea5
4 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/libvgl/mouse.c
View File

@ -234,7 +234,7 @@ VGLMouseStatus(int *x, int *y, char *buttons)
} }
int int
VGLMouseFreeze(int x, int y, int width, int hight, byte color) VGLMouseFreeze(int x, int y, int width, int hight, u_long color)
{ {
if (!VGLMouseFrozen) { if (!VGLMouseFrozen) {
VGLMouseFrozen = 1; VGLMouseFrozen = 1;

4
lib/libvgl/text.c
View File

@ -74,7 +74,7 @@ FILE *fd;
void void
VGLBitmapPutChar(VGLBitmap *Object, int x, int y, byte ch, VGLBitmapPutChar(VGLBitmap *Object, int x, int y, byte ch,
byte fgcol, byte bgcol, int fill, int dir) u_long fgcol, u_long bgcol, int fill, int dir)
{ {
int b, Bpc, Bpl, lin, bit, topbit; int b, Bpc, Bpl, lin, bit, topbit;
@ -126,7 +126,7 @@ VGLBitmapPutChar(VGLBitmap *Object, int x, int y, byte ch,
void void
VGLBitmapString(VGLBitmap *Object, int x, int y, char *str, VGLBitmapString(VGLBitmap *Object, int x, int y, char *str,
byte fgcol, byte bgcol, int fill, int dir) u_long fgcol, u_long bgcol, int fill, int dir)
{ {
int pos; int pos;

10
lib/libvgl/vgl.3
View File

@ -117,9 +117,9 @@
.Ft int .Ft int
.Fn VGLBitmapCopy "VGLBitmap *src" "int srcx" "int srcy" "VGLBitmap *dst" "int dstx" "int dsty" "int width" "int hight" .Fn VGLBitmapCopy "VGLBitmap *src" "int srcx" "int srcy" "VGLBitmap *dst" "int dstx" "int dsty" "int width" "int hight"
.Ft void .Ft void
.Fn VGLBitmapPutChar "VGLBitmap *Object" "int x" "int y" "byte ch" "byte fgcol" "byte bgcol" "int fill" "int dir" .Fn VGLBitmapPutChar "VGLBitmap *Object" "int x" "int y" "byte ch" "u_long fgcol" "u_long bgcol" "int fill" "int dir"
.Ft void .Ft void
.Fn VGLBitmapString "VGLBitmap *Object" "int x" "int y" "char *str" "byte fgcol" "byte bgcol" "int fill" "int dir" .Fn VGLBitmapString "VGLBitmap *Object" "int x" "int y" "char *str" "u_long fgcol" "u_long bgcol" "int fill" "int dir"
.Ft void .Ft void
.Fn VGLClear "VGLBitmap *object" "u_long color" .Fn VGLClear "VGLBitmap *object" "u_long color"
.Ft void .Ft void
@ -127,7 +127,7 @@
.Ft void .Ft void
.Fn VGLSetPaletteIndex "byte color" "byte red" "byte green" "byte blue" .Fn VGLSetPaletteIndex "byte color" "byte red" "byte green" "byte blue"
.Ft void .Ft void
.Fn VGLSetBorder "byte color" .Fn VGLSetBorder "u_long color"
.Ft int .Ft int
.Fn VGLSetVScreenSize "VGLBitmap *object" "int vxsize" "int vysize" .Fn VGLSetVScreenSize "VGLBitmap *object" "int vxsize" "int vysize"
.Ft int .Ft int
@ -238,7 +238,7 @@ retrieves the color of the pixel located at
.Va x , y , .Va x , y ,
coordinates of the coordinates of the
.Va object .Va object
argument, and returns it as a byte value. argument, and returns it as a u_long value.
.Pp .Pp
.Fn VGLSetXY .Fn VGLSetXY
sets the color of the pixel located at sets the color of the pixel located at
@ -247,7 +247,7 @@ coordinates of the
.Va object .Va object
argument to argument to
.Va color .Va color
byte value. u_long value.
.Pp .Pp
.Fn VGLLine .Fn VGLLine
draw a line from draw a line from

8
lib/libvgl/vgl.h
View File

@ -131,7 +131,7 @@ void VGLMouseSetImage(VGLBitmap *AndMask, VGLBitmap *OrMask);
void VGLMouseSetStdImage(void); void VGLMouseSetStdImage(void);
int VGLMouseInit(int mode); int VGLMouseInit(int mode);
int VGLMouseStatus(int *x, int *y, char *buttons); int VGLMouseStatus(int *x, int *y, char *buttons);
int VGLMouseFreeze(int x, int y, int width, int hight, byte color); int VGLMouseFreeze(int x, int y, int width, int hight, u_long color);
void VGLMouseUnFreeze(void); void VGLMouseUnFreeze(void);
/* simple.c */ /* simple.c */
void VGLSetXY(VGLBitmap *object, int x, int y, u_long color); void VGLSetXY(VGLBitmap *object, int x, int y, u_long color);
@ -146,11 +146,11 @@ void VGLRestorePalette(void);
void VGLSavePalette(void); void VGLSavePalette(void);
void VGLSetPalette(byte *red, byte *green, byte *blue); void VGLSetPalette(byte *red, byte *green, byte *blue);
void VGLSetPaletteIndex(byte color, byte red, byte green, byte blue); void VGLSetPaletteIndex(byte color, byte red, byte green, byte blue);
void VGLSetBorder(byte color); void VGLSetBorder(u_long color);
void VGLBlankDisplay(int blank); void VGLBlankDisplay(int blank);
/* text.c */ /* text.c */
int VGLTextSetFontFile(char *filename); int VGLTextSetFontFile(char *filename);
void VGLBitmapPutChar(VGLBitmap *Object, int x, int y, byte ch, byte fgcol, byte bgcol, int fill, int dir); void VGLBitmapPutChar(VGLBitmap *Object, int x, int y, byte ch, u_long fgcol, u_long bgcol, int fill, int dir);
void VGLBitmapString(VGLBitmap *Object, int x, int y, char *str, byte fgcol, byte bgcol, int fill, int dir); void VGLBitmapString(VGLBitmap *Object, int x, int y, char *str, u_long fgcol, u_long bgcol, int fill, int dir);
#endif /* !_VGL_H_ */ #endif /* !_VGL_H_ */