livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge Firestorm LGPL

master
Ansariel 2016-02-21 02:34:31 +01:00
parent 66a23cbb77 363dea1650
commit 21d8ab6fc0
9 changed files with 31 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
autobuild.xml
View File

@ -27,9 +27,9 @@
<key>archive</key>
<map>
<key>hash</key>
<string>11f68fef2c94128237baf110bf6e4ee6</string>
<string>ff2b6c4678ec520b4dd95431fc7d6191</string>
<key>url</key>
<string>http://downloads.phoenixviewer.com/slplugin_x86-4.7.6.48584-darwin-201601201757-r2.tar.bz2</string>
<string>http://downloads.phoenixviewer.com/slplugin_x86-4.7.6.48693-darwin-201602191441-r3.tar.bz2</string>
</map>
<key>name</key>
<string>windows</string>
@ -1753,11 +1753,11 @@
<key>archive</key>
<map>
<key>hash</key>
<string>cb4f8508b0212056c7a67967d668467f</string>
<string>d9a86fe36bada5011c25919715ed83ae</string>
<key>hash_algorithm</key>
<string>md5</string>
<key>url</key>
<string>http://downloads.phoenixviewer.com/llceflib-1.0-linux-201602081446-r54.tar.bz2</string>
<string>http://downloads.phoenixviewer.com/llceflib-1.0-linux-201602180356-r57.tar.bz2</string>
</map>
<key>name</key>
<string>linux</string>

2
indra/media_plugins/cef/CMakeLists.txt
View File

@ -111,7 +111,7 @@ if (WINDOWS)
set_target_properties(
media_plugin_cef
PROPERTIES
LINK_FLAGS "/MANIFEST:NO /SAFESEH:NO /LTCG /NODEFAULTLIB:LIBCMT"
LINK_FLAGS "/MANIFEST:NO /SAFESEH:NO /NODEFAULTLIB:LIBCMT"
LINK_FLAGS_DEBUG "/MANIFEST:NO /SAFESEH:NO /NODEFAULTLIB:LIBCMTD"
)
endif (WINDOWS)

50
indra/media_plugins/cef/media_plugin_cef.cpp
View File

@ -891,9 +891,9 @@ void MediaPluginCEF::deserializeKeyboardData(LLSD native_key_data, uint32_t& nat
#endif
#if LL_LINUX
native_scan_code = (uint32_t)(native_key_data["scan_code"].asInteger());
native_virtual_key = (uint32_t)(native_key_data["virtual_key"].asInteger());
native_modifiers = (uint32_t)(native_key_data["cef_modifiers"].asInteger());
native_scan_code = (uint32_t)(native_key_data["sdl_sym"].asInteger());
native_virtual_key = (uint32_t)(native_key_data["virtual_key"].asInteger());
native_modifiers = (uint32_t)(native_key_data["cef_modifiers"].asInteger());
#endif
};
};
@ -929,39 +929,14 @@ void MediaPluginCEF::keyEvent(LLCEFLib::EKeyEvent key_event, int key, LLCEFLib::
mLLCEFLib->nativeKeyboardEvent(msg, wparam, lparam);
#endif
// <FS:ND> Keyboard handling for Linux, code written by Henri Beauchamp
// <FS:ND> Keyboard handling for Linux.
#if LL_LINUX
// The incoming values for 'key' will be the ones from indra_constants.h
std::string utf8_text;
if (key < 128)
{
// Low-ascii characters need to get passed through.
utf8_text = (char)key;
}
// Any special-case handling we want to do for particular keys...
switch ((KEY)key)
{
// ASCII codes for some standard keys
case KEY_BACKSPACE:utf8_text = (char)8;break;
case KEY_TAB:utf8_text = (char)9;break;
case KEY_RETURN:utf8_text = (char)13;break;
case KEY_PAD_RETURN:utf8_text = (char)13;break;
case KEY_ESCAPE:utf8_text = (char)27;break;
default:
break;
}
uint32_t native_scan_code = 0;
uint32_t native_virtual_key = 0;
uint32_t native_modifiers = 0;
deserializeKeyboardData(native_key_data, native_scan_code,
native_virtual_key, native_modifiers);
mLLCEFLib->keyboardEvent(key_event, (uint32_t)key, utf8_text.c_str(),
modifiers_x, native_scan_code, native_virtual_key,
native_modifiers);
deserializeKeyboardData(native_key_data, native_scan_code, native_virtual_key, native_modifiers);
mLLCEFLib->nativeKeyboardEvent(key_event, native_scan_code, native_virtual_key, native_modifiers);
#endif
// </FS:ND>
}
@ -988,20 +963,15 @@ void MediaPluginCEF::unicodeInput(const std::string &utf8str, LLCEFLib::EKeyboar
mLLCEFLib->nativeKeyboardEvent(msg, wparam, lparam);
#endif
// <FS:ND> Keyboard handling for Linux, code written by Henri Beauchamp
// <FS:ND> Keyboard handling for Linux.
#if LL_LINUX
uint32_t key = KEY_NONE;
if (utf8str.size() == 1)
key = utf8str[0];
uint32_t native_scan_code = 0;
uint32_t native_virtual_key = 0;
uint32_t native_modifiers = 0;
deserializeKeyboardData(native_key_data, native_scan_code, native_virtual_key, native_modifiers);
mLLCEFLib->keyboardEvent(LLCEFLib::KE_KEY_DOWN, (uint32_t)key, utf8str.c_str(), modifiers, 0, native_virtual_key, native_modifiers);
mLLCEFLib->keyboardEvent(LLCEFLib::KE_KEY_UP, (uint32_t)key, utf8str.c_str(), modifiers, 0, native_virtual_key, native_modifiers);
mLLCEFLib->nativeKeyboardEvent(LLCEFLib::KE_KEY_DOWN, native_scan_code, native_virtual_key, native_modifiers);
mLLCEFLib->nativeKeyboardEvent(LLCEFLib::KE_KEY_UP, native_scan_code, native_virtual_key, native_modifiers);
#endif
// </FS:ND>
};

