Commit: ebef66cebe0fb7efda72c5b1f0ca80faba1ddac4 - tme (git)

Commit MetaInfo

• Revision: ebef66cebe0fb7efda72c5b1f0ca80faba1ddac4 (tree)
• Time: 2023-02-05 20:50:39
• Author: Ruben Agin <phabrics@phab...>
• Commiter: Ruben Agin

Log Message

Began the process of converting GTK 3 to 4.

Change Summary

• modified: configure.ac
• modified: host/display/display.c
• 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

Incremental Difference

--- a/configure.ac
+++ b/configure.ac
@@ -796,7 +796,9 @@ dnl Checks for GLIB.
 PKG_CHECK_MODULES([GLIB], [glib-2.0], [AC_DEFINE([HAVE_GLIB], [], [Defined if GLIB 2.0 is found.])], [])
 
 dnl Checks for display type support
-PKG_CHECK_MODULES([GTK], [gtk+-3.0], [have_gtk=$enable_gtk], [])
+PKG_CHECK_MODULES([GTK], [gtk4], [have_gtk=$enable_gtk], [
+   PKG_CHECK_MODULES([GTK], [gtk+-3.0], [have_gtk=$enable_gtk], [])
+])
 PKG_CHECK_MODULES([SDL], [sdl2], [have_sdl=$enable_sdl], [])
 AM_CONDITIONAL([HAVE_SDL], [test "x${have_sdl}" = xyes])
 PKG_CHECK_MODULES([RFB], [libvncclient libvncserver], [have_rfb=$enable_rfb], [])

