You don't get a XkbMapNotify event if you get a XkbNewKeyboardNotify

Fri Apr 18 14:15:09 2003  Owen Taylor  <otaylor@redhat.com>

        * gdk/x11/gdkdisplay-x11.c (gdk_display_open):
        * gdk/x11/gdkevents-x11.c (gdk_event_translate): You
        don't get a XkbMapNotify event if you get a XkbNewKeyboardNotify
        event, so select for both. (#108406, Egmont Koblinger)

diff --git a/ChangeLog b/ChangeLog
index 8be5a37d2a026fa7a0df7516549e9d42ad35d1ed..c9d18098a1ab5f5e8080202776a8777f5bed067d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Fri Apr 18 14:15:09 2003  Owen Taylor  <otaylor@redhat.com>
+
+       * gdk/x11/gdkdisplay-x11.c (gdk_display_open): 
+       * gdk/x11/gdkevents-x11.c (gdk_event_translate): You
+       don't get a XkbMapNotify event if you get a XkbNewKeyboardNotify 
+       event, so select for both. (#108406, Egmont Koblinger)
+
 Thu Apr 17 09:57:44 2003  Jonathan Blandford  <jrb@gnome.org>
 
        * gtk/gtktreeview.c (validate_visible_area): remove infinite loop

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 8be5a37d2a026fa7a0df7516549e9d42ad35d1ed..c9d18098a1ab5f5e8080202776a8777f5bed067d 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,10 @@
+Fri Apr 18 14:15:09 2003  Owen Taylor  <otaylor@redhat.com>
+
+       * gdk/x11/gdkdisplay-x11.c (gdk_display_open): 
+       * gdk/x11/gdkevents-x11.c (gdk_event_translate): You
+       don't get a XkbMapNotify event if you get a XkbNewKeyboardNotify 
+       event, so select for both. (#108406, Egmont Koblinger)
+
 Thu Apr 17 09:57:44 2003  Jonathan Blandford  <jrb@gnome.org>
 
        * gtk/gtktreeview.c (validate_visible_area): remove infinite loop

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 8be5a37d2a026fa7a0df7516549e9d42ad35d1ed..c9d18098a1ab5f5e8080202776a8777f5bed067d 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,10 @@
+Fri Apr 18 14:15:09 2003  Owen Taylor  <otaylor@redhat.com>
+
+       * gdk/x11/gdkdisplay-x11.c (gdk_display_open): 
+       * gdk/x11/gdkevents-x11.c (gdk_event_translate): You
+       don't get a XkbMapNotify event if you get a XkbNewKeyboardNotify 
+       event, so select for both. (#108406, Egmont Koblinger)
+
 Thu Apr 17 09:57:44 2003  Jonathan Blandford  <jrb@gnome.org>
 
        * gtk/gtktreeview.c (validate_visible_area): remove infinite loop

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 8be5a37d2a026fa7a0df7516549e9d42ad35d1ed..c9d18098a1ab5f5e8080202776a8777f5bed067d 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,10 @@
+Fri Apr 18 14:15:09 2003  Owen Taylor  <otaylor@redhat.com>
+
+       * gdk/x11/gdkdisplay-x11.c (gdk_display_open): 
+       * gdk/x11/gdkevents-x11.c (gdk_event_translate): You
+       don't get a XkbMapNotify event if you get a XkbNewKeyboardNotify 
+       event, so select for both. (#108406, Egmont Koblinger)
+
 Thu Apr 17 09:57:44 2003  Jonathan Blandford  <jrb@gnome.org>
 
        * gtk/gtktreeview.c (validate_visible_area): remove infinite loop

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 8be5a37d2a026fa7a0df7516549e9d42ad35d1ed..c9d18098a1ab5f5e8080202776a8777f5bed067d 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,10 @@
+Fri Apr 18 14:15:09 2003  Owen Taylor  <otaylor@redhat.com>
+
+       * gdk/x11/gdkdisplay-x11.c (gdk_display_open): 
+       * gdk/x11/gdkevents-x11.c (gdk_event_translate): You
+       don't get a XkbMapNotify event if you get a XkbNewKeyboardNotify 
+       event, so select for both. (#108406, Egmont Koblinger)
+
 Thu Apr 17 09:57:44 2003  Jonathan Blandford  <jrb@gnome.org>
 
        * gtk/gtktreeview.c (validate_visible_area): remove infinite loop

diff --git a/gdk/x11/gdkdisplay-x11.c b/gdk/x11/gdkdisplay-x11.c
index e6756685ba8bffb4b6028f278c0eaa29538d634c..126b3a8ce80b1afcd436b969d0677a28705fbcbf 100644 (file)
--- a/gdk/x11/gdkdisplay-x11.c
+++ b/gdk/x11/gdkdisplay-x11.c
@@ -199,8 +199,8 @@ gdk_display_open (const gchar *display_name)
 
             XkbSelectEvents (display_x11->xdisplay,
                              XkbUseCoreKbd,
-                             XkbMapNotifyMask | XkbStateNotifyMask,
-                             XkbMapNotifyMask | XkbStateNotifyMask);
+                             XkbNewKeyboardNotifyMask | XkbMapNotifyMask | XkbStateNotifyMask,
+                             XkbNewKeyboardNotifyMask | XkbMapNotifyMask | XkbStateNotifyMask);
 
            XkbSetDetectableAutoRepeat (display_x11->xdisplay,
                                        True,

diff --git a/gdk/x11/gdkevents-x11.c b/gdk/x11/gdkevents-x11.c
index 25681a8bb829a6ae13aa6c106f46c2b4b623fe65..fbdc68e5b12d2d127ce181b275199f7d5122bc9e 100644 (file)
--- a/gdk/x11/gdkevents-x11.c
+++ b/gdk/x11/gdkevents-x11.c
@@ -1795,6 +1795,7 @@ gdk_event_translate (GdkDisplay *display,
 
          switch (xkb_event->any.xkb_type)
            {
+           case XkbNewKeyboardNotify:
            case XkbMapNotify:
              _gdk_keymap_keys_changed (display);