AstralTransRocketries/ClassiCube
1
0
Fork 0
mirror of https://github.com/ClassiCube/ClassiCube.git synced 2025-09-08 14:56:12 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1368 from shinovon/1

Browse Source 
Symbian: Implement browser opening
This commit is contained in:
UnknownShadow200 2025-05-25 08:24:07 +10:00 committed by GitHub
commit 6a0291a9ab
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 39 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
misc/symbian/ClassiCube_common.mmh
View File

@ -35,9 +35,11 @@ LIBRARY libpthread.lib
STATICLIBRARY libcrt0.lib
ALWAYS_BUILD_AS_ARM
OPTION ARMCC -Otime --diag_suppress 1296 --diag_suppress 1293 --diag_suppress 66
OPTION_REPLACE ARMCC --cpu 6
OPTION_REPLACE ARMCC --fpu softvfp+vfpv2 --fpmode fast
OPTION_REPLACE ARMCC -O2 -O3
SOURCEPATH ../../src
SOURCE Animations.c Audio.c AudioBackend.c AxisLinesRenderer.c Bitmap.c Block.c BlockPhysics.c Builder.c Camera.c Chat.c Commands.c Deflate.c Drawer.c Drawer2D.c Entity.c EntityComponents.c EntityRenderers.c EnvRenderer.c Event.c ExtMath.c FancyLighting.c Formats.c Game.c GameVersion.c Generator.c Graphics_GL1.c Graphics_SoftGPU.c Gui.c HeldBlockRenderer.c Http_Web.c Http_Worker.c Input.c InputHandler.c Inventory.c IsometricDrawer.c LBackend.c LScreens.c LWeb.c LWidgets.c Launcher.c Lighting.c Logger.c MapRenderer.c MenuOptions.c Menus.c Model.c Options.c PackedCol.c Particle.c Physics.c Picking.c Platform_Posix.c Protocol.c Queue.c Resources.c SSL.c Screens.c SelOutlineRenderer.c SelectionBox.c Server.c Stream.c String.c SystemFonts.c TexturePack.c TouchUI.c Utils.c Vectors.c Widgets.c World.c _autofit.c _cff.c _ftbase.c _ftbitmap.c _ftglyph.c _ftinit.c _ftsynth.c _psaux.c _pshinter.c _psmodule.c _sfnt.c _smooth.c _truetype.c _type1.c Vorbis.c main.c Platform_Symbian.cpp Graphics_GL2.c Window_Symbian.cpp

54
src/Window_Symbian.cpp
View File

@ -71,6 +71,21 @@ class CWindow;
CWindow* window;
static void ConvertToUnicode(TDes& dst, const char* src, size_t length) {
if (!src) return;
cc_unichar* uni = reinterpret_cast <cc_unichar*> (const_cast <TUint16*> (dst.Ptr()));
for (int i = 0; i < length; i++) {
*uni++ = Convert_CP437ToUnicode(src[i]);
}
*uni = '\0';
dst.SetLength(length);
}
static void ConvertToUnicode(TDes& dst, const cc_string* src) {
ConvertToUnicode(dst, src->buffer, (size_t)src->length);
}
class CWindow : public CBase
{
public:
@ -82,7 +97,7 @@ public:
void ProcessEvents(float delta);
void RequestClose();
void InitEvents();
cc_result OpenBrowser(const cc_string* url);
cc_result OpenBrowserL(const cc_string* url);
~CWindow();
TWsEvent iWsEvent;
@ -184,8 +199,8 @@ CWindow::~CWindow() {
}
void CWindow::ConstructL() {
delete CActiveScheduler::Current();
CActiveScheduler* actScheduler = new (ELeave) CActiveScheduler();
delete CActiveScheduler::Current();
CActiveScheduler* actScheduler = new (ELeave) CActiveScheduler();
CActiveScheduler::Install(actScheduler);
CCoeEnv* env = CCoeEnv::Static();
@ -464,6 +479,7 @@ void CWindow::HandleWsEvent(const TWsEvent& aWsEvent) {
}
// shutdown request from task manager
case KAknShutOrHideApp: {
WindowInfo.Exists = false;
RequestClose();
break;
}
@ -471,6 +487,7 @@ void CWindow::HandleWsEvent(const TWsEvent& aWsEvent) {
case EEventUser: {
TApaSystemEvent apaSystemEvent = *(TApaSystemEvent*) aWsEvent.EventData();
if (apaSystemEvent == EApaSystemEventShutdown) {
WindowInfo.Exists = false;
RequestClose();
}
break;
@ -590,28 +607,31 @@ void CWindow::InitEvents() {
iWsSession.EventReady(&iWsEventStatus);
}
cc_result CWindow::OpenBrowser(const cc_string* url) {
#if 0
TUid browserUid = {0x1020724d};
cc_result CWindow::OpenBrowserL(const cc_string* url) {
#if defined CC_BUILD_SYMBIAN_3 || defined CC_BUILD_SYMBIAN_S60V5
TUid browserUid = {0x10008D39};
#else
TUid browserUid = {0x1020724D};
#endif
TApaTaskList tasklist(window->iWsSession);
TApaTask task = tasklist.FindApp(browserUid);
TPtrC des;
// TODO convert url to utf16
if (task.Exists()) {
task.BringToForeground();
task.SendMessage(TUid::Uid(0), TPtrC8((TUint8 *)url->buffer, (TInt)url->length));
} else {
RApaLsSession ls;
if (!ls.Connect()) {
TThreadId tid;
ls.StartDocument(des, browserUid, tid);
ls.Close();
if (!ls.Handle()) {
User::LeaveIfError(ls.Connect());
}
TThreadId tid;
TBuf<FILENAME_SIZE> buf;
ConvertToUnicode(buf, url);
ls.StartDocument(buf, browserUid, tid);
ls.Close();
}
#endif
return ERR_NOT_SUPPORTED;
return 0;
}
void Window_PreInit(void) {
@ -779,7 +799,7 @@ void GLContext_Create(void) {
cc_result Process_StartOpen(const cc_string* args) {
TInt err = 0;
TRAP(err, err = window->OpenBrowser(args));
TRAP(err, err = window->OpenBrowserL(args));
return (cc_result) err;
}