1.1 --- a/src/drivers/video_gtk.c	Wed Oct 10 11:02:04 2007 +0000
     1.2 +++ b/src/drivers/video_gtk.c	Thu Oct 11 08:20:38 2007 +0000
     1.3 @@ -1,5 +1,5 @@
     1.4  /**
     1.5 - * $Id: video_gtk.c,v 1.13 2007-10-10 11:02:04 nkeynes Exp $
     1.6 + * $Id: video_gtk.c,v 1.14 2007-10-11 08:20:38 nkeynes Exp $
     1.7   *
     1.8   * The PC side of the video support (responsible for actually displaying / 
     1.9   * rendering frames)
    1.10 @@ -25,11 +25,9 @@
    1.11  #include "drivers/video_x11.h"
    1.12  #include "gui/gtkui.h"
    1.13  
    1.14 -GdkImage *video_img = NULL;
    1.15 -GtkWidget *video_win = NULL;
    1.16 -GtkWidget *video_area = NULL;
    1.17 -uint32_t video_width = 640;
    1.18 -uint32_t video_height = 480;
    1.19 +static GtkWidget *video_win = NULL;
    1.20 +int video_width = 640;
    1.21 +int video_height = 480;
    1.22  
    1.23  gboolean video_gtk_init();
    1.24  void video_gtk_shutdown();
    1.25 @@ -69,6 +67,12 @@
    1.26      /* redisplay last frame */
    1.27  }
    1.28  
    1.29 +gboolean video_gtk_resize_callback(GtkWidget *widget, GdkEventConfigure *event, gpointer data )
    1.30 +{
    1.31 +    video_width = event->width;
    1.32 +    video_height = event->height;
    1.33 +}
    1.34 +
    1.35  gboolean video_gtk_init()
    1.36  {
    1.37      /*
    1.38 @@ -86,22 +90,17 @@
    1.39  		      G_CALLBACK(video_gtk_keyup_callback), NULL );
    1.40      g_signal_connect( video_win, "expose_event",
    1.41  		      G_CALLBACK(video_gtk_expose_callback), NULL );
    1.42 +    g_signal_connect( video_win, "configure_event",
    1.43 +		      G_CALLBACK(video_gtk_resize_callback), NULL );
    1.44      gtk_widget_add_events( video_win, 
    1.45  			   GDK_KEY_PRESS_MASK | GDK_KEY_RELEASE_MASK |
    1.46  			   GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK );
    1.47 -    video_area = gtk_image_new();
    1.48 -    gtk_widget_show( GTK_WIDGET(video_area) );
    1.49 -    gtk_container_add( GTK_CONTAINER(video_win), GTK_WIDGET(video_area) );
    1.50 -    gtk_widget_show( GTK_WIDGET(video_win) );
    1.51 -    video_img = gdk_image_new( GDK_IMAGE_FASTEST, gdk_visual_get_system(),
    1.52 -                               video_width, video_height );
    1.53 -    gtk_image_set_from_image( GTK_IMAGE(video_area), video_img, NULL );
    1.54 -
    1.55 -
    1.56 +    video_width = video_win->allocation.width;
    1.57 +    video_height = video_win->allocation.height;
    1.58      return video_glx_init( gdk_x11_display_get_xdisplay( gtk_widget_get_display(GTK_WIDGET(video_win))),
    1.59 -		    gdk_x11_screen_get_xscreen( gtk_widget_get_screen(GTK_WIDGET(video_win))),
    1.60 -		    GDK_WINDOW_XWINDOW( GTK_WIDGET(video_win)->window ),
    1.61 -		    video_width, video_height, &display_gtk_driver );
    1.62 +			   gdk_x11_screen_get_xscreen( gtk_widget_get_screen(GTK_WIDGET(video_win))),
    1.63 +			   GDK_WINDOW_XWINDOW( GTK_WIDGET(video_win)->window ),
    1.64 +			   video_width, video_height, &display_gtk_driver );
    1.65  }
    1.66  
    1.67  void video_gtk_shutdown()

     2.1 --- a/src/drivers/video_x11.c	Wed Oct 10 11:02:04 2007 +0000
     2.2 +++ b/src/drivers/video_x11.c	Thu Oct 11 08:20:38 2007 +0000
     2.3 @@ -1,5 +1,5 @@
     2.4  /**
     2.5 - * $Id: video_x11.c,v 1.15 2007-10-07 05:42:25 nkeynes Exp $
     2.6 + * $Id: video_x11.c,v 1.16 2007-10-11 08:20:38 nkeynes Exp $
     2.7   *
     2.8   * Shared functions for all X11-based display drivers.
     2.9   *
    2.10 @@ -119,6 +119,7 @@
    2.11       * means we have to jump through the following hoops to create a 
    2.12       * child window with the appropriate settings.
    2.13       */
    2.14 +#if 0
    2.15      win_attrs.event_mask = 0;
    2.16      win_attrs.colormap = XCreateColormap( video_x11_display, 
    2.17  					  RootWindowOfScreen(video_x11_screen),
    2.18 @@ -137,9 +138,9 @@
    2.19  	return FALSE;
    2.20      }
    2.21      XMapRaised( video_x11_display, glx_window );
    2.22 -
    2.23 +#endif
    2.24      /* And finally set the window to be the active drawing area */
    2.25 -    if( glXMakeCurrent( video_x11_display, glx_window, glx_context ) == False ) {
    2.26 +    if( glXMakeCurrent( video_x11_display, video_x11_window, glx_context ) == False ) {
    2.27  	/* Ok you have _GOT_ to be kidding me */
    2.28  	ERROR( "Unable to prepare GLX window for drawing" );
    2.29  	XDestroyWindow( video_x11_display, glx_window );