summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--ChangeLog9
-rw-r--r--ChangeLog.pre-2-09
-rw-r--r--ChangeLog.pre-2-109
-rw-r--r--ChangeLog.pre-2-29
-rw-r--r--ChangeLog.pre-2-49
-rw-r--r--ChangeLog.pre-2-69
-rw-r--r--ChangeLog.pre-2-89
-rw-r--r--gdk/linux-fb/gdkevents-fb.c56
-rw-r--r--gdk/linux-fb/gdkinput-ps2.c11
9 files changed, 101 insertions, 29 deletions
diff --git a/ChangeLog b/ChangeLog
index 50ede2f176..ec294fc959 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2000-12-06 Alexander Larsson <alexl@redhat.com>
+
+ * gdk/linux-fb/gdkevents-fb.c:
+ Update to match latest gmain/gsource changes.
+
+ * gdk/linux-fb/gdkinput-ps2.c:
+ Bogus gdk_keymap_get_entries_for_keycode implementation so that
+ it links. Will be implemented later.
+
2000-12-03 Havoc Pennington <hp@pobox.com>
* gdk/Makefile.am: add gdkkeys.[hc]
diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index 50ede2f176..ec294fc959 100644
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,12 @@
+2000-12-06 Alexander Larsson <alexl@redhat.com>
+
+ * gdk/linux-fb/gdkevents-fb.c:
+ Update to match latest gmain/gsource changes.
+
+ * gdk/linux-fb/gdkinput-ps2.c:
+ Bogus gdk_keymap_get_entries_for_keycode implementation so that
+ it links. Will be implemented later.
+
2000-12-03 Havoc Pennington <hp@pobox.com>
* gdk/Makefile.am: add gdkkeys.[hc]
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 50ede2f176..ec294fc959 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,12 @@
+2000-12-06 Alexander Larsson <alexl@redhat.com>
+
+ * gdk/linux-fb/gdkevents-fb.c:
+ Update to match latest gmain/gsource changes.
+
+ * gdk/linux-fb/gdkinput-ps2.c:
+ Bogus gdk_keymap_get_entries_for_keycode implementation so that
+ it links. Will be implemented later.
+
2000-12-03 Havoc Pennington <hp@pobox.com>
* gdk/Makefile.am: add gdkkeys.[hc]
diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 50ede2f176..ec294fc959 100644
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,12 @@
+2000-12-06 Alexander Larsson <alexl@redhat.com>
+
+ * gdk/linux-fb/gdkevents-fb.c:
+ Update to match latest gmain/gsource changes.
+
+ * gdk/linux-fb/gdkinput-ps2.c:
+ Bogus gdk_keymap_get_entries_for_keycode implementation so that
+ it links. Will be implemented later.
+
2000-12-03 Havoc Pennington <hp@pobox.com>
* gdk/Makefile.am: add gdkkeys.[hc]
diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 50ede2f176..ec294fc959 100644
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,12 @@
+2000-12-06 Alexander Larsson <alexl@redhat.com>
+
+ * gdk/linux-fb/gdkevents-fb.c:
+ Update to match latest gmain/gsource changes.
+
+ * gdk/linux-fb/gdkinput-ps2.c:
+ Bogus gdk_keymap_get_entries_for_keycode implementation so that
+ it links. Will be implemented later.
+
2000-12-03 Havoc Pennington <hp@pobox.com>
* gdk/Makefile.am: add gdkkeys.[hc]
diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 50ede2f176..ec294fc959 100644
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,12 @@
+2000-12-06 Alexander Larsson <alexl@redhat.com>
+
+ * gdk/linux-fb/gdkevents-fb.c:
+ Update to match latest gmain/gsource changes.
+
+ * gdk/linux-fb/gdkinput-ps2.c:
+ Bogus gdk_keymap_get_entries_for_keycode implementation so that
+ it links. Will be implemented later.
+
2000-12-03 Havoc Pennington <hp@pobox.com>
* gdk/Makefile.am: add gdkkeys.[hc]
diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 50ede2f176..ec294fc959 100644
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,12 @@
+2000-12-06 Alexander Larsson <alexl@redhat.com>
+
+ * gdk/linux-fb/gdkevents-fb.c:
+ Update to match latest gmain/gsource changes.
+
+ * gdk/linux-fb/gdkinput-ps2.c:
+ Bogus gdk_keymap_get_entries_for_keycode implementation so that
+ it links. Will be implemented later.
+
2000-12-03 Havoc Pennington <hp@pobox.com>
* gdk/Makefile.am: add gdkkeys.[hc]
diff --git a/gdk/linux-fb/gdkevents-fb.c b/gdk/linux-fb/gdkevents-fb.c
index 3a6002c06a..7b756c7495 100644
--- a/gdk/linux-fb/gdkevents-fb.c
+++ b/gdk/linux-fb/gdkevents-fb.c
@@ -33,16 +33,19 @@
* Functions for maintaining the event queue *
*********************************************/
-static gboolean fb_events_prepare (gpointer source_data,
- GTimeVal *current_time,
- gint *timeout,
- gpointer user_data);
-static gboolean fb_events_check (gpointer source_data,
- GTimeVal *current_time,
- gpointer user_data);
-static gboolean fb_events_dispatch (gpointer source_data,
- GTimeVal *dispatch_time,
- gpointer user_data);
+static gboolean fb_events_prepare (GSource *source,
+ gint *timeout);
+static gboolean fb_events_check (GSource *source);
+static gboolean fb_events_dispatch (GSource *source,
+ GSourceFunc callback,
+ gpointer user_data);
+
+static GSourceFuncs fb_events_funcs = {
+ fb_events_prepare,
+ fb_events_check,
+ fb_events_dispatch,
+ NULL
+};
guint32
gdk_fb_get_time(void)
@@ -56,14 +59,13 @@ gdk_fb_get_time(void)
void
gdk_events_init (void)
{
- static GSourceFuncs fb_events_funcs = {
- fb_events_prepare,
- fb_events_check,
- fb_events_dispatch,
- NULL
- };
-
- g_source_add (GDK_PRIORITY_EVENTS, TRUE, &fb_events_funcs, NULL, NULL, NULL);
+ GSource *source;
+
+ source = g_source_new (&fb_events_funcs, sizeof (GSource));
+ g_source_set_priority (source, GDK_PRIORITY_EVENTS);
+
+ g_source_set_can_recurse (source, TRUE);
+ g_source_attach (source, NULL);
}
/*
@@ -121,20 +123,16 @@ gdk_events_queue (void)
}
static gboolean
-fb_events_prepare (gpointer source_data,
- GTimeVal *current_time,
- gint *timeout,
- gpointer user_data)
+fb_events_prepare (GSource *source,
+ gint *timeout)
{
*timeout = -1;
- return fb_events_check (source_data, current_time, user_data);
+ return fb_events_check (source);
}
static gboolean
-fb_events_check (gpointer source_data,
- GTimeVal *current_time,
- gpointer user_data)
+fb_events_check (GSource *source)
{
gboolean retval;
@@ -148,9 +146,9 @@ fb_events_check (gpointer source_data,
}
static gboolean
-fb_events_dispatch (gpointer source_data,
- GTimeVal *dispatch_time,
- gpointer user_data)
+fb_events_dispatch (GSource *source,
+ GSourceFunc callback,
+ gpointer user_data)
{
GdkEvent *event;
diff --git a/gdk/linux-fb/gdkinput-ps2.c b/gdk/linux-fb/gdkinput-ps2.c
index d6119ee5b5..7c5a46a5bd 100644
--- a/gdk/linux-fb/gdkinput-ps2.c
+++ b/gdk/linux-fb/gdkinput-ps2.c
@@ -1122,6 +1122,17 @@ gdk_window_find_focus (void)
return gdk_parent_root;
}
+/* Bogus implementation */
+gboolean
+gdk_keymap_get_entries_for_keycode (GdkKeymap *keymap,
+ guint hardware_keycode,
+ GdkKeymapKey **keys,
+ guint **keyvals,
+ gint *n_entries)
+{
+ return FALSE;
+}
+
static const guint trans_table[256][3] = {
/* 0x00 */
{0, 0, 0},
View Lorry Controller Status