Lerking/gtk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use gdk_cursor_new_for_screen.

Browse Source 
2002-02-01  Anders Carlsson  <andersca@gnu.org>

	* gtk/gtkentry.c (gtk_entry_motion_notify): Use gdk_cursor_new_for_screen.

	* gdk/x11/gdkgc-x11.c (_gdk_x11_gc_get_fg_picture): Remove ;

	* gdk/x11/gdkdrawable-x11.c (draw_with_pixmaps): The drawable is actually
	a GdkDrawableImplX11, so get the display from that.
	(draw_with_images): Use the screen's root window when creating the pixmap.
	(draw_with_images): Get the screen from the GdkDrawableImplX11.
This commit is contained in:
Anders Carlsson
2002-02-01 20:44:53 +00:00
committed by Anders Carlsson
parent f4425feb4c
commit 0fcfca698d
10 changed files with 93 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
ChangeLog
View File

@@ -1,3 +1,14 @@
2002-02-01 Anders Carlsson <andersca@gnu.org>
* gtk/gtkentry.c (gtk_entry_motion_notify): Use gdk_cursor_new_for_screen.
* gdk/x11/gdkgc-x11.c (_gdk_x11_gc_get_fg_picture): Remove ;
* gdk/x11/gdkdrawable-x11.c (draw_with_pixmaps): The drawable is actually
a GdkDrawableImplX11, so get the display from that.
(draw_with_images): Use the screen's root window when creating the pixmap.
(draw_with_images): Get the screen from the GdkDrawableImplX11.
Thu Jan 31 18:46:10 2002 Jonathan Blandford <jrb@redhat.com>
* gtk/gtktreemodel.c (gtk_tree_row_reference_free): unref the
@@ -1273,6 +1284,7 @@ Tue Jan 8 14:19:43 2002 Owen Taylor <otaylor@redhat.com>
directly instead of calling get_child_requisition()
(#68199, Damon Chaplin)
>>>>>>> 1.2786
2001-01-08 James Henstridge <james@daa.com.au>
* gtk/gtkstyle.c: add trailing */ on doc comment.

12
ChangeLog.pre-2-0
View File

@@ -1,3 +1,14 @@
2002-02-01 Anders Carlsson <andersca@gnu.org>
* gtk/gtkentry.c (gtk_entry_motion_notify): Use gdk_cursor_new_for_screen.
* gdk/x11/gdkgc-x11.c (_gdk_x11_gc_get_fg_picture): Remove ;
* gdk/x11/gdkdrawable-x11.c (draw_with_pixmaps): The drawable is actually
a GdkDrawableImplX11, so get the display from that.
(draw_with_images): Use the screen's root window when creating the pixmap.
(draw_with_images): Get the screen from the GdkDrawableImplX11.
Thu Jan 31 18:46:10 2002 Jonathan Blandford <jrb@redhat.com>
* gtk/gtktreemodel.c (gtk_tree_row_reference_free): unref the
@@ -1273,6 +1284,7 @@ Tue Jan 8 14:19:43 2002 Owen Taylor <otaylor@redhat.com>
directly instead of calling get_child_requisition()
(#68199, Damon Chaplin)
>>>>>>> 1.2786
2001-01-08 James Henstridge <james@daa.com.au>
* gtk/gtkstyle.c: add trailing */ on doc comment.

12
ChangeLog.pre-2-10
View File

@@ -1,3 +1,14 @@
2002-02-01 Anders Carlsson <andersca@gnu.org>
* gtk/gtkentry.c (gtk_entry_motion_notify): Use gdk_cursor_new_for_screen.
* gdk/x11/gdkgc-x11.c (_gdk_x11_gc_get_fg_picture): Remove ;
* gdk/x11/gdkdrawable-x11.c (draw_with_pixmaps): The drawable is actually
a GdkDrawableImplX11, so get the display from that.
(draw_with_images): Use the screen's root window when creating the pixmap.
(draw_with_images): Get the screen from the GdkDrawableImplX11.
Thu Jan 31 18:46:10 2002 Jonathan Blandford <jrb@redhat.com>
* gtk/gtktreemodel.c (gtk_tree_row_reference_free): unref the
@@ -1273,6 +1284,7 @@ Tue Jan 8 14:19:43 2002 Owen Taylor <otaylor@redhat.com>
directly instead of calling get_child_requisition()
(#68199, Damon Chaplin)
>>>>>>> 1.2786
2001-01-08 James Henstridge <james@daa.com.au>
* gtk/gtkstyle.c: add trailing */ on doc comment.

12
ChangeLog.pre-2-2
View File

@@ -1,3 +1,14 @@
2002-02-01 Anders Carlsson <andersca@gnu.org>
* gtk/gtkentry.c (gtk_entry_motion_notify): Use gdk_cursor_new_for_screen.
* gdk/x11/gdkgc-x11.c (_gdk_x11_gc_get_fg_picture): Remove ;
* gdk/x11/gdkdrawable-x11.c (draw_with_pixmaps): The drawable is actually
a GdkDrawableImplX11, so get the display from that.
(draw_with_images): Use the screen's root window when creating the pixmap.
(draw_with_images): Get the screen from the GdkDrawableImplX11.
Thu Jan 31 18:46:10 2002 Jonathan Blandford <jrb@redhat.com>
* gtk/gtktreemodel.c (gtk_tree_row_reference_free): unref the
@@ -1273,6 +1284,7 @@ Tue Jan 8 14:19:43 2002 Owen Taylor <otaylor@redhat.com>
directly instead of calling get_child_requisition()
(#68199, Damon Chaplin)
>>>>>>> 1.2786
2001-01-08 James Henstridge <james@daa.com.au>
* gtk/gtkstyle.c: add trailing */ on doc comment.

12
ChangeLog.pre-2-4
View File

@@ -1,3 +1,14 @@
2002-02-01 Anders Carlsson <andersca@gnu.org>
* gtk/gtkentry.c (gtk_entry_motion_notify): Use gdk_cursor_new_for_screen.
* gdk/x11/gdkgc-x11.c (_gdk_x11_gc_get_fg_picture): Remove ;
* gdk/x11/gdkdrawable-x11.c (draw_with_pixmaps): The drawable is actually
a GdkDrawableImplX11, so get the display from that.
(draw_with_images): Use the screen's root window when creating the pixmap.
(draw_with_images): Get the screen from the GdkDrawableImplX11.
Thu Jan 31 18:46:10 2002 Jonathan Blandford <jrb@redhat.com>
* gtk/gtktreemodel.c (gtk_tree_row_reference_free): unref the
@@ -1273,6 +1284,7 @@ Tue Jan 8 14:19:43 2002 Owen Taylor <otaylor@redhat.com>
directly instead of calling get_child_requisition()
(#68199, Damon Chaplin)
>>>>>>> 1.2786
2001-01-08 James Henstridge <james@daa.com.au>
* gtk/gtkstyle.c: add trailing */ on doc comment.

12
ChangeLog.pre-2-6
View File

@@ -1,3 +1,14 @@
2002-02-01 Anders Carlsson <andersca@gnu.org>
* gtk/gtkentry.c (gtk_entry_motion_notify): Use gdk_cursor_new_for_screen.
* gdk/x11/gdkgc-x11.c (_gdk_x11_gc_get_fg_picture): Remove ;
* gdk/x11/gdkdrawable-x11.c (draw_with_pixmaps): The drawable is actually
a GdkDrawableImplX11, so get the display from that.
(draw_with_images): Use the screen's root window when creating the pixmap.
(draw_with_images): Get the screen from the GdkDrawableImplX11.
Thu Jan 31 18:46:10 2002 Jonathan Blandford <jrb@redhat.com>
* gtk/gtktreemodel.c (gtk_tree_row_reference_free): unref the
@@ -1273,6 +1284,7 @@ Tue Jan 8 14:19:43 2002 Owen Taylor <otaylor@redhat.com>
directly instead of calling get_child_requisition()
(#68199, Damon Chaplin)
>>>>>>> 1.2786
2001-01-08 James Henstridge <james@daa.com.au>
* gtk/gtkstyle.c: add trailing */ on doc comment.

12
ChangeLog.pre-2-8
View File

@@ -1,3 +1,14 @@
2002-02-01 Anders Carlsson <andersca@gnu.org>
* gtk/gtkentry.c (gtk_entry_motion_notify): Use gdk_cursor_new_for_screen.
* gdk/x11/gdkgc-x11.c (_gdk_x11_gc_get_fg_picture): Remove ;
* gdk/x11/gdkdrawable-x11.c (draw_with_pixmaps): The drawable is actually
a GdkDrawableImplX11, so get the display from that.
(draw_with_images): Use the screen's root window when creating the pixmap.
(draw_with_images): Get the screen from the GdkDrawableImplX11.
Thu Jan 31 18:46:10 2002 Jonathan Blandford <jrb@redhat.com>
* gtk/gtktreemodel.c (gtk_tree_row_reference_free): unref the
@@ -1273,6 +1284,7 @@ Tue Jan 8 14:19:43 2002 Owen Taylor <otaylor@redhat.com>
directly instead of calling get_child_requisition()
(#68199, Damon Chaplin)
>>>>>>> 1.2786
2001-01-08 James Henstridge <james@daa.com.au>
* gtk/gtkstyle.c: add trailing */ on doc comment.

12
gdk/x11/gdkdrawable-x11.c
View File

@@ -1137,7 +1137,8 @@ draw_with_images (GdkDrawable *drawable,
gint width,
gint height)
{
Display *xdisplay = GDK_DRAWABLE_XDISPLAY (drawable);
GdkScreenImplX11 *screen = GDK_SCREEN_IMPL_X11 (GDK_DRAWABLE_IMPL_X11 (drawable)->screen);
Display *xdisplay = screen->xdisplay;
GdkImage *image;
GdkPixmap *pix;
GdkGC *pix_gc;
@@ -1146,7 +1147,8 @@ draw_with_images (GdkDrawable *drawable,
Picture mask = None;
gint x0, y0;
pix = gdk_pixmap_new (NULL, width, height, 32);
pix = gdk_pixmap_new (screen->root_window, width, height, 32);
pict = XRenderCreatePicture (xdisplay,
GDK_PIXMAP_XID (pix),
format, 0, NULL);
@@ -1168,7 +1170,7 @@ draw_with_images (GdkDrawable *drawable,
gint width1 = MIN (width - x0, GDK_SCRATCH_IMAGE_WIDTH);
image = _gdk_image_get_scratch (GDK_DRAWABLE_SCREEN (drawable),
image = _gdk_image_get_scratch (GDK_DRAWABLE_IMPL_X11 (drawable)->screen,
width1, height1, 32, &xs0, &ys0);
convert_to_format (src_rgb + y0 * src_rowstride + 4 * x0, src_rowstride,
@@ -1261,7 +1263,7 @@ draw_with_pixmaps (GdkDrawable *drawable,
gint width,
gint height)
{
Display *xdisplay = GDK_DRAWABLE_XDISPLAY (drawable);
Display *xdisplay = GDK_SCREEN_IMPL_X11 (GDK_DRAWABLE_IMPL_X11 (drawable)->screen)->xdisplay;
GdkImage *image;
Pixmap pix;
Picture pict;
@@ -1280,7 +1282,7 @@ draw_with_pixmaps (GdkDrawable *drawable,
gint width1 = MIN (width - x0, GDK_SCRATCH_IMAGE_WIDTH);
image = _gdk_image_get_scratch (GDK_DRAWABLE_SCREEN (drawable),
image = _gdk_image_get_scratch (GDK_DRAWABLE_IMPL_X11 (drawable)->screen,
width1, height1, 32, &xs0, &ys0);
if (!get_shm_pixmap_for_image (xdisplay, image,
format, mask_format,

2
gdk/x11/gdkgc-x11.c
View File

@@ -831,7 +831,7 @@ _gdk_x11_gc_get_fg_picture (GdkGC *gc)
x11_gc = GDK_GC_X11 (gc);
if (!_gdk_x11_have_render (GDK_GC_DISPLAY (gc)));
if (!_gdk_x11_have_render (GDK_GC_DISPLAY (gc)))
return None;
if (x11_gc->fg_picture == None)

2
gtk/gtkentry.c
View File

@@ -1487,7 +1487,7 @@ gtk_entry_motion_notify (GtkWidget *widget,
{
GdkCursor *cursor;
cursor = gdk_cursor_new (GDK_XTERM);
cursor = gdk_cursor_new_for_screen (gtk_widget_get_screen (widget), GDK_XTERM);
gdk_window_set_cursor (entry->text_area, cursor);
gdk_cursor_unref (cursor);
entry->mouse_cursor_obscured = FALSE;