Download as
Browse Code »

Commit ca28bc5da72392b7a6be737384d034f8581000e9

Authored by perry.werneck@gmail.com
1 parent 3138a1d4
Exists in master and in 5 other branches develop, edit-header-bar, keypads, script-support, v5.2

Limpando globais obsoletas

Showing 7 changed files with 12 additions and 51 deletions   Show diff stats
src/gtk/mainwindow.c
  Diff comments   View file @ca28bc5
@@ -143,7 +143,7 @@ @@ -143,7 +143,7 @@
143 143
144 static void selecting(GtkWidget *widget, gboolean on, GtkActionGroup **group) 144 static void selecting(GtkWidget *widget, gboolean on, GtkActionGroup **group)
145 { 145 {
146 - trace("Widget %p selection state changed to %s",widget,on ? "Yes" : "No"); 146 +// trace("Widget %p selection state changed to %s",widget,on ? "Yes" : "No");
147 gtk_action_group_set_sensitive(group[ACTION_GROUP_SELECTION],on); 147 gtk_action_group_set_sensitive(group[ACTION_GROUP_SELECTION],on);
148 } 148 }
149 149
src/gtk/v3270/oia.c
  Diff comments   View file @ca28bc5
@@ -585,7 +585,7 @@ void v3270_update_luname(GtkWidget *widget,const gchar *name) @@ -585,7 +585,7 @@ void v3270_update_luname(GtkWidget *widget,const gchar *name)
585 if(!terminal->surface) 585 if(!terminal->surface)
586 return; 586 return;
587 587
588 - trace("%s",__FUNCTION__); 588 +// trace("%s",__FUNCTION__);
589 589
590 cr = set_update_region(terminal,&rect,V3270_OIA_LUNAME); 590 cr = set_update_region(terminal,&rect,V3270_OIA_LUNAME);
591 591
@@ -695,7 +695,7 @@ struct timer_info @@ -695,7 +695,7 @@ struct timer_info
695 695
696 static void release_timer(struct timer_info *info) 696 static void release_timer(struct timer_info *info)
697 { 697 {
698 - trace("Timer %p stops",info); 698 +// trace("Timer %p stops",info);
699 info->terminal->timer = NULL; 699 info->terminal->timer = NULL;
700 700
701 if(info->terminal->surface) 701 if(info->terminal->surface)
@@ -905,7 +905,7 @@ void v3270_stop_timer(GtkWidget *widget) @@ -905,7 +905,7 @@ void v3270_stop_timer(GtkWidget *widget)
905 if(!terminal->timer) 905 if(!terminal->timer)
906 return; 906 return;
907 907
908 - trace("Timer=%p",terminal->timer); 908 +// trace("Timer=%p",terminal->timer);
909 if(terminal->timer->ref_count < 2) 909 if(terminal->timer->ref_count < 2)
910 g_source_destroy(terminal->timer); 910 g_source_destroy(terminal->timer);
911 911
src/include/lib3270/session.h
  Diff comments   View file @ca28bc5
@@ -137,6 +137,7 @@ @@ -137,6 +137,7 @@
137 void (*erase)(H3270 *session); 137 void (*erase)(H3270 *session);
138 void (*cursor)(H3270 *session, LIB3270_CURSOR id); 138 void (*cursor)(H3270 *session, LIB3270_CURSOR id);
139 void (*set_selection)(H3270 *session, unsigned char on); 139 void (*set_selection)(H3270 *session, unsigned char on);
  140 + void (*ctlr_done)(H3270 *session);
140 141
141 }; 142 };
142 143
src/lib3270/glue.c
  Diff comments   View file @ca28bc5
@@ -150,6 +150,11 @@ static void nop_char(H3270 *session, unsigned char chr) @@ -150,6 +150,11 @@ static void nop_char(H3270 *session, unsigned char chr)
150 150
151 } 151 }
152 152
  153 +static void nop(H3270 *session)
  154 +{
  155 +
  156 +}
  157 +
153 static void lib3270_session_init(H3270 *hSession, const char *model) 158 static void lib3270_session_init(H3270 *hSession, const char *model)
154 { 159 {
155 int ovc, ovr; 160 int ovc, ovr;
@@ -162,7 +167,7 @@ static void lib3270_session_init(H3270 *hSession, const char *model) @@ -162,7 +167,7 @@ static void lib3270_session_init(H3270 *hSession, const char *model)
162 // A few dummy calls to avoid "ifs" 167 // A few dummy calls to avoid "ifs"
163 hSession->update = update_char; 168 hSession->update = update_char;
164 hSession->set_selection = nop_char; 169 hSession->set_selection = nop_char;
165 - 170 + hSession->ctlr_done = nop;
166 171
167 hSession->sock = -1; 172 hSession->sock = -1;
168 hSession->model_num = -1; 173 hSession->model_num = -1;
src/lib3270/kybd.c
  Diff comments   View file @ca28bc5
@@ -1567,12 +1567,6 @@ do_reset(Boolean explicit) @@ -1567,12 +1567,6 @@ do_reset(Boolean explicit)
1567 status_reset(NULL); 1567 status_reset(NULL);
1568 mcursor_normal(&h3270); 1568 mcursor_normal(&h3270);
1569 1569
1570 -// composing = NONE;  
1571 -// status_compose(False, 0, KT_STD);  
1572 -  
1573 - lib3270_event_counter[COUNTER_ID_RESET]++;  
1574 - Trace("Reset counter updated to %d",lib3270_event_counter[COUNTER_ID_RESET]);  
1575 -  
1576 } 1570 }
1577 1571
1578 LIB3270_CLEAR_SELECTION_ACTION( reset ) 1572 LIB3270_CLEAR_SELECTION_ACTION( reset )
src/lib3270/screen.c
  Diff comments   View file @ca28bc5
