mirror of
https://github.com/AngelAuraMC/Amethyst-Android.git
synced 2025-09-12 22:26:56 -04:00
More xawt stubs and implements
This commit is contained in:
parent
70a42c3a14
commit
120d727e28
@ -4,10 +4,14 @@ import android.content.*;
|
||||
import android.os.*;
|
||||
import android.system.*;
|
||||
import android.util.*;
|
||||
|
||||
import java.io.*;
|
||||
import java.lang.reflect.*;
|
||||
|
||||
import net.kdt.pojavlaunch.prefs.*;
|
||||
|
||||
import org.lwjgl.glfw.*;
|
||||
|
||||
public class JREUtils
|
||||
{
|
||||
private JREUtils() {}
|
||||
@ -101,6 +105,10 @@ public class JREUtils
|
||||
setEnvironment(launchType, "REGAL_GL_VENDOR", "Android");
|
||||
setEnvironment(launchType, "REGAL_GL_RENDERER", "Regal");
|
||||
setEnvironment(launchType, "REGAL_GL_VERSION", "4.5");
|
||||
|
||||
setEnvironment(launchType, "AWTSTUB_WIDTH", Integer.toString(CallbackBridge.windowWidth));
|
||||
setEnvironment(launchType, "AWTSTUB_HEIGHT", Integer.toString(CallbackBridge.windowHeight));
|
||||
|
||||
// REGAL_GL_EXTENSIONS
|
||||
|
||||
setLdLibraryPath(ldLibraryPath);
|
||||
|
@ -19,11 +19,11 @@ include $(BUILD_SHARED_LIBRARY)
|
||||
# include $(BUILD_SHARED_LIBRARY)
|
||||
|
||||
# libawt_xawt without X11
|
||||
include $(CLEAR_VARS)
|
||||
LOCAL_PATH := $(LOCAL_PATH)/awt_xawt
|
||||
include $(CLEAR_VARS)
|
||||
LOCAL_MODULE := awt_xawt
|
||||
# LOCAL_CFLAGS += -DHEADLESS
|
||||
LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)
|
||||
LOCAL_SRC_FILES := \
|
||||
xawt_fake.c \
|
||||
awt_AWTEvent.c \
|
||||
|
@ -1,12 +1,46 @@
|
||||
/*
|
||||
* Copyright (c) 1998, 2014, Oracle and/or its affiliates. All rights reserved.
|
||||
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
|
||||
*
|
||||
* This code is free software; you can redistribute it and/or modify it
|
||||
* under the terms of the GNU General Public License version 2 only, as
|
||||
* published by the Free Software Foundation. Oracle designates this
|
||||
* particular file as subject to the "Classpath" exception as provided
|
||||
* by Oracle in the LICENSE file that accompanied this code.
|
||||
*
|
||||
* This code 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
|
||||
* version 2 for more details (a copy is included in the LICENSE file that
|
||||
* accompanied this code).
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License version
|
||||
* 2 along with this work; if not, write to the Free Software Foundation,
|
||||
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
|
||||
*
|
||||
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
|
||||
* or visit www.oracle.com if you need additional information or have any
|
||||
* questions.
|
||||
*/
|
||||
|
||||
#include <jni.h>
|
||||
#include <assert.h>
|
||||
|
||||
#include "awt_global.h"
|
||||
|
||||
/*
|
||||
struct X11GraphicsConfigIDs x11GraphicsConfigIDs;
|
||||
struct X11GraphicsDeviceIDs x11GraphicsDeviceIDs;
|
||||
*/
|
||||
char* display = ":0";
|
||||
|
||||
JNIEXPORT jint JNICALL
|
||||
Java_sun_awt_X11GraphicsEnvironment_getDefaultScreenNum(
|
||||
JNIEnv *env, jobject this)
|
||||
{
|
||||
return (jint)0;
|
||||
}
|
||||
|
||||
JNIEXPORT void JNICALL Java_sun_awt_X11GraphicsEnvironment_initDisplay(JNIEnv *env, jobject this, jboolean glxReq) {
|
||||
|
||||
}
|
||||
@ -130,13 +164,14 @@ JNIEXPORT jint JNICALL Java_sun_awt_X11GraphicsConfig_getNumColors(JNIEnv *env,
|
||||
}
|
||||
|
||||
JNIEXPORT void JNICALL Java_sun_awt_X11GraphicsConfig_init(JNIEnv *env, jobject this, jint visualNum, jint screen) {
|
||||
/*
|
||||
(*env)->SetIntField(env, this, x11GraphicsConfigIDs.bitsPerPixel,
|
||||
(jint)tempImage->bits_per_pixel);
|
||||
*/
|
||||
// Android: 16bits pixel
|
||||
jfieldID bitsPerPixel = (*env)->GetFieldID(env, cls, "bitsPerPixel", "I");
|
||||
(*env)->SetIntField(env, (*env)->GetObjectClass(env, this), bitsPerPixel,
|
||||
(jint) 16 /* tempImage->bits_per_pixel */);
|
||||
}
|
||||
|
||||
JNIEXPORT jobject JNICALL Java_sun_awt_X11GraphicsConfig_makeColorModel(JNIEnv *env, jobject this) {
|
||||
// TODO
|
||||
return NULL;
|
||||
}
|
||||
|
||||
@ -160,8 +195,8 @@ Java_sun_awt_X11GraphicsConfig_pGetBounds(JNIEnv *env, jobject this, jint screen
|
||||
bounds = (*env)->NewObject(env, clazz, mid,
|
||||
0, // fbrects[screen].x,
|
||||
0, // fbrects[screen].y,
|
||||
1280, // fbrects[screen].width,
|
||||
720); // fbrects[screen].height);
|
||||
GLOBAL_WIDTH, // fbrects[screen].width,
|
||||
GLOBAL_HEIGHT); // fbrects[screen].height);
|
||||
}
|
||||
return bounds;
|
||||
}
|
||||
@ -304,8 +339,8 @@ Java_sun_awt_X11GraphicsDevice_getCurrentDisplayMode
|
||||
{
|
||||
// TODO change width height
|
||||
return X11GD_CreateDisplayMode(env,
|
||||
1280, // curSize.width,
|
||||
720, // curSize.height,
|
||||
GLOBAL_WIDTH, // curSize.width,
|
||||
GLOBAL_HEIGHT, // curSize.height,
|
||||
-1, // BIT_DEPTH_MULTI, // FIXME should be -1?
|
||||
60 /* refresh rate */);
|
||||
}
|
||||
|
@ -1,3 +1,28 @@
|
||||
/*
|
||||
* Copyright (c) 1998, 2014, Oracle and/or its affiliates. All rights reserved.
|
||||
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
|
||||
*
|
||||
* This code is free software; you can redistribute it and/or modify it
|
||||
* under the terms of the GNU General Public License version 2 only, as
|
||||
* published by the Free Software Foundation. Oracle designates this
|
||||
* particular file as subject to the "Classpath" exception as provided
|
||||
* by Oracle in the LICENSE file that accompanied this code.
|
||||
*
|
||||
* This code 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
|
||||
* version 2 for more details (a copy is included in the LICENSE file that
|
||||
* accompanied this code).
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License version
|
||||
* 2 along with this work; if not, write to the Free Software Foundation,
|
||||
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
|
||||
*
|
||||
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
|
||||
* or visit www.oracle.com if you need additional information or have any
|
||||
* questions.
|
||||
*/
|
||||
|
||||
#include <jni.h>
|
||||
|
||||
/*
|
||||
|
8
app/src/main/jni/awt_xawt/awt_global.h
Normal file
8
app/src/main/jni/awt_xawt/awt_global.h
Normal file
@ -0,0 +1,8 @@
|
||||
#ifndef AWT_GLOBAL_H
|
||||
#define AWT_GLOBAL_H
|
||||
|
||||
int GLOBAL_WIDTH;
|
||||
int GLOBAL_HEIGHT;
|
||||
|
||||
#endif // AWT_GLOBAL_H
|
||||
|
@ -1,4 +1,14 @@
|
||||
#include <jni.h>
|
||||
#include <stdlib.h>
|
||||
|
||||
#include "awt_global.h"
|
||||
|
||||
jint JNI_OnLoad(JavaVM* vm, void* reserved) {
|
||||
GLOBAL_WIDTH = atoi(getenv("AWTSTUB_WIDTH"));
|
||||
GLOBAL_HEIGHT = atoi(getenv("AWTSTUB_HEIGHT"));
|
||||
|
||||
return JNI_VERSION_1_4;
|
||||
}
|
||||
|
||||
JNIEXPORT void JNICALL Java_java_awt_FileDialog_initIDs(JNIEnv *env, jclass cls) {}
|
||||
JNIEXPORT void JNICALL Java_java_awt_Font_initIDs(JNIEnv *env, jclass cls) {}
|
||||
@ -20,5 +30,5 @@ JNIEXPORT void JNICALL Java_java_awt_Dialog_initIDs(JNIEnv *env, jclass cls) {}
|
||||
JNIEXPORT void JNICALL Java_java_awt_KeyboardFocusManager_initIDs(JNIEnv *env, jclass cls) {}
|
||||
JNIEXPORT void JNICALL Java_java_awt_TrayIcon_initIDs(JNIEnv *env, jclass cls) {}
|
||||
JNIEXPORT void JNICALL Java_sun_awt_X11_XWindow_initIDs(JNIEnv *env, jclass cls) {}
|
||||
JNIEXPORT void JNICALL Java_sun_awt_SunFontManager_initIDs(JNIEnv *env, jclass cls) {}
|
||||
JNIEXPORT void JNICALL Java_sun_font_SunFontManager_initIDs(JNIEnv *env, jclass cls) {}
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user