--- a/host/display/display.c
+++ b/host/display/display.c
@@ -216,7 +216,7 @@ tme_display_update(void *disp) {
     (*display->tme_display_update)(display) :
     (TME_OK);
 
-  if(rc != TME_OK) return rc;
+  //  if(rc != TME_OK) return rc;
 
   /* lock the mutex: */
   tme_mutex_lock(&display->tme_display_mutex);

--- a/host/display/gtk/gtk-display.c
+++ b/host/display/gtk/gtk-display.c
@@ -39,6 +39,27 @@ _TME_RCSID("$Id: gtk-screen.c,v 1.11 2009/08/30 21:39:03 fredette Exp $");
 /* includes: */
 #include "gtk-display.h"
 #include <stdlib.h>
+#if GTK_MAJOR_VERSION == 4
+#define _tme_gtk_window_toplevels gtk_window_get_toplevels
+#define _tme_gtk_init gtk_init_check
+#else
+#define _tme_gtk_window_toplevels gtk_window_list_toplevels
+static void _tme_gtk_init(void) {
+  char **argv;
+  char *argv_buffer[3];
+  int argc;
+
+  /* conjure up an argv.  this is pretty bad: */
+  argv = argv_buffer;
+  argc = 0;
+  argv[argc++] = "tmesh";
+#if 1
+  argv[argc++] = "--gtk-debug=signals";
+#endif
+  argv[argc] = NULL;
+  gtk_init_check(&argc, &argv);
+}
+#endif
 
 static void
 _tme_gtk_display_bell(struct tme_gdk_display *display) {
@@ -47,9 +68,13 @@ _tme_gtk_display_bell(struct tme_gdk_display *display) {
 
 static int
 _tme_gtk_display_update(struct tme_display *display) {
-  while (gtk_events_pending ())
-    gtk_main_iteration ();
-  return TME_OK;
+  int rc;
+  
+  for(rc=TRUE;rc && g_main_context_pending(NULL);
+      rc = g_main_context_iteration(NULL, TRUE));
+  
+  if(rc) rc = g_list_model_get_n_items(_tme_gtk_window_toplevels());
+  return !rc;
 }
 
 /* this sets the screen scaling to that indicated by the Scale menu: */
@@ -196,7 +221,7 @@ _tme_gtk_screen_create_similar_image(GdkWindow *window,
 {
   cairo_surface_t *surface;
 
-#if GTK_MINOR_VERSION < 10
+#if GTK_MAJOR_VERSION == 3 && GTK_MINOR_VERSION < 10
   surface = 
     cairo_image_surface_create(format,
 			       width,
@@ -449,42 +474,6 @@ _tme_gtk_screen_new(struct tme_gdk_display *display,
   return (screen);
 }
 
-static void _tme_gtk_init(void) {
-  char **argv;
-  char *argv_buffer[3];
-  int argc;
-
-  /* GTK requires program to be running non-setuid */
-#ifdef HAVE_SETUID
-  setuid(getuid());
-#endif
-  
-  /* conjure up an argv.  this is pretty bad: */
-  argv = argv_buffer;
-  argc = 0;
-  argv[argc++] = "tmesh";
-#if 1
-  argv[argc++] = "--gtk-debug=signals";
-#endif
-  argv[argc] = NULL;
-  gtk_init(&argc, &argv);
-}
-
-/* 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);
-}
-
 /* this creates a menu of radio buttons: */
 GtkWidget *
 _tme_display_menu_radio(struct tme_gtk_screen *screen,
@@ -523,7 +512,15 @@ _tme_display_menu_radio(struct tme_gtk_screen *screen,
 TME_ELEMENT_SUB_NEW_DECL(tme_host_gtk,display) {
   struct tme_gdk_display *display;
   GdkRectangle workarea;
-
+  int rc;
+  
+  /* GTK requires program to be running non-setuid */
+#ifdef HAVE_SETUID
+  setuid(getuid());
+#endif
+  
+  if(!(rc = _tme_gtk_init())) return rc;
+  
   /* start our data structure: */
   display = tme_new0(struct tme_gdk_display, 1);
   tme_display_init(element, display);
@@ -531,8 +528,6 @@ TME_ELEMENT_SUB_NEW_DECL(tme_host_gtk,display) {
   /* recover our data structure: */
   display = element->tme_element_private;
 
-  _tme_gtk_init();
-  
   display->tme_gdk_display = gdk_display_get_default();
 
   display->tme_gdk_display_cursor

--- a/host/display/gtk/gtk-display.h
+++ b/host/display/gtk/gtk-display.h
@@ -95,7 +95,7 @@ struct tme_gtk_screen {
 
   /* when mouse mode is on, this is the previous events mask
      for the framebuffer event box: */
-  GdkEventMask tme_gtk_screen_mouse_events_old;
+  //GdkEventMask tme_gtk_screen_mouse_events_old;
 
 };
 

--- a/host/display/gtk/gtk-keyboard.c
+++ b/host/display/gtk/gtk-keyboard.c
@@ -56,7 +56,7 @@ _tme_gtk_keyboard_key_event(GtkWidget *widget,
   /* make a tme event from this gdk event: */
   gdk_event = &gdk_event_raw->key;
   tme_event.tme_keyboard_event_type
-    = (gdk_event->type == GDK_KEY_PRESS
+    = (gdk_event_get_event_type(gdk_event) == GDK_KEY_PRESS
        ? TME_KEYBOARD_EVENT_PRESS
        : TME_KEYBOARD_EVENT_RELEASE);
   tme_event.tme_keyboard_event_modifiers
@@ -74,7 +74,7 @@ _tme_gtk_keyboard_key_event(GtkWidget *widget,
 
   /* if this is a press of the mouse mode off key, turn mouse mode off
      and return now: */
-  if (gdk_event->type == GDK_KEY_PRESS
+  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,

--- a/host/display/gtk/gtk-mouse.c
+++ b/host/display/gtk/gtk-mouse.c
@@ -66,14 +66,19 @@ _tme_gtk_mouse_mouse_event(GtkWidget *widget,
   gint y;
   int button=0;
 
+#if GTK_MAJOR_VERSION == 4
+  gdk_event_get_position(gdk_event_raw, &x, &y);
+  button = gdk_button_event_get_button(gdk_event_raw);
+
+#elif GTK_MAJOR_VERSION == 3
   /* if this is motion: */
   if (gdk_event_raw->type == GDK_MOTION_NOTIFY) {
 
     /* if the pointer position hasn't changed either, return now.
        every time we warp the pointer we will get a motion event, and
        this should ignore those events: */
-    x = gdk_event_raw->motion.x_root;
-    y = gdk_event_raw->motion.y_root;
+    x = gdk_event_raw->motion.x;
+    y = gdk_event_raw->motion.y;
 
   }
 
@@ -81,8 +86,8 @@ _tme_gtk_mouse_mouse_event(GtkWidget *widget,
   else {
 
     /* get the pointer position: */
-    x = gdk_event_raw->button.x_root;
-    y = gdk_event_raw->button.y_root;
+    x = gdk_event_raw->button.x;
+    y = gdk_event_raw->button.y;
 
     /* make the buttons mask: */
     button = gdk_event_raw->button.button;
@@ -92,12 +97,12 @@ _tme_gtk_mouse_mouse_event(GtkWidget *widget,
 
   /* otherwise, if this is a double- or triple-click: */
   if (gdk_event_raw->type != GDK_2BUTTON_PRESS
-      && gdk_event_raw->type != GDK_3BUTTON_PRESS) {
-
+      && gdk_event_raw->type != GDK_3BUTTON_PRESS)
+#endif
+  {    
     /* we ignore double- and triple-click events, since normal button
        press and release events are always generated also: */
-    assert (gdk_event_raw->type == GDK_BUTTON_PRESS
-	    || gdk_event_raw->type == GDK_BUTTON_RELEASE);
+   //    assert (gdk_event_raw->type == GDK_BUTTON_PRESS || gdk_event_raw->type == GDK_BUTTON_RELEASE);
 
     _tme_mouse_button_press(button, x, y, display);
   
@@ -121,13 +126,13 @@ _tme_gtk_mouse_ebox_event(GtkWidget *widget,
 
   /* if this is an enter notify event, grab the focus and continue
      propagating the event: */
-  if (gdk_event_raw->type == GDK_ENTER_NOTIFY) {
+  if (gdk_event_get_event_type(gdk_event_raw) == GDK_ENTER_NOTIFY) {
     gtk_widget_grab_focus(widget);
     return (FALSE);
   }
 
   /* if this is not a key press event, continue propagating it now: */
-  if (gdk_event_raw->type != GDK_KEY_PRESS) {
+  if (gdk_event_get_event_type(gdk_event_raw) != GDK_KEY_PRESS) {
     return (FALSE);
   }