callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Convert GdkDevice to a GObject.

Browse Source 
2001-06-30  Alex Larsson  <alexl@redhat.com>

	* gdk/linux-fb/gdkinput-none.c:
	* gdk/linux-fb/gdkinput.c:
	* gdk/linux-fb/gdkinputprivate.h:
	Convert GdkDevice to a GObject.

	* linux-fb/gdkprivate-fb.h:
	* linux-fb/gdkvisual-fb.c:
	Convert GdkVisual to a GObject.
This commit is contained in:
Alex Larsson
2001-06-30 04:30:32 +00:00
committed by Alexander Larsson
parent 43696e841d
commit ba02311234
12 changed files with 187 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
ChangeLog
View File

@ -1,3 +1,14 @@
2001-06-30 Alex Larsson <alexl@redhat.com>
* gdk/linux-fb/gdkinput-none.c:
* gdk/linux-fb/gdkinput.c:
* gdk/linux-fb/gdkinputprivate.h:
Convert GdkDevice to a GObject.
* linux-fb/gdkprivate-fb.h:
* linux-fb/gdkvisual-fb.c:
Convert GdkVisual to a GObject.
2001-06-29 Alex Larsson <alexl@redhat.com>
* gdk/gdkvisual.h:

11
ChangeLog.pre-2-0
View File

@ -1,3 +1,14 @@
2001-06-30 Alex Larsson <alexl@redhat.com>
* gdk/linux-fb/gdkinput-none.c:
* gdk/linux-fb/gdkinput.c:
* gdk/linux-fb/gdkinputprivate.h:
Convert GdkDevice to a GObject.
* linux-fb/gdkprivate-fb.h:
* linux-fb/gdkvisual-fb.c:
Convert GdkVisual to a GObject.
2001-06-29 Alex Larsson <alexl@redhat.com>
* gdk/gdkvisual.h:

11
ChangeLog.pre-2-10
View File

@ -1,3 +1,14 @@
2001-06-30 Alex Larsson <alexl@redhat.com>
* gdk/linux-fb/gdkinput-none.c:
* gdk/linux-fb/gdkinput.c:
* gdk/linux-fb/gdkinputprivate.h:
Convert GdkDevice to a GObject.
* linux-fb/gdkprivate-fb.h:
* linux-fb/gdkvisual-fb.c:
Convert GdkVisual to a GObject.
2001-06-29 Alex Larsson <alexl@redhat.com>
* gdk/gdkvisual.h:

11
ChangeLog.pre-2-2
View File

@ -1,3 +1,14 @@
2001-06-30 Alex Larsson <alexl@redhat.com>
* gdk/linux-fb/gdkinput-none.c:
* gdk/linux-fb/gdkinput.c:
* gdk/linux-fb/gdkinputprivate.h:
Convert GdkDevice to a GObject.
* linux-fb/gdkprivate-fb.h:
* linux-fb/gdkvisual-fb.c:
Convert GdkVisual to a GObject.
2001-06-29 Alex Larsson <alexl@redhat.com>
* gdk/gdkvisual.h:

11
ChangeLog.pre-2-4
View File

@ -1,3 +1,14 @@
2001-06-30 Alex Larsson <alexl@redhat.com>
* gdk/linux-fb/gdkinput-none.c:
* gdk/linux-fb/gdkinput.c:
* gdk/linux-fb/gdkinputprivate.h:
Convert GdkDevice to a GObject.
* linux-fb/gdkprivate-fb.h:
* linux-fb/gdkvisual-fb.c:
Convert GdkVisual to a GObject.
2001-06-29 Alex Larsson <alexl@redhat.com>
* gdk/gdkvisual.h:

11
ChangeLog.pre-2-6
View File

@ -1,3 +1,14 @@
2001-06-30 Alex Larsson <alexl@redhat.com>
* gdk/linux-fb/gdkinput-none.c:
* gdk/linux-fb/gdkinput.c:
* gdk/linux-fb/gdkinputprivate.h:
Convert GdkDevice to a GObject.
* linux-fb/gdkprivate-fb.h:
* linux-fb/gdkvisual-fb.c:
Convert GdkVisual to a GObject.
2001-06-29 Alex Larsson <alexl@redhat.com>
* gdk/gdkvisual.h:

11
ChangeLog.pre-2-8
View File

@ -1,3 +1,14 @@
2001-06-30 Alex Larsson <alexl@redhat.com>
* gdk/linux-fb/gdkinput-none.c:
* gdk/linux-fb/gdkinput.c:
* gdk/linux-fb/gdkinputprivate.h:
Convert GdkDevice to a GObject.
* linux-fb/gdkprivate-fb.h:
* linux-fb/gdkvisual-fb.c:
Convert GdkVisual to a GObject.
2001-06-29 Alex Larsson <alexl@redhat.com>
* gdk/gdkvisual.h:

1
gdk/linux-fb/gdkinput-none.c
View File

