Commit: 2f7e337032b081e4fa6874e7261c089e4c22693a - tme (git)

Commit MetaInfo

• Revision: 2f7e337032b081e4fa6874e7261c089e4c22693a (tree)
• Time: 2023-03-01 20:55:20
• Author: phabrics <phabrics@phab...>
• Commiter: phabrics

Log Message

Continued migration from GTK3 to GTK4 using recommended changes from GTK4 documentation.

Change Summary

• 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/host/display/gtk/gtk-display.c
+++ b/host/display/gtk/gtk-display.c
@@ -75,6 +75,8 @@ _tme_gtk_display_update(struct tme_display *display) {
   return !rc;
 }
 
+#if GTK_MAJOR_VERSION == 3
+
 /* this sets the screen scaling to that indicated by the Scale menu: */
 static void
 _tme_gtk_screen_scale_default(GtkWidget *widget,
@@ -119,7 +121,6 @@ _tme_gtk_screen_scale_double(GtkWidget *widget,
   _tme_screen_scale_set(screen, TME_FB_XLAT_SCALE_DOUBLE );
 }
 
-#if GTK_MAJOR_VERSION == 3
 /* this sets the screen size: */
 static inline void
 _tme_screen_format_set(_tme_gtk_screen *screen,
@@ -193,8 +194,6 @@ static struct tme_display_menu_item format_items[] =
    { _("RGB16_565"), G_CALLBACK(_tme_gtk_screen_format_rgb16_565) }
   };
 
-#endif
-
 static struct tme_display_menu_item scale_items[] =
   {
    { _("Default"), G_CALLBACK(_tme_gtk_screen_scale_default) },
@@ -203,12 +202,14 @@ static struct tme_display_menu_item scale_items[] =
    { _("Double"), G_CALLBACK(_tme_gtk_screen_scale_double) }
   };
 
+#endif
+
 /* Screen-specific size request */
 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 */
-  gtk_widget_set_size_request(screen->tme_gtk_screen_gtkframe,
+  gtk_widget_set_size_request(screen->tme_gtk_screen_draw,
 			      conn_fb->tme_fb_connection_width,
 			      conn_fb->tme_fb_connection_height);
 }
@@ -303,7 +304,7 @@ _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);
-  gtk_widget_queue_draw(screen->tme_gtk_screen_gtkframe);
+  gtk_widget_queue_draw(screen->tme_gtk_screen_draw);
 }
 
 /* Redraw the screen from the surface. Note that the ::draw
@@ -352,37 +353,56 @@ _tme_gtk_screen_new(_tme_gtk_display *display,
 		    struct tme_connection *conn)
 {
   _tme_gtk_screen *screen;
+  GtkWidget *vbox;
+#if GTK_MAJOR_VERSION == 3
   GtkWidget *menu_bar;
   GtkWidget *menu;
   GtkWidget *submenu;
   GtkWidget *menu_item;
-
+#endif
+  
   screen = tme_screen_new(display, _tme_gtk_screen, conn);
 
+  /* create the header bar: */
+  screen->tme_gtk_screen_header = gtk_header_bar_new();
+
+  /* create the outer vertical packing box: */
+  vbox
+    = gtk_box_new(GTK_ORIENTATION_VERTICAL, 0);
+
+  /* create the Draw for the framebuffer area: */
+  screen->tme_gtk_screen_draw = gtk_drawing_area_new();
+  
   /* create the top-level window, and allow it to shrink, grow,
      and auto-shrink: */
   screen->tme_gtk_screen_window = 
 #if GTK_MAJOR_VERSION == 4
      gtk_window_new();
+
+  gtk_drawing_area_set_draw_func(GTK_DRAWING_AREA(screen->tme_gtk_screen_draw),
+				 _tme_gtk_screen_draw, screen, NULL);
+  g_signal_connect_after(screen->tme_gtk_screen_draw, "resize",
+			 G_CALLBACK(_tme_gtk_screen_configure), screen);
+
+  /* add the outer vertical packing box to the window: */
+  gtk_window_set_child(GTK_WINDOW(screen->tme_gtk_screen_window), vbox);
+  
+  /* pack the Draw into the outer vertical packing box: */
+  gtk_box_prepend(GTK_BOX(vbox), 
+		  screen->tme_gtk_screen_draw);
+
 #elif GTK_MAJOR_VERSION == 3
   gtk_window_new(GTK_WINDOW_TOPLEVEL);
   screen->screen.tme_screen_scale = gdk_monitor_get_scale_factor(display->tme_gdk_display_monitor);
