Commit: 0087b47de8bd97a570875315eb877ee3f9889ac7 - tme (git)

Commit MetaInfo

• Révision: 0087b47de8bd97a570875315eb877ee3f9889ac7 (tree)
• l'heure: 2023-02-20 21:37:51
• Auteur: phabrics <phabrics@phab...>
• Commiter: phabrics

Message de Log

More GTK3->GTK4 changes checkpoint.

Change Summary

• modified: host/display/display-keyboard.c
• modified: host/display/display.h
• modified: host/display/gtk/gtk-display.c
• modified: host/display/gtk/gtk-display.h
• modified: host/display/gtk/gtk-keyboard.c
• modified: host/display/gtk/gtk-mouse.c
• modified: host/display/rfb/rfb-display.c
• modified: host/display/sdl/sdl-display.c

Modification

--- a/host/display/display-keyboard.c
+++ b/host/display/display-keyboard.c
@@ -227,10 +227,13 @@ _tme_keyboard_keyval_name(tme_keyboard_keyval_t keyval)
 
 /* this is a generic callback for a key press or release event: */
 int
-_tme_keyboard_key_press(int down, tme_keyboard_keyval_t key, void *disp)
+_tme_keyboard_key_event(int down, tme_keyboard_keyval_t key, void *disp)
 {
   struct tme_keyboard_event tme_event;
   struct tme_display *display = (_tme_display_get) ? (_tme_display_get(disp)) : (disp);
+  int was_empty;
+  int new_callouts;
+  int rc;
 
   /* make a tme event from this key event: */
   tme_event.tme_keyboard_event_type
@@ -243,16 +246,6 @@ _tme_keyboard_key_press(int down, tme_keyboard_keyval_t key, void *disp)
     = key;
   tme_event.tme_keyboard_event_time = tme_thread_get_time();
 
-  return _tme_keyboard_key_event(&tme_event, display);
-}
-
-int
-_tme_keyboard_key_event(struct tme_keyboard_event *tme_event, struct tme_display *display)
-{
-  int was_empty;
-  int new_callouts;
-  int rc;
-
   /* lock the mutex: */
   tme_mutex_lock(&display->tme_display_mutex);
 
@@ -260,9 +253,9 @@ _tme_keyboard_key_event(struct tme_keyboard_event *tme_event, struct tme_display
   new_callouts = 0;
   
   /* get any keycode associated with this keysym: */
-  tme_event->tme_keyboard_event_keycode
+  tme_event.tme_keyboard_event_keycode
     = tme_keyboard_hash_data_to_keyval(tme_hash_lookup(display->tme_display_keyboard_keysym_to_keycode,
-						       tme_keyboard_hash_data_from_keyval(tme_event->tme_keyboard_event_keyval)));
+						       tme_keyboard_hash_data_from_keyval(tme_event.tme_keyboard_event_keyval)));
 
   /* remember if the keyboard buffer was empty: */
   was_empty
