[Mplayer-cvslog] CVS: main/Gui/mplayer mw.c,1.100,1.101 play.c,1.80,1.81 sw.c,1.38,1.39 widgets.c,1.41,1.42

[Zoltan Ponekker]

Update of /cvsroot/mplayer/main/Gui/mplayer
In directory mail:/var/tmp.root/cvs-serv31571/Gui/mplayer

Modified Files:
	mw.c play.c sw.c widgets.c 
Log Message:


- sync with x11_common
- half rewrited font render engine (disabled by default)



Index: mw.c
===================================================================
RCS file: /cvsroot/mplayer/main/Gui/mplayer/mw.c,v
retrieving revision 1.100
retrieving revision 1.101
diff -u -r1.100 -r1.101
--- mw.c	2 Jan 2003 15:53:21 -0000	1.100
+++ mw.c	9 Jan 2003 20:47:10 -0000	1.101
@@ -218,20 +218,20 @@
             PutImage( &item->Mask,item->x + (int)( ( item->width - item->psx ) * item->value / 100.0f ),item->y,3,item->pressed );
             break;
        case itSLabel:
-            image=fntRender( item->fontid,0,item->width,"%s",item->label );
+            image=fntRender( item,0,"%s",item->label );
             goto drawrenderedtext;
        case itDLabel:
             {
 	     char * t = Translate( item->label );
 	     int    l = fntTextWidth( item->fontid,t );
-             image=fntRender( item->fontid,(GetTimerMS() / 20)%(l?l:item->width),item->width,"%s",t );
+             image=fntRender( item,(GetTimerMS() / 20)%(l?l:item->width),"%s",t );
 	    }
 drawrenderedtext:
             if ( image )
              {
               PutImage( image,item->x,item->y,1,0 );
-              if ( image->Image ) free( image->Image );
-              free( image );
+//              if ( image->Image ) free( image->Image );
+//              free( image );
              }
             break;
       }

Index: play.c
===================================================================
RCS file: /cvsroot/mplayer/main/Gui/mplayer/play.c,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -r1.80 -r1.81
--- play.c	16 Dec 2002 22:25:15 -0000	1.80
+++ play.c	9 Jan 2003 20:47:10 -0000	1.81
@@ -238,7 +238,7 @@
  if ( ( mplDrawBuffer = (unsigned char *)calloc( 1,appMPlayer.main.Bitmap.ImageSize ) ) == NULL )
   { mp_msg( MSGT_GPLAYER,MSGL_STATUS,MSGTR_NEMDB ); return; }
 
- if ( wsWMType == wsWMUnknown ) wsVisibleWindow( &appMPlayer.mainWindow,wsHideWindow );
+ if ( vo_wm_type == vo_wm_Unknown ) wsVisibleWindow( &appMPlayer.mainWindow,wsHideWindow );
  wsResizeWindow( &appMPlayer.mainWindow,appMPlayer.main.width,appMPlayer.main.height );
  wsMoveWindow( &appMPlayer.mainWindow,True,appMPlayer.main.x,appMPlayer.main.y );
  wsResizeImage( &appMPlayer.mainWindow,appMPlayer.main.width,appMPlayer.main.height );

Index: sw.c
===================================================================
RCS file: /cvsroot/mplayer/main/Gui/mplayer/sw.c,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- sw.c	2 Nov 2002 20:10:16 -0000	1.38
+++ sw.c	9 Jan 2003 20:47:10 -0000	1.39
@@ -1,6 +1,11 @@
 
 // sub window
 
+#include <inttypes.h>
+
+#include "../../config.h"
+#include "../../libvo/x11_common.h"
+
 #include "../app.h"
 #include "../interface.h"
 #include "../../help_mp.h"
@@ -18,7 +23,7 @@
  if ( appMPlayer.subWindow.State == wsWindowClosed ) exit_player( MSGTR_Exit_quit );
  
  if ( appMPlayer.subWindow.State == wsWindowFocusIn ) SubVisible++;
- if ( appMPlayer.subWindow.State == wsWindowFocusOut && wsWMType != wsWMKDE && wsWMType != wsWMIceWM ) SubVisible--;
+ if ( appMPlayer.subWindow.State == wsWindowFocusOut && metacity_hack != 3 ) SubVisible--;
 
  if ( !appMPlayer.subWindow.Mapped ||
       appMPlayer.subWindow.Visible == wsWindowNotVisible ) return;
@@ -74,7 +79,7 @@
           if ( ( !mplSubMoved )&&( appMPlayer.subWindow.isFullScreen ) )
            {
             if( SubVisible++%2 ) wsMoveTopWindow( wsDisplay,appMPlayer.mainWindow.WindowID );
-             else if ( wsWMType != wsWMNetWM && wsWMType != wsWMKDE ) wsMoveTopWindow( wsDisplay,appMPlayer.subWindow.WindowID );
+             else wsMoveTopWindow( wsDisplay,appMPlayer.subWindow.WindowID );
 	   }
           msButton=0;
           mplSubMoved=0;

Index: widgets.c
===================================================================
RCS file: /cvsroot/mplayer/main/Gui/mplayer/widgets.c,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- widgets.c	27 Nov 2002 22:48:53 -0000	1.41
+++ widgets.c	9 Jan 2003 20:47:10 -0000	1.42
@@ -144,13 +144,15 @@
   }
  gtk_widget_show( MessageBox );
  gtkSetLayer( MessageBox );
- gtkActive( MessageBox );
  if ( type == GTK_MB_FATAL )
   while ( MessageBox ) gtk_main_iteration_do( 0 );
 }
 
 void gtkSetLayer( GtkWidget * wdg )
-{ wsSetLayer( gdk_display,GDK_WINDOW_XWINDOW( wdg->window ),appMPlayer.subWindow.isFullScreen ); }
+{ 
+ wsSetLayer( gdk_display,GDK_WINDOW_XWINDOW( wdg->window ),appMPlayer.subWindow.isFullScreen );
+ gtkActive( wdg );
+}
 
 void gtkActive( GtkWidget * wdg )
 { wsMoveTopWindow( gdk_display,GDK_WINDOW_XWINDOW( wdg->window )); }