diff options
| author | 3 <alexl@redhat.com> | 2000-12-13 10:03:16 +0000 |
|---|---|---|
| committer | Alexander Larsson <alexl@src.gnome.org> | 2000-12-13 10:03:16 +0000 |
| commit | 02eac1c64dd8bf93136656500633cc0ec903e1f0 (patch) | |
| tree | 9f1d43df287ddfd301c2d94ec16f7faebcaa2c2d /gdk | |
| parent | 2c9eb3a5725420394322ecedb1556d59b5b4bcaa (diff) | |
| download | gtk+-02eac1c64dd8bf93136656500633cc0ec903e1f0.tar.gz | |
Add support for ps2 intellimouse.
2000-12-13 <alexl@redhat.com>
* gdk/linux-fb/gdkmouse-fb.c (mouse_devs):
Add support for ps2 intellimouse.
* gdkkeyboard-fb.c:
Move shift-F1 repaint handling to xlate handler only.
* docs/README.linux-fb:
Add imps2 to docs.
Document the new refresh keys.
Diffstat (limited to 'gdk')
| -rw-r--r-- | gdk/linux-fb/gdkkeyboard-fb.c | 11 | ||||
| -rw-r--r-- | gdk/linux-fb/gdkmouse-fb.c | 7 |
2 files changed, 13 insertions, 5 deletions
diff --git a/gdk/linux-fb/gdkkeyboard-fb.c b/gdk/linux-fb/gdkkeyboard-fb.c index 6f8b135638..046fb64f60 100644 --- a/gdk/linux-fb/gdkkeyboard-fb.c +++ b/gdk/linux-fb/gdkkeyboard-fb.c @@ -371,11 +371,6 @@ gdk_fb_handle_key (guint hw_keycode, gdk_fb_redraw_all (); } - /* Ctrl-Alt Return can't be pressed in the XLATE driver, - * use Shift F1 instead */ - if (key_up && (keyval == GDK_F1) && (modifier_state & GDK_SHIFT_MASK)) - gdk_fb_redraw_all (); - win = gdk_fb_window_find_focus (); event = gdk_event_make (win, key_up ? GDK_KEY_RELEASE : GDK_KEY_PRESS, @@ -767,6 +762,12 @@ xlate_io (GIOChannel *gioc, { if (iscode (xlate_codes[j].str, &buf[i], left)) { + /* Ctrl-Alt Return can't be pressed in the XLATE driver, + * use Shift F1 instead */ + if ((xlate_codes[j].code == GDK_F1) && + (xlate_codes[j].modifier & GDK_SHIFT_MASK)) + gdk_fb_redraw_all (); + gdk_fb_handle_key (xlate_codes[j].code, xlate_codes[j].code, xlate_codes[j].modifier, diff --git a/gdk/linux-fb/gdkmouse-fb.c b/gdk/linux-fb/gdkmouse-fb.c index af50148e01..63e8897c73 100644 --- a/gdk/linux-fb/gdkmouse-fb.c +++ b/gdk/linux-fb/gdkmouse-fb.c @@ -232,6 +232,13 @@ static GdkFBMouseDevice mouse_devs[] = gdk_fb_mouse_ps2_packet, { 0xc0, 0x00 } }, + { "imps2", + 4, + gdk_fb_mouse_ps2_open, + gdk_fb_mouse_ps2_close, + gdk_fb_mouse_ps2_packet, + { 0xc0, 0x00 } + }, { "ms", 3, gdk_fb_mouse_ms_open, |