Commit: b5d2faa81605973dc6399f2f6305c72bac356c73 - phabrics (git)

Commit MetaInfo

• Révision: b5d2faa81605973dc6399f2f6305c72bac356c73 (tree)
• l'heure: 2020-09-11 12:02:59
• Auteur: Ruben Agin <phabrics@phab...>
• Commiter: Ruben Agin

Message de Log

New shared display code working with GTK.

Change Summary

• modified: .gitignore
• modified: contrib/tme-0.8/configure.ac
• modified: contrib/tme-0.8/host/display/display.c
• modified: contrib/tme-0.8/host/display/display.h
• modified: contrib/tme-0.8/host/gtk/gtk-screen.c

Modification

--- a/.gitignore
+++ b/.gitignore
@@ -67,3 +67,6 @@ build*
 tmememory.h
 *.tex
 *.info
+mdate-sh
+stamp-vti
+version.texi

--- a/contrib/tme-0.8/configure.ac
+++ b/contrib/tme-0.8/configure.ac
@@ -1030,7 +1030,8 @@ if test "x$have_gtk" = xyes; then
    if test "x${enable_gtk}" = xyes; then
       TME_HOSTS="gtk display ${TME_HOSTS}"
    fi
-   TME_FB_XLAT_DST="d32b32s0p32olml_r0xffff0000_g0xff00ff00_b0xff0000ff d24b32s0p32olml_r0xff0000_g0xff00_b0xff d16b16s0p32olml_r0xf800_g0x07e0_b0x001f d8b8s0p32olml_r0xff_g0xff_b0xff d1b1s0p32olml_r0x1_g0x1_b0x1"
+   TME_FB_XLAT_DST="d32b32s0p32olml_r0xffff0000_g0xff00ff00_b0xff0000ff d24b32s0p32olml_r0xff0000_g0xff00_b0xff"
+#   TME_FB_XLAT_DST="d32b32s0p32olml_r0xffff0000_g0xff00ff00_b0xff0000ff d24b32s0p32olml_r0xff0000_g0xff00_b0xff d16b16s0p32olml_r0xf800_g0x07e0_b0x001f d8b8s0p32olml_r0xff_g0xff_b0xff d1b1s0p32olml_r0x1_g0x1_b0x1"
 fi
 
 # if --with-tme-host-displays is given, characterize those given displays:

--- a/contrib/tme-0.8/host/display/display.c
+++ b/contrib/tme-0.8/host/display/display.c
@@ -38,13 +38,14 @@
 
 static _tme_thret
 _tme_screen_th_update(void *disp) {
-  struct tme_fb_connection *conn_fb;
   struct tme_screen *screen;
-  struct tme_display *display = (rfbScreenInfoPtr)disp;
+  struct tme_display *display = (struct tme_display *)disp;
   int rc;
   
   tme_thread_enter(NULL);
-
+#ifdef TME_THREADS_SJLJ
+  tme_thread_create(&display->tme_display_thread, tme_sjlj_threads_main, NULL);
+#endif
   //_tme_thread_suspended();
   
   for(;;) {
@@ -60,18 +61,15 @@ _tme_screen_th_update(void *disp) {
     /* loop over all screens: */
     for (screen = display->tme_display_screens;
 	 screen != NULL;
-	 screen = screen->tme_screen_next)
+	 screen = screen->tme_screen_next) {
       switch(screen->tme_screen_update) {
       case TME_SCREEN_UPDATE_REDRAW:
 	if(display->tme_screen_redraw)
 	  display->tme_screen_redraw(screen);
 	break;
       case TME_SCREEN_UPDATE_RESIZE:
-	if(display->tme_screen_resize &&
-	   (conn_fb = screen->tme_screen_fb))
-	  display->tme_screen_resize(screen,
-				     conn_fb->tme_fb_connection_width,
-				     conn_fb->tme_fb_connection_height);
+	if(display->tme_screen_resize)
+	  display->tme_screen_resize(screen);
 	break;
       case TME_SCREEN_UPDATE_NONE:
 	break;
@@ -80,6 +78,8 @@ _tme_screen_th_update(void *disp) {
 	if(display->tme_screen_update)
 	  display->tme_screen_update(screen);
       }
+      screen->tme_screen_update = TME_SCREEN_UPDATE_NONE;  
+    }
     tme_mutex_unlock(&display->tme_display_mutex);
   }
   
@@ -104,7 +104,7 @@ _tme_display_update(struct tme_display *display)
     /* skip this screen if it's unconnected: */
     if (screen->tme_screen_update != TME_SCREEN_UPDATE_NONE ||
 	!(conn_fb = screen->tme_screen_fb) ||
-	!conn_fb->tme_fb_connection_buffer ||
+	!conn_fb->tme_fb_connection_buffsz ||
 	!(conn_fb_other = (struct tme_fb_connection *)conn_fb->tme_fb_connection.tme_connection_other)) return rc;
   
     /* unlock the mutex: */
@@ -500,10 +500,11 @@ _tme_screen_configure(struct tme_screen *screen)
   /* set the size & translation function */
   screen->tme_screen_fb_xlat = NULL;  
   if(conn_fb->tme_fb_connection_width != width ||
-     conn_fb->tme_fb_connection_height != height)
+     conn_fb->tme_fb_connection_height != height) {
     screen->tme_screen_update = TME_SCREEN_UPDATE_RESIZE;
     conn_fb->tme_fb_connection_width = width;
     conn_fb->tme_fb_connection_height = height;
+    conn_fb->tme_fb_connection_buffsz = 0;
   }
 }
 
