Revision: 75114 http://sourceforge.net/p/brlcad/code/75114 Author: starseeker Date: 2020-03-25 23:37:38 +0000 (Wed, 25 Mar 2020) Log Message: ----------- libcursor is no longer used
Modified Paths: -------------- brlcad/trunk/HACKING brlcad/trunk/doc/docbook/articles/main_menu.xml brlcad/trunk/doc/docbook/system/man3/CMakeLists.txt brlcad/trunk/doc/trunk_hierarchy.org brlcad/trunk/include/CMakeLists.txt brlcad/trunk/misc/clang-static-analyzer-run.sh brlcad/trunk/misc/doxygen/CMakeLists.txt brlcad/trunk/src/CMakeLists.txt brlcad/trunk/src/README Removed Paths: ------------- brlcad/trunk/doc/docbook/system/man3/libcursor.xml brlcad/trunk/include/cursor.h brlcad/trunk/misc/doxygen/libcursor.dox brlcad/trunk/src/libcursor/ Modified: brlcad/trunk/HACKING =================================================================== --- brlcad/trunk/HACKING 2020-03-25 23:21:50 UTC (rev 75113) +++ brlcad/trunk/HACKING 2020-03-25 23:37:38 UTC (rev 75114) @@ -263,10 +263,6 @@ Rational BSpline based boundary representations. Depends on: libbg libbn libbu OpenNURBS -libcursor: The cursor library is a lightweight cursor manipulation -library similar to curses but with less overhead. - Depends on: termlib - libdm: The display manager library contains the logic for generalizing a drawable context. This includes the ability to output drawing/plotting instructions to a variety of devices such as X11, Modified: brlcad/trunk/doc/docbook/articles/main_menu.xml =================================================================== --- brlcad/trunk/doc/docbook/articles/main_menu.xml 2020-03-25 23:21:50 UTC (rev 75113) +++ brlcad/trunk/doc/docbook/articles/main_menu.xml 2020-03-25 23:37:38 UTC (rev 75114) @@ -3737,13 +3737,8 @@ <link xlink:href="../xxxxx.php">Man 3</link> </para> <itemizedlist> - <listitem> + <listitem> <para> - <link xlink:href="../../man3/en/libcursor.php">Libcursor</link> - </para> - </listitem> - <listitem> - <para> <link xlink:href="../../man3/en/libfb.php">Lib fb</link> </para> </listitem> Modified: brlcad/trunk/doc/docbook/system/man3/CMakeLists.txt =================================================================== --- brlcad/trunk/doc/docbook/system/man3/CMakeLists.txt 2020-03-25 23:21:50 UTC (rev 75113) +++ brlcad/trunk/doc/docbook/system/man3/CMakeLists.txt 2020-03-25 23:37:38 UTC (rev 75114) @@ -1,5 +1,4 @@ set(man3_EN - libcursor.xml libfb.xml libplot3.xml librt.xml Deleted: brlcad/trunk/doc/docbook/system/man3/libcursor.xml =================================================================== --- brlcad/trunk/doc/docbook/system/man3/libcursor.xml 2020-03-25 23:21:50 UTC (rev 75113) +++ brlcad/trunk/doc/docbook/system/man3/libcursor.xml 2020-03-25 23:37:38 UTC (rev 75114) @@ -1,246 +0,0 @@ -<?xml version="1.0" encoding="ISO-8859-1"?> -<!-- lifted from troff+man by doclifter --> -<refentry xmlns='http://docbook.org/ns/docbook' version='5.0' xml:lang='en' xml:id='libcursor3'> -<refmeta> - <refentrytitle>LIBCURSOR</refentrytitle> -<manvolnum>3</manvolnum> -<refmiscinfo class='source'>BRL-CAD</refmiscinfo> -<refmiscinfo class='manual'>BRL-CAD</refmiscinfo> -</refmeta> - -<refnamediv> -<refname>libcursor</refname> -<refpurpose>cursor control library</refpurpose> -</refnamediv> -<!-- body begins here --> -<refsynopsisdiv xml:id='synopsis'> -<funcsynopsis> -<funcsynopsisinfo> -#include <stdio.h> - -</funcsynopsisinfo> -<funcprototype> -<funcdef>int <function>InitTermCap</function></funcdef> -<paramdef><parameter>fp</parameter></paramdef> -</funcprototype> -<funcsynopsisinfo> -FILE *fp; - -</funcsynopsisinfo> -<funcprototype> -<funcdef>int <function>MvCursor</function></funcdef> -<paramdef><parameter>x</parameter></paramdef> -<paramdef><parameter>y</parameter></paramdef> -</funcprototype> -<funcsynopsisinfo> -int x, y; - -</funcsynopsisinfo> -<funcprototype> -<funcdef>int <function>HmCursor</function></funcdef> -<void/></funcprototype> - -<funcprototype> -<funcdef>int <function>ClrEOL</function></funcdef> -<void/></funcprototype> - -<funcprototype> -<funcdef>int <function>ClrText</function></funcdef> -<void/></funcprototype> - -<funcprototype> -<funcdef>int <function>ClrStandout</function></funcdef> -<void/></funcprototype> - -<funcprototype> -<funcdef>int <function>SetStandout</function></funcdef> -<void/></funcprototype> - -<funcprototype> -<funcdef>int <function>SetScrlReg</function></funcdef> -<paramdef><parameter>top</parameter></paramdef> -<paramdef><parameter>bottom</parameter></paramdef> -</funcprototype> -<funcsynopsisinfo> -int top, bottom; - -</funcsynopsisinfo> -<funcprototype> -<funcdef>int <function>ResetScrlReg</function></funcdef> -<void/></funcprototype> - -<funcprototype> -<funcdef>int <function>ScrollUp</function></funcdef> -<void/></funcprototype> - -<funcprototype> -<funcdef>int <function>ScrollDn</function></funcdef> -<void/></funcprototype> - -<funcprototype> -<funcdef>int <function>DeleteLn</function></funcdef> -<void/></funcprototype> - -<funcprototype> -<funcdef>int <function>PutChr</function></funcdef> -<paramdef><parameter>c</parameter></paramdef> -</funcprototype> -<funcsynopsisinfo> -int c; - -extern char termName[]; - -</funcsynopsisinfo> -</funcsynopsis> -<para><emphasis remap='B'>extern int LI;</emphasis> /* number of lines on screen (or layer) */</para> - -<para><emphasis remap='B'>extern int CO;</emphasis> /* number of columns on screen (or layer) */</para> -</refsynopsisdiv> - - -<refsect1 xml:id='description'><title>DESCRIPTION</title> -<para>These routines are designed to provide a terminal-independent means of controlling -cursor movement, character attributes, text scrolling, and erasure of text -which is a level above the -<citerefentry><refentrytitle>termlib</refentrytitle><manvolnum>3</manvolnum></citerefentry> -library. -It is similar to the -<citerefentry><refentrytitle>curses</refentrytitle><manvolnum>3</manvolnum></citerefentry> -library, but does not address the problem of maintaining windows, so it has much -less overhead and avoids the associated bugs.</para> - -<para><emphasis remap='I'>InitTermCap</emphasis> -must be passed the output stream pointer and invoked before any other functions -in this library. -This function reads the -<citerefentry><refentrytitle>termcap</refentrytitle><manvolnum>4</manvolnum></citerefentry> -capability data base to extract terminal-specific parameters -and control strings, -then initializes the terminal, returning 1 for success and 0 for failure. -After -<emphasis remap='I'>InitTermCap</emphasis> -is used, the global buffer -<emphasis remap='I'>termName</emphasis> -will contain the name of the terminal device, or -<emphasis remap='B'>UNKNOWN</emphasis> -in the event of failure -(<emphasis remap='I'>e.g.</emphasis>, -the environment variable -<emphasis remap='SM'>$TERM</emphasis> -was not set or exported (see -<citerefentry><refentrytitle>sh</refentrytitle><manvolnum>1</manvolnum></citerefentry>)); -the global variables -<emphasis remap='I'>LI</emphasis> -and -<emphasis remap='I'>CO</emphasis> -will contain the number of lines and columns, respectively, of the -terminal screen or window layer attached to the specified output stream; -and the terminal control string pointers will be set, or -<acronym>NULL</acronym> -if their respective capabilities are not found. -The terminal control strings are not generally suitable for direct use -as they require the -<emphasis remap='I'>tputs</emphasis> -or -<emphasis remap='I'>tgoto</emphasis> -macros from the -<citerefentry><refentrytitle>termlib</refentrytitle><manvolnum>3</manvolnum></citerefentry> -library, but they may be checked for being -<acronym>NULL</acronym> -to test in advance for a capability, -rather than testing the respective function for -success or failure. -The function -<emphasis remap='I'>PutChr</emphasis> -will place the specified character on the terminal's output stream. -It is not intended -for use by the application (although such use is permissible), -but is defined for the -<citerefentry><refentrytitle>termlib</refentrytitle><manvolnum>3</manvolnum></citerefentry> -library.</para> - -<para>All the following functions will return 1 for success and 0 if the capability -is not described in the -<citerefentry><refentrytitle>termcap</refentrytitle><manvolnum>4</manvolnum></citerefentry> -entry. -<emphasis remap='I'>MvCursor</emphasis> -will move the cursor to the specified column and row -(<emphasis remap='I'>x</emphasis> -and -<emphasis remap='I'>y</emphasis>) -screen location specified. -<emphasis remap='I'>HmCursor</emphasis> -will move the cursor to the origin (top left) of the screen and is equivalent -to -<emphasis remap='I'>MvCursor(1,1)</emphasis>. -To erase from the cursor position to the end of the line, use -<emphasis remap='I'>ClrEOL</emphasis>, -and to erase the entire screen call -<emphasis remap='I'>ClrText</emphasis> -(typically has the side effect of homing the cursor). -To initiate the output of reverse video or emboldened text (depending -upon the terminal's capabilities), use -<emphasis remap='I'>SetStandout</emphasis>; -<emphasis remap='I'>ClrStandout</emphasis> -will restore the normal mode. -For terminals such as the -<emphasis remap='SM'>DEC VT100</emphasis> -which have scrolling region capability, the functions -<emphasis remap='I'>SetScrlReg</emphasis> -and -<emphasis remap='I'>ResetScrlReg</emphasis> -can be used. -<emphasis remap='I'>SetScrlReg</emphasis> -must be invoked with the top and bottom line numbers of the region of the -screen to be scrolled. -The functions -<emphasis remap='I'>ScrollUp</emphasis> -and -<emphasis remap='I'>ScrollDn</emphasis> -will scroll the text on the screen up and down -(forward and backward) respectively, -by one line per invocation. -The function -<emphasis remap='I'>DeleteLn</emphasis> -will delete the line containing the cursor, causing the text -below to scroll up to fill the void.</para> -</refsect1> - -<refsect1 xml:id='example'><title>EXAMPLE</title> -<para><emphasis remap='I'>Libcursor</emphasis> -can be loaded with any C program:</para> - -<literallayout remap='RS'> -$ <emphasis remap='I'>cc program.c -lcursor -ltermlib</emphasis> -</literallayout> <!-- remap='RE' --> -</refsect1> - -<refsect1 xml:id='files'><title>FILES</title> -<para>/usr/brl/lib/libcursor.a -<!-- .br --> -/usr/lib/libtermlib.a -<!-- .br --> -/etc/termcap</para> -</refsect1> - -<refsect1 xml:id='see_also'><title>SEE ALSO</title> -<para><citerefentry><refentrytitle>curses</refentrytitle><manvolnum>3X</manvolnum></citerefentry>, <citerefentry><refentrytitle>termlib</refentrytitle><manvolnum>3</manvolnum></citerefentry>, <citerefentry><refentrytitle>termcap</refentrytitle><manvolnum>4</manvolnum></citerefentry>.</para> -</refsect1> - -<refsect1 xml:id='author'><title>AUTHOR</title> -<para>Gary S. Moss, BRL/VLD-VMB</para> - -</refsect1> - -<refsect1 xml:id='copyright'><title>COPYRIGHT</title> -<para>This software is Copyright (c) 1987-2020 by the United States -Government as represented by U.S. Army Research Laboratory.</para> - -</refsect1> - -<refsect1 xml:id='bug_reports'><title>BUG REPORTS</title> -<para>Reports of bugs or problems should be submitted via electronic -mail to <email>d...@brlcad.org</email></para> -</refsect1> -</refentry> - Modified: brlcad/trunk/doc/trunk_hierarchy.org =================================================================== --- brlcad/trunk/doc/trunk_hierarchy.org 2020-03-25 23:21:50 UTC (rev 75113) +++ brlcad/trunk/doc/trunk_hierarchy.org 2020-03-25 23:37:38 UTC (rev 75114) @@ -598,7 +598,6 @@ ***** [[file:../doc/docbook/system/man3/en][en]] ****** [[file:../doc/docbook/system/man3/en/redblack.xml][redblack.xml]] ****** [[file:../doc/docbook/system/man3/en/libdm.xml][libdm.xml]] -****** [[file:../doc/docbook/system/man3/en/libcursor.xml][libcursor.xml]] ****** [[file:../doc/docbook/system/man3/en/TODO][TODO]] ****** [[file:../doc/docbook/system/man3/en/libwdb.xml][libwdb.xml]] ****** [[file:../doc/docbook/system/man3/en/libplot3.xml][libplot3.xml]] @@ -3145,9 +3144,6 @@ *** [[file:../src/burst/burst.c][burst.c]] *** [[file:../src/burst/Hm.h][Hm.h]] *** [[file:../src/burst/Hm.c][Hm.c]] -** [[file:../src/libcursor][libcursor]] -*** [[file:../src/libcursor/cursor.c][cursor.c]] -*** [[file:../src/libcursor/CMakeLists.txt][CMakeLists.txt]] ** [[file:../src/librt][librt]] *** [[file:../src/librt/cmd.c][cmd.c]] *** [[file:../src/librt/search.c][search.c]] @@ -13531,7 +13527,6 @@ *** [[file:../misc/doxygen/libbrep.dox][libbrep.dox]] *** [[file:../misc/doxygen/librt.dox][librt.dox]] *** [[file:../misc/doxygen/CMakeLists.txt][CMakeLists.txt]] -*** [[file:../misc/doxygen/libcursor.dox][libcursor.dox]] *** [[file:../misc/doxygen/libwdb.dox][libwdb.dox]] *** [[file:../misc/doxygen/libdm.dox][libdm.dox]] *** [[file:../misc/doxygen/intro.dox][intro.dox]] Modified: brlcad/trunk/include/CMakeLists.txt =================================================================== --- brlcad/trunk/include/CMakeLists.txt 2020-03-25 23:21:50 UTC (rev 75113) +++ brlcad/trunk/include/CMakeLists.txt 2020-03-25 23:37:38 UTC (rev 75114) @@ -26,7 +26,6 @@ bsocket.h bu.h common.h - cursor.h dm.h fb.h fft.h Deleted: brlcad/trunk/include/cursor.h =================================================================== --- brlcad/trunk/include/cursor.h 2020-03-25 23:21:50 UTC (rev 75113) +++ brlcad/trunk/include/cursor.h 2020-03-25 23:37:38 UTC (rev 75114) @@ -1,142 +0,0 @@ -/* C U R S O R . H - * BRL-CAD - * - * Copyright (c) 2013-2020 United States Government as represented by - * the U.S. Army Research Laboratory. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public License - * version 2.1 as published by the Free Software Foundation. - * - * This library is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this file; see the file named COPYING for more - * information. - */ -/** @addtogroup libcursor - * - * These are declarations of functions provided by libcursor, a simple - * wrapper library to terminal capabilities (termcap). - */ -/** @{ */ -/** @file cursor.h */ - -#ifndef CURSOR_H -#define CURSOR_H - -#include "common.h" - -#include <stdio.h> - -__BEGIN_DECLS - -#ifndef CURSOR_EXPORT -# if defined(CURSOR_DLL_EXPORTS) && defined(CURSOR_DLL_IMPORTS) -# error "Only CURSOR_DLL_EXPORTS or CURSOR_DLL_IMPORTS can be defined, not both." -# elif defined(CURSOR_DLL_EXPORTS) -# define CURSOR_EXPORT __declspec(dllexport) -# elif defined(CURSOR_DLL_IMPORTS) -# define CURSOR_EXPORT __declspec(dllimport) -# else -# define CURSOR_EXPORT -# endif -#endif - - -/** - * Initialize termcap. - * - * This function must be called first to read the termcap database and - * to specify the output stream. - * - * Get individual parameters and control strings. Initialize the - * terminal. Use 'fp' as output stream. - * - * Returns 1 for success, 0 for failure and prints appropriate - * diagnostic. - */ -CURSOR_EXPORT extern int InitTermCap(FILE *fp); - -/** - * These below functions output terminal control strings to the file - * stream specified by the InitTermCap() call which must precede them. - * They return 0 if the capability is not described in the termcap - * database and 1 otherwise. Of course if the database entry is - * wrong, the command will not do its job. - */ - -/** - * Begin standout mode. - */ -CURSOR_EXPORT extern int SetStandout(void); - -/** - * End standout mode. - */ -CURSOR_EXPORT extern int ClrStandout(void); - -/** - * Clear from the cursor to end of line. - */ -CURSOR_EXPORT extern int ClrEOL(void); - -/** - * Clear screen and home cursor. - */ -CURSOR_EXPORT extern int ClrText(void); - -/** - * Delete the current line. - */ -CURSOR_EXPORT extern int DeleteLn(void); - -/** - * Home the cursor. - */ -CURSOR_EXPORT extern int HmCursor(void); - -/** - * Move the cursor to screen coordinates x, y. - */ -CURSOR_EXPORT extern int MvCursor(int x, int y); - -/** - * Reverse scroll 1 line. - */ -CURSOR_EXPORT extern int ScrollDn(void); - -/** - * Forward scroll 1 line. - */ -CURSOR_EXPORT extern int ScrollUp(void); - -/** - * Set the scrolling region to be from "top" to "btm". - */ -CURSOR_EXPORT extern int SetScrlReg(int top, int btm); - -/** - * Reset the scrolling region to the entire screen. - */ -CURSOR_EXPORT extern int ResetScrlReg(void); - - -__END_DECLS - -#endif /* CURSOR_H */ - -/** @} */ - -/* - * Local Variables: - * tab-width: 8 - * mode: C - * indent-tabs-mode: t - * c-file-style: "stroustrup" - * End: - * ex: shiftwidth=4 tabstop=8 - */ Modified: brlcad/trunk/misc/clang-static-analyzer-run.sh =================================================================== --- brlcad/trunk/misc/clang-static-analyzer-run.sh 2020-03-25 23:21:50 UTC (rev 75113) +++ brlcad/trunk/misc/clang-static-analyzer-run.sh 2020-03-25 23:37:38 UTC (rev 75114) @@ -91,7 +91,6 @@ cleantest liboptical cleantest libicv failingtest libged -cleantest libcursor cleantest libdm cleantest libfft failingtest libtclcad Modified: brlcad/trunk/misc/doxygen/CMakeLists.txt =================================================================== --- brlcad/trunk/misc/doxygen/CMakeLists.txt 2020-03-25 23:21:50 UTC (rev 75113) +++ brlcad/trunk/misc/doxygen/CMakeLists.txt 2020-03-25 23:37:38 UTC (rev 75114) @@ -46,7 +46,6 @@ libtclcad libpkg libtermio - libcursor ) foreach(libname ${DOX_LIBS}) @@ -183,7 +182,6 @@ libbn.dox libbrep.dox libbu.dox - libcursor.dox libdm.dox libfb.dox libfft.dox Deleted: brlcad/trunk/misc/doxygen/libcursor.dox =================================================================== --- brlcad/trunk/misc/doxygen/libcursor.dox 2020-03-25 23:21:50 UTC (rev 75113) +++ brlcad/trunk/misc/doxygen/libcursor.dox 2020-03-25 23:37:38 UTC (rev 75114) @@ -1,2 +0,0 @@ -/** @defgroup libcursor libcursor (Cursor) */ - Modified: brlcad/trunk/src/CMakeLists.txt =================================================================== --- brlcad/trunk/src/CMakeLists.txt 2020-03-25 23:21:50 UTC (rev 75113) +++ brlcad/trunk/src/CMakeLists.txt 2020-03-25 23:37:38 UTC (rev 75114) @@ -53,7 +53,6 @@ libanalyze liboptical libged - libcursor libdm libfft libicv Modified: brlcad/trunk/src/README =================================================================== --- brlcad/trunk/src/README 2020-03-25 23:21:50 UTC (rev 75113) +++ brlcad/trunk/src/README 2020-03-25 23:37:38 UTC (rev 75114) @@ -35,7 +35,6 @@ libbn - the BRL-CAD numerics library libbrep - the BRL-CAD NURBS B-Rep library libbu - the BRL-CAD utility library -libcursor - a 2D cursor manipulation library libdm - a 3D display manager library libfb - a 2D framebuffer library libfft - a fast Fourier transform library This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. _______________________________________________ BRL-CAD Source Commits mailing list brlcad-commits@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/brlcad-commits