@ -38,6 +38,7 @@ static void gdk_input_none_get_pointer (GdkWindow *window,
void
gdk_input_init (void)
{
_gdk_init_input_core ();
gdk_input_vtable.set_mode = NULL;
gdk_input_vtable.set_axes = NULL;
gdk_input_vtable.set_key = NULL;

69
gdk/linux-fb/gdkinput.c
View File

@ -37,19 +37,7 @@ static const GdkDeviceAxis gdk_input_core_axes[] = {
{ GDK_AXIS_Y, 0, 0 }
};
static GdkDevice gdk_input_core_info =
{
"Core Pointer",
GDK_SOURCE_MOUSE,
GDK_MODE_SCREEN,
TRUE,
2,
(GdkDeviceAxis *)gdk_input_core_axes,
0,
NULL
};
GdkDevice *gdk_core_pointer = (GdkDevice *)&gdk_input_core_info;
GdkDevice *gdk_core_pointer = NULL;
/* Global variables */
@ -59,6 +47,61 @@ gint gdk_input_ignore_core;
GList *gdk_input_windows;
GList *gdk_input_devices;
void
_gdk_init_input_core (void)
{
gdk_core_pointer = g_object_new (GDK_TYPE_DEVICE, NULL);
gdk_core_pointer->name = "Core Pointer";
gdk_core_pointer->source = GDK_SOURCE_MOUSE;
gdk_core_pointer->mode = GDK_MODE_SCREEN;
gdk_core_pointer->has_cursor = TRUE;
gdk_core_pointer->num_axes = 2;
gdk_core_pointer->axes = gdk_input_core_axes;
gdk_core_pointer->num_keys = 0;
gdk_core_pointer->keys = NULL;
}
static void
gdk_device_finalize (GObject *object)
{
g_error ("A GdkDevice object was finalized. This should not happen");
}
static void
gdk_device_class_init (GObjectClass *class)
{
class->finalize = gdk_device_finalize;
}
GType
gdk_device_get_type (void)
{
static GType object_type = 0;
if (!object_type)
{
static const GTypeInfo object_info =
{
sizeof (GdkDeviceClass),
(GBaseInitFunc) NULL,
(GBaseFinalizeFunc) NULL,
(GClassInitFunc) gdk_device_class_init,
NULL, /* class_finalize */
NULL, /* class_data */
sizeof (GdkDevicePrivate),
0, /* n_preallocs */
(GInstanceInitFunc) NULL,
};
object_type = g_type_register_static (G_TYPE_OBJECT,
"GdkDevice",
&object_info, 0);
}
return object_type;
}
GList *
gdk_devices_list (void)
{

6
gdk/linux-fb/gdkinputprivate.h
View File

@ -98,6 +98,11 @@ struct _GdkDevicePrivate {
GdkDevice info;
};
struct _GdkDeviceClass
{
GObjectClass parent_class;
};
struct _GdkInputWindow
{
/* gdk window */
@ -141,6 +146,7 @@ gint gdk_input_enable_window (GdkWindow *window,
GdkDevicePrivate *gdkdev);
gint gdk_input_disable_window (GdkWindow *window,
GdkDevicePrivate *gdkdev);
void _gdk_init_input_core (void);
GdkDevicePrivate *gdk_input_find_device (guint32 id);
GdkInputWindow *gdk_input_window_find (GdkWindow *window);

8
gdk/linux-fb/gdkprivate-fb.h
View File

@ -155,9 +155,11 @@ struct _GdkFBDisplay
int manager_blocked;
};
typedef struct {
GdkVisual base;
} GdkVisualPrivateFB;
struct _GdkVisualClass
{
GObjectClass parent_class;
};
typedef struct {
GHashTable *hash;

54
gdk/linux-fb/gdkvisual-fb.c
View File

@ -31,10 +31,51 @@
static GdkVisual *system_visual = NULL;
static void
gdk_visual_finalize (GObject *object)
{
g_error ("A GdkVisual object was finalized. This should not happen");
}
static void
gdk_visual_class_init (GObjectClass *class)
{
class->finalize = gdk_visual_finalize;
}
GType
gdk_visual_get_type (void)
{
static GType object_type = 0;
if (!object_type)
{
static const GTypeInfo object_info =
{
sizeof (GdkVisualClass),
(GBaseInitFunc) NULL,
(GBaseFinalizeFunc) NULL,
(GClassInitFunc) gdk_visual_class_init,
NULL, /* class_finalize */
NULL, /* class_data */
sizeof (GdkVisual),
0, /* n_preallocs */
(GInstanceInitFunc) NULL,
};
object_type = g_type_register_static (G_TYPE_OBJECT,
"GdkVisual",
&object_info, 0);
}
return object_type;
}
void
gdk_visual_init (void)
{
system_visual = g_new0 (GdkVisual, 1);
system_visual = g_object_new (GDK_TYPE_VISUAL, NULL);
system_visual->depth = system_visual->bits_per_rgb = gdk_display->modeinfo.bits_per_pixel;
system_visual->byte_order = GDK_LSB_FIRST;
@ -101,17 +142,6 @@ gdk_visual_init (void)
}
}
GdkVisual*
gdk_visual_ref (GdkVisual *visual)
{
return visual;
}
void
gdk_visual_unref (GdkVisual *visual)
{
}
gint
gdk_visual_get_best_depth (void)
{