Skip site navigation (1)Skip section navigation (2) 
Date:      Sun, 24 Mar 2019 20:36:35 +0000 (UTC)
From:      Bruce Evans <bde@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org
Subject:   svn commit: r345484 - head/lib/libvgl
Message-ID:  <201903242036.x2OKaZl7068460@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help 
Author: bde
Date: Sun Mar 24 20:36:35 2019
New Revision: 345484
URL: https://svnweb.freebsd.org/changeset/base/345484

Log:
  Fix the type of the color args for VGLMouseFreeze(), VGLBitmapPutChar(),
  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).

Modified:
  head/lib/libvgl/mouse.c
  head/lib/libvgl/text.c
  head/lib/libvgl/vgl.3
  head/lib/libvgl/vgl.h

Modified: head/lib/libvgl/mouse.c
==============================================================================
--- head/lib/libvgl/mouse.c	Sun Mar 24 19:41:45 2019	(r345483)
+++ head/lib/libvgl/mouse.c	Sun Mar 24 20:36:35 2019	(r345484)
@@ -234,7 +234,7 @@ VGLMouseStatus(int *x, int *y, char *buttons)
 }
 
 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) {
     VGLMouseFrozen = 1;

Modified: head/lib/libvgl/text.c
==============================================================================
--- head/lib/libvgl/text.c	Sun Mar 24 19:41:45 2019	(r345483)
+++ head/lib/libvgl/text.c	Sun Mar 24 20:36:35 2019	(r345484)
@@ -74,7 +74,7 @@ FILE *fd;
 
 void
 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;
 
@@ -126,7 +126,7 @@ VGLBitmapPutChar(VGLBitmap *Object, int x, int y, byte
 
 void
 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;
 

Modified: head/lib/libvgl/vgl.3
==============================================================================
--- head/lib/libvgl/vgl.3	Sun Mar 24 19:41:45 2019	(r345483)
+++ head/lib/libvgl/vgl.3	Sun Mar 24 20:36:35 2019	(r345484)
@@ -117,9 +117,9 @@
 .Ft int
 .Fn VGLBitmapCopy "VGLBitmap *src" "int srcx" "int srcy" "VGLBitmap *dst" "int dstx" "int dsty" "int width" "int hight"
 .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
-.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
 .Fn VGLClear "VGLBitmap *object" "u_long color"
 .Ft void
@@ -127,7 +127,7 @@
 .Ft void
 .Fn VGLSetPaletteIndex "byte color" "byte red" "byte green" "byte blue"
 .Ft void
-.Fn VGLSetBorder "byte color"
+.Fn VGLSetBorder "u_long color"
 .Ft int
 .Fn VGLSetVScreenSize "VGLBitmap *object" "int vxsize" "int vysize"
 .Ft int
@@ -238,7 +238,7 @@ retrieves the color of the pixel located at
 .Va x , y ,
 coordinates of the
 .Va object
-argument, and returns it as a byte value.
+argument, and returns it as a u_long value.
 .Pp
 .Fn VGLSetXY
 sets the color of the pixel located at
@@ -247,7 +247,7 @@ coordinates of the
 .Va object
 argument to
 .Va color
-byte value.
+u_long value.
 .Pp
 .Fn VGLLine
 draw a line from

Modified: head/lib/libvgl/vgl.h
==============================================================================
--- head/lib/libvgl/vgl.h	Sun Mar 24 19:41:45 2019	(r345483)
+++ head/lib/libvgl/vgl.h	Sun Mar 24 20:36:35 2019	(r345484)
@@ -131,7 +131,7 @@ void VGLMouseSetImage(VGLBitmap *AndMask, VGLBitmap *O
 void VGLMouseSetStdImage(void);
 int VGLMouseInit(int mode);
 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);
 /* simple.c */
 void VGLSetXY(VGLBitmap *object, int x, int y, u_long color);
@@ -146,11 +146,11 @@ void VGLRestorePalette(void);
 void VGLSavePalette(void);
 void VGLSetPalette(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);
 /* text.c */
 int VGLTextSetFontFile(char *filename);
-void VGLBitmapPutChar(VGLBitmap *Object, int x, int y, byte ch, byte fgcol, byte bgcol, int fill, int dir);
-void VGLBitmapString(VGLBitmap *Object, int x, int y, char *str, 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, u_long fgcol, u_long bgcol, int fill, int dir);
 
 #endif /* !_VGL_H_ */

Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201903242036.x2OKaZl7068460>