@@ -270,7 +263,7 @@ _tme_keyboard_key_event(struct tme_keyboard_event *tme_event, struct tme_display
 
   /* add this tme event to the keyboard buffer: */
   rc = tme_keyboard_buffer_copyin(display->tme_display_keyboard_buffer,
-				  tme_event);
+				  &tme_event);
   assert (rc == TME_OK);
 
   /* if the keyboard buffer was empty and now it isn't,

--- a/host/display/display.h
+++ b/host/display/display.h
@@ -197,7 +197,7 @@ void _tme_screen_xlat_set _TME_P((struct tme_screen *screen));
 void _tme_keyboard_new _TME_P((struct tme_display *));
 int _tme_keyboard_connections_new _TME_P((struct tme_display *,
 					  struct tme_connection **));
-int _tme_keyboard_key_press _TME_P((int down, tme_keyboard_keyval_t key, void *disp));
+int _tme_keyboard_key_event _TME_P((int down, tme_keyboard_keyval_t key, void *disp));
 void _tme_mouse_new _TME_P((struct tme_display *));
 void _tme_mouse_mode_off _TME_P((struct tme_screen *, tme_uint32_t));
 int _tme_mouse_connections_new _TME_P((struct tme_display *,

--- a/host/display/gtk/gtk-display.c
+++ b/host/display/gtk/gtk-display.c
@@ -60,7 +60,7 @@ static gboolean _tme_gtk_init(void) {
 #endif
 
 static void
-_tme_gtk_display_bell(struct tme_gdk_display *display) {
+_tme_gtk_display_bell(_tme_gtk_display *display) {
   gdk_display_beep(display->tme_gdk_display);
 }
 
@@ -78,7 +78,7 @@ _tme_gtk_display_update(struct tme_display *display) {
 /* this sets the screen scaling to that indicated by the Scale menu: */
 static void
 _tme_gtk_screen_scale_default(GtkWidget *widget,
-			      struct tme_gtk_screen *screen)
+			      _tme_gtk_screen *screen)
 {
   if (!gtk_check_menu_item_get_active(GTK_CHECK_MENU_ITEM(GTK_MENU_ITEM(widget))))
     return;
@@ -89,7 +89,7 @@ _tme_gtk_screen_scale_default(GtkWidget *widget,
 /* this sets the screen scaling to that indicated by the Scale menu: */
 static void
 _tme_gtk_screen_scale_half(GtkWidget *widget,
-			   struct tme_gtk_screen *screen)
+			   _tme_gtk_screen *screen)
 {
   if (!gtk_check_menu_item_get_active(GTK_CHECK_MENU_ITEM(GTK_MENU_ITEM(widget))))
     return;
@@ -100,7 +100,7 @@ _tme_gtk_screen_scale_half(GtkWidget *widget,
 /* this sets the screen scaling to that indicated by the Scale menu: */
 static void
 _tme_gtk_screen_scale_full(GtkWidget *widget,
-			   struct tme_gtk_screen *screen)
+			   _tme_gtk_screen *screen)
 {
   if (!gtk_check_menu_item_get_active(GTK_CHECK_MENU_ITEM(GTK_MENU_ITEM(widget))))
     return;
@@ -111,7 +111,7 @@ _tme_gtk_screen_scale_full(GtkWidget *widget,
 /* this sets the screen scaling to that indicated by the Scale menu: */
 static void
 _tme_gtk_screen_scale_double(GtkWidget *widget,
-			     struct tme_gtk_screen *screen)
+			     _tme_gtk_screen *screen)
 {
   if (!gtk_check_menu_item_get_active(GTK_CHECK_MENU_ITEM(GTK_MENU_ITEM(widget))))
     return;
@@ -122,7 +122,7 @@ _tme_gtk_screen_scale_double(GtkWidget *widget,
 #if GTK_MAJOR_VERSION == 3
 /* this sets the screen size: */
 static inline void
-_tme_screen_format_set(struct tme_gtk_screen *screen,
+_tme_screen_format_set(_tme_gtk_screen *screen,
 		       cairo_format_t format)
 {
   screen->tme_gtk_screen_format = format;
@@ -132,7 +132,7 @@ _tme_screen_format_set(struct tme_gtk_screen *screen,
 /* this sets the screen format to that indicated by the Format menu: */
 static void
 _tme_gtk_screen_format_argb32(GtkWidget *widget,
-			      struct tme_gtk_screen *screen)
+			      _tme_gtk_screen *screen)
 {
   if (!gtk_check_menu_item_get_active(GTK_CHECK_MENU_ITEM(GTK_MENU_ITEM(widget))))
     return;
@@ -143,7 +143,7 @@ _tme_gtk_screen_format_argb32(GtkWidget *widget,
 /* this sets the screen format to that indicated by the Format menu: */
 static void
 _tme_gtk_screen_format_rgb24(GtkWidget *widget,
-			     struct tme_gtk_screen *screen)
+			     _tme_gtk_screen *screen)
 {
   if (!gtk_check_menu_item_get_active(GTK_CHECK_MENU_ITEM(GTK_MENU_ITEM(widget))))
     return;
@@ -154,7 +154,7 @@ _tme_gtk_screen_format_rgb24(GtkWidget *widget,
 /* this sets the screen format to that indicated by the Format menu: */
 static void
 _tme_gtk_screen_format_a8(GtkWidget *widget,
-			  struct tme_gtk_screen *screen)
+			  _tme_gtk_screen *screen)
 {
   if (!gtk_check_menu_item_get_active(GTK_CHECK_MENU_ITEM(GTK_MENU_ITEM(widget))))
     return;
@@ -165,7 +165,7 @@ _tme_gtk_screen_format_a8(GtkWidget *widget,
 /* this sets the screen format to that indicated by the Format menu: */
 static void
 _tme_gtk_screen_format_a1(GtkWidget *widget,
-			  struct tme_gtk_screen *screen)
+			  _tme_gtk_screen *screen)
 {
   if (!gtk_check_menu_item_get_active(GTK_CHECK_MENU_ITEM(GTK_MENU_ITEM(widget))))
     return;
@@ -176,7 +176,7 @@ _tme_gtk_screen_format_a1(GtkWidget *widget,
 /* this sets the screen format to that indicated by the Format menu: */
 static void
 _tme_gtk_screen_format_rgb16_565(GtkWidget *widget,
-				 struct tme_gtk_screen *screen)
+				 _tme_gtk_screen *screen)
 {
   if (!gtk_check_menu_item_get_active(GTK_CHECK_MENU_ITEM(GTK_MENU_ITEM(widget))))
     return;
@@ -204,7 +204,7 @@ static struct tme_display_menu_item scale_items[] =
   };
 
 /* Screen-specific size request */
-static void _tme_gtk_screen_resize(struct tme_gtk_screen *screen) {
+static void _tme_gtk_screen_resize(_tme_gtk_screen *screen) {
   struct tme_fb_connection *conn_fb = screen->screen.tme_screen_fb;
   
   /* set a minimum size */
@@ -224,14 +224,17 @@ _tme_gtk_screen_configure(GtkWidget         *widget,
 #endif
 			  gpointer          _screen)
 {
-  struct tme_gtk_screen *screen;
+  _tme_gtk_screen *screen;
   struct tme_display *display;
   struct tme_fb_connection *conn_fb;
-#if GTK_MAJOR_VERSION == 3
-  GdkWindow *window;
+#if GTK_MAJOR_VERSION == 4
+  GdkSurface
+#elif GTK_MAJOR_VERSION == 3
+  GdkWindow 
 #endif
+    *window;
   
-  screen = (struct tme_gtk_screen *) _screen;
+  screen = (_tme_gtk_screen *) _screen;
 
   /* get the display: */
   display = screen->screen.tme_screen_display;
@@ -245,15 +248,20 @@ _tme_gtk_screen_configure(GtkWidget         *widget,
   }
 
 #if GTK_MAJOR_VERSION == 4
-  if (gtk_native_get_surface(gtk_widget_get_native(widget))) {
+  window = gtk_native_get_surface(gtk_widget_get_native(widget));
+
+  //  screen->screen.tme_screen_scale = gdk_surface_get_scale_factor(window);
+  
+  if(window) {
       screen->tme_gtk_screen_surface =
-	gdk_surface_create_similar_surface(gtk_native_get_surface(gtk_widget_get_native(widget)),
+	gdk_surface_create_similar_surface(window,
 					   CAIRO_CONTENT_COLOR,
-					   gtk_widget_get_width(widget),
-					   gtk_widget_get_height(widget));
+					   gtk_widget_get_width(widget) /* * screen->screen.tme_screen_scale */,
+					   gtk_widget_get_height(widget) // * screen->screen.tme_screen_scale
+					   );
   }
 #elif GTK_MAJOR_VERSION == 3
-  window = gtk_widget_get_window(screen->tme_gtk_screen_gtkframe);
+  window = gtk_widget_get_window(widget);
   
   screen->screen.tme_screen_scale = gdk_window_get_scale_factor(window);
   
@@ -291,7 +299,7 @@ _tme_gtk_screen_configure(GtkWidget         *widget,
 
 /* this is called before the screen's display is updated: */
 static void
-_tme_gtk_screen_redraw(struct tme_gtk_screen *screen, int x, int y, int w, int h)
+_tme_gtk_screen_redraw(_tme_gtk_screen *screen, int x, int y, int w, int h)
 {
   cairo_surface_flush(screen->tme_gtk_screen_surface);
   cairo_surface_mark_dirty(screen->tme_gtk_screen_surface);
@@ -312,9 +320,9 @@ _tme_gtk_screen_draw(GtkWidget *widget,
 		     gpointer   _screen)
 {
   struct tme_display *display;
-  struct tme_gtk_screen *screen;
+  _tme_gtk_screen *screen;
 
-  screen = (struct tme_gtk_screen *) _screen;
+  screen = (_tme_gtk_screen *) _screen;
 
   /* get the display: */
   display = screen->screen.tme_screen_display;
@@ -331,18 +339,25 @@ _tme_gtk_screen_draw(GtkWidget *widget,
   return FALSE;
 }
 
+static void
+_tme_gtk_screen_close(_tme_gtk_screen *screen)
+{
+  if (screen->tme_gtk_screen_surface)
+    cairo_surface_destroy (screen->tme_gtk_screen_surface);
+}
+
 /* this makes a new screen: */
-struct tme_gtk_screen *
-_tme_gtk_screen_new(struct tme_gdk_display *display,
+_tme_gtk_screen *
+_tme_gtk_screen_new(_tme_gtk_display *display,
 		    struct tme_connection *conn)
 {
-  struct tme_gtk_screen *screen;
+  _tme_gtk_screen *screen;
   GtkWidget *menu_bar;
   GtkWidget *menu;
   GtkWidget *submenu;
   GtkWidget *menu_item;
 
-  screen = tme_screen_new(display, struct tme_gtk_screen, conn);
+  screen = tme_screen_new(display, _tme_gtk_screen, conn);
 
   /* create the top-level window, and allow it to shrink, grow,
      and auto-shrink: */
@@ -384,7 +399,7 @@ _tme_gtk_screen_new(struct tme_gdk_display *display,
   gtk_menu_item_set_submenu(GTK_MENU_ITEM(menu_item), submenu);
   gtk_menu_shell_append(GTK_MENU_SHELL(menu), menu_item);
 
-#if GTK_MAJOR_VERSION == 4
+#if GTK_MAJOR_VERSION == 3
   /* create the Screen colormap submenu: */
   submenu = _tme_display_menu_radio(screen, format_items, TME_ARRAY_ELS(format_items));
 
@@ -393,6 +408,9 @@ _tme_gtk_screen_new(struct tme_gdk_display *display,
   //  gtk_widget_show(menu_item);
   gtk_menu_item_set_submenu(GTK_MENU_ITEM(menu_item), submenu);
   gtk_menu_shell_append(GTK_MENU_SHELL(menu), menu_item);
+
+  _tme_screen_format_set(screen, CAIRO_FORMAT_RGB24);
+
 #endif
   
   /* create the Screen menu bar item, attach the menu to it, and 
@@ -410,19 +428,16 @@ _tme_gtk_screen_new(struct tme_gdk_display *display,
   //  _tme_gtk_screen_init(screen->tme_gtk_screen_gtkframe, screen);
 
   
-  _tme_screen_format_set(screen, CAIRO_FORMAT_RGB24);
-
   /* pack the Gtkframe into the outer vertical packing box: */
   gtk_box_pack_start(GTK_BOX(screen->tme_gtk_screen_vbox0), 
 		     screen->tme_gtk_screen_gtkframe,
 		     FALSE, FALSE, 0);
 
 #if GTK_MAJOR_VERSION == 4
-  gtk_drawing_area_set_draw_func (GTK_DRAWING_AREA (screen->tme_gtk_screen_gtkframe),
-				  _tme_gtk_screen_draw, screen, NULL);
+  gtk_drawing_area_set_draw_func(GTK_DRAWING_AREA(screen->tme_gtk_screen_gtkframe),
+				 _tme_gtk_screen_draw, screen, NULL);
   g_signal_connect_after(screen->tme_gtk_screen_gtkframe, "resize",
 			 G_CALLBACK(_tme_gtk_screen_configure), screen);
-
 #elif GTK_MAJOR_VERSION == 3
   g_signal_connect(screen->tme_gtk_screen_gtkframe, "draw",
 		   G_CALLBACK(_tme_gtk_screen_draw), screen);
@@ -436,8 +451,12 @@ _tme_gtk_screen_new(struct tme_gdk_display *display,
   /* attach the keyboard to this screen: */
   _tme_gtk_keyboard_attach(screen);
 
-  gtk_window_set_title(GTK_WINDOW(screen->tme_gtk_screen_window), display->display.tme_display_title);
+  gtk_window_set_title(GTK_WINDOW(screen->tme_gtk_screen_window),
+		       display->display.tme_display_title);
 
+  g_signal_connect(screen->tme_gtk_screen_window, "destroy",
+		   G_CALLBACK(_tme_gtk_screen_close), screen);
+  
   /* unlock our mutex: */
   tme_mutex_unlock(&display->display.tme_display_mutex);
 
@@ -452,7 +471,7 @@ _tme_gtk_screen_new(struct tme_gdk_display *display,
 
 /* this creates a menu of radio buttons: */
 GtkWidget *
-_tme_display_menu_radio(struct tme_gtk_screen *screen,
+_tme_display_menu_radio(_tme_gtk_screen *screen,
 			struct tme_display_menu_item menu_items[],
 			int num_items)
 {
@@ -484,25 +503,12 @@ _tme_display_menu_radio(struct tme_gtk_screen *screen,
   return (menu);
 }
 
-/* this is a GTK callback for an enter notify event, that has the
-   widget grab focus and then continue normal event processing: */
-gint
-_tme_display_enter_focus(GtkWidget *widget,
-			 GdkEvent *gdk_event_raw,
-			 gpointer junk)
-{
-
-  /* grab the focus: */
-  gtk_widget_grab_focus(widget);
-
-  /* continue normal event processing: */
-  return (FALSE);
-}
-
 /* the new GTK display function: */
 TME_ELEMENT_SUB_NEW_DECL(tme_host_gtk,display) {
-  struct tme_gdk_display *display;
+  _tme_gtk_display *display;
+#if GTK_MAJOR_VERSION == 3
   GdkRectangle workarea;
+#endif
   int rc;
   
   /* GTK requires program to be running non-setuid */
@@ -513,12 +519,14 @@ TME_ELEMENT_SUB_NEW_DECL(tme_host_gtk,display) {
   if(rc = !_tme_gtk_init()) return rc;
   
   /* start our data structure: */
-  display = tme_new0(struct tme_gdk_display, 1);
+  display = tme_new0(_tme_gtk_display, 1);
   tme_display_init(element, display);
 
   /* recover our data structure: */
   display = element->tme_element_private;
 
+  //  display->tme_gtk_application = gtk_application_new("org.phabrics.tme", G_APPLICATION_DEFAULT_FLAGS);
+  
   display->tme_gdk_display = gdk_display_get_default();
 
   display->tme_gdk_display_seat = gdk_display_get_default_seat(display->tme_gdk_display);

--- a/host/display/gtk/gtk-display.h
+++ b/host/display/gtk/gtk-display.h
@@ -50,8 +50,10 @@ _TME_RCSID("$Id: gtk-display.h,v 1.10 2009/08/28 01:29:47 fredette Exp $");
 /* types: */
 
 /* a display: */
-struct tme_gdk_display {
-
+typedef struct tme_gtk_display {
+  /* the GTK application structure */
+  GtkApplication *tme_gtk_application;
+  
   /* the generic display structure */
   struct tme_display display;
 
@@ -64,10 +66,10 @@ struct tme_gdk_display {
 #if GTK_MAJOR_VERSION == 3
   GdkMonitor *tme_gdk_display_monitor;
 #endif
-};
+} _tme_gtk_display, *tme_gtk_display;
   
 /* a screen: */
-struct tme_gtk_screen {
+typedef struct tme_gtk_screen {
 
   /* the generic screen structure */
   struct tme_screen screen;
@@ -99,7 +101,7 @@ struct tme_gtk_screen {
      for the framebuffer event box: */
   //GdkEventMask tme_gtk_screen_mouse_events_old;
 
-};
+} _tme_gtk_screen, *tme_gtk_screen;
 
 /* a menu item: */
 struct tme_display_menu_item {
@@ -112,7 +114,6 @@ struct tme_display_menu_item {
 /* prototypes: */
 void _tme_gtk_keyboard_attach _TME_P((struct tme_gtk_screen *));
 void _tme_gtk_mouse_attach _TME_P((struct tme_gtk_screen *));
-gint _tme_display_enter_focus _TME_P((GtkWidget *, GdkEvent *, gpointer));
 GtkWidget *_tme_display_menu_radio _TME_P((struct tme_gtk_screen *, struct tme_display_menu_item *, int num_items));
 
 #endif /* _HOST_GTK_DISPLAY_H */

--- a/host/display/gtk/gtk-keyboard.c
+++ b/host/display/gtk/gtk-keyboard.c
@@ -44,91 +44,61 @@ _TME_RCSID("$Id: gtk-keyboard.c,v 1.10 2007/02/15 02:15:41 fredette Exp $");
 /* types: */
 
 /* this is a GTK callback for a key press or release event: */
-static int
-_tme_gtk_keyboard_key_event(GtkWidget *widget,
-			    GdkEvent *gdk_event_raw,
-			    struct tme_gtk_screen *screen)
+static gboolean
+_tme_gtk_keyboard_key_down(
+  GtkEventControllerKey* self,
+  guint keyval,
+  guint keycode,
+  GdkModifierType* state,
+  struct tme_display *display)
 {
-  struct tme_display *display;
-  GdkEventKey *gdk_event;
-  struct tme_keyboard_event tme_event;
-
-  /* make a tme event from this gdk event: */
-  gdk_event = &gdk_event_raw->key;
-  tme_event.tme_keyboard_event_type
-    = (gdk_event_get_event_type(gdk_event) == GDK_KEY_PRESS
-       ? TME_KEYBOARD_EVENT_PRESS
-       : TME_KEYBOARD_EVENT_RELEASE);
-  tme_event.tme_keyboard_event_modifiers
-    = gdk_event->state;
-  tme_event.tme_keyboard_event_keyval
-    = gdk_event->keyval;
-  tme_event.tme_keyboard_event_time
-    = gdk_event->time;
-
-  /* recover our data structure: */
-  display = screen->screen.tme_screen_display;
-
-  /* lock the mutex: */
-  tme_mutex_lock(&display->tme_display_mutex);
-
-  /* if this is a press of the mouse mode off key, turn mouse mode off
-     and return now: */
-  if (gdk_event_get_event_type(gdk_event) == GDK_KEY_PRESS
-      && (gdk_event->keyval
-	  == screen->tme_gtk_screen_mouse_keyval)) {
-    _tme_gtk_mouse_mode_off(screen,
-			    gdk_event->time);
-
-    /* unlock the mutex: */
-    tme_mutex_unlock(&display->tme_display_mutex);
-    
-    return (TRUE);
-  }
-
-  _tme_keyboard_key_event(&tme_event, display);
-  
-  /* unlock the mutex: */
-  tme_mutex_unlock(&display->tme_display_mutex);
+  return _tme_keyboard_key_event(TRUE, keyval, display);
+}
 
-  /* don't process this event any further: */
-  return (TRUE);
+static gboolean
+_tme_gtk_keyboard_key_up(
+  GtkEventControllerKey* self,
+  guint keyval,
+  guint keycode,
+  GdkModifierType* state,
+  struct tme_display *display)
+{
+  return _tme_keyboard_key_event(FALSE, keyval, display);
 }
 
 /* this attaches the GTK keyboard to a new screen: */
 void
 _tme_gtk_keyboard_attach(struct tme_gtk_screen *screen)
 {
+  GtkEventControllerKey *key;
+  GtkEventControllerMotion *motion;
 
-  /* make sure the event box for the framebuffer gets enter, key_press
-     and key_release events.  we have to add these latter two events
-     to both the event box widget itself, and the top-level window,
-     since GTK 1.x appears to not select KeyRelease events at the
-     top-level: */
-  gtk_widget_add_events(screen->tme_gtk_screen_gtkframe,
-			GDK_ENTER_NOTIFY_MASK
-			| GDK_KEY_PRESS_MASK
-			| GDK_KEY_RELEASE_MASK);
-  gtk_widget_add_events (gtk_widget_get_toplevel(screen->tme_gtk_screen_gtkframe),
-			 GDK_KEY_PRESS_MASK
-			 | GDK_KEY_RELEASE_MASK);
-
-  /* set a signal handler for these events: */
-  g_signal_connect(screen->tme_gtk_screen_gtkframe,
-		   "enter_notify_event",
-		   G_CALLBACK(_tme_display_enter_focus),
-		   NULL);
-  g_signal_connect_after(screen->tme_gtk_screen_gtkframe,
-			 "key_press_event",
-			 G_CALLBACK(_tme_gtk_keyboard_key_event), 
-			 screen);
-  g_signal_connect_after(screen->tme_gtk_screen_gtkframe,
-			 "key_release_event",
-			 G_CALLBACK(_tme_gtk_keyboard_key_event), 
-			 screen);
+  motion=gtk_event_controller_motion_new(screen->tme_gtk_screen_gtkframe);
+  gtk_widget_add_controller(screen->tme_gtk_screen_gtkframe, GTK_EVENT_CONTROLLER(motion));
+  
+  /* on entering window, grab keyboard focus: */
+  g_signal_connect_swapped(motion,
+			   "enter",
+			   G_CALLBACK(gtk_widget_grab_focus),
+			   screen->tme_gtk_screen_gtkframe);
+
+  /* set the signal handler for the key events: */
+  key=gtk_event_controller_key_new(screen->tme_gtk_screen_gtkframe);
+  
+  gtk_widget_add_controller(screen->tme_gtk_screen_gtkframe, GTK_EVENT_CONTROLLER(key));
+
+  g_signal_connect_after(key,
+			 "key-pressed",
+			 G_CALLBACK(_tme_gtk_keyboard_key_down), 
+			 screen->screen.tme_screen_display);
+  g_signal_connect_after(key,
+			 "key-released",
+			 G_CALLBACK(_tme_gtk_keyboard_key_up), 
+			 screen->screen.tme_screen_display);
   
   /* the event box can focus, and have it grab the focus now: */
   gtk_widget_set_can_focus(screen->tme_gtk_screen_gtkframe, TRUE);
   gtk_widget_grab_focus(screen->tme_gtk_screen_gtkframe);
+
 }
 

--- a/host/display/gtk/gtk-mouse.c
+++ b/host/display/gtk/gtk-mouse.c
@@ -119,7 +119,7 @@ _tme_gtk_mouse_ebox_event(GtkWidget *widget,
 			  GdkEvent *gdk_event_raw,
 			  struct tme_gtk_screen *screen)
 {
-  struct tme_gdk_display *display;
+  struct tme_gtk_display *display;
   int rc;
   char *status;
   GdkWindow *window;
@@ -215,7 +215,7 @@ void
 _tme_gtk_mouse_mode_off(struct tme_gtk_screen *screen,
 			guint32 time)
 {
-  struct tme_gdk_display *display;
+  struct tme_gtk_display *display;
 
   /* get the display: */
   display = screen->screen.tme_screen_display;

--- a/host/display/rfb/rfb-display.c
+++ b/host/display/rfb/rfb-display.c
@@ -166,7 +166,7 @@ TME_ELEMENT_SUB_NEW_DECL(tme_host_rfb,display) {
 					  bpp);
   server->alwaysShared = TRUE;
   server->ptrAddEvent = _tme_mouse_buttons_event;
-  server->kbdAddEvent = _tme_keyboard_key_press;
+  server->kbdAddEvent = _tme_keyboard_key_event;
   server->newClientHook = _tme_rfb_newclient;
   //  server->httpDir = "../webclients";
   //  server->httpEnableProxyConnect = TRUE;

--- a/host/display/sdl/sdl-display.c
+++ b/host/display/sdl/sdl-display.c
@@ -273,14 +273,14 @@ _tme_sdl_display_update(struct tme_display *display) {
       switch (e.window.event) {
       case SDL_WINDOWEVENT_FOCUS_LOST:
 	if (rightAltKeyDown) {
-	  _tme_keyboard_key_press(FALSE, SDLK_RALT, display);
+	  _tme_keyboard_key_event(FALSE, SDLK_RALT, display);
 	  rightAltKeyDown = FALSE;
 	  tme_log(&display->tme_display_element->tme_element_log_handle, 0, TME_OK,
 		  (&display->tme_display_element->tme_element_log_handle,
 		   _("released right Alt key\n")));
 	}
 	if (leftAltKeyDown) {
-	  _tme_keyboard_key_press(FALSE, SDLK_LALT, display);
+	  _tme_keyboard_key_event(FALSE, SDLK_LALT, display);
 	  leftAltKeyDown = FALSE;
 	  tme_log(&display->tme_display_element->tme_element_log_handle, 0, TME_OK,
 		  (&display->tme_display_element->tme_element_log_handle,
@@ -343,7 +343,7 @@ _tme_sdl_display_update(struct tme_display *display) {
       if (viewOnly)
 	break;
       tme_keyboard_keyval_t sym = SDL_key2rfbKeySym(&e.key);
-      _tme_keyboard_key_press(e.type == SDL_KEYDOWN ? TRUE : FALSE,
+      _tme_keyboard_key_event(e.type == SDL_KEYDOWN ? TRUE : FALSE,
 			      (sym) ? (sym) : (e.key.keysym.sym), display);
       if (e.key.keysym.sym == SDLK_RALT)
 	rightAltKeyDown = e.type == SDL_KEYDOWN;
@@ -355,8 +355,8 @@ _tme_sdl_display_update(struct tme_display *display) {
       if (viewOnly)
 	break;
       tme_keyboard_keyval_t sym = utf8char2rfbKeySym(e.text.text);
-      _tme_keyboard_key_press(TRUE, sym, display);
-      _tme_keyboard_key_press(FALSE, sym, display);
+      _tme_keyboard_key_event(TRUE, sym, display);
+      _tme_keyboard_key_event(FALSE, sym, display);
 #endif
       break;
     default: