michael/lwjgl
michael
/
lwjgl
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Linux fixes to absolute coordinates

This commit is contained in:
Elias Naur 2004-11-12 15:43:14 +00:00
parent 7a2f853c44
commit 8458a8cbb7
1 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/native/linux/org_lwjgl_input_Mouse.c
View File

@ -74,16 +74,24 @@ static bool buffer_enabled;
static Cursor blank_cursor; static Cursor blank_cursor;
static Cursor current_cursor; static Cursor current_cursor;
static bool putMouseEvent(jint button, jint state, jint coord1, jint coord2, jint dz) { static bool putMouseEventWithCoords(jint button, jint state, jint coord1, jint coord2, jint dz) {
jint event[] = {button, state, coord1, coord2, dz}; jint event[] = {button, state, coord1, coord2, dz};
return putEvent(&event_queue, event); return putEvent(&event_queue, event);
} }
static bool putMouseEvent(jint button, jint state, jint dz) {
if (pointer_grabbed)
return putMouseEventWithCoords(button, state, 0, 0, dz);
else
return putMouseEventWithCoords(button, state, last_x, last_y, dz);
}
static int transformY(int y) { static int transformY(int y) {
return getWindowHeight() - 1 - y; return getWindowHeight() - 1 - y;
} }
static void setCursorPos(int x, int y) { static void setCursorPos(int x, int y) {
y = transformY(y);
jint dx = x - last_x; jint dx = x - last_x;
jint dy = y - last_y; jint dy = y - last_y;
accum_dx += dx; accum_dx += dx;
@ -91,9 +99,9 @@ static void setCursorPos(int x, int y) {
last_x = x; last_x = x;
last_y = y; last_y = y;
if (pointer_grabbed) { if (pointer_grabbed) {
putMouseEvent(-1, 0, dx, -dy, 0); putMouseEventWithCoords(-1, 0, dx, dy, 0);
} else { } else {
putMouseEvent(-1, 0, x, transformY(y), 0); putMouseEventWithCoords(-1, 0, x, y, 0);
} }
} }
@ -290,7 +298,7 @@ static void handleButton(XButtonEvent *event, unsigned char state) {
if (button_num == NUM_BUTTONS) if (button_num == NUM_BUTTONS)
return; return;
buttons[button_num] = state; buttons[button_num] = state;
putMouseEvent(button_num, state, 0, 0, 0); putMouseEvent(button_num, state, 0);
} }
void handleButtonPress(XButtonEvent *event) { void handleButtonPress(XButtonEvent *event) {
@ -298,11 +306,11 @@ void handleButtonPress(XButtonEvent *event) {
switch (event->button) { switch (event->button) {
case Button4: case Button4:
delta = WHEEL_SCALE; delta = WHEEL_SCALE;
putMouseEvent(-1, 0, 0, 0, delta); putMouseEvent(-1, 0, delta);
break; break;
case Button5: case Button5:
delta = -WHEEL_SCALE; delta = -WHEEL_SCALE;
putMouseEvent(-1, 0, 0, 0, delta); putMouseEvent(-1, 0, delta);
break; break;
default: default:
break; break;
@ -364,10 +372,10 @@ JNIEXPORT void JNICALL Java_org_lwjgl_opengl_LinuxDisplay_pollMouse(JNIEnv * env
} }
if (pointer_grabbed) { if (pointer_grabbed) {
coords[0] = accum_dx; coords[0] = accum_dx;
coords[1] = -accum_dy; coords[1] = accum_dy;
} else { } else {
coords[0] = last_x; coords[0] = last_x;
coords[1] = transformY(last_y); coords[1] = last_y;
} }
coords[2] = accum_dz; coords[2] = accum_dz;
accum_dx = accum_dy = accum_dz = 0; accum_dx = accum_dy = accum_dz = 0;