x11: Use glib malloc funcs for XSettings

[~andy/gtk] / gdk / gdkdeviceprivate.h

diff --git a/gdk/gdkdeviceprivate.h b/gdk/gdkdeviceprivate.h
index a9bb0455f12b0acf4e71947fb44b1bacc0476cad..f30dbdb2a0b4dbe501d9b31cf1e019cbd62db15e 100644 (file)
--- a/gdk/gdkdeviceprivate.h
+++ b/gdk/gdkdeviceprivate.h
@@ -12,9 +12,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library. If not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __GDK_DEVICE_PRIVATE_H__
@@ -31,7 +29,6 @@ G_BEGIN_DECLS
 #define GDK_DEVICE_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), GDK_TYPE_DEVICE, GdkDeviceClass))
 
 typedef struct _GdkDeviceClass GdkDeviceClass;
-
 typedef struct _GdkDeviceKey GdkDeviceKey;
 
 struct _GdkDeviceKey
@@ -85,10 +82,10 @@ struct _GdkDeviceClass
                               GdkScreen  *screen,
                               gint        x,
                               gint        y);
-  gboolean (* query_state)   (GdkDevice        *device,
-                              GdkWindow        *window,
-                              GdkWindow       **root_window,
-                              GdkWindow       **child_window,
+  void (* query_state)       (GdkDevice       *device,
+                              GdkWindow       *window,
+                              GdkWindow      **root_window,
+                              GdkWindow      **child_window,
                               gint             *root_x,
                               gint             *root_y,
                               gint             *win_x,
@@ -124,13 +121,17 @@ guint _gdk_device_add_axis   (GdkDevice   *device,
                               gdouble      min_value,
                               gdouble      max_value,
                               gdouble      resolution);
+void _gdk_device_get_axis_info (GdkDevice  *device,
+                               guint       index,
+                               GdkAtom    *label_atom,
+                               GdkAxisUse *use,
+                               gdouble    *min_value,
+                               gdouble    *max_value,
+                               gdouble    *resolution);
 
 void _gdk_device_set_keys    (GdkDevice   *device,
                               guint        num_keys);
 
-GdkAxisUse _gdk_device_get_axis_use (GdkDevice *device,
-                                     guint      index);
-
 gboolean   _gdk_device_translate_window_coord (GdkDevice *device,
                                                GdkWindow *window,
                                                guint      index,
@@ -157,6 +158,20 @@ void _gdk_device_add_slave (GdkDevice *device,
                             GdkDevice *slave);
 void _gdk_device_remove_slave (GdkDevice *device,
                                GdkDevice *slave);
+void _gdk_device_query_state                  (GdkDevice        *device,
+                                               GdkWindow        *window,
+                                               GdkWindow       **root_window,
+                                               GdkWindow       **child_window,
+                                               gint             *root_x,
+                                               gint             *root_y,
+                                               gint             *win_x,
+                                               gint             *win_y,
+                                               GdkModifierType  *mask);
+GdkWindow * _gdk_device_window_at_position    (GdkDevice        *device,
+                                               gint             *win_x,
+                                               gint             *win_y,
+                                               GdkModifierType  *mask,
+                                               gboolean          get_toplevel);
 
 G_END_DECLS