FCL/sf/mw/hb: comparison src/hbservers/hbthemeserver/hbthemeserver

equal deleted inserted replaced

-:11d3954df52a
+:627c4a0fd0e7
 // 5 MB  CPU cache size
 #define CPU_CACHE_SIZE 0x500000
 static const TInt KThemeName = 0;
-const QString KOperatorCPath = "C:/resource/hb/operatorTheme/icons/";
+const QString KOperatorCPath = "C:/resource/hb/prioritytheme/icons/";
-const QString KOperatorZPath = "Z:/resource/hb/operatorTheme/icons/";
+const QString KOperatorZPath = "Z:/resource/hb/prioritytheme/icons/";
 bool HbThemeServerPrivate::gpuGoodMemoryState = true;
 // This is used as parent theme always regardless of the active theme
 //**********************************
 // Store the active theme name in a member string
 iCurrentThemeName = HbThemeUtils::getThemeSetting(HbThemeUtils::CurrentThemeSetting);
 if (iCurrentThemeName.isEmpty()) {
 iCurrentThemeName = HbThemeUtils::defaultTheme().name;
-// Set the current theme also in the cenrep key that is used to notify clients.
-HbThemeUtils::setThemeSetting(HbThemeUtils::CurrentThemeSetting, iCurrentThemeName);
 }
 // Cache ROM theme(name)s
 QString romPath = "Z:\\resource\\hb\\themes\\icons\\";
 QDir dir(romPath);
 romThemeNames = dir.entryList(QDir::Dirs);