@@ -720,7 +721,7 @@ int tme_display_init(struct tme_element *element,
 
   /* setup the thread loop function: */
 #ifdef TME_THREADS_SJLJ
-  tme_thread_create(&display->tme_display_thread, tme_sjlj_threads_main, NULL);
+  //  tme_thread_create(&display->tme_display_thread, tme_sjlj_threads_main, NULL);
   tme_sjlj_thread_create(&display->tme_display_sjlj_thread, _tme_display_th_update, display);
 #else
   tme_thread_create(&display->tme_display_sjlj_thread, _tme_display_th_update, display);

--- a/contrib/tme-0.8/host/display/display.h
+++ b/contrib/tme-0.8/host/display/display.h
@@ -53,6 +53,9 @@
 #define  TME_DISPLAY_CALLOUT_KEYBOARD_CTRL	TME_BIT(1)
 #define  TME_DISPLAY_CALLOUT_MOUSE_CTRL	TME_BIT(2)
 #define BLANK_SIDE (16 * 8)
+#define TME_SCREEN_UPDATE_NONE                  (0)
+#define TME_SCREEN_UPDATE_REDRAW                (1)
+#define TME_SCREEN_UPDATE_RESIZE                (2)
 
 /* types: */
 
@@ -159,10 +162,9 @@ struct tme_display {
   /* implementation-specific callback functions: */
   struct tme_screen *(*tme_screen_add) _TME_P((struct tme_display *, struct tme_connection *));
   int (*tme_display_update) _TME_P((struct tme_display *));
-  int (*tme_screen_set_size) _TME_P((struct tme_screen *,
-				     int,
-				     int));
-  
+  int (*tme_screen_resize) _TME_P((struct tme_screen *));
+  int (*tme_screen_redraw) _TME_P((struct tme_screen *));
+  int (*tme_screen_update) _TME_P((struct tme_screen *));
 };
 
 /* prototypes: */

--- a/contrib/tme-0.8/host/gtk/gtk-screen.c
+++ b/contrib/tme-0.8/host/gtk/gtk-screen.c
@@ -51,7 +51,8 @@ _tme_gtk_screen_redraw(struct tme_gtk_screen *screen)
 
 static int
 _tme_gtk_display_update(struct tme_display *display) {
-  gtk_main_iteration_do(FALSE);
+  while (gtk_events_pending ())
+    gtk_main_iteration ();
   return TME_OK;
 }
 
@@ -194,11 +195,13 @@ static struct tme_display_menu_item format_items[] =
   };
 
 /* Screen-specific size request */
-static void _tme_gtk_screen_resize(struct tme_gtk_screen *screen,
-				   int width,
-				   int height) {
+static void _tme_gtk_screen_resize(struct 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, width, height);
+  gtk_widget_set_size_request(screen->tme_gtk_screen_gtkframe,
+			      conn_fb->tme_fb_connection_width,
+			      conn_fb->tme_fb_connection_height);
 }
 
 /* Create a similar image surface to the screen's target surface (i.e., backing store) */
@@ -302,13 +305,13 @@ _tme_gtk_screen_configure(GtkWidget         *widget,
   conn_fb->tme_fb_connection_order = TME_ENDIAN_NATIVE;
   conn_fb->tme_fb_connection_buffer = cairo_image_surface_get_data(screen->tme_gtk_screen_surface);
   conn_fb->tme_fb_connection_buffsz = cairo_image_surface_get_stride(screen->tme_gtk_screen_surface) * conn_fb->tme_fb_connection_height;
-  conn_fb->tme_fb_connection_bits_per_pixel = 16;
-  conn_fb->tme_fb_connection_depth = 16;
+  conn_fb->tme_fb_connection_bits_per_pixel = 32;
+  conn_fb->tme_fb_connection_depth = 24;
   conn_fb->tme_fb_connection_class = TME_FB_XLAT_CLASS_COLOR;
-  conn_fb->tme_fb_connection_mask_g = 0x0007e0;
-  conn_fb->tme_fb_connection_mask_b = 0x00001f;
-  conn_fb->tme_fb_connection_mask_r = 0x00f800;
-  
+  conn_fb->tme_fb_connection_mask_g = 0x00ff00;
+  conn_fb->tme_fb_connection_mask_b = 0x0000ff;
+  conn_fb->tme_fb_connection_mask_r = 0xff0000;
+
   /* unlock our mutex: */
   tme_mutex_unlock(&display->tme_display_mutex);
 
@@ -338,7 +341,6 @@ _tme_gtk_screen_draw(GtkWidget *widget,
 
   cairo_set_source_surface(cr, screen->tme_gtk_screen_surface, 0, 0);
   cairo_paint(cr);
-  screen->screen.tme_screen_update = TME_SCREEN_UPDATE_NONE;    
 
   /* unlock our mutex: */
   tme_mutex_unlock(&display->tme_display_mutex);
@@ -440,7 +442,7 @@ _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_RGB16_565);
+  _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), 
@@ -461,6 +463,8 @@ _tme_gtk_screen_new(struct tme_gdk_display *display,
 
   snprintf(title, sizeof(title), "%s (%s)", PACKAGE_STRING, conn->tme_connection_other->tme_connection_element->tme_element_args[0]);
   gtk_window_set_title(GTK_WINDOW(screen->tme_gtk_screen_window), title);
+
+  _tme_gtk_screen_resize(screen);
   
   /* unlock our mutex: */
   tme_mutex_unlock(&display->display.tme_display_mutex);