callisto-debian/gtk2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add check for source being a window.

Browse Source 
2006-04-16  Richard Hult  <richard@imendio.com>

	* gdk/quartz/gdkdrawable-quartz.c: (gdk_quartz_draw_drawable): Add check
	for source being a window.

	* gdk/quartz/gdkwindow-quartz.c: (_gdk_windowing_window_get_pointer):
	Don't assert on window not being the root window.
This commit is contained in:
Richard Hult
2006-04-16 20:13:13 +00:00
committed by Richard Hult
parent 5dc0919ed6
commit 7deea61cbf
4 changed files with 46 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
ChangeLog
View File

@ -1,3 +1,11 @@
2006-04-16 Richard Hult <richard@imendio.com>
* gdk/quartz/gdkdrawable-quartz.c: (gdk_quartz_draw_drawable): Add check
for source being a window.
* gdk/quartz/gdkwindow-quartz.c: (_gdk_windowing_window_get_pointer):
Don't assert on window not being the root window.
2006-04-16 Richard Hult <richard@imendio.com> 2006-04-16 Richard Hult <richard@imendio.com>
* gdk/quartz/gdkdrawable-quartz.c: Remove leading cairo/ in include. * gdk/quartz/gdkdrawable-quartz.c: Remove leading cairo/ in include.

8
ChangeLog.pre-2-10
View File

@ -1,3 +1,11 @@
2006-04-16 Richard Hult <richard@imendio.com>
* gdk/quartz/gdkdrawable-quartz.c: (gdk_quartz_draw_drawable): Add check
for source being a window.
* gdk/quartz/gdkwindow-quartz.c: (_gdk_windowing_window_get_pointer):
Don't assert on window not being the root window.
2006-04-16 Richard Hult <richard@imendio.com> 2006-04-16 Richard Hult <richard@imendio.com>
* gdk/quartz/gdkdrawable-quartz.c: Remove leading cairo/ in include. * gdk/quartz/gdkdrawable-quartz.c: Remove leading cairo/ in include.

13
gdk/quartz/gdkdrawable-quartz.c
View File

@ -275,15 +275,20 @@ gdk_quartz_draw_drawable (GdkDrawable *drawable,
{ {
int src_depth = gdk_drawable_get_depth (src); int src_depth = gdk_drawable_get_depth (src);
int dest_depth = gdk_drawable_get_depth (drawable); int dest_depth = gdk_drawable_get_depth (drawable);
GdkDrawableImplQuartz *impl;
GdkDrawableImplQuartz *src_impl; GdkDrawableImplQuartz *src_impl;
impl = GDK_DRAWABLE_IMPL_QUARTZ (drawable);
if (GDK_IS_DRAWABLE_IMPL_QUARTZ (src)) if (GDK_IS_DRAWABLE_IMPL_QUARTZ (src))
src_impl = GDK_DRAWABLE_IMPL_QUARTZ (src); src_impl = GDK_DRAWABLE_IMPL_QUARTZ (src);
else else if (GDK_IS_PIXMAP (src))
src_impl = GDK_DRAWABLE_IMPL_QUARTZ (GDK_PIXMAP_OBJECT (src)->impl); src_impl = GDK_DRAWABLE_IMPL_QUARTZ (GDK_PIXMAP_OBJECT (src)->impl);
else if (GDK_IS_WINDOW (src))
{
src_impl = GDK_DRAWABLE_IMPL_QUARTZ (GDK_WINDOW_OBJECT (src)->impl);
/* FIXME: Implement drawing a window. */
return;
}
else
g_assert_not_reached ();
if (src_depth == 1) if (src_depth == 1)
{ {

47
gdk/quartz/gdkwindow-quartz.c
View File

@ -952,35 +952,30 @@ _gdk_windowing_window_get_pointer (GdkDisplay *display,
gint *y, gint *y,
GdkModifierType *mask) GdkModifierType *mask)
{ {
if (window == _gdk_root) GdkWindow *toplevel = gdk_window_get_toplevel (window);
{ GdkWindowImplQuartz *impl = GDK_WINDOW_IMPL_QUARTZ (GDK_WINDOW_OBJECT (toplevel)->impl);
g_error ("FIXME: support get_pointer with root window"); GdkWindowObject *private = GDK_WINDOW_OBJECT (window);
} NSWindow *nswindow = impl->toplevel;
else NSPoint point = [nswindow mouseLocationOutsideOfEventStream];
{ int x_tmp, y_tmp;
GdkWindow *toplevel = gdk_window_get_toplevel (window);
GdkWindowImplQuartz *impl = GDK_WINDOW_IMPL_QUARTZ (GDK_WINDOW_OBJECT (toplevel)->impl);
GdkWindowObject *private = GDK_WINDOW_OBJECT (window);
NSWindow *nswindow = impl->toplevel;
NSPoint point = [nswindow mouseLocationOutsideOfEventStream];
int x_tmp, y_tmp;
/* First flip the y coordinate */ /* FIXME: Might need to special-case window being the root window. */
x_tmp = point.x;
y_tmp = impl->height - point.y; /* First flip the y coordinate */
x_tmp = point.x;
y_tmp = impl->height - point.y;
while (private != GDK_WINDOW_OBJECT (toplevel)) { while (private != GDK_WINDOW_OBJECT (toplevel)) {
x_tmp -= private->x; x_tmp -= private->x;
y_tmp -= private->y; y_tmp -= private->y;
private = private->parent;
}
private = private->parent; if (x)
} *x = x_tmp;
if (y)
if (x) *y = y_tmp;
*x = x_tmp;
if (y)
*y = y_tmp;
}
/* FIXME: Implement return value */ /* FIXME: Implement return value */
return NULL; return NULL;