Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-13 21:35:39 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Added a static function to determine at runtime what gfx toolkit is being

Browse Source 
used. Reviewed by ramiro@netscape.com.
This commit is contained in:
shawnp%earthling.net 1999-10-05 01:23:47 +00:00
parent d8db4adee0
commit 153c96aa91
2 changed files with 96 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

90
widget/src/qt/nsAppShell.cpp
View File

@ -20,9 +20,12 @@
#include "nsIAppShell.h"
#include "nsIServiceManager.h"
#include "nsIEventQueueService.h"
#include "nsIUnixToolkitService.h"
#include "nsICmdLineService.h"
#include <stdlib.h>
#include "nsWidget.h"
#include <qwindowdefs.h>
#include "xlibrgb.h"
//-------------------------------------------------------------------------
//
@ -31,6 +34,9 @@
//-------------------------------------------------------------------------
static NS_DEFINE_IID(kEventQueueServiceCID, NS_EVENTQUEUESERVICE_CID);
static NS_DEFINE_IID(kCmdLineServiceCID, NS_COMMANDLINE_SERVICE_CID);
static NS_DEFINE_CID(kCUnixToolkitServiceCID, NS_UNIX_TOOLKIT_SERVICE_CID);
nsAppShell::GfxToolkit nsAppShell::mGfxToolkit = nsAppShell::eInvalidGfxToolkit;
//-------------------------------------------------------------------------
//
@ -99,10 +105,38 @@ NS_METHOD nsAppShell::Create(int *bac, char **bav)
PR_LOG_DEBUG,
("nsAppShell::Create()\n"));
int argc = bac ? *bac : 0;
char **argv = bav;
#if 1
nsresult rv;
int argc = bac ? *bac : 0;
char ** argv = bav;
nsresult rv = NS_OK;
Display * aDisplay = nsnull;
Screen * aScreen = nsnull;
GfxToolkit aGfxToolkit = GetGfxToolkit();
if (aGfxToolkit == eQtGfxToolkit)
{
}
else if (aGfxToolkit == eXlibGfxToolkit)
{
// Open the display
aDisplay = XOpenDisplay(NULL);
if (aDisplay == NULL)
{
fprintf(stderr, "%s: Cannot connect to X server\n",
argv[0]);
exit(1);
}
aScreen = DefaultScreenOfDisplay(aDisplay);
xlib_rgb_init(aDisplay, aScreen);
}
else
{
fprintf(stderr, "Invalid toolkit\n");
exit(1);
}
NS_WITH_SERVICE(nsICmdLineService, cmdLineArgs, kCmdLineServiceCID, &rv);
if (NS_SUCCEEDED(rv))
@ -119,9 +153,15 @@ NS_METHOD nsAppShell::Create(int *bac, char **bav)
argv = bav;
}
}
#endif
mApplication = new nsQApplication(argc, argv);
if (aDisplay && aScreen)
{
mApplication = new nsQApplication(aDisplay);
}
else
{
mApplication = new nsQApplication(argc, argv);
}
if (!mApplication)
{
@ -341,4 +381,42 @@ NS_METHOD nsAppShell::EventIsForModalWindow(PRBool aRealEvent,
return NS_OK;
}
nsAppShell::GfxToolkit nsAppShell::GetGfxToolkit()
{
nsString aGfxToolkit;
nsresult rv;
if (mGfxToolkit == eInvalidGfxToolkit)
{
nsIUnixToolkitService * unixToolkitService = nsnull;
rv = nsComponentManager::CreateInstance(kCUnixToolkitServiceCID,
nsnull,
nsIUnixToolkitService::GetIID(),
(void **) &unixToolkitService);
NS_ASSERTION(NS_SUCCEEDED(rv),"Cannot obtain unix toolkit service.");
if (NS_SUCCEEDED(rv))
{
rv = unixToolkitService->GetGfxToolkitName(aGfxToolkit);
}
NS_IF_RELEASE(unixToolkitService);
}
if (NS_SUCCEEDED(rv))
{
if (aGfxToolkit == "qt")
{
mGfxToolkit = eQtGfxToolkit;
}
else if (aGfxToolkit == "xlib")
{
mGfxToolkit = eXlibGfxToolkit;
}
}
return mGfxToolkit;
}

15
widget/src/qt/nsAppShell.h
View File

@ -56,12 +56,21 @@ public:
NS_IMETHOD SetDispatchListener(nsDispatchListener* aDispatchListener);
virtual void* GetNativeData(PRUint32 aDataType);
enum GfxToolkit
{
eInvalidGfxToolkit = 0,
eQtGfxToolkit = 1,
eXlibGfxToolkit = 2
};
static GfxToolkit GetGfxToolkit();
protected:
static GfxToolkit mGfxToolkit;
private:
nsDispatchListener * mDispatchListener;
nsQApplication * mApplication;
protected:
nsIEventQueueService * mEventQService;
};
#endif // nsAppShell_h__