Skip to content

Commit

Permalink
8217955: Problems with touch input and JavaFX 11
Browse files Browse the repository at this point in the history 
Reviewed-by: kcr, jvos
  • Loading branch information
Jose Pereda committed Apr 7, 2021
1 parent 9796a83 commit cc94e96
Show file tree
Hide file tree
Showing 3 changed files with 15 additions and 5 deletions.
4 changes: 2 additions & 2 deletions modules/javafx.graphics/src/main/native-glass/gtk/glass_general.cpp
View file
Expand Up @@ -742,7 +742,7 @@ grab_mouse_device(GdkDevice *device, DeviceGrabContext *context) {
context->window,
GDK_OWNERSHIP_NONE,
TRUE,
GDK_ALL_EVENTS_MASK,
GDK_FILTERED_EVENTS_MASK,
NULL,
GDK_CURRENT_TIME);
#else
Expand All @@ -752,7 +752,7 @@ grab_mouse_device(GdkDevice *device, DeviceGrabContext *context) {
context->window,
GDK_OWNERSHIP_NONE,
TRUE,
GDK_ALL_EVENTS_MASK,
GDK_FILTERED_EVENTS_MASK,
NULL,
GDK_CURRENT_TIME);
*/
Expand Down
7 changes: 7 additions & 0 deletions modules/javafx.graphics/src/main/native-glass/gtk/glass_general.h
View file
Expand Up @@ -42,6 +42,13 @@
#define GLASS_GTK3
#endif

#ifndef GDK_TOUCH_MASK
#define GDK_TOUCH_MASK (1 << 22)
#endif

#define GDK_FILTERED_EVENTS_MASK static_cast<GdkEventMask>(GDK_ALL_EVENTS_MASK \
& ~GDK_TOUCH_MASK)

#define JLONG_TO_PTR(value) ((void*)(intptr_t)(value))
#define PTR_TO_JLONG(value) ((jlong)(intptr_t)(value))

Expand Down
9 changes: 6 additions & 3 deletions modules/javafx.graphics/src/main/native-glass/gtk/glass_window.cpp
View file
Expand Up @@ -751,7 +751,7 @@ WindowContextTop::WindowContextTop(jobject _jwindow, WindowContext* _owner, long
}

gtk_widget_set_size_request(gtk_widget, 0, 0);
gtk_widget_set_events(gtk_widget, GDK_ALL_EVENTS_MASK);
gtk_widget_set_events(gtk_widget, GDK_FILTERED_EVENTS_MASK);
gtk_widget_set_app_paintable(gtk_widget, TRUE);
if (frame_type != TITLED) {
gtk_window_set_decorated(GTK_WINDOW(gtk_widget), FALSE);
Expand All @@ -761,6 +761,7 @@ WindowContextTop::WindowContextTop(jobject _jwindow, WindowContext* _owner, long
gtk_window_set_title(GTK_WINDOW(gtk_widget), "");

gdk_window = gtk_widget_get_window(gtk_widget);
gdk_window_set_events(gdk_window, GDK_FILTERED_EVENTS_MASK);

g_object_set_data_full(G_OBJECT(gdk_window), GDK_WINDOW_DATA_CONTEXT, this, NULL);

Expand Down Expand Up @@ -1543,12 +1544,13 @@ WindowContextPlug::WindowContextPlug(jobject _jwindow, void* _owner) :
g_signal_connect(G_OBJECT(gtk_widget), "configure-event", G_CALLBACK(plug_configure), this);

gtk_widget_set_size_request(gtk_widget, 0, 0);
gtk_widget_set_events(gtk_widget, GDK_ALL_EVENTS_MASK);
gtk_widget_set_events(gtk_widget, GDK_FILTERED_EVENTS_MASK);
gtk_widget_set_can_focus(GTK_WIDGET(gtk_widget), TRUE);
gtk_widget_set_app_paintable(gtk_widget, TRUE);

gtk_widget_realize(gtk_widget);
gdk_window = gtk_widget_get_window(gtk_widget);
gdk_window_set_events(gdk_window, GDK_FILTERED_EVENTS_MASK);

g_object_set_data_full(G_OBJECT(gdk_window), GDK_WINDOW_DATA_CONTEXT, this, NULL);
gdk_window_register_dnd(gdk_window);
Expand Down Expand Up @@ -1711,12 +1713,13 @@ WindowContextChild::WindowContextChild(jobject _jwindow,
glass_gtk_window_configure_from_visual(gtk_widget, visual);
}

gtk_widget_set_events(gtk_widget, GDK_ALL_EVENTS_MASK);
gtk_widget_set_events(gtk_widget, GDK_FILTERED_EVENTS_MASK);
gtk_widget_set_can_focus(GTK_WIDGET(gtk_widget), TRUE);
gtk_widget_set_app_paintable(gtk_widget, TRUE);
gtk_container_add (GTK_CONTAINER(parent_widget), gtk_widget);
gtk_widget_realize(gtk_widget);
gdk_window = gtk_widget_get_window(gtk_widget);
gdk_window_set_events(gdk_window, GDK_FILTERED_EVENTS_MASK);
g_object_set_data_full(G_OBJECT(gdk_window), GDK_WINDOW_DATA_CONTEXT, this, NULL);
gdk_window_register_dnd(gdk_window);
g_signal_connect(gtk_widget, "focus-in-event", G_CALLBACK(child_focus_callback), this);
Expand Down

1 comment on commit cc94e96

@openjdk-notifier
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Review

Issues

Please sign in to comment.