Commit: 9b2874cb656f72b34151c30c067dc3b5cf87bd9f - tme (git)

Commit MetaInfo

• Revision: 9b2874cb656f72b34151c30c067dc3b5cf87bd9f (tree)
• Time: 2023-04-02 21:00:45
• Author: phabrics <phabrics@phab...>
• Commiter: phabrics

Log Message

Removal of deprecated status bar in favor of a switch/entry combo for mouse toggling.

Change Summary

• 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.h
+++ b/host/display/gtk/gtk-display.h
@@ -84,8 +84,12 @@ typedef struct tme_gtk_screen {
   GtkWidget *tme_gtk_screen_draw;
   cairo_surface_t *tme_gtk_screen_surface;
 
-  /* the mouse on label: */
+  /* the mouse label: */
   GtkWidget *tme_gtk_screen_mouse_label;
+  /* the mouse toggle button: */
+  GtkWidget *tme_gtk_screen_mouse_button;
+  /* the name of the mouse toggle key: */
+  GtkWidget *tme_gtk_screen_mouse_key;
 
   /* if GDK_VoidSymbol, mouse mode is off.  otherwise,
      mouse mode is on, and this is the keyval that will
@@ -93,10 +97,6 @@ typedef struct tme_gtk_screen {
   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;
   GtkEventController *key, *mouse, *motion, *event;
   GtkGesture *press;

--- a/host/display/gtk/gtk-keyboard.c
+++ b/host/display/gtk/gtk-keyboard.c
@@ -56,16 +56,7 @@ _tme_gtk_keyboard_key_down(
      != keyval)
     return _tme_keyboard_key_event(TRUE, keyval, screen->screen.tme_screen_display);
 
-  /* pop our message off of the statusbar: */
-  gtk_statusbar_pop(GTK_STATUSBAR(screen->tme_gtk_screen_mouse_statusbar),
-		    screen->tme_gtk_screen_mouse_statusbar_cid);
-    
-  /* restore the text on the mouse label: */
-  gtk_frame_set_label(GTK_FRAME(screen->tme_gtk_screen_mouse_label),
-		      _("Mouse is off"));
-    
-  /* the mouse is now off: */
-  screen->tme_gtk_screen_mouse_keyval = GDK_KEY_VoidSymbol;
+  gtk_switch_set_active(GTK_SWITCH(screen->tme_gtk_screen_mouse_button), FALSE);
 
   return (TRUE);
   
@@ -98,30 +89,11 @@ _tme_gtk_mouse_key_down(
   /* recover our data structure: */
   display = screen->screen.tme_screen_display;
 
-  if(screen->tme_gtk_screen_mouse_keyval
-     != GDK_KEY_VoidSymbol) return (FALSE);
-
   /* lock the mutex: */
   tme_mutex_lock(&display->display.tme_display_mutex);
 
-  /* this keyval must not be GDK_KEY_VoidSymbol: */
-  assert (keyval
-	  != GDK_KEY_VoidSymbol);
+  gtk_entry_set_text(GTK_ENTRY(screen->tme_gtk_screen_mouse_key), gdk_keyval_name(keyval));
   
-  /* set the text on the mouse label: */
-  gtk_frame_set_label(GTK_FRAME(screen->tme_gtk_screen_mouse_label),
-		      _("Mouse is on"));
-  
-  /* push the mouse status onto the statusbar: */
-  status = NULL;
-  tme_output_append(&status,
-		    _("Press the %s key to turn the mouse off"),
-		    gdk_keyval_name(keyval));
-  gtk_statusbar_push(GTK_STATUSBAR(screen->tme_gtk_screen_mouse_statusbar),
-		     screen->tme_gtk_screen_mouse_statusbar_cid,
-		     status);
-  tme_free(status);
-
   gdk_device_get_position(gdk_seat_get_pointer(display->tme_gdk_display_seat),
 			  NULL,
 			  &display->display.tme_screen_mouse_warp_x,
@@ -131,6 +103,8 @@ _tme_gtk_mouse_key_down(
   screen->tme_gtk_screen_mouse_keyval
     = keyval;
 
+  gtk_widget_grab_focus(screen->tme_gtk_screen_draw);
+
   /* unlock the mutex: */
   tme_mutex_unlock(&display->display.tme_display_mutex);
 
@@ -146,15 +120,13 @@ _tme_gtk_keyboard_attach(struct tme_gtk_screen *screen)
 #if GTK_MAJOR_VERSION == 4
   key=gtk_event_controller_key_new();
   gtk_widget_add_controller(screen->tme_gtk_screen_draw, key);
-  gtk_widget_set_focussable(screen->tme_gtk_screen_draw, TRUE);
+  gtk_widget_set_focusable(screen->tme_gtk_screen_draw, TRUE);
   mouse=gtk_event_controller_key_new();
-  gtk_widget_add_controller(screen->tme_gtk_screen_mouse_label, mouse);
-  gtk_widget_set_focussable(screen->tme_gtk_screen_mouse_label, TRUE);
+  gtk_widget_add_controller(screen->tme_gtk_screen_mouse_key, mouse);
 #elif GTK_MAJOR_VERSION == 3
   key=screen->key=gtk_event_controller_key_new(screen->tme_gtk_screen_draw);
   gtk_widget_set_can_focus(screen->tme_gtk_screen_draw, TRUE);
-  mouse=screen->mouse=gtk_event_controller_key_new(screen->tme_gtk_screen_mouse_label);
-  gtk_widget_set_can_focus(screen->tme_gtk_screen_mouse_label, TRUE);
+  mouse=screen->mouse=gtk_event_controller_key_new(screen->tme_gtk_screen_mouse_key);
 #endif
   
   g_signal_connect_after(key,
@@ -167,10 +139,9 @@ _tme_gtk_keyboard_attach(struct tme_gtk_screen *screen)
 			 G_CALLBACK(_tme_gtk_keyboard_key_up), 
 			 screen); 
 
-  g_signal_connect_after(mouse,
-			 "key-pressed",
-			 G_CALLBACK(_tme_gtk_mouse_key_down), 
-			 screen);
+  g_signal_connect(mouse,
+		   "key-pressed",
+		   G_CALLBACK(_tme_gtk_mouse_key_down), 
+		   screen);
 
 }
-

--- a/host/display/gtk/gtk-mouse.c
+++ b/host/display/gtk/gtk-mouse.c
@@ -65,8 +65,7 @@ _tme_gtk_mouse_motion_event(GtkEventControllerMotion* self,
 			    struct tme_gtk_screen *screen)
 
 {
-  if(screen->tme_gtk_screen_mouse_keyval
-     != GDK_KEY_VoidSymbol)
+  if(gtk_switch_get_state(GTK_SWITCH(screen->tme_gtk_screen_mouse_button)))
     _tme_mouse_event(0, x, y, screen->screen.tme_screen_display);
 }
 
@@ -78,8 +77,7 @@ _tme_gtk_mouse_button_down(GtkGesture* self,
 			   gdouble y,
 			   struct tme_gtk_screen *screen)
 {
-  if(screen->tme_gtk_screen_mouse_keyval
-     != GDK_KEY_VoidSymbol)
+  if(gtk_switch_get_state(GTK_SWITCH(screen->tme_gtk_screen_mouse_button)))
     _tme_mouse_event(gtk_gesture_single_get_current_button(self),
 		     x, y, screen->screen.tme_screen_display);
 }
@@ -92,8 +90,7 @@ _tme_gtk_mouse_button_up(GtkGesture* self,
 			 gdouble y,
 			 struct tme_gtk_screen *screen)
 {
-  if(screen->tme_gtk_screen_mouse_keyval
-     != GDK_KEY_VoidSymbol)
+  if(gtk_switch_get_state(GTK_SWITCH(screen->tme_gtk_screen_mouse_button)))
     _tme_mouse_event(-gtk_gesture_single_get_current_button(self),
 		     x, y, screen->screen.tme_screen_display);
 }
@@ -105,57 +102,35 @@ _tme_gtk_mouse_attach(struct tme_gtk_screen *screen)
   GtkEventController *motion, *event;
   GtkGesture *press;
 
-  /* create the event box for the mouse on label: */
-  /* create the mouse on label: */
-  screen->tme_gtk_screen_mouse_label
-    = gtk_frame_new(_("Mouse is off"));
+  /* create the mouse label, button, and key: */
+  screen->tme_gtk_screen_mouse_label = gtk_label_new(_("Mouse Mode"));
+  screen->tme_gtk_screen_mouse_button = gtk_switch_new();
+  //    = gtk_toggle_button_new_with_label(_("Mouse Mode"));
+  screen->tme_gtk_screen_mouse_key = gtk_entry_new();
   
-  /* pack the event box into the horizontal packing box: */
   gtk_header_bar_pack_start(GTK_HEADER_BAR(screen->tme_gtk_screen_header),
 			    screen->tme_gtk_screen_mouse_label);
+  gtk_header_bar_pack_start(GTK_HEADER_BAR(screen->tme_gtk_screen_header),
+			    screen->tme_gtk_screen_mouse_button);
+  gtk_header_bar_pack_start(GTK_HEADER_BAR(screen->tme_gtk_screen_header),
+			    screen->tme_gtk_screen_mouse_key);
 
 #if GTK_MAJOR_VERSION == 4
   motion=gtk_event_controller_motion_new();
   gtk_widget_add_controller(screen->tme_gtk_screen_draw, motion);
-  event=gtk_event_controller_motion_new();
-  gtk_widget_add_controller(screen->tme_gtk_screen_mouse_label, event);
   press = gtk_gesture_click_new();
   gtk_widget_add_controller(screen->tme_gtk_screen_draw, GTK_EVENT_CONTROLLER (press));
 #elif GTK_MAJOR_VERSION == 3
   motion=screen->motion=gtk_event_controller_motion_new(screen->tme_gtk_screen_draw);
-  event=screen->event=gtk_event_controller_motion_new(screen->tme_gtk_screen_mouse_label);
   press=screen->press=gtk_gesture_multi_press_new(screen->tme_gtk_screen_draw);
 #endif
   
   gtk_gesture_single_set_button(GTK_GESTURE_SINGLE (press), 0);
-  /* set the tip on the event box, which will eventually contain the mouse on label: */
-  gtk_widget_set_tooltip_text(screen->tme_gtk_screen_mouse_label,
+  /* set the tip on the entry box: */
+  gtk_widget_set_tooltip_text(screen->tme_gtk_screen_mouse_key,
 			      "Press a key here to turn the mouse on.  The same key " \
 			      "will turn the mouse off.");
 
-  /* set a signal handler for the event box events: */
-  /*  g_signal_connect(ebox,
-		   "event",
-		   G_CALLBACK(_tme_gtk_mouse_ebox_event),
-		   screen); */
-
-  /* create the mouse statusbar: */
-  screen->tme_gtk_screen_mouse_statusbar
-    = gtk_statusbar_new();
-
-  /* pack the mouse statusbar into the horizontal packing box: */
-  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
-    = gtk_statusbar_get_context_id(GTK_STATUSBAR(screen->tme_gtk_screen_mouse_statusbar),
-				   "mouse context");
-  gtk_statusbar_push(GTK_STATUSBAR(screen->tme_gtk_screen_mouse_statusbar),
-		     screen->tme_gtk_screen_mouse_statusbar_cid,
-		     _("The Machine Emulator"));
-  
-  /* on entering window, grab keyboard focus: */
   g_signal_connect_swapped(motion,
 			   "enter",
 			   G_CALLBACK(gtk_widget_grab_focus),
@@ -174,12 +149,6 @@ _tme_gtk_mouse_attach(struct tme_gtk_screen *screen)
   g_signal_connect(press, "pressed", G_CALLBACK(_tme_gtk_mouse_button_down),
 		   screen); 
   
-  /* on entering window, grab keyboard focus: */
-  g_signal_connect_swapped(event,
-			   "enter",
-			   G_CALLBACK(gtk_widget_grab_focus),
-			   screen->tme_gtk_screen_mouse_label);
-
   /* mouse mode is off: */
   screen->tme_gtk_screen_mouse_keyval = GDK_KEY_VoidSymbol;
 }