@@ -84,8 +84,6 @@ static int (*popup_handler)(H3270 *, LIB3270_NOTIFY, const char *, const char *, @@ -84,8 +84,6 @@ static int (*popup_handler)(H3270 *, LIB3270_NOTIFY, const char *, const char *,
84 // static SCRIPT_STATE script_state = SCRIPT_STATE_NONE; 84 // static SCRIPT_STATE script_state = SCRIPT_STATE_NONE;
85 85
86 86
87 -int lib3270_event_counter[COUNTER_ID_USER] = { 0, 0 };  
88 -  
89 enum ts { TS_AUTO, TS_ON, TS_OFF }; 87 enum ts { TS_AUTO, TS_ON, TS_OFF };
90 88
91 static void screen_update(H3270 *session, int bstart, int bend); 89 static void screen_update(H3270 *session, int bstart, int bend);
@@ -445,8 +443,8 @@ void set_status(H3270 *session, LIB3270_FLAG id, Boolean on) @@ -445,8 +443,8 @@ void set_status(H3270 *session, LIB3270_FLAG id, Boolean on)
445 void status_ctlr_done(H3270 *session) 443 void status_ctlr_done(H3270 *session)
446 { 444 {
447 CHECK_SESSION_HANDLE(session); 445 CHECK_SESSION_HANDLE(session);
448 - lib3270_event_counter[COUNTER_ID_CTLR_DONE]++;  
449 set_status(session,OIA_FLAG_UNDERA,True); 446 set_status(session,OIA_FLAG_UNDERA,True);
  447 + session->ctlr_done(session);
450 } 448 }
451 449
452 void status_oerr(H3270 *session, int error_type) 450 void status_oerr(H3270 *session, int error_type)
@@ -632,41 +630,6 @@ void status_untiming(H3270 *session) @@ -632,41 +630,6 @@ void status_untiming(H3270 *session)
632 session->set_timer(session,0); 630 session->set_timer(session,0);
633 } 631 }
634 632
635 -/* Set the window title. */ /*  
636 -void screen_title(char *text)  
637 -{  
638 -}  
639 -  
640 -static void  
641 -relabel(H3270 *session, int ignored unused, void *dunno)  
642 -{  
643 -#if defined(WC3270)  
644 - if (appres.title != CN)  
645 - return;  
646 -#endif  
647 -  
648 - if (PCONNECTED)  
649 - {  
650 -#if defined(WC3270)  
651 - if (profile_name != CN)  
652 - screen_title(profile_name);  
653 - else  
654 -#endif  
655 - screen_title(session->reconnect_host);  
656 -  
657 - }  
658 - else  
659 - {  
660 - screen_title(0);  
661 - }  
662 -}  
663 -  
664 -int query_counter(COUNTER_ID id)  
665 -{  
666 - return lib3270_event_counter[id];  
667 -}  
668 -*/  
669 -  
670 void show_3270_popup_dialog(H3270 *session, LIB3270_NOTIFY type, const char *title, const char *msg, const char *fmt, ...) 633 void show_3270_popup_dialog(H3270 *session, LIB3270_NOTIFY type, const char *title, const char *msg, const char *fmt, ...)
671 { 634 {
672 CHECK_SESSION_HANDLE(session); 635 CHECK_SESSION_HANDLE(session);
src/lib3270/statusc.h
  Diff comments   View file @ca28bc5
@@ -39,5 +39,3 @@ LIB3270_INTERNAL void set_status(H3270 *session, OIA_FLAG id, Boolean on); @@ -39,5 +39,3 @@ LIB3270_INTERNAL void set_status(H3270 *session, OIA_FLAG id, Boolean on);
39 #define status_syswait() status_changed(NULL,LIB3270_STATUS_SYSWAIT) 39 #define status_syswait() status_changed(NULL,LIB3270_STATUS_SYSWAIT)
40 #define status_minus() status_changed(NULL,LIB3270_STATUS_MINUS) 40 #define status_minus() status_changed(NULL,LIB3270_STATUS_MINUS)
41 41
42 -  
43 -extern int lib3270_event_counter[COUNTER_ID_USER];