Revision: 75412
http://sourceforge.net/p/brlcad/code/75412
Author: starseeker
Date: 2020-04-15 19:20:09 +0000 (Wed, 15 Apr 2020)
Log Message:
-----------
Same thing with fb - eliminate the typedef
Modified Paths:
--------------
brlcad/trunk/include/dm/calltable.h
brlcad/trunk/include/dm.h
brlcad/trunk/include/fb.h
brlcad/trunk/src/burst/extern.h
brlcad/trunk/src/burst/glob.c
brlcad/trunk/src/fb/bw-fb.c
brlcad/trunk/src/fb/fb-bw.c
brlcad/trunk/src/fb/fb-fb.c
brlcad/trunk/src/fb/fb-pix.c
brlcad/trunk/src/fb/fb-png.c
brlcad/trunk/src/fb/fbcbars.c
brlcad/trunk/src/fb/fbclear.c
brlcad/trunk/src/fb/fbcmap.c
brlcad/trunk/src/fb/fbcolor.c
brlcad/trunk/src/fb/fbfade.c
brlcad/trunk/src/fb/fbframe.c
brlcad/trunk/src/fb/fbfree.c
brlcad/trunk/src/fb/fbgamma.c
brlcad/trunk/src/fb/fbgrid.c
brlcad/trunk/src/fb/fbhelp.c
brlcad/trunk/src/fb/fblabel.c
brlcad/trunk/src/fb/fbline.c
brlcad/trunk/src/fb/fbpoint.c
brlcad/trunk/src/fb/fbstretch.c
brlcad/trunk/src/fb/fbzoom.c
brlcad/trunk/src/fb/gif-fb.c
brlcad/trunk/src/fb/gif2fb.c
brlcad/trunk/src/fb/ioutil.c
brlcad/trunk/src/fb/pix-fb.c
brlcad/trunk/src/fb/plot3-fb.c
brlcad/trunk/src/fb/png-fb.c
brlcad/trunk/src/fb/spm-fb.c
brlcad/trunk/src/fb/tests/fbthreadtest.c
brlcad/trunk/src/fbserv/fbserv.c
brlcad/trunk/src/fbserv/server.c
brlcad/trunk/src/libdm/dm-generic.c
brlcad/trunk/src/libfb/asize.c
brlcad/trunk/src/libfb/fb_generic.c
brlcad/trunk/src/libfb/fb_log.c
brlcad/trunk/src/libfb/fb_obj.c
brlcad/trunk/src/libfb/fb_paged_io.c
brlcad/trunk/src/libfb/fb_private.h
brlcad/trunk/src/libfb/fb_rect.c
brlcad/trunk/src/libfb/fb_util.c
brlcad/trunk/src/libfb/fbserv_obj.c
brlcad/trunk/src/libfb/if_TEMPLATE.c
brlcad/trunk/src/libfb/if_X24.c
brlcad/trunk/src/libfb/if_debug.c
brlcad/trunk/src/libfb/if_disk.c
brlcad/trunk/src/libfb/if_mem.c
brlcad/trunk/src/libfb/if_null.c
brlcad/trunk/src/libfb/if_ogl.c
brlcad/trunk/src/libfb/if_osgl.cpp
brlcad/trunk/src/libfb/if_qt.cpp
brlcad/trunk/src/libfb/if_remote.c
brlcad/trunk/src/libfb/if_stack.c
brlcad/trunk/src/libfb/if_tk.c
brlcad/trunk/src/libfb/if_wgl.c
brlcad/trunk/src/libfb/osg_fb_manipulator.h
brlcad/trunk/src/libfb/tcl.c
brlcad/trunk/src/mged/attach.c
brlcad/trunk/src/mged/edsol.c
brlcad/trunk/src/mged/facedef.c
brlcad/trunk/src/mged/mged_dm.h
brlcad/trunk/src/mged/set.c
brlcad/trunk/src/remrt/remrt.c
brlcad/trunk/src/remrt/rtsrv.c
brlcad/trunk/src/rt/do.c
brlcad/trunk/src/rt/ext.h
brlcad/trunk/src/rt/heatgraph.c
brlcad/trunk/src/rt/libfb-dummy.c
brlcad/trunk/src/rt/main.c
brlcad/trunk/src/rt/view.c
brlcad/trunk/src/rt/viewedge.c
brlcad/trunk/src/rt/viewxray.c
brlcad/trunk/src/sig/ddisp.c
brlcad/trunk/src/util/bwhist.c
brlcad/trunk/src/util/pixhist.c
brlcad/trunk/src/util/pixhist3d.c
Modified: brlcad/trunk/include/dm/calltable.h
===================================================================
--- brlcad/trunk/include/dm/calltable.h 2020-04-15 19:13:25 UTC (rev 75411)
+++ brlcad/trunk/include/dm/calltable.h 2020-04-15 19:20:09 UTC (rev 75412)
@@ -130,7 +130,7 @@
int dm_clearBufferAfter; /**< @brief 1 means clear back buffer after
drawing and swap */
int dm_fontsize; /**< @brief !0 override's the auto font size */
struct bu_structparse *vparse; /**< @brief Table listing settable
variables */
- fb *fbp; /**< @brief Framebuffer associated with this
display instance */
+ struct fb *fbp; /**< @brief Framebuffer associated with
this display instance */
void *dm_interp; /**< @brief interpreter */
};
Modified: brlcad/trunk/include/dm.h
===================================================================
--- brlcad/trunk/include/dm.h 2020-04-15 19:13:25 UTC (rev 75411)
+++ brlcad/trunk/include/dm.h 2020-04-15 19:20:09 UTC (rev 75412)
@@ -400,7 +400,7 @@
DM_EXPORT extern int dm_set_depth_mask(struct dm *dmp, int d_on);
DM_EXPORT extern int dm_debug(struct dm *dmp, int lvl);
DM_EXPORT extern int dm_logfile(struct dm *dmp, const char *filename);
-DM_EXPORT extern fb *dm_get_fb(struct dm *dmp);
+DM_EXPORT extern struct fb *dm_get_fb(struct dm *dmp);
DM_EXPORT extern int dm_get_fb_visible(struct dm *dmp);
DM_EXPORT extern int dm_set_fb_visible(struct dm *dmp, int is_fb_visible);
Modified: brlcad/trunk/include/fb.h
===================================================================
--- brlcad/trunk/include/fb.h 2020-04-15 19:13:25 UTC (rev 75411)
+++ brlcad/trunk/include/fb.h 2020-04-15 19:20:09 UTC (rev 75412)
@@ -91,8 +91,8 @@
#define COLORMAP_NULL (ColorMap *) 0
/* Use a typedef to hide the details of the framebuffer structure */
-typedef struct fb_internal fb;
-#define FB_NULL (fb *) 0
+struct fb;
+#define FB_NULL (struct fb *) 0
/**
* assert the integrity of a framebuffer struct.
@@ -103,71 +103,71 @@
/* Library entry points */
-FB_EXPORT fb *fb_get();
-FB_EXPORT void fb_put(fb *ifp);
-FB_EXPORT extern char *fb_gettype(fb *ifp);
-FB_EXPORT extern int fb_get_max_width(fb *ifp);
-FB_EXPORT extern int fb_get_max_height(fb *ifp);
-FB_EXPORT extern int fb_getwidth(fb *ifp);
-FB_EXPORT extern int fb_getheight(fb *ifp);
-FB_EXPORT extern int fb_poll(fb *ifp);
+FB_EXPORT struct fb *fb_get();
+FB_EXPORT void fb_put(struct fb *ifp);
+FB_EXPORT extern char *fb_gettype(struct fb *ifp);
+FB_EXPORT extern int fb_get_max_width(struct fb *ifp);
+FB_EXPORT extern int fb_get_max_height(struct fb *ifp);
+FB_EXPORT extern int fb_getwidth(struct fb *ifp);
+FB_EXPORT extern int fb_getheight(struct fb *ifp);
+FB_EXPORT extern int fb_poll(struct fb *ifp);
/* Returns in microseconds the maximum recommended amount of time to linger
* before polling for updates for a specific framebuffer instance (can be
* implementation dependent.) Zero means the fb_poll process does nothing
* (for example, the NULL fb). */
-FB_EXPORT extern long fb_poll_rate(fb *ifp);
-FB_EXPORT extern int fb_help(fb *ifp);
-FB_EXPORT extern int fb_free(fb *ifp);
-FB_EXPORT extern int fb_clear(fb *ifp, unsigned char *pp);
-FB_EXPORT extern ssize_t fb_read(fb *ifp, int x, int y, unsigned char *pp,
size_t count);
-FB_EXPORT extern ssize_t fb_write(fb *ifp, int x, int y, const unsigned char
*pp, size_t count);
-FB_EXPORT extern int fb_rmap(fb *ifp, ColorMap *cmap);
-FB_EXPORT extern int fb_wmap(fb *ifp, const ColorMap *cmap);
-FB_EXPORT extern int fb_view(fb *ifp, int xcenter, int ycenter, int xzoom, int
yzoom);
-FB_EXPORT extern int fb_getview(fb *ifp, int *xcenter, int *ycenter, int
*xzoom, int *yzoom);
-FB_EXPORT extern int fb_setcursor(fb *ifp, const unsigned char *bits, int xb,
int yb, int xo, int yo);
-FB_EXPORT extern int fb_cursor(fb *ifp, int mode, int x, int y);
-FB_EXPORT extern int fb_getcursor(fb *ifp, int *mode, int *x, int *y);
-FB_EXPORT extern int fb_readrect(fb *ifp, int xmin, int ymin, int width, int
height, unsigned char *pp);
-FB_EXPORT extern int fb_writerect(fb *ifp, int xmin, int ymin, int width, int
height, const unsigned char *pp);
-FB_EXPORT extern int fb_bwreadrect(fb *ifp, int xmin, int ymin, int width, int
height, unsigned char *pp);
-FB_EXPORT extern int fb_bwwriterect(fb *ifp, int xmin, int ymin, int width,
int height, const unsigned char *pp);
+FB_EXPORT extern long fb_poll_rate(struct fb *ifp);
+FB_EXPORT extern int fb_help(struct fb *ifp);
+FB_EXPORT extern int fb_free(struct fb *ifp);
+FB_EXPORT extern int fb_clear(struct fb *ifp, unsigned char *pp);
+FB_EXPORT extern ssize_t fb_read(struct fb *ifp, int x, int y, unsigned char
*pp, size_t count);
+FB_EXPORT extern ssize_t fb_write(struct fb *ifp, int x, int y, const unsigned
char *pp, size_t count);
+FB_EXPORT extern int fb_rmap(struct fb *ifp, ColorMap *cmap);
+FB_EXPORT extern int fb_wmap(struct fb *ifp, const ColorMap *cmap);
+FB_EXPORT extern int fb_view(struct fb *ifp, int xcenter, int ycenter, int
xzoom, int yzoom);
+FB_EXPORT extern int fb_getview(struct fb *ifp, int *xcenter, int *ycenter,
int *xzoom, int *yzoom);
+FB_EXPORT extern int fb_setcursor(struct fb *ifp, const unsigned char *bits,
int xb, int yb, int xo, int yo);
+FB_EXPORT extern int fb_cursor(struct fb *ifp, int mode, int x, int y);
+FB_EXPORT extern int fb_getcursor(struct fb *ifp, int *mode, int *x, int *y);
+FB_EXPORT extern int fb_readrect(struct fb *ifp, int xmin, int ymin, int
width, int height, unsigned char *pp);
+FB_EXPORT extern int fb_writerect(struct fb *ifp, int xmin, int ymin, int
width, int height, const unsigned char *pp);
+FB_EXPORT extern int fb_bwreadrect(struct fb *ifp, int xmin, int ymin, int
width, int height, unsigned char *pp);
+FB_EXPORT extern int fb_bwwriterect(struct fb *ifp, int xmin, int ymin, int
width, int height, const unsigned char *pp);
-FB_EXPORT extern fb *fb_open(const char *file, int _width, int _height);
-FB_EXPORT extern int fb_close(fb *ifp);
-FB_EXPORT extern int fb_close_existing(fb *ifp);
+FB_EXPORT extern struct fb *fb_open(const char *file, int _width, int _height);
+FB_EXPORT extern int fb_close(struct fb *ifp);
+FB_EXPORT extern int fb_close_existing(struct fb *ifp);
FB_EXPORT extern int fb_genhelp(void);
-FB_EXPORT extern int fb_ioinit(fb *ifp);
-FB_EXPORT extern int fb_seek(fb *ifp, int x, int y);
-FB_EXPORT extern int fb_tell(fb *ifp, int *xp, int *yp);
-FB_EXPORT extern int fb_rpixel(fb *ifp, unsigned char *pp);
-FB_EXPORT extern int fb_wpixel(fb *ifp, unsigned char *pp);
-FB_EXPORT extern int fb_flush(fb *ifp);
-FB_EXPORT extern int fb_configure_window(fb *, int, int);
-FB_EXPORT extern int fb_refresh(fb *ifp, int x, int y, int w, int h);
+FB_EXPORT extern int fb_ioinit(struct fb *ifp);
+FB_EXPORT extern int fb_seek(struct fb *ifp, int x, int y);
+FB_EXPORT extern int fb_tell(struct fb *ifp, int *xp, int *yp);
+FB_EXPORT extern int fb_rpixel(struct fb *ifp, unsigned char *pp);
+FB_EXPORT extern int fb_wpixel(struct fb *ifp, unsigned char *pp);
+FB_EXPORT extern int fb_flush(struct fb *ifp);
+FB_EXPORT extern int fb_configure_window(struct fb *, int, int);
+FB_EXPORT extern int fb_refresh(struct fb *ifp, int x, int y, int w, int h);
#if !defined(_WIN32) || defined(__CYGWIN__)
FB_EXPORT extern void fb_log(const char *fmt, ...) _BU_ATTR_PRINTF12;
#endif
-FB_EXPORT extern int fb_null(fb *ifp);
-FB_EXPORT extern int fb_null_setcursor(fb *ifp, const unsigned char *bits, int
xbits, int ybits, int xorig, int yorig);
+FB_EXPORT extern int fb_null(struct fb *ifp);
+FB_EXPORT extern int fb_null_setcursor(struct fb *ifp, const unsigned char
*bits, int xbits, int ybits, int xorig, int yorig);
/* utility functions */
FB_EXPORT extern int fb_common_file_size(size_t *widthp, size_t *heightp,
const char *filename, int pixel_size);
FB_EXPORT extern int fb_common_image_size(size_t *widthp, size_t *heightp,
size_t npixels);
FB_EXPORT extern int fb_common_name_size(size_t *widthp, size_t *heightp,
const char *name);
-FB_EXPORT extern int fb_write_fp(fb *ifp, FILE *fp, int req_width, int
req_height, int crunch, int inverse, struct bu_vls *result);
-FB_EXPORT extern int fb_read_fd(fb *ifp, int fd, int file_width, int
file_height, int file_xoff, int file_yoff, int scr_width, int scr_height, int
scr_xoff, int scr_yoff, int fileinput, char *file_name, int one_line_only, int
multiple_lines, int autosize, int inverse, int clear, int zoom, struct bu_vls
*result);
-FB_EXPORT extern int fb_read_png(fb *ifp, FILE *fp, int file_xoff, int
file_yoff, int scr_xoff, int scr_yoff, int clear, int zoom, int inverse, int
one_line_only, int multiple_lines, int verbose, int header_only, double
def_screen_gamma, struct bu_vls *result);
+FB_EXPORT extern int fb_write_fp(struct fb *ifp, FILE *fp, int req_width, int
req_height, int crunch, int inverse, struct bu_vls *result);
+FB_EXPORT extern int fb_read_fd(struct fb *ifp, int fd, int file_width, int
file_height, int file_xoff, int file_yoff, int scr_width, int scr_height, int
scr_xoff, int scr_yoff, int fileinput, char *file_name, int one_line_only, int
multiple_lines, int autosize, int inverse, int clear, int zoom, struct bu_vls
*result);
+FB_EXPORT extern int fb_read_png(struct fb *ifp, FILE *fp, int file_xoff, int
file_yoff, int scr_xoff, int scr_yoff, int clear, int zoom, int inverse, int
one_line_only, int multiple_lines, int verbose, int header_only, double
def_screen_gamma, struct bu_vls *result);
-FB_EXPORT extern void fb_set_interface(fb *ifp, const char *interface_type);
-FB_EXPORT extern void fb_set_name(fb *ifp, const char *name);
-FB_EXPORT extern char *fb_get_name(fb *ifp);
-FB_EXPORT extern void fb_set_magic(fb *ifp, uint32_t magic);
-FB_EXPORT extern long fb_get_pagebuffer_pixel_size(fb *ifp);
+FB_EXPORT extern void fb_set_interface(struct fb *ifp, const char
*interface_type);
+FB_EXPORT extern void fb_set_name(struct fb *ifp, const char *name);
+FB_EXPORT extern char *fb_get_name(struct fb *ifp);
+FB_EXPORT extern void fb_set_magic(struct fb *ifp, uint32_t magic);
+FB_EXPORT extern long fb_get_pagebuffer_pixel_size(struct fb *ifp);
-FB_EXPORT extern int fb_is_set_fd(fb *ifp, fd_set *infds);
-FB_EXPORT extern int fb_set_fd(fb *ifp, fd_set *select_list);
-FB_EXPORT extern int fb_clear_fd(fb *ifp, fd_set *select_list);
+FB_EXPORT extern int fb_is_set_fd(struct fb *ifp, fd_set *infds);
+FB_EXPORT extern int fb_set_fd(struct fb *ifp, fd_set *select_list);
+FB_EXPORT extern int fb_clear_fd(struct fb *ifp, fd_set *select_list);
/* color mapping */
FB_EXPORT extern int fb_is_linear_cmap(const ColorMap *cmap);
@@ -177,14 +177,14 @@
struct fb_platform_specific {uint32_t magic; void *data;};
FB_EXPORT extern struct fb_platform_specific
*fb_get_platform_specific(uint32_t magic);
FB_EXPORT extern void fb_put_platform_specific(struct fb_platform_specific
*fb_p);
-FB_EXPORT extern fb *fb_open_existing(const char *file, int _width, int
_height, struct fb_platform_specific *fb_p);
+FB_EXPORT extern struct fb *fb_open_existing(const char *file, int _width, int
_height, struct fb_platform_specific *fb_p);
/* backward compatibility hacks */
-FB_EXPORT extern int fb_reset(fb *ifp);
-FB_EXPORT extern int fb_viewport(fb *ifp, int left, int top, int right, int
bottom);
-FB_EXPORT extern int fb_window(fb *ifp, int xcenter, int ycenter);
-FB_EXPORT extern int fb_zoom(fb *ifp, int xzoom, int yzoom);
-FB_EXPORT extern int fb_scursor(fb *ifp, int mode, int x, int y);
+FB_EXPORT extern int fb_reset(struct fb *ifp);
+FB_EXPORT extern int fb_viewport(struct fb *ifp, int left, int top, int right,
int bottom);
+FB_EXPORT extern int fb_window(struct fb *ifp, int xcenter, int ycenter);
+FB_EXPORT extern int fb_zoom(struct fb *ifp, int xzoom, int yzoom);
+FB_EXPORT extern int fb_scursor(struct fb *ifp, int mode, int x, int y);
/*
* Copy one RGB pixel to another.
@@ -286,7 +286,7 @@
struct fbserv_obj {
- fb *fbs_fbp; /**< @brief framebuffer pointer */
+ struct fb *fbs_fbp; /**< @brief framebuffer pointer
*/
Tcl_Interp *fbs_interp; /**< @brief tcl interpreter */
struct fbserv_listener fbs_listener; /**< @brief data for
listening */
struct fbserv_client fbs_clients[MAX_CLIENTS]; /**< @brief connected
clients */
Modified: brlcad/trunk/src/burst/extern.h
===================================================================
--- brlcad/trunk/src/burst/extern.h 2020-04-15 19:13:25 UTC (rev 75411)
+++ brlcad/trunk/src/burst/extern.h 2020-04-15 19:20:09 UTC (rev 75412)
@@ -113,7 +113,7 @@
extern int roundToInt(fastf_t f);
extern Colors colorids;
-extern fb *fbiop;
+extern struct fb *fbiop;
extern FILE *burstfp;
extern FILE *gridfp;
extern FILE *histfp;
Modified: brlcad/trunk/src/burst/glob.c
===================================================================
--- brlcad/trunk/src/burst/glob.c 2020-04-15 19:13:25 UTC (rev 75411)
+++ brlcad/trunk/src/burst/glob.c 2020-04-15 19:20:09 UTC (rev 75412)
@@ -35,7 +35,7 @@
Colors colorids; /* ident range to color mappings for plots */
-fb *fbiop = NULL; /* frame buffer specific access from libfb */
+struct fb *fbiop = NULL; /* frame buffer specific access from libfb */
FILE *burstfp = NULL; /* input stream for burst point locations */
FILE *gridfp = NULL; /* grid file output stream (2-d shots) */
FILE *histfp = NULL; /* histogram output stream (statistics) */
Modified: brlcad/trunk/src/fb/bw-fb.c
===================================================================
--- brlcad/trunk/src/fb/bw-fb.c 2020-04-15 19:13:25 UTC (rev 75411)
+++ brlcad/trunk/src/fb/bw-fb.c 2020-04-15 19:20:09 UTC (rev 75412)
@@ -72,7 +72,7 @@
static char *framebuffer = NULL;
static char *file_name;
static int infd;
-static fb *fbp;
+static struct fb *fbp;
static char usage[] = "\
Usage: bw-fb [-a -i -c -z -R -G -B] [-F framebuffer]\n\
Modified: brlcad/trunk/src/fb/fb-bw.c
===================================================================
--- brlcad/trunk/src/fb/fb-bw.c 2020-04-15 19:13:25 UTC (rev 75411)
+++ brlcad/trunk/src/fb/fb-bw.c 2020-04-15 19:20:09 UTC (rev 75412)
@@ -111,7 +111,7 @@
int
main(int argc, char **argv)
{
- fb *fbp;
+ struct fb *fbp;
int x, y;
int xin, yin; /* number of screen output lines */
Modified: brlcad/trunk/src/fb/fb-fb.c
===================================================================
--- brlcad/trunk/src/fb/fb-fb.c 2020-04-15 19:13:25 UTC (rev 75411)
+++ brlcad/trunk/src/fb/fb-fb.c 2020-04-15 19:20:09 UTC (rev 75412)
@@ -87,7 +87,7 @@
main(int argc, char **argv)
{
int y;
- fb *in_fbp, *out_fbp;
+ struct fb *in_fbp, *out_fbp;
int n, m;
int height;
Modified: brlcad/trunk/src/fb/fb-pix.c
===================================================================
--- brlcad/trunk/src/fb/fb-pix.c 2020-04-15 19:13:25 UTC (rev 75411)
+++ brlcad/trunk/src/fb/fb-pix.c 2020-04-15 19:20:09 UTC (rev 75412)
@@ -109,7 +109,7 @@
int
main(int argc, char **argv)
{
- fb *fbp;
+ struct fb *fbp;
int y;
unsigned char *scanline; /* 1 scanline pixel buffer */
Modified: brlcad/trunk/src/fb/fb-png.c
===================================================================
--- brlcad/trunk/src/fb/fb-png.c 2020-04-15 19:13:25 UTC (rev 75411)
+++ brlcad/trunk/src/fb/fb-png.c 2020-04-15 19:20:09 UTC (rev 75412)
@@ -126,7 +126,7 @@
static int scanpix; /* # of pixels of scanline */
static ColorMap cmap; /* libfb color map */
- fb *fbp;
+ struct fb *fbp;
int y;
int got;
png_structp png_p;
Modified: brlcad/trunk/src/fb/fbcbars.c
===================================================================
--- brlcad/trunk/src/fb/fbcbars.c 2020-04-15 19:13:25 UTC (rev 75411)
+++ brlcad/trunk/src/fb/fbcbars.c 2020-04-15 19:20:09 UTC (rev 75412)
@@ -217,7 +217,7 @@
main(int argc, char **argv)
{
int x, y;
- fb *fbp;
+ struct fb *fbp;
if (argc == 1 && isatty(fileno(stdin)) && isatty(fileno(stdout)))
printusage();
Modified: brlcad/trunk/src/fb/fbclear.c
===================================================================
--- brlcad/trunk/src/fb/fbclear.c 2020-04-15 19:13:25 UTC (rev 75411)
+++ brlcad/trunk/src/fb/fbclear.c 2020-04-15 19:20:09 UTC (rev 75412)
@@ -41,7 +41,7 @@
static char *framebuffer = NULL;
-static fb *fbp;
+static struct fb *fbp;
static int scr_width = 0; /* use default size */
static int scr_height = 0;
static int clear_and_reset = 0;
Modified: brlcad/trunk/src/fb/fbcmap.c
===================================================================
--- brlcad/trunk/src/fb/fbcmap.c 2020-04-15 19:13:25 UTC (rev 75411)
+++ brlcad/trunk/src/fb/fbcmap.c 2020-04-15 19:20:09 UTC (rev 75412)
@@ -652,7 +652,7 @@
int fudge;
ColorMap cmap;
ColorMap *cp = &cmap;
- fb *fbp;
+ struct fb *fbp;
bu_log("DEPRECATION WARNING: This command is scheduled for removal.
Please contact the developers if you use this command.\n\n");
bu_snooze(BU_SEC2USEC(1));
Modified: brlcad/trunk/src/fb/fbcolor.c
===================================================================
--- brlcad/trunk/src/fb/fbcolor.c 2020-04-15 19:13:25 UTC (rev 75411)
+++ brlcad/trunk/src/fb/fbcolor.c 2020-04-15 19:20:09 UTC (rev 75412)
@@ -48,7 +48,7 @@
ColorMap cm;
static char *framebuffer = NULL;
-static fb *fbp;
+static struct fb *fbp;
static int scr_height;
static int scr_width;
Modified: brlcad/trunk/src/fb/fbfade.c
===================================================================
--- brlcad/trunk/src/fb/fbfade.c 2020-04-15 19:13:25 UTC (rev 75411)
+++ brlcad/trunk/src/fb/fbfade.c 2020-04-15 19:20:09 UTC (rev 75412)
@@ -75,7 +75,7 @@
static bool_t hires = 0; /* set for 1024x1024; clear for 512x512
*/
static char *in_fb_file = NULL; /* input image name */
static char *out_fb_file = NULL; /* output frame buffer name */
-static fb *fbp = FB_NULL; /* libfb input/output handle */
+static struct fb *fbp = FB_NULL; /* libfb input/output handle */
static int src_width = 0; /* input image width */
static int src_height = 0; /* input image height */
static int dst_width = 0; /* output frame buffer size */
@@ -85,7 +85,7 @@
/* in ioutil.c */
extern void Message(const char *format, ...);
-extern void Fatal(fb *fbiop, const char *format, ...);
+extern void Fatal(struct fb *fbiop, const char *format, ...);
static void
Modified: brlcad/trunk/src/fb/fbframe.c
===================================================================
--- brlcad/trunk/src/fb/fbframe.c 2020-04-15 19:13:25 UTC (rev 75411)
+++ brlcad/trunk/src/fb/fbframe.c 2020-04-15 19:20:09 UTC (rev 75412)
@@ -44,7 +44,7 @@
{
int c;
int x;
- fb *fbp;
+ struct fb *fbp;
int xsize, ysize;
int len;
char *framebuffer = (char *)NULL;
Modified: brlcad/trunk/src/fb/fbfree.c
===================================================================
--- brlcad/trunk/src/fb/fbfree.c 2020-04-15 19:13:25 UTC (rev 75411)
+++ brlcad/trunk/src/fb/fbfree.c 2020-04-15 19:20:09 UTC (rev 75412)
@@ -42,7 +42,7 @@
main(int argc, char **argv)
{
int c;
- fb *fbp;
+ struct fb *fbp;
while ((c = bu_getopt(argc, argv, "F:h?")) != -1) {
switch (c) {
Modified: brlcad/trunk/src/fb/fbgamma.c
===================================================================
--- brlcad/trunk/src/fb/fbgamma.c 2020-04-15 19:13:25 UTC (rev 75411)
+++ brlcad/trunk/src/fb/fbgamma.c 2020-04-15 19:20:09 UTC (rev 75412)
@@ -50,7 +50,7 @@
static char usage[] = "\
Usage: fbgamma [-H -o -i] [-F framebuffer] val [gval bval]\n";
-void mk_ramp(fb *fb_i, int r, int g, int b, int n)
+void mk_ramp(struct fb *fb_i, int r, int g, int b, int n)
{
/* grey ramp */
@@ -81,7 +81,7 @@
}
-void disp_image(fb *fb_i)
+void disp_image(struct fb *fb_i)
{
scr_width = fb_getwidth(fb_i);
@@ -116,7 +116,7 @@
double gamr = 0, gamg = 0, gamb = 0; /* gamma's */
double f;
ColorMap cm;
- fb *fbp;
+ struct fb *fbp;
onegamma = 0;
Modified: brlcad/trunk/src/fb/fbgrid.c
===================================================================
--- brlcad/trunk/src/fb/fbgrid.c 2020-04-15 19:13:25 UTC (rev 75411)
+++ brlcad/trunk/src/fb/fbgrid.c 2020-04-15 19:20:09 UTC (rev 75412)
@@ -33,7 +33,7 @@
static unsigned char *white_line, *grey_line, *dark_line;
-static fb *fbp;
+static struct fb *fbp;
static char *framebuffer = NULL;
#define OLD 0
@@ -45,7 +45,7 @@
static int flavor = DECIMAL;
static int clear = 0;
-void grid(fb *fbiop, unsigned char *line, int spacing), oldflavor(void);
+void grid(struct fb *fbiop, unsigned char *line, int spacing), oldflavor(void);
static char usage[] = "\
Usage: fbgrid [-c] [-b | -d | -o] [-F framebuffer]\n\
@@ -157,7 +157,7 @@
void
-grid(fb *fbiop, unsigned char *line, int spacing)
+grid(struct fb *fbiop, unsigned char *line, int spacing)
{
int x, y;
@@ -172,7 +172,7 @@
void
oldflavor(void)
{
- fb *fbiop;
+ struct fb *fbiop;
int x, y;
int middle;
int mask;
Modified: brlcad/trunk/src/fb/fbhelp.c
===================================================================
--- brlcad/trunk/src/fb/fbhelp.c 2020-04-15 19:13:25 UTC (rev 75411)
+++ brlcad/trunk/src/fb/fbhelp.c 2020-04-15 19:20:09 UTC (rev 75412)
@@ -42,7 +42,7 @@
main(int argc, char **argv)
{
int c;
- fb *fbp;
+ struct fb *fbp;
while ((c = bu_getopt(argc, argv, "F:h?")) != -1) {
switch (c) {
Modified: brlcad/trunk/src/fb/fblabel.c
===================================================================
--- brlcad/trunk/src/fb/fblabel.c 2020-04-15 19:13:25 UTC (rev 75411)
+++ brlcad/trunk/src/fb/fblabel.c 2020-04-15 19:20:09 UTC (rev 75412)
@@ -44,7 +44,7 @@
static char *framebuffer = NULL;
static char *font1 = NULL;
-fb *fbp;
+struct fb *fbp;
static char usage[] = "\
Usage: fblabel [-c -a] [-F framebuffer] [-C r/g/b]\n\
Modified: brlcad/trunk/src/fb/fbline.c
===================================================================
--- brlcad/trunk/src/fb/fbline.c 2020-04-15 19:13:25 UTC (rev 75411)
+++ brlcad/trunk/src/fb/fbline.c 2020-04-15 19:20:09 UTC (rev 75412)
@@ -59,7 +59,7 @@
}; /* rasterization descriptor */
static char *framebuffer = NULL;
-fb *fbp; /* Current framebuffer */
+struct fb *fbp; /* Current framebuffer */
static int screen_width = 512; /* default input width */
static int screen_height = 512; /* default input height */
Modified: brlcad/trunk/src/fb/fbpoint.c
===================================================================
--- brlcad/trunk/src/fb/fbpoint.c 2020-04-15 19:13:25 UTC (rev 75411)
+++ brlcad/trunk/src/fb/fbpoint.c 2020-04-15 19:20:09 UTC (rev 75412)
@@ -38,7 +38,7 @@
#include "libtermio.h"
-fb *fbp;
+struct fb *fbp;
int JumpSpeed; /* # pixels skipped with fast commands. */
Modified: brlcad/trunk/src/fb/fbstretch.c
===================================================================
--- brlcad/trunk/src/fb/fbstretch.c 2020-04-15 19:13:25 UTC (rev 75411)
+++ brlcad/trunk/src/fb/fbstretch.c 2020-04-15 19:20:09 UTC (rev 75412)
@@ -100,9 +100,9 @@
static bool_t x_compress; /* set if compressing horizontally */
static bool_t y_compress; /* set if compressing vertically */
static char *src_file = NULL; /* source frame buffer name */
-static fb *src_fbp = FB_NULL; /* source frame buffer handle */
+static struct fb *src_fbp = FB_NULL; /* source frame buffer handle */
static char *dst_file = NULL; /* destination frame buffer name */
-static fb *dst_fbp = FB_NULL; /* destination frame buffer handle */
+static struct fb *dst_fbp = FB_NULL; /* destination frame buffer handle */
static int src_width = 512;
static int src_height = 512; /* source image size */
static int dst_width = 0;
@@ -112,7 +112,7 @@
/* in ioutil.c */
extern void Message(const char *format, ...);
-extern void Fatal(fb *fbiop, const char *format, ...);
+extern void Fatal(struct fb *fbiop, const char *format, ...);
static void
@@ -188,11 +188,11 @@
sample = 1;
break;
- case 'f': /* -f in_fb */
+ case 'f': /* -f in_struct fb */
src_file = bu_optarg;
break;
- case 'F': /* -F out_fb */
+ case 'F': /* -F out_struct fb */
dst_file = bu_optarg;
break;
Modified: brlcad/trunk/src/fb/fbzoom.c
===================================================================
--- brlcad/trunk/src/fb/fbzoom.c 2020-04-15 19:13:25 UTC (rev 75411)
+++ brlcad/trunk/src/fb/fbzoom.c 2020-04-15 19:20:09 UTC (rev 75412)
@@ -61,7 +61,7 @@
static int scr_height = 512;
static int toggle_pan = 0; /* Reverse sense of pan commands? */
static char *framebuffer = NULL;
-static fb *fbp;
+static struct fb *fbp;
static char usage[] = "\
Usage: fbzoom [-T] [-F framebuffer]\n\
Modified: brlcad/trunk/src/fb/gif-fb.c
===================================================================
--- brlcad/trunk/src/fb/gif-fb.c 2020-04-15 19:13:25 UTC (rev 75411)
+++ brlcad/trunk/src/fb/gif-fb.c 2020-04-15 19:20:09 UTC (rev 75412)
@@ -94,7 +94,7 @@
static char *gif_file = NULL; /* GIF file name */
static FILE *gfp = NULL; /* GIF input stream handle */
static char *fb_file = NULL; /* frame buffer name */
-static fb *fbp = FB_NULL; /* frame buffer handle */
+static struct fb *fbp = FB_NULL; /* frame buffer handle */
static int ht; /* virtual frame buffer height */
static int width, height; /* overall "screen" size */
static int write_width; /* used width of screen, <= width */
@@ -117,7 +117,7 @@
/* in ioutil.c */
void Message(const char *format, ...);
-void Fatal(fb *fbiop, const char *format, ...);
+void Fatal(struct fb *fbiop, const char *format, ...);
static void
Modified: brlcad/trunk/src/fb/gif2fb.c
===================================================================
--- brlcad/trunk/src/fb/gif2fb.c 2020-04-15 19:13:25 UTC (rev 75411)
+++ brlcad/trunk/src/fb/gif2fb.c 2020-04-15 19:20:09 UTC (rev 75412)
@@ -126,7 +126,7 @@
static int lace[4] = {8, 8, 4, 2};
static int offs[4] = {0, 4, 2, 1};
- fb *fbp;
+ struct fb *fbp;
FILE *fp;
while ((code = bu_getopt(argc, argv, "HvFh?")) != -1) {
Modified: brlcad/trunk/src/fb/ioutil.c
===================================================================
--- brlcad/trunk/src/fb/ioutil.c 2020-04-15 19:13:25 UTC (rev 75411)
+++ brlcad/trunk/src/fb/ioutil.c 2020-04-15 19:20:09 UTC (rev 75412)
@@ -62,7 +62,7 @@
void
-Fatal(fb *fbp, const char *format, ...)
+Fatal(struct fb *fbp, const char *format, ...)
{
va_list ap;
Modified: brlcad/trunk/src/fb/pix-fb.c
===================================================================
--- brlcad/trunk/src/fb/pix-fb.c 2020-04-15 19:13:25 UTC (rev 75411)
+++ brlcad/trunk/src/fb/pix-fb.c 2020-04-15 19:20:09 UTC (rev 75412)
@@ -211,7 +211,7 @@
main(int argc, char **argv)
{
int y;
- fb *fbp;
+ struct fb *fbp;
int xout, yout, n, m, xstart, xskip;
if (!get_args(argc, argv)) {
Modified: brlcad/trunk/src/fb/plot3-fb.c
===================================================================
--- brlcad/trunk/src/fb/plot3-fb.c 2020-04-15 19:13:25 UTC (rev 75411)
+++ brlcad/trunk/src/fb/plot3-fb.c 2020-04-15 19:20:09 UTC (rev 75412)
@@ -317,7 +317,7 @@
static FILE *pfin; /* input file FIO block ptr */
-fb *fbp; /* Current framebuffer */
+struct fb *fbp; /* Current framebuffer */
/*
Modified: brlcad/trunk/src/fb/png-fb.c
===================================================================
--- brlcad/trunk/src/fb/png-fb.c 2020-04-15 19:13:25 UTC (rev 75411)
+++ brlcad/trunk/src/fb/png-fb.c 2020-04-15 19:20:09 UTC (rev 75412)
@@ -161,7 +161,7 @@
main(int argc, char **argv)
{
int y;
- fb *fbp;
+ struct fb *fbp;
int i;
int xout, yout, m, xstart;
png_structp png_p;
Modified: brlcad/trunk/src/fb/spm-fb.c
===================================================================
--- brlcad/trunk/src/fb/spm-fb.c 2020-04-15 19:13:25 UTC (rev 75411)
+++ brlcad/trunk/src/fb/spm-fb.c 2020-04-15 19:20:09 UTC (rev 75412)
@@ -33,7 +33,7 @@
#include "bn/spm.h"
-static fb *fbp;
+static struct fb *fbp;
static char *framebuffer = NULL;
static int scr_width = 0;
Modified: brlcad/trunk/src/fb/tests/fbthreadtest.c
===================================================================
--- brlcad/trunk/src/fb/tests/fbthreadtest.c 2020-04-15 19:13:25 UTC (rev
75411)
+++ brlcad/trunk/src/fb/tests/fbthreadtest.c 2020-04-15 19:20:09 UTC (rev
75412)
@@ -191,8 +191,8 @@
bu_exit(1, NULL);
}
- fb *ifp;
- ifp = (fb *) calloc(sizeof(fb), 1);
+ struct fb *ifp;
+ ifp = (struct fb *) calloc(sizeof(struct fb), 1);
ifp->if_name = "/dev/tk";
ifp->if_magic = FB_MAGIC;
char *fbname = "/dev/tk";
Modified: brlcad/trunk/src/fbserv/fbserv.c
===================================================================
--- brlcad/trunk/src/fbserv/fbserv.c 2020-04-15 19:13:25 UTC (rev 75411)
+++ brlcad/trunk/src/fbserv/fbserv.c 2020-04-15 19:20:09 UTC (rev 75412)
@@ -109,7 +109,7 @@
/* from server.c */
extern const struct pkg_switch fb_server_pkg_switch[];
-extern fb *fb_server_fbp;
+extern struct fb *fb_server_fbp;
extern fd_set *fb_server_select_list;
extern int *fb_server_max_fd;
extern int fb_server_got_fb_free; /* !0 => we have received an fb_free */
Modified: brlcad/trunk/src/fbserv/server.c
===================================================================
--- brlcad/trunk/src/fbserv/server.c 2020-04-15 19:13:25 UTC (rev 75411)
+++ brlcad/trunk/src/fbserv/server.c 2020-04-15 19:20:09 UTC (rev 75412)
@@ -48,7 +48,7 @@
* These are the only symbols intended for export to LIBFB users.
*/
-fb *fb_server_fbp = FB_NULL;
+struct fb *fb_server_fbp = FB_NULL;
fd_set *fb_server_select_list;
int *fb_server_max_fd = (int *)NULL;
int fb_server_got_fb_free = 0; /* !0 => we have received an fb_free */
Modified: brlcad/trunk/src/libdm/dm-generic.c
===================================================================
--- brlcad/trunk/src/libdm/dm-generic.c 2020-04-15 19:13:25 UTC (rev 75411)
+++ brlcad/trunk/src/libdm/dm-generic.c 2020-04-15 19:20:09 UTC (rev 75412)
@@ -348,7 +348,7 @@
*dmp = dm_null;
}
-fb *
+struct fb *
dm_get_fb(struct dm *dmp)
{
if (UNLIKELY(!dmp)) return NULL;
Modified: brlcad/trunk/src/libfb/asize.c
===================================================================
--- brlcad/trunk/src/libfb/asize.c 2020-04-15 19:13:25 UTC (rev 75411)
+++ brlcad/trunk/src/libfb/asize.c 2020-04-15 19:20:09 UTC (rev 75412)
@@ -17,7 +17,7 @@
* License along with this file; see the file named COPYING for more
* information.
*/
-/** @addtogroup libfb */
+/** @addtogroup libstruct fb */
/** @{ */
/** @file ./libfb/asize.c
*
Modified: brlcad/trunk/src/libfb/fb_generic.c
===================================================================
--- brlcad/trunk/src/libfb/fb_generic.c 2020-04-15 19:13:25 UTC (rev 75411)
+++ brlcad/trunk/src/libfb/fb_generic.c 2020-04-15 19:20:09 UTC (rev 75412)
@@ -19,7 +19,7 @@
*/
/** \defgroup fb Framebuffer
- * \ingroup libfb */
+ * \ingroup libstruct fb */
/** @{ */
/** @file fb_generic.c
*
@@ -56,7 +56,7 @@
* First element of list is default device when no name given
*/
static
-fb *_if_list[] = {
+struct fb *_if_list[] = {
#ifdef IF_OSGL
&osgl_interface,
#endif
@@ -80,24 +80,24 @@
&stk_interface,
&memory_interface,
&fb_null_interface,
- (fb *) 0
+ (struct fb *) 0
};
-fb *fb_get()
+struct fb *fb_get()
{
- struct fb_internal *new_fb = FB_NULL;
- BU_GET(new_fb, struct fb_internal);
+ struct fb *new_fb = FB_NULL;
+ BU_GET(new_fb, struct fb);
new_fb->if_name = NULL;
return new_fb;
}
-void fb_put(fb *ifp)
+void fb_put(struct fb *ifp)
{
if (ifp != FB_NULL)
- BU_PUT(ifp, struct fb_internal);
+ BU_PUT(ifp, struct fb);
}
-void fb_set_interface(fb *ifp, const char *interface_type)
+void fb_set_interface(struct fb *ifp, const char *interface_type)
{
int i = 0;
if (!ifp) return;
@@ -145,10 +145,10 @@
return;
}
-fb *
+struct fb *
fb_open_existing(const char *file, int width, int height, struct
fb_platform_specific *fb_p)
{
- fb *ifp = (fb *)calloc(sizeof(fb), 1);
+ struct fb *ifp = (struct fb *)calloc(sizeof(struct fb), 1);
if (!ifp) return NULL;
fb_set_interface(ifp, file);
fb_set_magic(ifp, FB_MAGIC);
@@ -157,13 +157,13 @@
}
int
-fb_refresh(fb *ifp, int x, int y, int w, int h)
+fb_refresh(struct fb *ifp, int x, int y, int w, int h)
{
return ifp->if_refresh(ifp, x, y, w, h);
}
int
-fb_configure_window(fb *ifp, int width, int height)
+fb_configure_window(struct fb *ifp, int width, int height)
{
/* unknown/unset framebuffer */
if (!ifp || !ifp->if_configure_window || width < 0 || height < 0) {
@@ -172,7 +172,7 @@
return ifp->if_configure_window(ifp, width, height);
}
-void fb_set_name(fb *ifp, const char *name)
+void fb_set_name(struct fb *ifp, const char *name)
{
if (!ifp) return;
ifp->if_name = (char *)bu_malloc((unsigned)strlen(name)+1, "if_name");
@@ -179,19 +179,19 @@
bu_strlcpy(ifp->if_name, name, strlen(name)+1);
}
-char *fb_get_name(fb *ifp)
+char *fb_get_name(struct fb *ifp)
{
if (!ifp) return NULL;
return ifp->if_name;
}
-long fb_get_pagebuffer_pixel_size(fb *ifp)
+long fb_get_pagebuffer_pixel_size(struct fb *ifp)
{
if (!ifp) return 0;
return ifp->if_ppixels;
}
-int fb_is_set_fd(fb *ifp, fd_set *infds)
+int fb_is_set_fd(struct fb *ifp, fd_set *infds)
{
if (!ifp) return 0;
if (!infds) return 0;
@@ -200,7 +200,7 @@
return FD_ISSET(ifp->if_selfd, infds);
}
-int fb_set_fd(fb *ifp, fd_set *select_list)
+int fb_set_fd(struct fb *ifp, fd_set *select_list)
{
if (!ifp) return 0;
if (!select_list) return 0;
@@ -210,7 +210,7 @@
return ifp->if_selfd;
}
-int fb_clear_fd(fb *ifp, fd_set *list)
+int fb_clear_fd(struct fb *ifp, fd_set *list)
{
if (!ifp) return 0;
if (!list) return 0;
@@ -220,7 +220,7 @@
return ifp->if_selfd;
}
-void fb_set_magic(fb *ifp, uint32_t magic)
+void fb_set_magic(struct fb *ifp, uint32_t magic)
{
if (!ifp) return;
ifp->if_magic = magic;
@@ -227,101 +227,101 @@
}
-char *fb_gettype(fb *ifp)
+char *fb_gettype(struct fb *ifp)
{
return ifp->if_type;
}
-int fb_getwidth(fb *ifp)
+int fb_getwidth(struct fb *ifp)
{
return ifp->if_width;
}
-int fb_getheight(fb *ifp)
+int fb_getheight(struct fb *ifp)
{
return ifp->if_height;
}
-int fb_get_max_width(fb *ifp)
+int fb_get_max_width(struct fb *ifp)
{
return ifp->if_max_width;
}
-int fb_get_max_height(fb *ifp)
+int fb_get_max_height(struct fb *ifp)
{
return ifp->if_max_height;
}
-int fb_poll(fb *ifp)
+int fb_poll(struct fb *ifp)
{
return (*ifp->if_poll)(ifp);
}
-long fb_poll_rate(fb *ifp)
+long fb_poll_rate(struct fb *ifp)
{
return ifp->if_poll_refresh_rate;
}
-int fb_help(fb *ifp)
+int fb_help(struct fb *ifp)
{
return (*ifp->if_help)(ifp);
}
-int fb_free(fb *ifp)
+int fb_free(struct fb *ifp)
{
return (*ifp->if_free)(ifp);
}
-int fb_clear(fb *ifp, unsigned char *pp)
+int fb_clear(struct fb *ifp, unsigned char *pp)
{
return (*ifp->if_clear)(ifp, pp);
}
-ssize_t fb_read(fb *ifp, int x, int y, unsigned char *pp, size_t count)
+ssize_t fb_read(struct fb *ifp, int x, int y, unsigned char *pp, size_t count)
{
return (*ifp->if_read)(ifp, x, y, pp, count);
}
-ssize_t fb_write(fb *ifp, int x, int y, const unsigned char *pp, size_t count)
+ssize_t fb_write(struct fb *ifp, int x, int y, const unsigned char *pp, size_t
count)
{
return (*ifp->if_write)(ifp, x, y, pp, count);
}
-int fb_rmap(fb *ifp, ColorMap *cmap)
+int fb_rmap(struct fb *ifp, ColorMap *cmap)
{
return (*ifp->if_rmap)(ifp, cmap);
}
-int fb_wmap(fb *ifp, const ColorMap *cmap)
+int fb_wmap(struct fb *ifp, const ColorMap *cmap)
{
return (*ifp->if_wmap)(ifp, cmap);
}
-int fb_view(fb *ifp, int xcenter, int ycenter, int xzoom, int yzoom)
+int fb_view(struct fb *ifp, int xcenter, int ycenter, int xzoom, int yzoom)
{
return (*ifp->if_view)(ifp, xcenter, ycenter, xzoom, yzoom);
}
-int fb_getview(fb *ifp, int *xcenter, int *ycenter, int *xzoom, int *yzoom)
+int fb_getview(struct fb *ifp, int *xcenter, int *ycenter, int *xzoom, int
*yzoom)
{
return (*ifp->if_getview)(ifp, xcenter, ycenter, xzoom, yzoom);
}
-int fb_setcursor(fb *ifp, const unsigned char *bits, int xb, int yb, int xo,
int yo)
+int fb_setcursor(struct fb *ifp, const unsigned char *bits, int xb, int yb,
int xo, int yo)
{
return (*ifp->if_setcursor)(ifp, bits, xb, yb, xo, yo);
}
-int fb_cursor(fb *ifp, int mode, int x, int y)
+int fb_cursor(struct fb *ifp, int mode, int x, int y)
{
return (*ifp->if_cursor)(ifp, mode, x, y);
}
-int fb_getcursor(fb *ifp, int *mode, int *x, int *y)
+int fb_getcursor(struct fb *ifp, int *mode, int *x, int *y)
{
return (*ifp->if_getcursor)(ifp, mode, x, y);
}
-int fb_readrect(fb *ifp, int xmin, int ymin, int width, int height, unsigned
char *pp)
+int fb_readrect(struct fb *ifp, int xmin, int ymin, int width, int height,
unsigned char *pp)
{
return (*ifp->if_readrect)(ifp, xmin, ymin, width, height, pp);
}
-int fb_writerect(fb *ifp, int xmin, int ymin, int width, int height, const
unsigned char *pp)
+int fb_writerect(struct fb *ifp, int xmin, int ymin, int width, int height,
const unsigned char *pp)
{
return (*ifp->if_writerect)(ifp, xmin, ymin, width, height, pp);
}
-int fb_bwreadrect(fb *ifp, int xmin, int ymin, int width, int height, unsigned
char *pp)
+int fb_bwreadrect(struct fb *ifp, int xmin, int ymin, int width, int height,
unsigned char *pp)
{
return (*ifp->if_bwreadrect)(ifp, xmin, ymin, width, height, pp);
}
-int fb_bwwriterect(fb *ifp, int xmin, int ymin, int width, int height, const
unsigned char *pp)
+int fb_bwwriterect(struct fb *ifp, int xmin, int ymin, int width, int height,
const unsigned char *pp)
{
return (*ifp->if_bwwriterect)(ifp, xmin, ymin, width, height, pp);
}
@@ -360,7 +360,7 @@
/**
* Filler for fb function slots not used by a particular device
*/
-int fb_null(fb *ifp)
+int fb_null(struct fb *ifp)
{
if (ifp) {
FB_CK_FB(ifp);
@@ -373,7 +373,7 @@
/**
* Used by if_*.c routines that don't have programmable cursor patterns.
*/
-int fb_null_setcursor(fb *ifp, const unsigned char *UNUSED(bits), int
UNUSED(xbits), int UNUSED(ybits), int UNUSED(xorig), int UNUSED(yorig))
+int fb_null_setcursor(struct fb *ifp, const unsigned char *UNUSED(bits), int
UNUSED(xbits), int UNUSED(ybits), int UNUSED(xorig), int UNUSED(yorig))
{
if (ifp) {
FB_CK_FB(ifp);
@@ -384,18 +384,18 @@
-fb *
+struct fb *
fb_open(const char *file, int width, int height)
{
- register fb *ifp;
+ register struct fb *ifp;
int i;
if (width < 0 || height < 0)
return FB_NULL;
- ifp = (fb *) calloc(sizeof(fb), 1);
+ ifp = (struct fb *) calloc(sizeof(struct fb), 1);
if (ifp == FB_NULL) {
- Malloc_Bomb(sizeof(fb));
+ Malloc_Bomb(sizeof(struct fb));
return FB_NULL;
}
if (file == NULL || *file == '\0') {
@@ -418,7 +418,7 @@
* device array. If we don't find it assume it's a file.
*/
i = 0;
- while (_if_list[i] != (fb *)NULL) {
+ while (_if_list[i] != (struct fb *)NULL) {
if (bu_strncmp(file, _if_list[i]->if_name,
strlen(_if_list[i]->if_name)) == 0) {
/* found it, copy its struct in */
@@ -484,7 +484,7 @@
int
-fb_close(fb *ifp)
+fb_close(struct fb *ifp)
{
int i;
@@ -504,7 +504,7 @@
int
-fb_close_existing(fb *ifp)
+fb_close_existing(struct fb *ifp)
{
int status = 0;
if (!ifp)
@@ -537,7 +537,7 @@
int i;
i = 0;
- while (_if_list[i] != (fb *)NULL) {
+ while (_if_list[i] != (struct fb *)NULL) {
fb_log("%-12s %s\n",
_if_list[i]->if_name,
_if_list[i]->if_type);
@@ -607,7 +607,7 @@
}
int
-fb_write_fp(fb *ifp, FILE *fp, int req_width, int req_height, int crunch, int
inverse, struct bu_vls *result)
+fb_write_fp(struct fb *ifp, FILE *fp, int req_width, int req_height, int
crunch, int inverse, struct bu_vls *result)
{
unsigned char *scanline; /* 1 scanline pixel buffer */
int scanbytes; /* # of bytes of scanline */
@@ -692,7 +692,7 @@
int
-fb_read_fd(fb *ifp, int fd, int file_width, int file_height, int file_xoff,
int file_yoff, int scr_width, int scr_height, int scr_xoff, int scr_yoff, int
fileinput, char *file_name, int one_line_only, int multiple_lines, int
autosize, int inverse, int clear, int zoom, struct bu_vls *UNUSED(result))
+fb_read_fd(struct fb *ifp, int fd, int file_width, int file_height, int
file_xoff, int file_yoff, int scr_width, int scr_height, int scr_xoff, int
scr_yoff, int fileinput, char *file_name, int one_line_only, int
multiple_lines, int autosize, int inverse, int clear, int zoom, struct bu_vls
*UNUSED(result))
{
int y;
int xout, yout, n, m, xstart, xskip;
@@ -865,7 +865,7 @@
static png_color_16 def_backgrd={ 0, 0, 0, 0, 0 };
int
-fb_read_png(fb *ifp, FILE *fp_in, int file_xoff, int file_yoff, int scr_xoff,
int scr_yoff, int clear, int zoom, int inverse, int one_line_only, int
multiple_lines, int verbose, int header_only, double def_screen_gamma, struct
bu_vls *result)
+fb_read_png(struct fb *ifp, FILE *fp_in, int file_xoff, int file_yoff, int
scr_xoff, int scr_yoff, int clear, int zoom, int inverse, int one_line_only,
int multiple_lines, int verbose, int header_only, double def_screen_gamma,
struct bu_vls *result)
{
int y;
int i;
Modified: brlcad/trunk/src/libfb/fb_log.c
===================================================================
--- brlcad/trunk/src/libfb/fb_log.c 2020-04-15 19:13:25 UTC (rev 75411)
+++ brlcad/trunk/src/libfb/fb_log.c 2020-04-15 19:20:09 UTC (rev 75412)
@@ -17,7 +17,7 @@
* License along with this file; see the file named COPYING for more
* information.
*/
-/** @addtogroup libfb */
+/** @addtogroup libstruct fb */
/** @{ */
/** @file fb_log.c
*
Modified: brlcad/trunk/src/libfb/fb_obj.c
===================================================================
--- brlcad/trunk/src/libfb/fb_obj.c 2020-04-15 19:13:25 UTC (rev 75411)
+++ brlcad/trunk/src/libfb/fb_obj.c 2020-04-15 19:20:09 UTC (rev 75412)
@@ -17,7 +17,7 @@
* License along with this file; see the file named COPYING for more
* information.
*/
-/** @addtogroup libfb */
+/** @addtogroup libstruct fb */
/** @{ */
/** @file fb_obj.c
*
@@ -46,7 +46,7 @@
#include "fb.h"
/* defined in libfb/tcl.c */
-extern int fb_refresh(fb *ifp, int x, int y, int w, int h);
+extern int fb_refresh(struct fb *ifp, int x, int y, int w, int h);
#define FBO_CONSTRAIN(_v, _a, _b) \
@@ -69,7 +69,7 @@
HIDDEN int
-fbo_coords_ok(fb *fbp, int x, int y)
+fbo_coords_ok(struct fb *fbp, int x, int y)
{
int width;
int height;
@@ -786,7 +786,7 @@
fbo_open_tcl(void *UNUSED(clientData), Tcl_Interp *interp, int argc, const
char **argv)
{
struct fb_obj *fbop;
- fb *ifp;
+ struct fb *ifp;
int width = 512;
int height = 512;
register int c;
Modified: brlcad/trunk/src/libfb/fb_paged_io.c
===================================================================
--- brlcad/trunk/src/libfb/fb_paged_io.c 2020-04-15 19:13:25 UTC (rev
75411)
+++ brlcad/trunk/src/libfb/fb_paged_io.c 2020-04-15 19:20:09 UTC (rev
75412)
@@ -17,7 +17,7 @@
* License along with this file; see the file named COPYING for more
* information.
*/
-/** @addtogroup libfb */
+/** @addtogroup libstruct fb */
/** @{ */
/** @file fb_paged_io.c
*
@@ -47,7 +47,7 @@
static int
-_fb_pgout(register fb *ifp)
+_fb_pgout(register struct fb *ifp)
{
size_t scans, first_scan;
@@ -72,7 +72,7 @@
static int
-_fb_pgin(register fb *ifp, int pageno)
+_fb_pgin(register struct fb *ifp, int pageno)
{
size_t scans, first_scan;
@@ -99,7 +99,7 @@
static int
-_fb_pgflush(register fb *ifp)
+_fb_pgflush(register struct fb *ifp)
{
if (ifp->if_debug & FB_DEBUG_BIO) {
fb_log("_fb_pgflush(%p)\n", (void *)ifp);
@@ -120,7 +120,7 @@
* routines in this file are used.
*/
int
-fb_ioinit(register fb *ifp)
+fb_ioinit(register struct fb *ifp)
{
if (ifp->if_debug & FB_DEBUG_BIO) {
fb_log("fb_ioinit(%p)\n", (void *)ifp);
@@ -146,7 +146,7 @@
int
-fb_seek(register fb *ifp, int x, int y)
+fb_seek(register struct fb *ifp, int x, int y)
{
long pixelnum;
long pagepixel;
@@ -178,7 +178,7 @@
int
-fb_tell(register fb *ifp, int *xp, int *yp)
+fb_tell(register struct fb *ifp, int *xp, int *yp)
{
*yp = (int) (ifp->if_pixcur / ifp->if_width);
*xp = (int) (ifp->if_pixcur % ifp->if_width);
@@ -193,7 +193,7 @@
int
-fb_wpixel(register fb *ifp, unsigned char *pixelp)
+fb_wpixel(register struct fb *ifp, unsigned char *pixelp)
{
if (ifp->if_pno == -1)
if (_fb_pgin(ifp, ifp->if_pixcur / ifp->if_ppixels) <= -1)
@@ -213,7 +213,7 @@
int
-fb_rpixel(register fb *ifp, unsigned char *pixelp)
+fb_rpixel(register struct fb *ifp, unsigned char *pixelp)
{
if (ifp->if_pno == -1)
if (_fb_pgin(ifp, ifp->if_pixcur / ifp->if_ppixels) <= -1)
@@ -233,7 +233,7 @@
int
-fb_flush(register fb *ifp)
+fb_flush(register struct fb *ifp)
{
_fb_pgflush(ifp);
Modified: brlcad/trunk/src/libfb/fb_private.h
===================================================================
--- brlcad/trunk/src/libfb/fb_private.h 2020-04-15 19:13:25 UTC (rev 75411)
+++ brlcad/trunk/src/libfb/fb_private.h 2020-04-15 19:20:09 UTC (rev 75412)
@@ -35,30 +35,30 @@
/* declare all the possible interfaces */
#ifdef IF_X
-FB_EXPORT extern fb X24_interface;
+FB_EXPORT extern struct fb X24_interface;
#endif
#ifdef IF_OGL
-FB_EXPORT extern fb ogl_interface;
+FB_EXPORT extern struct fb ogl_interface;
#endif
#ifdef IF_OSGL
-FB_EXPORT extern fb osgl_interface;
+FB_EXPORT extern struct fb osgl_interface;
#endif
#ifdef IF_WGL
-FB_EXPORT extern fb wgl_interface;
+FB_EXPORT extern struct fb wgl_interface;
#endif
#ifdef IF_TK
-FB_EXPORT extern fb tk_interface;
+FB_EXPORT extern struct fb tk_interface;
#endif
#ifdef IF_QT
-FB_EXPORT extern fb qt_interface;
+FB_EXPORT extern struct fb qt_interface;
#endif
#ifdef IF_REMOTE
-FB_EXPORT extern fb remote_interface; /* not in list[] */
+FB_EXPORT extern struct fb remote_interface; /* not in list[] */
#endif
/* Always included */
-FB_EXPORT extern fb debug_interface, disk_interface, stk_interface;
-FB_EXPORT extern fb memory_interface, fb_null_interface;
+FB_EXPORT extern struct fb debug_interface, disk_interface, stk_interface;
+FB_EXPORT extern struct fb memory_interface, fb_null_interface;
/* Shared memory (shmget et. al.) key common to multiple framebuffers */
@@ -90,36 +90,36 @@
* calls in the fb.h API - no code external to libfb should work
* directly with structure members.
*/
-struct fb_internal {
+struct fb {
uint32_t if_magic;
uint32_t type_magic;
/* Static information: per device TYPE. */
- int (*if_open)(struct fb_internal *ifp, const char *file, int _width, int
_height); /**< @brief open device */
- int (*if_open_existing)(struct fb_internal *ifp, int width, int height,
struct fb_platform_specific *fb_p); /**< @brief open
device */
- int (*if_close_existing)(struct fb_internal *ifp);
/**< @brief close embedded fb */
+ int (*if_open)(struct fb *ifp, const char *file, int _width, int _height);
/**< @brief open device */
+ int (*if_open_existing)(struct fb *ifp, int width, int height, struct
fb_platform_specific *fb_p); /**< @brief open device */
+ int (*if_close_existing)(struct fb *ifp); /**<
@brief close embedded struct fb */
struct fb_platform_specific *(*if_existing_get)(uint32_t magic);
/**< @brief allocate memory for platform specific container*/
void (*if_existing_put)(struct
fb_platform_specific *fb_p); /**< @brief free memory for
platform specific container */
- int (*if_close)(struct fb_internal *ifp);
/**< @brief close device */
- int (*if_clear)(struct fb_internal *ifp, unsigned char *pp);
/**< @brief clear device */
- ssize_t (*if_read)(struct fb_internal *ifp, int x, int y, unsigned char
*pp, size_t count); /**< @brief read pixels */
- ssize_t (*if_write)(struct fb_internal *ifp, int x, int y, const unsigned
char *pp, size_t count); /**< @brief write pixels */
- int (*if_rmap)(struct fb_internal *ifp, ColorMap *cmap);
/**< @brief read colormap */
- int (*if_wmap)(struct fb_internal *ifp, const ColorMap *cmap);
/**< @brief write colormap */
- int (*if_view)(struct fb_internal *ifp, int xcent, int ycent, int xzoom,
int yzoom); /**< @brief set view */
- int (*if_getview)(struct fb_internal *ifp, int *xcent, int *ycent, int
*xzoom, int *yzoom); /**< @brief get view */
- int (*if_setcursor)(struct fb_internal *ifp, const unsigned char *bits,
int xb, int yb, int xo, int yo); /**< @brief define cursor */
- int (*if_cursor)(struct fb_internal *ifp, int mode, int x, int y);
/**< @brief set cursor */
- int (*if_getcursor)(struct fb_internal *ifp, int *mode, int *x, int *y);
/**< @brief get cursor */
- int (*if_readrect)(struct fb_internal *ifp, int xmin, int ymin, int
_width, int _height, unsigned char *pp); /**< @brief read
rectangle */
- int (*if_writerect)(struct fb_internal *ifp, int xmin, int ymin, int
_width, int _height, const unsigned char *pp); /**< @brief write
rectangle */
- int (*if_bwreadrect)(struct fb_internal *ifp, int xmin, int ymin, int
_width, int _height, unsigned char *pp); /**< @brief read monochrome
rectangle */
- int (*if_bwwriterect)(struct fb_internal *ifp, int xmin, int ymin, int
_width, int _height, const unsigned char *pp); /**< @brief write rectangle
*/
- int (*if_configure_window)(struct fb_internal *ifp, int width, int
height); /**< @brief configure window */
- int (*if_refresh)(struct fb_internal *ifp, int x, int y, int w, int h);
/**< @brief refresh window */
- int (*if_poll)(struct fb_internal *ifp); /**< @brief handle
events */
- int (*if_flush)(struct fb_internal *ifp); /**< @brief flush output
*/
- int (*if_free)(struct fb_internal *ifp); /**< @brief free
resources */
- int (*if_help)(struct fb_internal *ifp); /**< @brief print useful
info */
+ int (*if_close)(struct fb *ifp);
/**< @brief close device */
+ int (*if_clear)(struct fb *ifp, unsigned char *pp);
/**< @brief clear device */
+ ssize_t (*if_read)(struct fb *ifp, int x, int y, unsigned char *pp, size_t
count); /**< @brief read pixels */
+ ssize_t (*if_write)(struct fb *ifp, int x, int y, const unsigned char *pp,
size_t count); /**< @brief write pixels */
+ int (*if_rmap)(struct fb *ifp, ColorMap *cmap);
/**< @brief read colormap */
+ int (*if_wmap)(struct fb *ifp, const ColorMap *cmap);
/**< @brief write colormap */
+ int (*if_view)(struct fb *ifp, int xcent, int ycent, int xzoom, int
yzoom); /**< @brief set view */
+ int (*if_getview)(struct fb *ifp, int *xcent, int *ycent, int *xzoom, int
*yzoom); /**< @brief get view */
+ int (*if_setcursor)(struct fb *ifp, const unsigned char *bits, int xb, int
yb, int xo, int yo); /**< @brief define cursor */
+ int (*if_cursor)(struct fb *ifp, int mode, int x, int y);
/**< @brief set cursor */
+ int (*if_getcursor)(struct fb *ifp, int *mode, int *x, int *y);
/**< @brief get cursor */
+ int (*if_readrect)(struct fb *ifp, int xmin, int ymin, int _width, int
_height, unsigned char *pp); /**< @brief read rectangle */
+ int (*if_writerect)(struct fb *ifp, int xmin, int ymin, int _width, int
_height, const unsigned char *pp); /**< @brief write rectangle */
+ int (*if_bwreadrect)(struct fb *ifp, int xmin, int ymin, int _width, int
_height, unsigned char *pp); /**< @brief read monochrome rectangle */
+ int (*if_bwwriterect)(struct fb *ifp, int xmin, int ymin, int _width, int
_height, const unsigned char *pp); /**< @brief write rectangle */
+ int (*if_configure_window)(struct fb *ifp, int width, int height);
/**< @brief configure window */
+ int (*if_refresh)(struct fb *ifp, int x, int y, int w, int h);
/**< @brief refresh window */
+ int (*if_poll)(struct fb *ifp); /**< @brief handle events */
+ int (*if_flush)(struct fb *ifp); /**< @brief flush output */
+ int (*if_free)(struct fb *ifp); /**< @brief free resources */
+ int (*if_help)(struct fb *ifp); /**< @brief print useful info */
char *if_type; /**< @brief what "open" calls it */
int if_max_width; /**< @brief max device width */
int if_max_height; /**< @brief max device height */
@@ -200,14 +200,14 @@
* Not for general consumption.
*/
FB_EXPORT extern int _fb_disk_enable;
-FB_EXPORT extern int fb_sim_readrect(fb *ifp, int xmin, int ymin, int _width,
int _height, unsigned char *pp);
-FB_EXPORT extern int fb_sim_writerect(fb *ifp, int xmin, int ymin, int _width,
int _height, const unsigned char *pp);
-FB_EXPORT extern int fb_sim_bwreadrect(fb *ifp, int xmin, int ymin, int
_width, int _height, unsigned char *pp);
-FB_EXPORT extern int fb_sim_bwwriterect(fb *ifp, int xmin, int ymin, int
_width, int _height, const unsigned char *pp);
-FB_EXPORT extern int fb_sim_view(fb *ifp, int xcenter, int ycenter, int xzoom,
int yzoom);
-FB_EXPORT extern int fb_sim_getview(fb *ifp, int *xcenter, int *ycenter, int
*xzoom, int *yzoom);
-FB_EXPORT extern int fb_sim_cursor(fb *ifp, int mode, int x, int y);
-FB_EXPORT extern int fb_sim_getcursor(fb *ifp, int *mode, int *x, int *y);
+FB_EXPORT extern int fb_sim_readrect(struct fb *ifp, int xmin, int ymin, int
_width, int _height, unsigned char *pp);
+FB_EXPORT extern int fb_sim_writerect(struct fb *ifp, int xmin, int ymin, int
_width, int _height, const unsigned char *pp);
+FB_EXPORT extern int fb_sim_bwreadrect(struct fb *ifp, int xmin, int ymin, int
_width, int _height, unsigned char *pp);
+FB_EXPORT extern int fb_sim_bwwriterect(struct fb *ifp, int xmin, int ymin,
int _width, int _height, const unsigned char *pp);
+FB_EXPORT extern int fb_sim_view(struct fb *ifp, int xcenter, int ycenter, int
xzoom, int yzoom);
+FB_EXPORT extern int fb_sim_getview(struct fb *ifp, int *xcenter, int
*ycenter, int *xzoom, int *yzoom);
+FB_EXPORT extern int fb_sim_cursor(struct fb *ifp, int mode, int x, int y);
+FB_EXPORT extern int fb_sim_getcursor(struct fb *ifp, int *mode, int *x, int
*y);
__END_DECLS
Modified: brlcad/trunk/src/libfb/fb_rect.c
===================================================================
--- brlcad/trunk/src/libfb/fb_rect.c 2020-04-15 19:13:25 UTC (rev 75411)
+++ brlcad/trunk/src/libfb/fb_rect.c 2020-04-15 19:20:09 UTC (rev 75412)
@@ -17,7 +17,7 @@
* License along with this file; see the file named COPYING for more
* information.
*/
-/** @addtogroup libfb */
+/** @addtogroup libstruct fb */
/** @{ */
/** @file fb_rect.c
*
@@ -42,7 +42,7 @@
* particular display does not handle it.
*/
int
-fb_sim_readrect(fb *ifp, int xmin, int ymin, int width, int height, unsigned
char *pp)
+fb_sim_readrect(struct fb *ifp, int xmin, int ymin, int width, int height,
unsigned char *pp)
{
register int y;
register int tot;
@@ -75,7 +75,7 @@
* Clipping to the screen may reduce the total if caller was sloppy.
*/
int
-fb_sim_writerect(fb *ifp, int xmin, int ymin, int width, int height, const
unsigned char *pp)
+fb_sim_writerect(struct fb *ifp, int xmin, int ymin, int width, int height,
const unsigned char *pp)
{
register int y;
register int tot;
@@ -99,7 +99,7 @@
#define SIMBUF_SIZE (24*1024)
int
-fb_sim_bwreadrect(fb *ifp, int xmin, int ymin, int width, int height, unsigned
char *pp)
+fb_sim_bwreadrect(struct fb *ifp, int xmin, int ymin, int width, int height,
unsigned char *pp)
{
register int y;
register int tot;
@@ -129,7 +129,7 @@
int
-fb_sim_bwwriterect(fb *ifp, int xmin, int ymin, int width, int height, const
unsigned char *pp)
+fb_sim_bwwriterect(struct fb *ifp, int xmin, int ymin, int width, int height,
const unsigned char *pp)
{
register int y;
register int tot;
Modified: brlcad/trunk/src/libfb/fb_util.c
===================================================================
--- brlcad/trunk/src/libfb/fb_util.c 2020-04-15 19:13:25 UTC (rev 75411)
+++ brlcad/trunk/src/libfb/fb_util.c 2020-04-15 19:20:09 UTC (rev 75412)
@@ -17,7 +17,7 @@
* License along with this file; see the file named COPYING for more
* information.
*/
-/** @addtogroup libfb */
+/** @addtogroup libstruct fb */
/** @{ */
/** @file fb_util.c
*
@@ -40,7 +40,7 @@
* storing this information into the fb structure.
*/
int
-fb_sim_view(fb *ifp, int xcenter, int ycenter, int xzoom, int yzoom)
+fb_sim_view(struct fb *ifp, int xcenter, int ycenter, int xzoom, int yzoom)
{
FB_CK_FB(ifp);
@@ -58,7 +58,7 @@
* reading this information from the fb structure.
*/
int
-fb_sim_getview(fb *ifp, int *xcenter, int *ycenter, int *xzoom, int *yzoom)
+fb_sim_getview(struct fb *ifp, int *xcenter, int *ycenter, int *xzoom, int
*yzoom)
{
FB_CK_FB(ifp);
@@ -76,7 +76,7 @@
* storing this information into the fb structure.
*/
int
-fb_sim_cursor(fb *ifp, int mode, int x, int y)
+fb_sim_cursor(struct fb *ifp, int mode, int x, int y)
{
FB_CK_FB(ifp);
@@ -93,7 +93,7 @@
* reading this information from the fb structure.
*/
int
-fb_sim_getcursor(fb *ifp, int *mode, int *x, int *y)
+fb_sim_getcursor(struct fb *ifp, int *mode, int *x, int *y)
{
FB_CK_FB(ifp);
@@ -108,7 +108,7 @@
/* Backward Compatibility Routines */
int
-fb_reset(fb *ifp)
+fb_reset(struct fb *ifp)
{
if (ifp) {
FB_CK_FB(ifp);
@@ -119,7 +119,7 @@
int
-fb_viewport(fb *ifp, int UNUSED(left), int UNUSED(top), int UNUSED(right), int
UNUSED(bottom))
+fb_viewport(struct fb *ifp, int UNUSED(left), int UNUSED(top), int
UNUSED(right), int UNUSED(bottom))
{
if (ifp) {
FB_CK_FB(ifp);
@@ -130,7 +130,7 @@
int
-fb_window(fb *ifp, int x, int y)
+fb_window(struct fb *ifp, int x, int y)
{
int xcenter, ycenter;
int xzoom, yzoom;
@@ -148,7 +148,7 @@
int
-fb_zoom(fb *ifp, int x, int y)
+fb_zoom(struct fb *ifp, int x, int y)
{
int xcenter, ycenter;
int xzoom, yzoom;
@@ -167,7 +167,7 @@
int
-fb_scursor(fb *ifp, int UNUSED(mode), int UNUSED(x), int UNUSED(y))
+fb_scursor(struct fb *ifp, int UNUSED(mode), int UNUSED(x), int UNUSED(y))
{
if (ifp) {
FB_CK_FB(ifp);
Modified: brlcad/trunk/src/libfb/fbserv_obj.c
===================================================================
--- brlcad/trunk/src/libfb/fbserv_obj.c 2020-04-15 19:13:25 UTC (rev 75411)
+++ brlcad/trunk/src/libfb/fbserv_obj.c 2020-04-15 19:20:09 UTC (rev 75412)
@@ -17,7 +17,7 @@
* License along with this file; see the file named COPYING for more
* information.
*/
-/** @addtogroup libfb */
+/** @addtogroup libstruct fb */
/** @{ */
/** @file fbserv_obj.c
*
@@ -43,7 +43,7 @@
#include "fb_private.h"
-static fb *curr_fbp; /* current framebuffer pointer */
+static struct fb *curr_fbp; /* current framebuffer pointer */
/*
Modified: brlcad/trunk/src/libfb/if_TEMPLATE.c
===================================================================
--- brlcad/trunk/src/libfb/if_TEMPLATE.c 2020-04-15 19:13:25 UTC (rev
75411)
+++ brlcad/trunk/src/libfb/if_TEMPLATE.c 2020-04-15 19:20:09 UTC (rev
75412)
@@ -17,7 +17,7 @@
* License along with this file; see the file named COPYING for more
* information.
*/
-/** @addtogroup libfb */
+/** @addtogroup libstruct fb */
/** @{ */
/** @file if_TEMPLATE.c
*
@@ -56,7 +56,7 @@
HIDDEN int
-DEVNAME_open(fb *ifp, const char *file, int width, int height)
+DEVNAME_open(struct fb *ifp, const char *file, int width, int height)
{
FB_CK_fb(ifp);
return 0;
@@ -64,7 +64,7 @@
HIDDEN int
-DEVNAME_close(fb *ifp)
+DEVNAME_close(struct fb *ifp)
{
return 0;
}
@@ -71,7 +71,7 @@
HIDDEN int
-DEVNAME_clear(fb *ifp, unsigned char *pp)
+DEVNAME_clear(struct fb *ifp, unsigned char *pp)
{
return 0;
}
@@ -78,7 +78,7 @@
HIDDEN int
-DEVNAME_read(fb *ifp, int x, int y, unsigned char *pixelp, size_t count)
+DEVNAME_read(struct fb *ifp, int x, int y, unsigned char *pixelp, size_t count)
{
return (int)count;
}
@@ -85,7 +85,7 @@
HIDDEN int
-DEVNAME_write(fb *ifp, int x, int y, const unsigned char *pixelp, size_t count)
+DEVNAME_write(struct fb *ifp, int x, int y, const unsigned char *pixelp,
size_t count)
{
return (int)count;
}
@@ -92,7 +92,7 @@
HIDDEN int
-DEVNAME_rmap(fb *ifp, ColorMap *cmp)
+DEVNAME_rmap(struct fb *ifp, ColorMap *cmp)
{
return 0;
}
@@ -99,7 +99,7 @@
HIDDEN int
-DEVNAME_wmap(fb *ifp, const ColorMap *cmp)
+DEVNAME_wmap(struct fb *ifp, const ColorMap *cmp)
{
return 0;
}
@@ -106,7 +106,7 @@
HIDDEN int
-DEVNAME_view(fb *ifp, int xcenter, int ycenter, int xzoom, int yzoom)
+DEVNAME_view(struct fb *ifp, int xcenter, int ycenter, int xzoom, int yzoom)
{
return 0;
}
@@ -113,7 +113,7 @@
HIDDEN int
-DEVNAME_getview(fb *ifp, int *xcenter, int *ycenter, int *xzoom, int *yzoom)
+DEVNAME_getview(struct fb *ifp, int *xcenter, int *ycenter, int *xzoom, int
*yzoom)
{
return 0;
}
@@ -120,7 +120,7 @@
HIDDEN int
-DEVNAME_setcursor(fb *ifp, const unsigned char *bits, int xbits, int ybits,
int xorig, int yorig)
+DEVNAME_setcursor(struct fb *ifp, const unsigned char *bits, int xbits, int
ybits, int xorig, int yorig)
{
return 0;
}
@@ -127,7 +127,7 @@
HIDDEN int
-DEVNAME_cursor(fb *ifp, int mode, int x, int y)
+DEVNAME_cursor(struct fb *ifp, int mode, int x, int y)
{
return 0;
}
@@ -134,7 +134,7 @@
HIDDEN int
-DEVNAME_getcursor(fb *ifp, int *mode, int *x, int *y)
+DEVNAME_getcursor(struct fb *ifp, int *mode, int *x, int *y)
{
return 0;
}
@@ -141,7 +141,7 @@
HIDDEN int
-DEVNAME_readrect(fb *ifp, int xmin, int ymin, int width, int height, unsigned
char *pp)
+DEVNAME_readrect(struct fb *ifp, int xmin, int ymin, int width, int height,
unsigned char *pp)
{
return width*height;
}
@@ -148,7 +148,7 @@
HIDDEN int
-DEVNAME_writerect(fb *ifp, int xmin, int ymin, int width, int height, const
unsigned char *pp)
+DEVNAME_writerect(struct fb *ifp, int xmin, int ymin, int width, int height,
const unsigned char *pp)
{
return width*height;
}
@@ -155,7 +155,7 @@
HIDDEN int
-DEVNAME_poll(fb *ifp)
+DEVNAME_poll(struct fb *ifp)
{
return 0;
}
@@ -162,7 +162,7 @@
HIDDEN int
-DEVNAME_flush(fb *ifp)
+DEVNAME_flush(struct fb *ifp)
{
return 0;
}
@@ -169,7 +169,7 @@
HIDDEN int
-DEVNAME_free(fb *ifp)
+DEVNAME_free(struct fb *ifp)
{
return 0;
}
@@ -176,7 +176,7 @@
HIDDEN int
-DEVNAME_help(fb *ifp)
+DEVNAME_help(struct fb *ifp)
{
fb_log("Description: %s\n", DEVNAME_interface.if_type);
fb_log("Device: %s\n", ifp->if_name);
@@ -191,7 +191,7 @@
/* This is the ONLY thing that we normally "export" */
-fb DEVNAME_interface = {
+struct fb DEVNAME_interface = {
0, /* magic number slot */
DEVNAME_open, /* open device */
DEVNAME_close, /* close device */
Modified: brlcad/trunk/src/libfb/if_X24.c
===================================================================
--- brlcad/trunk/src/libfb/if_X24.c 2020-04-15 19:13:25 UTC (rev 75411)
+++ brlcad/trunk/src/libfb/if_X24.c 2020-04-15 19:20:09 UTC (rev 75412)
@@ -20,7 +20,7 @@
* IS ON AN "AS IS" BASIS, AND SUN MICROSYSTEMS INC. HAS NO OBLIGATION TO
* PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
*/
-/** @addtogroup libfb */
+/** @addtogroup libstruct fb */
/** @{*/
/** @file if_X24.c
*
@@ -525,7 +525,7 @@
HIDDEN int
-x24_setup(fb *ifp, int width, int height)
+x24_setup(struct fb *ifp, int width, int height)
{
struct xinfo *xi = XI(ifp);
@@ -1006,7 +1006,7 @@
* x_1, y_1->w, h describes a Rectangle of changed bits (image space coord.)
*/
HIDDEN void
-X24_blit(fb *ifp, int x_1, int y_1, int w, int h, int flags /* BLIT_xxx flags
*/)
+X24_blit(struct fb *ifp, int x_1, int y_1, int w, int h, int flags /* BLIT_xxx
flags */)
{
struct xinfo *xi = XI(ifp);
@@ -1861,7 +1861,7 @@
HIDDEN int
-X24_rmap(fb *ifp, ColorMap *cmp)
+X24_rmap(struct fb *ifp, ColorMap *cmp)
{
struct xinfo *xi = XI(ifp);
FB_CK_FB(ifp);
@@ -1873,7 +1873,7 @@
HIDDEN int
-X24_wmap(fb *ifp, const ColorMap *cmp)
+X24_wmap(struct fb *ifp, const ColorMap *cmp)
{
struct xinfo *xi = XI(ifp);
ColorMap *map = xi->xi_rgb_cmap;
@@ -1981,7 +1981,7 @@
* accessed again, even though the windows are transient, per-process.
*/
HIDDEN int
-X24_getmem(fb *ifp)
+X24_getmem(struct fb *ifp)
{
struct xinfo *xi = XI(ifp);
@@ -2079,7 +2079,7 @@
HIDDEN void
-X24_updstate(fb *ifp)
+X24_updstate(struct fb *ifp)
{
struct xinfo *xi = XI(ifp);
@@ -2414,7 +2414,7 @@
HIDDEN int
-X24_open(fb *ifp, const char *file, int width, int height)
+X24_open(struct fb *ifp, const char *file, int width, int height)
{
struct xinfo *xi;
@@ -2544,7 +2544,7 @@
}
int
-X24_configureWindow(fb *ifp, int width, int height)
+X24_configureWindow(struct fb *ifp, int width, int height)
{
struct xinfo *xi = XI(ifp);
XRectangle rect;
@@ -2662,7 +2662,7 @@
int
-_X24_open_existing(fb *ifp, Display *dpy, Window win, Window cwinp, Colormap
cmap, XVisualInfo *vip, int width, int height, GC gc)
+_X24_open_existing(struct fb *ifp, Display *dpy, Window win, Window cwinp,
Colormap cmap, XVisualInfo *vip, int width, int height, GC gc)
{
struct xinfo *xi;
int getmem_stat;
@@ -2850,7 +2850,7 @@
}
HIDDEN int
-X24_open_existing(fb *ifp, int width, int height, struct fb_platform_specific
*fb_p)
+X24_open_existing(struct fb *ifp, int width, int height, struct
fb_platform_specific *fb_p)
{
struct X24_fb_info *x24_internal = (struct X24_fb_info *)fb_p->data;
BU_CKMAG(fb_p, FB_X24_MAGIC, "X24 framebuffer");
@@ -2863,7 +2863,7 @@
static int alive = 1;
HIDDEN void
-X24_handle_event(fb *ifp, XEvent *event)
+X24_handle_event(struct fb *ifp, XEvent *event)
{
struct xinfo *xi = XI(ifp);
FB_CK_FB(ifp);
@@ -2988,7 +2988,7 @@
HIDDEN int
-x24_linger(fb *ifp)
+x24_linger(struct fb *ifp)
{
struct xinfo *xi = XI(ifp);
XEvent event;
@@ -3006,7 +3006,7 @@
HIDDEN int
-X24_close(fb *ifp)
+X24_close(struct fb *ifp)
{
struct xinfo *xi = XI(ifp);
FB_CK_FB(ifp);
@@ -3024,7 +3024,7 @@
int
-X24_close_existing(fb *ifp)
+X24_close_existing(struct fb *ifp)
{
struct xinfo *xi = XI(ifp);
FB_CK_FB(ifp);
@@ -3049,7 +3049,7 @@
HIDDEN int
-X24_clear(fb *ifp, unsigned char *pp)
+X24_clear(struct fb *ifp, unsigned char *pp)
{
struct xinfo *xi = XI(ifp);
@@ -3091,7 +3091,7 @@
HIDDEN ssize_t
-X24_read(fb *ifp, int x, int y, unsigned char *pixelp, size_t count)
+X24_read(struct fb *ifp, int x, int y, unsigned char *pixelp, size_t count)
{
struct xinfo *xi = XI(ifp);
size_t maxcount;
@@ -3112,7 +3112,7 @@
HIDDEN ssize_t
-X24_write(fb *ifp, int x, int y, const unsigned char *pixelp, size_t count)
+X24_write(struct fb *ifp, int x, int y, const unsigned char *pixelp, size_t
count)
{
struct xinfo *xi = XI(ifp);
size_t maxcount;
@@ -3152,7 +3152,7 @@
HIDDEN int
-X24_view(fb *ifp, int xcenter, int ycenter, int xzoom, int yzoom)
+X24_view(struct fb *ifp, int xcenter, int ycenter, int xzoom, int yzoom)
{
struct xinfo *xi = XI(ifp);
FB_CK_FB(ifp);
@@ -3183,7 +3183,7 @@
HIDDEN int
-X24_getview(fb *ifp, int *xcenter, int *ycenter, int *xzoom, int *yzoom)
+X24_getview(struct fb *ifp, int *xcenter, int *ycenter, int *xzoom, int *yzoom)
{
*xcenter = ifp->if_xcenter;
@@ -3197,7 +3197,7 @@
/*ARGSUSED*/
HIDDEN int
-X24_setcursor(fb *ifp, const unsigned char *UNUSED(bits), int UNUSED(xbits),
int UNUSED(ybits), int UNUSED(xorig), int UNUSED(yorig))
+X24_setcursor(struct fb *ifp, const unsigned char *UNUSED(bits), int
UNUSED(xbits), int UNUSED(ybits), int UNUSED(xorig), int UNUSED(yorig))
{
FB_CK_FB(ifp);
@@ -3206,7 +3206,7 @@
HIDDEN int
-X24_cursor(fb *ifp, int mode, int x, int y)
+X24_cursor(struct fb *ifp, int mode, int x, int y)
{
struct xinfo *xi = XI(ifp);
@@ -3264,7 +3264,7 @@
HIDDEN int
-X24_getcursor(fb *ifp, int *mode, int *x, int *y)
+X24_getcursor(struct fb *ifp, int *mode, int *x, int *y)
{
fb_sim_getcursor(ifp, mode, x, y);
@@ -3273,7 +3273,7 @@
HIDDEN int
-X24_readrect(fb *ifp, int xmin, int ymin, int width, int height, unsigned char
*pp)
+X24_readrect(struct fb *ifp, int xmin, int ymin, int width, int height,
unsigned char *pp)
{
struct xinfo *xi = XI(ifp);
FB_CK_FB(ifp);
@@ -3316,7 +3316,7 @@
HIDDEN int
-X24_writerect(fb *ifp, int xmin, int ymin, int width, int height, const
unsigned char *pp)
+X24_writerect(struct fb *ifp, int xmin, int ymin, int width, int height, const
unsigned char *pp)
{
struct xinfo *xi = XI(ifp);
FB_CK_FB(ifp);
@@ -3362,7 +3362,7 @@
HIDDEN int
-X24_poll(fb *ifp)
+X24_poll(struct fb *ifp)
{
struct xinfo *xi = XI(ifp);
XEvent event;
@@ -3378,7 +3378,7 @@
HIDDEN int
-X24_flush(fb *ifp)
+X24_flush(struct fb *ifp)
{
struct xinfo *xi = XI(ifp);
FB_CK_FB(ifp);
@@ -3389,7 +3389,7 @@
HIDDEN int
-X24_free(fb *ifp)
+X24_free(struct fb *ifp)
{
FB_CK_FB(ifp);
@@ -3398,7 +3398,7 @@
HIDDEN int
-X24_help(fb *ifp)
+X24_help(struct fb *ifp)
{
struct xinfo *xi = XI(ifp);
struct modeflags *mfp;
@@ -3466,7 +3466,7 @@
int
-X24_refresh(fb *ifp, int x, int y, int w, int h)
+X24_refresh(struct fb *ifp, int x, int y, int w, int h)
{
if (w < 0) {
w = -w;
@@ -3485,7 +3485,7 @@
/* This is the ONLY thing that we normally "export" */
-fb X24_interface = {
+struct fb X24_interface = {
0, /* magic number slot */
FB_X24_MAGIC,
X24_open, /* open device */
Modified: brlcad/trunk/src/libfb/if_debug.c
===================================================================
--- brlcad/trunk/src/libfb/if_debug.c 2020-04-15 19:13:25 UTC (rev 75411)
+++ brlcad/trunk/src/libfb/if_debug.c 2020-04-15 19:20:09 UTC (rev 75412)
@@ -17,7 +17,7 @@
* License along with this file; see the file named COPYING for more
* information.
*/
-/** @addtogroup libfb */
+/** @addtogroup libstruct fb */
/** @{ */
/** @file if_debug.c
*
@@ -38,7 +38,7 @@
HIDDEN int
-deb_open(fb *ifp, const char *file, int width, int height)
+deb_open(struct fb *ifp, const char *file, int width, int height)
{
FB_CK_FB(ifp);
if (file == (char *)NULL)
@@ -85,19 +85,19 @@
}
HIDDEN int
-deb_open_existing(fb *UNUSED(ifp), int UNUSED(width), int UNUSED(height),
struct fb_platform_specific *UNUSED(fb_p))
+deb_open_existing(struct fb *UNUSED(ifp), int UNUSED(width), int
UNUSED(height), struct fb_platform_specific *UNUSED(fb_p))
{
return 0;
}
HIDDEN int
-deb_close_existing(fb *UNUSED(ifp))
+deb_close_existing(struct fb *UNUSED(ifp))
{
return 0;
}
HIDDEN int
-deb_close(fb *ifp)
+deb_close(struct fb *ifp)
{
FB_CK_FB(ifp);
fb_log("fb_close(%p)\n", (void *)ifp);
@@ -105,19 +105,19 @@
}
HIDDEN int
-deb_configure_window(fb *UNUSED(ifp), int UNUSED(width), int UNUSED(height))
+deb_configure_window(struct fb *UNUSED(ifp), int UNUSED(width), int
UNUSED(height))
{
return 0;
}
HIDDEN int
-deb_refresh(fb *UNUSED(ifp), int UNUSED(x), int UNUSED(y), int UNUSED(w), int
UNUSED(h))
+deb_refresh(struct fb *UNUSED(ifp), int UNUSED(x), int UNUSED(y), int
UNUSED(w), int UNUSED(h))
{
return 0;
}
HIDDEN int
-deb_clear(fb *ifp, unsigned char *pp)
+deb_clear(struct fb *ifp, unsigned char *pp)
{
FB_CK_FB(ifp);
if (pp == 0)
@@ -132,7 +132,7 @@
HIDDEN ssize_t
-deb_read(fb *ifp, int x, int y, unsigned char *pixelp, size_t count)
+deb_read(struct fb *ifp, int x, int y, unsigned char *pixelp, size_t count)
{
FB_CK_FB(ifp);
fb_log("fb_read(%p, %4d, %4d, %p, %lu)\n",
@@ -143,7 +143,7 @@
HIDDEN ssize_t
-deb_write(fb *ifp, int x, int y, const unsigned char *pixelp, size_t count)
+deb_write(struct fb *ifp, int x, int y, const unsigned char *pixelp, size_t
count)
{
size_t i;
@@ -171,7 +171,7 @@
HIDDEN int
-deb_rmap(fb *ifp, ColorMap *cmp)
+deb_rmap(struct fb *ifp, ColorMap *cmp)
{
FB_CK_FB(ifp);
fb_log("fb_rmap(%p, %p)\n",
@@ -181,7 +181,7 @@
HIDDEN int
-deb_wmap(fb *ifp, const ColorMap *cmp)
+deb_wmap(struct fb *ifp, const ColorMap *cmp)
{
int i;
@@ -208,7 +208,7 @@
HIDDEN int
-deb_view(fb *ifp, int xcenter, int ycenter, int xzoom, int yzoom)
+deb_view(struct fb *ifp, int xcenter, int ycenter, int xzoom, int yzoom)
{
FB_CK_FB(ifp);
fb_log("fb_view(%p, %4d, %4d, %4d, %4d)\n",
@@ -219,7 +219,7 @@
HIDDEN int
-deb_getview(fb *ifp, int *xcenter, int *ycenter, int *xzoom, int *yzoom)
+deb_getview(struct fb *ifp, int *xcenter, int *ycenter, int *xzoom, int *yzoom)
{
FB_CK_FB(ifp);
fb_log("fb_getview(%p, %p, %p, %p, %p)\n",
@@ -232,7 +232,7 @@
HIDDEN int
-deb_setcursor(fb *ifp, const unsigned char *bits, int xbits, int ybits, int
xorig, int yorig)
+deb_setcursor(struct fb *ifp, const unsigned char *bits, int xbits, int ybits,
int xorig, int yorig)
{
FB_CK_FB(ifp);
fb_log("fb_setcursor(%p, %p, %d, %d, %d, %d)\n",
@@ -242,7 +242,7 @@
HIDDEN int
-deb_cursor(fb *ifp, int mode, int x, int y)
+deb_cursor(struct fb *ifp, int mode, int x, int y)
{
fb_log("fb_cursor(%p, %d, %4d, %4d)\n",
(void *)ifp, mode, x, y);
@@ -252,7 +252,7 @@
HIDDEN int
-deb_getcursor(fb *ifp, int *mode, int *x, int *y)
+deb_getcursor(struct fb *ifp, int *mode, int *x, int *y)
{
FB_CK_FB(ifp);
fb_log("fb_getcursor(%p, %p, %p, %p)\n",
@@ -264,7 +264,7 @@
HIDDEN int
-deb_readrect(fb *ifp, int xmin, int ymin, int width, int height, unsigned char
*pp)
+deb_readrect(struct fb *ifp, int xmin, int ymin, int width, int height,
unsigned char *pp)
{
FB_CK_FB(ifp);
fb_log("fb_readrect(%p, (%4d, %4d), %4d, %4d, %p)\n",
@@ -275,7 +275,7 @@
HIDDEN int
-deb_writerect(fb *ifp, int xmin, int ymin, int width, int height, const
unsigned char *pp)
+deb_writerect(struct fb *ifp, int xmin, int ymin, int width, int height, const
unsigned char *pp)
{
FB_CK_FB(ifp);
fb_log("fb_writerect(%p, %4d, %4d, %4d, %4d, %p)\n",
@@ -286,7 +286,7 @@
HIDDEN int
-deb_bwreadrect(fb *ifp, int xmin, int ymin, int width, int height, unsigned
char *pp)
+deb_bwreadrect(struct fb *ifp, int xmin, int ymin, int width, int height,
unsigned char *pp)
{
FB_CK_FB(ifp);
fb_log("fb_bwreadrect(%p, (%4d, %4d), %4d, %4d, %p)\n",
@@ -297,7 +297,7 @@
HIDDEN int
-deb_bwwriterect(fb *ifp, int xmin, int ymin, int width, int height, const
unsigned char *pp)
+deb_bwwriterect(struct fb *ifp, int xmin, int ymin, int width, int height,
const unsigned char *pp)
{
FB_CK_FB(ifp);
fb_log("fb_bwwriterect(%p, %4d, %4d, %4d, %4d, %p)\n",
@@ -308,7 +308,7 @@
HIDDEN int
-deb_poll(fb *ifp)
+deb_poll(struct fb *ifp)
{
FB_CK_FB(ifp);
fb_log("fb_poll(%p)\n", (void *)ifp);
@@ -317,7 +317,7 @@
HIDDEN int
-deb_flush(fb *ifp)
+deb_flush(struct fb *ifp)
{
FB_CK_FB(ifp);
fb_log("if_flush(%p)\n", (void *)ifp);
@@ -326,7 +326,7 @@
HIDDEN int
-deb_free(fb *ifp)
+deb_free(struct fb *ifp)
{
FB_CK_FB(ifp);
fb_log("fb_free(%p)\n", (void *)ifp);
@@ -336,7 +336,7 @@
/*ARGSUSED*/
HIDDEN int
-deb_help(fb *ifp)
+deb_help(struct fb *ifp)
{
FB_CK_FB(ifp);
fb_log("Description: %s\n", debug_interface.if_type);
@@ -360,7 +360,7 @@
/* This is the ONLY thing that we "export" */
-fb debug_interface = {
+struct fb debug_interface = {
0,
FB_DEBUG_MAGIC,
deb_open,
Modified: brlcad/trunk/src/libfb/if_disk.c
===================================================================
--- brlcad/trunk/src/libfb/if_disk.c 2020-04-15 19:13:25 UTC (rev 75411)
+++ brlcad/trunk/src/libfb/if_disk.c 2020-04-15 19:20:09 UTC (rev 75412)
@@ -17,7 +17,7 @@
* License along with this file; see the file named COPYING for more
* information.
*/
-/** @addtogroup libfb */
+/** @addtogroup libstruct fb */
/** @{ */
/** @file if_disk.c
*
@@ -45,7 +45,7 @@
HIDDEN int
-dsk_open(fb *ifp, const char *file, int width, int height)
+dsk_open(struct fb *ifp, const char *file, int width, int height)
{
static char zero = 0;
@@ -112,31 +112,31 @@
}
HIDDEN int
-dsk_open_existing(fb *UNUSED(ifp), int UNUSED(width), int UNUSED(height),
struct fb_platform_specific *UNUSED(fb_p))
+dsk_open_existing(struct fb *UNUSED(ifp), int UNUSED(width), int
UNUSED(height), struct fb_platform_specific *UNUSED(fb_p))
{
return 0;
}
HIDDEN int
-dsk_close_existing(fb *UNUSED(ifp))
+dsk_close_existing(struct fb *UNUSED(ifp))
{
return 0;
}
HIDDEN int
-dsk_configure_window(fb *UNUSED(ifp), int UNUSED(width), int UNUSED(height))
+dsk_configure_window(struct fb *UNUSED(ifp), int UNUSED(width), int
UNUSED(height))
{
return 0;
}
HIDDEN int
-dsk_refresh(fb *UNUSED(ifp), int UNUSED(x), int UNUSED(y), int UNUSED(w), int
UNUSED(h))
+dsk_refresh(struct fb *UNUSED(ifp), int UNUSED(x), int UNUSED(y), int
UNUSED(w), int UNUSED(h))
{
return 0;
}
HIDDEN int
-dsk_close(fb *ifp)
+dsk_close(struct fb *ifp)
{
return close(ifp->if_fd);
}
@@ -143,7 +143,7 @@
HIDDEN int
-dsk_free(fb *ifp)
+dsk_free(struct fb *ifp)
{
close(ifp->if_fd);
if (bu_file_delete(ifp->if_name)) {
@@ -158,7 +158,7 @@
* Clear the disk file to the given color.
*/
HIDDEN int
-disk_color_clear(fb *ifp, register unsigned char *bpp)
+disk_color_clear(struct fb *ifp, register unsigned char *bpp)
{
static unsigned char pix_buf[DISK_DMA_BYTES] = {0};
register unsigned char *pix_to;
@@ -194,7 +194,7 @@
HIDDEN int
-dsk_clear(fb *ifp, unsigned char *bgpp)
+dsk_clear(struct fb *ifp, unsigned char *bgpp)
{
static RGBpixel black = { 0, 0, 0 };
@@ -206,7 +206,7 @@
HIDDEN ssize_t
-dsk_read(fb *ifp, int x, int y, unsigned char *pixelp, size_t count)
+dsk_read(struct fb *ifp, int x, int y, unsigned char *pixelp, size_t count)
{
size_t bytes = count * sizeof(RGBpixel);
size_t todo;
@@ -254,7 +254,7 @@
HIDDEN ssize_t
-dsk_write(fb *ifp, int x, int y, const unsigned char *pixelp, size_t count)
+dsk_write(struct fb *ifp, int x, int y, const unsigned char *pixelp, size_t
count)
{
register ssize_t bytes = count * sizeof(RGBpixel);
ssize_t todo;
@@ -285,7 +285,7 @@
HIDDEN int
-dsk_rmap(fb *ifp, ColorMap *cmap)
+dsk_rmap(struct fb *ifp, ColorMap *cmap)
{
int fd = ifp->if_fd;
@@ -309,7 +309,7 @@
HIDDEN int
-dsk_wmap(fb *ifp, const ColorMap *cmap)
+dsk_wmap(struct fb *ifp, const ColorMap *cmap)
{
if (cmap == (ColorMap *) NULL)
/* Do not write default map to file. */
@@ -330,7 +330,7 @@
HIDDEN int
-dsk_help(fb *ifp)
+dsk_help(struct fb *ifp)
{
fb_log("Description: %s\n", disk_interface.if_type);
fb_log("Device: %s\n", ifp->if_name);
@@ -351,7 +351,7 @@
}
-fb disk_interface = {
+struct fb disk_interface = {
0,
FB_DISK_MAGIC,
dsk_open,
Modified: brlcad/trunk/src/libfb/if_mem.c
===================================================================
--- brlcad/trunk/src/libfb/if_mem.c 2020-04-15 19:13:25 UTC (rev 75411)
+++ brlcad/trunk/src/libfb/if_mem.c 2020-04-15 19:20:09 UTC (rev 75412)
@@ -17,7 +17,7 @@
* License along with this file; see the file named COPYING for more
* information.
*/
-/** @addtogroup libfb */
+/** @addtogroup libstruct fb */
/** @{ */
/** @file if_mem.c
*
@@ -43,7 +43,7 @@
/* Per connection private info */
struct mem_info {
- fb *fbp; /* attached frame buffer (if any) */
+ struct fb *fbp; /* attached frame buffer (if any) */
unsigned char *mem; /* memory frame buffer */
ColorMap cmap; /* color map buffer */
int mem_dirty; /* !0 implies unflushed written data */
@@ -59,7 +59,7 @@
#define MODE_2MASK (1<<2)
#define MODE_2CLEAR (0<<2) /* assume fb opens clear */
-#define MODE_2PREREAD (1<<2) /* pre-read data from fb */
+#define MODE_2PREREAD (1<<2) /* pre-read data from struct fb */
static struct modeflags {
char c;
@@ -76,11 +76,11 @@
HIDDEN int
-mem_open(fb *ifp, const char *file, int width, int height)
+mem_open(struct fb *ifp, const char *file, int width, int height)
{
int mode;
const char *cp;
- fb *fbp;
+ struct fb *fbp;
char modebuf[80];
char *mp;
int alpha;
@@ -201,31 +201,31 @@
}
HIDDEN int
-mem_open_existing(fb *UNUSED(ifp), int UNUSED(width), int UNUSED(height),
struct fb_platform_specific *UNUSED(fb_p))
+mem_open_existing(struct fb *UNUSED(ifp), int UNUSED(width), int
UNUSED(height), struct fb_platform_specific *UNUSED(fb_p))
{
return 0;
}
HIDDEN int
-mem_close_existing(fb *UNUSED(ifp))
+mem_close_existing(struct fb *UNUSED(ifp))
{
return 0;
}
HIDDEN int
-mem_configure_window(fb *UNUSED(ifp), int UNUSED(width), int UNUSED(height))
+mem_configure_window(struct fb *UNUSED(ifp), int UNUSED(width), int
UNUSED(height))
{
return 0;
}
HIDDEN int
-mem_refresh(fb *UNUSED(ifp), int UNUSED(x), int UNUSED(y), int UNUSED(w), int
UNUSED(h))
+mem_refresh(struct fb *UNUSED(ifp), int UNUSED(x), int UNUSED(y), int
UNUSED(w), int UNUSED(h))
{
return 0;
}
HIDDEN int
-mem_close(fb *ifp)
+mem_close(struct fb *ifp)
{
/*
* Flush memory/cmap to attached frame buffer if any
@@ -249,7 +249,7 @@
HIDDEN int
-mem_clear(fb *ifp, unsigned char *pp)
+mem_clear(struct fb *ifp, unsigned char *pp)
{
RGBpixel v;
register int n;
@@ -287,7 +287,7 @@
HIDDEN ssize_t
-mem_read(fb *ifp, int x, int y, unsigned char *pixelp, size_t count)
+mem_read(struct fb *ifp, int x, int y, unsigned char *pixelp, size_t count)
{
size_t pixels_to_end;
@@ -306,7 +306,7 @@
HIDDEN ssize_t
-mem_write(fb *ifp, int x, int y, const unsigned char *pixelp, size_t count)
+mem_write(struct fb *ifp, int x, int y, const unsigned char *pixelp, size_t
count)
{
size_t pixels_to_end;
@@ -330,7 +330,7 @@
HIDDEN int
-mem_rmap(fb *ifp, ColorMap *cmp)
+mem_rmap(struct fb *ifp, ColorMap *cmp)
{
*cmp = MI(ifp)->cmap; /* struct copy */
return 0;
@@ -338,7 +338,7 @@
HIDDEN int
-mem_wmap(fb *ifp, const ColorMap *cmp)
+mem_wmap(struct fb *ifp, const ColorMap *cmp)
{
if (cmp == COLORMAP_NULL) {
fb_make_linear_cmap(&(MI(ifp)->cmap));
@@ -356,7 +356,7 @@
HIDDEN int
-mem_view(fb *ifp, int xcenter, int ycenter, int xzoom, int yzoom)
+mem_view(struct fb *ifp, int xcenter, int ycenter, int xzoom, int yzoom)
{
fb_sim_view(ifp, xcenter, ycenter, xzoom, yzoom);
if (MI(ifp)->write_thru) {
@@ -368,7 +368,7 @@
HIDDEN int
-mem_getview(fb *ifp, int *xcenter, int *ycenter, int *xzoom, int *yzoom)
+mem_getview(struct fb *ifp, int *xcenter, int *ycenter, int *xzoom, int *yzoom)
{
if (MI(ifp)->write_thru) {
return fb_getview(MI(ifp)->fbp, xcenter, ycenter,
@@ -380,7 +380,7 @@
HIDDEN int
-mem_setcursor(fb *ifp, const unsigned char *bits, int xbits, int ybits, int
xorig, int yorig)
+mem_setcursor(struct fb *ifp, const unsigned char *bits, int xbits, int ybits,
int xorig, int yorig)
{
if (MI(ifp)->write_thru) {
return fb_setcursor(MI(ifp)->fbp,
@@ -391,7 +391,7 @@
HIDDEN int
-mem_cursor(fb *ifp, int mode, int x, int y)
+mem_cursor(struct fb *ifp, int mode, int x, int y)
{
fb_sim_cursor(ifp, mode, x, y);
if (MI(ifp)->write_thru) {
@@ -402,7 +402,7 @@
HIDDEN int
-mem_getcursor(fb *ifp, int *mode, int *x, int *y)
+mem_getcursor(struct fb *ifp, int *mode, int *x, int *y)
{
if (MI(ifp)->write_thru) {
return fb_getcursor(MI(ifp)->fbp, mode, x, y);
@@ -413,7 +413,7 @@
HIDDEN int
-mem_poll(fb *ifp)
+mem_poll(struct fb *ifp)
{
if (MI(ifp)->write_thru) {
return fb_poll(MI(ifp)->fbp);
@@ -423,7 +423,7 @@
HIDDEN int
-mem_flush(fb *ifp)
+mem_flush(struct fb *ifp)
{
/*
* Flush memory/cmap to attached frame buffer if any
@@ -448,7 +448,7 @@
HIDDEN int
-mem_help(fb *ifp)
+mem_help(struct fb *ifp)
{
struct modeflags *mfp;
@@ -469,7 +469,7 @@
/* This is the ONLY thing that we normally "export" */
-fb memory_interface = {
+struct fb memory_interface = {
0,
FB_MEMORY_MAGIC,
mem_open, /* device_open */
Modified: brlcad/trunk/src/libfb/if_null.c
===================================================================
--- brlcad/trunk/src/libfb/if_null.c 2020-04-15 19:13:25 UTC (rev 75411)
+++ brlcad/trunk/src/libfb/if_null.c 2020-04-15 19:20:09 UTC (rev 75412)
@@ -17,7 +17,7 @@
* License along with this file; see the file named COPYING for more
* information.
*/
-/** @addtogroup libfb */
+/** @addtogroup libstruct fb */
/** @{ */
/** @file if_null.c
*
@@ -38,7 +38,7 @@
HIDDEN int
-_fb_null_open(fb *ifp, const char *UNUSED(file), int width, int height)
+_fb_null_open(struct fb *ifp, const char *UNUSED(file), int width, int height)
{
FB_CK_FB(ifp);
@@ -64,31 +64,31 @@
}
HIDDEN int
-_fb_null_open_existing(fb *UNUSED(ifp), int UNUSED(width), int UNUSED(height),
struct fb_platform_specific *UNUSED(fb_p))
+_fb_null_open_existing(struct fb *UNUSED(ifp), int UNUSED(width), int
UNUSED(height), struct fb_platform_specific *UNUSED(fb_p))
{
return 0;
}
HIDDEN int
-_fb_null_close_existing(fb *UNUSED(ifp))
+_fb_null_close_existing(struct fb *UNUSED(ifp))
{
return 0;
}
HIDDEN int
-_fb_null_configure_window(fb *UNUSED(ifp), int UNUSED(width), int
UNUSED(height))
+_fb_null_configure_window(struct fb *UNUSED(ifp), int UNUSED(width), int
UNUSED(height))
{
return 0;
}
HIDDEN int
-_fb_null_refresh(fb *UNUSED(ifp), int UNUSED(x), int UNUSED(y), int UNUSED(w),
int UNUSED(h))
+_fb_null_refresh(struct fb *UNUSED(ifp), int UNUSED(x), int UNUSED(y), int
UNUSED(w), int UNUSED(h))
{
return 0;
}
HIDDEN int
-_fb_null_close(fb *ifp)
+_fb_null_close(struct fb *ifp)
{
FB_CK_FB(ifp);
@@ -97,7 +97,7 @@
HIDDEN int
-_fb_null_clear(fb *ifp, unsigned char *UNUSED(pp))
+_fb_null_clear(struct fb *ifp, unsigned char *UNUSED(pp))
{
FB_CK_FB(ifp);
@@ -106,7 +106,7 @@
HIDDEN ssize_t
-_fb_null_read(fb *ifp, int UNUSED(x), int UNUSED(y), unsigned char
*UNUSED(pixelp), size_t count)
+_fb_null_read(struct fb *ifp, int UNUSED(x), int UNUSED(y), unsigned char
*UNUSED(pixelp), size_t count)
{
FB_CK_FB(ifp);
@@ -115,7 +115,7 @@
HIDDEN ssize_t
-_fb_null_write(fb *ifp, int UNUSED(x), int UNUSED(y), const unsigned char
*UNUSED(pixelp), size_t count)
+_fb_null_write(struct fb *ifp, int UNUSED(x), int UNUSED(y), const unsigned
char *UNUSED(pixelp), size_t count)
{
FB_CK_FB(ifp);
@@ -124,7 +124,7 @@
HIDDEN int
-_fb_null_rmap(fb *ifp, ColorMap *UNUSED(cmp))
+_fb_null_rmap(struct fb *ifp, ColorMap *UNUSED(cmp))
{
FB_CK_FB(ifp);
@@ -133,7 +133,7 @@
HIDDEN int
-_fb_null_wmap(fb *ifp, const ColorMap *UNUSED(cmp))
+_fb_null_wmap(struct fb *ifp, const ColorMap *UNUSED(cmp))
{
FB_CK_FB(ifp);
@@ -142,7 +142,7 @@
HIDDEN int
-_fb_null_view(fb *ifp, int UNUSED(xcenter), int UNUSED(ycenter), int
UNUSED(xzoom), int UNUSED(yzoom))
+_fb_null_view(struct fb *ifp, int UNUSED(xcenter), int UNUSED(ycenter), int
UNUSED(xzoom), int UNUSED(yzoom))
{
FB_CK_FB(ifp);
@@ -152,7 +152,7 @@
HIDDEN int
-_fb_null_getview(fb *ifp, int *UNUSED(xcenter), int *UNUSED(ycenter), int
*UNUSED(xzoom), int *UNUSED(yzoom))
+_fb_null_getview(struct fb *ifp, int *UNUSED(xcenter), int *UNUSED(ycenter),
int *UNUSED(xzoom), int *UNUSED(yzoom))
{
FB_CK_FB(ifp);
@@ -162,7 +162,7 @@
HIDDEN int
-_fb_null_setcursor(fb *ifp, const unsigned char *UNUSED(bits), int
UNUSED(xbits), int UNUSED(ybits), int UNUSED(xorig), int UNUSED(yorig))
+_fb_null_setcursor(struct fb *ifp, const unsigned char *UNUSED(bits), int
UNUSED(xbits), int UNUSED(ybits), int UNUSED(xorig), int UNUSED(yorig))
{
FB_CK_FB(ifp);
@@ -171,7 +171,7 @@
HIDDEN int
-_fb_null_cursor(fb *ifp, int UNUSED(mode), int UNUSED(x), int UNUSED(y))
+_fb_null_cursor(struct fb *ifp, int UNUSED(mode), int UNUSED(x), int UNUSED(y))
{
FB_CK_FB(ifp);
@@ -181,7 +181,7 @@
HIDDEN int
-_fb_null_getcursor(fb *ifp, int *UNUSED(mode), int *UNUSED(x), int *UNUSED(y))
+_fb_null_getcursor(struct fb *ifp, int *UNUSED(mode), int *UNUSED(x), int
*UNUSED(y))
{
FB_CK_FB(ifp);
@@ -191,7 +191,7 @@
HIDDEN int
-_fb_null_readrect(fb *ifp, int UNUSED(xmin), int UNUSED(ymin), int width, int
height, unsigned char *UNUSED(pp))
+_fb_null_readrect(struct fb *ifp, int UNUSED(xmin), int UNUSED(ymin), int
width, int height, unsigned char *UNUSED(pp))
{
FB_CK_FB(ifp);
@@ -200,7 +200,7 @@
HIDDEN int
-_fb_null_writerect(fb *ifp, int UNUSED(xmin), int UNUSED(ymin), int width, int
height, const unsigned char *UNUSED(pp))
+_fb_null_writerect(struct fb *ifp, int UNUSED(xmin), int UNUSED(ymin), int
width, int height, const unsigned char *UNUSED(pp))
{
FB_CK_FB(ifp);
@@ -209,7 +209,7 @@
HIDDEN int
-_fb_null_poll(fb *ifp)
+_fb_null_poll(struct fb *ifp)
{
FB_CK_FB(ifp);
@@ -218,7 +218,7 @@
HIDDEN int
-_fb_null_flush(fb *ifp)
+_fb_null_flush(struct fb *ifp)
{
FB_CK_FB(ifp);
@@ -227,7 +227,7 @@
HIDDEN int
-_fb_null_free(fb *ifp)
+_fb_null_free(struct fb *ifp)
{
FB_CK_FB(ifp);
@@ -236,7 +236,7 @@
HIDDEN int
-_fb_null_help(fb *ifp)
+_fb_null_help(struct fb *ifp)
{
FB_CK_FB(ifp);
@@ -254,7 +254,7 @@
/* This is the ONLY thing that we normally "export" */
-fb fb_null_interface = {
+struct fb fb_null_interface = {
0,
FB_NULL_MAGIC,
_fb_null_open, /* device_open */
Modified: brlcad/trunk/src/libfb/if_ogl.c
===================================================================
--- brlcad/trunk/src/libfb/if_ogl.c 2020-04-15 19:13:25 UTC (rev 75411)
+++ brlcad/trunk/src/libfb/if_ogl.c 2020-04-15 19:20:09 UTC (rev 75412)
@@ -17,7 +17,7 @@
* License along with this file; see the file named COPYING for more
* information.
*/
-/** @addtogroup libfb */
+/** @addtogroup libstruct fb */
/** @{ */
/** @file if_ogl.c
*
@@ -222,7 +222,7 @@
* screen if one_y equals -1.
*/
HIDDEN void
-backbuffer_to_screen(register fb *ifp, int one_y)
+backbuffer_to_screen(register struct fb *ifp, int one_y)
{
struct fb_clip *clp;
@@ -297,7 +297,7 @@
* rectangle of the frame buffer
*/
HIDDEN void
-ogl_xmit_scanlines(register fb *ifp, int ybase, int nlines, int xbase, int
npix)
+ogl_xmit_scanlines(register struct fb *ifp, int ybase, int nlines, int xbase,
int npix)
{
register int y;
register int n;
@@ -422,7 +422,7 @@
HIDDEN void
-ogl_cminit(register fb *ifp)
+ogl_cminit(register struct fb *ifp)
{
register int i;
@@ -466,7 +466,7 @@
* might need to be increased.
*/
HIDDEN int
-ogl_getmem(fb *ifp)
+ogl_getmem(struct fb *ifp)
{
size_t pixsize;
size_t size;
@@ -575,7 +575,7 @@
* (xpixmin, xpixmax, ypixmin, ypixmax)
*/
void
-fb_clipper(register fb *ifp)
+fb_clipper(register struct fb *ifp)
{
register struct fb_clip *clp;
register int i;
@@ -636,7 +636,7 @@
HIDDEN void
-expose_callback(fb *ifp)
+expose_callback(struct fb *ifp)
{
XWindowAttributes xwa;
struct fb_clip *clp;
@@ -764,7 +764,7 @@
int
-ogl_configureWindow(fb *ifp, int width, int height)
+ogl_configureWindow(struct fb *ifp, int width, int height)
{
if (width == OGL(ifp)->win_width &&
height == OGL(ifp)->win_height)
@@ -789,7 +789,7 @@
HIDDEN void
-ogl_do_event(fb *ifp)
+ogl_do_event(struct fb *ifp)
{
XEvent event;
@@ -893,7 +893,7 @@
* Return NULL on failure.
*/
HIDDEN XVisualInfo *
-fb_ogl_choose_visual(fb *ifp)
+fb_ogl_choose_visual(struct fb *ifp)
{
XVisualInfo *vip, *vibase, *maxvip, _template;
@@ -1005,7 +1005,7 @@
* linear map, 0 for non-linear map (i.e., non-identity map).
*/
HIDDEN int
-is_linear_cmap(register fb *ifp)
+is_linear_cmap(register struct fb *ifp)
{
register int i;
@@ -1019,7 +1019,7 @@
HIDDEN int
-fb_ogl_open(fb *ifp, const char *file, int width, int height)
+fb_ogl_open(struct fb *ifp, const char *file, int width, int height)
{
static char title[128] = {0};
int mode, i, direct;
@@ -1283,7 +1283,7 @@
static int
-open_existing(fb *ifp, Display *dpy, Window win, Colormap cmap, XVisualInfo
*vip, int width, int height, GLXContext glxc, int double_buffer, int soft_cmap)
+open_existing(struct fb *ifp, Display *dpy, Window win, Colormap cmap,
XVisualInfo *vip, int width, int height, GLXContext glxc, int double_buffer,
int soft_cmap)
{
/*XXX for now use private memory */
ifp->if_mode = MODE_1MALLOC;
@@ -1372,7 +1372,7 @@
HIDDEN int
-ogl_open_existing(fb *ifp, int width, int height, struct fb_platform_specific
*fb_p)
+ogl_open_existing(struct fb *ifp, int width, int height, struct
fb_platform_specific *fb_p)
{
struct ogl_fb_info *ogl_internal = (struct ogl_fb_info *)fb_p->data;
BU_CKMAG(fb_p, FB_OGL_MAGIC, "ogl framebuffer");
@@ -1385,7 +1385,7 @@
int
-ogl_close_existing(fb *ifp)
+ogl_close_existing(struct fb *ifp)
{
if (OGL(ifp)->cursor)
XDestroyWindow(OGL(ifp)->dispp, OGL(ifp)->cursor);
@@ -1423,7 +1423,7 @@
HIDDEN int
-ogl_final_close(fb *ifp)
+ogl_final_close(struct fb *ifp)
{
Display *display = OGL(ifp)->dispp;
Window window = OGL(ifp)->wind;
@@ -1443,7 +1443,7 @@
HIDDEN int
-ogl_flush(fb *ifp)
+ogl_flush(struct fb *ifp)
{
if (FB_DEBUG)
printf("flushing, copy flag is %d\n", OGL(ifp)->copy_flag);
@@ -1476,7 +1476,7 @@
* Handle any pending input events
*/
HIDDEN int
-ogl_poll(fb *ifp)
+ogl_poll(struct fb *ifp)
{
ogl_do_event(ifp);
@@ -1487,7 +1487,7 @@
HIDDEN int
-fb_ogl_close(fb *ifp)
+fb_ogl_close(struct fb *ifp)
{
ogl_flush(ifp);
@@ -1536,7 +1536,7 @@
* Free shared memory resources, and close.
*/
HIDDEN int
-ogl_free(fb *ifp)
+ogl_free(struct fb *ifp)
{
int ret;
@@ -1555,7 +1555,7 @@
HIDDEN int
-ogl_clear(fb *ifp, unsigned char *pp)
+ogl_clear(struct fb *ifp, unsigned char *pp)
{
struct fb_pixel bg;
register struct fb_pixel *oglp;
@@ -1629,7 +1629,7 @@
HIDDEN int
-ogl_view(fb *ifp, int xcenter, int ycenter, int xzoom, int yzoom)
+ogl_view(struct fb *ifp, int xcenter, int ycenter, int xzoom, int yzoom)
{
struct fb_clip *clp;
@@ -1702,7 +1702,7 @@
HIDDEN int
-ogl_getview(fb *ifp, int *xcenter, int *ycenter, int *xzoom, int *yzoom)
+ogl_getview(struct fb *ifp, int *xcenter, int *ycenter, int *xzoom, int *yzoom)
{
if (FB_DEBUG)
printf("entering ogl_getview\n");
@@ -1718,7 +1718,7 @@
/* read count pixels into pixelp starting at x, y */
HIDDEN ssize_t
-ogl_read(fb *ifp, int x, int y, unsigned char *pixelp, size_t count)
+ogl_read(struct fb *ifp, int x, int y, unsigned char *pixelp, size_t count)
{
size_t n;
size_t scan_count; /* # pix on this scanline */
@@ -1770,7 +1770,7 @@
/* write count pixels from pixelp starting at xstart, ystart */
HIDDEN ssize_t
-ogl_write(fb *ifp, int xstart, int ystart, const unsigned char *pixelp, size_t
count)
+ogl_write(struct fb *ifp, int xstart, int ystart, const unsigned char *pixelp,
size_t count)
{
size_t scan_count; /* # pix on this scanline */
register unsigned char *cp;
@@ -1900,7 +1900,7 @@
* separately.
*/
HIDDEN int
-ogl_writerect(fb *ifp, int xmin, int ymin, int width, int height, const
unsigned char *pp)
+ogl_writerect(struct fb *ifp, int xmin, int ymin, int width, int height, const
unsigned char *pp)
{
register int x;
register int y;
@@ -1965,7 +1965,7 @@
* separately.
*/
HIDDEN int
-ogl_bwwriterect(fb *ifp, int xmin, int ymin, int width, int height, const
unsigned char *pp)
+ogl_bwwriterect(struct fb *ifp, int xmin, int ymin, int width, int height,
const unsigned char *pp)
{
register int x;
register int y;
@@ -2025,7 +2025,7 @@
HIDDEN int
-ogl_rmap(register fb *ifp, register ColorMap *cmp)
+ogl_rmap(register struct fb *ifp, register ColorMap *cmp)
{
register int i;
@@ -2043,7 +2043,7 @@
HIDDEN int
-ogl_wmap(register fb *ifp, register const ColorMap *cmp)
+ogl_wmap(register struct fb *ifp, register const ColorMap *cmp)
{
register int i;
int prev; /* !0 = previous cmap was non-linear */
@@ -2104,7 +2104,7 @@
HIDDEN int
-ogl_help(fb *ifp)
+ogl_help(struct fb *ifp)
{
struct modeflags *mfp;
XVisualInfo *visual = OGL(ifp)->vip;
@@ -2168,7 +2168,7 @@
HIDDEN int
-ogl_setcursor(fb *ifp, const unsigned char *UNUSED(bits), int UNUSED(xbits),
int UNUSED(ybits), int UNUSED(xorig), int UNUSED(yorig))
+ogl_setcursor(struct fb *ifp, const unsigned char *UNUSED(bits), int
UNUSED(xbits), int UNUSED(ybits), int UNUSED(xorig), int UNUSED(yorig))
{
FB_CK_FB(ifp);
@@ -2177,7 +2177,7 @@
HIDDEN int
-ogl_cursor(fb *ifp, int mode, int x, int y)
+ogl_cursor(struct fb *ifp, int mode, int x, int y)
{
if (mode) {
register int xx, xy;
@@ -2240,7 +2240,7 @@
int
-ogl_refresh(fb *ifp, int x, int y, int w, int h)
+ogl_refresh(struct fb *ifp, int x, int y, int w, int h)
{
int mm;
struct fb_clip *clp;
@@ -2287,7 +2287,7 @@
/* This is the ONLY thing that we normally "export" */
-fb ogl_interface =
+struct fb ogl_interface =
{
0, /* magic number slot */
FB_OGL_MAGIC,
Modified: brlcad/trunk/src/libfb/if_osgl.cpp
===================================================================
--- brlcad/trunk/src/libfb/if_osgl.cpp 2020-04-15 19:13:25 UTC (rev 75411)
+++ brlcad/trunk/src/libfb/if_osgl.cpp 2020-04-15 19:20:09 UTC (rev 75412)
@@ -17,7 +17,7 @@
* License along with this file; see the file named COPYING for more
* information.
*/
-/** @addtogroup libfb */
+/** @addtogroup libstruct fb */
/** @{ */
/** @file if_osgl.cpp
*
@@ -171,7 +171,7 @@
* rectangle of the frame buffer
*/
HIDDEN void
-osgl_xmit_scanlines(register fb *ifp, int ybase, int nlines, int xbase, int
npix)
+osgl_xmit_scanlines(register struct fb *ifp, int ybase, int nlines, int xbase,
int npix)
{
register int y;
register int n;
@@ -285,7 +285,7 @@
HIDDEN void
-osgl_cminit(register fb *ifp)
+osgl_cminit(register struct fb *ifp)
{
register int i;
@@ -298,7 +298,7 @@
HIDDEN int
-osgl_getmem(fb *ifp)
+osgl_getmem(struct fb *ifp)
{
int pixsize;
int size;
@@ -357,7 +357,7 @@
* (xpixmin, xpixmax, ypixmin, ypixmax)
*/
void
-fb_clipper(register fb *ifp)
+fb_clipper(register struct fb *ifp)
{
register struct fb_clip *clp;
register int i;
@@ -403,7 +403,7 @@
}
int
-osgl_configureWindow(fb *ifp, int width, int height)
+osgl_configureWindow(struct fb *ifp, int width, int height)
{
if (width == OSGL(ifp)->win_width &&
height == OSGL(ifp)->win_height)
@@ -430,7 +430,7 @@
HIDDEN void
-osgl_do_event(fb *ifp)
+osgl_do_event(struct fb *ifp)
{
if (OSGL(ifp)->firstTime) {
OSGL(ifp)->firstTime = 0;
@@ -445,7 +445,7 @@
* linear map, 0 for non-linear map (i.e., non-identity map).
*/
HIDDEN int
-is_linear_cmap(register fb *ifp)
+is_linear_cmap(register struct fb *ifp)
{
register int i;
@@ -459,7 +459,7 @@
HIDDEN int
-fb_osgl_open(fb *ifp, const char *UNUSED(file), int width, int height)
+fb_osgl_open(struct fb *ifp, const char *UNUSED(file), int width, int height)
{
FB_CK_FB(ifp);
@@ -596,7 +596,7 @@
int
-_osgl_open_existing(fb *ifp, int width, int height, void *glc, void *traits)
+_osgl_open_existing(struct fb *ifp, int width, int height, void *glc, void
*traits)
{
/*
* Allocate extension memory sections,
@@ -670,7 +670,7 @@
}
HIDDEN int
-osgl_open_existing(fb *ifp, int width, int height, struct fb_platform_specific
*fb_p)
+osgl_open_existing(struct fb *ifp, int width, int height, struct
fb_platform_specific *fb_p)
{
struct osgl_fb_info *osgl_internal = (struct osgl_fb_info *)fb_p->data;
BU_CKMAG(fb_p, FB_OSGL_MAGIC, "osgl framebuffer");
@@ -679,7 +679,7 @@
HIDDEN int
-osgl_final_close(fb *ifp)
+osgl_final_close(struct fb *ifp)
{
if (FB_DEBUG)
printf("osgl_final_close: All done...goodbye!\n");
@@ -713,7 +713,7 @@
HIDDEN int
-osgl_flush(fb *UNUSED(ifp))
+osgl_flush(struct fb *UNUSED(ifp))
{
glFlush();
return 0;
@@ -721,7 +721,7 @@
HIDDEN int
-fb_osgl_close(fb *ifp)
+fb_osgl_close(struct fb *ifp)
{
osgl_flush(ifp);
@@ -769,7 +769,7 @@
int
-osgl_close_existing(fb *ifp)
+osgl_close_existing(struct fb *ifp)
{
if (WINL(ifp) != NULL) {
/* free memory */
@@ -793,7 +793,7 @@
* Handle any pending input events
*/
HIDDEN int
-osgl_poll(fb *ifp)
+osgl_poll(struct fb *ifp)
{
osgl_do_event(ifp);
@@ -807,7 +807,7 @@
* Free memory resources and close.
*/
HIDDEN int
-osgl_free(fb *ifp)
+osgl_free(struct fb *ifp)
{
int ret;
@@ -822,7 +822,7 @@
HIDDEN int
-osgl_clear(fb *ifp, unsigned char *pp)
+osgl_clear(struct fb *ifp, unsigned char *pp)
{
struct fb_pixel bg;
register struct fb_pixel *osglp;
@@ -888,7 +888,7 @@
HIDDEN int
-osgl_view(fb *ifp, int xcenter, int ycenter, int xzoom, int yzoom)
+osgl_view(struct fb *ifp, int xcenter, int ycenter, int xzoom, int yzoom)
{
struct fb_clip *clp;
@@ -948,7 +948,7 @@
HIDDEN int
-osgl_getview(fb *ifp, int *xcenter, int *ycenter, int *xzoom, int *yzoom)
+osgl_getview(struct fb *ifp, int *xcenter, int *ycenter, int *xzoom, int
*yzoom)
{
if (FB_DEBUG)
printf("entering osgl_getview\n");
@@ -964,7 +964,7 @@
/* read count pixels into pixelp starting at x, y */
HIDDEN ssize_t
-osgl_read(fb *ifp, int x, int y, unsigned char *pixelp, size_t count)
+osgl_read(struct fb *ifp, int x, int y, unsigned char *pixelp, size_t count)
{
size_t n;
size_t scan_count; /* # pix on this scanline */
@@ -1019,7 +1019,7 @@
/* write count pixels from pixelp starting at xstart, ystart */
HIDDEN ssize_t
-osgl_write(fb *ifp, int xstart, int ystart, const unsigned char *pixelp,
size_t count)
+osgl_write(struct fb *ifp, int xstart, int ystart, const unsigned char
*pixelp, size_t count)
{
register int x;
register int y;
@@ -1185,7 +1185,7 @@
* separately.
*/
HIDDEN int
-osgl_writerect(fb *ifp, int xmin, int ymin, int width, int height, const
unsigned char *pp)
@@ Diff output truncated at 100000 characters. @@
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
_______________________________________________
BRL-CAD Source Commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
