aniani/elinks
1
0
Fork 0
mirror of https://github.com/rkd77/elinks.git synced 2025-02-02 15:09:23 -05:00
Code

[win32] Some changes in mouse handling

Browse Source 
It is a step forward. There some problems with wheel, the right mouse button.
This commit is contained in:
Witold Filipczyk 2024-01-04 18:29:31 +01:00
parent 84f6a08f83
commit 6642ebe509
3 changed files with 195 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/osdep/osdep.c
View File

@ -959,7 +959,7 @@ elinks_cfmakeraw(struct termios *t)
t->c_cc[VTIME] = 0; t->c_cc[VTIME] = 0;
} }
#if !defined(CONFIG_MOUSE) || (!defined(CONFIG_GPM) && !defined(CONFIG_SYSMOUSE) && !defined(OS2_MOUSE) && !defined(CONFIG_OS_DOS)) #if !defined(CONFIG_MOUSE) || (!defined(CONFIG_GPM) && !defined(CONFIG_SYSMOUSE) && !defined(OS2_MOUSE) && !defined(CONFIG_OS_DOS) && !defined(CONFIG_OS_WIN32))
void * void *
handle_mouse(int cons, void (*fn)(void *, char *, int), handle_mouse(int cons, void (*fn)(void *, char *, int),

197
src/osdep/win32/overrides.c
View File

@ -129,25 +129,199 @@ console_key_read(const KEY_EVENT_RECORD *ker, char *buf, int max)
} }
#ifdef CONFIG_MOUSE #ifdef CONFIG_MOUSE
struct elwin_mouse {
int cons;
void (*fn)(void *, char *, int);
void *data;
} elm;
static int static int
console_mouse_read(const MOUSE_EVENT_RECORD *mer, char *buf, int max) console_mouse_read(const MOUSE_EVENT_RECORD *mer, char *buf, int max)
{ {
struct term_event ev; static struct interlink_event_mouse prev_mouse;
static int prev_buttons;
struct interlink_event ev;
struct interlink_event_mouse mouse;
int len; int len;
int buttons;
int change;
int wheeled;
int extended_button;
if (mer->dwEventFlags || !mer->dwButtonState) /* not mouse down, or shifts */ mouse.x = mer->dwMousePosition.X;
mouse.y = mer->dwMousePosition.Y;
change = (mouse.x != prev_mouse.x || mouse.y != prev_mouse.y);
prev_mouse = mouse;
buttons = mer->dwButtonState & 7;
if (!change && (buttons == prev_buttons) && !mer->dwEventFlags) {
return 0; return 0;
}
set_mouse_term_event(&ev, /* It's horrible. */
1 + mer->dwMousePosition.X, switch (buttons) {
1 + mer->dwMousePosition.Y, case 0:
B_DOWN); switch (prev_buttons) {
case 0:
wheeled = mer->dwEventFlags & MOUSE_WHEELED;
len = int_min(max, sizeof(ev)); if (wheeled) {
memcpy(buf, &ev, len); int16_t v = (mer->dwButtonState >> 16);
return len; mouse.button = v > 0 ? B_WHEEL_UP : B_WHEEL_DOWN;
}
break;
case 1:
case 3:
case 5:
case 7:
mouse.button = B_LEFT | B_UP;
//fprintf(stderr, "LEFT UP ");
break;
case 2:
case 6:
mouse.button = B_MIDDLE | B_UP;
//fprintf(stderr, "MIDDLE UP ");
break;
case 4:
//fprintf(stderr, "RIGHT UP ");
mouse.button = B_RIGHT | B_UP;
break;
}
break;
case 1:
case 3:
case 5:
case 7:
switch (prev_buttons) {
case 0:
case 2:
case 4:
case 6:
//fprintf(stderr, "LEFT DOWN ");
mouse.button = B_LEFT | B_DOWN;
break;
case 1:
case 3:
case 5:
case 7:
if (change) {
mouse.button = B_LEFT | B_DRAG;
//fprintf(stderr, "LEFT DRAG ");
} else {
//fprintf(stderr, "LEFT DOWN2 ");
mouse.button = B_LEFT | B_DOWN;
}
break;
}
break;
case 2:
case 6:
switch (prev_buttons) {
case 1:
case 3:
case 5:
case 7:
//fprintf(stderr, "LEFT UP2 ");
mouse.button = B_LEFT | B_UP;
break;
case 0:
case 4:
//fprintf(stderr, "MIDDLE DOWN ");
mouse.button = B_MIDDLE | B_DOWN;
break;
case 2:
case 6:
if (change) {
mouse.button = B_MIDDLE | B_DRAG;
//fprintf(stderr, "MIDDLE DRAG ");
} else {
//fprintf(stderr, "MIDDLE DOWN2 ");
mouse.button = B_MIDDLE | B_DOWN;
}
break;
}
break;
case 4:
switch (prev_buttons) {
case 1:
case 3:
case 5:
case 7:
mouse.button = B_LEFT | B_UP;
//fprintf(stderr, "LEFT UP3 ");
break;
case 2:
case 6:
mouse.button = B_MIDDLE | B_UP;
//fprintf(stderr, "MIDDLE UP2 ");
break;
case 0:
mouse.button = B_RIGHT | B_DOWN;
//fprintf(stderr, "RIGHT DOWN ");
break;
case 4:
if (change) {
mouse.button = B_RIGHT | B_DRAG;
//fprintf(stderr, "RIGHT DRAG ");
} else {
//fprintf(stderr, "RIGHT DOWN2 ");
mouse.button = B_RIGHT | B_DOWN;
}
break;
}
break;
}
prev_buttons = buttons;
set_mouse_interlink_event(&ev, mouse.x, mouse.y, mouse.button);
if (elm.fn) {
elm.fn(elm.data, (char *)&ev, sizeof(ev));
}
return 0;
} }
static int
init_mouse(int cons, int suspend)
{
return 1;
}
static int
done_mouse(void)
{
return 1;
}
void *
handle_mouse(int cons, void (*fn)(void *, char *, int),
void *data)
{
elm.cons = cons;
elm.fn = fn;
elm.data = data;
return &elm;
}
void
unhandle_mouse(void *h)
{
memset(&elm, 0, sizeof(elm));
}
void
suspend_mouse(void *h)
{
}
void
resume_mouse(void *h)
{
}
#endif #endif
static int static int
@ -188,7 +362,7 @@ static int
console_peek(HANDLE hnd) console_peek(HANDLE hnd)
{ {
DWORD num = 0; DWORD num = 0;
char buf[10]; char buf[32];
int rc = 0; int rc = 0;
if (!GetNumberOfConsoleInputEvents(hnd, &num) || num == 0) if (!GetNumberOfConsoleInputEvents(hnd, &num) || num == 0)
@ -232,8 +406,9 @@ win32_write(int fd, const void *buf, unsigned len)
#if 0 #if 0
WriteConsole ((HANDLE) fd, buf, len, &written, NULL); WriteConsole ((HANDLE) fd, buf, len, &written, NULL);
rc = written; rc = written;
#endif #else
rc = VT100_decode((HANDLE) fd, buf, len); rc = VT100_decode((HANDLE) fd, buf, len);
#endif
} else { } else {
/* stdout redirected */ /* stdout redirected */
rc = write(STDOUT_FILENO, buf, len); rc = write(STDOUT_FILENO, buf, len);

15
src/osdep/win32/win32.c
View File

@ -240,15 +240,11 @@ get_input_handle(void)
static HANDLE hStdIn = INVALID_HANDLE_VALUE; static HANDLE hStdIn = INVALID_HANDLE_VALUE;
if (hStdIn == INVALID_HANDLE_VALUE) { if (hStdIn == INVALID_HANDLE_VALUE) {
DWORD dwMode;
SetConsoleTitle("ELinks - Console mode browser"); SetConsoleTitle("ELinks - Console mode browser");
hStdIn = GetStdHandle(STD_INPUT_HANDLE); hStdIn = GetStdHandle(STD_INPUT_HANDLE);
GetConsoleMode(hStdIn, &dwMode); SetConsoleMode(hStdIn, ENABLE_EXTENDED_FLAGS);
dwMode &= ~(ENABLE_LINE_INPUT | ENABLE_ECHO_INPUT); SetConsoleMode(hStdIn, (ENABLE_WINDOW_INPUT | ENABLE_MOUSE_INPUT));
dwMode |= (ENABLE_WINDOW_INPUT | ENABLE_MOUSE_INPUT);
SetConsoleMode(hStdIn, dwMode);
} }
return (int) hStdIn; return (int) hStdIn;
} }
@ -258,8 +254,13 @@ get_output_handle(void)
{ {
static HANDLE hStdOut = INVALID_HANDLE_VALUE; static HANDLE hStdOut = INVALID_HANDLE_VALUE;
if (hStdOut == INVALID_HANDLE_VALUE) if (hStdOut == INVALID_HANDLE_VALUE) {
DWORD dwMode;
hStdOut = GetStdHandle(STD_OUTPUT_HANDLE); hStdOut = GetStdHandle(STD_OUTPUT_HANDLE);
GetConsoleMode(hStdOut, &dwMode);
SetConsoleMode(hStdOut, dwMode);
}
return (int) hStdOut; return (int) hStdOut;
} }