From 2c2e5e2a9fe22042d7b5aaf44f90acea9be42b27 Mon Sep 17 00:00:00 2001
From: Perry Werneck <perry.werneck@gmail.com>
Date: Mon, 5 Aug 2019 12:51:54 -0300
Subject: [PATCH] Adding more options for toggle description. Removing unused headers.

---
 lib3270.cbp                  |  10 ----------
 src/core/toggles.c           |  51 +++++++++++++++++++++++++++++++++++++++++++--------
 src/include/actionsc.h       |  37 -------------------------------------
 src/include/api.h            | 155 -----------------------------------------------------------------------------------------------------------------------------------------------------------
 src/include/aplc.h           |  22 ----------------------
 src/include/childc.h         |  30 ------------------------------
 src/include/icmdc.h          |  22 ----------------------
 src/include/keypadc.h        |  53 -----------------------------------------------------
 src/include/lib3270/toggle.h |  18 +++++++++++++-----
 src/include/objects.h        |  28 ----------------------------
 src/include/popupsc.h        |   5 ++++-
 src/include/printc.h         |  27 ---------------------------
 src/include/printerc.h       |  29 -----------------------------
 src/include/savec.h          |  25 -------------------------
 src/include/scrollc.h        |  20 --------------------
 src/include/togglesc.h       |  51 +++++++++++++++++++++++++++++----------------------
 16 files changed, 89 insertions(+), 494 deletions(-)
 delete mode 100644 src/include/actionsc.h
 delete mode 100644 src/include/api.h
 delete mode 100644 src/include/aplc.h
 delete mode 100644 src/include/childc.h
 delete mode 100644 src/include/icmdc.h
 delete mode 100644 src/include/keypadc.h
 delete mode 100644 src/include/objects.h
 delete mode 100644 src/include/printc.h
 delete mode 100644 src/include/printerc.h
 delete mode 100644 src/include/savec.h
 delete mode 100644 src/include/scrollc.h

diff --git a/lib3270.cbp b/lib3270.cbp
index 6ac5bdd..a4831e5 100644
--- a/lib3270.cbp
+++ b/lib3270.cbp
@@ -178,13 +178,9 @@
 			<Option compilerVar="CC" />
 		</Unit>
 		<Unit filename="src/include/3270ds.h" />
-		<Unit filename="src/include/actionsc.h" />
 		<Unit filename="src/include/ansic.h" />
-		<Unit filename="src/include/api.h" />
-		<Unit filename="src/include/aplc.h" />
 		<Unit filename="src/include/arpa_telnet.h" />
 		<Unit filename="src/include/cg.h" />
-		<Unit filename="src/include/childc.h" />
 		<Unit filename="src/include/config.h" />
 		<Unit filename="src/include/config.h.in" />
 		<Unit filename="src/include/ctlrc.h" />
@@ -194,7 +190,6 @@
 		<Unit filename="src/include/ft_dftc.h" />
 		<Unit filename="src/include/ftc.h" />
 		<Unit filename="src/include/hostc.h" />
-		<Unit filename="src/include/icmdc.h" />
 		<Unit filename="src/include/keypadc.h" />
 		<Unit filename="src/include/kybdc.h" />
 		<Unit filename="src/include/lib3270-internals.h" />
@@ -213,17 +208,12 @@
 		<Unit filename="src/include/lib3270/toggle.h" />
 		<Unit filename="src/include/lib3270/trace.h" />
 		<Unit filename="src/include/localdefs.h" />
-		<Unit filename="src/include/objects.h" />
 		<Unit filename="src/include/popupsc.h" />
-		<Unit filename="src/include/printc.h" />
-		<Unit filename="src/include/printerc.h" />
 		<Unit filename="src/include/proxyc.h" />
 		<Unit filename="src/include/resolverc.h" />
 		<Unit filename="src/include/resources.h" />
-		<Unit filename="src/include/savec.h" />
 		<Unit filename="src/include/screen.h" />
 		<Unit filename="src/include/screenc.h" />
-		<Unit filename="src/include/scrollc.h" />
 		<Unit filename="src/include/seec.h" />
 		<Unit filename="src/include/sf.h" />
 		<Unit filename="src/include/shlobj_missing.h" />
diff --git a/src/core/toggles.c b/src/core/toggles.c
index 94e2705..1e834b7 100644
--- a/src/core/toggles.c
+++ b/src/core/toggles.c
@@ -54,16 +54,16 @@
 #include "screenc.h"
 #include "trace_dsc.h"
 #include "togglesc.h"
-//#include "api.h"
 #include "utilc.h"
 #include <lib3270/log.h>
 
 static const struct _toggle_info
 {
-	const char * name;
-	const char   def;
-	const char * label;
-	const char * description;
+	const char * name;				///< @brief Toggle name.
+	const char   def;				///< @brief Default value.
+	const char * label;				///< @brief Button label.
+	const char * summary;			///< @brief Short description.
+	const char * description;		///< @brief Toggle description.
 }
 toggle_info[LIB3270_TOGGLE_COUNT] =
 {
@@ -71,53 +71,62 @@ toggle_info[LIB3270_TOGGLE_COUNT] =
 			"monocase",
 			False,
 			N_( "Monocase" ),
+			N_( "Uppercase only" ),
 			N_( "If set, the terminal operates in uppercase-only mode" )
 		},
 		{
 			"cursorblink",
 			True,
 			N_( "Blinking Cursor" ),
+			N_( "Blinking Cursor" ),
 			N_( "If set, the cursor blinks" )
 		},
 		{
 			"showtiming",
 			True,
 			N_( "Show timer when processing" ),
+			N_( "Show timer when processing" ),
 			N_( "If set, the time taken by the host to process an AID is displayed on the status line" )
 		},
 		{
 			"cursorpos",
 			True,
 			N_( "Track Cursor" ),
+			N_( "Track Cursor" ),
 			N_( "Display the cursor location in the OIA (the status line)" )
 		},
 		{
 			"dstrace",
 			False,
+			N_( "Data Stream" ),
 			N_( "Trace Data Stream" ),
 			""
 		},
 		{
 			"linewrap",
 			False,
-			"",
-			""
+			N_("Wrap around"),
+			N_("Wrap around"),
+			N_("If set, the NVT terminal emulator automatically assumes a NEWLINE character when it reaches the end of a line.")
 		},
 		{
 			"blankfill",
 			False,
 			N_( "Blank Fill" ),
+			N_( "Blank Fill" ),
 			N_( "Automatically convert trailing blanks in a field to NULLs in order to insert a character, and will automatically convert leading NULLs to blanks so that input data is not squeezed to the left" )
 		},
 		{
 			"screentrace",
 			False,
+			N_( "Screens" ),
 			N_( "Trace screen contents" ),
 			""
 		},
 		{
 			"eventtrace",
 			False,
+			N_( "Interface" ),
 			N_( "Trace interface events" ),
 			""
 		},
@@ -125,35 +134,41 @@ toggle_info[LIB3270_TOGGLE_COUNT] =
 			"marginedpaste",
 			False,
 			N_( "Paste with left margin" ),
+			N_( "Paste with left margin" ),
 			N_( "If set, puts restrictions on how pasted text is placed on the screen. The position of the cursor at the time the paste operation is begun is used as a left margin. No pasted text will fill any area of the screen to the left of that position. This option is useful for pasting into certain IBM editors that use the left side of the screen for control information" )
 		},
 		{
 			"rectselect",
 			False,
 			N_( "Select by rectangles" ),
+			N_( "Select by rectangles" ),
 			N_( "If set, the terminal will always select rectangular areas of the screen. Otherwise, it selects continuous regions of the screen" )
 		},
 		{
 			"crosshair",
 			False,
 			N_( "Cross hair cursor" ),
+			N_( "Cross hair cursor" ),
 			N_( "If set, the terminal will display a crosshair over the cursor: lines extending the full width and height of the screen, centered over the cursor position. This makes locating the cursor on the screen much easier" )
 		},
 		{
 			"fullscreen",
 			False,
 			N_( "Full Screen" ),
+			N_( "Full Screen" ),
 			N_( "If set, asks to place the toplevel window in the fullscreen state" )
 		},
 		{
 			"reconnect",
 			False,
 			N_( "Auto-Reconnect" ),
+			N_( "Auto-Reconnect" ),
 			N_( "Automatically reconnect to the host if it ever disconnects" )
 		},
 		{
 			"insert",
 			False,
+			N_( "Insert" ),
 			N_( "Set insert mode" ),
 			""
 		},
@@ -161,29 +176,34 @@ toggle_info[LIB3270_TOGGLE_COUNT] =
 			"smartpaste",
 			False,
 			N_( "Smart paste" ),
+			N_( "Smart paste" ),
 			""
 		},
 		{
 			"bold",
 			False,
 			N_( "Bold" ),
+			N_( "Bold" ),
 			""
 		},
 		{
 			"keepselected",
 			False,
 			N_( "Keep selected" ),
+			N_( "Keep selected" ),
 			""
 		},
 		{
 			"underline",
 			False,
+			N_( "Underline" ),
 			N_( "Show Underline" ),
 			""
 		},
 		{
 			"autoconnect",
 			False,
+			N_( "Auto connect" ),
 			N_( "Connect on startup" ),
 			""
 		},
@@ -191,23 +211,27 @@ toggle_info[LIB3270_TOGGLE_COUNT] =
 			"kpalternative",
 			False,
 			N_( "Use +/- for field navigation" ),
+			N_( "Use +/- for field navigation" ),
 			N_( "Use the keys +/- from keypad to select editable fields" )
 		},
 		{
 			"beep",
 			True,
+			N_( "Sound" ),
 			N_( "Alert sound" ),
 			N_( "Beep on errors" )
 		},
 		{
 			"fieldattr",
 			False,
+			N_( "Show Field" ),
 			N_( "Show Field attribute" ),
 			""
 		},
 		{
 			"altscreen",
 			True,
+			N_( "Alternate screen" ),
 			N_( "Resize on alternate screen" ),
 			N_( "Auto resize on altscreen" )
 		},
@@ -215,19 +239,22 @@ toggle_info[LIB3270_TOGGLE_COUNT] =
 			"keepalive",
 			True,
 			N_( "Network keep alive" ),
+			N_( "Network keep alive" ),
 			N_( "Enable network keep-alive with SO_KEEPALIVE" )
 		},
 		{
 			"nettrace",
 			False,
+			N_( "Network data" ),
 			N_( "Trace network data flow" ),
 			N_( "Enable network in/out trace" )
 		},
 		{
 			"ssltrace",
 			False,
+			N_( "SSL negotiation" ),
 			N_( "Trace SSL negotiation" ),
-			N_( "Enable SSL messages trace" )
+			N_( "Enable security negotiation messages trace" )
 		},
 };
 
@@ -386,6 +413,13 @@ void shutdown_toggles(H3270 *session)
 #endif
 }
 
+LIB3270_EXPORT const char * lib3270_get_toggle_summary(LIB3270_TOGGLE ix)
+{
+	if(ix < LIB3270_TOGGLE_COUNT)
+		return toggle_info[ix].summary;
+	return "";
+}
+
 LIB3270_EXPORT const char * lib3270_get_toggle_label(LIB3270_TOGGLE ix)
 {
 	if(ix < LIB3270_TOGGLE_COUNT)
@@ -393,6 +427,7 @@ LIB3270_EXPORT const char * lib3270_get_toggle_label(LIB3270_TOGGLE ix)
 	return "";
 }
 
+
 LIB3270_EXPORT const char * lib3270_get_toggle_description(LIB3270_TOGGLE ix)
 {
 	if(ix < LIB3270_TOGGLE_COUNT)
diff --git a/src/include/actionsc.h b/src/include/actionsc.h
deleted file mode 100644
index f2f0dcd..0000000
--- a/src/include/actionsc.h
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Copyright 1995, 1999, 2000, 2001, 2002, 2003, 2005 by Paul Mattes.
- *  Permission to use, copy, modify, and distribute this software and its
- *  documentation for any purpose and without fee is hereby granted,
- *  provided that the above copyright notice appear in all copies and that
- *  both that copyright notice and this permission notice appear in
- *  supporting documentation.
- *
- * x3270, c3270, s3270 and tcl3270 are distributed in the hope that they will
- * be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the file LICENSE
- * for more details.
- */
-
-/*
- *	actionsc.h
- *		Global declarations for actions.c.
- */
-
-#error Deprecated
-
-// extern enum iaction ia_cause;
-
-// extern int              actioncount;
-// extern XtActionsRec     *actions;
-
-// extern const char       *ia_name[];
-
-// extern void action_init(void);
-
-// extern void action_internal(XtActionProc action, enum iaction cause, const char *parm1, const char *parm2);
-
-// #define action_name(x)  #x
-
-// extern Boolean event_is_meta(int state);
-
-
diff --git a/src/include/api.h b/src/include/api.h
deleted file mode 100644
index 7411ea0..0000000
--- a/src/include/api.h
+++ /dev/null
@@ -1,155 +0,0 @@
-/*
- * "Software PW3270, desenvolvido com base nos códigos fontes do WC3270  e X3270
- * (Paul Mattes Paul.Mattes@usa.net), de emulação de terminal 3270 para acesso a
- * aplicativos mainframe. Registro no INPI sob o nome G3270.
- *
- * Copyright (C) <2008> <Banco do Brasil S.A.>
- *
- * Este programa é software livre. Você pode redistribuí-lo e/ou modificá-lo sob
- * os termos da GPL v.2 - Licença Pública Geral  GNU,  conforme  publicado  pela
- * Free Software Foundation.
- *
- * Este programa é distribuído na expectativa de  ser  útil,  mas  SEM  QUALQUER
- * GARANTIA; sem mesmo a garantia implícita de COMERCIALIZAÇÃO ou  de  ADEQUAÇÃO
- * A QUALQUER PROPÓSITO EM PARTICULAR. Consulte a Licença Pública Geral GNU para
- * obter mais detalhes.
- *
- * Você deve ter recebido uma cópia da Licença Pública Geral GNU junto com este
- * programa; se não, escreva para a Free Software Foundation, Inc., 51 Franklin
- * St, Fifth Floor, Boston, MA  02110-1301  USA
- *
- * Este programa está nomeado como api.h e possui - linhas de código.
- *
- * Contatos:
- *
- * perry.werneck@gmail.com	(Alexandre Perry de Souza Werneck)
- * erico.mendonca@gmail.com	(Erico Mascarenhas de Mendonça)
- * licinio@bb.com.br		(Licínio Luis Branco)
- * kraucer@bb.com.br		(Kraucer Fernandes Mazuco)
- *
- */
-
-#error Deprecated
-
-#ifndef LIB3270_API_INCLUDED
-
-#ifdef WIN32
-	#include <winsock2.h>
-	#include <windows.h>
-#endif // WIN32
-
-#ifdef __cplusplus
-	extern "C" {
-#endif
-
-		#define LIB3270_API_INCLUDED "4.2"
-
-		#include <errno.h>
-
-		#if defined(_WIN32)
-			#include <windows.h>
-
-			#if defined (HAVE_GNUC_VISIBILITY)
-				#define LOCAL_EXTERN	__attribute__((visibility("hidden"))) extern
-			#else
-				#define LOCAL_EXTERN extern
-			#endif
-
-		#else
-			#include <stdarg.h>
-
-			// http://gcc.gnu.org/wiki/Visibility
-			#if defined(__SUNPRO_C) && (__SUNPRO_C >= 0x550)
-				#define LOCAL_EXTERN __hidden extern
-			#elif defined (HAVE_GNUC_VISIBILITY)
-				#define LOCAL_EXTERN	__attribute__((visibility("hidden"))) extern
-			#else
-				#define LOCAL_EXTERN extern
-			#endif
-
-
-		#endif
-
-		#ifndef HCONSOLE
-			#define HCONSOLE void *
-		#endif
-
-		#ifndef ETIMEDOUT
-			#define ETIMEDOUT -1238
-		#endif
-
-		#ifndef ECANCELED
-			#ifdef EINTR
-				#define ECANCELED EINTR
-			#else
-				#define ECANCELED -1125
-			#endif
-		#endif
-
-		#ifndef ENOTCONN
-			#define ENOTCONN -1107
-		#endif
-
-		#ifndef EISCONN
-			#define EISCONN -1106
-		#endif
-
-		#ifndef CN
-			#define CN ((char *) NULL)
-		#endif
-
-		#include <lib3270/log.h>
-
-		#include <lib3270/session.h>
-
-
-		/** Type of dialog boxes */
-		#include <lib3270/popup.h>
-
-		/* File transfer */
-
-		#define FT_RECORD_FORMAT_FIXED			LIB3270_FT_RECORD_FORMAT_FIXED
-		#define FT_RECORD_FORMAT_VARIABLE		LIB3270_FT_RECORD_FORMAT_VARIABLE
-		#define FT_RECORD_FORMAT_UNDEFINED		LIB3270_FT_RECORD_FORMAT_UNDEFINED
-		#define FT_RECORD_FORMAT_MASK 			LIB3270_FT_RECORD_FORMAT_MASK
-
-		#define FT_ALLOCATION_UNITS_TRACKS		LIB3270_FT_ALLOCATION_UNITS_TRACKS
-		#define FT_ALLOCATION_UNITS_CYLINDERS	LIB3270_FT_ALLOCATION_UNITS_CYLINDERS
-		#define FT_ALLOCATION_UNITS_AVBLOCK		LIB3270_FT_ALLOCATION_UNITS_AVBLOCK
-		#define FT_ALLOCATION_UNITS_MASK		LIB3270_FT_ALLOCATION_UNITS_MASK
-
-		LOCAL_EXTERN int 				CancelFileTransfer(int force);
-
-		#define PCONNECTED		lib3270_pconnected(hSession)
-		#define HALF_CONNECTED	lib3270_half_connected(hSession)
-		#define CONNECTED		lib3270_connected(hSession)
-
-		#define IN_NEITHER		lib3270_in_neither(hSession)
-		#define IN_ANSI			lib3270_in_ansi(hSession)
-		#define IN_3270			lib3270_in_3270(hSession)
-		#define IN_SSCP			lib3270_in_sscp(hSession)
-		#define IN_TN3270E		lib3270_in_tn3270e(hSession)
-		#define IN_E			lib3270_in_e(hSession)
-
-		/* Set/Get screen contents */
-		#define find_field_attribute(s,a) lib3270_field_addr(s,a)
-		#define find_field_length(s,a) find_field_length(s,a)
-
-		// LOCAL_EXTERN unsigned char get_field_attribute(H3270 *session, int baddr);
-		// LOCAL_EXTERN void Input_String(const unsigned char *str);
-		// LOCAL_EXTERN void screen_size(int *rows, int *cols);
-
-		#define lib3270_paste_string(str) lib3270_set_string(NULL,str)
-
-		/* Keyboard */
-		LOCAL_EXTERN int			  emulate_input(char *s, int len, int pasting);
-
-        /* Misc calls */
-
-		#include <lib3270/actions.h>
-
-#ifdef __cplusplus
-	}
-#endif
-
-#endif // LIB3270_API_INCLUDED
diff --git a/src/include/aplc.h b/src/include/aplc.h
deleted file mode 100644
index 1d31177..0000000
--- a/src/include/aplc.h
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * Copyright 1995, 1999, 2000 by Paul Mattes.
- *  Permission to use, copy, modify, and distribute this software and its
- *  documentation for any purpose and without fee is hereby granted,
- *  provided that the above copyright notice appear in all copies and that
- *  both that copyright notice and this permission notice appear in
- *  supporting documentation.
- *
- * x3270, c3270, s3270 and tcl3270 are distributed in the hope that they will
- * be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the file LICENSE
- * for more details.
- */
-
-/*
- *	aplc.h
- *		Global declarations for apl.c.
- */
-
-#error Deprecated
-
-LIB3270_INTERNAL KeySym APLStringToKeysym(char *s, int *is_gep);
diff --git a/src/include/childc.h b/src/include/childc.h
deleted file mode 100644
index 4fbef59..0000000
--- a/src/include/childc.h
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * Copyright 2001 by Paul Mattes.
- *  Permission to use, copy, modify, and distribute this software and its
- *  documentation for any purpose and without fee is hereby granted,
- *  provided that the above copyright notice appear in all copies and that
- *  both that copyright notice and this permission notice appear in
- *  supporting documentation.
- *
- * x3270, c3270, s3270 and tcl3270 are distributed in the hope that they will
- * be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the file LICENSE
- * for more details.
- */
-
-/*
- *	childc.h
- *		Global declarations for child.c.
- */
-
-/*
-#if defined(X3270_DISPLAY) || defined(C3270)
-LIB3270_INTERNAL int fork_child(void);
-LIB3270_INTERNAL void child_ignore_output(void);
-#else
-#define fork_child()	fork()
-#define child_ignore_output()
-#endif
-*/
-
-#error Deprecated
diff --git a/src/include/icmdc.h b/src/include/icmdc.h
deleted file mode 100644
index 690c545..0000000
--- a/src/include/icmdc.h
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * Copyright 2007 by Paul Mattes.
- *   Permission to use, copy, modify, and distribute this software and its
- *   documentation for any purpose and without fee is hereby granted,
- *   provided that the above copyright notice appear in all copies and that
- *   both that copyright notice and this permission notice appear in
- *   supporting documentation.
- *
- * c3270 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 file LICENSE for more details.
- */
-
-/*
- *	icmdc.h
- *		A curses-based 3270 Terminal Emulator
- *		Declarations for icmd.c.
- */
-
-// LIB3270_INTERNAL int interactive_transfer(String **params, Cardinal *num_params);
-
-#error Deprecated
diff --git a/src/include/keypadc.h b/src/include/keypadc.h
deleted file mode 100644
index 0ff2bc1..0000000
--- a/src/include/keypadc.h
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * Copyright 1995, 1996, 1999, 2000, 2002, 2003, 2005 by Paul Mattes.
- *  Permission to use, copy, modify, and distribute this software and its
- *  documentation for any purpose and without fee is hereby granted,
- *  provided that the above copyright notice appear in all copies and that
- *  both that copyright notice and this permission notice appear in
- *  supporting documentation.
- *
- * x3270, c3270, s3270 and tcl3270 are distributed in the hope that they will
- * be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the file LICENSE
- * for more details.
- */
-
-/*
- *	keypadc.h
- *		Global declarations for keypad.c.
- */
-
-// LIB3270_INTERNAL Boolean keypad_changed;
-/*
-#if defined(X3270_KEYPAD)
-
-LIB3270_INTERNAL enum kp_placement { kp_right, kp_left, kp_bottom, kp_integral, kp_inside_right } kp_placement;
-
-LIB3270_INTERNAL void keypad_first_up(void);
-LIB3270_INTERNAL Widget keypad_init(Widget container, Dimension voffset, Dimension screen_width, Boolean floating, Boolean vert);
-LIB3270_INTERNAL void keypad_move(void);
-LIB3270_INTERNAL void keypad_placement_init(void);
-LIB3270_INTERNAL void keypad_popup_init(void);
-LIB3270_INTERNAL Dimension keypad_qheight(void);
-LIB3270_INTERNAL void keypad_set_keymap(void);
-LIB3270_INTERNAL void keypad_set_temp_keymap(XtTranslations trans);
-LIB3270_INTERNAL void keypad_shift(void);
-LIB3270_INTERNAL Dimension min_keypad_width(void);
-
-#else
-
-#define keypad_qheight()	0
-#define min_keypad_width()	0
-#define keypad_first_up()
-#define keypad_init(a, b, c, d, e)	0
-#define keypad_move()
-#define keypad_placement_init()
-#define keypad_popup_init()
-#define keypad_set_keymap()
-#define keypad_set_temp_keymap(n)
-#define keypad_shift()
-
-#endif
-*/
-
-#error Deprecated
diff --git a/src/include/lib3270/toggle.h b/src/include/lib3270/toggle.h
index 01692ba..3935b14 100644
--- a/src/include/lib3270/toggle.h
+++ b/src/include/lib3270/toggle.h
@@ -1,7 +1,7 @@
 /*
- * "Software G3270, desenvolvido com base nos códigos fontes do WC3270  e  X3270
+ * "Software pw3270, desenvolvido com base nos códigos fontes do WC3270  e X3270
  * (Paul Mattes Paul.Mattes@usa.net), de emulação de terminal 3270 para acesso a
- * aplicativos mainframe. Registro no INPI sob o nome G3270.
+ * aplicativos mainframe. Registro no INPI sob o nome G3270. Registro no INPI sob o nome G3270.
  *
  * Copyright (C) <2008> <Banco do Brasil S.A.>
  *
@@ -18,12 +18,12 @@
  * programa; se não, escreva para a Free Software Foundation, Inc., 51 Franklin
  * St, Fifth Floor, Boston, MA  02110-1301  USA
  *
- * Este programa está nomeado como toggle.h e possui - linhas de código.
+ * Este programa está nomeado como - e possui - linhas de código.
  *
  * Contatos:
  *
  * perry.werneck@gmail.com	(Alexandre Perry de Souza Werneck)
- * erico.mendonca@gmail.com	(Erico Mascarenhas de Mendonça)
+ * erico.mendonca@gmail.com	(Erico Mascarenhas Mendonça)
  *
  */
 
@@ -84,7 +84,15 @@
 	LIB3270_EXPORT const char * lib3270_get_toggle_description(LIB3270_TOGGLE ix);
 
 	/**
-	 * @brief Get a short description of the toggle (for menus).
+	 * @brief Get a summary description of the toggle (for menus).
+	 *
+	 * @return Constant string with the toggle summary.
+	 *
+	 */
+	LIB3270_EXPORT const char * lib3270_get_toggle_summary(LIB3270_TOGGLE ix);
+
+	/**
+	 * @brief Get a short description of the toggle (for buttons).
 	 *
 	 * @return Constant string with the toggle label.
 	 *
diff --git a/src/include/objects.h b/src/include/objects.h
deleted file mode 100644
index 7e42ab4..0000000
--- a/src/include/objects.h
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * Copyright 1995, 1999, 2000 by Paul Mattes.
- *  Permission to use, copy, modify, and distribute this software and its
- *  documentation for any purpose and without fee is hereby granted,
- *  provided that the above copyright notice appear in all copies and that
- *  both that copyright notice and this permission notice appear in
- *  supporting documentation.
- *
- * x3270, c3270, s3270 and tcl3270 are distributed in the hope that they will
- * be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the file LICENSE
- * for more details.
- */
-
-/*
- *	objects.h
- *		x3270 object names.
- */
-
-// #define ObjConfirmButton	"confirmButton"
-// #define ObjConfirm2Button	"confirm2Button"
-// #define ObjCancelButton		"cancelButton"
-// #define ObjDialog		"dialog"
-// #define ObjSmallLabel		"smallLabel"
-// #define ObjNameLabel		"nameLabel"
-// #define ObjDataLabel		"dataLabel"
-
-#error Deprecated
diff --git a/src/include/popupsc.h b/src/include/popupsc.h
index ac7b078..f025c9f 100644
--- a/src/include/popupsc.h
+++ b/src/include/popupsc.h
@@ -29,7 +29,10 @@
  *
  */
 
- /* Popup calls */
+ /**
+  * @brief Popup calls
+  *
+  */
 
  #include <lib3270.h>
 
diff --git a/src/include/printc.h b/src/include/printc.h
deleted file mode 100644
index f49332c..0000000
--- a/src/include/printc.h
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * Copyright 1995, 1999, 2000, 2002, 2004, 2005 by Paul Mattes.
- *  Permission to use, copy, modify, and distribute this software and its
- *  documentation for any purpose and without fee is hereby granted,
- *  provided that the above copyright notice appear in all copies and that
- *  both that copyright notice and this permission notice appear in
- *  supporting documentation.
- *
- * x3270, c3270, s3270 and tcl3270 are distributed in the hope that they will
- * be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the file LICENSE
- * for more details.
- */
-
-/*
- *	printc.h
- *		Global declarations for print.c.
- */
-
-// LIB3270_INTERNAL Boolean fprint_screen(FILE *f, Boolean even_if_empty, Boolean use_html);
-// LIB3270_INTERNAL void PrintText_action(Widget w, XEvent *event, String *params,Cardinal *num_params);
-// LIB3270_INTERNAL void PrintWindow_action(Widget w, XEvent *event, String *params,Cardinal *num_params);
-// LIB3270_INTERNAL void print_text_option(Widget w, XtPointer client_data,XtPointer call_data);
-// LIB3270_INTERNAL void print_window_option(Widget w, XtPointer client_data,XtPointer call_data);
-// LIB3270_INTERNAL void save_text_option(Widget w, XtPointer client_data,XtPointer call_data);
-
-#error Deprecated
diff --git a/src/include/printerc.h b/src/include/printerc.h
deleted file mode 100644
index bf4eff2..0000000
--- a/src/include/printerc.h
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * Copyright 2000, 2002, 2007 by Paul Mattes.
- *  Permission to use, copy, modify, and distribute this software and its
- *  documentation for any purpose and without fee is hereby granted,
- *  provided that the above copyright notice appear in all copies and that
- *  both that copyright notice and this permission notice appear in
- *  supporting documentation.
- *
- * x3270, c3270, s3270 and tcl3270 are distributed in the hope that they will
- * be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the file LICENSE
- * for more details.
- */
-
-/*
- *	printerc.h
- *		Printer session support
- */
-
-// LIB3270_INTERNAL void printer_init(void);
-// LIB3270_INTERNAL void printer_lu_dialog(void);
-// LIB3270_INTERNAL void printer_start(const char *lu);
-// LIB3270_INTERNAL void printer_stop(void);
-// LIB3270_INTERNAL Boolean printer_running(void);
-#if defined(_WIN32) /*[*/
-// LIB3270_INTERNAL void printer_check(void);
-#endif /*]*/
-
-#error Deprecated
diff --git a/src/include/savec.h b/src/include/savec.h
deleted file mode 100644
index 27646a4..0000000
--- a/src/include/savec.h
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * Copyright 1999 by Paul Mattes.
- *  Permission to use, copy, modify, and distribute this software and its
- *  documentation for any purpose and without fee is hereby granted,
- *  provided that the above copyright notice appear in all copies and that
- *  both that copyright notice and this permission notice appear in
- *  supporting documentation.
- *
- * c3270, s3270 and tcl3270 are distributed in the hope that they will
- * be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the file LICENSE
- * for more details.
- */
-
-/* Non-display version of savec.h */
-
-/*
-
-#define save_yourself()
-
-LIB3270_INTERNAL char *command_string;
-*/
-
-
-#error Deprecated
diff --git a/src/include/scrollc.h b/src/include/scrollc.h
deleted file mode 100644
index 93a98b1..0000000
--- a/src/include/scrollc.h
+++ /dev/null
@@ -1,20 +0,0 @@
-/*
- * Copyright 1999, 2001 by Paul Mattes.
- *  Permission to use, copy, modify, and distribute this software and its
- *  documentation for any purpose and without fee is hereby granted,
- *  provided that the above copyright notice appear in all copies and that
- *  both that copyright notice and this permission notice appear in
- *  supporting documentation.
- *
- * c3270, s3270 and tcl3270 are distributed in the hope that they will
- * be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the file LICENSE
- * for more details.
- */
-
-/* Non-display version of scrollc.h */
-
-// #define scroll_save(n, trim_blanks)
-// #define scroll_to_bottom()
-
-#error Deprecated
diff --git a/src/include/togglesc.h b/src/include/togglesc.h
index 56c7edd..e1d4123 100644
--- a/src/include/togglesc.h
+++ b/src/include/togglesc.h
@@ -1,29 +1,36 @@
 /*
- * Modifications Copyright 1993, 1994, 1995, 1996, 1999, 2002 by Paul Mattes.
- * Original X11 Port Copyright 1990 by Jeff Sparkes.
- *  Permission to use, copy, modify, and distribute this software and its
- *  documentation for any purpose and without fee is hereby granted,
- *  provided that the above copyright notice appear in all copies and that
- *  both that copyright notice and this permission notice appear in
- *  supporting documentation.
- *
- * Copyright 1989 by Georgia Tech Research Corporation, Atlanta, GA 30332.
- *  All Rights Reserved.  GTRC hereby grants public use of this software.
- *  Derivative works based on this software must incorporate this copyright
- *  notice.
- *
- * x3270, c3270, s3270 and tcl3270 are distributed in the hope that they will
- * be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the file LICENSE
- * for more details.
+ * "Software pw3270, desenvolvido com base nos códigos fontes do WC3270  e X3270
+ * (Paul Mattes Paul.Mattes@usa.net), de emulação de terminal 3270 para acesso a
+ * aplicativos mainframe. Registro no INPI sob o nome G3270. Registro no INPI sob o nome G3270.
+ *
+ * Copyright (C) <2008> <Banco do Brasil S.A.>
+ *
+ * Este programa é software livre. Você pode redistribuí-lo e/ou modificá-lo sob
+ * os termos da GPL v.2 - Licença Pública Geral  GNU,  conforme  publicado  pela
+ * Free Software Foundation.
+ *
+ * Este programa é distribuído na expectativa de  ser  útil,  mas  SEM  QUALQUER
+ * GARANTIA; sem mesmo a garantia implícita de COMERCIALIZAÇÃO ou  de  ADEQUAÇÃO
+ * A QUALQUER PROPÓSITO EM PARTICULAR. Consulte a Licença Pública Geral GNU para
+ * obter mais detalhes.
+ *
+ * Você deve ter recebido uma cópia da Licença Pública Geral GNU junto com este
+ * programa; se não, escreva para a Free Software Foundation, Inc., 51 Franklin
+ * St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ * Este programa está nomeado como - e possui - linhas de código.
+ *
+ * Contatos:
+ *
+ * perry.werneck@gmail.com	(Alexandre Perry de Souza Werneck)
+ * erico.mendonca@gmail.com	(Erico Mascarenhas Mendonça)
+ *
  */
 
-/*
- *	toggles.c
- *		Global declarations for toggles.c.
+/**
+ *	@file togglesc.h
+ *	@brief Global declarations for toggles.c.
  */
 
-// extern const char *toggle_names[N_TOGGLES];
-
  LIB3270_INTERNAL void initialize_toggles(H3270 *session);
  LIB3270_INTERNAL void shutdown_toggles(H3270 *session);
--
libgit2 0.21.2