3
indra/newview/fonts/fonts.xml
View File

@ -15,6 +15,9 @@
<file>ヒラギノ角ゴシック W3.ttc</file>
<file>ヒラギノ角ゴ Pro W3.otf</file>
<file>ヒラギノ角ゴ ProN W3.otf</file>
<!-- <FS:TS> FIRE-17481: Add El Capitan Korean font -->
<file>AppleSDGothicNeo.ttc</file>
<!-- </FS:TS> FIRE-17481 -->
<file>AppleGothic.dfont</file>
<file>AppleGothic.ttf</file>
<file>AppleSDGothicNeo-Regular.otf</file>

4
indra/newview/fs_viewer_manifest.py
View File

@ -167,11 +167,11 @@ class FSViewerManifest:
def fs_copy_windows_manifest(self):
from shutil import copyfile
self.fs_strip_windows_manifest( "%s/slplugin.exe" % self.args['configuration'].lower() )
# self.fs_strip_windows_manifest( "%s/firestorm-bin.exe" % self.args['configuration'].lower() )
self.fs_strip_windows_manifest( "%s/firestorm-bin.exe" % self.args['configuration'].lower() )
self.fs_strip_windows_manifest( "%s/llplugin/llceflib_host.exe" % self.args['configuration'].lower() )
if self.prefix(src=os.path.join(os.pardir, '..', 'indra', 'tools', 'manifests'), dst=""):
self.path( "compatibility.manifest", "slplugin.exe.manifest" )
# self.path( "compatibility.manifest", "firestorm-bin.exe.manifest" )
self.path( "compatibility.manifest", "firestorm-bin.exe.manifest" )
self.end_prefix()
if self.prefix(src=os.path.join(os.pardir, '..', 'indra', 'tools', 'manifests'), dst="llplugin"):
self.path( "compatibility.manifest", "llceflib_host.exe.manifest" )

BIN
indra/newview/installers/windows_x64/CheckProcess.dll Normal file
View File

Binary file not shown.

6
indra/newview/installers/windows_x64/firestorm.wxs
View File

