+2008-01-30 Sven Neumann <sven@gimp.org>
+
+ * gdk/directfb/gdkdirectfb.h
+ * gdk/directfb/gdkdisplay-directfb.c
+ * gdk/directfb/gdkdrawable-directfb.c
+ * gdk/directfb/gdkim-directfb.c
+ * gdk/directfb/gdkimage-directfb.c
+ * gdk/directfb/gdkinput-directfb.c
+ * gdk/directfb/gdkmain-directfb.c
+ * gdk/directfb/gdkpixmap-directfb.c
+ * gdk/directfb/gdktestutils-directfb.c
+ * gdk/directfb/gdkvisual-directfb.c
+ * gdk/directfb/gdkwindow-directfb.c: applied patch from Denis
+ Oliver Kropp <dok@directfb.org>. Fixes various warnings, some
+ errors and has some cleanups.
+
2008-01-30 Michael Natterer <mitch@imendio.com>
* gtk/gtkbuilderparser.c (parse_custom): use the right type for
#include <directfb.h>
#include "gdk/gdkprivate.h"
-/* macro for a safe call to DirectFB functions */
-#define DFBCHECK(x...) \
- { \
- int err = x; \
- if (err != DFB_OK) { \
- fprintf( stderr, "%s <%d>:\n\t", __FILE__, __LINE__ ); \
- DirectFBErrorFatal( #x, err ); \
- } \
- }
-
extern GdkWindow * _gdk_parent_root;
}
+/*************************************************************************************************
+ * Displays and Screens
+ */
void
_gdk_windowing_set_default_display (GdkDisplay *display)
return _gdk_screen;
}
+gboolean
+gdk_display_supports_shapes (GdkDisplay *display)
+{
+ return FALSE;
+}
+
+gboolean
+gdk_display_supports_input_shapes (GdkDisplay *display)
+{
+ return FALSE;
+}
+
+
+GdkWindow *gdk_display_get_default_group (GdkDisplay *display)
+{
+ g_return_val_if_fail (GDK_IS_DISPLAY (display), NULL);
+ return _gdk_parent_root;
+}
+
+
+/*************************************************************************************************
+ * Selection and Clipboard
+ */
+
gboolean
gdk_display_supports_selection_notification (GdkDisplay *display)
{
}
-gboolean
-gdk_display_supports_shapes (GdkDisplay *display)
-{
- return FALSE;
-}
-
-
-gboolean
-gdk_display_supports_input_shapes (GdkDisplay *display)
-{
- return FALSE;
-}
-
-
-GdkWindow *gdk_display_get_default_group (GdkDisplay *display)
-{
- g_return_val_if_fail (GDK_IS_DISPLAY (display), NULL);
- return _gdk_parent_root;
-}
-
-
-
+/*************************************************************************************************
+ * Pointer
+ */
static gboolean _gdk_directfb_pointer_implicit_grab = FALSE;
return GDK_GRAB_SUCCESS;
}
-
-
-
void
gdk_directfb_pointer_ungrab (guint32 time,
gboolean implicit_grab)
g_object_unref (old_grab_window);
}
+gint
+gdk_display_pointer_is_grabbed (GdkDisplay *display)
+{
+ return _gdk_directfb_pointer_grab_window != NULL;
+}
+
+void
+gdk_display_pointer_ungrab (GdkDisplay *display,guint32 time)
+{
+ gdk_directfb_pointer_ungrab (time, _gdk_directfb_pointer_implicit_grab);
+}
+
+
+/*************************************************************************************************
+ * Keyboard
+ */
+
+GdkGrabStatus
+gdk_directfb_keyboard_grab (GdkDisplay *display,GdkWindow *window,
+ gint owner_events,
+ guint32 time)
+{
+ GdkWindow *toplevel;
+ GdkWindowImplDirectFB *impl;
+
+ g_return_val_if_fail (GDK_IS_WINDOW (window), 0);
+
+ if (_gdk_directfb_keyboard_grab_window)
+ gdk_keyboard_ungrab (time);
+
+ toplevel = gdk_directfb_window_find_toplevel (window);
+ impl = GDK_WINDOW_IMPL_DIRECTFB (GDK_WINDOW_OBJECT (toplevel)->impl);
+
+ if (impl->window)
+ {
+ if (impl->window->GrabKeyboard (impl->window) == DFB_LOCKED)
+ return GDK_GRAB_ALREADY_GRABBED;
+ }
+
+ _gdk_directfb_keyboard_grab_window = g_object_ref (window);
+ _gdk_directfb_keyboard_grab_owner_events = owner_events;
+ return GDK_GRAB_SUCCESS;
+}
+
+void
+gdk_directfb_keyboard_ungrab (GdkDisplay *display,guint32 time)
+{
+ GdkWindow *toplevel;
+ GdkWindowImplDirectFB *impl;
+
+ if (!_gdk_directfb_keyboard_grab_window)
+ return;
+ toplevel =
+ gdk_directfb_window_find_toplevel (_gdk_directfb_keyboard_grab_window);
+ impl = GDK_WINDOW_IMPL_DIRECTFB (GDK_WINDOW_OBJECT (toplevel)->impl);
+ if (impl->window)
+ impl->window->UngrabKeyboard (impl->window);
+
+ g_object_unref (_gdk_directfb_keyboard_grab_window);
+ _gdk_directfb_keyboard_grab_window = NULL;
+}
/*
*--------------------------------------------------------------
_gdk_directfb_keyboard_grab_window = NULL;
}
-gint
-gdk_display_pointer_is_grabbed (GdkDisplay *display)
-{
- return _gdk_directfb_pointer_grab_window != NULL;
-}
-void
-gdk_display_pointer_ungrab (GdkDisplay *display,guint32 time)
-{
- gdk_directfb_pointer_ungrab (time, _gdk_directfb_pointer_implicit_grab);
-}
+/*************************************************************************************************
+ * Misc Stuff
+ */
void
gdk_display_beep (GdkDisplay *display)
+/*************************************************************************************************
+ * Notifications
+ */
+
void
gdk_notify_startup_complete (void)
{
}
+/*************************************************************************************************
+ * Compositing
+ */
+
gboolean
gdk_display_supports_composite (GdkDisplay *display)
{
return FALSE;
}
+
#define __GDK_DISPLAY_X11_C__
#include "gdkaliasdef.c"
#include "cairo-directfb.h"
-#define WARN_UNIMPLEMENTED(func)\
-{\
- static gboolean first_call = TRUE;\
- if (first_call)\
- {\
- g_message ("unimplemented " func);\
- first_call = FALSE;\
- }\
-}
-
/* From DirectFB's <gfx/generix/duffs_device.h> */
#define DUFF_1() \
gint angle1,
gint angle2)
{
- WARN_UNIMPLEMENTED (G_GNUC_FUNCTION);
+ D_UNIMPLEMENTED();
}
static void
const gchar *text,
gint text_length)
{
- WARN_UNIMPLEMENTED (G_GNUC_FUNCTION);
+ D_UNIMPLEMENTED();
}
static void
const GdkWChar *text,
gint text_length)
{
- WARN_UNIMPLEMENTED (G_GNUC_FUNCTION);
+ D_UNIMPLEMENTED();
}
static void
*bp = 0;
- return mbstr;
+ return (gchar*)mbstr;
}
GDK_NOTE (MISC, g_print ("gdk_image_new_bitmap: %dx%d\n", w, h));
- g_message ("not fully implemented %s", G_GNUC_FUNCTION);
+ g_message ("not fully implemented %s", __FUNCTION__);
image->bpl = (w + 7) / 8;
image->mem = g_malloc (image->bpl * h);
format = DSPF_ARGB;
break;
default:
- g_message ("unimplemented %s for depth %d", G_GNUC_FUNCTION, depth);
+ g_message ("unimplemented %s for depth %d", __FUNCTION__, depth);
return NULL;
}
private->surface = surface;
- surface->Lock( surface, DSLF_WRITE, &image->mem, &pitch );
+ ret = surface->Lock( surface, DSLF_WRITE, &image->mem, &pitch );
+ if (ret)
+ {
+ DirectFBError( "IDirectFBSurface::Lock() for writing failed!\n", ret );
+ gdk_image_unref( image );
+ return NULL;
+ }
image->type = type;
image->visual = visual;
if (!private)
return;
- GDK_NOTE (MISC, g_print ("gdk_directfb_image_destroy: %#x\n",
- (guint) private->surface));
+ GDK_NOTE (MISC, g_print ("gdk_directfb_image_destroy: %#lx\n",
+ (gulong) private->surface));
private->surface->Unlock( private->surface );
private->surface->Release( private->surface );
gdk_device_set_mode (GdkDevice *device,
GdkInputMode mode)
{
- g_message ("unimplemented %s", G_GNUC_FUNCTION);
+ g_message ("unimplemented %s", __FUNCTION__);
return FALSE;
}
gint mask,
GdkExtensionMode mode)
{
- g_message ("unimplemented %s", G_GNUC_FUNCTION);
+ g_message ("unimplemented %s", __FUNCTION__);
}
GList *
gint owner_events,
guint32 time)
{
- return gdk_display_keyboard_grab(gdk_display_get_default(),
+ return gdk_directfb_keyboard_grab(gdk_display_get_default(),
window,
owner_events,
time);
static void
gdk_pixmap_impl_directfb_finalize (GObject *object)
{
- GdkDrawableImplDirectFB *impl = GDK_DRAWABLE_IMPL_DIRECTFB (object);
-
if (G_OBJECT_CLASS (parent_class)->finalize)
G_OBJECT_CLASS (parent_class)->finalize (object);
}
format = DSPF_RGB32;
break;
default:
- g_message ("unimplemented %s for depth %d", G_GNUC_FUNCTION, depth);
+ g_message ("unimplemented %s for depth %d", __FUNCTION__, depth);
return NULL;
}
}
case GDK_Cancel:
return DIKS_CANCEL;
/* TODO: handle them all */
- defualt:
+ default:
break;
}
void
_gdk_visual_init ()
{
- DFBResult ret;
DFBDisplayLayerConfig dlc;
DFBSurfaceDescription desc;
IDirectFBSurface *dest;
return;
/* N/A */
- g_message("unimplemented %s", G_GNUC_FUNCTION);
+ g_message("unimplemented %s", __FUNCTION__);
}
void
return FALSE;
/* N/A */
- g_message("unimplemented %s", G_GNUC_FUNCTION);
+ g_message("unimplemented %s", __FUNCTION__);
return FALSE;
}
if (GDK_WINDOW_DESTROYED (window))
return;
- g_message("unimplemented %s", G_GNUC_FUNCTION);
+ g_message("unimplemented %s", __FUNCTION__);
}
void
if (GDK_WINDOW_DESTROYED (window))
return;
- g_message("unimplemented %s", G_GNUC_FUNCTION);
+ g_message("unimplemented %s", __FUNCTION__);
}
/**
}
static void
-gdk_window_impl_directfb_invalidate_maybe_recurse (GdkPaintable *paintable,
- GdkRegion *region,
- gboolean (*child_func) (GdkWindow *, gpointer),
- gpointer user_data)
+gdk_window_impl_directfb_invalidate_maybe_recurse (GdkPaintable *paintable,
+ const GdkRegion *region,
+ gboolean (*child_func) (GdkWindow *, gpointer),
+ gpointer user_data)
{
GdkWindow *window;
GdkWindowObject *private;
if (child_func && (*child_func) ((GdkWindow *)child, user_data))
{
- gdk_region_offset (region, - child->x, - child->y);
- gdk_region_offset (&child_region, - child->x, - child->y);
gdk_region_intersect (&child_region, region);
+ gdk_region_offset (&child_region, - child->x, - child->y);
gdk_window_invalidate_maybe_recurse ((GdkWindow *)child,
&child_region, child_func, user_data);
-
- gdk_region_offset (region, child->x, child->y);
}
temp_region_deinit( &child_region );
static void
-gdk_window_impl_directfb_begin_paint_region (GdkPaintable *paintable,
- GdkRegion *region)
+gdk_window_impl_directfb_begin_paint_region (GdkPaintable *paintable,
+ const GdkRegion *region)
{
GdkDrawableImplDirectFB *impl;
GdkWindowImplDirectFB *wimpl;
projects / ~andy / gtk / commitdiff