+// Resolve the path of the current theme
+QDir path(iCurrentThemeName);
+if (!path.isAbsolute()) {
+// Resolve the path of the current theme
+resolveThemePath(iCurrentThemeName, iCurrentThemePath);
+} else {
+iCurrentThemeName = path.dirName();
+iCurrentThemePath = path.absolutePath();
+}
-// Resolve the path of the current theme
-resolveThemePath(iCurrentThemeName, iCurrentThemePath);
-// Register theme system effects in construction
-// TODO: fix parameter
-HbThemeSystemEffect::handleThemeChange(iCurrentThemeName);
 // Open index file to prevent uninstallation of the active theme
 if (!openCurrentIndexFile()) {
 // theme doesn't exist activate default theme
 iCurrentThemeName = HbThemeUtils::defaultTheme().name;
 resolveThemePath(iCurrentThemeName, iCurrentThemePath);
 #endif
 // Process base theme index, it is used as parent index also when the current theme is something else
 QString basePath;
 resolveThemePath(HbThemeUtils::getThemeSetting(HbThemeUtils::BaseThemeSetting), basePath);
-createThemeIndex(basePath, BaseTheme);
+HbThemeServerUtils::createThemeIndex(basePath, BaseTheme);
 // Process operator theme indexes
 QString operatorName = HbThemeUtils::getThemeSetting(HbThemeUtils::OperatorNameSetting);
 if (!operatorName.isEmpty()) {
 QString operatorPath;
 operatorPath.append(KOperatorCPath);
 operatorPath.append(operatorName);
-createThemeIndex(operatorPath, OperatorC);
+HbThemeServerUtils::createThemeIndex(operatorPath, OperatorC);
 // Process operator Drive Z theme index
 QString operatorROMPath;
 operatorROMPath.append(KOperatorZPath);
 operatorROMPath.append(operatorName);
-createThemeIndex(operatorROMPath, OperatorROM);
+HbThemeServerUtils::createThemeIndex(operatorROMPath, OperatorROM);
 }
 // Process current theme index
-createThemeIndex(iCurrentThemePath, ActiveTheme);
+HbThemeServerUtils::createThemeIndex(iCurrentThemePath, ActiveTheme);
+// Register theme system effects in construction
+// TODO: fix parameter
+HbThemeSystemEffect::handleThemeChange(iCurrentThemeName);
+// Set the current theme also in the cenrep key that is used to notify clients.
+HbThemeUtils::setThemeSetting(HbThemeUtils::CurrentThemeSetting, iCurrentThemePath);
 // Temporary hack for pre-loading app. background graphics in server startup to give more realistic
 // results in performance tests. (Normally these graphics get loaded anyway when the first hb app is started.)
 #ifndef HB_NVG_CS_ICON
 QProcess::startDetached("hbiconpreloader.exe");
 #endif
 return true;
 }
 bool HbThemeServerPrivate::resolveThemePath(const QString &themeName, QString &themePath)
 {
-if(themeName == "hbdefault") {
+if (themeName == "hbdefault") {
 themePath = ":\\themes\\icons\\hbdefault";
 return true;
 }
 if (!themeName.isEmpty()) {
 QDir path(cleanThemeName);
 if (!path.isAbsolute()) {
 // Resolve the path of the current theme
 resolveThemePath(iCurrentThemeName, iCurrentThemePath);
+} else {
+iCurrentThemeName = path.dirName();
+iCurrentThemePath = path.absolutePath();
 }
 #ifdef THEME_INDEX_TRACES
 qDebug() << "ThemeIndex: theme change request, new theme =" << cleanThemeName.toUtf8();
 #endif
 QString operatorName = HbThemeUtils::getThemeSetting(HbThemeUtils::OperatorNameSetting);
 if (!operatorName.isEmpty()) {
 QString operatorPath;
 operatorPath.append(KOperatorCPath);
 operatorPath.append(operatorName);
-createThemeIndex(operatorPath, OperatorC);
+HbThemeServerUtils::createThemeIndex(operatorPath, OperatorC);
 }
 // Process current theme index
-createThemeIndex(iCurrentThemePath, ActiveTheme);
+HbThemeServerUtils::createThemeIndex(iCurrentThemePath, ActiveTheme);
 // Clear cached icons and session data
 clearIconCache();
 iSessionIter.SetToFirst();
 while(iSessionIter) {
 session.ClearSessionData();
 iSessionIter++;
 }
 // TODO: fix parameter
-HbThemeSystemEffect::handleThemeChange(cleanThemeName);
+HbThemeSystemEffect::handleThemeChange(iCurrentThemeName);
 // Update settings and notify clients
-HbThemeUtils::setThemeSetting(HbThemeUtils::CurrentThemeSetting,iCurrentThemeName);
+HbThemeUtils::setThemeSetting(HbThemeUtils::CurrentThemeSetting,iCurrentThemePath);
 }
 /**
 Creates a new session with the server.
 */
 HbCacheItem * HbThemeServerPrivate::cssCacheItem(const QString &key)
 {
 return(cssCache->cacheItem(key));
 }
-void HbThemeServerPrivate::insertIconDefaultSizeCacheItem(const QString &key, const QSizeF &item)
-{
-iconDefaultSizes.insert(key, item);
-}
-QSizeF HbThemeServerPrivate::iconDefaultSizeCacheItem(const QString &key)
-{
-return iconDefaultSizes.value(key);
-}
 /**
 * HbThemeServerPrivate::clearIconCache
 *
 * Clears icon cache.
 */
 {
 gpuGoodMemoryState = true;
 cache->memoryGood();
 }
-void HbThemeServerPrivate::FreeGpuRam(int bytes)
+void HbThemeServerPrivate::FreeGpuRam(int bytes, bool useSwRendering )
 {
 gpuGoodMemoryState = false;
-cache->freeGpuRam(bytes);
+cache->freeGpuRam(bytes, useSwRendering);
 #ifdef HB_SGIMAGE_ICON
+if (useSwRendering) {
 HbSgImageRenderer::global()->terminate();
+}
 #endif
 }
 /**
 *  HbThemeServerPrivate::freeUnusedGpuResources
 */
 void HbThemeServerPrivate::doCleanup()
 {
 HbThemeServerUtils::cleanupUnusedCss(cssCache);
 }
-void HbThemeServerPrivate::createThemeIndex(const QString &themePath, const HbThemeType &themetype)
-{
-#ifdef THEME_INDEX_TRACES
-qDebug() <<  "ThemeIndex: createThemeIndex" << themePath.toUtf8();
-#endif
-QDir themeBasePath(themePath);
-// Path is like "C:/resource/hb/themes/icons/sfwhitetheme"
-QString themeName = themeBasePath.dirName();
-QString filename(themeBasePath.absolutePath());
-int cutindex = filename.lastIndexOf("/",filename.lastIndexOf("/")-1)+1;
-filename = filename.left(cutindex);
-themeBasePath.setPath(filename);
-filename.append(themeName);
-filename.append(".themeindex");
-if (themePath == ":\\themes\\icons\\hbdefault") {
-themeBasePath.setPath(":/themes");
-filename = ":/themes/hbdefault.themeindex";
-themeName = "hbdefault";
-}
-QFile indexFile(filename);
-bool indexOK = false;
-if (indexFile.open(QIODevice::ReadOnly)) {
-indexOK = true;
-GET_MEMORY_MANAGER(HbMemoryManager::SharedMemory);
-HbSharedChunkHeader *chunkHeader = (HbSharedChunkHeader*) manager->base();
-qint64 byteSize = indexFile.size();
-#ifdef THEME_INDEX_TRACES
-qDebug() <<  "ThemeIndex: " << themeName.toUtf8() << " index file size:" << byteSize;
-#endif
-int offset = manager->alloc(byteSize);
-if (offset >= 0) {
-#ifdef THEME_INDEX_TRACES
-qDebug() <<  "ThemeIndex: memory allocated for theme: " << themeName.toUtf8();
-#endif
-// Read the theme index in the shared chunk
-char *address = HbMemoryUtils::getAddress<char>(HbMemoryManager::SharedMemory, offset);
-indexFile.read(address, byteSize);
-indexFile.close();
-#ifdef THEME_INDEX_TRACES
-qDebug() <<  "ThemeIndex: Reading themeindex for theme" << themeName.toUtf8() << "... Done!";
-#endif
-// Verify theme index contents if it is not located in ROM,
-// so that it does not have over-indexing offsets which might
-// crash all the clients trying to read from it.
-if (themePath[0] != 'z' && themePath[0] != 'Z') {
-#ifdef THEME_INDEX_TRACES
-qDebug() <<  "ThemeIndex: Validating themeindex for theme" << themeName.toUtf8();
-#endif
-HbThemeIndex index(address);
-indexOK = index.validateItems(byteSize);
-#ifdef THEME_INDEX_TRACES
-qDebug() <<  "ThemeIndex: Validating themeindex for theme" << themeName.toUtf8() << " done! Result: " << indexOK;
-#endif
-}
-if (indexOK) {
-// Allocate theme path string from shared memory
-QByteArray themePathArray = themeBasePath.absolutePath().toLatin1();
-quint32 themePathOffset = manager->alloc(themePathArray.size()+1);
-memcpy(HbMemoryUtils::getAddress<char>(
-HbMemoryManager::SharedMemory,
-themePathOffset),
-themePathArray.data(),
-themePathArray.size()+1); // +1 for '/0'
-// Allocate theme name string from shared memory
-QByteArray themeNameArray = themeName.toLatin1();
-quint32 themeNameOffset = manager->alloc(themeNameArray.size()+1);
-memcpy(HbMemoryUtils::getAddress<char>(
-HbMemoryManager::SharedMemory,
-themeNameOffset),
-themeNameArray.data(),
-themeNameArray.size()+1); // +1 for '/0'
-// Store offset to the index in chunk
-switch (themetype) {
-case BaseTheme:
-// Release previously allocated content
-manager->free(chunkHeader->baseThemePathOffset);
-manager->free(chunkHeader->baseThemeNameOffset);
-manager->free(chunkHeader->baseThemeIndexOffset);
-// Base theme offsets
-chunkHeader->baseThemePathOffset = themePathOffset;
-chunkHeader->baseThemeNameOffset = themeNameOffset;
-chunkHeader->baseThemeIndexOffset = offset;
-break;
-case OperatorC:
-// Release previously allocated content
-manager->free(chunkHeader->operatorThemeDriveCPathOffset);
-manager->free(chunkHeader->operatorThemeDriveCNameOffset);
-manager->free(chunkHeader->operatorThemeDriveCIndexOffset);
-// Operator theme in C-drive offsets
-chunkHeader->operatorThemeDriveCPathOffset = themePathOffset;
-chunkHeader->operatorThemeDriveCNameOffset = themeNameOffset;
-chunkHeader->operatorThemeDriveCIndexOffset = offset;
-break;
-case OperatorROM:
-// Release previously allocated content
-manager->free(chunkHeader->operatorThemeRomPathOffset);
-manager->free(chunkHeader->operatorThemeRomNameOffset);
-manager->free(chunkHeader->operatorThemeRomIndexOffset);
-// Operator theme in ROM offsets
-chunkHeader->operatorThemeRomPathOffset = themePathOffset;
-chunkHeader->operatorThemeRomNameOffset = themeNameOffset;
-chunkHeader->operatorThemeRomIndexOffset = offset;
-break;
-case ActiveTheme:
-// Release previously allocated content
-manager->free(chunkHeader->activeThemePathOffset);
-manager->free(chunkHeader->activeThemeNameOffset);
-manager->free(chunkHeader->activeThemeIndexOffset);
-// Active theme offsets
-chunkHeader->activeThemePathOffset = themePathOffset;
-chunkHeader->activeThemeNameOffset = themeNameOffset;
-chunkHeader->activeThemeIndexOffset = offset;
-break;
-default:
-break;
-}
-} else {
-// If the index contents were not OK, remove the index from the chunk
-manager->free(offset);
-}
-}
-}
-}
 //**********************************
 //HbThemeServerSession
 //**********************************
 /**
 HandleEffectAddAndFileLookupL(aMessage);
 break;
 case EIconLookup:
 GetSharedIconInfoL(aMessage);
-break;
-case EIconDefaultSize:
-GetSharedIconDefaultSizeInfoL(aMessage);
 break;
 case EThemeSelection:
 HandleThemeSelectionL(aMessage);
 break;
 TPckg<HbFreeRamNotificationData> paramPckg(params);
 aMessage.ReadL(0, paramPckg, 0);
 if(params.useSwRendering){
 iServer->setCurrentRenderingMode(ESWRendering );
 }
-iServer->FreeGpuRam(params.bytesToFree);
+iServer->FreeGpuRam(params.bytesToFree, params.useSwRendering);
 break;
 }
 case ERenderModeSwitch: {
 TInt mode = 0;
 QString effFileName((QChar*)fileName.Ptr(), fileName.Length());
 HbSharedEffectInfo offsetInfo;
 offsetInfo.offset = HbThemeServerUtils::getSharedEffect(effFileName);
 TPckg<HbSharedEffectInfo> data(offsetInfo);
 aMessage.WriteL(1, data);
-}
-void HbThemeServerSession::GetSharedIconDefaultSizeInfoL(const RMessage2 &aMessage)
-{
-TIconParams params = ReadMessageAndRetrieveParams(aMessage);
-// Need to be allocated from heap or the leave in the end causes a crash
-QScopedPointer<QString> filenamePtr(new QString((QChar*)params.fileName.Ptr(), params.fileName.Length()));
-// See if the icon's default size has been queried already earlier and
-// can be found stored in the hash.
-QSizeF defSize = iServer->iconDefaultSizeCacheItem(*filenamePtr.data());
-if (!defSize.isValid()) {
-defSize = RetrieveIconDefaultSize(*filenamePtr.data());
-// If the default size was retrieved, insert it in the hash for further lookups
-if (defSize.isValid()) {
-iServer->insertIconDefaultSizeCacheItem(*filenamePtr.data(), defSize);
-}
-}
-// Return the default size back to the client if it was resolved
-if (defSize.isValid()) {
-TPckg<QSizeF> returnData(defSize);
-aMessage.WriteL(1, returnData);
-#ifdef THEME_SERVER_TRACES
-qDebug() << "Completed aMessage.WriteL";
-#endif
-}
-// Otherwise leave with error code
-else {
-User::Leave(KErrNotFound);
-}
-}
-QSizeF HbThemeServerSession::RetrieveIconDefaultSize(const QString &filename)
-{
-QSizeF ret;
-// Get icon source, previous icons sources are cached so if accessed again,
-// they don't need to be loaded and parsed from a file always.
-HbIconSource *source = HbThemeServerUtils::getIconSource(filename);
-if (source) {
-ret = source->defaultSize();
-}
-return ret;
 }
 /**
 * GetSharedIconInfoL
 */

changeset 5	627c4a0fd0e7
parent 3	11d3954df52a
child 6	c3690ec91ef8