diff --git a/ChangeLog b/ChangeLog index 6f322e84a4..545c28bc27 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +Tue Sep 24 19:45:55 2002 Owen Taylor + + * gdk/x11/gdkwindow-x11.c (gdk_window_impl_x11_get_colormap): + Look up the visual as well as the colormap, since calling + gdk_drawable_get_visual() causes infinite recursion. + + * gdk/x11/gdkwindow-x11.c (_gdk_windowing_window_init): + Set the colormap for the root window. + Tue Sep 24 15:35:42 2002 HideToshi Tajima disable/enable preedit/status in GtkIMContextXIM (#59076) diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 6f322e84a4..545c28bc27 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,12 @@ +Tue Sep 24 19:45:55 2002 Owen Taylor + + * gdk/x11/gdkwindow-x11.c (gdk_window_impl_x11_get_colormap): + Look up the visual as well as the colormap, since calling + gdk_drawable_get_visual() causes infinite recursion. + + * gdk/x11/gdkwindow-x11.c (_gdk_windowing_window_init): + Set the colormap for the root window. + Tue Sep 24 15:35:42 2002 HideToshi Tajima disable/enable preedit/status in GtkIMContextXIM (#59076) diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index 6f322e84a4..545c28bc27 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,12 @@ +Tue Sep 24 19:45:55 2002 Owen Taylor + + * gdk/x11/gdkwindow-x11.c (gdk_window_impl_x11_get_colormap): + Look up the visual as well as the colormap, since calling + gdk_drawable_get_visual() causes infinite recursion. + + * gdk/x11/gdkwindow-x11.c (_gdk_windowing_window_init): + Set the colormap for the root window. + Tue Sep 24 15:35:42 2002 HideToshi Tajima disable/enable preedit/status in GtkIMContextXIM (#59076) diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 6f322e84a4..545c28bc27 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,12 @@ +Tue Sep 24 19:45:55 2002 Owen Taylor + + * gdk/x11/gdkwindow-x11.c (gdk_window_impl_x11_get_colormap): + Look up the visual as well as the colormap, since calling + gdk_drawable_get_visual() causes infinite recursion. + + * gdk/x11/gdkwindow-x11.c (_gdk_windowing_window_init): + Set the colormap for the root window. + Tue Sep 24 15:35:42 2002 HideToshi Tajima disable/enable preedit/status in GtkIMContextXIM (#59076) diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 6f322e84a4..545c28bc27 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,12 @@ +Tue Sep 24 19:45:55 2002 Owen Taylor + + * gdk/x11/gdkwindow-x11.c (gdk_window_impl_x11_get_colormap): + Look up the visual as well as the colormap, since calling + gdk_drawable_get_visual() causes infinite recursion. + + * gdk/x11/gdkwindow-x11.c (_gdk_windowing_window_init): + Set the colormap for the root window. + Tue Sep 24 15:35:42 2002 HideToshi Tajima disable/enable preedit/status in GtkIMContextXIM (#59076) diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 6f322e84a4..545c28bc27 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,12 @@ +Tue Sep 24 19:45:55 2002 Owen Taylor + + * gdk/x11/gdkwindow-x11.c (gdk_window_impl_x11_get_colormap): + Look up the visual as well as the colormap, since calling + gdk_drawable_get_visual() causes infinite recursion. + + * gdk/x11/gdkwindow-x11.c (_gdk_windowing_window_init): + Set the colormap for the root window. + Tue Sep 24 15:35:42 2002 HideToshi Tajima disable/enable preedit/status in GtkIMContextXIM (#59076) diff --git a/gdk/x11/gdkwindow-x11.c b/gdk/x11/gdkwindow-x11.c index f76e71971a..c4368d7f6c 100644 --- a/gdk/x11/gdkwindow-x11.c +++ b/gdk/x11/gdkwindow-x11.c @@ -198,13 +198,16 @@ gdk_window_impl_x11_get_colormap (GdkDrawable *drawable) drawable_impl->colormap == NULL) { XWindowAttributes window_attributes; + GdkVisual *visual; XGetWindowAttributes (GDK_SCREEN_XDISPLAY (drawable_impl->screen), drawable_impl->xid, &window_attributes); - drawable_impl->colormap = - gdk_x11_colormap_foreign_new (gdk_drawable_get_visual (drawable), - window_attributes.colormap); + + visual = gdk_x11_screen_lookup_visual (drawable_impl->screen, + window_attributes.visual->visualid); + drawable_impl->colormap = gdk_x11_colormap_foreign_new (visual, + window_attributes.colormap); } return drawable_impl->colormap; @@ -302,9 +305,11 @@ _gdk_windowing_window_init (GdkScreen * screen) draw_impl->screen = screen; draw_impl->xid = screen_x11->xroot_window; draw_impl->wrapper = GDK_DRAWABLE (private); + draw_impl->colormap = gdk_screen_get_system_colormap (screen); private->window_type = GDK_WINDOW_ROOT; private->depth = depth; + impl->width = width; impl->height = height;