Skip to content

Android: implement al_get_joystick_name() #1485

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
merged 1 commit into from
Oct 14, 2023
Merged

Android: implement al_get_joystick_name() #1485

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
12 changes: 12 additions & 0 deletions android/gradle_project/allegro/src/main/java/org/liballeg/android/AllegroActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -572,6 +572,18 @@ public int indexOfJoystick(int id) {
return joysticks.indexOf(id, 0);
}

public String getJoystickName(int index) {
if (index >= 0 && index < joysticks.size()) {
int id = joysticks.get(index);
InputDevice input = InputDevice.getDevice(id);

if (input != null)
return input.getName();
}

return "";
}

public void setJoystickActive() {
joystickActive = true;
}
Expand Down
19 changes: 15 additions & 4 deletions src/android/android_joystick.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,25 +9,37 @@ ALLEGRO_DEBUG_CHANNEL("android")
typedef struct ALLEGRO_JOYSTICK_ANDROID {
ALLEGRO_JOYSTICK parent;
ALLEGRO_JOYSTICK_STATE joystate;
const char *name;
char name[64];
} ALLEGRO_JOYSTICK_ANDROID;

static _AL_VECTOR joysticks = _AL_VECTOR_INITIALIZER(ALLEGRO_JOYSTICK_ANDROID *);
static bool initialized;

static char *android_get_joystick_name(JNIEnv *env, jobject activity, int index, char *buffer, size_t buffer_size)
{
jobject str_obj = _jni_callObjectMethodV(env, activity, "getJoystickName", "(I)Ljava/lang/String;", (jint)index);
ALLEGRO_USTR *s = _jni_getString(env, str_obj);
_al_sane_strncpy(buffer, al_cstr(s), buffer_size);
al_ustr_free(s);

return buffer;
}

static void android_init_joysticks(int num)
{
int i, j;
JNIEnv *env = _al_android_get_jnienv();
jobject activity = _al_android_activity_object();

for (i = 0; i < num; i++) {
ALLEGRO_JOYSTICK_ANDROID *stick = al_calloc(1, sizeof(ALLEGRO_JOYSTICK_ANDROID));
ALLEGRO_JOYSTICK_ANDROID **ptr;
ALLEGRO_JOYSTICK *joy;

joy = (void *)stick;
stick->name = "Android Joystick";

/* Fill in the joystick information fields. */
android_get_joystick_name(env, activity, i, stick->name, sizeof(stick->name));
joy->info.num_sticks = 2;
joy->info.num_buttons = 11;
joy->info.stick[0].name = "Stick 1";
Expand Down Expand Up @@ -57,11 +69,10 @@ static bool andjoy_init_joystick(void)
ALLEGRO_JOYSTICK *joy;
int num;

accel->name = "Accelerometer";

joy = (void *)accel;

/* Fill in the joystick information fields. */
_al_sane_strncpy(accel->name, "Accelerometer", sizeof(accel->name));
joy->info.num_sticks = 1;
joy->info.num_buttons = 0;
joy->info.stick[0].name = "Accelerometer";
Expand Down