@ -14,6 +14,7 @@
<Property Id="ARPURLUPDATEINFO" Value="http://www.firestormviewer.org/downloads"/>
<Property Id="ARPHELPLINK" Value="http://www.firestormviewer.org/support"/>
<Property Id="ARPPRODUCTICON" Value="firestorm.ico"/>
<Property Id="CheckProcess" Value="firestorm-bin.exe"/>
<Media Id="1" Cabinet="firestorm.cab" EmbedCab="yes" CompressionLevel="high"/>
<!-- VersionNT64 is undefined if the operating system is not 64-bit: http://msdn.microsoft.com/en-us/library/aa372497%28v=vs.85%29.aspx -->
@ -43,6 +44,7 @@
<Component Id="firestorm" Guid="{2CDF0673-595F-4fb4-B38A-C338BF9D4DF1}">
<File Id="firestorm" Source="$(var.BUILDDIR)/$(var.PROGRAM_FILE)" KeyPath="yes"/>
<File Id="firestorm_manifest" Source="$(var.BUILDDIR)/$(var.PROGRAM_FILE).manifest" CompanionFile="firestorm"/>
<File Source="$(var.BUILDDIR)/win_crash_logger.exe" CompanionFile="firestorm" />
<File Source="$(var.BUILDDIR)/fmodex64.dll" CompanionFile="firestorm" />
@ -115,8 +117,11 @@
<ComponentGroupRef Id="fs_fonts" />
<ComponentGroupRef Id="fs_fsres" />
</Feature>
<Binary Id="ExtractCab" SourceFile="$(var.WIX_SOURCEDIR)\ExtractCab.dll" />
<Binary Id="CheckProcess" SourceFile="$(var.WIX_SOURCEDIR)\CheckProcess.dll" />
<CustomAction Id="CheckProcess" BinaryKey="CheckProcess" DllEntry="doCheckProcess" Execute="immediate" Return="check" Impersonate="no" HideTarget="no"/>
<CustomAction Id="ExtractSkins_pre" Property="ExtractSkins"
Value="InstallDir=[INSTALLDIR]\skins\;CabFile=[INSTALLDIR]\skins.cab;CabDirFile=[INSTALLDIR]\skins.cabdir"/>
<CustomAction Id="ExtractSkins" BinaryKey="ExtractCab" DllEntry="ExtractCab" Execute="deferred" Return="check" Impersonate="no" HideTarget="no"/>
@ -135,6 +140,7 @@
<InstallExecuteSequence>
<Custom Action="CheckProcess" After="LaunchConditions"></Custom>
<Custom Action="ExtractSkins_pre" After="InstallInitialize">Not Installed</Custom>
<Custom Action="ExtractSkins" Before="InstallFinalize">Not Installed</Custom>
<Custom Action="DeleteSkins_pre" After="InstallInitialize">REMOVE</Custom>

12
indra/newview/llappviewer.cpp
View File

@ -140,11 +140,9 @@
#include "llleap.h"
#include "stringize.h"
#include "llcoros.h"
//<FS:TS> Turn off library for 64-bit OS X too
//#if !LL_LINUX
#if !(LL_DARWIN && defined(ND_BUILD64BIT_ARCH))
#include "cef/llceflib.h"
#endif
//#endif
// Third party library includes
#include <boost/bind.hpp>
@ -3990,13 +3988,11 @@ LLSD LLAppViewer::getViewerInfo() const
{
info["VOICE_VERSION"] = LLTrans::getString("NotConnected");
}
//<FS:TS> Check for the symbol being defined, not for an OS
//#if !LL_LINUX
#if defined(LLCEFLIB_VERSION)
info["LLCEFLIB_VERSION"] = LLCEFLIB_VERSION;
#else
info["LLCEFLIB_VERSION"] = "Undefined";
#endif
//#else
// info["LLCEFLIB_VERSION"] = "Undefined";
//#endif
#if defined( FS_CEFLIB_VERSION ) && FS_CEFLIB_VERSION >= 6
{

2
package_override_gcc.ini
View File

@ -104,5 +104,5 @@ linux = http://downloads.phoenixviewer.com/uriparser-0.8.0.1-linux-x64-201502251
linux =
[llceflib]
linux = http://downloads.phoenixviewer.com/llceflib-1.0-linux-x64-201602080551-r54.tar.bz2|73b956009a7cdb715050b1173a0a2908
linux = http://downloads.phoenixviewer.com/llceflib-1.0-linux-x64-201602180255-r57.tar.bz2|4eb86000a408d3a6e8b39b8fb1bc98de