git-svn-id: https://pcsxr.svn.codeplex.com/svn/pcsxr@66880 e17a0e51-4ae3-4d35-97c3-1a29b211df97

4 files changed, 8 insertions, 20 deletions

diff --git a/plugins/dfinput/Makefile.am b/plugins/dfinput/Makefile.am
index a7ef7888..c9ea709d 100644
--- a/plugins/dfinput/Makefile.am
+++ b/plugins/dfinput/Makefile.am
@@ -3,7 +3,7 @@ libdir = @libdir@/games/psemu/
 
 lib_LTLIBRARIES = libDFInput.la
 
-libDFInput_la_SOURCES = cfg.c pad.c pad.h sdljoy.c xkb.c analog.c
+libDFInput_la_SOURCES = cfg.c pad.c pad.h sdljoy.c xkb.c analog.c util.c
 libDFInput_la_LDFLAGS = -module -avoid-version 
 libDFInput_la_LIBADD = -lpthread -lX11 $(SDL_LIBS)
 
diff --git a/plugins/dfinput/cfg-gtk2.c b/plugins/dfinput/cfg-gtk2.c
index 7921f726..5328401f 100644
--- a/plugins/dfinput/cfg-gtk2.c
+++ b/plugins/dfinput/cfg-gtk2.c
@@ -658,12 +658,12 @@ long PADconfigure() {
 	gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(widget), g.cfg.Threaded);

 	g_signal_connect_data(GTK_OBJECT(widget), "toggled",

 		G_CALLBACK(OnThreadedToggled), NULL, NULL, G_CONNECT_AFTER);

-

+/*

     widget = gtk_builder_get_object(xml, "checkcg");

     gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(widget), g.cfg.HideCursor);

     g_signal_connect_data(GTK_OBJECT(widget), "toggled",

         G_CALLBACK(OnHideCursorToggled), NULL, NULL, G_CONNECT_AFTER);

-    

+*/

 	widget = gtk_builder_get_object(xml, "combodev1");

 	g_signal_connect_data(GTK_OBJECT(widget), "changed",

 		G_CALLBACK(OnDeviceChanged), (gpointer)0, NULL, G_CONNECT_AFTER);

diff --git a/plugins/dfinput/dfinput.ui b/plugins/dfinput/dfinput.ui
index 5d3ef1ef..e76898a5 100644
--- a/plugins/dfinput/dfinput.ui
+++ b/plugins/dfinput/dfinput.ui
@@ -477,21 +477,6 @@
                     <property name="position">0</property>
                   </packing>
                 </child>
-                <child>
-                  <object class="GtkCheckButton" id="checkcg">
-                    <property name="label" translatable="yes">Hide cursor</property>
-                    <property name="visible">True</property>
-                    <property name="sensitive">False</property>
-                    <property name="can_focus">True</property>
-                    <property name="receives_default">False</property>
-                    <property name="draw_indicator">True</property>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">False</property>
-                    <property name="position">1</property>
-                  </packing>
-                </child>
               </object>
               <packing>
                 <property name="position">2</property>
diff --git a/plugins/dfinput/xkb.c b/plugins/dfinput/xkb.c
index 6a7a21bd..7e2601ae 100644
--- a/plugins/dfinput/xkb.c
+++ b/plugins/dfinput/xkb.c
@@ -17,6 +17,7 @@
  */
 
 #include "pad.h"
+#include "util.h"
 
 static Atom wmprotocols, wmdelwindow;
 static int g_currentMouse_X;
@@ -33,7 +34,8 @@ void InitKeyboard() {
         g.cfg.PadDef[1].Type == PSE_PAD_TYPE_MOUSE) {
         int revert_to;
         XGetInputFocus(g.Disp, &window, &revert_to);
-        XGrabPointer(g.Disp, window, True, ButtonPressMask, GrabModeAsync, GrabModeAsync, window, None, CurrentTime);
+        grabCursor(g.Disp, window, 1);
+        showCursor(g.Disp, window, 0);
     }
     
     g_currentMouse_X = 0;
@@ -48,7 +50,8 @@ void DestroyKeyboard() {
     
     if (g.cfg.PadDef[0].Type == PSE_PAD_TYPE_MOUSE ||
         g.cfg.PadDef[1].Type == PSE_PAD_TYPE_MOUSE) {
-        XUngrabPointer(g.Disp, CurrentTime);
+        grabCursor(g.Disp, window, 0);
+        showCursor(g.Disp, window, 1);
     }
 }