Removing old trace messages.

Perry Werneck
1 parent f9c5ddcf
Showing 9 changed files with 0 additions and 124 deletions Show diff stats
src/v3270/accessible.c
src/v3270/charset.c
src/v3270/draw.c
src/v3270/iocallback.c
src/v3270/keyboard.c
src/v3270/mouse.c
src/v3270/oia.c
src/v3270/selection.c
src/v3270/widget.c
@@ -324,8 +324,6 @@ static void v3270_accessible_get_character_extents(	AtkText      *text,
 		*y -= y_window;
 	}
-//	trace("%s: offset=%d x=%d y=%d %s",__FUNCTION__,offset,*x,*y,coords == ATK_XY_WINDOW ? "ATK_XY_WINDOW" : "");
-
 }
 static gchar * v3270_accessible_get_text_at_offset(AtkText *atk_text, gint offset, AtkTextBoundary boundary_type, gint *start_offset, gint *end_offset)
@@ -443,8 +441,6 @@ static gchar * v3270_accessible_get_text(AtkText *atk_text, gint start_pos, gint
 		lib3270_free(text);
-//		trace("%s:\n%s\n",__FUNCTION__,utftext);
-
 	}
 	return utftext;
@@ -456,8 +452,6 @@ static gboolean v3270_set_caret_offset(AtkText *text, gint offset)
 	if (widget == NULL)
 	return FALSE;
-	trace("%s - offset=%d",__FUNCTION__,offset);
-
 	lib3270_set_cursor_address(GTK_V3270(widget)->host,offset);
 	return TRUE;
@@ -482,8 +476,6 @@ static gint v3270_accessible_get_n_selections (AtkText *text)
 	if(!widget)
 		return 0;
-//	trace("%s: n_selections=%d",__FUNCTION__,v3270_get_selection_bounds(widget, NULL, NULL) ? 1 : 0);
-
 	return v3270_get_selection_bounds(widget, NULL, NULL) ? 1 : 0;
 }
