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.

10 files changed, 107 insertions, 7 deletions

diff --git a/ChangeLog b/ChangeLog
index 0a6f807984..951456601a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+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.
+	
 Tue Dec 12 23:46:44 2000  Tim Janik  <timj@gtk.org>
 
 	* gtk/stock-icons/Makefile.am: doh, this was broken beyond believe.
diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index 0a6f807984..951456601a 100644
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,15 @@
+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.
+	
 Tue Dec 12 23:46:44 2000  Tim Janik  <timj@gtk.org>
 
 	* gtk/stock-icons/Makefile.am: doh, this was broken beyond believe.
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 0a6f807984..951456601a 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,15 @@
+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.
+	
 Tue Dec 12 23:46:44 2000  Tim Janik  <timj@gtk.org>
 
 	* gtk/stock-icons/Makefile.am: doh, this was broken beyond believe.
diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 0a6f807984..951456601a 100644
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,15 @@
+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.
+	
 Tue Dec 12 23:46:44 2000  Tim Janik  <timj@gtk.org>
 
 	* gtk/stock-icons/Makefile.am: doh, this was broken beyond believe.
diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 0a6f807984..951456601a 100644
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,15 @@
+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.
+	
 Tue Dec 12 23:46:44 2000  Tim Janik  <timj@gtk.org>
 
 	* gtk/stock-icons/Makefile.am: doh, this was broken beyond believe.
diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 0a6f807984..951456601a 100644
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,15 @@
+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.
+	
 Tue Dec 12 23:46:44 2000  Tim Janik  <timj@gtk.org>
 
 	* gtk/stock-icons/Makefile.am: doh, this was broken beyond believe.
diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 0a6f807984..951456601a 100644
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,15 @@
+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.
+	
 Tue Dec 12 23:46:44 2000  Tim Janik  <timj@gtk.org>
 
 	* gtk/stock-icons/Makefile.am: doh, this was broken beyond believe.
diff --git a/docs/README.linux-fb b/docs/README.linux-fb
index 6203e32409..8a882982b2 100644
--- a/docs/README.linux-fb
+++ b/docs/README.linux-fb
@@ -103,6 +103,7 @@ GDK_DISPLAY:
 GDK_MOUSE_TYPE:
  Specify mouse type. Currently supported is:
   ps2 - PS/2 mouse
+  imps2 - PS/2 intellimouse (wheelmouse)
   ms - Microsoft serial mouse
   fidmour - touch screen
  Default is ps2.
@@ -124,9 +125,16 @@ GDK_KEYBOARD_TYPE:
 
 HACKING:
 --------
-Pressing shift-F1 forces a repaint of the whole screen.
 
-To be written.
+Pressing Ctrl-Alt-Return repaints the whole screen.
+Unfortunately this cannot be pressed when using the xlate keyboard
+driver, so instead you can use shift-F1 instead when using this
+driver.
+
+Pressing Ctrl-Alt-BackSpace kills the GtkFB program. (Can't be pressed
+in the xlate driver.
+
+More to be written.
 
    - Alexander Larsson <alexl@redhat.com>
      2000/12/06
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,