-#endif
-
-  gtk_window_set_resizable(GTK_WINDOW(screen->tme_gtk_screen_window), FALSE);
-
-  /* create the outer vertical packing box: */
-  screen->tme_gtk_screen_vbox0
-    = gtk_box_new(GTK_ORIENTATION_VERTICAL, 0);
 
   /* add the outer vertical packing box to the window: */
   gtk_container_add(GTK_CONTAINER(screen->tme_gtk_screen_window),
-		    screen->tme_gtk_screen_vbox0);
+		    vbox);
 
   /* create the menu bar and pack it into the outer vertical packing
      box: */
   menu_bar = gtk_menu_bar_new ();
-  gtk_box_pack_start(GTK_BOX(screen->tme_gtk_screen_vbox0), 
+  gtk_box_pack_start(GTK_BOX(vbox), 
 		     menu_bar,
 		     FALSE, FALSE, 0);
   //  gtk_widget_show(menu_bar);
@@ -399,7 +419,6 @@ _tme_gtk_screen_new(_tme_gtk_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 == 3
   /* create the Screen colormap submenu: */
   submenu = _tme_display_menu_radio(screen, format_items, TME_ARRAY_ELS(format_items));
 
@@ -411,8 +430,6 @@ _tme_gtk_screen_new(_tme_gtk_display *display,
 
   _tme_screen_format_set(screen, CAIRO_FORMAT_RGB24);
 
-#endif
-  
   /* create the Screen menu bar item, attach the menu to it, and 
      attach the menu bar item to the menu bar: */
   menu_item = gtk_menu_item_new_with_label("Screen");
@@ -420,37 +437,28 @@ _tme_gtk_screen_new(_tme_gtk_display *display,
   gtk_menu_item_set_submenu(GTK_MENU_ITEM(menu_item), menu);
   gtk_menu_shell_append(GTK_MENU_SHELL(menu_bar), menu_item);
 
-  /* create the Gtkframe for the framebuffer area: */
-  screen->tme_gtk_screen_gtkframe = gtk_drawing_area_new();
-  
-  /* new a minimum size */
-  //_tme_gtk_screen_set_size(screen, BLANK_SIDE, BLANK_SIDE);
-  //  _tme_gtk_screen_init(screen->tme_gtk_screen_gtkframe, screen);
-
-  
-  /* 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,
+  /* pack the Draw into the outer vertical packing box: */
+  gtk_box_pack_start(GTK_BOX(vbox), 
+		     screen->tme_gtk_screen_draw,
 		     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);
-  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_signal_connect(screen->tme_gtk_screen_draw, "draw",
 		   G_CALLBACK(_tme_gtk_screen_draw), screen);
-  g_signal_connect(screen->tme_gtk_screen_gtkframe, "configure-event",
+  g_signal_connect(screen->tme_gtk_screen_draw, "configure-event",
 		   G_CALLBACK(_tme_gtk_screen_configure), screen);
 #endif
 
+  gtk_window_set_resizable(GTK_WINDOW(screen->tme_gtk_screen_window), FALSE);
+
   /* attach the mouse to this screen: */
   _tme_gtk_mouse_attach(screen);
 
   /* attach the keyboard to this screen: */
   _tme_gtk_keyboard_attach(screen);
 
+  gtk_window_set_titlebar(GTK_WINDOW(screen->tme_gtk_screen_window),
+			  screen->tme_gtk_screen_header);
+  
   gtk_window_set_title(GTK_WINDOW(screen->tme_gtk_screen_window),
 		       display->display.tme_display_title);
 
@@ -469,6 +477,7 @@ _tme_gtk_screen_new(_tme_gtk_display *display,
   return (screen);
 }
 
+#if GTK_MAJOR_VERSION == 3
 /* this creates a menu of radio buttons: */
 GtkWidget *
 _tme_display_menu_radio(_tme_gtk_screen *screen,
@@ -502,6 +511,7 @@ _tme_display_menu_radio(_tme_gtk_screen *screen,
   /* return the menu: */
   return (menu);
 }
+#endif
 
 /* the new GTK display function: */
 TME_ELEMENT_SUB_NEW_DECL(tme_host_gtk,display) {

--- a/host/display/gtk/gtk-display.h
+++ b/host/display/gtk/gtk-display.h
@@ -51,12 +51,12 @@ _TME_RCSID("$Id: gtk-display.h,v 1.10 2009/08/28 01:29:47 fredette Exp $");
 
 /* a display: */
 typedef struct tme_gtk_display {
-  /* the GTK application structure */
-  GtkApplication *tme_gtk_application;
-  
   /* the generic display structure */
   struct tme_display display;
 
+  /* the GTK application structure */
+  GtkApplication *tme_gtk_application;
+  
   GdkDisplay *tme_gdk_display;
   
   GdkCursor *tme_gdk_display_cursor;
@@ -77,26 +77,30 @@ typedef struct tme_gtk_screen {
   /* the top-level window: */
   GtkWidget *tme_gtk_screen_window;
   
-  /* the outer vertical packing box: */
-  GtkWidget *tme_gtk_screen_vbox0;
+  /* the header bar: */
+  GtkWidget *tme_gtk_screen_header;
 
-  /* the GtkWidget, GdkWindow & cairo_surface for the framebuffer: */
-  GtkWidget *tme_gtk_screen_gtkframe;
+  /* the drawing area & surface for the framebuffer: */
+  GtkWidget *tme_gtk_screen_draw;
   cairo_surface_t *tme_gtk_screen_surface;
-  cairo_format_t tme_gtk_screen_format;
 
   /* the mouse on label: */
   GtkWidget *tme_gtk_screen_mouse_label;
 
-  /* the status bar, and the context ID: */
-  GtkWidget *tme_gtk_screen_mouse_statusbar;
-  guint tme_gtk_screen_mouse_statusbar_cid;
-
   /* if GDK_VoidSymbol, mouse mode is off.  otherwise,
      mouse mode is on, and this is the keyval that will
      turn mouse mode off: */
   guint tme_gtk_screen_mouse_keyval;
 
+#if GTK_MAJOR_VERSION == 3
+  /* the status bar, and the context ID: */
+  GtkWidget *tme_gtk_screen_mouse_statusbar;
+  guint tme_gtk_screen_mouse_statusbar_cid;
+
+  cairo_format_t tme_gtk_screen_format;
+  GtkEventControllerKey *key;
+  GtkEventControllerMotion *motion;
+
   /* when mouse mode is on, this is the previous events mask
      for the framebuffer event box: */
   //GdkEventMask tme_gtk_screen_mouse_events_old;
@@ -112,9 +116,12 @@ struct tme_display_menu_item {
 };
 
 /* prototypes: */
+GtkWidget *_tme_display_menu_radio _TME_P((struct tme_gtk_screen *, struct tme_display_menu_item *, int num_items));
+#else
+} _tme_gtk_screen, *tme_gtk_screen;
+#endif
 void _tme_gtk_keyboard_attach _TME_P((struct tme_gtk_screen *));
 void _tme_gtk_mouse_attach _TME_P((struct tme_gtk_screen *));
-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
@@ -73,19 +73,21 @@ _tme_gtk_keyboard_attach(struct tme_gtk_screen *screen)
   GtkEventControllerKey *key;
   GtkEventControllerMotion *motion;
 
-  motion=gtk_event_controller_motion_new(screen->tme_gtk_screen_gtkframe);
-  gtk_widget_add_controller(screen->tme_gtk_screen_gtkframe, GTK_EVENT_CONTROLLER(motion));
+#if GTK_MAJOR_VERSION == 4
+  motion=gtk_event_controller_motion_new();
+  key=gtk_event_controller_key_new();
+  gtk_widget_add_controller(screen->tme_gtk_screen_draw, GTK_EVENT_CONTROLLER(key));
+  gtk_widget_add_controller(screen->tme_gtk_screen_draw, GTK_EVENT_CONTROLLER(motion));
+#elif GTK_MAJOR_VERSION == 3
+  motion=screen->motion=gtk_event_controller_motion_new(screen->tme_gtk_screen_draw);
+  key=screen->key=gtk_event_controller_key_new(screen->tme_gtk_screen_draw);
+#endif
   
   /* 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));
+			   screen->tme_gtk_screen_draw);
 
   g_signal_connect_after(key,
 			 "key-pressed",
@@ -97,8 +99,8 @@ _tme_gtk_keyboard_attach(struct tme_gtk_screen *screen)
 			 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);
+  gtk_widget_set_can_focus(screen->tme_gtk_screen_draw, TRUE);
+  gtk_widget_grab_focus(screen->tme_gtk_screen_draw);
 
 }
 

--- a/host/display/gtk/gtk-mouse.c
+++ b/host/display/gtk/gtk-mouse.c
@@ -41,7 +41,7 @@ _TME_RCSID("$Id: gtk-mouse.c,v 1.3 2007/03/03 15:33:22 fredette Exp $");
 #include <gdk/gdkkeysyms.h>
 
 #if 0
-/* this warps the pointer to the middle of the Gtkframe: */
+/* this warps the pointer to the middle of the Draw: */
 void
 _tme_gtk_mouse_warp_pointer(struct tme_gtk_screen *screen)
 {
@@ -164,22 +164,22 @@ _tme_gtk_mouse_ebox_event(GtkWidget *widget,
 		     status);
   tme_free(status);
   
-  window = gtk_widget_get_window(screen->tme_gtk_screen_gtkframe);
+  window = gtk_widget_get_window(screen->tme_gtk_screen_draw);
 
   /* if the original events mask on the framebuffer event box have
      never been saved, save them now, and add the mouse events: */
   /*  if (screen->tme_gtk_screen_mouse_events_old == 0) {
     screen->tme_gtk_screen_mouse_events_old
-      = gtk_widget_get_events(screen->tme_gtk_screen_gtkframe);
-    gtk_widget_add_events(screen->tme_gtk_screen_gtkframe,
+      = gtk_widget_get_events(screen->tme_gtk_screen_draw);
+    gtk_widget_add_events(screen->tme_gtk_screen_draw,
 			  GDK_POINTER_MOTION_MASK
 			  | GDK_BUTTON_PRESS_MASK
 			  | GDK_BUTTON_RELEASE_MASK);
   }
   */
   /* grab the pointer: */
-  gtk_grab_add(screen->tme_gtk_screen_gtkframe);
-    /*gtk_device_grab_add(screen->tme_gtk_screen_gtkframe,
+  gtk_grab_add(screen->tme_gtk_screen_draw);
+    /*gtk_device_grab_add(screen->tme_gtk_screen_draw,
 		      gdk_seat_get_pointer(display->tme_gdk_display_seat),
 		      FALSE);*/
 
@@ -226,11 +226,11 @@ _tme_gtk_mouse_mode_off(struct tme_gtk_screen *screen,
 
   /* ungrab the pointer: */
   gdk_seat_ungrab(display->tme_gdk_display_seat);
-  gtk_grab_remove(screen->tme_gtk_screen_gtkframe);
-  //gtk_device_grab_remove(screen->tme_gtk_screen_gtkframe, gdk_seat_get_pointer(display->tme_gdk_display_seat));
+  gtk_grab_remove(screen->tme_gtk_screen_draw);
+  //gtk_device_grab_remove(screen->tme_gtk_screen_draw, gdk_seat_get_pointer(display->tme_gdk_display_seat));
 
   /* restore the old events mask on the event box: */
-  //  gtk_widget_set_events(screen->tme_gtk_screen_gtkframe, screen->tme_gtk_screen_mouse_events_old);
+  //  gtk_widget_set_events(screen->tme_gtk_screen_draw, screen->tme_gtk_screen_mouse_events_old);
 
   /* pop our message off of the statusbar: */
   gtk_statusbar_pop(GTK_STATUSBAR(screen->tme_gtk_screen_mouse_statusbar),
@@ -248,27 +248,13 @@ _tme_gtk_mouse_mode_off(struct tme_gtk_screen *screen,
 void
 _tme_gtk_mouse_attach(struct tme_gtk_screen *screen)
 {
-  GtkWidget *hbox0;
   GtkWidget *ebox;
 
-  /* create the horizontal packing box for the mouse controls: */
-  hbox0 = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0);
-
-  /* pack the horizontal packing box into the outer vertical packing box: */
-  gtk_box_pack_start(GTK_BOX(screen->tme_gtk_screen_vbox0), 
-		     hbox0,
-		     FALSE, FALSE, 0);
-
-  /* show the horizontal packing box: */
-  gtk_widget_show(hbox0);
-
   /* create the event box for the mouse on label: */
   ebox = gtk_event_box_new();
-
+  
   /* pack the event box into the horizontal packing box: */
-  gtk_box_pack_start(GTK_BOX(hbox0), 
-		     ebox,
-		     FALSE, FALSE, 0);
+  gtk_header_bar_pack_start(GTK_HEADER_BAR(screen->tme_gtk_screen_header), ebox);
 
   /* set the tip on the event box, which will eventually contain the mouse on label: */
   gtk_widget_set_tooltip_text(ebox,
@@ -288,9 +274,6 @@ _tme_gtk_mouse_attach(struct tme_gtk_screen *screen)
   /* the event box can focus: */
   gtk_widget_set_can_focus(ebox, TRUE);
 
-  /* show the event box: */
-  gtk_widget_show(ebox);
-
   /* create the mouse on label: */
   screen->tme_gtk_screen_mouse_label
     = gtk_label_new(_("Mouse is off"));
@@ -299,20 +282,13 @@ _tme_gtk_mouse_attach(struct tme_gtk_screen *screen)
   gtk_container_add(GTK_CONTAINER(ebox), 
 		    screen->tme_gtk_screen_mouse_label);
 
-  /* show the mouse on label: */
-  gtk_widget_show(screen->tme_gtk_screen_mouse_label);
-
   /* create the mouse statusbar: */
   screen->tme_gtk_screen_mouse_statusbar
     = gtk_statusbar_new();
 
   /* pack the mouse statusbar into the horizontal packing box: */
-  gtk_box_pack_start(GTK_BOX(hbox0), 
-		     screen->tme_gtk_screen_mouse_statusbar,
-		     TRUE, TRUE, 10);
-
-  /* show the mouse statusbar: */
-  gtk_widget_show(screen->tme_gtk_screen_mouse_statusbar);
+  gtk_header_bar_pack_start(GTK_HEADER_BAR(screen->tme_gtk_screen_header), 
+			    screen->tme_gtk_screen_mouse_statusbar);
 
   /* push an initial message onto the statusbar: */
   screen->tme_gtk_screen_mouse_statusbar_cid
@@ -321,18 +297,18 @@ _tme_gtk_mouse_attach(struct tme_gtk_screen *screen)
   gtk_statusbar_push(GTK_STATUSBAR(screen->tme_gtk_screen_mouse_statusbar),
 		     screen->tme_gtk_screen_mouse_statusbar_cid,
 		     _("The Machine Emulator"));
-
+  
   /* although the event mask doesn't include these events yet,
      set a signal handler for the mouse events: */
-  g_signal_connect(screen->tme_gtk_screen_gtkframe,
+  g_signal_connect(screen->tme_gtk_screen_draw,
 		   "motion_notify_event",
 		   G_CALLBACK(_tme_gtk_mouse_mouse_event), 
 		   screen->screen.tme_screen_display);
-  g_signal_connect(screen->tme_gtk_screen_gtkframe,
+  g_signal_connect(screen->tme_gtk_screen_draw,
 		   "button_press_event",
 		   G_CALLBACK(_tme_gtk_mouse_mouse_event), 
 		   screen->screen.tme_screen_display);
-  g_signal_connect(screen->tme_gtk_screen_gtkframe,
+  g_signal_connect(screen->tme_gtk_screen_draw,
 		   "button_release_event",
 		   G_CALLBACK(_tme_gtk_mouse_mouse_event), 
 		   screen->screen.tme_screen_display);