Revision: 76682
http://sourceforge.net/p/brlcad/code/76682
Author: starseeker
Date: 2020-08-07 14:23:49 +0000 (Fri, 07 Aug 2020)
Log Message:
-----------
more syncing between MGED and fbserv
Modified Paths:
--------------
brlcad/trunk/src/fbserv/fbserv.c
brlcad/trunk/src/fbserv/server.c
Modified: brlcad/trunk/src/fbserv/fbserv.c
===================================================================
--- brlcad/trunk/src/fbserv/fbserv.c 2020-08-07 14:14:04 UTC (rev 76681)
+++ brlcad/trunk/src/fbserv/fbserv.c 2020-08-07 14:23:49 UTC (rev 76682)
@@ -109,7 +109,7 @@
int verbose = 0;
/* from server.c */
-extern const struct pkg_switch fb_server_pkg_switch[];
+extern const struct pkg_switch pkg_switch[];
extern struct fb *fb_server_fbp;
extern fd_set *fb_server_select_list;
extern int *fb_server_max_fd;
@@ -337,7 +337,7 @@
/* Accept any new client connections */
if (netfd > 0 && FD_ISSET(netfd, &infds)) {
- fbserv_new_client(pkg_getclient(netfd, fb_server_pkg_switch,
communications_error, 0));
+ fbserv_new_client(pkg_getclient(netfd, pkg_switch,
communications_error, 0));
nopens++;
}
@@ -416,7 +416,7 @@
netfd = 0;
if (is_socket(netfd)) {
init_syslog();
- fbserv_new_client(pkg_transerver(fb_server_pkg_switch,
communications_error));
+ fbserv_new_client(pkg_transerver(pkg_switch, communications_error));
max_fd = 8;
once_only = 1;
main_loop();
@@ -486,7 +486,7 @@
int fbstat;
struct pkg_conn *pcp;
- pcp = pkg_getclient(netfd, fb_server_pkg_switch, communications_error,
0);
+ pcp = pkg_getclient(netfd, pkg_switch, communications_error, 0);
if (pcp == PKC_ERROR)
break; /* continue is unlikely to work */
Modified: brlcad/trunk/src/fbserv/server.c
===================================================================
--- brlcad/trunk/src/fbserv/server.c 2020-08-07 14:14:04 UTC (rev 76681)
+++ brlcad/trunk/src/fbserv/server.c 2020-08-07 14:23:49 UTC (rev 76682)
@@ -64,9 +64,9 @@
* which might send the message back across the wire.
*/
static void
-fb_server_got_unknown(struct pkg_conn *pcp, char *buf)
+fb_server_fb_unknown(struct pkg_conn *pcp, char *buf)
{
- fb_log("fb_server_got_unknown: message type %d not part of remote LIBFB
protocol, ignored.\n",
+ fb_log("fb_server_fb_unknown: message type %d not part of remote LIBFB
protocol, ignored.\n",
pcp->pkc_type);
(void)free(buf);
}
@@ -698,39 +698,38 @@
if (buf) (void)free(buf);
}
-
-const struct pkg_switch fb_server_pkg_switch[] = {
- { 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_got_unknown, "Error Message", NULL },
- { MSG_CLOSE, fb_server_got_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 }
+const struct pkg_switch pkg_switch[] = {
+ { 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
