Skip to content

Extremely tiny change: don't map cursors to AWT #4

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ds58 merged 2 commits into from
Aug 9, 2023
Merged

Extremely tiny change: don't map cursors to AWT #4

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
dcb4144
don't map mouse types, but I'm gonna wanna make a java enum for that …
GiantLuigi4 Aug 9, 2023
37e09ab
Merge branch 'CinemaMod:master' into master
GiantLuigi4 Aug 9, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
73 changes: 1 addition & 72 deletions native/display_handler.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,77 +6,6 @@

#include "jni_util.h"

namespace {

int GetCursorId(cef_cursor_type_t type) {
ScopedJNIEnv env;
if (!env)
return 0;

const char* cursorClassName = "java/awt/Cursor";
JNI_STATIC_DEFINE_INT_RV(env, ScopedJNIClass(env, cursorClassName),
CROSSHAIR_CURSOR, 0);
JNI_STATIC_DEFINE_INT_RV(env, ScopedJNIClass(env, cursorClassName),
DEFAULT_CURSOR, 0);
JNI_STATIC_DEFINE_INT_RV(env, ScopedJNIClass(env, cursorClassName),
E_RESIZE_CURSOR, 0);
JNI_STATIC_DEFINE_INT_RV(env, ScopedJNIClass(env, cursorClassName),
HAND_CURSOR, 0);
JNI_STATIC_DEFINE_INT_RV(env, ScopedJNIClass(env, cursorClassName),
MOVE_CURSOR, 0);
JNI_STATIC_DEFINE_INT_RV(env, ScopedJNIClass(env, cursorClassName),
N_RESIZE_CURSOR, 0);
JNI_STATIC_DEFINE_INT_RV(env, ScopedJNIClass(env, cursorClassName),
NE_RESIZE_CURSOR, 0);
JNI_STATIC_DEFINE_INT_RV(env, ScopedJNIClass(env, cursorClassName),
NW_RESIZE_CURSOR, 0);
JNI_STATIC_DEFINE_INT_RV(env, ScopedJNIClass(env, cursorClassName),
S_RESIZE_CURSOR, 0);
JNI_STATIC_DEFINE_INT_RV(env, ScopedJNIClass(env, cursorClassName),
SE_RESIZE_CURSOR, 0);
JNI_STATIC_DEFINE_INT_RV(env, ScopedJNIClass(env, cursorClassName),
SW_RESIZE_CURSOR, 0);
JNI_STATIC_DEFINE_INT_RV(env, ScopedJNIClass(env, cursorClassName),
TEXT_CURSOR, 0);
JNI_STATIC_DEFINE_INT_RV(env, ScopedJNIClass(env, cursorClassName),
W_RESIZE_CURSOR, 0);
JNI_STATIC_DEFINE_INT_RV(env, ScopedJNIClass(env, cursorClassName),
WAIT_CURSOR, 0);

switch (type) {
case CT_CROSS:
return JNI_STATIC(CROSSHAIR_CURSOR);
case CT_HAND:
return JNI_STATIC(HAND_CURSOR);
case CT_IBEAM:
return JNI_STATIC(TEXT_CURSOR);
case CT_WAIT:
return JNI_STATIC(WAIT_CURSOR);
case CT_EASTRESIZE:
return JNI_STATIC(E_RESIZE_CURSOR);
case CT_NORTHRESIZE:
return JNI_STATIC(N_RESIZE_CURSOR);
case CT_NORTHEASTRESIZE:
return JNI_STATIC(NE_RESIZE_CURSOR);
case CT_NORTHWESTRESIZE:
return JNI_STATIC(NW_RESIZE_CURSOR);
case CT_SOUTHRESIZE:
return JNI_STATIC(S_RESIZE_CURSOR);
case CT_SOUTHEASTRESIZE:
return JNI_STATIC(SE_RESIZE_CURSOR);
case CT_SOUTHWESTRESIZE:
return JNI_STATIC(SW_RESIZE_CURSOR);
case CT_WESTRESIZE:
return JNI_STATIC(W_RESIZE_CURSOR);
case CT_MOVE:
return JNI_STATIC(MOVE_CURSOR);
default:
return JNI_STATIC(DEFAULT_CURSOR);
}
}

} // namespace

DisplayHandler::DisplayHandler(JNIEnv* env, jobject handler)
: handle_(env, handler) {}

Expand Down Expand Up @@ -191,7 +120,7 @@ bool DisplayHandler::OnCursorChange(CefRefPtr<CefBrowser> browser,
return false;

ScopedJNIBrowser jbrowser(env, browser);
const int cursorId = GetCursorId(type);
const int cursorId = (int) type;
jboolean jreturn = JNI_FALSE;

JNI_CALL_METHOD(env, handle_, "onCursorChange",
Expand Down