Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Menu
Open sidebar
Dorota Czaplejewicz
gtk
Commits
ff8a3347
Commit
ff8a3347
authored
Dec 10, 2010
by
Matthias Clasen
Browse files
Hide GdkDevice struct
Once its hidden, we can kill the GdkDevicePrivate struct too.
parent
b5df5012
Changes
3
Expand all
Hide whitespace changes
Inline
Side-by-side
gdk/gdkdevice.c
View file @
ff8a3347
This diff is collapsed.
Click to expand it.
gdk/gdkdevice.h
View file @
ff8a3347
...
...
@@ -156,14 +156,6 @@ struct _GdkTimeCoord
gdouble
axes
[
GDK_MAX_TIMECOORD_AXES
];
};
struct
_GdkDevice
{
GObject
parent_instance
;
/*< private >*/
GdkDevicePrivate
*
priv
;
};
GType
gdk_device_get_type
(
void
)
G_GNUC_CONST
;
G_CONST_RETURN
gchar
*
gdk_device_get_name
(
GdkDevice
*
device
);
...
...
@@ -172,11 +164,11 @@ gboolean gdk_device_get_has_cursor (GdkDevice *device);
/* Functions to configure a device */
GdkInputSource
gdk_device_get_source
(
GdkDevice
*
device
);
void
gdk_device_set_source
(
GdkDevice
*
device
,
GdkInputSource
source
);
GdkInputSource
source
);
GdkInputMode
gdk_device_get_mode
(
GdkDevice
*
device
);
gboolean
gdk_device_set_mode
(
GdkDevice
*
device
,
GdkInputMode
mode
);
GdkInputMode
mode
);
gint
gdk_device_get_n_keys
(
GdkDevice
*
device
);
gboolean
gdk_device_get_key
(
GdkDevice
*
device
,
...
...
@@ -184,9 +176,9 @@ gboolean gdk_device_get_key (GdkDevice *device,
guint
*
keyval
,
GdkModifierType
*
modifiers
);
void
gdk_device_set_key
(
GdkDevice
*
device
,
guint
index_
,
guint
keyval
,
GdkModifierType
modifiers
);
guint
index_
,
guint
keyval
,
GdkModifierType
modifiers
);
GdkAxisUse
gdk_device_get_axis_use
(
GdkDevice
*
device
,
guint
index_
);
...
...
@@ -196,17 +188,17 @@ void gdk_device_set_axis_use (GdkDevice *device,
void
gdk_device_get_state
(
GdkDevice
*
device
,
GdkWindow
*
window
,
gdouble
*
axes
,
GdkModifierType
*
mask
);
GdkWindow
*
window
,
gdouble
*
axes
,
GdkModifierType
*
mask
);
gboolean
gdk_device_get_history
(
GdkDevice
*
device
,
GdkWindow
*
window
,
guint32
start
,
guint32
stop
,
GdkTimeCoord
***
events
,
gint
*
n_events
);
GdkWindow
*
window
,
guint32
start
,
guint32
stop
,
GdkTimeCoord
***
events
,
gint
*
n_events
);
void
gdk_device_free_history
(
GdkTimeCoord
**
events
,
gint
n_events
);
gint
n_events
);
gint
gdk_device_get_n_axes
(
GdkDevice
*
device
);
GList
*
gdk_device_list_axes
(
GdkDevice
*
device
);
...
...
@@ -216,9 +208,9 @@ gboolean gdk_device_get_axis_value (GdkDevice *device,
gdouble
*
value
);
gboolean
gdk_device_get_axis
(
GdkDevice
*
device
,
gdouble
*
axes
,
GdkAxisUse
use
,
gdouble
*
value
);
gdouble
*
axes
,
GdkAxisUse
use
,
gdouble
*
value
);
GdkDisplay
*
gdk_device_get_display
(
GdkDevice
*
device
);
GdkDevice
*
gdk_device_get_associated_device
(
GdkDevice
*
device
);
...
...
gdk/gdkdeviceprivate.h
View file @
ff8a3347
...
...
@@ -20,8 +20,9 @@
#ifndef __GDK_DEVICE_PRIVATE_H__
#define __GDK_DEVICE_PRIVATE_H__
#include <gdk/gdkdevice.h>
#include <gdk/gdkevents.h>
#include "gdkdevicemanager.h"
#include "gdkdevice.h"
#include "gdkevents.h"
G_BEGIN_DECLS
...
...
@@ -31,21 +32,50 @@ G_BEGIN_DECLS
typedef
struct
_GdkDeviceClass
GdkDeviceClass
;
typedef
struct
_GdkDeviceKey
GdkDeviceKey
;
struct
_GdkDeviceKey
{
guint
keyval
;
GdkModifierType
modifiers
;
};
struct
_GdkDevice
{
GObject
parent_instance
;
gchar
*
name
;
GdkInputSource
source
;
GdkInputMode
mode
;
gboolean
has_cursor
;
gint
num_keys
;
GdkDeviceKey
*
keys
;
GdkDeviceManager
*
manager
;
GdkDisplay
*
display
;
/* Paired master for master,
* associated master for slaves
*/
GdkDevice
*
associated
;
GList
*
slaves
;
GdkDeviceType
type
;
GArray
*
axes
;
};
struct
_GdkDeviceClass
{
GObjectClass
parent_class
;
gboolean
(
*
get_history
)
(
GdkDevice
*
device
,
GdkWindow
*
window
,
guint32
start
,
guint32
stop
,
GdkTimeCoord
***
events
,
gint
*
n_events
);
void
(
*
get_state
)
(
GdkDevice
*
device
,
GdkWindow
*
window
,
gdouble
*
axes
,
GdkModifierType
*
mask
);
gboolean
(
*
get_history
)
(
GdkDevice
*
device
,
GdkWindow
*
window
,
guint32
start
,
guint32
stop
,
GdkTimeCoord
***
events
,
gint
*
n_events
);
void
(
*
get_state
)
(
GdkDevice
*
device
,
GdkWindow
*
window
,
gdouble
*
axes
,
GdkModifierType
*
mask
);
void
(
*
set_window_cursor
)
(
GdkDevice
*
device
,
GdkWindow
*
window
,
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment