From 610c78d4ddaeba0cd0474afd382528c96efd079f Mon Sep 17 00:00:00 2001 From: Perry Werneck Date: Tue, 2 Jul 2019 10:38:22 -0300 Subject: [PATCH] Updating data types while trying to identify screen size detection problem in some machines. --- src/include/api.h | 1 - src/include/ctlrc.h | 2 +- src/include/lib3270.h | 8 ++++---- src/lib3270/private.h | 16 ++++++++-------- src/lib3270/screen.c | 10 +++++----- src/lib3270/trace_ds.c | 6 +++--- 6 files changed, 21 insertions(+), 22 deletions(-) diff --git a/src/include/api.h b/src/include/api.h index 9c23487..dac4c0b 100644 --- a/src/include/api.h +++ b/src/include/api.h @@ -219,7 +219,6 @@ LOCAL_EXTERN void screen_size(int *rows, int *cols); #define lib3270_paste_string(str) lib3270_set_string(NULL,str) - #define get_3270_terminal_size(h,r,c) lib3270_get_screen_size(h,r,c) /* Keyboard */ LOCAL_EXTERN int emulate_input(char *s, int len, int pasting); diff --git a/src/include/ctlrc.h b/src/include/ctlrc.h index a687792..c548552 100644 --- a/src/include/ctlrc.h +++ b/src/include/ctlrc.h @@ -67,7 +67,7 @@ LIB3270_INTERNAL void mdt_set(H3270 *hSession, int baddr); LIB3270_INTERNAL enum pds process_ds(H3270 *hSession, unsigned char *buf, int buflen); LIB3270_INTERNAL void ps_process(H3270 *hSession); -LIB3270_INTERNAL void update_model_info(H3270 *session, int model, int cols, int rows); +LIB3270_INTERNAL void update_model_info(H3270 *session, unsigned int model, unsigned int cols, unsigned int rows); LIB3270_INTERNAL void ctlr_set_rows_cols(H3270 *session, int mn, int ovc, int ovr); LIB3270_INTERNAL void ctlr_erase(H3270 *session, int alt); diff --git a/src/include/lib3270.h b/src/include/lib3270.h index d97329f..58d9475 100644 --- a/src/include/lib3270.h +++ b/src/include/lib3270.h @@ -409,7 +409,7 @@ * @param c Pointer to screen columns. * */ - LIB3270_EXPORT void lib3270_get_screen_size(H3270 *h, int *r, int *c); + LIB3270_EXPORT void lib3270_get_screen_size(H3270 *h, unsigned int *r, unsigned int *c); /** * Get current screen width in columns. @@ -419,7 +419,7 @@ * @return screen width. * */ - LIB3270_EXPORT int lib3270_get_width(H3270 *h); + LIB3270_EXPORT unsigned int lib3270_get_width(H3270 *h); /** * Get current screen width in rows. @@ -429,9 +429,9 @@ * @return screen rows. * */ - LIB3270_EXPORT int lib3270_get_height(H3270 *h); + LIB3270_EXPORT unsigned int lib3270_get_height(H3270 *h); - LIB3270_EXPORT int lib3270_get_length(H3270 *h); + LIB3270_EXPORT unsigned int lib3270_get_length(H3270 *h); /** * @brief Creates an empty TN3270 session. diff --git a/src/lib3270/private.h b/src/lib3270/private.h index 064b988..617cc3a 100644 --- a/src/lib3270/private.h +++ b/src/lib3270/private.h @@ -363,7 +363,7 @@ struct _h3270 char full_model_name[LIB3270_FULL_MODEL_NAME_LENGTH+1]; char * model_name; - int model_num; + unsigned int model_num; char * termtype; struct @@ -391,13 +391,13 @@ struct _h3270 H3270FT * ft; /**< @brief Active file transfer data */ // screen info - int ov_rows; - int ov_cols; - int maxROWS; - int maxCOLS; - unsigned short rows; - unsigned short cols; - unsigned short pointer; /**< @brief Current pointer. */ + unsigned int ov_rows; + unsigned int ov_cols; + unsigned int maxROWS; + unsigned int maxCOLS; + unsigned int rows; + unsigned int cols; + LIB3270_POINTER pointer; /**< @brief Current pointer. */ int cursor_addr; int buffer_addr; char flipped; diff --git a/src/lib3270/screen.c b/src/lib3270/screen.c index 9185dce..285fc81 100644 --- a/src/lib3270/screen.c +++ b/src/lib3270/screen.c @@ -244,13 +244,13 @@ static unsigned short calc_attrs(H3270 *session, int baddr, int fa_addr, int fa) return a; } -LIB3270_EXPORT int lib3270_get_length(H3270 *h) +LIB3270_EXPORT unsigned int lib3270_get_length(H3270 *h) { CHECK_SESSION_HANDLE(h); return h->rows * h->cols; } -LIB3270_EXPORT void lib3270_get_screen_size(H3270 *h, int *r, int *c) +LIB3270_EXPORT void lib3270_get_screen_size(H3270 *h, unsigned int *r, unsigned int *c) { CHECK_SESSION_HANDLE(h); *r = h->rows; @@ -260,19 +260,19 @@ LIB3270_EXPORT void lib3270_get_screen_size(H3270 *h, int *r, int *c) } -LIB3270_EXPORT int lib3270_get_width(H3270 *h) +LIB3270_EXPORT unsigned int lib3270_get_width(H3270 *h) { CHECK_SESSION_HANDLE(h); return h->cols; } -LIB3270_EXPORT int lib3270_get_height(H3270 *h) +LIB3270_EXPORT unsigned int lib3270_get_height(H3270 *h) { CHECK_SESSION_HANDLE(h); return h->rows; } -void update_model_info(H3270 *session, int model, int cols, int rows) +void update_model_info(H3270 *session, unsigned int model, unsigned int cols, unsigned int rows) { if(model == session->model_num && session->maxROWS == rows && session->maxCOLS == cols) return; diff --git a/src/lib3270/trace_ds.c b/src/lib3270/trace_ds.c index 79d3146..dc2fa8e 100644 --- a/src/lib3270/trace_ds.c +++ b/src/lib3270/trace_ds.c @@ -260,11 +260,11 @@ void trace_screen(H3270 *session) if (lib3270_get_toggle(session,LIB3270_TOGGLE_SCREEN_TRACE)) { - int row, baddr; + unsigned int row, baddr; for(row=baddr=0;row < session->rows;row++) { - int col; + unsigned int col; wtrace(session,"%02d ",row+1); for(col = 0; col < session->cols;col++) @@ -302,7 +302,7 @@ void trace_char(H3270 *hSession, char c) */ void trace_ansi_disc(H3270 *hSession) { - int i; + unsigned int i; wtrace(hSession,"%c",'\n'); for (i = 0; i < hSession->cols; i++) -- libgit2 0.21.2