Commit b7f7cba7 authored by Alexander Larsson's avatar Alexander Larsson Committed by Alexander Larsson
Browse files

Update to match latest gmain/gsource changes.

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.
parent 36aac017
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> 2000-12-03 Havoc Pennington <hp@pobox.com>
* gdk/Makefile.am: add gdkkeys.[hc] * gdk/Makefile.am: add gdkkeys.[hc]
......
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> 2000-12-03 Havoc Pennington <hp@pobox.com>
* gdk/Makefile.am: add gdkkeys.[hc] * gdk/Makefile.am: add gdkkeys.[hc]
......
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> 2000-12-03 Havoc Pennington <hp@pobox.com>
* gdk/Makefile.am: add gdkkeys.[hc] * gdk/Makefile.am: add gdkkeys.[hc]
......
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> 2000-12-03 Havoc Pennington <hp@pobox.com>
* gdk/Makefile.am: add gdkkeys.[hc] * gdk/Makefile.am: add gdkkeys.[hc]
......
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> 2000-12-03 Havoc Pennington <hp@pobox.com>
* gdk/Makefile.am: add gdkkeys.[hc] * gdk/Makefile.am: add gdkkeys.[hc]
......
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> 2000-12-03 Havoc Pennington <hp@pobox.com>
* gdk/Makefile.am: add gdkkeys.[hc] * gdk/Makefile.am: add gdkkeys.[hc]
......
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> 2000-12-03 Havoc Pennington <hp@pobox.com>
* gdk/Makefile.am: add gdkkeys.[hc] * gdk/Makefile.am: add gdkkeys.[hc]
......
...@@ -33,16 +33,19 @@ ...@@ -33,16 +33,19 @@
* Functions for maintaining the event queue * * Functions for maintaining the event queue *
*********************************************/ *********************************************/
static gboolean fb_events_prepare (gpointer source_data, static gboolean fb_events_prepare (GSource *source,
GTimeVal *current_time, gint *timeout);
gint *timeout, static gboolean fb_events_check (GSource *source);
gpointer user_data); static gboolean fb_events_dispatch (GSource *source,
static gboolean fb_events_check (gpointer source_data, GSourceFunc callback,
GTimeVal *current_time, gpointer user_data);
gpointer user_data);
static gboolean fb_events_dispatch (gpointer source_data, static GSourceFuncs fb_events_funcs = {
GTimeVal *dispatch_time, fb_events_prepare,
gpointer user_data); fb_events_check,
fb_events_dispatch,
NULL
};
guint32 guint32
gdk_fb_get_time(void) gdk_fb_get_time(void)
...@@ -56,14 +59,13 @@ gdk_fb_get_time(void) ...@@ -56,14 +59,13 @@ gdk_fb_get_time(void)
void void
gdk_events_init (void) gdk_events_init (void)
{ {
static GSourceFuncs fb_events_funcs = { GSource *source;
fb_events_prepare,
fb_events_check, source = g_source_new (&fb_events_funcs, sizeof (GSource));
fb_events_dispatch, g_source_set_priority (source, GDK_PRIORITY_EVENTS);
NULL
}; g_source_set_can_recurse (source, TRUE);
g_source_attach (source, NULL);
g_source_add (GDK_PRIORITY_EVENTS, TRUE, &fb_events_funcs, NULL, NULL, NULL);
} }
/* /*
...@@ -121,20 +123,16 @@ gdk_events_queue (void) ...@@ -121,20 +123,16 @@ gdk_events_queue (void)
} }
static gboolean static gboolean
fb_events_prepare (gpointer source_data, fb_events_prepare (GSource *source,
GTimeVal *current_time, gint *timeout)
gint *timeout,
gpointer user_data)
{ {
*timeout = -1; *timeout = -1;
return fb_events_check (source_data, current_time, user_data); return fb_events_check (source);
} }
static gboolean static gboolean
fb_events_check (gpointer source_data, fb_events_check (GSource *source)
GTimeVal *current_time,
gpointer user_data)
{ {
gboolean retval; gboolean retval;
...@@ -148,9 +146,9 @@ fb_events_check (gpointer source_data, ...@@ -148,9 +146,9 @@ fb_events_check (gpointer source_data,
} }
static gboolean static gboolean
fb_events_dispatch (gpointer source_data, fb_events_dispatch (GSource *source,
GTimeVal *dispatch_time, GSourceFunc callback,
gpointer user_data) gpointer user_data)
{ {
GdkEvent *event; GdkEvent *event;
......
...@@ -1122,6 +1122,17 @@ gdk_window_find_focus (void) ...@@ -1122,6 +1122,17 @@ gdk_window_find_focus (void)
return gdk_parent_root; 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] = { static const guint trans_table[256][3] = {
/* 0x00 */ /* 0x00 */
{0, 0, 0}, {0, 0, 0},
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment