From bec84bcb18d2b689a52331ae016ea6f44110f376 Mon Sep 17 00:00:00 2001 From: Perry Werneck Date: Fri, 11 Oct 2019 12:32:50 -0300 Subject: [PATCH] Changing toggle id type name. --- src/core/toggles/getset.c | 8 ++++---- src/core/toggles/init.c | 2 +- src/core/toggles/listener.c | 4 ++-- src/core/toggles/table.c | 10 +++++----- src/include/lib3270-internals.h | 2 +- src/include/lib3270/session.h | 2 +- src/include/lib3270/toggle.h | 34 +++++++++++++++++----------------- src/include/screenc.h | 2 +- 8 files changed, 32 insertions(+), 32 deletions(-) diff --git a/src/core/toggles/getset.c b/src/core/toggles/getset.c index ac869a0..1f61118 100644 --- a/src/core/toggles/getset.c +++ b/src/core/toggles/getset.c @@ -41,7 +41,7 @@ /*---[ Implement ]------------------------------------------------------------------------------------------------------------*/ -LIB3270_EXPORT unsigned char lib3270_get_toggle(const H3270 *hSession, LIB3270_TOGGLE ix) +LIB3270_EXPORT unsigned char lib3270_get_toggle(const H3270 *hSession, LIB3270_TOGGLE_ID ix) { if(ix < 0 || ix >= LIB3270_TOGGLE_COUNT) { @@ -55,7 +55,7 @@ LIB3270_EXPORT unsigned char lib3270_get_toggle(const H3270 *hSession, LIB3270_T /** * @brief Call the internal update routine and listeners. */ -static void toggle_notify(H3270 *session, struct lib3270_toggle *t, LIB3270_TOGGLE ix) +static void toggle_notify(H3270 *session, struct lib3270_toggle *t, LIB3270_TOGGLE_ID ix) { struct lib3270_toggle_callback * st; @@ -81,7 +81,7 @@ static void toggle_notify(H3270 *session, struct lib3270_toggle *t, LIB3270_TOGG * * @returns 0 if the toggle is already at the state, 1 if the toggle was changed; < 0 on error (sets errno). */ -LIB3270_EXPORT int lib3270_set_toggle(H3270 *session, LIB3270_TOGGLE ix, int value) +LIB3270_EXPORT int lib3270_set_toggle(H3270 *session, LIB3270_TOGGLE_ID ix, int value) { char v = value ? True : False; struct lib3270_toggle * t; @@ -102,7 +102,7 @@ LIB3270_EXPORT int lib3270_set_toggle(H3270 *session, LIB3270_TOGGLE ix, int val return 1; } -LIB3270_EXPORT int lib3270_toggle(H3270 *session, LIB3270_TOGGLE ix) +LIB3270_EXPORT int lib3270_toggle(H3270 *session, LIB3270_TOGGLE_ID ix) { struct lib3270_toggle *t; diff --git a/src/core/toggles/init.c b/src/core/toggles/init.c index b424d15..8885515 100644 --- a/src/core/toggles/init.c +++ b/src/core/toggles/init.c @@ -127,7 +127,7 @@ void initialize_toggles(H3270 *session) void shutdown_toggles(H3270 *session) { #if defined(X3270_TRACE) - static const LIB3270_TOGGLE disable_on_shutdown[] = {LIB3270_TOGGLE_DS_TRACE, LIB3270_TOGGLE_EVENT_TRACE, LIB3270_TOGGLE_SCREEN_TRACE}; + static const LIB3270_TOGGLE_ID disable_on_shutdown[] = {LIB3270_TOGGLE_DS_TRACE, LIB3270_TOGGLE_EVENT_TRACE, LIB3270_TOGGLE_SCREEN_TRACE}; size_t f; diff --git a/src/core/toggles/listener.c b/src/core/toggles/listener.c index d68ba36..e252f21 100644 --- a/src/core/toggles/listener.c +++ b/src/core/toggles/listener.c @@ -44,7 +44,7 @@ /*---[ Implement ]------------------------------------------------------------------------------------------------------------*/ -LIB3270_EXPORT const void * lib3270_register_toggle_listener(H3270 *hSession, LIB3270_TOGGLE tx, void (*func)(H3270 *, LIB3270_TOGGLE, char, void *),void *data) +LIB3270_EXPORT const void * lib3270_register_toggle_listener(H3270 *hSession, LIB3270_TOGGLE_ID tx, void (*func)(H3270 *, LIB3270_TOGGLE_ID, char, void *),void *data) { struct lib3270_toggle_callback *st; @@ -65,7 +65,7 @@ LIB3270_EXPORT const void * lib3270_register_toggle_listener(H3270 *hSession, LI } -LIB3270_EXPORT int lib3270_unregister_toggle_listener(H3270 *hSession, LIB3270_TOGGLE tx, const void *id) +LIB3270_EXPORT int lib3270_unregister_toggle_listener(H3270 *hSession, LIB3270_TOGGLE_ID tx, const void *id) { struct lib3270_toggle_callback *st; struct lib3270_toggle_callback *prev = (struct lib3270_toggle_callback *) NULL; diff --git a/src/core/toggles/table.c b/src/core/toggles/table.c index c69018e..64d72ab 100644 --- a/src/core/toggles/table.c +++ b/src/core/toggles/table.c @@ -333,14 +333,14 @@ LIB3270_EXPORT const LIB3270_TOGGLE_ENTRY * lib3270_get_toggle_list() return toggle_descriptor; } -LIB3270_EXPORT const char * lib3270_get_toggle_summary(LIB3270_TOGGLE ix) +LIB3270_EXPORT const char * lib3270_get_toggle_summary(LIB3270_TOGGLE_ID ix) { if(ix < LIB3270_TOGGLE_COUNT) return toggle_descriptor[ix].summary; return ""; } -LIB3270_EXPORT const char * lib3270_get_toggle_label(LIB3270_TOGGLE ix) +LIB3270_EXPORT const char * lib3270_get_toggle_label(LIB3270_TOGGLE_ID ix) { if(ix < LIB3270_TOGGLE_COUNT) return toggle_descriptor[ix].label; @@ -348,21 +348,21 @@ LIB3270_EXPORT const char * lib3270_get_toggle_label(LIB3270_TOGGLE ix) } -LIB3270_EXPORT const char * lib3270_get_toggle_description(LIB3270_TOGGLE ix) +LIB3270_EXPORT const char * lib3270_get_toggle_description(LIB3270_TOGGLE_ID ix) { if(ix < LIB3270_TOGGLE_COUNT) return toggle_descriptor[ix].description; return ""; } -LIB3270_EXPORT const char * lib3270_get_toggle_name(LIB3270_TOGGLE ix) +LIB3270_EXPORT const char * lib3270_get_toggle_name(LIB3270_TOGGLE_ID ix) { if(ix < LIB3270_TOGGLE_COUNT) return toggle_descriptor[ix].name; return ""; } -LIB3270_EXPORT LIB3270_TOGGLE lib3270_get_toggle_id(const char *name) +LIB3270_EXPORT LIB3270_TOGGLE_ID lib3270_get_toggle_id(const char *name) { if(name) { diff --git a/src/include/lib3270-internals.h b/src/include/lib3270-internals.h index d8e30e6..416ae88 100644 --- a/src/include/lib3270-internals.h +++ b/src/include/lib3270-internals.h @@ -332,7 +332,7 @@ struct lib3270_toggle_callback { struct lib3270_toggle_callback * next; /**< @brief Next callback in chain */ void * data; /**< @brief User data */ - void (*func)(H3270 *, LIB3270_TOGGLE, char, void *); /**< @brief Function to call */ + void (*func)(H3270 *, LIB3270_TOGGLE_ID, char, void *); /**< @brief Function to call */ }; /** diff --git a/src/include/lib3270/session.h b/src/include/lib3270/session.h index 8956540..c7134e7 100644 --- a/src/include/lib3270/session.h +++ b/src/include/lib3270/session.h @@ -59,7 +59,7 @@ void (*update_cursor)(H3270 *session, unsigned short row, unsigned short col, unsigned char c, unsigned short attr); void (*update_oia)(H3270 *session, LIB3270_FLAG id, unsigned char on); - void (*update_toggle)(H3270 *session, LIB3270_TOGGLE ix, unsigned char value, LIB3270_TOGGLE_TYPE reason, const char *name); + void (*update_toggle)(H3270 *session, LIB3270_TOGGLE_ID ix, unsigned char value, LIB3270_TOGGLE_TYPE reason, const char *name); void (*update_luname)(H3270 *session, const char *name); void (*update_status)(H3270 *session, LIB3270_MESSAGE id); void (*update_connect)(H3270 *session, unsigned char connected); diff --git a/src/include/lib3270/toggle.h b/src/include/lib3270/toggle.h index e15d9f1..ef690dc 100644 --- a/src/include/lib3270/toggle.h +++ b/src/include/lib3270/toggle.h @@ -40,7 +40,7 @@ /** * @brief Toogles. */ - typedef enum _lib3270_toggle + typedef enum _lib3270_toggle_id { LIB3270_TOGGLE_MONOCASE, LIB3270_TOGGLE_CURSOR_BLINK, @@ -72,7 +72,7 @@ LIB3270_TOGGLE_COUNT - } LIB3270_TOGGLE; + } LIB3270_TOGGLE_ID; /** * @brief Toggle types. @@ -95,11 +95,11 @@ { LIB3270_PROPERTY_HEAD - LIB3270_TOGGLE id; ///< @brief Toggle ID. - const char def; ///< @brief Default value. - const char * key; ///< @brief Default key (or NULL if no default). - const char * icon; ///< @brief Icon name (from https://standards.freedesktop.org/icon-naming-spec/icon-naming-spec-latest.html) - const char * label; ///< @brief Button label (or NULL). + LIB3270_TOGGLE_ID id; ///< @brief Toggle ID. + const char def; ///< @brief Default value. + const char * key; ///< @brief Default key (or NULL if no default). + const char * icon; ///< @brief Icon name (from https://standards.freedesktop.org/icon-naming-spec/icon-naming-spec-latest.html) + const char * label; ///< @brief Button label (or NULL). } LIB3270_TOGGLE_ENTRY; @@ -118,7 +118,7 @@ * @return 0 if the toggle is disabled, non zero if enabled. * */ - LIB3270_EXPORT unsigned char lib3270_get_toggle(const H3270 *hSession, LIB3270_TOGGLE ix); + LIB3270_EXPORT unsigned char lib3270_get_toggle(const H3270 *hSession, LIB3270_TOGGLE_ID ix); /** * @brief Set toggle state. @@ -132,7 +132,7 @@ * @retval -EINVAL Invalid toggle id. * */ - LIB3270_EXPORT int lib3270_set_toggle(H3270 *hSession, LIB3270_TOGGLE ix, int value); + LIB3270_EXPORT int lib3270_set_toggle(H3270 *hSession, LIB3270_TOGGLE_ID ix, int value); /** * @brief Translate a string toggle name to the corresponding value. @@ -142,7 +142,7 @@ * @return Toggle ID or negative if it's invalid. * */ - LIB3270_EXPORT LIB3270_TOGGLE lib3270_get_toggle_id(const char *name); + LIB3270_EXPORT LIB3270_TOGGLE_ID lib3270_get_toggle_id(const char *name); /** * @brief Get the toggle name as string. @@ -152,7 +152,7 @@ * @return Constant string with the toggle name or "" if invalid. * */ - LIB3270_EXPORT const char * lib3270_get_toggle_name(LIB3270_TOGGLE ix); + LIB3270_EXPORT const char * lib3270_get_toggle_name(LIB3270_TOGGLE_ID ix); /** * @brief Get a long description of the toggle. @@ -160,7 +160,7 @@ * @return Constant string with the toggle description. * */ - LIB3270_EXPORT const char * lib3270_get_toggle_description(LIB3270_TOGGLE ix); + LIB3270_EXPORT const char * lib3270_get_toggle_description(LIB3270_TOGGLE_ID ix); /** * @brief Get a summary description of the toggle (for menus). @@ -168,7 +168,7 @@ * @return Constant string with the toggle summary. * */ - LIB3270_EXPORT const char * lib3270_get_toggle_summary(LIB3270_TOGGLE ix); + LIB3270_EXPORT const char * lib3270_get_toggle_summary(LIB3270_TOGGLE_ID ix); /** * @brief Get a short description of the toggle (for buttons). @@ -176,7 +176,7 @@ * @return Constant string with the toggle label. * */ - LIB3270_EXPORT const char * lib3270_get_toggle_label(LIB3270_TOGGLE ix); + LIB3270_EXPORT const char * lib3270_get_toggle_label(LIB3270_TOGGLE_ID ix); /** * @brief Revert toggle status. @@ -188,10 +188,10 @@ * * @retval -EINVAL Invalid toggle id. */ - LIB3270_EXPORT int lib3270_toggle(H3270 *hSession, LIB3270_TOGGLE ix); + LIB3270_EXPORT int lib3270_toggle(H3270 *hSession, LIB3270_TOGGLE_ID ix); - LIB3270_EXPORT const void * lib3270_register_toggle_listener(H3270 *hSession, LIB3270_TOGGLE tx, void (*func)(H3270 *, LIB3270_TOGGLE, char, void *),void *data); - LIB3270_EXPORT int lib3270_unregister_toggle_listener(H3270 *hSession, LIB3270_TOGGLE tx, const void *id); + LIB3270_EXPORT const void * lib3270_register_toggle_listener(H3270 *hSession, LIB3270_TOGGLE_ID tx, void (*func)(H3270 *, LIB3270_TOGGLE_ID, char, void *),void *data); + LIB3270_EXPORT int lib3270_unregister_toggle_listener(H3270 *hSession, LIB3270_TOGGLE_ID tx, const void *id); #ifdef __cplusplus } diff --git a/src/include/screenc.h b/src/include/screenc.h index cf59dae..30ed263 100644 --- a/src/include/screenc.h +++ b/src/include/screenc.h @@ -47,7 +47,7 @@ LIB3270_INTERNAL void mcursor_set(H3270 *session,LIB3270_POINTER m); #define mcursor_normal(x) mcursor_set(x,LIB3270_POINTER_UNLOCKED) #define mcursor_waiting(x) mcursor_set(x,LIB3270_POINTER_WAITING) -LIB3270_INTERNAL void notify_toggle_changed(H3270 *session, LIB3270_TOGGLE ix, unsigned char value, LIB3270_TOGGLE_TYPE reason); +LIB3270_INTERNAL void notify_toggle_changed(H3270 *session, LIB3270_TOGGLE_ID ix, unsigned char value, LIB3270_TOGGLE_TYPE reason); LIB3270_INTERNAL void set_viewsize(H3270 *session, unsigned int rows, unsigned int cols); // LIB3270_INTERNAL Boolean escaped; -- libgit2 0.21.2