diff options
| author | Kazutaka YOKOTA <yokota@FreeBSD.org> | 1999-11-08 10:04:29 +0000 |
|---|---|---|
| committer | Kazutaka YOKOTA <yokota@FreeBSD.org> | 1999-11-08 10:04:29 +0000 |
| commit | 51ebcb230eb00b4465e7b69ed7b05a80a772fae3 (patch) | |
| tree | 236b452028c99ea5f8cbf800d6f545b8186069d2 | |
| parent | 0ed43ec68c386d0617697dee7cab92d88408896f (diff) | |
Notes
| -rw-r--r-- | sys/alpha/conf/options.alpha | 1 | ||||
| -rw-r--r-- | sys/conf/options.alpha | 1 | ||||
| -rw-r--r-- | sys/conf/options.i386 | 1 | ||||
| -rw-r--r-- | sys/dev/syscons/scmouse.c | 12 | ||||
| -rw-r--r-- | sys/i386/conf/options.i386 | 1 |
5 files changed, 14 insertions, 2 deletions
diff --git a/sys/alpha/conf/options.alpha b/sys/alpha/conf/options.alpha index 6303c74e4501..5bdcc8afe2d5 100644 --- a/sys/alpha/conf/options.alpha +++ b/sys/alpha/conf/options.alpha @@ -35,6 +35,7 @@ SC_NO_HISTORY opt_syscons.h SC_NO_SYSMOUSE opt_syscons.h SC_PIXEL_MODE opt_syscons.h SC_RENDER_DEBUG opt_syscons.h +SC_TWOBUTTON_MOUSE opt_syscons.h VGA_ALT_SEQACCESS opt_vga.h VGA_DEBUG opt_vga.h diff --git a/sys/conf/options.alpha b/sys/conf/options.alpha index 6303c74e4501..5bdcc8afe2d5 100644 --- a/sys/conf/options.alpha +++ b/sys/conf/options.alpha @@ -35,6 +35,7 @@ SC_NO_HISTORY opt_syscons.h SC_NO_SYSMOUSE opt_syscons.h SC_PIXEL_MODE opt_syscons.h SC_RENDER_DEBUG opt_syscons.h +SC_TWOBUTTON_MOUSE opt_syscons.h VGA_ALT_SEQACCESS opt_vga.h VGA_DEBUG opt_vga.h diff --git a/sys/conf/options.i386 b/sys/conf/options.i386 index 4cae5c08b052..147bffe841a4 100644 --- a/sys/conf/options.i386 +++ b/sys/conf/options.i386 @@ -75,6 +75,7 @@ SC_NO_HISTORY opt_syscons.h SC_NO_SYSMOUSE opt_syscons.h SC_PIXEL_MODE opt_syscons.h SC_RENDER_DEBUG opt_syscons.h +SC_TWOBUTTON_MOUSE opt_syscons.h VGA_ALT_SEQACCESS opt_vga.h VGA_DEBUG opt_vga.h diff --git a/sys/dev/syscons/scmouse.c b/sys/dev/syscons/scmouse.c index bc4d93a14235..496cd7c32d37 100644 --- a/sys/dev/syscons/scmouse.c +++ b/sys/dev/syscons/scmouse.c @@ -45,6 +45,14 @@ #include <dev/syscons/syscons.h> +#ifdef SC_TWOBUTTON_MOUSE +#define SC_MOUSE_PASTEBUTTON MOUSE_BUTTON3DOWN /* right button */ +#define SC_MOUSE_EXTENDBUTTON MOUSE_BUTTON2DOWN /* not really used */ +#else +#define SC_MOUSE_PASTEBUTTON MOUSE_BUTTON2DOWN /* middle button */ +#define SC_MOUSE_EXTENDBUTTON MOUSE_BUTTON3DOWN /* right button */ +#endif /* SC_TWOBUTTON_MOUSE */ + #define SC_WAKEUP_DELTA 20 /* for backward compatibility */ @@ -919,7 +927,7 @@ sc_mouse_ioctl(struct tty *tp, u_long cmd, caddr_t data, int flag, break; } break; - case MOUSE_BUTTON2DOWN: + case SC_MOUSE_PASTEBUTTON: switch (mouse->u.event.value) { case 0: /* up */ break; @@ -928,7 +936,7 @@ sc_mouse_ioctl(struct tty *tp, u_long cmd, caddr_t data, int flag, break; } break; - case MOUSE_BUTTON3DOWN: + case SC_MOUSE_EXTENDBUTTON: switch (mouse->u.event.value) { case 0: /* up */ if (!(cur_scp->mouse_buttons & MOUSE_BUTTON1DOWN)) diff --git a/sys/i386/conf/options.i386 b/sys/i386/conf/options.i386 index 4cae5c08b052..147bffe841a4 100644 --- a/sys/i386/conf/options.i386 +++ b/sys/i386/conf/options.i386 @@ -75,6 +75,7 @@ SC_NO_HISTORY opt_syscons.h SC_NO_SYSMOUSE opt_syscons.h SC_PIXEL_MODE opt_syscons.h SC_RENDER_DEBUG opt_syscons.h +SC_TWOBUTTON_MOUSE opt_syscons.h VGA_ALT_SEQACCESS opt_vga.h VGA_DEBUG opt_vga.h |