From 5372b5eb092a7d531cd1b4180555b537d3a0b1f9 Mon Sep 17 00:00:00 2001 From: perry.werneck@gmail.com Date: Wed, 26 Nov 2014 23:51:53 +0000 Subject: [PATCH] Substituindo "widget" por "user_data" na estrutura de sessão --- iocalls.c | 9 --------- screen.c | 10 +++++----- session.c | 9 +++++++-- 3 files changed, 12 insertions(+), 16 deletions(-) diff --git a/iocalls.c b/iocalls.c index 3a4897d..06f0b62 100644 --- a/iocalls.c +++ b/iocalls.c @@ -51,15 +51,6 @@ static void * internal_add_timeout(unsigned long interval_ms, H3270 *session, vo static void * internal_add_poll(H3270 *session, int fd, LIB3270_IO_FLAG flag, void(*proc)(H3270 *, int, LIB3270_IO_FLAG, void *), void *userdata ); static void internal_remove_poll(void *id); - -/* -// fdcalls -static void internal_remove_source(void *id); -static void * internal_add_input(int source, H3270 *session, void (*fn)(H3270 *session)); -static void * internal_add_output(int source, H3270 *session, void (*fn)(H3270 *session)); -static void * internal_add_except(int source, H3270 *session, void (*fn)(H3270 *session)); -*/ - static int internal_wait(H3270 *hSession, int seconds); static int internal_event_dispatcher(H3270 *hSession, int block); diff --git a/screen.c b/screen.c index d88a7d2..52eed45 100644 --- a/screen.c +++ b/screen.c @@ -688,7 +688,7 @@ void Error(H3270 *session, const char *fmt, ...) va_start(arg_ptr, fmt); - popup_handler(session,session->widget,LIB3270_NOTIFY_ERROR, _( "3270 Error" ),NULL,fmt,arg_ptr); + popup_handler(session,session->user_data,LIB3270_NOTIFY_ERROR, _( "3270 Error" ),NULL,fmt,arg_ptr); va_end(arg_ptr); @@ -703,7 +703,7 @@ void Warning(H3270 *session, const char *fmt, ...) trace("%s: title=%s fmt=%s",__FUNCTION__,"3270 Warning",fmt); va_start(arg_ptr, fmt); - popup_handler(session,session->widget,LIB3270_NOTIFY_WARNING, _( "3270 Warning" ),NULL,fmt,arg_ptr); + popup_handler(session,session->user_data,LIB3270_NOTIFY_WARNING, _( "3270 Warning" ),NULL,fmt,arg_ptr); va_end(arg_ptr); } @@ -718,7 +718,7 @@ void popup_an_error(H3270 *session, const char *fmt, ...) trace("%s: title=%s fmt=%s",__FUNCTION__,"3270 Error",fmt); va_start(args, fmt); - popup_handler(session,session->widget,LIB3270_NOTIFY_ERROR,_( "3270 Error" ),NULL,fmt,args); + popup_handler(session,session->user_data,LIB3270_NOTIFY_ERROR,_( "3270 Error" ),NULL,fmt,args); va_end(args); } @@ -732,7 +732,7 @@ void popup_system_error(H3270 *session, const char *title, const char *message, trace("%s: title=%s msg=%s",__FUNCTION__,"3270 Error",message); va_start(args, fmt); - popup_handler(session,session->widget,LIB3270_NOTIFY_ERROR,title ? title : _( "3270 Error" ), message,fmt,args); + popup_handler(session,session->user_data,LIB3270_NOTIFY_ERROR,title ? title : _( "3270 Error" ), message,fmt,args); va_end(args); } @@ -857,7 +857,7 @@ LIB3270_EXPORT void lib3270_popup_va(H3270 *session, LIB3270_NOTIFY id , const c trace("%s: title=%s msg=%s",__FUNCTION__,"3270 Error",message); - popup_handler(session,session->widget,id,title ? title : _( "3270 Error" ), message,fmt,args); + popup_handler(session,session->user_data,id,title ? title : _( "3270 Error" ), message,fmt,args); } LIB3270_EXPORT int lib3270_is_protected(H3270 *h, unsigned int baddr) diff --git a/session.c b/session.c index 4601460..e7f7838 100644 --- a/session.c +++ b/session.c @@ -320,9 +320,14 @@ LIB3270_EXPORT H3270 * lib3270_get_default_session_handle(void) return lib3270_session_new(""); } -LIB3270_EXPORT void * lib3270_get_widget(H3270 *h) +LIB3270_EXPORT void lib3270_set_user_data(H3270 *h, void *ptr) { CHECK_SESSION_HANDLE(h); - return h->widget; + h->user_data = ptr; } +LIB3270_EXPORT void * lib3270_get_user_data(H3270 *h) +{ + CHECK_SESSION_HANDLE(h); + return h->user_data; +} -- libgit2 0.21.2