Update for first darwoon build
This commit is contained in:
Geoff Norton
Родитель
3b92b45410
Коммит
0982d7d972
|
|
@ -1,33 +1,3 @@
|
|||
Install the following from macports
|
||||
|
||||
1) cairo 1.10
|
||||
|
||||
sudo /opt/local/bin/port install cairo +quartz
|
||||
|
||||
2) automake/autoconf/libtool
|
||||
|
||||
sudo /opt/local/bin/port install automake libtool
|
||||
|
||||
3) glib
|
||||
|
||||
sudo /opt/local/bin/port install glib2
|
||||
|
||||
4) curl
|
||||
|
||||
sudo /opt/local/bin/port install curl
|
||||
|
||||
You can then make a moon/mono/mono-basic parallel checkout and run with:
|
||||
|
||||
PATH=/opt/local/bin/:$PATH ./autogen.sh --prefix=/opt/darwoon --with-pal=cocoa --with-curl=system --host=i386-apple-darwin10 --with-cairo=system CFLAGS="-arch i386" CXXFLAGS="-arch i386" LDFLAGS="-arch i386"
|
||||
|
||||
You need to symlink /opt/darwoon/lib/moonlight/plugin/libmoonplugin.dylib -> /opt/darwoon/lib/moonlight/plugin/libmoon.dylib
|
||||
|
||||
To run the hacked up lunar-launcher use something like this:
|
||||
|
||||
DYLD_FALLBACK_LIBRARY_PATH=/opt/darwoon/lib/moonlight/plugin/ DYLD_INSERT_LIBRARIES=/usr/lib/libiconv.dylib MOON_TRACE=E:all MOONLIGHT_DEBUG=deployment /opt/darwoon/lib/moonlight/plugin/lunar-launcher 1
|
||||
|
||||
Put an xap in /tmp/Application.xap
|
||||
|
||||
TODO:
|
||||
1> Subclass NSWindow to properly deliver window realized, resize, et all events
|
||||
2> Figure out why Invalidate is upside down on the MoonNSView
|
||||
|
|
|
|||
|
|
@ -0,0 +1,3 @@
|
|||
#!/bin/sh
|
||||
./autogen.sh --prefix=/opt/moonlight-osx --with-pal=cocoa --disable-browser-support --with-curl=system CFLAGS="-arch i386" \
|
||||
--enable-xlib=no --enable-trace=no --enable-svg=no --enable-png=yes --enable-ft=no --enable-fc=no --enable-gobject=no --enable-xlib-xrender=no
|
||||
|
|
@ -2311,7 +2311,7 @@ class Generator {
|
|||
header.AppendLine ();
|
||||
header.AppendLine ("#include \"pal.h\"");
|
||||
header.AppendLine ("#if PAL_COCOA_WINDOWING");
|
||||
header.AppendLine ("# include \"pal/coca/window-cocoa.h\"");
|
||||
header.AppendLine ("# include \"pal/cocoa/window-cocoa.h\"");
|
||||
header.AppendLine ("#elif PAL_GTK_WINDOWING");
|
||||
header.AppendLine ("# include \"pal/gtk/window-gtk.h\"");
|
||||
header.AppendLine ("#elif PAL_ANDROID_WINDOWING");
|
||||
|
|
|
|||
|
|
@ -32,8 +32,6 @@ AC_DEFUN([MOONLIGHT_CHECK_MONO],
|
|||
MOON_ARG_ENABLED_BY_DEFAULT([browser-support], [Disable the browser plugin])
|
||||
browser_support=$enableval
|
||||
if test "x$browser_support" = xyes; then
|
||||
MONO_REQUIRED_VERSION=$MONO_REQUIRED_BROWSER_VERSION
|
||||
|
||||
dnl
|
||||
dnl path to mono-basic checkout
|
||||
dnl
|
||||
|
|
|
|||
|
|
@ -61,11 +61,16 @@ elif test "x$with_pal" = "xcocoa"; then
|
|||
pal_audio_capture="none"
|
||||
pal_font_service="none"
|
||||
|
||||
dnl We need to flesh out eglib enough to drop this dep
|
||||
PKG_CHECK_MODULES(GLIB, glib-2.0)
|
||||
GLIB_CFLAGS='-I$(MONO_PATH)/eglib/src'
|
||||
GLIB_LIBS='-L$(MONO_PATH)/eglib/src -leglib -lm'
|
||||
|
||||
PAL=cocoa
|
||||
|
||||
PKG_CHECK_MODULES(FREETYPE2, freetype2, [
|
||||
AC_DEFINE([HAVE_FREETYPE2], [1],
|
||||
[Include support for freetype2 in the font manager])
|
||||
])
|
||||
|
||||
elif test "x$with_pal" = "xandroid"; then
|
||||
|
||||
AC_DEFINE([PAL_ANDROID_WINDOWING],1,[Hack in support for the pal-android so we can start using it.])
|
||||
|
|
|
|||
|
|
@ -0,0 +1,155 @@
|
|||
# pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*-
|
||||
#
|
||||
# Copyright © 2004 Scott James Remnant <scott@netsplit.com>.
|
||||
#
|
||||
# This program is free software; you can redistribute it and/or modify
|
||||
# it under the terms of the GNU General Public License as published by
|
||||
# the Free Software Foundation; either version 2 of the License, or
|
||||
# (at your option) any later version.
|
||||
#
|
||||
# This program is distributed in the hope that it will be useful, but
|
||||
# WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
||||
# General Public License for more details.
|
||||
#
|
||||
# You should have received a copy of the GNU General Public License
|
||||
# along with this program; if not, write to the Free Software
|
||||
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
||||
#
|
||||
# As a special exception to the GNU General Public License, if you
|
||||
# distribute this file as part of a program that contains a
|
||||
# configuration script generated by Autoconf, you may include it under
|
||||
# the same distribution terms that you use for the rest of that program.
|
||||
|
||||
# PKG_PROG_PKG_CONFIG([MIN-VERSION])
|
||||
# ----------------------------------
|
||||
AC_DEFUN([PKG_PROG_PKG_CONFIG],
|
||||
[m4_pattern_forbid([^_?PKG_[A-Z_]+$])
|
||||
m4_pattern_allow([^PKG_CONFIG(_PATH)?$])
|
||||
AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility])dnl
|
||||
if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
|
||||
AC_PATH_TOOL([PKG_CONFIG], [pkg-config])
|
||||
fi
|
||||
if test -n "$PKG_CONFIG"; then
|
||||
_pkg_min_version=m4_default([$1], [0.9.0])
|
||||
AC_MSG_CHECKING([pkg-config is at least version $_pkg_min_version])
|
||||
if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then
|
||||
AC_MSG_RESULT([yes])
|
||||
else
|
||||
AC_MSG_RESULT([no])
|
||||
PKG_CONFIG=""
|
||||
fi
|
||||
|
||||
fi[]dnl
|
||||
])# PKG_PROG_PKG_CONFIG
|
||||
|
||||
# PKG_CHECK_EXISTS(MODULES, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
|
||||
#
|
||||
# Check to see whether a particular set of modules exists. Similar
|
||||
# to PKG_CHECK_MODULES(), but does not set variables or print errors.
|
||||
#
|
||||
#
|
||||
# Similar to PKG_CHECK_MODULES, make sure that the first instance of
|
||||
# this or PKG_CHECK_MODULES is called, or make sure to call
|
||||
# PKG_CHECK_EXISTS manually
|
||||
# --------------------------------------------------------------
|
||||
AC_DEFUN([PKG_CHECK_EXISTS],
|
||||
[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
|
||||
if test -n "$PKG_CONFIG" && \
|
||||
AC_RUN_LOG([$PKG_CONFIG --exists --print-errors "$1"]); then
|
||||
m4_ifval([$2], [$2], [:])
|
||||
m4_ifvaln([$3], [else
|
||||
$3])dnl
|
||||
fi])
|
||||
|
||||
|
||||
# _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES])
|
||||
# ---------------------------------------------
|
||||
m4_define([_PKG_CONFIG],
|
||||
[if test -n "$$1"; then
|
||||
pkg_cv_[]$1="$$1"
|
||||
elif test -n "$PKG_CONFIG"; then
|
||||
PKG_CHECK_EXISTS([$3],
|
||||
[pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`],
|
||||
[pkg_failed=yes])
|
||||
else
|
||||
pkg_failed=untried
|
||||
fi[]dnl
|
||||
])# _PKG_CONFIG
|
||||
|
||||
# _PKG_SHORT_ERRORS_SUPPORTED
|
||||
# -----------------------------
|
||||
AC_DEFUN([_PKG_SHORT_ERRORS_SUPPORTED],
|
||||
[AC_REQUIRE([PKG_PROG_PKG_CONFIG])
|
||||
if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
|
||||
_pkg_short_errors_supported=yes
|
||||
else
|
||||
_pkg_short_errors_supported=no
|
||||
fi[]dnl
|
||||
])# _PKG_SHORT_ERRORS_SUPPORTED
|
||||
|
||||
|
||||
# PKG_CHECK_MODULES(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND],
|
||||
# [ACTION-IF-NOT-FOUND])
|
||||
#
|
||||
#
|
||||
# Note that if there is a possibility the first call to
|
||||
# PKG_CHECK_MODULES might not happen, you should be sure to include an
|
||||
# explicit call to PKG_PROG_PKG_CONFIG in your configure.ac
|
||||
#
|
||||
#
|
||||
# --------------------------------------------------------------
|
||||
AC_DEFUN([PKG_CHECK_MODULES],
|
||||
[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
|
||||
AC_ARG_VAR([$1][_CFLAGS], [C compiler flags for $1, overriding pkg-config])dnl
|
||||
AC_ARG_VAR([$1][_LIBS], [linker flags for $1, overriding pkg-config])dnl
|
||||
|
||||
pkg_failed=no
|
||||
AC_MSG_CHECKING([for $1])
|
||||
|
||||
_PKG_CONFIG([$1][_CFLAGS], [cflags], [$2])
|
||||
_PKG_CONFIG([$1][_LIBS], [libs], [$2])
|
||||
|
||||
m4_define([_PKG_TEXT], [Alternatively, you may set the environment variables $1[]_CFLAGS
|
||||
and $1[]_LIBS to avoid the need to call pkg-config.
|
||||
See the pkg-config man page for more details.])
|
||||
|
||||
if test $pkg_failed = yes; then
|
||||
_PKG_SHORT_ERRORS_SUPPORTED
|
||||
if test $_pkg_short_errors_supported = yes; then
|
||||
$1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$2" 2>&1`
|
||||
else
|
||||
$1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors "$2" 2>&1`
|
||||
fi
|
||||
# Put the nasty error message in config.log where it belongs
|
||||
echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD
|
||||
|
||||
ifelse([$4], , [AC_MSG_ERROR(dnl
|
||||
[Package requirements ($2) were not met:
|
||||
|
||||
$$1_PKG_ERRORS
|
||||
|
||||
Consider adjusting the PKG_CONFIG_PATH environment variable if you
|
||||
installed software in a non-standard prefix.
|
||||
|
||||
_PKG_TEXT
|
||||
])],
|
||||
[AC_MSG_RESULT([no])
|
||||
$4])
|
||||
elif test $pkg_failed = untried; then
|
||||
ifelse([$4], , [AC_MSG_FAILURE(dnl
|
||||
[The pkg-config script could not be found or is too old. Make sure it
|
||||
is in your PATH or set the PKG_CONFIG environment variable to the full
|
||||
path to pkg-config.
|
||||
|
||||
_PKG_TEXT
|
||||
|
||||
To get pkg-config, see <http://pkg-config.freedesktop.org/>.])],
|
||||
[$4])
|
||||
else
|
||||
$1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS
|
||||
$1[]_LIBS=$pkg_cv_[]$1[]_LIBS
|
||||
AC_MSG_RESULT([yes])
|
||||
ifelse([$3], , :, [$3])
|
||||
fi[]dnl
|
||||
])# PKG_CHECK_MODULES
|
||||
|
|
@ -51,7 +51,7 @@ AC_DEFUN([MOONLIGHT_CHECK_SOUND],
|
|||
|
||||
AC_ARG_WITH(opensles, AC_HELP_STRING([--with-opensles=yes|no],
|
||||
[If you want to enable opensles sound support]),
|
||||
[], [with_opensles=yes])
|
||||
[], [with_opensles=no])
|
||||
|
||||
if test x$with_opensles = xyes; then
|
||||
AC_DEFINE([INCLUDE_OPENSLES], [1], [Include opensles sound support])
|
||||
|
|
|
|||
|
|
@ -0,0 +1,155 @@
|
|||
# pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*-
|
||||
#
|
||||
# Copyright © 2004 Scott James Remnant <scott@netsplit.com>.
|
||||
#
|
||||
# This program is free software; you can redistribute it and/or modify
|
||||
# it under the terms of the GNU General Public License as published by
|
||||
# the Free Software Foundation; either version 2 of the License, or
|
||||
# (at your option) any later version.
|
||||
#
|
||||
# This program is distributed in the hope that it will be useful, but
|
||||
# WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
||||
# General Public License for more details.
|
||||
#
|
||||
# You should have received a copy of the GNU General Public License
|
||||
# along with this program; if not, write to the Free Software
|
||||
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
||||
#
|
||||
# As a special exception to the GNU General Public License, if you
|
||||
# distribute this file as part of a program that contains a
|
||||
# configuration script generated by Autoconf, you may include it under
|
||||
# the same distribution terms that you use for the rest of that program.
|
||||
|
||||
# PKG_PROG_PKG_CONFIG([MIN-VERSION])
|
||||
# ----------------------------------
|
||||
AC_DEFUN([PKG_PROG_PKG_CONFIG],
|
||||
[m4_pattern_forbid([^_?PKG_[A-Z_]+$])
|
||||
m4_pattern_allow([^PKG_CONFIG(_PATH)?$])
|
||||
AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility])dnl
|
||||
if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
|
||||
AC_PATH_TOOL([PKG_CONFIG], [pkg-config])
|
||||
fi
|
||||
if test -n "$PKG_CONFIG"; then
|
||||
_pkg_min_version=m4_default([$1], [0.9.0])
|
||||
AC_MSG_CHECKING([pkg-config is at least version $_pkg_min_version])
|
||||
if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then
|
||||
AC_MSG_RESULT([yes])
|
||||
else
|
||||
AC_MSG_RESULT([no])
|
||||
PKG_CONFIG=""
|
||||
fi
|
||||
|
||||
fi[]dnl
|
||||
])# PKG_PROG_PKG_CONFIG
|
||||
|
||||
# PKG_CHECK_EXISTS(MODULES, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
|
||||
#
|
||||
# Check to see whether a particular set of modules exists. Similar
|
||||
# to PKG_CHECK_MODULES(), but does not set variables or print errors.
|
||||
#
|
||||
#
|
||||
# Similar to PKG_CHECK_MODULES, make sure that the first instance of
|
||||
# this or PKG_CHECK_MODULES is called, or make sure to call
|
||||
# PKG_CHECK_EXISTS manually
|
||||
# --------------------------------------------------------------
|
||||
AC_DEFUN([PKG_CHECK_EXISTS],
|
||||
[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
|
||||
if test -n "$PKG_CONFIG" && \
|
||||
AC_RUN_LOG([$PKG_CONFIG --exists --print-errors "$1"]); then
|
||||
m4_ifval([$2], [$2], [:])
|
||||
m4_ifvaln([$3], [else
|
||||
$3])dnl
|
||||
fi])
|
||||
|
||||
|
||||
# _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES])
|
||||
# ---------------------------------------------
|
||||
m4_define([_PKG_CONFIG],
|
||||
[if test -n "$$1"; then
|
||||
pkg_cv_[]$1="$$1"
|
||||
elif test -n "$PKG_CONFIG"; then
|
||||
PKG_CHECK_EXISTS([$3],
|
||||
[pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`],
|
||||
[pkg_failed=yes])
|
||||
else
|
||||
pkg_failed=untried
|
||||
fi[]dnl
|
||||
])# _PKG_CONFIG
|
||||
|
||||
# _PKG_SHORT_ERRORS_SUPPORTED
|
||||
# -----------------------------
|
||||
AC_DEFUN([_PKG_SHORT_ERRORS_SUPPORTED],
|
||||
[AC_REQUIRE([PKG_PROG_PKG_CONFIG])
|
||||
if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
|
||||
_pkg_short_errors_supported=yes
|
||||
else
|
||||
_pkg_short_errors_supported=no
|
||||
fi[]dnl
|
||||
])# _PKG_SHORT_ERRORS_SUPPORTED
|
||||
|
||||
|
||||
# PKG_CHECK_MODULES(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND],
|
||||
# [ACTION-IF-NOT-FOUND])
|
||||
#
|
||||
#
|
||||
# Note that if there is a possibility the first call to
|
||||
# PKG_CHECK_MODULES might not happen, you should be sure to include an
|
||||
# explicit call to PKG_PROG_PKG_CONFIG in your configure.ac
|
||||
#
|
||||
#
|
||||
# --------------------------------------------------------------
|
||||
AC_DEFUN([PKG_CHECK_MODULES],
|
||||
[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
|
||||
AC_ARG_VAR([$1][_CFLAGS], [C compiler flags for $1, overriding pkg-config])dnl
|
||||
AC_ARG_VAR([$1][_LIBS], [linker flags for $1, overriding pkg-config])dnl
|
||||
|
||||
pkg_failed=no
|
||||
AC_MSG_CHECKING([for $1])
|
||||
|
||||
_PKG_CONFIG([$1][_CFLAGS], [cflags], [$2])
|
||||
_PKG_CONFIG([$1][_LIBS], [libs], [$2])
|
||||
|
||||
m4_define([_PKG_TEXT], [Alternatively, you may set the environment variables $1[]_CFLAGS
|
||||
and $1[]_LIBS to avoid the need to call pkg-config.
|
||||
See the pkg-config man page for more details.])
|
||||
|
||||
if test $pkg_failed = yes; then
|
||||
_PKG_SHORT_ERRORS_SUPPORTED
|
||||
if test $_pkg_short_errors_supported = yes; then
|
||||
$1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$2" 2>&1`
|
||||
else
|
||||
$1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors "$2" 2>&1`
|
||||
fi
|
||||
# Put the nasty error message in config.log where it belongs
|
||||
echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD
|
||||
|
||||
ifelse([$4], , [AC_MSG_ERROR(dnl
|
||||
[Package requirements ($2) were not met:
|
||||
|
||||
$$1_PKG_ERRORS
|
||||
|
||||
Consider adjusting the PKG_CONFIG_PATH environment variable if you
|
||||
installed software in a non-standard prefix.
|
||||
|
||||
_PKG_TEXT
|
||||
])],
|
||||
[AC_MSG_RESULT([no])
|
||||
$4])
|
||||
elif test $pkg_failed = untried; then
|
||||
ifelse([$4], , [AC_MSG_FAILURE(dnl
|
||||
[The pkg-config script could not be found or is too old. Make sure it
|
||||
is in your PATH or set the PKG_CONFIG environment variable to the full
|
||||
path to pkg-config.
|
||||
|
||||
_PKG_TEXT
|
||||
|
||||
To get pkg-config, see <http://pkg-config.freedesktop.org/>.])],
|
||||
[$4])
|
||||
else
|
||||
$1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS
|
||||
$1[]_LIBS=$pkg_cv_[]$1[]_LIBS
|
||||
AC_MSG_RESULT([yes])
|
||||
ifelse([$3], , :, [$3])
|
||||
fi[]dnl
|
||||
])# PKG_CHECK_MODULES
|
||||
|
|
@ -14,7 +14,6 @@
|
|||
#include <config.h>
|
||||
|
||||
#include <glib.h>
|
||||
#include <glib/gstdio.h>
|
||||
|
||||
#include <signal.h>
|
||||
|
||||
|
|
|
|||
|
|
@ -615,8 +615,9 @@ FloatTryParse (const char *str, double *val)
|
|||
|
||||
/* Android implements localeconv, but doesn't have the structure, we're presuming
|
||||
* its always "." there
|
||||
* OSX Doesn't have stpcpy
|
||||
*/
|
||||
#if !defined (PLATFORM_ANDROID)
|
||||
#if !defined (PLATFORM_ANDROID) && !defined (__APPLE__)
|
||||
if (decimal && (locale = localeconv ()) && strcmp (locale->decimal_point, ".") != 0) {
|
||||
/* locale doesn't use '.' as decimal point so we need to munge
|
||||
* the string into the locale's formatting */
|
||||
|
|
|
|||
|
|
@ -13,16 +13,16 @@
|
|||
<ColumnDefinition Width="32"/>
|
||||
<ColumnDefinition Width="32"/>
|
||||
</Grid.ColumnDefinitions>
|
||||
<Border HorizontalAlignment="Left" VerticalAlignment="Top" Background="#FF000000" Padding="1" Grid.Column="0">
|
||||
<Border HorizontalAlignment="Left" VerticalAlignment="Bottom" Background="#FF000000" Padding="1" Grid.Column="0">
|
||||
<TextBlock Foreground="#FFFFFFFF" FontSize="12" Text="000" x:Name="framerate"/>
|
||||
</Border>
|
||||
<Border HorizontalAlignment="Left" VerticalAlignment="Top" Background="#FF000000" Padding="1" Grid.Column="1">
|
||||
<Border HorizontalAlignment="Left" VerticalAlignment="Bottom" Background="#FF000000" Padding="1" Grid.Column="1">
|
||||
<TextBlock Foreground="#FFFFFFFF" FontSize="12" Text="000000" x:Name="videomemoryused"/>
|
||||
</Border>
|
||||
<Border HorizontalAlignment="Left" VerticalAlignment="Top" Background="#FF000000" Padding="1" Grid.Column="2">
|
||||
<Border HorizontalAlignment="Left" VerticalAlignment="Bottom" Background="#FF000000" Padding="1" Grid.Column="2">
|
||||
<TextBlock Foreground="#FFFFFFFF" FontSize="12" Text="000" x:Name="gpuenabledsurfaces"/>
|
||||
</Border>
|
||||
<Border HorizontalAlignment="Left" VerticalAlignment="Top" Background="#FF000000" Padding="1" Grid.Column="3">
|
||||
<Border HorizontalAlignment="Left" VerticalAlignment="Bottom" Background="#FF000000" Padding="1" Grid.Column="3">
|
||||
<TextBlock Foreground="#FFFFFFFF" FontSize="12" Text="000" x:Name="intermediatesurfaces"/>
|
||||
</Border>
|
||||
</Grid>
|
||||
|
|
|
|||
|
|
@ -20,7 +20,6 @@
|
|||
#include "window-cocoa.h"
|
||||
#include "openfile.h"
|
||||
#include "pipeline.h"
|
||||
#include "pipeline-ui.h"
|
||||
#include "timemanager.h"
|
||||
#include "debug-ui-cocoa.h"
|
||||
#include "consent.h"
|
||||
|
|
|
|||
|
|
@ -15,7 +15,6 @@
|
|||
#endif
|
||||
|
||||
#include <glib.h>
|
||||
#include <glib/gstdio.h>
|
||||
|
||||
#include <stdio.h>
|
||||
#include <string.h>
|
||||
|
|
|
|||
|
|
@ -14,6 +14,7 @@ public:
|
|||
|
||||
// creates a platform/windowing system specific surface
|
||||
virtual cairo_surface_t *CreateSurface ();
|
||||
virtual void ExitApplication ();
|
||||
|
||||
MoonWindow *CreateWindow (MoonWindowType windowType, int width, int height, MoonWindow *parentWindow, Surface *surface);
|
||||
MoonWindow *CreateWindowless (int width, int height, PluginInstance *forPlugin);
|
||||
|
|
@ -45,6 +46,15 @@ public:
|
|||
|
||||
void UnregisterWindow (MoonWindow *window);
|
||||
|
||||
virtual void ShowCodecsUnavailableMessage ();
|
||||
|
||||
virtual guint32 GetScreenHeight (MoonWindow *moon_window);
|
||||
|
||||
virtual guint32 GetScreenWidth (MoonWindow *moon_window);
|
||||
|
||||
virtual bool ConvertJPEGToBGRA (void *jpeg, guint32 jpeg_size, guint8 *buffer, guint32 buffer_stride, guint32 buffer_height);
|
||||
|
||||
virtual gchar *GetTemporaryFolder ();
|
||||
private:
|
||||
void *pool;
|
||||
int stride;
|
||||
|
|
|
|||
|
|
@ -10,7 +10,6 @@
|
|||
#include "debug.h"
|
||||
|
||||
#include <glib.h>
|
||||
#include <glib/gstdio.h>
|
||||
|
||||
#include <cairo.h>
|
||||
|
||||
|
|
@ -78,6 +77,18 @@ public:
|
|||
return NO;
|
||||
}
|
||||
|
||||
bool IsRelease ()
|
||||
{
|
||||
g_assert_not_reached ();
|
||||
}
|
||||
|
||||
virtual MoonEventStatus DispatchToWindow (MoonWindow *window)
|
||||
{
|
||||
if (!window || !window->GetSurface())
|
||||
return MoonEventNotHandled;
|
||||
|
||||
return IsRelease () ? window->GetSurface()->HandleUIKeyRelease (this) : window->GetSurface()->HandleUIKeyPress (this);
|
||||
}
|
||||
private:
|
||||
MLEvent *event;
|
||||
};
|
||||
|
|
@ -133,6 +144,14 @@ public:
|
|||
return YES;
|
||||
}
|
||||
|
||||
virtual MoonEventStatus DispatchToWindow (MoonWindow *window)
|
||||
{
|
||||
if (!window || !window->GetSurface())
|
||||
return MoonEventNotHandled;
|
||||
|
||||
return window->GetSurface()->HandleUICrossing (this);
|
||||
}
|
||||
|
||||
private:
|
||||
MLEvent *event;
|
||||
};
|
||||
|
|
@ -188,6 +207,14 @@ public:
|
|||
return NO;
|
||||
}
|
||||
|
||||
virtual MoonEventStatus DispatchToWindow (MoonWindow *window)
|
||||
{
|
||||
if (!window || !window->GetSurface())
|
||||
return MoonEventNotHandled;
|
||||
|
||||
return window->GetSurface()->HandleUICrossing (this);
|
||||
}
|
||||
|
||||
private:
|
||||
MLEvent *event;
|
||||
};
|
||||
|
|
@ -257,6 +284,15 @@ public:
|
|||
return [event.event clickCount];
|
||||
}
|
||||
|
||||
virtual MoonEventStatus DispatchToWindow (MoonWindow *window)
|
||||
{
|
||||
if (!window || !window->GetSurface())
|
||||
return MoonEventNotHandled;
|
||||
|
||||
return IsRelease() ? window->GetSurface()->HandleUIButtonRelease (this) : window->GetSurface()->HandleUIButtonPress (this);
|
||||
}
|
||||
|
||||
|
||||
private:
|
||||
MLEvent *event;
|
||||
};
|
||||
|
|
@ -308,6 +344,14 @@ public:
|
|||
g_assert_not_reached ();
|
||||
}
|
||||
|
||||
virtual MoonEventStatus DispatchToWindow (MoonWindow *window)
|
||||
{
|
||||
if (!window || !window->GetSurface())
|
||||
return MoonEventNotHandled;
|
||||
|
||||
return window->GetSurface()->HandleUIMotion (this);
|
||||
}
|
||||
|
||||
private:
|
||||
MLEvent *event;
|
||||
};
|
||||
|
|
@ -329,14 +373,25 @@ MoonWindowingSystemCocoa::~MoonWindowingSystemCocoa ()
|
|||
[((NSAutoreleasePool *)pool) release];
|
||||
}
|
||||
|
||||
void
|
||||
MoonWindowingSystemCocoa::ShowCodecsUnavailableMessage ()
|
||||
{
|
||||
g_assert_not_reached ();
|
||||
}
|
||||
|
||||
cairo_surface_t *
|
||||
MoonWindowingSystemCocoa::CreateSurface ()
|
||||
{
|
||||
// FIXME...
|
||||
g_assert_not_reached ();
|
||||
}
|
||||
|
||||
void
|
||||
MoonWindowingSystemCocoa::ExitApplication ()
|
||||
{
|
||||
// FIXME
|
||||
exit (1);
|
||||
}
|
||||
|
||||
MoonWindow *
|
||||
MoonWindowingSystemCocoa::CreateWindow (MoonWindowType windowType, int width, int height, MoonWindow *parentWindow, Surface *surface)
|
||||
{
|
||||
|
|
@ -490,6 +545,33 @@ MoonWindowingSystemCocoa::RunMainLoop (MoonWindow *window, bool quit_on_window_c
|
|||
[NSApp run];
|
||||
}
|
||||
|
||||
gchar *
|
||||
MoonWindowingSystemCocoa::GetTemporaryFolder ()
|
||||
{
|
||||
return (gchar *) g_get_tmp_dir ();
|
||||
}
|
||||
|
||||
guint32
|
||||
MoonWindowingSystemCocoa::GetScreenHeight (MoonWindow *moon_window)
|
||||
{
|
||||
MLView *view = (MLView *) moon_window->GetPlatformWindow ();
|
||||
|
||||
return view.frame.size.height;
|
||||
}
|
||||
|
||||
guint32
|
||||
MoonWindowingSystemCocoa::GetScreenWidth (MoonWindow *moon_window)
|
||||
{
|
||||
MLView *view = (MLView *) moon_window->GetPlatformWindow ();
|
||||
|
||||
return view.frame.size.width;
|
||||
}
|
||||
|
||||
bool
|
||||
MoonWindowingSystemCocoa::ConvertJPEGToBGRA (void *jpeg, guint32 jpeg_size, guint8 *buffer, guint32 buffer_stride, guint32 buffer_height)
|
||||
{
|
||||
g_assert_not_reached ();
|
||||
}
|
||||
|
||||
MoonInstallerServiceCocoa::MoonInstallerServiceCocoa ()
|
||||
{
|
||||
|
|
|
|||
|
|
@ -14,7 +14,6 @@
|
|||
#include "config.h"
|
||||
|
||||
#include <glib.h>
|
||||
#include <glib/gstdio.h>
|
||||
|
||||
#include "window-cocoa.h"
|
||||
#include "clipboard-cocoa.h"
|
||||
|
|
@ -355,10 +354,11 @@ void
|
|||
MoonWindowCocoa::ExposeEvent (Rect r)
|
||||
{
|
||||
SetCurrentDeployment ();
|
||||
|
||||
Region *region = new Region (r);
|
||||
cairo_surface_t *native = CreateCairoSurface ();
|
||||
CairoSurface *target = new CairoSurface (native);
|
||||
CairoContext *ctx = new CairoContext (target);
|
||||
CairoSurface *target = new CairoSurface (1, 1);
|
||||
Context *ctx = new CairoContext (target);
|
||||
|
||||
surface->Paint (ctx, region, GetTransparent (), NO);
|
||||
|
||||
|
|
|
|||
|
|
@ -1402,10 +1402,10 @@ cleanup:
|
|||
return result;
|
||||
}
|
||||
|
||||
bool
|
||||
gchar *
|
||||
MoonWindowingSystemGtk::GetTemporaryFolder ()
|
||||
{
|
||||
return g_get_tmp_dir ();
|
||||
return (gchar *) g_get_tmp_dir ();
|
||||
}
|
||||
|
||||
MoonInstallerServiceGtk::MoonInstallerServiceGtk ()
|
||||
|
|
|
|||
|
|
@ -2745,6 +2745,7 @@ MediaThreadPool::WorkerLoop (void *data)
|
|||
|
||||
sigset_t signal_set;
|
||||
int err = 0;
|
||||
#if !defined(__APPLE__)
|
||||
if ((err = sigemptyset (&signal_set)) != 0) {
|
||||
g_warning ("Moonlight: Media thread pool was unable to create an empty set of signals: %s (%i).\n", strerror (err), err);
|
||||
} else if ((err = pthread_sigmask (SIG_SETMASK, &signal_set, NULL)) != 0) {
|
||||
|
|
@ -2773,6 +2774,7 @@ MediaThreadPool::WorkerLoop (void *data)
|
|||
return NULL;
|
||||
}
|
||||
}
|
||||
#endif
|
||||
#endif
|
||||
|
||||
pthread_mutex_lock (&mutex);
|
||||
|
|
|
|||
|
|
@ -27,7 +27,8 @@ void
|
|||
a11y_stat_init (const char *platform_dir)
|
||||
{
|
||||
// Android doesn't have strrstr and will doesn't use a11y, just guard this for now
|
||||
#if !PLATFORM_ANDROID
|
||||
// OSX too
|
||||
#if !PLATFORM_ANDROID && !defined(__APPLE__)
|
||||
//please keep this lookup pattern in sync with the one in A11yHelper.cs (Initiailize() method)
|
||||
const char* moonlight_at_novell = g_strrstr (platform_dir, "moonlight@novell.com");
|
||||
if (moonlight_at_novell != NULL) {
|
||||
|
|
|
|||
Загрузка…
Ссылка в новой задаче