Download as
Browse Code »

Commit ab2ef4a7294dbb68eccabf169e102ab960c40f8f

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

Scroll do mouse não funcionava no Ubuntu 12.04; removendo dependência do binutils no debian.control

Showing 3 changed files with 11 additions and 4 deletions   Show diff stats
debian.control
  Diff comments   View file @ab2ef4a
@@ -14,7 +14,7 @@ Description: IBM 3270 Terminal emulator for gtk @@ -14,7 +14,7 @@ Description: IBM 3270 Terminal emulator for gtk
14 Package: lib3270 14 Package: lib3270
15 Architecture: any 15 Architecture: any
16 Section: libs 16 Section: libs
17 -Depends: ${misc:Depends}, binutils (>= 2.14.90.0.7) 17 +Depends: ${misc:Depends}
18 Description: pw3270 shared libraries. 18 Description: pw3270 shared libraries.
19 This package contains the pw3270 shared library for the core application. 19 This package contains the pw3270 shared library for the core application.
20 20
src/pw3270/v3270/mouse.c
  Diff comments   View file @ab2ef4a
@@ -275,10 +275,17 @@ void v3270_set_scroll_action(GtkWidget *widget, GdkScrollDirection direction, Gt @@ -275,10 +275,17 @@ void v3270_set_scroll_action(GtkWidget *widget, GdkScrollDirection direction, Gt
275 275
276 gboolean v3270_scroll_event(GtkWidget *widget, GdkEventScroll *event) 276 gboolean v3270_scroll_event(GtkWidget *widget, GdkEventScroll *event)
277 { 277 {
278 - v3270 * terminal = GTK_V3270(widget); 278 + H3270 * hSession = v3270_get_session(widget);
  279 +
  280 + lib3270_trace_event(hSession,"scroll event direction=%d",(int) event->direction);
279 281
280 - if(lib3270_get_program_message(terminal->host) != LIB3270_MESSAGE_NONE || event->direction < 0 || event->direction > G_N_ELEMENTS(action_scroll)) 282 + if(lib3270_get_program_message(hSession) != LIB3270_MESSAGE_NONE || event->direction < 0 || event->direction > G_N_ELEMENTS(action_scroll))
  283 + {
  284 + lib3270_trace_event(hSession," dropped (not available)\n");
281 return FALSE; 285 return FALSE;
  286 + }
  287 +
  288 + lib3270_trace_event(hSession,"\n");
282 289
283 trace("Scroll: %d Action: %p",event->direction,action_scroll[event->direction]); 290 trace("Scroll: %d Action: %p",event->direction,action_scroll[event->direction]);
284 291
src/pw3270/v3270/widget.c
  Diff comments   View file @ab2ef4a
@@ -828,7 +828,7 @@ static void v3270_init(v3270 *widget) @@ -828,7 +828,7 @@ static void v3270_init(v3270 *widget)
828 #endif // GTK(2,18) 828 #endif // GTK(2,18)
829 829
830 // Setup events 830 // Setup events
831 - 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); 831 + 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);
832 832
833 trace("%s",__FUNCTION__); 833 trace("%s",__FUNCTION__);
834 } 834 }