From ca28bc5da72392b7a6be737384d034f8581000e9 Mon Sep 17 00:00:00 2001 From: perry.werneck@gmail.com Date: Mon, 12 Mar 2012 19:26:12 +0000 Subject: [PATCH] Limpando globais obsoletas --- src/gtk/mainwindow.c | 2 +- src/gtk/v3270/oia.c | 6 +++--- src/include/lib3270/session.h | 1 + src/lib3270/glue.c | 7 ++++++- src/lib3270/kybd.c | 6 ------ src/lib3270/screen.c | 39 +-------------------------------------- src/lib3270/statusc.h | 2 -- 7 files changed, 12 insertions(+), 51 deletions(-) diff --git a/src/gtk/mainwindow.c b/src/gtk/mainwindow.c index f5ea04c..4e708e3 100644 --- a/src/gtk/mainwindow.c +++ b/src/gtk/mainwindow.c @@ -143,7 +143,7 @@ static void selecting(GtkWidget *widget, gboolean on, GtkActionGroup **group) { - trace("Widget %p selection state changed to %s",widget,on ? "Yes" : "No"); +// trace("Widget %p selection state changed to %s",widget,on ? "Yes" : "No"); gtk_action_group_set_sensitive(group[ACTION_GROUP_SELECTION],on); } diff --git a/src/gtk/v3270/oia.c b/src/gtk/v3270/oia.c index 43b492f..9310762 100644 --- a/src/gtk/v3270/oia.c +++ b/src/gtk/v3270/oia.c @@ -585,7 +585,7 @@ void v3270_update_luname(GtkWidget *widget,const gchar *name) if(!terminal->surface) return; - trace("%s",__FUNCTION__); +// trace("%s",__FUNCTION__); cr = set_update_region(terminal,&rect,V3270_OIA_LUNAME); @@ -695,7 +695,7 @@ struct timer_info static void release_timer(struct timer_info *info) { - trace("Timer %p stops",info); +// trace("Timer %p stops",info); info->terminal->timer = NULL; if(info->terminal->surface) @@ -905,7 +905,7 @@ void v3270_stop_timer(GtkWidget *widget) if(!terminal->timer) return; - trace("Timer=%p",terminal->timer); +// trace("Timer=%p",terminal->timer); if(terminal->timer->ref_count < 2) g_source_destroy(terminal->timer); diff --git a/src/include/lib3270/session.h b/src/include/lib3270/session.h index 8b8a68d..c53bb61 100644 --- a/src/include/lib3270/session.h +++ b/src/include/lib3270/session.h @@ -137,6 +137,7 @@ void (*erase)(H3270 *session); void (*cursor)(H3270 *session, LIB3270_CURSOR id); void (*set_selection)(H3270 *session, unsigned char on); + void (*ctlr_done)(H3270 *session); }; diff --git a/src/lib3270/glue.c b/src/lib3270/glue.c index e209b1f..5de2831 100644 --- a/src/lib3270/glue.c +++ b/src/lib3270/glue.c @@ -150,6 +150,11 @@ static void nop_char(H3270 *session, unsigned char chr) } +static void nop(H3270 *session) +{ + +} + static void lib3270_session_init(H3270 *hSession, const char *model) { int ovc, ovr; @@ -162,7 +167,7 @@ static void lib3270_session_init(H3270 *hSession, const char *model) // A few dummy calls to avoid "ifs" hSession->update = update_char; hSession->set_selection = nop_char; - + hSession->ctlr_done = nop; hSession->sock = -1; hSession->model_num = -1; diff --git a/src/lib3270/kybd.c b/src/lib3270/kybd.c index 7fbe2c9..7ab3ed2 100644 --- a/src/lib3270/kybd.c +++ b/src/lib3270/kybd.c @@ -1567,12 +1567,6 @@ do_reset(Boolean explicit) status_reset(NULL); mcursor_normal(&h3270); -// composing = NONE; -// status_compose(False, 0, KT_STD); - - lib3270_event_counter[COUNTER_ID_RESET]++; - Trace("Reset counter updated to %d",lib3270_event_counter[COUNTER_ID_RESET]); - } LIB3270_CLEAR_SELECTION_ACTION( reset ) diff --git a/src/lib3270/screen.c b/src/lib3270/screen.c index f7c0532..c48aeff 100644 --- a/src/lib3270/screen.c +++ b/src/lib3270/screen.c @@ -84,8 +84,6 @@ static int (*popup_handler)(H3270 *, LIB3270_NOTIFY, const char *, const char *, // static SCRIPT_STATE script_state = SCRIPT_STATE_NONE; -int lib3270_event_counter[COUNTER_ID_USER] = { 0, 0 }; - enum ts { TS_AUTO, TS_ON, TS_OFF }; static void screen_update(H3270 *session, int bstart, int bend); @@ -445,8 +443,8 @@ void set_status(H3270 *session, LIB3270_FLAG id, Boolean on) void status_ctlr_done(H3270 *session) { CHECK_SESSION_HANDLE(session); - lib3270_event_counter[COUNTER_ID_CTLR_DONE]++; set_status(session,OIA_FLAG_UNDERA,True); + session->ctlr_done(session); } void status_oerr(H3270 *session, int error_type) @@ -632,41 +630,6 @@ void status_untiming(H3270 *session) session->set_timer(session,0); } -/* Set the window title. */ /* -void screen_title(char *text) -{ -} - -static void -relabel(H3270 *session, int ignored unused, void *dunno) -{ -#if defined(WC3270) - if (appres.title != CN) - return; -#endif - - if (PCONNECTED) - { -#if defined(WC3270) - if (profile_name != CN) - screen_title(profile_name); - else -#endif - screen_title(session->reconnect_host); - - } - else - { - screen_title(0); - } -} - -int query_counter(COUNTER_ID id) -{ - return lib3270_event_counter[id]; -} -*/ - void show_3270_popup_dialog(H3270 *session, LIB3270_NOTIFY type, const char *title, const char *msg, const char *fmt, ...) { CHECK_SESSION_HANDLE(session); diff --git a/src/lib3270/statusc.h b/src/lib3270/statusc.h index f6053d7..d683223 100644 --- a/src/lib3270/statusc.h +++ b/src/lib3270/statusc.h @@ -39,5 +39,3 @@ LIB3270_INTERNAL void set_status(H3270 *session, OIA_FLAG id, Boolean on); #define status_syswait() status_changed(NULL,LIB3270_STATUS_SYSWAIT) #define status_minus() status_changed(NULL,LIB3270_STATUS_MINUS) - -extern int lib3270_event_counter[COUNTER_ID_USER]; -- libgit2 0.21.2