* Use BeginFullScreen() to hide the mouse cursor ;

* Cheat with the screen saver (closes #46).

diff --git a/modules/gui/macosx/intf.m b/modules/gui/macosx/intf.m
index 5b2a35529a3672d4f9dc5977a4dedf6a41e06e9f..30bdbf5d4f43a053723fb915c60d663a15af5740 100644 (file)
--- a/modules/gui/macosx/intf.m
+++ b/modules/gui/macosx/intf.m
@@ -2,7 +2,7 @@
  * intf.m: MacOS X interface plugin
  *****************************************************************************
  * Copyright (C) 2002 VideoLAN
- * $Id: intf.m,v 1.10 2002/12/14 19:34:06 gbazin Exp $
+ * $Id: intf.m,v 1.11 2002/12/24 23:00:51 massiot Exp $
  *
  * Authors: Jon Lech Johansen <jon-vl@nanocrew.net>
  *          Christophe Massiot <massiot@via.ecp.fr>
@@ -196,7 +196,7 @@ static void Run( intf_thread_t *p_intf )
 
     [o_mu_file setTitle: _NS("File")];
     [o_mi_open_file setTitle: _NS("Open File...")];
-    [o_mi_open_generic setTitle: _NS("Open Generic...")];
+    [o_mi_open_generic setTitle: _NS("Open...")];
     [o_mi_open_disc setTitle: _NS("Open Disc...")];
     [o_mi_open_net setTitle: _NS("Open Network...")];
     [o_mi_open_recent setTitle: _NS("Open Recent")];
@@ -310,6 +310,9 @@ static void Run( intf_thread_t *p_intf )
             vout_thread_t * p_vout = vlc_object_find( p_intf, VLC_OBJECT_VOUT,
                                                       FIND_ANYWHERE );
 
+            /* Disable screen saver. */
+            UpdateSystemActivity( UsrActivity );
+
             vlc_mutex_lock( &p_input->stream.stream_lock );
 
             if( !p_input->b_die )

diff --git a/modules/gui/macosx/vout.h b/modules/gui/macosx/vout.h
index cc69b6fdb35c5dd8ad98ac415a9b65fcf370ed5c..9f6f3d6d5a73eb5e52e2a73d4c97d73a23e1090d 100644 (file)
--- a/modules/gui/macosx/vout.h
+++ b/modules/gui/macosx/vout.h
@@ -2,7 +2,7 @@
  * vout.h: MacOS X interface plugin
  *****************************************************************************
  * Copyright (C) 2001, 2002 VideoLAN
- * $Id: vout.h,v 1.2 2002/12/08 05:30:47 jlj Exp $
+ * $Id: vout.h,v 1.3 2002/12/24 23:00:51 massiot Exp $
  *
  * Authors: Colin Delacroix <colin@zoy.org>
  *          Florian G. Pflug <fgp@phlo.org>
@@ -82,5 +82,6 @@ struct vout_sys_t
     MatrixRecordPtr p_matrix;
     DecompressorComponent img_dc;
     ImageDescriptionHandle h_img_descr;
+    Ptr p_fullscreen_state;
 #endif
 };

diff --git a/modules/gui/macosx/vout.m b/modules/gui/macosx/vout.m
index 27913077690dbf45388dfd615d88e02d328128c1..bfa24252ebf276cd814d3507714c10c007ccb870 100644 (file)
--- a/modules/gui/macosx/vout.m
+++ b/modules/gui/macosx/vout.m
@@ -2,7 +2,7 @@
  * vout.m: MacOS X video output plugin
  *****************************************************************************
  * Copyright (C) 2001, 2002 VideoLAN
- * $Id: vout.m,v 1.7 2002/12/08 05:30:47 jlj Exp $
+ * $Id: vout.m,v 1.8 2002/12/24 23:00:51 massiot Exp $
  *
  * Authors: Colin Delacroix <colin@zoy.org>
  *          Florian G. Pflug <fgp@phlo.org>
@@ -130,6 +130,7 @@ int E_(OpenVideo) ( vlc_object_t *p_this )
     p_vout->p_sys->h_img_descr = 
         (ImageDescriptionHandle)NewHandleClear( sizeof(ImageDescription) );
     p_vout->p_sys->p_matrix = (MatrixRecordPtr)malloc( sizeof(MatrixRecord) );
+    p_vout->p_sys->p_fullscreen_state;
 
     p_vout->p_sys->b_mouse_pointer_visible = 1;
 
@@ -533,11 +534,15 @@ static int CoToggleFullscreen( vout_thread_t *p_vout )
 
     if( p_vout->b_fullscreen )
     {
-        HideMenuBar();
+        if ( p_vout->p_sys->p_fullscreen_state == NULL )
+            BeginFullScreen( &p_vout->p_sys->p_fullscreen_state, NULL, 0, 0,
+                             NULL, NULL, fullScreenHideCursor | fullScreenAllowEvents );
     }
     else
     {
-        ShowMenuBar();
+        if ( p_vout->p_sys->p_fullscreen_state != NULL )
+            EndFullScreen ( p_vout->p_sys->p_fullscreen_state, NULL );
+        p_vout->p_sys->p_fullscreen_state = NULL;
     }
 
     if( CoCreateWindow( p_vout ) )