Revision: 76681
http://sourceforge.net/p/brlcad/code/76681
Author: starseeker
Date: 2020-08-07 14:14:04 +0000 (Fri, 07 Aug 2020)
Log Message:
-----------
Rename to match standalone fbserv
Modified Paths:
--------------
brlcad/trunk/src/mged/fbserv.c
Modified: brlcad/trunk/src/mged/fbserv.c
===================================================================
--- brlcad/trunk/src/mged/fbserv.c 2020-08-07 13:55:15 UTC (rev 76680)
+++ brlcad/trunk/src/mged/fbserv.c 2020-08-07 14:14:04 UTC (rev 76681)
@@ -470,10 +470,10 @@
* This is where we go for message types we don't understand.
*/
void
-rfbunknown(struct pkg_conn *pcp, char *buf)
+fb_server_fb_unknown(struct pkg_conn *pcp, char *buf)
{
if (buf == NULL) {
- bu_log("rfbunknown: null buffer\n");
+ bu_log("fb_server_fb_unknown: null buffer\n");
return;
}
@@ -484,14 +484,14 @@
/******** Here's where the hooks lead *********/
-void
-rfbopen(struct pkg_conn *pcp, char *buf)
+static void
+fb_server_fb_open(struct pkg_conn *pcp, char *buf)
{
char rbuf[5*NET_LONG_LEN+1];
int want;
if (buf == NULL) {
- bu_log("rfbopen: null buffer\n");
+ bu_log("fb_server_fb_open: null buffer\n");
return;
}
@@ -510,8 +510,8 @@
}
-void
-rfbclose(struct pkg_conn *pcp, char *buf)
+static void
+fb_server_fb_close(struct pkg_conn *pcp, char *buf)
{
char rbuf[NET_LONG_LEN+1];
@@ -533,8 +533,8 @@
}
-void
-rfbfree(struct pkg_conn *pcp, char *buf)
+static void
+fb_server_fb_free(struct pkg_conn *pcp, char *buf)
{
char rbuf[NET_LONG_LEN+1];
@@ -547,14 +547,14 @@
}
-void
-rfbclear(struct pkg_conn *pcp, char *buf)
+static void
+fb_server_fb_clear(struct pkg_conn *pcp, char *buf)
{
RGBpixel bg;
char rbuf[NET_LONG_LEN+1];
if (buf == NULL) {
- bu_log("rfbwindow: null buffer\n");
+ bu_log("fb_server_fb_window: null buffer\n");
return;
}
@@ -569,8 +569,8 @@
}
-void
-rfbread(struct pkg_conn *pcp, char *buf)
+static void
+fb_server_fb_read(struct pkg_conn *pcp, char *buf)
{
int x, y;
size_t num;
@@ -579,7 +579,7 @@
static size_t buflen = 0;
if (buf == NULL) {
- bu_log("rfbreadrect: null buffer\n");
+ bu_log("fb_server_fb_readrect: null buffer\n");
return;
}
@@ -609,8 +609,8 @@
}
-void
-rfbwrite(struct pkg_conn *pcp, char *buf)
+static void
+fb_server_fb_write(struct pkg_conn *pcp, char *buf)
{
int x, y, num;
char rbuf[NET_LONG_LEN+1];
@@ -618,7 +618,7 @@
int type;
if (buf == NULL) {
- bu_log("rfbreadrect: null buffer\n");
+ bu_log("fb_server_fb_readrect: null buffer\n");
return;
}
@@ -636,8 +636,8 @@
}
-void
-rfbreadrect(struct pkg_conn *pcp, char *buf)
+static void
+fb_server_fb_readrect(struct pkg_conn *pcp, char *buf)
{
int xmin, ymin;
int width, height;
@@ -647,7 +647,7 @@
static size_t buflen = 0;
if (buf == NULL) {
- bu_log("rfbreadrect: null buffer\n");
+ bu_log("fb_server_fb_readrect: null buffer\n");
return;
}
@@ -679,8 +679,8 @@
}
-void
-rfbwriterect(struct pkg_conn *pcp, char *buf)
+static void
+fb_server_fb_writerect(struct pkg_conn *pcp, char *buf)
{
int x, y;
int width, height;
@@ -689,7 +689,7 @@
int type;
if (buf == NULL) {
- bu_log("rfbreadrect: null buffer\n");
+ bu_log("fb_server_fb_readrect: null buffer\n");
return;
}
@@ -710,8 +710,8 @@
}
-void
-rfbbwreadrect(struct pkg_conn *pcp, char *buf)
+static void
+fb_server_fb_bwreadrect(struct pkg_conn *pcp, char *buf)
{
int xmin, ymin;
int width, height;
@@ -721,7 +721,7 @@
static int buflen = 0;
if (buf == NULL) {
- bu_log("rfbbwreadrect: null buffer\n");
+ bu_log("fb_server_fb_bwreadrect: null buffer\n");
return;
}
@@ -738,7 +738,7 @@
if (buflen < 1024)
buflen = 1024;
if ((scanbuf = (unsigned char *)malloc(buflen)) == NULL) {
- fb_log("rfbbwreadrect: malloc failed!");
+ fb_log("fb_server_fb_bwreadrect: malloc failed!");
(void)free(buf);
buflen = 0;
return;
@@ -753,8 +753,8 @@
}
-void
-rfbbwwriterect(struct pkg_conn *pcp, char *buf)
+static void
+fb_server_fb_bwwriterect(struct pkg_conn *pcp, char *buf)
{
int x, y;
int width, height;
@@ -784,14 +784,14 @@
}
-void
-rfbcursor(struct pkg_conn *pcp, char *buf)
+static void
+fb_server_fb_cursor(struct pkg_conn *pcp, char *buf)
{
int mode, x, y;
char rbuf[NET_LONG_LEN+1];
if (buf == NULL) {
- bu_log("rfbwindow: null buffer\n");
+ bu_log("fb_server_fb_window: null buffer\n");
return;
}
@@ -805,8 +805,8 @@
}
-void
-rfbgetcursor(struct pkg_conn *pcp, char *buf)
+static void
+fb_server_fb_getcursor(struct pkg_conn *pcp, char *buf)
{
int ret;
int mode, x, y;
@@ -822,8 +822,8 @@
}
-void
-rfbsetcursor(struct pkg_conn *pcp, char *buf)
+static void
+fb_server_fb_setcursor(struct pkg_conn *pcp, char *buf)
{
char rbuf[NET_LONG_LEN+1];
int ret;
@@ -831,7 +831,7 @@
int xorig, yorig;
if (buf == NULL) {
- bu_log("rfbreadrect: null buffer\n");
+ bu_log("fb_server_fb_readrect: null buffer\n");
return;
}
@@ -852,14 +852,14 @@
/*OLD*/
-void
-rfbscursor(struct pkg_conn *pcp, char *buf)
+static void
+fb_server_fb_scursor(struct pkg_conn *pcp, char *buf)
{
int mode, x, y;
char rbuf[NET_LONG_LEN+1];
if (buf == NULL) {
- bu_log("rfbopen: null buffer\n");
+ bu_log("fb_server_fb_open: null buffer\n");
return;
}
@@ -874,14 +874,14 @@
/*OLD*/
-void
-rfbwindow(struct pkg_conn *pcp, char *buf)
+static void
+fb_server_fb_window(struct pkg_conn *pcp, char *buf)
{
int x, y;
char rbuf[NET_LONG_LEN+1];
if (buf == NULL) {
- bu_log("rfbwindow: null buffer\n");
+ bu_log("fb_server_fb_window: null buffer\n");
return;
}
@@ -895,14 +895,14 @@
/*OLD*/
-void
-rfbzoom(struct pkg_conn *pcp, char *buf)
+static void
+fb_server_fb_zoom(struct pkg_conn *pcp, char *buf)
{
int x, y;
char rbuf[NET_LONG_LEN+1];
if (buf == NULL) {
- bu_log("rfbreadrect: null buffer\n");
+ bu_log("fb_server_fb_readrect: null buffer\n");
return;
}
@@ -915,8 +915,8 @@
}
-void
-rfbview(struct pkg_conn *pcp, char *buf)
+static void
+fb_server_fb_view(struct pkg_conn *pcp, char *buf)
{
int ret;
int xcenter, ycenter, xzoom, yzoom;
@@ -923,7 +923,7 @@
char rbuf[NET_LONG_LEN+1];
if (buf == NULL) {
- bu_log("rfbreadrect: null buffer\n");
+ bu_log("fb_server_fb_readrect: null buffer\n");
return;
}
@@ -939,8 +939,8 @@
}
-void
-rfbgetview(struct pkg_conn *pcp, char *buf)
+static void
+fb_server_fb_getview(struct pkg_conn *pcp, char *buf)
{
int ret;
int xcenter, ycenter, xzoom, yzoom;
@@ -957,8 +957,8 @@
}
-void
-rfbrmap(struct pkg_conn *pcp, char *buf)
+static void
+fb_server_fb_rmap(struct pkg_conn *pcp, char *buf)
{
int i;
char rbuf[NET_LONG_LEN+1];
@@ -983,8 +983,8 @@
* (IBM) order 2-byte short, 256 red shorts, followed by 256 green and
* 256 blue, for a total of 3*256*2 bytes.
*/
-void
-rfbwmap(struct pkg_conn *pcp, char *buf)
+static void
+fb_server_fb_wmap(struct pkg_conn *pcp, char *buf)
{
int i;
char rbuf[NET_LONG_LEN+1];
@@ -992,7 +992,7 @@
ColorMap map;
if (buf == NULL) {
- bu_log("rfbwmap: null buffer\n");
+ bu_log("fb_server_fb_wmap: null buffer\n");
return;
}
@@ -1012,8 +1012,8 @@
}
-void
-rfbflush(struct pkg_conn *pcp, char *buf)
+static void
+fb_server_fb_flush(struct pkg_conn *pcp, char *buf)
{
int ret;
char rbuf[NET_LONG_LEN+1];
@@ -1028,8 +1028,8 @@
}
-void
-rfbpoll(struct pkg_conn *pcp, char *buf)
+static void
+fb_server_fb_poll(struct pkg_conn *pcp, char *buf)
{
if (!pcp) return;
(void)fb_poll(fbp);
@@ -1041,14 +1041,14 @@
* At one time at least we couldn't send a zero length PKG message
* back and forth, so we receive a dummy long here.
*/
-void
-rfbhelp(struct pkg_conn *pcp, char *buf)
+static void
+fb_server_fb_help(struct pkg_conn *pcp, char *buf)
{
long ret;
char rbuf[NET_LONG_LEN+1];
if (buf == NULL) {
- bu_log("rfbwindow: null buffer\n");
+ bu_log("fb_server_fb_window: null buffer\n");
return;
}
@@ -1061,36 +1061,36 @@
}
const struct pkg_switch pkg_switch[] = {
- { MSG_FBOPEN, rfbopen, "Open Framebuffer",
NULL },
- { MSG_FBCLOSE, rfbclose, "Close Framebuffer",
NULL },
- { MSG_FBCLEAR, rfbclear, "Clear Framebuffer",
NULL },
- { MSG_FBREAD, rfbread, "Read Pixels", NULL },
- { MSG_FBWRITE, rfbwrite, "Write Pixels", NULL },
- { MSG_FBWRITE + MSG_NORETURN, rfbwrite, "Asynch write", NULL },
- { MSG_FBCURSOR, rfbcursor, "Cursor", NULL },
- { MSG_FBGETCURSOR, rfbgetcursor, "Get Cursor", NULL },
/*NEW*/
- { MSG_FBSCURSOR, rfbscursor, "Screen Cursor", NULL
}, /*OLD*/
- { MSG_FBWINDOW, rfbwindow, "Window", NULL },
/*OLD*/
- { MSG_FBZOOM, rfbzoom, "Zoom", NULL },
/*OLD*/
- { MSG_FBVIEW, rfbview, "View", NULL },
/*NEW*/
- { MSG_FBGETVIEW, rfbgetview, "Get View", NULL },
/*NEW*/
- { MSG_FBRMAP, rfbrmap, "R Map", NULL },
- { MSG_FBWMAP, rfbwmap, "W Map", NULL },
- { MSG_FBHELP, rfbhelp, "Help Request", NULL },
- { MSG_ERROR, rfbunknown, "Error Message", NULL
},
- { MSG_CLOSE, rfbunknown, "Close Connection",
NULL },
- { MSG_FBREADRECT, rfbreadrect, "Read Rectangle", NULL
},
- { MSG_FBWRITERECT, rfbwriterect, "Write Rectangle",
NULL },
- { MSG_FBWRITERECT + MSG_NORETURN, rfbwriterect, "Write Rectangle",
NULL },
- { MSG_FBBWREADRECT, rfbbwreadrect, "Read BW Rectangle",
NULL },
- { MSG_FBBWWRITERECT, rfbbwwriterect, "Write BW Rectangle",
NULL },
- { MSG_FBBWWRITERECT + MSG_NORETURN, rfbbwwriterect, "Write BW Rectangle",
NULL },
- { MSG_FBFLUSH, rfbflush, "Flush Output", NULL },
- { MSG_FBFLUSH + MSG_NORETURN, rfbflush, "Flush Output", NULL },
- { MSG_FBFREE, rfbfree, "Free Resources", NULL
},
- { MSG_FBPOLL, rfbpoll, "Handle Events", NULL
},
- { MSG_FBSETCURSOR, rfbsetcursor, "Set Cursor Shape",
NULL },
- { MSG_FBSETCURSOR + MSG_NORETURN, rfbsetcursor, "Set Cursor Shape",
NULL },
+ { MSG_FBOPEN, fb_server_fb_open, "Open
Framebuffer", NULL },
+ { MSG_FBCLOSE, fb_server_fb_close, "Close
Framebuffer", NULL },
+ { MSG_FBCLEAR, fb_server_fb_clear, "Clear
Framebuffer", NULL },
+ { MSG_FBREAD, fb_server_fb_read, "Read
Pixels", NULL },
+ { MSG_FBWRITE, fb_server_fb_write, "Write
Pixels", NULL },
+ { MSG_FBWRITE + MSG_NORETURN, fb_server_fb_write, "Asynch
write", NULL },
+ { MSG_FBCURSOR, fb_server_fb_cursor, "Cursor",
NULL },
+ { MSG_FBGETCURSOR, fb_server_fb_getcursor, "Get
Cursor", NULL }, /*NEW*/
+ { MSG_FBSCURSOR, fb_server_fb_scursor, "Screen
Cursor", NULL }, /*OLD*/
+ { MSG_FBWINDOW, fb_server_fb_window, "Window",
NULL }, /*OLD*/
+ { MSG_FBZOOM, fb_server_fb_zoom, "Zoom", NULL
}, /*OLD*/
+ { MSG_FBVIEW, fb_server_fb_view, "View", NULL
}, /*NEW*/
+ { MSG_FBGETVIEW, fb_server_fb_getview, "Get View",
NULL }, /*NEW*/
+ { MSG_FBRMAP, fb_server_fb_rmap, "R Map",
NULL },
+ { MSG_FBWMAP, fb_server_fb_wmap, "W Map",
NULL },
+ { MSG_FBHELP, fb_server_fb_help, "Help
Request", NULL },
+ { MSG_ERROR, fb_server_fb_unknown, "Error
Message", NULL },
+ { MSG_CLOSE, fb_server_fb_unknown, "Close
Connection", NULL },
+ { MSG_FBREADRECT, fb_server_fb_readrect, "Read
Rectangle", NULL },
+ { MSG_FBWRITERECT, fb_server_fb_writerect, "Write
Rectangle", NULL },
+ { MSG_FBWRITERECT + MSG_NORETURN, fb_server_fb_writerect, "Write
Rectangle", NULL },
+ { MSG_FBBWREADRECT, fb_server_fb_bwreadrect, "Read BW
Rectangle", NULL },
+ { MSG_FBBWWRITERECT, fb_server_fb_bwwriterect, "Write BW
Rectangle", NULL },
+ { MSG_FBBWWRITERECT + MSG_NORETURN, fb_server_fb_bwwriterect, "Write BW
Rectangle", NULL },
+ { MSG_FBFLUSH, fb_server_fb_flush, "Flush
Output", NULL },
+ { MSG_FBFLUSH + MSG_NORETURN, fb_server_fb_flush, "Flush
Output", NULL },
+ { MSG_FBFREE, fb_server_fb_free, "Free
Resources", NULL },
+ { MSG_FBPOLL, fb_server_fb_poll, "Handle
Events", NULL },
+ { MSG_FBSETCURSOR, fb_server_fb_setcursor, "Set Cursor
Shape", NULL },
+ { MSG_FBSETCURSOR + MSG_NORETURN, fb_server_fb_setcursor, "Set Cursor
Shape", NULL },
{ 0, NULL, NULL, NULL }
};
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
