[Mplayer-cvslog] CVS: main/libvo x11_common.c,1.23,1.24

[Zoltan Ponekker]

Update of /cvsroot/mplayer/main/libvo
In directory mplayerhq:/var/tmp.root/cvs-serv19751/libvo

Modified Files:
	x11_common.c 
Log Message:
icewm basz bug fix

Index: x11_common.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/x11_common.c,v
retrieving revision 1.23
retrieving revision 1.24
diff -C2 -r1.23 -r1.24
*** x11_common.c	17 Jun 2001 01:22:09 -0000	1.23
--- x11_common.c	27 Jun 2001 08:50:03 -0000	1.24
***************
*** 137,141 ****
  // ----- Motif header: -------
  
! #define MWM_HINTS_DECORATIONS   2
  
  typedef struct
--- 137,167 ----
  // ----- Motif header: -------
  
! #define MWM_HINTS_FUNCTIONS     (1L << 0)
! #define MWM_HINTS_DECORATIONS   (1L << 1)
! #define MWM_HINTS_INPUT_MODE    (1L << 2)
! #define MWM_HINTS_STATUS        (1L << 3)
! 
! #define MWM_FUNC_ALL            (1L << 0)
! #define MWM_FUNC_RESIZE         (1L << 1)
! #define MWM_FUNC_MOVE           (1L << 2)
! #define MWM_FUNC_MINIMIZE       (1L << 3)
! #define MWM_FUNC_MAXIMIZE       (1L << 4)
! #define MWM_FUNC_CLOSE          (1L << 5)
! 
! #define MWM_DECOR_ALL           (1L << 0)
! #define MWM_DECOR_BORDER        (1L << 1)
! #define MWM_DECOR_RESIZEH       (1L << 2)
! #define MWM_DECOR_TITLE         (1L << 3)
! #define MWM_DECOR_MENU          (1L << 4)
! #define MWM_DECOR_MINIMIZE      (1L << 5)
! #define MWM_DECOR_MAXIMIZE      (1L << 6)
! 
! #define MWM_INPUT_MODELESS 0
! #define MWM_INPUT_PRIMARY_APPLICATION_MODAL 1
! #define MWM_INPUT_SYSTEM_MODAL 2
! #define MWM_INPUT_FULL_APPLICATION_MODAL 3
! #define MWM_INPUT_APPLICATION_MODAL MWM_INPUT_PRIMARY_APPLICATION_MODAL
! 
! #define MWM_TEAROFF_WINDOW      (1L<<0)
  
  typedef struct
***************
*** 145,148 ****
--- 171,175 ----
    long decorations;
    long input_mode;
+   long state;
  } MotifWmHints;
  
***************
*** 158,176 ****
  void vo_x11_decoration( Display * vo_Display,Window w,int d )
  {
- 
- #if 1
-     XSetWindowAttributes attr;
-     attr.override_redirect = True;
-     XChangeWindowAttributes(vo_Display, w, CWOverrideRedirect, &attr);
- //    XMapWindow(vo_Display], w);
- #endif
- 
   vo_MotifHints=XInternAtom( vo_Display,"_MOTIF_WM_HINTS",0 );
   if ( vo_MotifHints != None )
    {
!    vo_MotifWmHints.flags=2;
!    vo_MotifWmHints.decorations=d;
     XChangeProperty( vo_Display,w,vo_MotifHints,vo_MotifHints,32,
!                     PropModeReplace,(unsigned char *)&vo_MotifWmHints,4 );
    }
  }
--- 185,198 ----
  void vo_x11_decoration( Display * vo_Display,Window w,int d )
  {
   vo_MotifHints=XInternAtom( vo_Display,"_MOTIF_WM_HINTS",0 );
   if ( vo_MotifHints != None )
    {
!    memset( &vo_MotifWmHints,0,sizeof( MotifWmHints ) );
!    vo_MotifWmHints.flags=MWM_HINTS_FUNCTIONS | MWM_HINTS_DECORATIONS;
!    vo_MotifWmHints.functions=MWM_FUNC_MOVE | MWM_FUNC_CLOSE | MWM_FUNC_MINIMIZE | MWM_FUNC_MAXIMIZE;
!    if ( d ) d=MWM_DECOR_ALL;
!    vo_MotifWmHints.decorations=d | MWM_DECOR_MENU;
     XChangeProperty( vo_Display,w,vo_MotifHints,vo_MotifHints,32,
!                     PropModeReplace,(unsigned char *)&vo_MotifWmHints,5 );
    }
  }


_______________________________________________
Mplayer-cvslog mailing list
Mplayer-cvslog at lists.sourceforge.net
http://lists.sourceforge.net/lists/listinfo/mplayer-cvslog