From ab2ef4a7294dbb68eccabf169e102ab960c40f8f Mon Sep 17 00:00:00 2001 From: perry.werneck@gmail.com Date: Mon, 1 Oct 2012 18:37:29 +0000 Subject: [PATCH] Scroll do mouse não funcionava no Ubuntu 12.04; removendo dependência do binutils no debian.control --- debian.control | 2 +- src/pw3270/v3270/mouse.c | 11 +++++++++-- src/pw3270/v3270/widget.c | 2 +- 3 files changed, 11 insertions(+), 4 deletions(-) diff --git a/debian.control b/debian.control index 223ba28..1642825 100644 --- a/debian.control +++ b/debian.control @@ -14,7 +14,7 @@ Description: IBM 3270 Terminal emulator for gtk Package: lib3270 Architecture: any Section: libs -Depends: ${misc:Depends}, binutils (>= 2.14.90.0.7) +Depends: ${misc:Depends} Description: pw3270 shared libraries. This package contains the pw3270 shared library for the core application. diff --git a/src/pw3270/v3270/mouse.c b/src/pw3270/v3270/mouse.c index ce91a66..aba09af 100644 --- a/src/pw3270/v3270/mouse.c +++ b/src/pw3270/v3270/mouse.c @@ -275,10 +275,17 @@ void v3270_set_scroll_action(GtkWidget *widget, GdkScrollDirection direction, Gt gboolean v3270_scroll_event(GtkWidget *widget, GdkEventScroll *event) { - v3270 * terminal = GTK_V3270(widget); + H3270 * hSession = v3270_get_session(widget); + + lib3270_trace_event(hSession,"scroll event direction=%d",(int) event->direction); - if(lib3270_get_program_message(terminal->host) != LIB3270_MESSAGE_NONE || event->direction < 0 || event->direction > G_N_ELEMENTS(action_scroll)) + if(lib3270_get_program_message(hSession) != LIB3270_MESSAGE_NONE || event->direction < 0 || event->direction > G_N_ELEMENTS(action_scroll)) + { + lib3270_trace_event(hSession," dropped (not available)\n"); return FALSE; + } + + lib3270_trace_event(hSession,"\n"); trace("Scroll: %d Action: %p",event->direction,action_scroll[event->direction]); diff --git a/src/pw3270/v3270/widget.c b/src/pw3270/v3270/widget.c index d7cf67d..decb246 100644 --- a/src/pw3270/v3270/widget.c +++ b/src/pw3270/v3270/widget.c @@ -828,7 +828,7 @@ static void v3270_init(v3270 *widget) #endif // GTK(2,18) // Setup events - gtk_widget_add_events(GTK_WIDGET(widget),GDK_KEY_PRESS_MASK|GDK_KEY_RELEASE_MASK|GDK_BUTTON_PRESS_MASK|GDK_BUTTON_MOTION_MASK|GDK_BUTTON_RELEASE_MASK|GDK_POINTER_MOTION_MASK|GDK_ENTER_NOTIFY_MASK); + gtk_widget_add_events(GTK_WIDGET(widget),GDK_KEY_PRESS_MASK|GDK_KEY_RELEASE_MASK|GDK_BUTTON_PRESS_MASK|GDK_BUTTON_MOTION_MASK|GDK_BUTTON_RELEASE_MASK|GDK_POINTER_MOTION_MASK|GDK_ENTER_NOTIFY_MASK|GDK_SCROLL_MASK); trace("%s",__FUNCTION__); } -- libgit2 0.21.2