зеркало из https://github.com/mozilla/pjs.git
Bug 78672 #ifdef DEBUG some printfs p=gautheri@noos.fr r=me sr=alecf
This commit is contained in:
neil%parkwaycc.co.uk
Родитель
d756fef3d5
Коммит
e717de460e
|
|
@ -1,208 +0,0 @@
|
|||
/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
|
||||
/* ***** BEGIN LICENSE BLOCK *****
|
||||
* Version: MPL 1.1/GPL 2.0/LGPL 2.1
|
||||
*
|
||||
* The contents of this file are subject to the Mozilla Public License Version
|
||||
* 1.1 (the "License"); you may not use this file except in compliance with
|
||||
* the License. You may obtain a copy of the License at
|
||||
* http://www.mozilla.org/MPL/
|
||||
*
|
||||
* Software distributed under the License is distributed on an "AS IS" basis,
|
||||
* WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
|
||||
* for the specific language governing rights and limitations under the
|
||||
* License.
|
||||
*
|
||||
* The Original Code is Mozilla Communicator client code.
|
||||
*
|
||||
* The Initial Developer of the Original Code is
|
||||
* Netscape Communications Corporation.
|
||||
* Portions created by the Initial Developer are Copyright (C) 1998
|
||||
* the Initial Developer. All Rights Reserved.
|
||||
*
|
||||
* Contributor(s):
|
||||
*
|
||||
* Alternatively, the contents of this file may be used under the terms of
|
||||
* either of the GNU General Public License Version 2 or later (the "GPL"),
|
||||
* or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
|
||||
* in which case the provisions of the GPL or the LGPL are applicable instead
|
||||
* of those above. If you wish to allow use of your version of this file only
|
||||
* under the terms of either the GPL or the LGPL, and not to allow others to
|
||||
* use your version of this file under the terms of the MPL, indicate your
|
||||
* decision by deleting the provisions above and replace them with the notice
|
||||
* and other provisions required by the GPL or the LGPL. If you do not delete
|
||||
* the provisions above, a recipient may use your version of this file under
|
||||
* the terms of any one of the MPL, the GPL or the LGPL.
|
||||
*
|
||||
* ***** END LICENSE BLOCK ***** */
|
||||
|
||||
#include "nsNativeAppSupport.h"
|
||||
|
||||
#define PX_IMAGE_MODULES
|
||||
#define PX_BMP_SUPPORT
|
||||
#include <photon/PxImage.h>
|
||||
|
||||
#include <Ph.h>
|
||||
#include <Pt.h>
|
||||
|
||||
class nsSplashScreenPh : public nsISplashScreen {
|
||||
public:
|
||||
nsSplashScreenPh()
|
||||
: mDialog( 0 ), mRefCnt( 0 ) {
|
||||
|
||||
/* initialize widget library and attach to Photon */
|
||||
if( PtInit( NULL ) )
|
||||
exit( EXIT_FAILURE );
|
||||
|
||||
/* increase the draw buffer */
|
||||
PgSetDrawBufferSize( 0x8000 );
|
||||
}
|
||||
~nsSplashScreenPh() {
|
||||
Hide();
|
||||
}
|
||||
|
||||
NS_IMETHOD Show();
|
||||
NS_IMETHOD Hide();
|
||||
|
||||
// nsISupports methods
|
||||
NS_IMETHOD_(nsrefcnt) AddRef() {
|
||||
mRefCnt++;
|
||||
return mRefCnt;
|
||||
}
|
||||
NS_IMETHOD_(nsrefcnt) Release() {
|
||||
--mRefCnt;
|
||||
if ( !mRefCnt ) {
|
||||
delete this;
|
||||
return 0;
|
||||
}
|
||||
return mRefCnt;
|
||||
}
|
||||
NS_IMETHOD QueryInterface( const nsIID &iid, void**p ) {
|
||||
nsresult rv = NS_OK;
|
||||
if ( p ) {
|
||||
*p = 0;
|
||||
if ( iid.Equals( NS_GET_IID( nsISplashScreen ) ) ) {
|
||||
nsISplashScreen *result = this;
|
||||
*p = result;
|
||||
NS_ADDREF( result );
|
||||
} else if ( iid.Equals( NS_GET_IID( nsISupports ) ) ) {
|
||||
nsISupports *result = NS_STATIC_CAST( nsISupports*, this );
|
||||
*p = result;
|
||||
NS_ADDREF( result );
|
||||
} else {
|
||||
rv = NS_NOINTERFACE;
|
||||
}
|
||||
} else {
|
||||
rv = NS_ERROR_NULL_POINTER;
|
||||
}
|
||||
return rv;
|
||||
}
|
||||
|
||||
PtWidget_t *mDialog;
|
||||
nsrefcnt mRefCnt;
|
||||
}; // class nsSplashScreenPh
|
||||
|
||||
|
||||
NS_IMETHODIMP
|
||||
nsSplashScreenPh::Show()
|
||||
{
|
||||
PhImage_t *img = nsnull;
|
||||
char *p = NULL;
|
||||
char *splash = NULL;
|
||||
char splash_path[256];
|
||||
int inp_grp,n=0;
|
||||
PhRid_t rid;
|
||||
PhRegion_t region;
|
||||
PhRect_t rect;
|
||||
PRInt32 aWidth, aHeight;
|
||||
PhRect_t console;
|
||||
struct stat sbuf;
|
||||
|
||||
/* Get the Screen Size and Depth, so I can center the splash dialog, there has to be a better way!*/
|
||||
p = getenv("PHIG");
|
||||
if( p ) inp_grp = atoi( p );
|
||||
else inp_grp = 1;
|
||||
|
||||
PhQueryRids( 0, 0, inp_grp, Ph_INPUTGROUP_REGION, 0, 0, 0, &rid, 1 );
|
||||
PhRegionQuery( rid, ®ion, &rect, NULL, 0 );
|
||||
inp_grp = region.input_group;
|
||||
PhWindowQueryVisible( Ph_QUERY_INPUT_GROUP | Ph_QUERY_EXACT, 0, inp_grp, &rect );
|
||||
aWidth = rect.lr.x - rect.ul.x + 1;
|
||||
aHeight = rect.lr.y - rect.ul.y + 1;
|
||||
|
||||
/* Get the current console offset */
|
||||
if (PhWindowQueryVisible( Ph_QUERY_GRAPHICS, 0, inp_grp, &console ) == 0)
|
||||
|
||||
mDialog = nsnull;
|
||||
|
||||
/* Setup proper path to the splash.bmp so it loads the splash screen at start up. */
|
||||
splash = getenv( "MOZILLA_FIVE_HOME" );
|
||||
if( splash ) {
|
||||
sprintf( splash_path, "%s/splash.bmp", splash );
|
||||
if( ( img = PxLoadImage( splash_path, NULL ) ) != NULL )
|
||||
{
|
||||
PtArg_t arg[10];
|
||||
PhPoint_t pos;
|
||||
|
||||
img->flags = img->flags | Ph_RELEASE_IMAGE_ALL;
|
||||
|
||||
pos.x = (aWidth/2) - (img->size.w/2);
|
||||
pos.y = (aHeight/2) - (img->size.h/2);
|
||||
|
||||
pos.x += console.ul.x;
|
||||
pos.y += console.ul.y;
|
||||
|
||||
PtSetArg( &arg[n++], Pt_ARG_DIM, &img->size, 0 );
|
||||
PtSetArg( &arg[n++], Pt_ARG_POS, &pos, 0 );
|
||||
PtSetArg( &arg[n++], Pt_ARG_WINDOW_RENDER_FLAGS, 0, 0xFFFFFFFF );
|
||||
PtSetArg( &arg[n++], Pt_ARG_FILL_COLOR, Pg_BLACK, 0 );
|
||||
PtSetArg( &arg[n++], Pt_ARG_WINDOW_MANAGED_FLAGS, Ph_WM_CLOSE | Ph_WM_TOFRONT | Ph_WM_TOBACK | Ph_WM_MOVE | Ph_WM_RESIZE, ~0 );
|
||||
mDialog = PtCreateWidget( PtWindow, NULL, n, arg );
|
||||
|
||||
n=0;
|
||||
pos.x = pos.y = 0;
|
||||
PtSetArg( &arg[n++], Pt_ARG_POS, &pos, 0 );
|
||||
PtSetArg( &arg[n++], Pt_ARG_LABEL_TYPE, Pt_IMAGE, 0 );
|
||||
PtSetArg( &arg[n++], Pt_ARG_LABEL_DATA, img, sizeof(PhImage_t) );
|
||||
PtSetArg( &arg[n++], Pt_ARG_MARGIN_HEIGHT, 0, 0);
|
||||
PtSetArg( &arg[n++], Pt_ARG_MARGIN_WIDTH, 0, 0);
|
||||
PtCreateWidget( PtLabel, mDialog, n, arg );
|
||||
PtRealizeWidget( mDialog );
|
||||
PtFlush();
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
fprintf( stderr, "Error loading splash screen image: %s\n", splash );
|
||||
}
|
||||
|
||||
return NS_OK;
|
||||
}
|
||||
|
||||
NS_IMETHODIMP
|
||||
nsSplashScreenPh::Hide() {
|
||||
if ( mDialog ) {
|
||||
PtDestroyWidget(mDialog);
|
||||
mDialog = nsnull;
|
||||
}
|
||||
return NS_OK;
|
||||
}
|
||||
|
||||
nsresult NS_CreateSplashScreen(nsISplashScreen**aResult)
|
||||
{
|
||||
if ( aResult ) {
|
||||
*aResult = new nsSplashScreenPh;
|
||||
if ( *aResult ) {
|
||||
NS_ADDREF( *aResult );
|
||||
return NS_OK;
|
||||
} else {
|
||||
return NS_ERROR_OUT_OF_MEMORY;
|
||||
}
|
||||
} else {
|
||||
return NS_ERROR_NULL_POINTER;
|
||||
}
|
||||
}
|
||||
|
||||
PRBool NS_CanRun()
|
||||
{
|
||||
return PR_TRUE;
|
||||
}
|
||||
|
|
@ -586,7 +586,9 @@ nsNativeAppSupportWin::CheckConsole() {
|
|||
FILE *hf = ::_fdopen( hCrt, "w" );
|
||||
if ( hf ) {
|
||||
*stdout = *hf;
|
||||
#ifdef DEBUG
|
||||
::fprintf( stdout, "stdout directed to dynamic console\n" );
|
||||
#endif
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -597,7 +599,9 @@ nsNativeAppSupportWin::CheckConsole() {
|
|||
FILE *hf = ::_fdopen( hCrt, "w" );
|
||||
if ( hf ) {
|
||||
*stderr = *hf;
|
||||
#ifdef DEBUG
|
||||
::fprintf( stderr, "stderr directed to dynamic console\n" );
|
||||
#endif
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
Загрузка…
Ссылка в новой задаче