diff --git a/ChangeLog b/ChangeLog index 421b3d4c34..9f8e18ac1a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,26 @@ +Fri Jan 30 11:37:37 2004 Owen Taylor + + * gdk/x11/gdkdrawable-x11.c: Revert changes from + #113476 and go back to using XftDrawSetClip, because + XftDrawSetClipRectangles is buggy in XFree86-4.3. + +Thu Jan 29 18:08:06 2004 Owen Taylor + + * gtk/gtktextlayout.c (line_display_iter_to_index) + * gtk/gtktextlayout.c (line_display_index_to_iter): Only + adjust the preedit position for lines that include the + preedit string. (#132353, Yao Zhang). How the heck + did this work as well as it did?!?! + + * modules/input/gtkimcontextxim.c (gtk_im_context_xim_get_ic): + Reverse change to change of XNFilterEvents event mask from + #110493 -- it's documented and in the Xlib code an + unsigned long. + + * modules/input/gtkimcontextxim.c (preedit_start_callback): + Return -1 rather than void to indicate no length limit. + (#129548) + Fri Jan 30 00:45:46 2004 Matthias Clasen * gtk/gtkadjustment.c: Add properties to GtkAdjustment. diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 421b3d4c34..9f8e18ac1a 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,26 @@ +Fri Jan 30 11:37:37 2004 Owen Taylor + + * gdk/x11/gdkdrawable-x11.c: Revert changes from + #113476 and go back to using XftDrawSetClip, because + XftDrawSetClipRectangles is buggy in XFree86-4.3. + +Thu Jan 29 18:08:06 2004 Owen Taylor + + * gtk/gtktextlayout.c (line_display_iter_to_index) + * gtk/gtktextlayout.c (line_display_index_to_iter): Only + adjust the preedit position for lines that include the + preedit string. (#132353, Yao Zhang). How the heck + did this work as well as it did?!?! + + * modules/input/gtkimcontextxim.c (gtk_im_context_xim_get_ic): + Reverse change to change of XNFilterEvents event mask from + #110493 -- it's documented and in the Xlib code an + unsigned long. + + * modules/input/gtkimcontextxim.c (preedit_start_callback): + Return -1 rather than void to indicate no length limit. + (#129548) + Fri Jan 30 00:45:46 2004 Matthias Clasen * gtk/gtkadjustment.c: Add properties to GtkAdjustment. diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 421b3d4c34..9f8e18ac1a 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,26 @@ +Fri Jan 30 11:37:37 2004 Owen Taylor + + * gdk/x11/gdkdrawable-x11.c: Revert changes from + #113476 and go back to using XftDrawSetClip, because + XftDrawSetClipRectangles is buggy in XFree86-4.3. + +Thu Jan 29 18:08:06 2004 Owen Taylor + + * gtk/gtktextlayout.c (line_display_iter_to_index) + * gtk/gtktextlayout.c (line_display_index_to_iter): Only + adjust the preedit position for lines that include the + preedit string. (#132353, Yao Zhang). How the heck + did this work as well as it did?!?! + + * modules/input/gtkimcontextxim.c (gtk_im_context_xim_get_ic): + Reverse change to change of XNFilterEvents event mask from + #110493 -- it's documented and in the Xlib code an + unsigned long. + + * modules/input/gtkimcontextxim.c (preedit_start_callback): + Return -1 rather than void to indicate no length limit. + (#129548) + Fri Jan 30 00:45:46 2004 Matthias Clasen * gtk/gtkadjustment.c: Add properties to GtkAdjustment. diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 421b3d4c34..9f8e18ac1a 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,26 @@ +Fri Jan 30 11:37:37 2004 Owen Taylor + + * gdk/x11/gdkdrawable-x11.c: Revert changes from + #113476 and go back to using XftDrawSetClip, because + XftDrawSetClipRectangles is buggy in XFree86-4.3. + +Thu Jan 29 18:08:06 2004 Owen Taylor + + * gtk/gtktextlayout.c (line_display_iter_to_index) + * gtk/gtktextlayout.c (line_display_index_to_iter): Only + adjust the preedit position for lines that include the + preedit string. (#132353, Yao Zhang). How the heck + did this work as well as it did?!?! + + * modules/input/gtkimcontextxim.c (gtk_im_context_xim_get_ic): + Reverse change to change of XNFilterEvents event mask from + #110493 -- it's documented and in the Xlib code an + unsigned long. + + * modules/input/gtkimcontextxim.c (preedit_start_callback): + Return -1 rather than void to indicate no length limit. + (#129548) + Fri Jan 30 00:45:46 2004 Matthias Clasen * gtk/gtkadjustment.c: Add properties to GtkAdjustment. diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 421b3d4c34..9f8e18ac1a 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,26 @@ +Fri Jan 30 11:37:37 2004 Owen Taylor + + * gdk/x11/gdkdrawable-x11.c: Revert changes from + #113476 and go back to using XftDrawSetClip, because + XftDrawSetClipRectangles is buggy in XFree86-4.3. + +Thu Jan 29 18:08:06 2004 Owen Taylor + + * gtk/gtktextlayout.c (line_display_iter_to_index) + * gtk/gtktextlayout.c (line_display_index_to_iter): Only + adjust the preedit position for lines that include the + preedit string. (#132353, Yao Zhang). How the heck + did this work as well as it did?!?! + + * modules/input/gtkimcontextxim.c (gtk_im_context_xim_get_ic): + Reverse change to change of XNFilterEvents event mask from + #110493 -- it's documented and in the Xlib code an + unsigned long. + + * modules/input/gtkimcontextxim.c (preedit_start_callback): + Return -1 rather than void to indicate no length limit. + (#129548) + Fri Jan 30 00:45:46 2004 Matthias Clasen * gtk/gtkadjustment.c: Add properties to GtkAdjustment. diff --git a/gdk/x11/gdkdrawable-x11.c b/gdk/x11/gdkdrawable-x11.c index 070e5efca9..3dbd8c1fa2 100644 --- a/gdk/x11/gdkdrawable-x11.c +++ b/gdk/x11/gdkdrawable-x11.c @@ -352,6 +352,7 @@ gdk_x11_drawable_update_xft_clip (GdkDrawable *drawable, { GdkRegionBox *boxes = gc_private->clip_region->rects; gint n_boxes = gc_private->clip_region->numRects; +#if 0 /* Until XftDrawSetClipRectangles is there */ XRectangle *rects = g_new (XRectangle, n_boxes); int i; @@ -365,6 +366,25 @@ gdk_x11_drawable_update_xft_clip (GdkDrawable *drawable, XftDrawSetClipRectangles (xft_draw, 0, 0, rects, n_boxes); g_free (rects); +#else + Region xregion = XCreateRegion (); + int i; + + for (i=0; i < n_boxes; i++) + { + XRectangle rect; + + rect.x = CLAMP (boxes[i].x1 + gc->clip_x_origin, G_MINSHORT, G_MAXSHORT); + rect.y = CLAMP (boxes[i].y1 + gc->clip_y_origin, G_MINSHORT, G_MAXSHORT); + rect.width = CLAMP (boxes[i].x2 + gc->clip_x_origin, G_MINSHORT, G_MAXSHORT) - rect.x; + rect.height = CLAMP (boxes[i].y2 + gc->clip_y_origin, G_MINSHORT, G_MAXSHORT) - rect.y; + + XUnionRectWithRegion (&rect, xregion, xregion); + } + + XftDrawSetClip (xft_draw, xregion); + XDestroyRegion (xregion); +#endif } else {