@@ -491,17 +483,14 @@ static gchar * v3270_accessible_get_selection(AtkText *atk_text, gint selection_
 {
 	GtkWidget *widget = gtk_accessible_get_widget(GTK_ACCESSIBLE (atk_text));
-//	trace("%s: selection_num=%d",__FUNCTION__,selection_num);
 	if (widget == NULL ||selection_num != 0)
 		return NULL;
 	if(v3270_get_selection_bounds(widget, start_pos, end_pos))
 	{
-//		trace("%s: TRUE",__FUNCTION__);
 		return v3270_get_region(widget, *start_pos, *end_pos, FALSE);
 	}
-//	trace("%s: FALSE",__FUNCTION__);
 	return NULL;
 }
@@ -556,8 +545,6 @@ static AtkAttributeSet * v3270_accessible_get_default_attributes (AtkText *text)
 	if(!widget)
 		return NULL;
-	trace("%s is incomplete ***********************",__FUNCTION__);
-
 	// http://developer.gnome.org/atk/stable/AtkText.html#AtkTextAttribute
 	// The direction of the text, if set. Values are "none", "ltr" or "rtl"
@@ -588,8 +575,6 @@ static AtkAttributeSet * v3270_accessible_get_run_attributes(AtkText *text, gint
 	AtkAttributeSet	* attributes	= NULL;
 	int				  start, end;
-	trace("%s is incomplete ***********************",__FUNCTION__);
-
 	g_return_val_if_fail((widget && GTK_IS_V3270(widget)),NULL);
 	host = v3270_get_session(widget);
@@ -636,24 +621,6 @@ static AtkAttributeSet * v3270_accessible_get_run_attributes(AtkText *text, gint
   return attributes;
 }
-/*
-static gchar * v3270_accessible_get_text_after_offset(AtkText *text, gint offset, AtkTextBoundary boundary_type, gint *start_offset, gint *end_offset)
-{
-	// http://developer.gnome.org/atk/stable/AtkText.html#atk-text-get-text-after-offset
-	trace("WARNING: %s is incomplete",__FUNCTION__);
-
-}
-*/
-
-/*
-static gchar * v3270_accessible_get_text_before_offset(AtkText *text,gint offset,AtkTextBoundary boundary_type,gint *start_offset,gint *end_offset)
-{
-	// http://developer.gnome.org/atk/stable/AtkText.html#atk-text-get-text-before-offset
-	trace("WARNING: %s is incomplete",__FUNCTION__);
-
-}
-*/
-
 static void atk_text_interface_init(AtkTextIface *iface)
 {
 	iface->get_text 				= v3270_accessible_get_text;
@@ -867,13 +834,10 @@ void v3270_acessible_set_state(GtkAccessible *obj, LIB3270_MESSAGE id)
 	bits = GTK_V3270_ACCESSIBLE(obj)->state ^ state;
-//	trace("State change from %04x to %04x (bits=%04x)",GTK_V3270_ACCESSIBLE(obj)->state,state, bits );
-
 	for(f=0;f<G_N_ELEMENTS(table);f++)
 	{
 		if(bits & table[f].flag)
 		{
-//			trace("State %s is %s",table[f].dbg,(state & table[f].flag) ? "Yes" : "No");
 			atk_object_notify_state_change(ATK_OBJECT(obj),table[f].atkstate,(state & table[f].flag) ? TRUE : FALSE);
 		}
 	}
@@ -324,8 +324,6 @@
  static void element_start(GMarkupParseContext *context, const gchar *element_name, const gchar **names,const gchar **values, struct parse *info, GError **error)
  {
-	trace("%s(%s)",__FUNCTION__,element_name);
-
  	if(!g_ascii_strcasecmp(element_name,"pw3270-remap"))
 	{
 		const gchar *host		= NULL;
@@ -408,8 +406,6 @@
 		info->map[info->len].iso 	= getChar(iso,error);
 		info->map[info->len].scope	= getRemapScope(scope,error);
-		trace("%u: ebc=%04x iso=%04x %c",(unsigned int) info->len,info->map[info->len].ebc,info->map[info->len].iso,info->map[info->len].iso);
-
  		info->len++;
  	}
@@ -418,10 +414,8 @@
  static void element_end(GMarkupParseContext *context, const gchar *element_name, struct parse *info, GError **error)
  {
-	// trace("%s(%s)",__FUNCTION__,element_name);
  }
-
  LIB3270_EXPORT	void v3270_remap_from_xml(GtkWidget *widget, const gchar *path)
  {
 	static const GMarkupParser parser =
@@ -490,11 +484,6 @@
 		{
 			unsigned int i;
-			trace("cgcsgid = %lx",cfg.cgcsgid);
-			trace("display = %s",cfg.display);
-			trace("host = %s",cfg.host);
-			trace("length = %u",(unsigned int) cfg.len);
-
 			lib3270_reset_charset(hSession, cfg.host, cfg.display, cfg.cgcsgid);
 			for(i=0;i < cfg.len; i++)
@@ -470,8 +470,6 @@ void v3270_update_char(H3270 *session, int addr, unsigned char chr, unsigned sho
 	rect.width      = terminal->font.width;
 	rect.height     = terminal->font.spacing;
-//	trace("%s: c=%c attr=%04x addr=%d pos=%d,%d x=%d y=%d w=%d h=%d",__FUNCTION__,chr,(int) attr,addr,(addr / cols),(addr % cols),rect.x,rect.y,rect.width,rect.height);
-
 	cr = cairo_create(terminal->surface);
 	cairo_set_scaled_font(cr,terminal->font.scaled);
 	v3270_draw_element(cr, chr, attr, terminal->host, &terminal->font, &rect,terminal->color);
@@ -134,7 +134,6 @@ static void * static_AddTimeOut(H3270 *session, unsigned long interval, void (*c
 	t->call		= call;
 	t->session	= session;
-	trace("Adding timeout with %ld ms",interval);
 	g_timeout_add_full(G_PRIORITY_DEFAULT, (guint) interval, (GSourceFunc) do_timer, t, g_free);
 	return t;
@@ -253,10 +252,8 @@ struct bgParameter
 gpointer BgCall(struct bgParameter *p)
 {
-//	trace("%s starts",__FUNCTION__);
 	p->rc = p->callback(p->session, p->parm);
 	p->running = FALSE;
-//	trace("%s ends",__FUNCTION__);
 	return 0;
 }
@@ -313,5 +310,4 @@ void v3270_register_io_handlers(v3270Class *cls)
 		g_error("%s",_( "Can't set lib3270 I/O handlers" ) );
 	}
-	trace("%s: I/O handlers OK",__FUNCTION__);
 }
@@ -143,8 +143,6 @@
 	{
 		int pfcode = (event->keyval - GDK_F1) + ((state & GDK_SHIFT_MASK) ? 13 : 1);
-		trace("PF%02d",pfcode);
-
 		if(pfcode > 0 && pfcode < 25)
 		{
 			lib3270_pfkey(widget->host,pfcode);
@@ -156,7 +154,6 @@
 	{
 		if(keycode[f].keyval == event->keyval && state == keycode[f].state)
 		{
-			trace("%s: id=%d action=%p",__FUNCTION__,f,keycode[f].action);
 			if(keycode[f].action)
 				gtk_action_activate(keycode[f].action);
 			else if(keycode[f].exec)
@@ -81,7 +81,6 @@ static void single_click(v3270 *widget, int baddr)
 	default:
 		// Move selected area
-		trace("%s: default action",__FUNCTION__);
 		widget->selection.baddr = baddr;
 		widget->moving = 1;
 	}
@@ -110,10 +109,6 @@ static void button_1_press(GtkWidget *widget, GdkEventType type, int baddr)
 			lib3270_ring_bell(GTK_V3270(widget)->host);
 		break;
-#ifdef DEBUG
-	default:
-		trace("Unexpected button 1 type %d",type);
-#endif
 	}
 	#pragma GCC diagnostic pop
@@ -175,14 +170,11 @@ gboolean v3270_button_press_event(GtkWidget *widget, GdkEventButton *event)
 				v3270_emit_popup(GTK_V3270(widget),baddr,event);
 			break;
-		default:
-			trace("%s button=%d type=%d",__FUNCTION__,event->button,event->type);
 		}
 	}
 	else if(event->button == 1 && event->type == GDK_BUTTON_PRESS)
 	{
 		GTK_V3270(widget)->selected_field = get_field_from_event(GTK_V3270(widget),event);
-		trace("%s field=%d",__FUNCTION__,GTK_V3270(widget)->selected_field);
 	}
 	return FALSE;
@@ -201,16 +193,12 @@ gboolean v3270_button_release_event(GtkWidget *widget, GdkEventButton*event)
 		{
 			gboolean handled = FALSE;
-			trace("%s field %d was clicked event=%p",__FUNCTION__,GTK_V3270(widget)->selected_field,event);
-
 			g_signal_emit(widget,	v3270_widget_signal[SIGNAL_FIELD], 0,
 									lib3270_connected(GTK_V3270(widget)->host) ? TRUE : FALSE,
 									GTK_V3270(widget)->selected_field,
 									event,
 									&handled);
-			trace("Handled: %s",handled ? "Yes": "No");
-
 			if(!handled)
 				gdk_beep();
@@ -220,8 +208,6 @@ gboolean v3270_button_release_event(GtkWidget *widget, GdkEventButton*event)
 		break;
-	default:
-		trace("%s button=%d type=%d",__FUNCTION__,event->button,event->type);
 	}
 	return FALSE;
@@ -335,8 +321,6 @@ gboolean v3270_scroll_event(GtkWidget *widget, GdkEventScroll *event)
 	lib3270_trace_event(hSession,"\n");
-	trace("Scroll: %d Action: %p",event->direction,action_scroll[event->direction]);
-
 	if(action_scroll[event->direction])
 		gtk_action_activate(action_scroll[event->direction]);
@@ -461,8 +461,6 @@ static void draw_status_message(cairo_t *cr, LIB3270_MESSAGE id, v3270FontInfo *
 	memcpy(&rect,r,sizeof(GdkRectangle));
-//	trace("%s: id=%d",__FUNCTION__,id);
-
 	if(id >= 0 && id < G_N_ELEMENTS(message))
 	{
 		msg = message[id].msg;
@@ -821,8 +819,6 @@ struct timer_info
 static void release_timer(struct timer_info *info)
 {
-	trace("%s: info=%p",__FUNCTION__,info);
-
 	info->terminal->timer = NULL;
 	if(info->terminal->surface)
@@ -867,8 +863,6 @@ void v3270_draw_shift_status(v3270 *terminal)
 	cr = set_update_region(terminal,&r,V3270_OIA_SHIFT);
 	cairo_translate(cr, r->x, r->y+1);
-	trace("%s: %s",__FUNCTION__,(terminal->keyflags & KEY_FLAG_SHIFT) ? "Yes" : "No");
-
 	if(r->width > 2 && r->height > 7 && (terminal->keyflags & KEY_FLAG_SHIFT))
 	{
 		int b,x,y,w,h,l;
@@ -1037,7 +1031,6 @@ void v3270_start_timer(GtkWidget *widget)
 	if(terminal->timer)
 	{
-		trace("Timer %p starts again",terminal->timer);
 		g_source_ref(terminal->timer);
 		return;
 	}
@@ -1054,16 +1047,12 @@ void v3270_start_timer(GtkWidget *widget)
 	g_source_attach(terminal->timer,NULL);
 	g_source_unref(terminal->timer);
-	trace("Timer %p starts",terminal->timer);
-
 }
 void v3270_stop_timer(GtkWidget *widget)
 {
 	v3270 *terminal = GTK_V3270(widget);
-	trace("Timer %p stops",terminal->timer);
-
 	if(terminal->timer)
 	{
 		if(terminal->timer->ref_count < 2)
@@ -52,15 +52,12 @@
 static void clipboard_clear(GtkClipboard *clipboard, GObject *obj)
 {
-	trace("%s widget=%p",__FUNCTION__,obj);
 }
 static void clipboard_get(GtkClipboard *clipboard, GtkSelectionData *selection, guint target, GObject *obj)
 {
 	v3270 * widget = GTK_V3270(obj);
-	trace("%s: widget=%p target=\"%s\"",__FUNCTION__,obj,targets[target].target);
-
 	switch(target)
 	{
 	case CLIPBOARD_TYPE_TEXT:   /* Get clipboard contents as text */
@@ -505,8 +502,6 @@ void v3270_paste_string(GtkWidget *widget, const gchar *text, const gchar *encod
 	next = lib3270_paste(session,(unsigned char *) buffer) ? TRUE : FALSE;
-	trace("Pastenext is %s",next ? "On" : "Off");
-
 	g_free(buffer);
 	g_signal_emit(widget,v3270_widget_signal[SIGNAL_PASTENEXT], 0, next);
@@ -187,8 +187,6 @@ void v3270_popup_message(GtkWidget *widget, LIB3270_NOTIFY type , const gchar *t
 	if(!GTK_IS_WINDOW(toplevel))
 		toplevel = NULL;
-	trace("%s: widget=%p toplevel=%p",__FUNCTION__,widget,toplevel);
-
 	if(type == LIB3270_NOTIFY_CRITICAL)
 	{
 		msgtype	= GTK_MESSAGE_ERROR;
@@ -218,7 +216,6 @@ void v3270_popup_message(GtkWidget *widget, LIB3270_NOTIFY type , const gchar *t
 	gtk_dialog_run(GTK_DIALOG (dialog));
 	gtk_widget_destroy(dialog);
-	trace("%s ends",__FUNCTION__);
 }
 gboolean v3270_query_tooltip(GtkWidget  *widget, gint x, gint y, gboolean keyboard_tooltip, GtkTooltip *tooltip)
@@ -657,8 +654,6 @@ static void update_toggle(H3270 *session, LIB3270_TOGGLE ix, unsigned char value
 {
 	GtkWidget *widget = GTK_WIDGET(lib3270_get_user_data(session));
-	trace("Toggle %s is %s",name,value ? "ON" : "OFF");
-
 	switch(ix)
 	{
 	case LIB3270_TOGGLE_CURSOR_POS:
@@ -771,8 +766,6 @@ static void update_connect(H3270 *session, unsigned char connected)
 #endif // DEBUG
 	v3270 *widget = GTK_V3270(lib3270_get_user_data(session));
-	trace("%s - %s %s",__FUNCTION__,lib3270_get_url(session,dbg,sizeof(dbg)),connected ? "Connected" : "Disconnected");
-
 	if(connected)
 	{
 		widget->cursor.show |= 2;
@@ -797,7 +790,6 @@ static void update_connect(H3270 *session, unsigned char connected)
 static void update_screen_size(H3270 *session,unsigned short rows, unsigned short cols)
 {
-//	trace("Widget %p changes to %dx%d",session->widget,cols,rows);
 	v3270_reload(GTK_WIDGET(lib3270_get_user_data(session)));
 	gtk_widget_queue_draw(GTK_WIDGET(lib3270_get_user_data(session)));
 }
@@ -817,10 +809,6 @@ static void changed(H3270 *session, int offset, int len)
 	GtkWidget 		* widget	= lib3270_get_user_data(session);
 	GtkAccessible	* obj		= GTK_V3270(widget)->accessible;
-#ifdef WIN32
-	trace("%s: offset=%d len=%d accessible=%p",__FUNCTION__,offset,len,obj);
-#endif
-
 	if(obj)
 	{
 		// Get new text, notify atk
@@ -860,15 +848,7 @@ static void changed(H3270 *session, int offset, int len)
 	gtk_widget_queue_draw(widget);
 #endif // WIN32
-#ifdef WIN32
-	trace("%s: emit signal",__FUNCTION__);
-#endif
-
 	g_signal_emit(GTK_WIDGET(widget),v3270_widget_signal[SIGNAL_CHANGED], 0, (guint) offset, (guint) len);
-
-#ifdef WIN32
-	trace("%s: ends",__FUNCTION__);
-#endif
 }
 static void set_selection(H3270 *session, unsigned char status)
@@ -913,8 +893,6 @@ static int emit_print_signal(H3270 *session)
 static gboolean activity_tick(v3270 *widget)
 {
-//	trace("idle=%d (%d) timeout=%d",(int) (time(0) - widget->activity.timestamp),(int) (((time(0) - widget->activity.timestamp)/60),widget->activity.disconnect));
-
 	if(widget->activity.disconnect && lib3270_is_connected(widget->host) && ((time(0) - widget->activity.timestamp)/60) >= widget->activity.disconnect)
 		lib3270_disconnect(widget->host);
@@ -1013,7 +991,6 @@ static void v3270_init(v3270 *widget)
 	// Enable drawing
 	widget->drawing	= 1;
-	trace("%s",__FUNCTION__);
 }
 GtkWidget * v3270_new(void)
@@ -1034,8 +1011,6 @@ static void v3270_destroy(GtkObject *widget)
 {
 	v3270 * terminal = GTK_V3270(widget);
-	trace("%s %p",__FUNCTION__,widget);
-
 	if(terminal->accessible)
 	{
 		gtk_accessible_set_widget(terminal->accessible, NULL);
@@ -1255,7 +1230,6 @@ static void v3270_size_allocate(GtkWidget * widget, GtkAllocation * allocation)
 	g_return_if_fail(GTK_IS_V3270(widget));
 	g_return_if_fail(allocation != NULL);
-//	trace("Widget size changes to %dx%d",allocation->width,allocation->height);
 #if GTK_CHECK_VERSION(2,18,0)
 	gtk_widget_set_allocation(widget, allocation);
 #else
@@ -1362,8 +1336,6 @@ void v3270_set_colors(GtkWidget *widget, const gchar *colors)
 	}
-	trace("Widget %p colors:\n%s\n",widget,colors);
-
 	v3270_set_color_table(GTK_V3270(widget)->color,colors);
 	g_signal_emit(widget,v3270_widget_signal[SIGNAL_UPDATE_CONFIG], 0, "colors", colors);
 	v3270_reload(widget);
@@ -1417,8 +1389,6 @@ void v3270_set_color_table(GdkRGBA *table, const gchar *colors)
  	guint	  cnt;
  	int		  f;
-	trace("colors=[%s]",colors);
-
 	if(strchr(colors,':'))
 		clr = g_strsplit(colors,":",V3270_COLOR_COUNT+1);
 	else if(strchr(colors,';'))
@@ -1494,8 +1464,6 @@ void v3270_set_font_family(GtkWidget *widget, const gchar *name)
 	terminal->font.family = g_strdup(name);
 	terminal->font.weight = lib3270_get_toggle(terminal->host,LIB3270_TOGGLE_BOLD) ? CAIRO_FONT_WEIGHT_BOLD : CAIRO_FONT_WEIGHT_NORMAL;
-	trace("%s: %s (%p)",__FUNCTION__,terminal->font.family,terminal->font.family);
-
 	g_signal_emit(widget,v3270_widget_signal[SIGNAL_UPDATE_CONFIG], 0, "font-family", name);
 	v3270_reload(widget);
@@ -1568,7 +1536,6 @@ static void v3270_activate(GtkWidget *widget)
 {
 	v3270 * terminal = GTK_V3270(widget);
-	trace("%s: %p",__FUNCTION__,terminal);
 	terminal->activity.timestamp = time(0);
 	if(lib3270_connected(terminal->host))
@@ -1588,8 +1555,6 @@ static AtkObject * v3270_get_accessible(GtkWidget * widget)
 {
 	v3270 * terminal = GTK_V3270(widget);
-//	trace("%s acc=%p",__FUNCTION__,terminal->accessible);
-
 	if(!terminal->accessible)
 	{
 		terminal->accessible = g_object_new(GTK_TYPE_V3270_ACCESSIBLE,NULL);
@@ -1660,7 +1625,6 @@ void v3270_set_scaled_fonts(GtkWidget *widget, gboolean on)
 	GTK_V3270(widget)->scaled_fonts = on ? 1 : 0;
-	trace("Sfonts is %s",GTK_V3270(widget)->scaled_fonts ? "YES" : "NO");
 }
 void v3270_set_session_name(GtkWidget *widget, const gchar *name)