[gtk+/gtk-2-22] directfb: coding style coherency
- From: Sven Neumann <neo src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk+/gtk-2-22] directfb: coding style coherency
- Date: Tue, 31 Aug 2010 19:09:51 +0000 (UTC)
commit f8d42326eafc4dace3e6d98e8b7d48df31e0e644
Author: Lionel Landwerlin <llandwerlin gmail com>
Date: Sat Aug 28 18:38:17 2010 +0200
directfb: coding style coherency
Signed-off-by: Lionel Landwerlin <llandwerlin gmail com>
gdk/directfb/gdkcolor-directfb.c | 10 +-
gdk/directfb/gdkcursor-directfb.c | 127 +++---
gdk/directfb/gdkdirectfb.h | 14 +-
gdk/directfb/gdkdisplay-directfb.c | 96 +++--
gdk/directfb/gdkdisplay-directfb.h | 16 +-
gdk/directfb/gdkdnd-directfb.c | 1 -
gdk/directfb/gdkdrawable-directfb.c | 601 +++++++++++++-------------
gdk/directfb/gdkevents-directfb.c | 138 +++---
gdk/directfb/gdkfont-directfb.c | 44 +-
gdk/directfb/gdkgc-directfb.c | 23 +-
gdk/directfb/gdkgeometry-directfb.c | 68 ++--
gdk/directfb/gdkglobals-directfb.c | 36 +-
gdk/directfb/gdkimage-directfb.c | 35 +-
gdk/directfb/gdkinput-directfb.c | 40 +-
gdk/directfb/gdkkeys-directfb.c | 787 +++++++++++++++++-----------------
gdk/directfb/gdkmain-directfb.c | 121 +++---
gdk/directfb/gdkpixmap-directfb.c | 57 ++--
gdk/directfb/gdkprivate-directfb.h | 138 ++++---
gdk/directfb/gdkproperty-directfb.c | 80 ++--
gdk/directfb/gdkscreen-directfb.c | 26 +-
gdk/directfb/gdktestutils-directfb.c | 110 +++---
gdk/directfb/gdkvisual-directfb.c | 101 +++---
gdk/directfb/gdkwindow-directfb.c | 754 +++++++++++++++++----------------
23 files changed, 1754 insertions(+), 1669 deletions(-)
---
diff --git a/gdk/directfb/gdkcolor-directfb.c b/gdk/directfb/gdkcolor-directfb.c
index 86f68da..a565982 100644
--- a/gdk/directfb/gdkcolor-directfb.c
+++ b/gdk/directfb/gdkcolor-directfb.c
@@ -134,7 +134,7 @@ gdk_colormap_new (GdkVisual *visual,
private = g_new0 (GdkColormapPrivateDirectFB, 1);
private->info = g_new0 (GdkColorInfo, colormap->size);
- if (visual == gdk_visual_get_system())
+ if (visual == gdk_visual_get_system ())
{
/* save the first (transparent) palette entry */
private->info[0].ref_count++;
@@ -181,7 +181,7 @@ gdk_screen_get_system_colormap (GdkScreen *screen)
if (!colormap)
{
- GdkVisual *visual = gdk_visual_get_system();
+ GdkVisual *visual = gdk_visual_get_system ();
/* special case PSEUDO_COLOR to use the system palette */
if (visual->type == GDK_VISUAL_PSEUDO_COLOR)
@@ -197,9 +197,9 @@ gdk_screen_get_system_colormap (GdkScreen *screen)
private = g_new0 (GdkColormapPrivateDirectFB, 1);
private->info = g_new0 (GdkColorInfo, colormap->size);
-
- surface=GDK_WINDOW_IMPL_DIRECTFB (
- GDK_WINDOW_OBJECT (_gdk_parent_root)->impl)->drawable.surface;
+
+ surface = GDK_WINDOW_IMPL_DIRECTFB (
+ GDK_WINDOW_OBJECT (_gdk_parent_root)->impl)->drawable.surface;
surface->GetPalette (surface, &private->palette);
colormap->windowing_data = private;
diff --git a/gdk/directfb/gdkcursor-directfb.c b/gdk/directfb/gdkcursor-directfb.c
index f5d9a19..e86814d 100644
--- a/gdk/directfb/gdkcursor-directfb.c
+++ b/gdk/directfb/gdkcursor-directfb.c
@@ -204,26 +204,28 @@ static struct {
};
GdkCursor *
-gdk_cursor_new_for_display (GdkDisplay *display,GdkCursorType cursor_type)
+gdk_cursor_new_for_display (GdkDisplay *display, GdkCursorType cursor_type)
{
GdkCursor *cursor;
- GdkDisplayDFB *dfb_display = GDK_DISPLAY_DFB(display);
+ GdkDisplayDFB *dfb_display = GDK_DISPLAY_DFB (display);
- if (cursor_type >= sizeof(stock_cursors)/sizeof(stock_cursors[0]))
+ if (cursor_type >= sizeof (stock_cursors) / sizeof (stock_cursors[0]))
return NULL;
cursor = stock_cursors[cursor_type].cursor;
if (!cursor)
{
- GdkCursorDirectFB *private;
- DFBResult ret;
- IDirectFBSurface *temp;
- IDirectFBSurface *shape;
+ GdkCursorDirectFB *private;
+ DFBResult ret;
+ IDirectFBSurface *temp;
+ IDirectFBSurface *shape;
- int width = stock_cursors[cursor_type+1].width;
- int height = stock_cursors[cursor_type+1].height;
+ int width = stock_cursors[cursor_type+1].width;
+ int height = stock_cursors[cursor_type+1].height;
- temp =gdk_display_dfb_create_surface(dfb_display,DSPF_ARGB,width,height);
+ temp = gdk_display_dfb_create_surface (dfb_display,
+ DSPF_ARGB,
+ width, height);
if (!temp)
{
@@ -249,7 +251,7 @@ gdk_cursor_new_for_display (GdkDisplay *display,GdkCursorType cursor_type)
gint x, y;
gint mx, my;
gint p = ((stock_cursors[cursor_type].width + 7) / 8) * 8;
- gint mp = ((stock_cursors[cursor_type+1].width + 7) / 8) * 8;
+ gint mp = ((stock_cursors[cursor_type + 1].width + 7) / 8) * 8;
const guchar *src;
const guchar *mask;
@@ -269,9 +271,9 @@ gdk_cursor_new_for_display (GdkDisplay *display,GdkCursorType cursor_type)
gint bit = x-mx + (y-my) * p;
gint mbit = x + y * mp;
- u32 color = (x-mx < 0 || y-my < 0 ||
- x-mx >= stock_cursors[cursor_type].width ||
- y-my >= stock_cursors[cursor_type].height)
+ u32 color = ((x - mx) < 0 || (y - my) < 0 ||
+ (x - mx) >= stock_cursors[cursor_type].width ||
+ (y - my) >= stock_cursors[cursor_type].height)
? 0x00FFFFFF : (src[bit/8] & (1 << bit%8) ? 0 : 0x00FFFFFF);
u8 a = color ? 0xE0 : 0xFF;
@@ -289,10 +291,12 @@ gdk_cursor_new_for_display (GdkDisplay *display,GdkCursorType cursor_type)
width += 2;
height += 2;
- shape=gdk_display_dfb_create_surface(dfb_display,DSPF_ARGB,width,height);
+ shape = gdk_display_dfb_create_surface (dfb_display,
+ DSPF_ARGB,
+ width, height);
- if( !shape ) {
- temp->Release(temp);
+ if (!shape) {
+ temp->Release (temp);
return NULL;
}
@@ -353,11 +357,13 @@ gdk_cursor_new_from_pixmap (GdkPixmap *source,
impl = GDK_DRAWABLE_IMPL_DIRECTFB (GDK_PIXMAP_OBJECT (source)->impl);
mask_impl = GDK_DRAWABLE_IMPL_DIRECTFB (GDK_PIXMAP_OBJECT (mask)->impl);
- int width = impl->width;
- int height = impl->height;
+ int width = impl->width;
+ int height = impl->height;
+
+ shape = gdk_display_dfb_create_surface (_gdk_display,
+ DSPF_ARGB,
+ width, height);
- shape=gdk_display_dfb_create_surface(_gdk_display,DSPF_ARGB,width,height);
-
if (!shape)
{
return NULL;
@@ -401,40 +407,40 @@ gdk_cursor_new_from_pixbuf (GdkDisplay *display,
gint x,
gint y)
{
-GdkPixmap *pixmap, *mask;
- GdkCursor *cursor;
- gint width, height, depth = 8;
- GdkVisual* visual;
+ GdkPixmap *pixmap, *mask;
+ GdkCursor *cursor;
+ gint width, height, depth = 8;
+ GdkVisual* visual;
- /* FIXME: this is not the right way to set colours */
- GdkColor fg = { 0, 65535, 65535, 65535 };
- GdkColor bg = { 0, 65535, 65535, 65535 };
+ /* FIXME: this is not the right way to set colours */
+ GdkColor fg = { 0, 65535, 65535, 65535 };
+ GdkColor bg = { 0, 65535, 65535, 65535 };
- g_return_val_if_fail (GDK_IS_DISPLAY (display), NULL);
- g_return_val_if_fail (GDK_IS_PIXBUF (pixbuf), NULL);
- g_return_val_if_fail (0 <= x && x < gdk_pixbuf_get_width (pixbuf), NULL);
- g_return_val_if_fail (0 <= y && y < gdk_pixbuf_get_height (pixbuf), NULL);
+ g_return_val_if_fail (GDK_IS_DISPLAY (display), NULL);
+ g_return_val_if_fail (GDK_IS_PIXBUF (pixbuf), NULL);
+ g_return_val_if_fail (0 <= x && x < gdk_pixbuf_get_width (pixbuf), NULL);
+ g_return_val_if_fail (0 <= y && y < gdk_pixbuf_get_height (pixbuf), NULL);
- width = gdk_pixbuf_get_width(pixbuf);
- height = gdk_pixbuf_get_height(pixbuf);
+ width = gdk_pixbuf_get_width (pixbuf);
+ height = gdk_pixbuf_get_height (pixbuf);
- pixmap = gdk_pixmap_new ( NULL, width, height, depth);
- mask = gdk_pixmap_new ( NULL, width, height, 1);
- visual = gdk_rgb_get_visual ();
- depth = visual->depth;
+ pixmap = gdk_pixmap_new (NULL, width, height, depth);
+ mask = gdk_pixmap_new (NULL, width, height, 1);
+ visual = gdk_rgb_get_visual ();
+ depth = visual->depth;
- gdk_pixbuf_render_pixmap_and_mask (pixbuf, &pixmap, &mask, 0);
+ gdk_pixbuf_render_pixmap_and_mask (pixbuf, &pixmap, &mask, 0);
- g_return_val_if_fail (GDK_IS_PIXMAP (pixmap), NULL);
- g_return_val_if_fail (GDK_IS_PIXMAP (mask), NULL);
+ g_return_val_if_fail (GDK_IS_PIXMAP (pixmap), NULL);
+ g_return_val_if_fail (GDK_IS_PIXMAP (mask), NULL);
- cursor = gdk_cursor_new_from_pixmap (pixmap, mask, &fg, &bg, x, y) ;
+ cursor = gdk_cursor_new_from_pixmap (pixmap, mask, &fg, &bg, x, y) ;
- g_object_unref (pixmap);
- g_object_unref (mask);
+ g_object_unref (pixmap);
+ g_object_unref (mask);
- /* a cursor of type GDK_CURSOR_IS_PIXMAP is returned */
- return cursor;
+ /* a cursor of type GDK_CURSOR_IS_PIXMAP is returned */
+ return cursor;
}
@@ -442,19 +448,20 @@ GdkCursor*
gdk_cursor_new_from_name (GdkDisplay *display,
const gchar *name)
{
- GdkCursor *cursor;
- GdkPixbuf *pixbuf;
-
- g_return_val_if_fail (GDK_IS_DISPLAY (display), NULL);
- pixbuf = gdk_pixbuf_new_from_file(name, NULL);
- /* Prevents attempts to load stock X cursors from generating error messages */
- if (pixbuf == NULL)
- return NULL;
- g_return_val_if_fail (GDK_IS_PIXBUF (pixbuf), NULL);
- cursor = gdk_cursor_new_from_pixbuf (display, pixbuf, 1, 1);
- g_object_unref (pixbuf);
-
- return cursor;
+ GdkCursor *cursor;
+ GdkPixbuf *pixbuf;
+
+ g_return_val_if_fail (GDK_IS_DISPLAY (display), NULL);
+
+ pixbuf = gdk_pixbuf_new_from_file (name, NULL);
+ /* Prevents attempts to load stock X cursors from generating error messages */
+ if (pixbuf == NULL)
+ return NULL;
+ g_return_val_if_fail (GDK_IS_PIXBUF (pixbuf), NULL);
+ cursor = gdk_cursor_new_from_pixbuf (display, pixbuf, 1, 1);
+ g_object_unref (pixbuf);
+
+ return cursor;
}
@@ -516,7 +523,7 @@ gdk_display_get_maximal_cursor_size (GdkDisplay *display,
/* Cursor sizes in DirectFB can be large (4095x4095), but we limit this to
128x128 for max compatibility with the x11 backend. */
- *width = 128;
+ *width = 128;
*height = 128;
}
diff --git a/gdk/directfb/gdkdirectfb.h b/gdk/directfb/gdkdirectfb.h
index bc2ba7a..52750c8 100644
--- a/gdk/directfb/gdkdirectfb.h
+++ b/gdk/directfb/gdkdirectfb.h
@@ -46,7 +46,7 @@ extern GdkWindow * _gdk_parent_root;
G_BEGIN_DECLS
-#define GDK_ROOT_WINDOW() _gdk_parent_root
+#define GDK_ROOT_WINDOW() _gdk_parent_root
#define GDK_WINDOW_DFB_ID(win) (GDK_WINDOW_IMPL_DIRECTFB (GDK_WINDOW_OBJECT (win)->impl)->dfb_id)
@@ -65,8 +65,8 @@ extern gboolean gdk_directfb_monochrome_fonts;
/* GTK+-DirectFB specific functions */
-void gdk_directfb_window_set_opacity (GdkWindow *window,
- guchar opacity);
+void gdk_directfb_window_set_opacity (GdkWindow *window,
+ guchar opacity);
#ifndef GDK_DISABLE_DEPRECATED
GdkWindow * gdk_directfb_window_new (GdkWindow *parent,
@@ -79,11 +79,11 @@ GdkWindow * gdk_directfb_window_new (GdkWindow *parent,
GdkVisual * gdk_directfb_visual_by_format (DFBSurfacePixelFormat pixel_format);
-IDirectFBWindow *gdk_directfb_window_lookup(GdkWindow *window);
-IDirectFBSurface *gdk_directfb_surface_lookup(GdkWindow *window);
+IDirectFBWindow *gdk_directfb_window_lookup (GdkWindow *window);
+IDirectFBSurface *gdk_directfb_surface_lookup (GdkWindow *window);
-GdkWindow *gdk_directfb_create_child_window(GdkWindow *parent,
- IDirectFBSurface *subsurface);
+GdkWindow *gdk_directfb_create_child_window (GdkWindow *parent,
+ IDirectFBSurface *subsurface);
G_END_DECLS
diff --git a/gdk/directfb/gdkdisplay-directfb.c b/gdk/directfb/gdkdisplay-directfb.c
index 62c1f28..39f7983 100644
--- a/gdk/directfb/gdkdisplay-directfb.c
+++ b/gdk/directfb/gdkdisplay-directfb.c
@@ -48,27 +48,28 @@ static gint gdk_directfb_glyph_surface_cache = 8;
const GOptionEntry _gdk_windowing_args[] =
-{
- { "disable-aa-fonts",0,0,G_OPTION_ARG_INT,&gdk_directfb_monochrome_fonts,NULL,NULL },
- { "argb-font",0,0, G_OPTION_ARG_INT, &gdk_directfb_argb_font,NULL,NULL},
- { "transparent-unfocused",0,0, G_OPTION_ARG_INT, &gdk_directfb_apply_focus_opacity,NULL,NULL },
- { "glyph-surface-cache",0,0,G_OPTION_ARG_INT,&gdk_directfb_glyph_surface_cache,NULL,NULL },
- { "enable-color-keying",0,0,G_OPTION_ARG_INT,&gdk_directfb_enable_color_keying,NULL,NULL },
- { NULL}
-};
+ {
+ { "disable-aa-fonts",0,0,G_OPTION_ARG_INT,&gdk_directfb_monochrome_fonts,NULL,NULL },
+ { "argb-font",0,0, G_OPTION_ARG_INT, &gdk_directfb_argb_font,NULL,NULL},
+ { "transparent-unfocused",0,0, G_OPTION_ARG_INT, &gdk_directfb_apply_focus_opacity,NULL,NULL },
+ { "glyph-surface-cache",0,0,G_OPTION_ARG_INT,&gdk_directfb_glyph_surface_cache,NULL,NULL },
+ { "enable-color-keying",0,0,G_OPTION_ARG_INT,&gdk_directfb_enable_color_keying,NULL,NULL },
+ { NULL }
+ };
/* Main entry point for gdk in 2.6 args are parsed
*/
-GdkDisplay * gdk_display_open (const gchar *display_name)
+GdkDisplay *
+gdk_display_open (const gchar *display_name)
{
- IDirectFB *directfb;
- IDirectFBDisplayLayer *layer;
- IDirectFBInputDevice *keyboard;
- DFBResult ret;
+ IDirectFB *directfb;
+ IDirectFBDisplayLayer *layer;
+ IDirectFBInputDevice *keyboard;
+ DFBResult ret;
if (_gdk_display)
{
- return GDK_DISPLAY_OBJECT(_gdk_display); /* single display only */
+ return GDK_DISPLAY_OBJECT (_gdk_display); /* single display only */
}
ret = DirectFBInit (NULL, NULL);
@@ -107,8 +108,8 @@ GdkDisplay * gdk_display_open (const gchar *display_name)
return NULL;
}
- _gdk_display->layer=layer;
- _gdk_display->keyboard=keyboard;
+ _gdk_display->layer = layer;
+ _gdk_display->keyboard = keyboard;
_gdk_directfb_keyboard_init ();
@@ -118,7 +119,8 @@ GdkDisplay * gdk_display_open (const gchar *display_name)
_gdk_windowing_window_init ();
gdk_screen_set_default_colormap (_gdk_screen,
- gdk_screen_get_system_colormap (_gdk_screen)); _gdk_windowing_image_init ();
+ gdk_screen_get_system_colormap (_gdk_screen));
+ _gdk_windowing_image_init ();
_gdk_events_init ();
_gdk_input_init ();
@@ -129,7 +131,7 @@ GdkDisplay * gdk_display_open (const gchar *display_name)
g_signal_emit_by_name (gdk_display_manager_get (),
"display_opened", _gdk_display);
- return GDK_DISPLAY_OBJECT(_gdk_display);
+ return GDK_DISPLAY_OBJECT (_gdk_display);
}
GType
@@ -160,21 +162,23 @@ gdk_display_dfb_get_type (void)
return object_type;
}
-IDirectFBSurface * gdk_display_dfb_create_surface (GdkDisplayDFB *display,int format,int width, int height) {
- DFBResult ret;
- IDirectFBSurface *temp;
- DFBSurfaceDescription dsc;
- dsc.flags = DSDESC_WIDTH | DSDESC_HEIGHT | DSDESC_PIXELFORMAT;
- dsc.width = width;
- dsc.height = height;
- dsc.pixelformat = format;
- ret = display->directfb->CreateSurface (display->directfb, &dsc, &temp);
- if (ret)
- {
- DirectFBError ("gdk_display_dfb_create_surface ", ret);
- return NULL;
- }
- return temp;
+IDirectFBSurface *
+gdk_display_dfb_create_surface (GdkDisplayDFB *display, int format, int width, int height)
+{
+ DFBResult ret;
+ IDirectFBSurface *temp;
+ DFBSurfaceDescription dsc;
+ dsc.flags = DSDESC_WIDTH | DSDESC_HEIGHT | DSDESC_PIXELFORMAT;
+ dsc.width = width;
+ dsc.height = height;
+ dsc.pixelformat = format;
+ ret = display->directfb->CreateSurface (display->directfb, &dsc, &temp);
+ if (ret)
+ {
+ DirectFBError ("gdk_display_dfb_create_surface ", ret);
+ return NULL;
+ }
+ return temp;
}
@@ -186,7 +190,7 @@ IDirectFBSurface * gdk_display_dfb_create_surface (GdkDisplayDFB *display,int fo
void
_gdk_windowing_set_default_display (GdkDisplay *display)
{
- _gdk_display=GDK_DISPLAY_DFB(display);
+ _gdk_display = GDK_DISPLAY_DFB (display);
}
G_CONST_RETURN gchar *
@@ -217,13 +221,13 @@ gdk_display_get_default_screen (GdkDisplay *display)
gboolean
gdk_display_supports_shapes (GdkDisplay *display)
{
- return FALSE;
+ return FALSE;
}
gboolean
gdk_display_supports_input_shapes (GdkDisplay *display)
{
- return FALSE;
+ return FALSE;
}
@@ -241,23 +245,22 @@ GdkWindow *gdk_display_get_default_group (GdkDisplay *display)
gboolean
gdk_display_supports_selection_notification (GdkDisplay *display)
{
- return FALSE;
+ return FALSE;
}
gboolean gdk_display_request_selection_notification (GdkDisplay *display,
GdkAtom selection)
{
-
- g_warning("gdk_display_request_selection_notification Unimplemented function \n");
- return FALSE;
+ g_warning("gdk_display_request_selection_notification Unimplemented function \n");
+ return FALSE;
}
gboolean
gdk_display_supports_clipboard_persistence (GdkDisplay *display)
{
- g_warning("gdk_display_supports_clipboard_persistence Unimplemented function \n");
- return FALSE;
+ g_warning("gdk_display_supports_clipboard_persistence Unimplemented function \n");
+ return FALSE;
}
void
@@ -268,7 +271,7 @@ gdk_display_store_clipboard (GdkDisplay *display,
gint n_targets)
{
- g_warning("gdk_display_store_clipboard Unimplemented function \n");
+ g_warning("gdk_display_store_clipboard Unimplemented function \n");
}
@@ -290,6 +293,7 @@ gdk_directfb_pointer_grab (GdkWindow *window,
{
GdkWindow *toplevel;
GdkWindowImplDirectFB *impl;
+
if (_gdk_directfb_pointer_grab_window)
{
if (implicit_grab && !_gdk_directfb_pointer_implicit_grab)
@@ -514,10 +518,10 @@ gdk_notify_startup_complete (void)
* gdk_notify_startup_complete_with_id:
* @startup_id: a startup-notification identifier, for which notification
* process should be completed
- *
+ *
* Indicates to the GUI environment that the application has finished
* loading, using a given identifier.
- *
+ *
* GTK+ will call this function automatically for #GtkWindow with custom
* startup-notification identifier unless
* gtk_window_set_auto_startup_notification() is called to disable
@@ -538,7 +542,7 @@ gdk_notify_startup_complete_with_id (const gchar* startup_id)
gboolean
gdk_display_supports_composite (GdkDisplay *display)
{
- return FALSE;
+ return FALSE;
}
diff --git a/gdk/directfb/gdkdisplay-directfb.h b/gdk/directfb/gdkdisplay-directfb.h
index f5e028a..0a5b861 100644
--- a/gdk/directfb/gdkdisplay-directfb.h
+++ b/gdk/directfb/gdkdisplay-directfb.h
@@ -37,12 +37,12 @@ typedef struct _GdkDisplayDFBClass GdkDisplayDFBClass;
struct _GdkDisplayDFB
{
- GdkDisplay parent;
- IDirectFB *directfb;
- IDirectFBDisplayLayer *layer;
- IDirectFBEventBuffer *buffer;
- IDirectFBInputDevice *keyboard;
- GdkKeymap *keymap;
+ GdkDisplay parent;
+ IDirectFB *directfb;
+ IDirectFBDisplayLayer *layer;
+ IDirectFBEventBuffer *buffer;
+ IDirectFBInputDevice *keyboard;
+ GdkKeymap *keymap;
};
struct _GdkDisplayDFBClass
@@ -52,7 +52,9 @@ struct _GdkDisplayDFBClass
GType gdk_display_dfb_get_type (void);
-IDirectFBSurface * gdk_display_dfb_create_surface (GdkDisplayDFB *display,int format,int width, int height);
+IDirectFBSurface *gdk_display_dfb_create_surface (GdkDisplayDFB *display,
+ int format,
+ int width, int height);
G_END_DECLS
diff --git a/gdk/directfb/gdkdnd-directfb.c b/gdk/directfb/gdkdnd-directfb.c
index 35624c7..0af5995 100644
--- a/gdk/directfb/gdkdnd-directfb.c
+++ b/gdk/directfb/gdkdnd-directfb.c
@@ -398,7 +398,6 @@ gdk_drag_find_window_for_screen (GdkDragContext *context,
*protocol = context->protocol;
}
-
}
gboolean
diff --git a/gdk/directfb/gdkdrawable-directfb.c b/gdk/directfb/gdkdrawable-directfb.c
index 7a2dd08..84a7a1b 100644
--- a/gdk/directfb/gdkdrawable-directfb.c
+++ b/gdk/directfb/gdkdrawable-directfb.c
@@ -56,70 +56,70 @@
/*
* There can be multiple domains in one file and one domain (same same) in multiple files.
*/
-D_DEBUG_DOMAIN( GDKDFB_Drawable, "GDKDFB/Drawable", "GDK DirectFB Drawable" );
-D_DEBUG_DOMAIN( GDKDFB_DrawClip, "GDKDFB/DrawClip", "GDK DirectFB Drawable Clip Region" );
+D_DEBUG_DOMAIN (GDKDFB_Drawable, "GDKDFB/Drawable", "GDK DirectFB Drawable");
+D_DEBUG_DOMAIN (GDKDFB_DrawClip, "GDKDFB/DrawClip", "GDK DirectFB Drawable Clip Region");
/* From DirectFB's <gfx/generix/duffs_device.h> */
-#define DUFF_1() \
- case 1:\
- SET_PIXEL( D[0], S[0] );
-
-#define DUFF_2() \
- case 3:\
- SET_PIXEL( D[2], S[2] );\
- case 2:\
- SET_PIXEL( D[1], S[1] );\
- DUFF_1()
-
-#define DUFF_3() \
- case 7:\
- SET_PIXEL( D[6], S[6] );\
- case 6:\
- SET_PIXEL( D[5], S[5] );\
- case 5:\
- SET_PIXEL( D[4], S[4] );\
- case 4:\
- SET_PIXEL( D[3], S[3] );\
- DUFF_2()
-
-#define DUFF_4() \
- case 15:\
- SET_PIXEL( D[14], S[14] );\
- case 14:\
- SET_PIXEL( D[13], S[13] );\
- case 13:\
- SET_PIXEL( D[12], S[12] );\
- case 12:\
- SET_PIXEL( D[11], S[11] );\
- case 11:\
- SET_PIXEL( D[10], S[10] );\
- case 10:\
- SET_PIXEL( D[9], S[9] );\
- case 9:\
- SET_PIXEL( D[8], S[8] );\
- case 8:\
- SET_PIXEL( D[7], S[7] );\
- DUFF_3()
-
-#define SET_PIXEL_DUFFS_DEVICE_N( D, S, w, n ) \
-do {\
- while (w) {\
- register int l = w & ((1 << n) - 1);\
- switch (l) {\
- default:\
- l = (1 << n);\
- SET_PIXEL( D[(1 << n)-1], S[(1 << n)-1] );\
- DUFF_##n()\
- }\
- D += l;\
- S += l;\
- w -= l;\
- }\
-} while(0)
-
-
-static GdkScreen * gdk_directfb_get_screen (GdkDrawable *drawable);
+#define DUFF_1() \
+ case 1: \
+ SET_PIXEL (D[0], S[0]);
+
+#define DUFF_2() \
+ case 3: \
+ SET_PIXEL (D[2], S[2]); \
+ case 2: \
+ SET_PIXEL (D[1], S[1]); \
+ DUFF_1 ()
+
+#define DUFF_3() \
+ case 7: \
+ SET_PIXEL (D[6], S[6]); \
+ case 6: \
+ SET_PIXEL (D[5], S[5]); \
+ case 5: \
+ SET_PIXEL (D[4], S[4]); \
+ case 4: \
+ SET_PIXEL (D[3], S[3]); \
+ DUFF_2 ()
+
+#define DUFF_4() \
+ case 15: \
+ SET_PIXEL (D[14], S[14]); \
+ case 14: \
+ SET_PIXEL (D[13], S[13]); \
+ case 13: \
+ SET_PIXEL (D[12], S[12]); \
+ case 12: \
+ SET_PIXEL (D[11], S[11]); \
+ case 11: \
+ SET_PIXEL (D[10], S[10]); \
+ case 10: \
+ SET_PIXEL (D[9], S[9]); \
+ case 9: \
+ SET_PIXEL (D[8], S[8]); \
+ case 8: \
+ SET_PIXEL (D[7], S[7]); \
+ DUFF_3 ()
+
+#define SET_PIXEL_DUFFS_DEVICE_N(D, S, w, n) \
+ do { \
+ while (w) { \
+ register int l = w & ((1 << n) - 1); \
+ switch (l) { \
+ default: \
+ l = (1 << n); \
+ SET_PIXEL (D[(1 << n) - 1], S[(1 << n) - 1]); \
+ DUFF_##n () \
+ } \
+ D += l; \
+ S += l; \
+ w -= l; \
+ } \
+ } while(0)
+
+
+static GdkScreen *gdk_directfb_get_screen (GdkDrawable *drawable);
static void gdk_drawable_impl_directfb_class_init (GdkDrawableImplDirectFBClass *klass);
static void gdk_directfb_draw_lines (GdkDrawable *drawable,
GdkGC *gc,
@@ -160,7 +160,8 @@ gdk_directfb_set_colormap (GdkDrawable *drawable,
impl = GDK_DRAWABLE_IMPL_DIRECTFB (drawable);
- D_DEBUG_AT( GDKDFB_Drawable, "%s( %p, %p ) <- old %p\n", G_STRFUNC, drawable, colormap, impl->colormap );
+ D_DEBUG_AT (GDKDFB_Drawable, "%s( %p, %p ) <- old %p\n",
+ G_STRFUNC, drawable, colormap, impl->colormap);
if (impl->colormap == colormap)
return;
@@ -183,7 +184,7 @@ gdk_directfb_get_colormap (GdkDrawable *drawable)
if (!retval) {
retval = gdk_colormap_get_system ();
- gdk_directfb_set_colormap(drawable,retval);
+ gdk_directfb_set_colormap (drawable, retval);
}
return retval;
@@ -235,7 +236,8 @@ gdk_directfb_clip_region (GdkDrawable *drawable,
g_return_if_fail (GDK_IS_DRAWABLE_IMPL_DIRECTFB (drawable));
g_return_if_fail (ret_clip != NULL);
- D_DEBUG_AT( GDKDFB_DrawClip, "%s( %p, %p, %p )\n", G_STRFUNC, drawable, gc, draw_rect );
+ D_DEBUG_AT (GDKDFB_DrawClip, "%s( %p, %p, %p )\n",
+ G_STRFUNC, drawable, gc, draw_rect);
private = GDK_DRAWABLE_IMPL_DIRECTFB (drawable);
@@ -248,15 +250,15 @@ gdk_directfb_clip_region (GdkDrawable *drawable,
draw_rect = ▭
}
- D_DEBUG_AT( GDKDFB_DrawClip, " -> draw rectangle == %4d,%4d - %4dx%4d =\n",
- draw_rect->x, draw_rect->y, draw_rect->width, draw_rect->height );
+ D_DEBUG_AT (GDKDFB_DrawClip, " -> draw rectangle == %4d,%4d - %4dx%4d =\n",
+ draw_rect->x, draw_rect->y, draw_rect->width, draw_rect->height);
- temp_region_init_rectangle( ret_clip, draw_rect );
+ temp_region_init_rectangle (ret_clip, draw_rect);
if (private->buffered) {
- D_DEBUG_AT( GDKDFB_DrawClip, " -> buffered region > %4d,%4d - %4dx%4d < (%ld boxes)\n",
- GDKDFB_RECTANGLE_VALS_FROM_BOX( &private->paint_region.extents ),
- private->paint_region.numRects );
+ D_DEBUG_AT (GDKDFB_DrawClip, " -> buffered region > %4d,%4d - %4dx%4d < (%ld boxes)\n",
+ GDKDFB_RECTANGLE_VALS_FROM_BOX (&private->paint_region.extents),
+ private->paint_region.numRects);
gdk_region_intersect (ret_clip, &private->paint_region);
}
@@ -268,8 +270,8 @@ gdk_directfb_clip_region (GdkDrawable *drawable,
if (region->numRects)
{
- D_DEBUG_AT( GDKDFB_DrawClip, " -> clipping region > %4d,%4d - %4dx%4d < (%ld boxes)\n",
- GDKDFB_RECTANGLE_VALS_FROM_BOX( ®ion->extents ), region->numRects );
+ D_DEBUG_AT (GDKDFB_DrawClip, " -> clipping region > %4d,%4d - %4dx%4d < (%ld boxes)\n",
+ GDKDFB_RECTANGLE_VALS_FROM_BOX (®ion->extents), region->numRects);
if (gc->clip_x_origin || gc->clip_y_origin)
{
@@ -289,8 +291,8 @@ gdk_directfb_clip_region (GdkDrawable *drawable,
}
if (private->buffered) {
- D_DEBUG_AT( GDKDFB_DrawClip, " => returning clip >> %4d,%4d - %4dx%4d << (%ld boxes)\n",
- GDKDFB_RECTANGLE_VALS_FROM_BOX( &ret_clip->extents ), ret_clip->numRects );
+ D_DEBUG_AT (GDKDFB_DrawClip, " => returning clip >> %4d,%4d - %4dx%4d << (%ld boxes)\n",
+ GDKDFB_RECTANGLE_VALS_FROM_BOX (&ret_clip->extents), ret_clip->numRects);
return;
}
@@ -324,15 +326,15 @@ gdk_directfb_clip_region (GdkDrawable *drawable,
temp.extents.x2 = cur_private->x + cur_impl->width;
temp.extents.y2 = cur_private->y + cur_impl->height;
- D_DEBUG_AT( GDKDFB_DrawClip, " -> clipping child [ %4d,%4d - %4dx%4d ] (%ld boxes)\n",
- GDKDFB_RECTANGLE_VALS_FROM_BOX( &temp.extents ), temp.numRects );
+ D_DEBUG_AT (GDKDFB_DrawClip, " -> clipping child [ %4d,%4d - %4dx%4d ] (%ld boxes)\n",
+ GDKDFB_RECTANGLE_VALS_FROM_BOX (&temp.extents), temp.numRects);
gdk_region_subtract (ret_clip, &temp);
}
}
- D_DEBUG_AT( GDKDFB_DrawClip, " => returning clip >> %4d,%4d - %4dx%4d << (%ld boxes)\n",
- GDKDFB_RECTANGLE_VALS_FROM_BOX( &ret_clip->extents ), ret_clip->numRects );
+ D_DEBUG_AT (GDKDFB_DrawClip, " => returning clip >> %4d,%4d - %4dx%4d << (%ld boxes)\n",
+ GDKDFB_RECTANGLE_VALS_FROM_BOX (&ret_clip->extents), ret_clip->numRects);
}
/* Drawing
@@ -435,8 +437,8 @@ gdk_directfb_draw_rectangle (GdkDrawable *drawable,
g_return_if_fail (GDK_IS_DRAWABLE (drawable));
- D_DEBUG_AT( GDKDFB_Drawable, "%s( %p, %p, %s, %4d,%4d - %4dx%4d )\n", G_STRFUNC,
- drawable, gc, filled ? " filled" : "outline", x, y, width, height );
+ D_DEBUG_AT (GDKDFB_Drawable, "%s( %p, %p, %s, %4d,%4d - %4dx%4d )\n", G_STRFUNC,
+ drawable, gc, filled ? " filled" : "outline", x, y, width, height);
impl = GDK_DRAWABLE_IMPL_DIRECTFB (drawable);
@@ -464,9 +466,9 @@ gdk_directfb_draw_rectangle (GdkDrawable *drawable,
}
else
{
- if (!gdk_directfb_setup_for_drawing (impl, gc_private)){
+ if (!gdk_directfb_setup_for_drawing (impl, gc_private)) {
return;
- }
+ }
}
}
else
@@ -502,7 +504,8 @@ gdk_directfb_draw_rectangle (GdkDrawable *drawable,
gc_private->values_mask & GDK_GC_STIPPLE &&
gc_private->values.stipple)
{
- surface = GDK_DRAWABLE_IMPL_DIRECTFB (GDK_PIXMAP_OBJECT (gc_private->values.stipple)->impl)->surface;
+ surface =
+ GDK_DRAWABLE_IMPL_DIRECTFB (GDK_PIXMAP_OBJECT (gc_private->values.stipple)->impl)->surface;
if (surface)
impl->surface->SetBlittingFlags (impl->surface,
@@ -528,7 +531,7 @@ gdk_directfb_draw_rectangle (GdkDrawable *drawable,
for (i = 0; i < clip.numRects; i++)
{
- DFBRegion reg = { clip.rects[i].x1, clip.rects[i].y1,
+ DFBRegion reg = { clip.rects[i].x1, clip.rects[i].y1,
clip.rects[i].x2, clip.rects[i].y2 };
impl->surface->SetClip (impl->surface, ®);
@@ -551,22 +554,23 @@ gdk_directfb_draw_rectangle (GdkDrawable *drawable,
rects[i].h = box->y2 - box->y1;
}
- impl->surface->FillRectangles(impl->surface, rects, clip.numRects);
+ impl->surface->FillRectangles (impl->surface, rects, clip.numRects);
}
- temp_region_deinit( &clip );
+ temp_region_deinit (&clip);
}
else
{
DFBRegion region = { x, y, x + width, y + height };
+
impl->surface->SetClip (impl->surface, ®ion);
/* DirectFB does not draw rectangles the X way. Using DirectFB,
a filled Rectangle has the same size as a drawn one, while
X draws the rectangle one pixel taller and wider. */
impl->surface->DrawRectangle (impl->surface,
- x, y, width , height);
+ x, y, width, height);
}
}
@@ -581,7 +585,7 @@ gdk_directfb_draw_arc (GdkDrawable *drawable,
gint angle1,
gint angle2)
{
- D_UNIMPLEMENTED();
+ D_UNIMPLEMENTED ();
}
static void
@@ -593,53 +597,53 @@ gdk_directfb_draw_polygon (GdkDrawable *drawable,
{
g_return_if_fail (GDK_IS_DRAWABLE (drawable));
- D_DEBUG_AT( GDKDFB_Drawable, "%s( %p, %p, %s, %p, %d )\n", G_STRFUNC,
- drawable, gc, filled ? " filled" : "outline", points, npoints );
+ D_DEBUG_AT (GDKDFB_Drawable, "%s( %p, %p, %s, %p, %d )\n", G_STRFUNC,
+ drawable, gc, filled ? " filled" : "outline", points, npoints);
if (npoints < 3)
return;
if (filled)
{
- if (npoints == 3 || (npoints == 4 &&
- points[0].x == points[npoints-1].x &&
- points[0].y == points[npoints-1].y))
- {
- GdkDrawableImplDirectFB *impl;
- GdkRegion clip;
- gint i;
+ if (npoints == 3 || (npoints == 4 &&
+ points[0].x == points[npoints - 1].x &&
+ points[0].y == points[npoints - 1].y))
+ {
+ GdkDrawableImplDirectFB *impl;
+ GdkRegion clip;
+ gint i;
- impl = GDK_DRAWABLE_IMPL_DIRECTFB (drawable);
+ impl = GDK_DRAWABLE_IMPL_DIRECTFB (drawable);
- if (!gdk_directfb_setup_for_drawing (impl, GDK_GC_DIRECTFB (gc)))
- return;
+ if (!gdk_directfb_setup_for_drawing (impl, GDK_GC_DIRECTFB (gc)))
+ return;
- gdk_directfb_clip_region (drawable, gc, NULL, &clip);
+ gdk_directfb_clip_region (drawable, gc, NULL, &clip);
- for (i = 0; i < clip.numRects; i++)
- {
- DFBRegion reg = { clip.rects[i].x1, clip.rects[i].y1,
- clip.rects[i].x2 , clip.rects[i].y2 };
+ for (i = 0; i < clip.numRects; i++)
+ {
+ DFBRegion reg = { clip.rects[i].x1, clip.rects[i].y1,
+ clip.rects[i].x2, clip.rects[i].y2 };
- impl->surface->SetClip (impl->surface, ®);
- impl->surface->FillTriangle (impl->surface,
- points[0].x, points[0].y,
- points[1].x, points[1].y,
- points[2].x, points[2].y);
+ impl->surface->SetClip (impl->surface, ®);
+ impl->surface->FillTriangle (impl->surface,
+ points[0].x, points[0].y,
+ points[1].x, points[1].y,
+ points[2].x, points[2].y);
- }
+ }
- temp_region_deinit( &clip );
+ temp_region_deinit (&clip);
- return;
- }
- else
- g_message ("filled polygons with n > 3 are not yet supported, "
- "drawing outlines");
+ return;
+ }
+ else
+ g_message ("filled polygons with n > 3 are not yet supported, "
+ "drawing outlines");
}
- if (points[0].x != points[npoints-1].x ||
- points[0].y != points[npoints-1].y)
+ if (points[0].x != points[npoints - 1].x ||
+ points[0].y != points[npoints - 1].y)
{
GdkPoint *tmp_points;
@@ -667,7 +671,7 @@ gdk_directfb_draw_text (GdkDrawable *drawable,
const gchar *text,
gint text_length)
{
- D_UNIMPLEMENTED();
+ D_UNIMPLEMENTED ();
}
static void
@@ -679,7 +683,7 @@ gdk_directfb_draw_text_wc (GdkDrawable *drawable,
const GdkWChar *text,
gint text_length)
{
- D_UNIMPLEMENTED();
+ D_UNIMPLEMENTED ();
}
static void
@@ -698,14 +702,14 @@ gdk_directfb_draw_drawable (GdkDrawable *drawable,
GdkRegion clip;
GdkRectangle dest_rect = { xdest,
ydest,
- xdest + width ,
- ydest + height};
+ xdest + width ,
+ ydest + height};
DFBRectangle rect = { xsrc, ysrc, width, height };
gint i;
- D_DEBUG_AT( GDKDFB_Drawable, "%s( %p, %p, %p, %4d,%4d -> %4d,%4d - %dx%d )\n", G_STRFUNC,
- drawable, gc, src, xsrc, ysrc, xdest, ydest, width, height );
+ D_DEBUG_AT (GDKDFB_Drawable, "%s( %p, %p, %p, %4d,%4d -> %4d,%4d - %dx%d )\n", G_STRFUNC,
+ drawable, gc, src, xsrc, ysrc, xdest, ydest, width, height);
impl = GDK_DRAWABLE_IMPL_DIRECTFB (drawable);
@@ -727,15 +731,17 @@ gdk_directfb_draw_drawable (GdkDrawable *drawable,
for (i = 0; i < clip.numRects; i++)
{
- DFBRegion reg = { clip.rects[i].x1, clip.rects[i].y1,
- clip.rects[i].x2 , clip.rects[i].y2 };
+ DFBRegion reg = { clip.rects[i].x1, clip.rects[i].y1,
+ clip.rects[i].x2, clip.rects[i].y2 };
impl->surface->SetClip (impl->surface, ®);
- impl->surface->Blit (impl->surface, src_impl->surface, &rect,
+ impl->surface->Blit (impl->surface,
+ src_impl->surface,
+ &rect,
xdest, ydest);
}
- temp_region_deinit( &clip );
+ temp_region_deinit (&clip);
}
static void
@@ -749,7 +755,8 @@ gdk_directfb_draw_points (GdkDrawable *drawable,
DFBRegion region = { points->x, points->y, points->x, points->y };
- D_DEBUG_AT( GDKDFB_Drawable, "%s( %p, %p, %p, %d )\n", G_STRFUNC, drawable, gc, points, npoints );
+ D_DEBUG_AT (GDKDFB_Drawable, "%s( %p, %p, %p, %d )\n",
+ G_STRFUNC, drawable, gc, points, npoints);
if (npoints < 1)
return;
@@ -783,7 +790,7 @@ gdk_directfb_draw_points (GdkDrawable *drawable,
points++;
}
- temp_region_deinit( &clip );
+ temp_region_deinit (&clip);
}
static void
@@ -796,9 +803,10 @@ gdk_directfb_draw_segments (GdkDrawable *drawable,
GdkRegion clip;
gint i;
-// DFBRegion region = { segs->x1, segs->y1, segs->x2, segs->y2 };
+ // DFBRegion region = { segs->x1, segs->y1, segs->x2, segs->y2 };
- D_DEBUG_AT( GDKDFB_Drawable, "%s( %p, %p, %p, %d )\n", G_STRFUNC, drawable, gc, segs, nsegs );
+ D_DEBUG_AT (GDKDFB_Drawable, "%s( %p, %p, %p, %d )\n",
+ G_STRFUNC, drawable, gc, segs, nsegs);
if (nsegs < 1)
return;
@@ -812,7 +820,7 @@ gdk_directfb_draw_segments (GdkDrawable *drawable,
for (i = 0; i < clip.numRects; i++)
{
- DFBRegion reg = { clip.rects[i].x1, clip.rects[i].y1,
+ DFBRegion reg = { clip.rects[i].x1, clip.rects[i].y1,
clip.rects[i].x2, clip.rects[i].y2 };
impl->surface->SetClip (impl->surface, ®);
@@ -820,48 +828,48 @@ gdk_directfb_draw_segments (GdkDrawable *drawable,
impl->surface->DrawLines (impl->surface, (DFBRegion *)segs, nsegs);
}
- temp_region_deinit( &clip );
+ temp_region_deinit (&clip);
/* everything below can be omitted if the drawing is buffered */
-/* if (impl->buffered)
- return;
+ /* if (impl->buffered)
+ return;
- if (region.x1 > region.x2)
- {
+ if (region.x1 > region.x2)
+ {
region.x1 = segs->x2;
region.x2 = segs->x1;
- }
- if (region.y1 > region.y2)
- {
+ }
+ if (region.y1 > region.y2)
+ {
region.y1 = segs->y2;
region.y2 = segs->y1;
- }
+ }
- while (nsegs > 1)
- {
+ while (nsegs > 1)
+ {
nsegs--;
segs++;
if (segs->x1 < region.x1)
- region.x1 = segs->x1;
+ region.x1 = segs->x1;
if (segs->x2 < region.x1)
- region.x1 = segs->x2;
+ region.x1 = segs->x2;
if (segs->y1 < region.y1)
- region.y1 = segs->y1;
+ region.y1 = segs->y1;
if (segs->y2 < region.y1)
- region.y1 = segs->y2;
+ region.y1 = segs->y2;
if (segs->x1 > region.x2)
- region.x2 = segs->x1;
+ region.x2 = segs->x1;
if (segs->x2 > region.x2)
- region.x2 = segs->x2;
+ region.x2 = segs->x2;
if (segs->y1 > region.y2)
- region.y2 = segs->y1;
+ region.y2 = segs->y1;
if (segs->y2 > region.y2)
- region.y2 = segs->y2;
- }*/
+ region.y2 = segs->y2;
+ }*/
}
static void
@@ -878,7 +886,8 @@ gdk_directfb_draw_lines (GdkDrawable *drawable,
DFBRegion region = { points->x, points->y, points->x, points->y };
- D_DEBUG_AT( GDKDFB_Drawable, "%s( %p, %p, %p, %d )\n", G_STRFUNC, drawable, gc, points, npoints );
+ D_DEBUG_AT (GDKDFB_Drawable, "%s( %p, %p, %p, %d )\n", G_STRFUNC,
+ drawable, gc, points, npoints);
if (npoints < 2)
return;
@@ -921,14 +930,14 @@ gdk_directfb_draw_lines (GdkDrawable *drawable,
for (i = 0; i < clip.numRects; i++)
{
- DFBRegion reg = { clip.rects[i].x1, clip.rects[i].y1,
+ DFBRegion reg = { clip.rects[i].x1, clip.rects[i].y1,
clip.rects[i].x2, clip.rects[i].y2 };
impl->surface->SetClip (impl->surface, ®);
impl->surface->DrawLines (impl->surface, lines, npoints - 1);
}
- temp_region_deinit( &clip );
+ temp_region_deinit (&clip);
}
static void
@@ -953,8 +962,9 @@ gdk_directfb_draw_image (GdkDrawable *drawable,
g_return_if_fail (GDK_IS_DRAWABLE (drawable));
g_return_if_fail (image != NULL);
- D_DEBUG_AT( GDKDFB_Drawable, "%s( %p, %p, %p, %4d,%4d -> %4d,%4d - %dx%d )\n", G_STRFUNC,
- drawable, gc, image, xsrc, ysrc, xdest, ydest, width, height );
+ D_DEBUG_AT (GDKDFB_Drawable, "%s( %p, %p, %p, %4d,%4d -> %4d,%4d - %dx%d )\n",
+ G_STRFUNC,
+ drawable, gc, image, xsrc, ysrc, xdest, ydest, width, height);
impl = GDK_DRAWABLE_IMPL_DIRECTFB (drawable);
image_private = image->windowing_data;
@@ -974,8 +984,8 @@ gdk_directfb_draw_image (GdkDrawable *drawable,
for (i = 0; i < clip.numRects; i++)
{
- DFBRegion reg = { clip.rects[i].x1, clip.rects[i].y1,
- clip.rects[i].x2 , clip.rects[i].y2 };
+ DFBRegion reg = { clip.rects[i].x1, clip.rects[i].y1,
+ clip.rects[i].x2, clip.rects[i].y2 };
impl->surface->SetClip (impl->surface, ®);
impl->surface->Blit (impl->surface,
@@ -988,7 +998,7 @@ gdk_directfb_draw_image (GdkDrawable *drawable,
image->bpl = pitch;
}
- temp_region_deinit( &clip );
+ temp_region_deinit (&clip);
}
static void
@@ -1023,7 +1033,7 @@ composite (guchar *src_buf,
p += 4;
q += 3;
}
-
+
src += src_rowstride;
dest += dest_rowstride;
}
@@ -1052,7 +1062,7 @@ composite_0888 (guchar *src_buf,
while (twidth--)
{
guint t;
-
+
t = p[3] * p[2] + (255 - p[3]) * q[0] + 0x80;
q[0] = (t + (t >> 8)) >> 8;
t = p[3] * p[1] + (255 - p[3]) * q[1] + 0x80;
@@ -1068,7 +1078,7 @@ composite_0888 (guchar *src_buf,
while (twidth--)
{
guint t;
-
+
t = p[3] * p[0] + (255 - p[3]) * q[1] + 0x80;
q[1] = (t + (t >> 8)) >> 8;
t = p[3] * p[1] + (255 - p[3]) * q[2] + 0x80;
@@ -1079,33 +1089,33 @@ composite_0888 (guchar *src_buf,
q += 4;
}
}
-
+
src += src_rowstride;
dest += dest_rowstride;
}
}
/* change the last value to adjust the size of the device (1-4) */
-#define SET_PIXEL_DUFFS_DEVICE( D, S, w ) \
- SET_PIXEL_DUFFS_DEVICE_N( D, S, w, 2 )
+#define SET_PIXEL_DUFFS_DEVICE(D, S, w) \
+ SET_PIXEL_DUFFS_DEVICE_N (D, S, w, 2)
/* From DirectFB's gfx/generic/generic.c" */
-#define SET_PIXEL( D, S ) \
- switch (S >> 26) { \
- case 0: \
- break; \
- case 0x3f: \
- D = ((S << 8) & 0xF800) | \
- ((S >> 5) & 0x07E0) | \
- ((S >> 19) & 0x001F); \
- break; \
- default: \
- D = (((( (((S<<8) & 0xf800) | ((S>>19) & 0x001f)) \
- - (D & 0xf81f)) * ((S>>26)+1) + ((D & 0xf81f)<<6)) & 0x003e07c0) \
- + \
- ((( ((S>>5) & 0x07e0) \
- - (D & 0x07e0)) * ((S>>26)+1) + ((D & 0x07e0)<<6)) & 0x0001f800)) >> 6; \
- }
+#define SET_PIXEL(D, S) \
+ switch (S >> 26) { \
+ case 0: \
+ break; \
+ case 0x3f: \
+ D = ((S << 8) & 0xF800) | \
+ ((S >> 5) & 0x07E0) | \
+ ((S >> 19) & 0x001F); \
+ break; \
+ default: \
+ D = (((( (((S<<8) & 0xf800) | ((S>>19) & 0x001f)) \
+ - (D & 0xf81f)) * ((S>>26)+1) + ((D & 0xf81f)<<6)) & 0x003e07c0) \
+ + \
+ ((( ((S>>5) & 0x07e0) \
+ - (D & 0x07e0)) * ((S>>26)+1) + ((D & 0x07e0)<<6)) & 0x0001f800)) >> 6; \
+ }
static void
composite_565 (guchar *src_buf,
@@ -1116,49 +1126,49 @@ composite_565 (guchar *src_buf,
gint width,
gint height)
{
- while (height--) {
- int w = width;
- u16 *D = (u16*) dest_buf;
- u32 *S = (u32*) src_buf;
+ while (height--) {
+ int w = width;
+ u16 *D = (u16*) dest_buf;
+ u32 *S = (u32*) src_buf;
#if 1
- if ((unsigned long)D & 2) {
- SET_PIXEL( D[0], S[0] );
- w--;
- D++;
- S++;
- }
+ if ((unsigned long)D & 2) {
+ SET_PIXEL (D[0], S[0]);
+ w--;
+ D++;
+ S++;
+ }
- int i;
- int w2 = w / 2;
- u32 *D32 = (u32*) D;
-
- for (i=0; i<w2; i++) {
- register u32 S0 = S[(i << 1) + 0];
- register u32 S1 = S[(i << 1) + 1];
-
- if ((S0 >> 26) == 0x3f && (S1 >> 26) == 0x3f) {
- D32[i] = ((S0 << 8) & 0x0000F800) |
- ((S0 >> 5) & 0x000007E0) |
- ((S0 >> 19) & 0x0000001F) |
- ((S1 << 24) & 0xF8000000) |
- ((S1 << 11) & 0x07E00000) |
- ((S1 >> 3) & 0x001F0000);
- }
- else {
- SET_PIXEL( D[(i << 1) + 0], S0 );
- SET_PIXEL( D[(i << 1) + 1], S1 );
- }
- }
+ int i;
+ int w2 = w / 2;
+ u32 *D32 = (u32*) D;
+
+ for (i=0; i<w2; i++) {
+ register u32 S0 = S[(i << 1) + 0];
+ register u32 S1 = S[(i << 1) + 1];
+
+ if ((S0 >> 26) == 0x3f && (S1 >> 26) == 0x3f) {
+ D32[i] = ((S0 << 8) & 0x0000F800) |
+ ((S0 >> 5) & 0x000007E0) |
+ ((S0 >> 19) & 0x0000001F) |
+ ((S1 << 24) & 0xF8000000) |
+ ((S1 << 11) & 0x07E00000) |
+ ((S1 >> 3) & 0x001F0000);
+ }
+ else {
+ SET_PIXEL (D[(i << 1) + 0], S0);
+ SET_PIXEL (D[(i << 1) + 1], S1);
+ }
+ }
- if (w & 1)
- SET_PIXEL( D[w-1], S[w-1] );
+ if (w & 1)
+ SET_PIXEL (D[w - 1], S[w - 1]);
#else
- SET_PIXEL_DUFFS_DEVICE( D, S, w );
+ SET_PIXEL_DUFFS_DEVICE (D, S, w);
#endif
- dest_buf += dest_rowstride;
- src_buf += src_rowstride;
- }
+ dest_buf += dest_rowstride;
+ src_buf += src_rowstride;
+ }
}
#undef SET_PIXEL
@@ -1214,13 +1224,14 @@ gdk_directfb_draw_pixbuf (GdkDrawable *drawable,
g_return_if_fail (src_x >= 0 && src_x + width <= pb_width);
g_return_if_fail (src_y >= 0 && src_y + height <= pb_height);
- D_DEBUG_AT( GDKDFB_Drawable, "%s( %p, %p, %p, %4d,%4d -> %4d,%4d - %dx%d )\n", G_STRFUNC,
- drawable, gc, pixbuf, src_x, src_y, dest_x, dest_y, width, height );
+ D_DEBUG_AT (GDKDFB_Drawable, "%s( %p, %p, %p, %4d,%4d -> %4d,%4d - %dx%d )\n",
+ G_STRFUNC,
+ drawable, gc, pixbuf, src_x, src_y, dest_x, dest_y, width, height);
/* Clip to the drawable; this is required for get_from_drawable() so
* can't be done implicitly
*/
-
+
if (dest_x < 0)
{
src_x -= dest_x;
@@ -1248,7 +1259,7 @@ gdk_directfb_draw_pixbuf (GdkDrawable *drawable,
/* Clip to the clip region; this avoids getting more
* image data from the server than we need to.
*/
-
+
tmp_rect.x = dest_x;
tmp_rect.y = dest_y;
tmp_rect.width = width;
@@ -1260,7 +1271,7 @@ gdk_directfb_draw_pixbuf (GdkDrawable *drawable,
gdk_region_intersect (drect, clip);
gdk_region_get_clipbox (drect, &tmp_rect);
-
+
gdk_region_destroy (drect);
gdk_region_destroy (clip);
@@ -1270,25 +1281,25 @@ gdk_directfb_draw_pixbuf (GdkDrawable *drawable,
#endif
if (gdk_pixbuf_get_has_alpha (pixbuf) && impl->format == DSPF_RGB16) {
- void *data;
- int pitch;
-
- if (impl->surface->Lock( impl->surface, DSLF_READ | DSLF_WRITE, &data, &pitch ) == DFB_OK) {
- composite_565( pb_pixels + src_y * pb_rowstride + src_x * 4,
- pb_rowstride,
- data + dest_y * pitch + dest_x * 2,
- pitch,
- #if G_BYTE_ORDER == G_BIG_ENDIAN
- GDK_MSB_FIRST,
- #else
- GDK_LSB_FIRST,
- #endif
- width, height );
-
- impl->surface->Unlock( impl->surface );
+ void *data;
+ int pitch;
+
+ if (impl->surface->Lock (impl->surface, DSLF_READ | DSLF_WRITE, &data, &pitch) == DFB_OK) {
+ composite_565 (pb_pixels + src_y * pb_rowstride + src_x * 4,
+ pb_rowstride,
+ data + dest_y * pitch + dest_x * 2,
+ pitch,
+#if G_BYTE_ORDER == G_BIG_ENDIAN
+ GDK_MSB_FIRST,
+#else
+ GDK_LSB_FIRST,
+#endif
+ width, height);
- return;
- }
+ impl->surface->Unlock (impl->surface);
+
+ return;
+ }
}
/* Actually draw */
@@ -1313,7 +1324,7 @@ gdk_directfb_draw_pixbuf (GdkDrawable *drawable,
{
gint bits_per_pixel = _gdk_windowing_get_bits_for_depth (gdk_drawable_get_display (drawable),
visual->depth);
-
+
if (visual->byte_order == (G_BYTE_ORDER == G_BIG_ENDIAN ? GDK_MSB_FIRST : GDK_LSB_FIRST) &&
visual->depth == 16 &&
visual->red_mask == 0xf800 &&
@@ -1339,13 +1350,13 @@ gdk_directfb_draw_pixbuf (GdkDrawable *drawable,
for (x0 = 0; x0 < width; x0 += GDK_SCRATCH_IMAGE_WIDTH)
{
gint xs0, ys0;
-
+
gint width1 = MIN (width - x0, GDK_SCRATCH_IMAGE_WIDTH);
-
+
GdkImage *image = _gdk_image_get_scratch (gdk_drawable_get_screen (drawable),
width1, height1,
gdk_drawable_get_depth (drawable), &xs0, &ys0);
-
+
gdk_drawable_copy_to_image (drawable, image,
dest_x + x0, dest_y + y0,
xs0, ys0,
@@ -1366,17 +1377,19 @@ gdk_directfb_draw_pixbuf (GdkDrawable *drawable,
void *data;
int pitch;
- if (impl->surface->Lock( impl->surface, DSLF_READ | DSLF_WRITE, &data, &pitch ) == DFB_OK) {
- (*composite_func) (pb_pixels + src_y * pb_rowstride + src_x * 4,
- pb_rowstride,
- data + dest_y * pitch + DFB_BYTES_PER_LINE( impl->format, dest_x ),
- pitch,
- visual->byte_order,
- width, height);
-
- impl->surface->Unlock( impl->surface );
+ if (impl->surface->Lock (impl->surface,
+ DSLF_READ | DSLF_WRITE,
+ &data, &pitch) == DFB_OK) {
+ (*composite_func) (pb_pixels + src_y * pb_rowstride + src_x * 4,
+ pb_rowstride,
+ data + dest_y * pitch + DFB_BYTES_PER_LINE (impl->format, dest_x),
+ pitch,
+ visual->byte_order,
+ width, height);
+
+ impl->surface->Unlock (impl->surface);
}
-#endif
+#endif
goto out;
}
else
@@ -1390,7 +1403,7 @@ gdk_directfb_draw_pixbuf (GdkDrawable *drawable,
dest_x, dest_y,
0, 0,
width, height);
-
+
if (composited)
composite (pb_pixels + src_y * pb_rowstride + src_x * 4,
pb_rowstride,
@@ -1487,18 +1500,18 @@ convert_rgb_pixbuf_to_image (guchar *src,
* Object stuff
*/
static inline const char *
-drawable_impl_type_name( GObject *object )
+drawable_impl_type_name (GObject *object)
{
- if (GDK_IS_PIXMAP (object))
- return "PIXMAP";
+ if (GDK_IS_PIXMAP (object))
+ return "PIXMAP";
- if (GDK_IS_WINDOW (object))
- return "WINDOW";
+ if (GDK_IS_WINDOW (object))
+ return "WINDOW";
- if (GDK_IS_DRAWABLE_IMPL_DIRECTFB (object))
- return "DRAWABLE";
+ if (GDK_IS_DRAWABLE_IMPL_DIRECTFB (object))
+ return "DRAWABLE";
- return "unknown";
+ return "unknown";
}
@@ -1508,17 +1521,19 @@ gdk_drawable_impl_directfb_finalize (GObject *object)
GdkDrawableImplDirectFB *impl;
impl = GDK_DRAWABLE_IMPL_DIRECTFB (object);
- D_DEBUG_AT( GDKDFB_Drawable, "%s( %p ) <- %dx%d (%s at %4d,%4d)\n", G_STRFUNC,
+ D_DEBUG_AT (GDKDFB_Drawable, "%s( %p ) <- %dx%d (%s at %4d,%4d)\n",
+ G_STRFUNC,
object, impl->width, impl->height,
- drawable_impl_type_name( object ),
- impl->abs_x, impl->abs_y );
+ drawable_impl_type_name (object),
+ impl->abs_x, impl->abs_y);
gdk_directfb_set_colormap (GDK_DRAWABLE (object), NULL);
- if( impl->cairo_surface ) {
- cairo_surface_finish(impl->cairo_surface);
+ if (impl->cairo_surface) {
+ cairo_surface_finish (impl->cairo_surface);
}
- if( impl->surface )
- impl->surface->Release (impl->surface);
+ if (impl->surface)
+ impl->surface->Release (impl->surface);
+
G_OBJECT_CLASS (parent_class)->finalize (object);
}
@@ -1543,31 +1558,31 @@ gdk_drawable_impl_directfb_class_init (GdkDrawableImplDirectFBClass *klass)
drawable_class->draw_segments = gdk_directfb_draw_segments;
drawable_class->draw_lines = gdk_directfb_draw_lines;
#if 0
- drawable_class->draw_glyphs = NULL;
- drawable_class->draw_glyphs_transformed = NULL;
+ drawable_class->draw_glyphs = NULL;
+ drawable_class->draw_glyphs_transformed = NULL;
#endif
drawable_class->draw_image = gdk_directfb_draw_image;
drawable_class->ref_cairo_surface = gdk_directfb_ref_cairo_surface;
- drawable_class->set_colormap = gdk_directfb_set_colormap;
- drawable_class->get_colormap = gdk_directfb_get_colormap;
+ drawable_class->set_colormap = gdk_directfb_set_colormap;
+ drawable_class->get_colormap = gdk_directfb_get_colormap;
- drawable_class->get_depth = gdk_directfb_get_depth;
- drawable_class->get_visual = gdk_directfb_get_visual;
+ drawable_class->get_depth = gdk_directfb_get_depth;
+ drawable_class->get_visual = gdk_directfb_get_visual;
- drawable_class->get_size = gdk_directfb_get_size;
+ drawable_class->get_size = gdk_directfb_get_size;
drawable_class->_copy_to_image = _gdk_directfb_copy_to_image;
- drawable_class->get_screen = gdk_directfb_get_screen;
+ drawable_class->get_screen = gdk_directfb_get_screen;
- real_draw_pixbuf = drawable_class->draw_pixbuf;
+ real_draw_pixbuf = drawable_class->draw_pixbuf;
drawable_class->draw_pixbuf = gdk_directfb_draw_pixbuf;
/* check for hardware-accelerated alpha-blending */
{
DFBGraphicsDeviceDescription desc;
- _gdk_display->directfb->GetDeviceDescription ( _gdk_display->directfb, &desc);
+ _gdk_display->directfb->GetDeviceDescription (_gdk_display->directfb, &desc);
accelerated_alpha_blending =
((desc.acceleration_mask & DFXL_BLIT) &&
@@ -1603,8 +1618,10 @@ gdk_drawable_impl_directfb_get_type (void)
return object_type;
}
-static GdkScreen * gdk_directfb_get_screen (GdkDrawable *drawable){
- return gdk_screen_get_default();
+static GdkScreen *
+gdk_directfb_get_screen (GdkDrawable *drawable)
+{
+ return gdk_screen_get_default ();
}
static void
@@ -1646,13 +1663,13 @@ gdk_directfb_ref_cairo_surface (GdkDrawable *drawable)
{
GdkDrawableImplDirectFB *impl;
IDirectFB *dfb;
-
+
g_return_val_if_fail (GDK_IS_DRAWABLE (drawable), NULL);
g_return_val_if_fail (GDK_IS_DRAWABLE_IMPL_DIRECTFB (drawable), NULL);
impl = GDK_DRAWABLE_IMPL_DIRECTFB (drawable);
- dfb = GDK_DISPLAY_DFB(gdk_drawable_get_display(drawable))->directfb;
-
+ dfb = GDK_DISPLAY_DFB (gdk_drawable_get_display (drawable))->directfb;
+
if (!impl->cairo_surface) {
IDirectFBSurface *surface;
g_assert (impl->surface != NULL);
@@ -1664,8 +1681,8 @@ gdk_directfb_ref_cairo_surface (GdkDrawable *drawable)
if (surface) {
impl->cairo_surface = cairo_directfb_surface_create (dfb, surface);
if (impl->cairo_surface) {
- cairo_surface_set_user_data (impl->cairo_surface,
- &gdk_directfb_cairo_key, drawable,
+ cairo_surface_set_user_data (impl->cairo_surface,
+ &gdk_directfb_cairo_key, drawable,
gdk_directfb_cairo_surface_destroy);
}
#if defined(CAIRO_VERSION) && CAIRO_VERSION >= CAIRO_VERSION_ENCODE(1,5,5)
@@ -1675,7 +1692,7 @@ gdk_directfb_ref_cairo_surface (GdkDrawable *drawable)
} else {
cairo_surface_reference (impl->cairo_surface);
}
-
+
g_assert (impl->cairo_surface != NULL);
return impl->cairo_surface;
}
diff --git a/gdk/directfb/gdkevents-directfb.c b/gdk/directfb/gdkevents-directfb.c
index 2dd5000..e979526 100644
--- a/gdk/directfb/gdkevents-directfb.c
+++ b/gdk/directfb/gdkevents-directfb.c
@@ -102,12 +102,12 @@ apply_filters (GdkWindow *window,
* more events and append them after it if it likes.
*/
node = _gdk_event_queue_append ((GdkDisplay*)_gdk_display, event);
-
+
tmp_list = filters;
while (tmp_list)
{
GdkEventFilter *filter = (GdkEventFilter *) tmp_list->data;
-
+
tmp_list = tmp_list->next;
result = filter->function (dfbevent, event, filter->data);
if (result != GDK_FILTER_CONTINUE)
@@ -173,7 +173,7 @@ gdk_event_send_client_message_by_window (GdkEvent *event,
evt.type = GPOINTER_TO_UINT (GDK_ATOM_TO_POINTER (event->client.message_type));
evt.data = (void *) event->client.data.l[0];
- _gdk_display->buffer->PostEvent(_gdk_display->buffer, DFB_EVENT (&evt));
+ _gdk_display->buffer->PostEvent (_gdk_display->buffer, DFB_EVENT (&evt));
return TRUE;
}
@@ -225,8 +225,8 @@ dfb_events_io_func (GIOChannel *channel,
{
case DFEC_WINDOW:
/* TODO workaround to prevent two DWET_ENTER in a row from being delivered */
- if (event->window.type == DWET_ENTER ) {
- if ( i>0 && buf[i-1].window.type != DWET_ENTER )
+ if (event->window.type == DWET_ENTER) {
+ if (i > 0 && buf[i - 1].window.type != DWET_ENTER)
dfb_events_process_window_event (&event->window);
}
else
@@ -356,7 +356,7 @@ _gdk_events_queue (GdkDisplay *display)
void
gdk_flush (void)
{
-gdk_display_flush ( GDK_DISPLAY_OBJECT(_gdk_display));
+ gdk_display_flush (GDK_DISPLAY_OBJECT (_gdk_display));
}
/* Sends a ClientMessage to all toplevel client windows */
@@ -368,22 +368,22 @@ gdk_event_send_client_message_for_display (GdkDisplay *display,
GdkWindow *win = NULL;
gboolean ret = TRUE;
- g_return_val_if_fail(event != NULL, FALSE);
+ g_return_val_if_fail (event != NULL, FALSE);
win = gdk_window_lookup_for_display (display, (GdkNativeWindow) xid);
- g_return_val_if_fail(win != NULL, FALSE);
+ g_return_val_if_fail (win != NULL, FALSE);
- if ((GDK_WINDOW_OBJECT(win)->window_type != GDK_WINDOW_CHILD) &&
+ if ((GDK_WINDOW_OBJECT (win)->window_type != GDK_WINDOW_CHILD) &&
(g_object_get_data (G_OBJECT (win), "gdk-window-child-handler")))
{
/* Managed window, check children */
GList *ltmp = NULL;
- for (ltmp = GDK_WINDOW_OBJECT(win)->children; ltmp; ltmp = ltmp->next)
- {
- ret &= gdk_event_send_client_message_by_window (event,
- GDK_WINDOW(ltmp->data));
- }
+ for (ltmp = GDK_WINDOW_OBJECT (win)->children; ltmp; ltmp = ltmp->next)
+ {
+ ret &= gdk_event_send_client_message_by_window (event,
+ GDK_WINDOW(ltmp->data));
+ }
}
else
{
@@ -437,7 +437,7 @@ gdk_directfb_event_windows_remove (GdkWindow *window)
if (EventBuffer)
impl->window->DetachEventBuffer (impl->window, EventBuffer);
-/* FIXME: should we warn if (! EventBuffer) ? */
+ /* FIXME: should we warn if (! EventBuffer) ? */
}
GdkWindow *
@@ -464,7 +464,7 @@ gdk_directfb_child_at (GdkWindow *window,
*winx -= win->x;
*winy -= win->y;
- return gdk_directfb_child_at (GDK_WINDOW (win), winx, winy );
+ return gdk_directfb_child_at (GDK_WINDOW (win), winx, winy);
}
}
@@ -636,67 +636,65 @@ gdk_event_translate (DFBWindowEvent *dfbevent,
_gdk_directfb_mouse_y = dfbevent->cy;
//child = gdk_directfb_child_at (window, &dfbevent->x, &dfbevent->y);
- /* Go all the way to root to catch popup menus */
- int wx=_gdk_directfb_mouse_x;
- int wy=_gdk_directfb_mouse_y;
+ /* Go all the way to root to catch popup menus */
+ int wx=_gdk_directfb_mouse_x;
+ int wy=_gdk_directfb_mouse_y;
child = gdk_directfb_child_at (_gdk_parent_root, &wx, &wy);
- /* first let's see if any cossing event has to be send */
- gdk_directfb_window_send_crossing_events (NULL, child, GDK_CROSSING_NORMAL);
+ /* first let's see if any cossing event has to be send */
+ gdk_directfb_window_send_crossing_events (NULL, child, GDK_CROSSING_NORMAL);
- /* then dispatch the motion event to the window the cursor it's inside */
- event_win = gdk_directfb_pointer_event_window (child, GDK_MOTION_NOTIFY);
+ /* then dispatch the motion event to the window the cursor it's inside */
+ event_win = gdk_directfb_pointer_event_window (child, GDK_MOTION_NOTIFY);
- if (event_win)
- {
-
- if (event_win == _gdk_directfb_pointer_grab_window) {
- GdkDrawableImplDirectFB *impl;
+ if (event_win)
+ {
+ if (event_win == _gdk_directfb_pointer_grab_window) {
+ GdkDrawableImplDirectFB *impl;
- child = _gdk_directfb_pointer_grab_window;
- impl = GDK_DRAWABLE_IMPL_DIRECTFB (GDK_WINDOW_OBJECT (child)->impl);
+ child = _gdk_directfb_pointer_grab_window;
+ impl = GDK_DRAWABLE_IMPL_DIRECTFB (GDK_WINDOW_OBJECT (child)->impl);
- dfbevent->x = _gdk_directfb_mouse_x - impl->abs_x;
- dfbevent->y = _gdk_directfb_mouse_y - impl->abs_y;
- }
+ dfbevent->x = _gdk_directfb_mouse_x - impl->abs_x;
+ dfbevent->y = _gdk_directfb_mouse_y - impl->abs_y;
+ }
- event = gdk_directfb_event_make (child, GDK_MOTION_NOTIFY);
+ event = gdk_directfb_event_make (child, GDK_MOTION_NOTIFY);
- event->motion.x_root = _gdk_directfb_mouse_x;
- event->motion.y_root = _gdk_directfb_mouse_y;
+ event->motion.x_root = _gdk_directfb_mouse_x;
+ event->motion.y_root = _gdk_directfb_mouse_y;
- //event->motion.x = dfbevent->x;
- //event->motion.y = dfbevent->y;
- event->motion.x = wx;
- event->motion.y = wy;
+ //event->motion.x = dfbevent->x;
+ //event->motion.y = dfbevent->y;
+ event->motion.x = wx;
+ event->motion.y = wy;
- event->motion.state = _gdk_directfb_modifiers;
- event->motion.is_hint = FALSE;
- event->motion.device = display->core_pointer;
+ event->motion.state = _gdk_directfb_modifiers;
+ event->motion.is_hint = FALSE;
+ event->motion.device = display->core_pointer;
- if (GDK_WINDOW_OBJECT (event_win)->event_mask &
- GDK_POINTER_MOTION_HINT_MASK)
- {
- while (EventBuffer->PeekEvent (EventBuffer,
- DFB_EVENT (dfbevent)) == DFB_OK
- && dfbevent->type == DWET_MOTION)
- {
- EventBuffer->GetEvent (EventBuffer, DFB_EVENT (dfbevent));
- event->motion.is_hint = TRUE;
- }
- }
- }
- /* make sure crossing events go to the event window found */
-/* GdkWindow *ev_win = ( event_win == NULL ) ? gdk_window_at_pointer (NULL,NULL) :event_win;
- gdk_directfb_window_send_crossing_events (NULL,ev_win,GDK_CROSSING_NORMAL);
-*/
+ if (GDK_WINDOW_OBJECT (event_win)->event_mask &
+ GDK_POINTER_MOTION_HINT_MASK)
+ {
+ while (EventBuffer->PeekEvent (EventBuffer,
+ DFB_EVENT (dfbevent)) == DFB_OK
+ && dfbevent->type == DWET_MOTION)
+ {
+ EventBuffer->GetEvent (EventBuffer, DFB_EVENT (dfbevent));
+ event->motion.is_hint = TRUE;
+ }
+ }
+ }
+ /* make sure crossing events go to the event window found */
+ /* GdkWindow *ev_win = (event_win == NULL) ? gdk_window_at_pointer (NULL,NULL) :event_win;
+ gdk_directfb_window_send_crossing_events (NULL,ev_win,GDK_CROSSING_NORMAL);
+ */
}
break;
case DWET_GOTFOCUS:
gdk_directfb_change_focus (window);
-
break;
case DWET_LOSTFOCUS:
@@ -836,7 +834,7 @@ gdk_event_translate (DFBWindowEvent *dfbevent,
case DWET_CLOSE:
{
-
+
GdkWindow *event_win;
event_win = gdk_directfb_other_event_window (window, GDK_DELETE);
@@ -946,25 +944,25 @@ void
gdk_screen_broadcast_client_message (GdkScreen *screen,
GdkEvent *sev)
{
- GdkWindow *root_window;
+ GdkWindow *root_window;
GdkWindowObject *private;
- GList *top_level = NULL;
+ GList *top_level = NULL;
g_return_if_fail (GDK_IS_SCREEN (screen));
- g_return_if_fail(sev != NULL);
+ g_return_if_fail (sev != NULL);
root_window = gdk_screen_get_root_window (screen);
- g_return_if_fail(GDK_IS_WINDOW(root_window));
+ g_return_if_fail (GDK_IS_WINDOW (root_window));
private = GDK_WINDOW_OBJECT (root_window);
for (top_level = private->children; top_level; top_level = top_level->next)
{
- gdk_event_send_client_message_for_display (gdk_drawable_get_display(GDK_DRAWABLE(root_window)),
- sev,
- (guint32)(GDK_WINDOW_DFB_ID(GDK_WINDOW(top_level->data))));
- }
+ gdk_event_send_client_message_for_display (gdk_drawable_get_display (GDK_DRAWABLE (root_window)),
+ sev,
+ (guint32)(GDK_WINDOW_DFB_ID (GDK_WINDOW (top_level->data))));
+ }
}
@@ -984,7 +982,7 @@ gdk_screen_broadcast_client_message (GdkScreen *screen,
gboolean
gdk_net_wm_supports (GdkAtom property)
{
- return FALSE;
+ return FALSE;
}
void
diff --git a/gdk/directfb/gdkfont-directfb.c b/gdk/directfb/gdkfont-directfb.c
index a778a52..c9669c1 100644
--- a/gdk/directfb/gdkfont-directfb.c
+++ b/gdk/directfb/gdkfont-directfb.c
@@ -63,18 +63,19 @@ gdk_directfb_bogus_font (gint height)
GdkFontDirectFB *private;
private = g_new0 (GdkFontDirectFB, 1);
- font = (GdkFont *)private;
+ font = (GdkFont *) private;
- font->type = GDK_FONT_FONT;
- font->ascent = height*3/4;
- font->descent = height/4;
- private->size = height;
+ font->type = GDK_FONT_FONT;
+ font->ascent = height * 3 / 4;
+ font->descent = height / 4;
+ private->size = height;
private->base.ref_count = 1;
return font;
}
-GdkFont*
-gdk_font_from_description_for_display (GdkDisplay * display,PangoFontDescription *font_desc)
+GdkFont *
+gdk_font_from_description_for_display (GdkDisplay *display,
+ PangoFontDescription *font_desc)
{
gint size;
@@ -87,19 +88,20 @@ gdk_font_from_description_for_display (GdkDisplay * display,PangoFontDescription
/* ********************* */
-GdkFont*
+GdkFont *
gdk_fontset_load (const gchar *fontset_name)
{
return gdk_directfb_bogus_font (10);
}
GdkFont *
-gdk_fontset_load_for_display (GdkDisplay *display,const gchar *font_name) {
+gdk_fontset_load_for_display (GdkDisplay *display,const gchar *font_name)
+{
return gdk_directfb_bogus_font (10);
}
GdkFont *
-gdk_font_load_for_display (GdkDisplay *display,const gchar *font_name)
+gdk_font_load_for_display (GdkDisplay *display, const gchar *font_name)
{
return gdk_directfb_bogus_font (10);
}
@@ -126,7 +128,7 @@ _gdk_font_strlen (GdkFont *font,
const gchar *str)
{
GdkFontDirectFB *font_private;
- gint length = 0;
+ gint length = 0;
g_return_val_if_fail (font != NULL, -1);
g_return_val_if_fail (str != NULL, -1);
@@ -182,7 +184,7 @@ gdk_font_equal (const GdkFont *fonta,
privatea = (const GdkFontDirectFB*) fonta;
privateb = (const GdkFontDirectFB*) fontb;
- if(fonta == fontb)
+ if (fonta == fontb)
return TRUE;
return FALSE;
@@ -218,15 +220,15 @@ gdk_text_extents (GdkFont *font,
gint *ascent,
gint *descent)
{
- if(ascent)
+ if (ascent)
*ascent = font->ascent;
- if(descent)
+ if (descent)
*descent = font->descent;
- if(width)
- *width = gdk_text_width(font, text, text_length);
- if(lbearing)
+ if (width)
+ *width = gdk_text_width (font, text, text_length);
+ if (lbearing)
*lbearing = 0;
- if(rbearing)
+ if (rbearing)
*rbearing = 0;
}
@@ -263,14 +265,14 @@ gdk_text_extents_wc (GdkFont *font,
GdkFont *
gdk_font_lookup (GdkNativeWindow xid)
{
- g_warning(" gdk_font_lookup unimplemented \n");
+ g_warning(" gdk_font_lookup unimplemented \n");
return NULL;
}
-GdkDisplay*
+GdkDisplay *
gdk_font_get_display (GdkFont* font)
{
- g_warning(" gdk_font_get_display unimplemented \n");
+ g_warning(" gdk_font_get_display unimplemented \n");
return NULL;
}
diff --git a/gdk/directfb/gdkgc-directfb.c b/gdk/directfb/gdkgc-directfb.c
index 202c27c..d53c9f1 100644
--- a/gdk/directfb/gdkgc-directfb.c
+++ b/gdk/directfb/gdkgc-directfb.c
@@ -117,13 +117,13 @@ _gdk_directfb_gc_new (GdkDrawable *drawable,
private = GDK_GC_DIRECTFB (gc);
#if 0
private->values.background.pixel = 0;
- private->values.background.red =
- private->values.background.green =
+ private->values.background.red = 0;
+ private->values.background.green = 0;
private->values.background.blue = 0;
private->values.foreground.pixel = 0;
- private->values.foreground.red =
- private->values.foreground.green =
+ private->values.foreground.red = 0;
+ private->values.foreground.green = 0;
private->values.foreground.blue = 0;
#endif
@@ -146,11 +146,8 @@ void
_gdk_windowing_gc_get_foreground (GdkGC *gc,
GdkColor *color)
{
- GdkGCDirectFB *private;
- private = GDK_GC_DIRECTFB (gc);
+ GdkGCDirectFB *private = GDK_GC_DIRECTFB (gc);
*color =private->values.foreground;
-
-
}
#endif
@@ -344,8 +341,8 @@ _gdk_windowing_gc_set_clip_region (GdkGC *gc,
if (reset_origin)
{
- gc->clip_x_origin = 0;
- gc->clip_y_origin = 0;
+ gc->clip_x_origin = 0;
+ gc->clip_y_origin = 0;
data->values.clip_x_origin = 0;
data->values.clip_y_origin = 0;
}
@@ -355,7 +352,7 @@ _gdk_windowing_gc_set_clip_region (GdkGC *gc,
void
_gdk_windowing_gc_copy (GdkGC *dst_gc,
- GdkGC *src_gc)
+ GdkGC *src_gc)
{
GdkGCDirectFB *dst_private;
@@ -396,11 +393,11 @@ _gdk_windowing_gc_copy (GdkGC *dst_gc,
*
* Since: 2.2
*/
-GdkScreen *
+GdkScreen *
gdk_gc_get_screen (GdkGC *gc)
{
g_return_val_if_fail (GDK_IS_GC_DIRECTFB (gc), NULL);
-
+
return _gdk_screen;
}
#define __GDK_GC_X11_C__
diff --git a/gdk/directfb/gdkgeometry-directfb.c b/gdk/directfb/gdkgeometry-directfb.c
index f848956..01e52f7 100644
--- a/gdk/directfb/gdkgeometry-directfb.c
+++ b/gdk/directfb/gdkgeometry-directfb.c
@@ -119,7 +119,7 @@ _gdk_directfb_window_scroll (GdkWindow *window,
impl->surface->SetClip (impl->surface, &update);
impl->surface->Blit (impl->surface, impl->surface, NULL, dx, dy);
impl->surface->SetClip (impl->surface, NULL);
- impl->surface->Flip(impl->surface,&update,0);
+ impl->surface->Flip (impl->surface, &update, 0);
}
}
}
@@ -151,13 +151,13 @@ _gdk_directfb_window_scroll (GdkWindow *window,
* @region: The #GdkRegion to move
* @dx: Amount to move in the X direction
* @dy: Amount to move in the Y direction
- *
- * Move the part of @window indicated by @region by @dy pixels in the Y
- * direction and @dx pixels in the X direction. The portions of @region
+ *
+ * Move the part of @window indicated by @region by @dy pixels in the Y
+ * direction and @dx pixels in the X direction. The portions of @region
* that not covered by the new position of @region are invalidated.
- *
+ *
* Child windows are not moved.
- *
+ *
* Since: 2.8
**/
void
@@ -168,21 +168,21 @@ _gdk_directfb_window_move_region (GdkWindow *window,
{
GdkWindowObject *private;
GdkDrawableImplDirectFB *impl;
- GdkRegion *window_clip;
- GdkRegion *src_region;
- GdkRegion *brought_in;
- GdkRegion *dest_region;
- GdkRegion *moving_invalid_region;
- GdkRectangle dest_extents;
-
+ GdkRegion *window_clip;
+ GdkRegion *src_region;
+ GdkRegion *brought_in;
+ GdkRegion *dest_region;
+ GdkRegion *moving_invalid_region;
+ GdkRectangle dest_extents;
+
g_return_if_fail (GDK_IS_WINDOW (window));
g_return_if_fail (region != NULL);
-
+
if (GDK_WINDOW_DESTROYED (window))
return;
-
+
private = GDK_WINDOW_OBJECT (window);
- impl = GDK_DRAWABLE_IMPL_DIRECTFB (private->impl);
+ impl = GDK_DRAWABLE_IMPL_DIRECTFB (private->impl);
if (dx == 0 && dy == 0)
return;
@@ -214,14 +214,14 @@ _gdk_directfb_window_move_region (GdkWindow *window,
gdk_region_intersect (moving_invalid_region, src_region);
gdk_region_offset (moving_invalid_region, dx, dy);
}
-
+
/* invalidate all of the src region */
gdk_window_invalidate_region (window, src_region, FALSE);
/* un-invalidate destination region */
if (private->update_area)
gdk_region_subtract (private->update_area, dest_region);
-
+
/* invalidate moving parts of existing update area */
if (moving_invalid_region)
{
@@ -234,22 +234,22 @@ _gdk_directfb_window_move_region (GdkWindow *window,
gdk_region_destroy (brought_in);
/* Actually do the moving */
- if (impl->surface)
- {
- DFBRectangle source = { dest_extents.x - dx,
- dest_extents.y - dy,
- dest_extents.width,
- dest_extents.height};
- DFBRegion destination = { dest_extents.x,
- dest_extents.y,
- dest_extents.x+dest_extents.width-1,
- dest_extents.y+dest_extents.height-1};
-
- impl->surface->SetClip (impl->surface, &destination);
- impl->surface->Blit (impl->surface, impl->surface,&source,dx,dy);
- impl->surface->SetClip (impl->surface, NULL);
- impl->surface->Flip(impl->surface,&destination,0);
- }
+ if (impl->surface)
+ {
+ DFBRectangle source = { dest_extents.x - dx,
+ dest_extents.y - dy,
+ dest_extents.width,
+ dest_extents.height};
+ DFBRegion destination = { dest_extents.x,
+ dest_extents.y,
+ dest_extents.x + dest_extents.width - 1,
+ dest_extents.y + dest_extents.height - 1};
+
+ impl->surface->SetClip (impl->surface, &destination);
+ impl->surface->Blit (impl->surface, impl->surface, &source, dx, dy);
+ impl->surface->SetClip (impl->surface, NULL);
+ impl->surface->Flip (impl->surface, &destination, 0);
+ }
gdk_region_destroy (src_region);
gdk_region_destroy (dest_region);
}
diff --git a/gdk/directfb/gdkglobals-directfb.c b/gdk/directfb/gdkglobals-directfb.c
index fbfd863..412ce32 100644
--- a/gdk/directfb/gdkglobals-directfb.c
+++ b/gdk/directfb/gdkglobals-directfb.c
@@ -40,23 +40,23 @@
GdkDisplayDFB *_gdk_display = NULL;
-GdkScreen * _gdk_screen = NULL;
-
-gboolean gdk_directfb_apply_focus_opacity = FALSE;
-gboolean gdk_directfb_enable_color_keying = FALSE;
-DFBColor gdk_directfb_bg_color = { 0, 0, 0, 0 };
-DFBColor gdk_directfb_bg_color_key = { 0, 0, 0, 0 };
-gboolean gdk_directfb_monochrome_fonts = FALSE;
-
-GdkWindow * _gdk_directfb_pointer_grab_window = NULL;
-GdkWindow * _gdk_directfb_keyboard_grab_window = NULL;
-GdkWindow * _gdk_directfb_pointer_grab_confine = NULL;
-gboolean _gdk_directfb_pointer_grab_owner_events = FALSE;
-gboolean _gdk_directfb_keyboard_grab_owner_events = FALSE;
-GdkEventMask _gdk_directfb_pointer_grab_events = 0;
-GdkEventMask _gdk_directfb_keyboard_grab_events = 0;
-GdkCursor * _gdk_directfb_pointer_grab_cursor = NULL;
-
-GdkAtom _gdk_selection_property = 0;
+GdkScreen *_gdk_screen = NULL;
+
+gboolean gdk_directfb_apply_focus_opacity = FALSE;
+gboolean gdk_directfb_enable_color_keying = FALSE;
+DFBColor gdk_directfb_bg_color = { 0, 0, 0, 0 };
+DFBColor gdk_directfb_bg_color_key = { 0, 0, 0, 0 };
+gboolean gdk_directfb_monochrome_fonts = FALSE;
+
+GdkWindow *_gdk_directfb_pointer_grab_window = NULL;
+GdkWindow *_gdk_directfb_keyboard_grab_window = NULL;
+GdkWindow *_gdk_directfb_pointer_grab_confine = NULL;
+gboolean _gdk_directfb_pointer_grab_owner_events = FALSE;
+gboolean _gdk_directfb_keyboard_grab_owner_events = FALSE;
+GdkEventMask _gdk_directfb_pointer_grab_events = 0;
+GdkEventMask _gdk_directfb_keyboard_grab_events = 0;
+GdkCursor *_gdk_directfb_pointer_grab_cursor = NULL;
+
+GdkAtom _gdk_selection_property = 0;
#include "gdkaliasdef.c"
diff --git a/gdk/directfb/gdkimage-directfb.c b/gdk/directfb/gdkimage-directfb.c
index 0485dfd..1147595 100644
--- a/gdk/directfb/gdkimage-directfb.c
+++ b/gdk/directfb/gdkimage-directfb.c
@@ -213,30 +213,31 @@ _gdk_image_new_for_depth (GdkScreen *screen,
return NULL;
}
- surface = gdk_display_dfb_create_surface(_gdk_display,format,width,height);
+ surface = gdk_display_dfb_create_surface (_gdk_display, format,
+ width, height);
if (!surface)
{
return NULL;
}
- surface->GetPixelFormat( surface, &format );
+ surface->GetPixelFormat (surface, &format);
image = g_object_new (gdk_image_get_type (), NULL);
private = image->windowing_data;
private->surface = surface;
- ret = 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 );
+ DirectFBError ("IDirectFBSurface::Lock() for writing failed!\n", ret);
+ g_object_unref (image);
return NULL;
}
image->type = type;
image->visual = visual;
#if G_BYTE_ORDER == G_BIG_ENDIAN
- image->byte_order = GDK_MSB_FIRST;
+ image->byte_order = GDK_MSB_FIRST;
#else
image->byte_order = GDK_LSB_FIRST;
#endif
@@ -266,8 +267,8 @@ _gdk_directfb_copy_to_image (GdkDrawable *drawable,
GdkDrawableImplDirectFB *impl;
GdkImageDirectFB *private;
int pitch;
- DFBRectangle rect = { src_x, src_y, width, height };
- IDirectFBDisplayLayer *layer = _gdk_display->layer;
+ DFBRectangle rect = { src_x, src_y, width, height };
+ IDirectFBDisplayLayer *layer = _gdk_display->layer;
g_return_val_if_fail (GDK_IS_DRAWABLE_IMPL_DIRECTFB (drawable), NULL);
g_return_val_if_fail (image != NULL || (dest_x == 0 && dest_y == 0), NULL);
@@ -295,7 +296,7 @@ _gdk_directfb_copy_to_image (GdkDrawable *drawable,
}
}
- if (! impl->surface)
+ if (!impl->surface)
return NULL;
if (!image)
@@ -304,12 +305,14 @@ _gdk_directfb_copy_to_image (GdkDrawable *drawable,
private = image->windowing_data;
- private->surface->Unlock( private->surface );
+ private->surface->Unlock (private->surface);
- private->surface->Blit( private->surface,
- impl->surface, &rect, dest_x, dest_y );
+ private->surface->Blit (private->surface,
+ impl->surface, &rect, dest_x, dest_y);
- private->surface->Lock( private->surface, DSLF_READ | DSLF_WRITE, &image->mem, &pitch );
+ private->surface->Lock (private->surface,
+ DSLF_READ | DSLF_WRITE,
+ &image->mem, &pitch);
image->bpl = pitch;
if (impl->wrapper == _gdk_parent_root)
@@ -371,7 +374,7 @@ gdk_image_put_pixel (GdkImage *image,
{
g_return_if_fail (image != NULL);
- if (!(x >= 0 && x < image->width && y >= 0 && y < image->height))
+ if (!(x >= 0 && x < image->width && y >= 0 && y < image->height))
return;
if (image->depth == 1)
@@ -412,8 +415,8 @@ gdk_directfb_image_destroy (GdkImage *image)
GDK_NOTE (MISC, g_print ("gdk_directfb_image_destroy: %#lx\n",
(gulong) private->surface));
- private->surface->Unlock( private->surface );
- private->surface->Release( private->surface );
+ private->surface->Unlock (private->surface);
+ private->surface->Release (private->surface);
g_free (private);
image->windowing_data = NULL;
diff --git a/gdk/directfb/gdkinput-directfb.c b/gdk/directfb/gdkinput-directfb.c
index a4d56bb..363fd2c 100644
--- a/gdk/directfb/gdkinput-directfb.c
+++ b/gdk/directfb/gdkinput-directfb.c
@@ -44,18 +44,18 @@
static GdkDeviceAxis gdk_input_core_axes[] =
-{
- { GDK_AXIS_X, 0, 0 },
- { GDK_AXIS_Y, 0, 0 }
-};
+ {
+ { GDK_AXIS_X, 0, 0 },
+ { GDK_AXIS_Y, 0, 0 }
+ };
-GdkDevice * _gdk_core_pointer = NULL;
-GList * _gdk_input_devices = NULL;
-gboolean _gdk_input_ignore_core = FALSE;
+GdkDevice *_gdk_core_pointer = NULL;
+GList *_gdk_input_devices = NULL;
+gboolean _gdk_input_ignore_core = FALSE;
-int _gdk_directfb_mouse_x = 0;
-int _gdk_directfb_mouse_y = 0;
+int _gdk_directfb_mouse_x = 0;
+int _gdk_directfb_mouse_y = 0;
void
@@ -96,17 +96,17 @@ gdk_device_get_type (void)
if (!object_type)
{
const GTypeInfo object_info =
- {
- sizeof (GdkDeviceClass),
- (GBaseInitFunc) NULL,
- (GBaseFinalizeFunc) NULL,
- (GClassInitFunc) gdk_device_class_init,
- NULL, /* class_finalize */
- NULL, /* class_data */
- sizeof (GdkDevice),
- 0, /* n_preallocs */
- (GInstanceInitFunc) NULL,
- };
+ {
+ sizeof (GdkDeviceClass),
+ (GBaseInitFunc) NULL,
+ (GBaseFinalizeFunc) NULL,
+ (GClassInitFunc) gdk_device_class_init,
+ NULL, /* class_finalize */
+ NULL, /* class_data */
+ sizeof (GdkDevice),
+ 0, /* n_preallocs */
+ (GInstanceInitFunc) NULL,
+ };
object_type = g_type_register_static (G_TYPE_OBJECT,
"GdkDevice",
diff --git a/gdk/directfb/gdkkeys-directfb.c b/gdk/directfb/gdkkeys-directfb.c
index fb72321..e775384 100644
--- a/gdk/directfb/gdkkeys-directfb.c
+++ b/gdk/directfb/gdkkeys-directfb.c
@@ -52,7 +52,7 @@ static gint directfb_min_keycode = 0;
static gint directfb_max_keycode = 0;
-/*
+/*
* This array needs to be sorted by key values. It can be generated
* from gdkkeysyms.h using a few lines of Perl. This is a bit more
* complex as one would expect since GDK defines multiple names for a
@@ -1452,18 +1452,18 @@ gdk_keyval_from_name (const gchar *keyval_name)
if (gdk_keys_by_name == NULL)
{
gdk_keys_by_name = g_new (struct gdk_key, GDK_NUM_KEYS);
-
+
memcpy (gdk_keys_by_name, gdk_keys_by_keyval,
GDK_NUM_KEYS * sizeof (struct gdk_key));
-
+
qsort (gdk_keys_by_name, GDK_NUM_KEYS, sizeof (struct gdk_key),
gdk_key_compare_by_name);
}
-
+
found = bsearch (keyval_name, gdk_keys_by_name,
GDK_NUM_KEYS, sizeof (struct gdk_key),
gdk_keys_name_compare);
-
+
if (found)
return found->keyval;
else
@@ -1472,264 +1472,264 @@ gdk_keyval_from_name (const gchar *keyval_name)
static void
gdk_directfb_convert_modifiers (DFBInputDeviceModifierMask dfbmod,
- DFBInputDeviceLockState dfblock)
+ DFBInputDeviceLockState dfblock)
{
- if (dfbmod & DIMM_ALT)
- _gdk_directfb_modifiers |= GDK_MOD1_MASK;
- else
- _gdk_directfb_modifiers &= ~GDK_MOD1_MASK;
-
- if (dfbmod & DIMM_ALTGR)
- _gdk_directfb_modifiers |= GDK_MOD2_MASK;
- else
- _gdk_directfb_modifiers &= ~GDK_MOD2_MASK;
-
- if (dfbmod & DIMM_CONTROL)
- _gdk_directfb_modifiers |= GDK_CONTROL_MASK;
- else
- _gdk_directfb_modifiers &= ~GDK_CONTROL_MASK;
-
- if (dfbmod & DIMM_SHIFT)
- _gdk_directfb_modifiers |= GDK_SHIFT_MASK;
- else
- _gdk_directfb_modifiers &= ~GDK_SHIFT_MASK;
-
- if (dfblock & DILS_CAPS)
- _gdk_directfb_modifiers |= GDK_LOCK_MASK;
- else
- _gdk_directfb_modifiers &= ~GDK_LOCK_MASK;
+ if (dfbmod & DIMM_ALT)
+ _gdk_directfb_modifiers |= GDK_MOD1_MASK;
+ else
+ _gdk_directfb_modifiers &= ~GDK_MOD1_MASK;
+
+ if (dfbmod & DIMM_ALTGR)
+ _gdk_directfb_modifiers |= GDK_MOD2_MASK;
+ else
+ _gdk_directfb_modifiers &= ~GDK_MOD2_MASK;
+
+ if (dfbmod & DIMM_CONTROL)
+ _gdk_directfb_modifiers |= GDK_CONTROL_MASK;
+ else
+ _gdk_directfb_modifiers &= ~GDK_CONTROL_MASK;
+
+ if (dfbmod & DIMM_SHIFT)
+ _gdk_directfb_modifiers |= GDK_SHIFT_MASK;
+ else
+ _gdk_directfb_modifiers &= ~GDK_SHIFT_MASK;
+
+ if (dfblock & DILS_CAPS)
+ _gdk_directfb_modifiers |= GDK_LOCK_MASK;
+ else
+ _gdk_directfb_modifiers &= ~GDK_LOCK_MASK;
}
static guint
gdk_directfb_translate_key (DFBInputDeviceKeyIdentifier key_id,
- DFBInputDeviceKeySymbol key_symbol)
+ DFBInputDeviceKeySymbol key_symbol)
{
- guint keyval = GDK_VoidSymbol;
-
- /* special case numpad */
- if (key_id >= DIKI_KP_DIV && key_id <= DIKI_KP_9)
- {
- switch (key_symbol)
- {
- case DIKS_SLASH: keyval = GDK_KP_Divide; break;
- case DIKS_ASTERISK: keyval = GDK_KP_Multiply; break;
- case DIKS_PLUS_SIGN: keyval = GDK_KP_Add; break;
- case DIKS_MINUS_SIGN: keyval = GDK_KP_Subtract; break;
- case DIKS_ENTER: keyval = GDK_KP_Enter; break;
- case DIKS_SPACE: keyval = GDK_KP_Space; break;
- case DIKS_TAB: keyval = GDK_KP_Tab; break;
- case DIKS_EQUALS_SIGN: keyval = GDK_KP_Equal; break;
- case DIKS_COMMA:
- case DIKS_PERIOD: keyval = GDK_KP_Decimal; break;
- case DIKS_HOME: keyval = GDK_KP_Home; break;
- case DIKS_END: keyval = GDK_KP_End; break;
- case DIKS_PAGE_UP: keyval = GDK_KP_Page_Up; break;
- case DIKS_PAGE_DOWN: keyval = GDK_KP_Page_Down; break;
- case DIKS_CURSOR_LEFT: keyval = GDK_KP_Left; break;
- case DIKS_CURSOR_RIGHT: keyval = GDK_KP_Right; break;
- case DIKS_CURSOR_UP: keyval = GDK_KP_Up; break;
- case DIKS_CURSOR_DOWN: keyval = GDK_KP_Down; break;
- case DIKS_BEGIN: keyval = GDK_KP_Begin; break;
-
- case DIKS_0 ... DIKS_9:
- keyval = GDK_KP_0 + key_symbol - DIKS_0;
- break;
- case DIKS_F1 ... DIKS_F4:
- keyval = GDK_KP_F1 + key_symbol - DIKS_F1;
- break;
-
- default:
- break;
- }
- }
- else
- {
- switch (DFB_KEY_TYPE (key_symbol))
- {
- case DIKT_UNICODE:
- switch (key_symbol)
- {
- case DIKS_NULL: keyval = GDK_VoidSymbol; break;
- case DIKS_BACKSPACE: keyval = GDK_BackSpace; break;
- case DIKS_TAB: keyval = GDK_Tab; break;
- case DIKS_RETURN: keyval = GDK_Return; break;
- case DIKS_CANCEL: keyval = GDK_Cancel; break;
- case DIKS_ESCAPE: keyval = GDK_Escape; break;
- case DIKS_SPACE: keyval = GDK_space; break;
- case DIKS_DELETE: keyval = GDK_Delete; break;
-
- default:
- keyval = gdk_unicode_to_keyval (key_symbol);
- if (keyval & 0x01000000)
- keyval = GDK_VoidSymbol;
- }
- break;
-
- case DIKT_SPECIAL:
- switch (key_symbol)
- {
- case DIKS_CURSOR_LEFT: keyval = GDK_Left; break;
- case DIKS_CURSOR_RIGHT: keyval = GDK_Right; break;
- case DIKS_CURSOR_UP: keyval = GDK_Up; break;
- case DIKS_CURSOR_DOWN: keyval = GDK_Down; break;
- case DIKS_INSERT: keyval = GDK_Insert; break;
- case DIKS_HOME: keyval = GDK_Home; break;
- case DIKS_END: keyval = GDK_End; break;
- case DIKS_PAGE_UP: keyval = GDK_Page_Up; break;
- case DIKS_PAGE_DOWN: keyval = GDK_Page_Down; break;
- case DIKS_PRINT: keyval = GDK_Print; break;
- case DIKS_PAUSE: keyval = GDK_Pause; break;
- case DIKS_SELECT: keyval = GDK_Select; break;
- case DIKS_CLEAR: keyval = GDK_Clear; break;
- case DIKS_MENU: keyval = GDK_Menu; break;
- case DIKS_HELP: keyval = GDK_Help; break;
- case DIKS_NEXT: keyval = GDK_Next; break;
- case DIKS_BEGIN: keyval = GDK_Begin; break;
- case DIKS_BREAK: keyval = GDK_Break; break;
- default:
- break;
- }
- break;
-
- case DIKT_FUNCTION:
- keyval = GDK_F1 + key_symbol - DIKS_F1;
- if (keyval > GDK_F35)
- keyval = GDK_VoidSymbol;
- break;
-
- case DIKT_MODIFIER:
- switch (key_id)
- {
- case DIKI_SHIFT_L: keyval = GDK_Shift_L; break;
- case DIKI_SHIFT_R: keyval = GDK_Shift_R; break;
- case DIKI_CONTROL_L: keyval = GDK_Control_L; break;
- case DIKI_CONTROL_R: keyval = GDK_Control_R; break;
- case DIKI_ALT_L: keyval = GDK_Alt_L; break;
- case DIKI_ALT_R: keyval = GDK_Alt_R; break;
- case DIKI_META_L: keyval = GDK_Meta_L; break;
- case DIKI_META_R: keyval = GDK_Meta_R; break;
- case DIKI_SUPER_L: keyval = GDK_Super_L; break;
- case DIKI_SUPER_R: keyval = GDK_Super_R; break;
- case DIKI_HYPER_L: keyval = GDK_Hyper_L; break;
- case DIKI_HYPER_R: keyval = GDK_Hyper_R; break;
- default:
- break;
- }
- break;
-
- case DIKT_LOCK:
- switch (key_symbol)
- {
- case DIKS_CAPS_LOCK: keyval = GDK_Caps_Lock; break;
- case DIKS_NUM_LOCK: keyval = GDK_Num_Lock; break;
- case DIKS_SCROLL_LOCK: keyval = GDK_Scroll_Lock; break;
- default:
- break;
- }
- break;
-
- case DIKT_DEAD:
- /* dead keys are handled directly by directfb */
- break;
-
- case DIKT_CUSTOM:
- break;
- }
- }
-
- return keyval;
+ guint keyval = GDK_VoidSymbol;
+
+ /* special case numpad */
+ if (key_id >= DIKI_KP_DIV && key_id <= DIKI_KP_9)
+ {
+ switch (key_symbol)
+ {
+ case DIKS_SLASH: keyval = GDK_KP_Divide; break;
+ case DIKS_ASTERISK: keyval = GDK_KP_Multiply; break;
+ case DIKS_PLUS_SIGN: keyval = GDK_KP_Add; break;
+ case DIKS_MINUS_SIGN: keyval = GDK_KP_Subtract; break;
+ case DIKS_ENTER: keyval = GDK_KP_Enter; break;
+ case DIKS_SPACE: keyval = GDK_KP_Space; break;
+ case DIKS_TAB: keyval = GDK_KP_Tab; break;
+ case DIKS_EQUALS_SIGN: keyval = GDK_KP_Equal; break;
+ case DIKS_COMMA:
+ case DIKS_PERIOD: keyval = GDK_KP_Decimal; break;
+ case DIKS_HOME: keyval = GDK_KP_Home; break;
+ case DIKS_END: keyval = GDK_KP_End; break;
+ case DIKS_PAGE_UP: keyval = GDK_KP_Page_Up; break;
+ case DIKS_PAGE_DOWN: keyval = GDK_KP_Page_Down; break;
+ case DIKS_CURSOR_LEFT: keyval = GDK_KP_Left; break;
+ case DIKS_CURSOR_RIGHT: keyval = GDK_KP_Right; break;
+ case DIKS_CURSOR_UP: keyval = GDK_KP_Up; break;
+ case DIKS_CURSOR_DOWN: keyval = GDK_KP_Down; break;
+ case DIKS_BEGIN: keyval = GDK_KP_Begin; break;
+
+ case DIKS_0 ... DIKS_9:
+ keyval = GDK_KP_0 + key_symbol - DIKS_0;
+ break;
+ case DIKS_F1 ... DIKS_F4:
+ keyval = GDK_KP_F1 + key_symbol - DIKS_F1;
+ break;
+
+ default:
+ break;
+ }
+ }
+ else
+ {
+ switch (DFB_KEY_TYPE (key_symbol))
+ {
+ case DIKT_UNICODE:
+ switch (key_symbol)
+ {
+ case DIKS_NULL: keyval = GDK_VoidSymbol; break;
+ case DIKS_BACKSPACE: keyval = GDK_BackSpace; break;
+ case DIKS_TAB: keyval = GDK_Tab; break;
+ case DIKS_RETURN: keyval = GDK_Return; break;
+ case DIKS_CANCEL: keyval = GDK_Cancel; break;
+ case DIKS_ESCAPE: keyval = GDK_Escape; break;
+ case DIKS_SPACE: keyval = GDK_space; break;
+ case DIKS_DELETE: keyval = GDK_Delete; break;
+
+ default:
+ keyval = gdk_unicode_to_keyval (key_symbol);
+ if (keyval & 0x01000000)
+ keyval = GDK_VoidSymbol;
+ }
+ break;
+
+ case DIKT_SPECIAL:
+ switch (key_symbol)
+ {
+ case DIKS_CURSOR_LEFT: keyval = GDK_Left; break;
+ case DIKS_CURSOR_RIGHT: keyval = GDK_Right; break;
+ case DIKS_CURSOR_UP: keyval = GDK_Up; break;
+ case DIKS_CURSOR_DOWN: keyval = GDK_Down; break;
+ case DIKS_INSERT: keyval = GDK_Insert; break;
+ case DIKS_HOME: keyval = GDK_Home; break;
+ case DIKS_END: keyval = GDK_End; break;
+ case DIKS_PAGE_UP: keyval = GDK_Page_Up; break;
+ case DIKS_PAGE_DOWN: keyval = GDK_Page_Down; break;
+ case DIKS_PRINT: keyval = GDK_Print; break;
+ case DIKS_PAUSE: keyval = GDK_Pause; break;
+ case DIKS_SELECT: keyval = GDK_Select; break;
+ case DIKS_CLEAR: keyval = GDK_Clear; break;
+ case DIKS_MENU: keyval = GDK_Menu; break;
+ case DIKS_HELP: keyval = GDK_Help; break;
+ case DIKS_NEXT: keyval = GDK_Next; break;
+ case DIKS_BEGIN: keyval = GDK_Begin; break;
+ case DIKS_BREAK: keyval = GDK_Break; break;
+ default:
+ break;
+ }
+ break;
+
+ case DIKT_FUNCTION:
+ keyval = GDK_F1 + key_symbol - DIKS_F1;
+ if (keyval > GDK_F35)
+ keyval = GDK_VoidSymbol;
+ break;
+
+ case DIKT_MODIFIER:
+ switch (key_id)
+ {
+ case DIKI_SHIFT_L: keyval = GDK_Shift_L; break;
+ case DIKI_SHIFT_R: keyval = GDK_Shift_R; break;
+ case DIKI_CONTROL_L: keyval = GDK_Control_L; break;
+ case DIKI_CONTROL_R: keyval = GDK_Control_R; break;
+ case DIKI_ALT_L: keyval = GDK_Alt_L; break;
+ case DIKI_ALT_R: keyval = GDK_Alt_R; break;
+ case DIKI_META_L: keyval = GDK_Meta_L; break;
+ case DIKI_META_R: keyval = GDK_Meta_R; break;
+ case DIKI_SUPER_L: keyval = GDK_Super_L; break;
+ case DIKI_SUPER_R: keyval = GDK_Super_R; break;
+ case DIKI_HYPER_L: keyval = GDK_Hyper_L; break;
+ case DIKI_HYPER_R: keyval = GDK_Hyper_R; break;
+ default:
+ break;
+ }
+ break;
+
+ case DIKT_LOCK:
+ switch (key_symbol)
+ {
+ case DIKS_CAPS_LOCK: keyval = GDK_Caps_Lock; break;
+ case DIKS_NUM_LOCK: keyval = GDK_Num_Lock; break;
+ case DIKS_SCROLL_LOCK: keyval = GDK_Scroll_Lock; break;
+ default:
+ break;
+ }
+ break;
+
+ case DIKT_DEAD:
+ /* dead keys are handled directly by directfb */
+ break;
+
+ case DIKT_CUSTOM:
+ break;
+ }
+ }
+
+ return keyval;
}
- void
+void
_gdk_directfb_keyboard_init (void)
{
- DFBInputDeviceDescription desc;
- gint i, n, length;
- IDirectFBInputDevice *keyboard=_gdk_display->keyboard;
-
- if (!keyboard)
- return;
- if( directfb_keymap )
- return;
+ DFBInputDeviceDescription desc;
+ gint i, n, length;
+ IDirectFBInputDevice *keyboard = _gdk_display->keyboard;
- keyboard->GetDescription (keyboard, &desc);
- _gdk_display->keymap=g_object_new (gdk_keymap_get_type (), NULL);
+ if (!keyboard)
+ return;
+ if (directfb_keymap)
+ return;
- if (desc.min_keycode < 0 || desc.max_keycode < desc.min_keycode)
- return;
+ keyboard->GetDescription (keyboard, &desc);
+ _gdk_display->keymap = g_object_new (gdk_keymap_get_type (), NULL);
- directfb_min_keycode = desc.min_keycode;
- directfb_max_keycode = desc.max_keycode;
+ if (desc.min_keycode < 0 || desc.max_keycode < desc.min_keycode)
+ return;
- length = directfb_max_keycode - desc.min_keycode + 1;
+ directfb_min_keycode = desc.min_keycode;
+ directfb_max_keycode = desc.max_keycode;
+ length = directfb_max_keycode - desc.min_keycode + 1;
- directfb_keymap = g_new0 (guint, 4 * length);
- for (i = 0; i < length; i++)
- {
- DFBInputDeviceKeymapEntry entry;
+ directfb_keymap = g_new0 (guint, 4 * length);
- if (keyboard->GetKeymapEntry (keyboard,
- i + desc.min_keycode, &entry) != DFB_OK)
- continue;
- for (n = 0; n < 4; n++) {
- directfb_keymap[i * 4 + n] =
- gdk_directfb_translate_key (entry.identifier, entry.symbols[n]);
- }
- }
+ for (i = 0; i < length; i++)
+ {
+ DFBInputDeviceKeymapEntry entry;
+
+ if (keyboard->GetKeymapEntry (keyboard,
+ i + desc.min_keycode, &entry) != DFB_OK)
+ continue;
+ for (n = 0; n < 4; n++) {
+ directfb_keymap[i * 4 + n] =
+ gdk_directfb_translate_key (entry.identifier, entry.symbols[n]);
+ }
+ }
}
- void
+void
_gdk_directfb_keyboard_exit (void)
{
- if (!directfb_keymap)
- return;
+ if (!directfb_keymap)
+ return;
- g_free (directfb_keymap);
- g_free(_gdk_display->keymap);
- _gdk_display->keymap = NULL;
- directfb_keymap = NULL;
+ g_free (directfb_keymap);
+ g_free (_gdk_display->keymap);
+ _gdk_display->keymap = NULL;
+ directfb_keymap = NULL;
}
void
gdk_directfb_translate_key_event (DFBWindowEvent *dfb_event,
GdkEventKey *event)
{
- gint len;
- gchar buf[6];
-
- g_return_if_fail (dfb_event != NULL);
- g_return_if_fail (event != NULL);
-
- gdk_directfb_convert_modifiers (dfb_event->modifiers, dfb_event->locks);
-
- event->state = _gdk_directfb_modifiers;
- event->group = (dfb_event->modifiers & DIMM_ALTGR) ? 1 : 0;
- event->hardware_keycode = dfb_event->key_code;
- event->keyval = gdk_directfb_translate_key (dfb_event->key_id,
- dfb_event->key_symbol);
- /* If the device driver didn't send a key_code (happens with remote
- controls), we try to find a suitable key_code by looking at the
- default keymap. */
- if (dfb_event->key_code == -1 && directfb_keymap)
- {
- gint i;
-
- for (i = directfb_min_keycode; i <= directfb_max_keycode; i++)
- {
- if (directfb_keymap[(i - directfb_min_keycode) * 4] == event->keyval)
- {
- event->hardware_keycode = i;
- break;
- }
- }
- }
-
- len = g_unichar_to_utf8 (dfb_event->key_symbol, buf);
-
- event->string = g_strndup (buf, len);
- event->length = len;
+ gint len;
+ gchar buf[6];
+
+ g_return_if_fail (dfb_event != NULL);
+ g_return_if_fail (event != NULL);
+
+ gdk_directfb_convert_modifiers (dfb_event->modifiers, dfb_event->locks);
+
+ event->state = _gdk_directfb_modifiers;
+ event->group = (dfb_event->modifiers & DIMM_ALTGR) ? 1 : 0;
+ event->hardware_keycode = dfb_event->key_code;
+ event->keyval = gdk_directfb_translate_key (dfb_event->key_id,
+ dfb_event->key_symbol);
+ /* If the device driver didn't send a key_code (happens with remote
+ controls), we try to find a suitable key_code by looking at the
+ default keymap. */
+ if (dfb_event->key_code == -1 && directfb_keymap)
+ {
+ gint i;
+
+ for (i = directfb_min_keycode; i <= directfb_max_keycode; i++)
+ {
+ if (directfb_keymap[(i - directfb_min_keycode) * 4] == event->keyval)
+ {
+ event->hardware_keycode = i;
+ break;
+ }
+ }
+ }
+
+ len = g_unichar_to_utf8 (dfb_event->key_symbol, buf);
+
+ event->string = g_strndup (buf, len);
+ event->length = len;
}
/**
@@ -1777,65 +1777,65 @@ gdk_keymap_get_caps_lock_state (GdkKeymap *keymap)
**/
gboolean
gdk_keymap_get_entries_for_keycode (GdkKeymap *keymap,
- guint hardware_keycode,
- GdkKeymapKey **keys,
- guint **keyvals,
- gint *n_entries)
+ guint hardware_keycode,
+ GdkKeymapKey **keys,
+ guint **keyvals,
+ gint *n_entries)
{
- gint num = 0;
- gint i, j;
- gint index;
-
- index = (hardware_keycode - directfb_min_keycode) * 4;
-
- if (directfb_keymap && (hardware_keycode >= directfb_min_keycode &&
- hardware_keycode <= directfb_max_keycode))
- {
- for (i = 0; i < 4; i++)
- if (directfb_keymap[index + i] != GDK_VoidSymbol)
- num++;
- }
-
- if (keys)
- {
- *keys = g_new (GdkKeymapKey, num);
-
- for (i = 0, j = 0; num > 0 && i < 4; i++)
- if (directfb_keymap[index + i] != GDK_VoidSymbol)
- {
- (*keys)[j].keycode = hardware_keycode;
- (*keys)[j].level = j % 2;
- (*keys)[j].group = j > DIKSI_BASE_SHIFT ? 1 : 0;
- j++;
- }
- }
- if (keyvals)
- {
- *keyvals = g_new (guint, num);
-
- for (i = 0, j = 0; num > 0 && i < 4; i++)
- if (directfb_keymap[index + i] != GDK_VoidSymbol)
- {
- (*keyvals)[j] = directfb_keymap[index + i];
- j++;
- }
- }
-
- if (n_entries)
- *n_entries = num;
-
- return (num > 0);
+ gint num = 0;
+ gint i, j;
+ gint index;
+
+ index = (hardware_keycode - directfb_min_keycode) * 4;
+
+ if (directfb_keymap && (hardware_keycode >= directfb_min_keycode &&
+ hardware_keycode <= directfb_max_keycode))
+ {
+ for (i = 0; i < 4; i++)
+ if (directfb_keymap[index + i] != GDK_VoidSymbol)
+ num++;
+ }
+
+ if (keys)
+ {
+ *keys = g_new (GdkKeymapKey, num);
+
+ for (i = 0, j = 0; num > 0 && i < 4; i++)
+ if (directfb_keymap[index + i] != GDK_VoidSymbol)
+ {
+ (*keys)[j].keycode = hardware_keycode;
+ (*keys)[j].level = j % 2;
+ (*keys)[j].group = j > DIKSI_BASE_SHIFT ? 1 : 0;
+ j++;
+ }
+ }
+ if (keyvals)
+ {
+ *keyvals = g_new (guint, num);
+
+ for (i = 0, j = 0; num > 0 && i < 4; i++)
+ if (directfb_keymap[index + i] != GDK_VoidSymbol)
+ {
+ (*keyvals)[j] = directfb_keymap[index + i];
+ j++;
+ }
+ }
+
+ if (n_entries)
+ *n_entries = num;
+
+ return (num > 0);
}
static inline void
append_keymap_key (GArray *array,
- guint keycode,
- gint group,
- gint level)
+ guint keycode,
+ gint group,
+ gint level)
{
- GdkKeymapKey key = { keycode, group, level };
+ GdkKeymapKey key = { keycode, group, level };
- g_array_append_val (array, key);
+ g_array_append_val (array, key);
}
/**
@@ -1844,7 +1844,7 @@ append_keymap_key (GArray *array,
* @keyval: a keyval, such as %GDK_a, %GDK_Up, %GDK_Return, etc.
* @keys: return location for an array of #GdkKeymapKey
* @n_keys: return location for number of elements in returned array
- *
+ *
* Obtains a list of keycode/group/level combinations that will
* generate @keyval. Groups and levels are two kinds of keyboard mode;
* in general, the level determines whether the top or bottom symbol
@@ -1861,120 +1861,125 @@ append_keymap_key (GArray *array,
**/
gboolean
gdk_keymap_get_entries_for_keyval (GdkKeymap *keymap,
- guint keyval,
- GdkKeymapKey **keys,
- gint *n_keys)
+ guint keyval,
+ GdkKeymapKey **keys,
+ gint *n_keys)
{
- GArray *retval;
- gint i, j;
-
- g_return_val_if_fail (keys != NULL, FALSE);
- g_return_val_if_fail (n_keys != NULL, FALSE);
- g_return_val_if_fail (keyval != GDK_VoidSymbol, FALSE);
-
- retval = g_array_new (FALSE, FALSE, sizeof (GdkKeymapKey));
-
- for (i = directfb_min_keycode;
- directfb_keymap && i <= directfb_max_keycode;
- i++)
- {
- gint index = i - directfb_min_keycode;
-
- for (j = 0; j < 4; j++)
- {
- if (directfb_keymap[index * 4 + j] == keyval)
- append_keymap_key (retval, i, j % 2, j > DIKSI_BASE_SHIFT ? 1 : 0);
- }
- }
-
- if (retval->len > 0)
- {
- *keys = (GdkKeymapKey *) retval->data;
- *n_keys = retval->len;
- }
- else
- {
- *keys = NULL;
- *n_keys = 0;
- }
-
- g_array_free (retval, retval->len > 0 ? FALSE : TRUE);
-
- return (*n_keys > 0);
+ GArray *retval;
+ gint i, j;
+
+ g_return_val_if_fail (keys != NULL, FALSE);
+ g_return_val_if_fail (n_keys != NULL, FALSE);
+ g_return_val_if_fail (keyval != GDK_VoidSymbol, FALSE);
+
+ retval = g_array_new (FALSE, FALSE, sizeof (GdkKeymapKey));
+
+ for (i = directfb_min_keycode;
+ directfb_keymap && i <= directfb_max_keycode;
+ i++)
+ {
+ gint index = i - directfb_min_keycode;
+
+ for (j = 0; j < 4; j++)
+ {
+ if (directfb_keymap[index * 4 + j] == keyval)
+ append_keymap_key (retval, i, j % 2, j > DIKSI_BASE_SHIFT ? 1 : 0);
+ }
+ }
+
+ if (retval->len > 0)
+ {
+ *keys = (GdkKeymapKey *) retval->data;
+ *n_keys = retval->len;
+ }
+ else
+ {
+ *keys = NULL;
+ *n_keys = 0;
+ }
+
+ g_array_free (retval, retval->len > 0 ? FALSE : TRUE);
+
+ return (*n_keys > 0);
}
gboolean
gdk_keymap_translate_keyboard_state (GdkKeymap *keymap,
- guint keycode,
- GdkModifierType state,
- gint group,
- guint *keyval,
- gint *effective_group,
- gint *level,
- GdkModifierType *consumed_modifiers)
+ guint keycode,
+ GdkModifierType state,
+ gint group,
+ guint *keyval,
+ gint *effective_group,
+ gint *level,
+ GdkModifierType *consumed_modifiers)
{
- if (directfb_keymap &&
- (keycode >= directfb_min_keycode && keycode <= directfb_max_keycode) &&
- (group == 0 || group == 1))
- {
- gint index = (keycode - directfb_min_keycode) * 4;
- gint i = (state & GDK_SHIFT_MASK) ? 1 : 0;
-
- if (directfb_keymap[index + i + 2 * group] != GDK_VoidSymbol)
- {
- if (keyval)
- *keyval = directfb_keymap[index + i + 2 * group];
-
- if (group && directfb_keymap[index + i] == *keyval)
- {
- if (effective_group)
- *effective_group = 0;
- if(consumed_modifiers)
- *consumed_modifiers = 0;
- }
- else
- {
- if (effective_group)
- *effective_group = group;
- if(consumed_modifiers)
- *consumed_modifiers = GDK_MOD2_MASK;
- }
- if (level)
- *level = i;
-
- if (i && directfb_keymap[index + 2 * *effective_group] != *keyval)
- if(consumed_modifiers)
- *consumed_modifiers |= GDK_SHIFT_MASK;
-
- return TRUE;
- }
- }
- if (keyval)
- *keyval = 0;
- if (effective_group)
- *effective_group = 0;
- if (level)
- *level = 0;
- if(consumed_modifiers)
- *consumed_modifiers = 0;
-
- return FALSE;
+ if (directfb_keymap &&
+ (keycode >= directfb_min_keycode && keycode <= directfb_max_keycode) &&
+ (group == 0 || group == 1))
+ {
+ gint index = (keycode - directfb_min_keycode) * 4;
+ gint i = (state & GDK_SHIFT_MASK) ? 1 : 0;
+
+ if (directfb_keymap[index + i + 2 * group] != GDK_VoidSymbol)
+ {
+ if (keyval)
+ *keyval = directfb_keymap[index + i + 2 * group];
+
+ if (group && directfb_keymap[index + i] == *keyval)
+ {
+ if (effective_group)
+ *effective_group = 0;
+ if (consumed_modifiers)
+ *consumed_modifiers = 0;
+ }
+ else
+ {
+ if (effective_group)
+ *effective_group = group;
+ if (consumed_modifiers)
+ *consumed_modifiers = GDK_MOD2_MASK;
+ }
+ if (level)
+ *level = i;
+
+ if (i && directfb_keymap[index + 2 * *effective_group] != *keyval)
+ if (consumed_modifiers)
+ *consumed_modifiers |= GDK_SHIFT_MASK;
+
+ return TRUE;
+ }
+ }
+ if (keyval)
+ *keyval = 0;
+ if (effective_group)
+ *effective_group = 0;
+ if (level)
+ *level = 0;
+ if (consumed_modifiers)
+ *consumed_modifiers = 0;
+
+ return FALSE;
}
- GdkKeymap*
+GdkKeymap *
gdk_keymap_get_for_display (GdkDisplay *display)
{
- if( display == NULL ) return NULL;
- g_assert(GDK_IS_DISPLAY_DFB(display));
- GdkDisplayDFB *gdisplay = GDK_DISPLAY_DFB(display);
- g_assert( gdisplay->keymap != NULL);
- return gdisplay->keymap;
+ if (display == NULL)
+ return NULL;
+
+ g_assert (GDK_IS_DISPLAY_DFB (display));
+
+ GdkDisplayDFB *gdisplay = GDK_DISPLAY_DFB (display);
+
+ g_assert (gdisplay->keymap != NULL);
+
+ return gdisplay->keymap;
}
- PangoDirection
+PangoDirection
gdk_keymap_get_direction (GdkKeymap *keymap)
{
- return PANGO_DIRECTION_NEUTRAL;
+ return PANGO_DIRECTION_NEUTRAL;
}
/**
@@ -1992,17 +1997,17 @@ gdk_keymap_get_direction (GdkKeymap *keymap)
**/
guint
gdk_keymap_lookup_key (GdkKeymap *keymap,
- const GdkKeymapKey *key)
+ const GdkKeymapKey *key)
{
- g_warning("gdk_keymap_lookup_key unimplemented \n");
- return 0;
+ g_warning ("gdk_keymap_lookup_key unimplemented \n");
+ return 0;
}
void
gdk_keymap_add_virtual_modifiers (GdkKeymap *keymap,
GdkModifierType *state)
{
- g_warning ("gdk_keymap_add_virtual_modifiers unimplemented \n");
+ g_warning ("gdk_keymap_add_virtual_modifiers unimplemented \n");
}
gboolean
diff --git a/gdk/directfb/gdkmain-directfb.c b/gdk/directfb/gdkmain-directfb.c
index 05aa042..d426805 100644
--- a/gdk/directfb/gdkmain-directfb.c
+++ b/gdk/directfb/gdkmain-directfb.c
@@ -32,16 +32,16 @@
*/
/*
- Main entry point for 2.6 seems to be open_display so
- most stuff in main is moved over to gdkdisplay-directfb.c
- I'll move stub functions here that make no sense for directfb
- and true globals
- Michael Emmel
+ Main entry point for 2.6 seems to be open_display so
+ most stuff in main is moved over to gdkdisplay-directfb.c
+ I'll move stub functions here that make no sense for directfb
+ and true globals
+ Michael Emmel
*/
#include "config.h"
-#include <string.h>
-#include <stdlib.h>
+#include <string.h>
+#include <stdlib.h>
#include "gdk.h"
#include "gdkdisplay.h"
@@ -84,7 +84,7 @@ _gdk_windowing_display_set_sm_client_id (GdkDisplay *display,const gchar *sm_cli
void
_gdk_windowing_exit (void)
{
-
+
if (_gdk_display->buffer)
_gdk_display->buffer->Release (_gdk_display->buffer);
@@ -95,7 +95,7 @@ _gdk_windowing_exit (void)
_gdk_display->layer->Release (_gdk_display->layer);
- _gdk_display->directfb->Release (_gdk_display->directfb);
+ _gdk_display->directfb->Release (_gdk_display->directfb);
g_free (_gdk_display);
_gdk_display = NULL;
@@ -110,40 +110,40 @@ gdk_get_display (void)
/* utils */
static const guint type_masks[] =
-{
- GDK_STRUCTURE_MASK, /* GDK_DELETE = 0, */
- GDK_STRUCTURE_MASK, /* GDK_DESTROY = 1, */
- GDK_EXPOSURE_MASK, /* GDK_EXPOSE = 2, */
- GDK_POINTER_MOTION_MASK, /* GDK_MOTION_NOTIFY = 3, */
- GDK_BUTTON_PRESS_MASK, /* GDK_BUTTON_PRESS = 4, */
- GDK_BUTTON_PRESS_MASK, /* GDK_2BUTTON_PRESS = 5, */
- GDK_BUTTON_PRESS_MASK, /* GDK_3BUTTON_PRESS = 6, */
- GDK_BUTTON_RELEASE_MASK, /* GDK_BUTTON_RELEASE = 7, */
- GDK_KEY_PRESS_MASK, /* GDK_KEY_PRESS = 8, */
- GDK_KEY_RELEASE_MASK, /* GDK_KEY_RELEASE = 9, */
- GDK_ENTER_NOTIFY_MASK, /* GDK_ENTER_NOTIFY = 10, */
- GDK_LEAVE_NOTIFY_MASK, /* GDK_LEAVE_NOTIFY = 11, */
- GDK_FOCUS_CHANGE_MASK, /* GDK_FOCUS_CHANGE = 12, */
- GDK_STRUCTURE_MASK, /* GDK_CONFIGURE = 13, */
- GDK_VISIBILITY_NOTIFY_MASK,/* GDK_MAP = 14, */
- GDK_VISIBILITY_NOTIFY_MASK,/* GDK_UNMAP = 15, */
- GDK_PROPERTY_CHANGE_MASK, /* GDK_PROPERTY_NOTIFY = 16, */
- GDK_PROPERTY_CHANGE_MASK, /* GDK_SELECTION_CLEAR = 17, */
- GDK_PROPERTY_CHANGE_MASK, /* GDK_SELECTION_REQUEST = 18, */
- GDK_PROPERTY_CHANGE_MASK, /* GDK_SELECTION_NOTIFY = 19, */
- GDK_PROXIMITY_IN_MASK, /* GDK_PROXIMITY_IN = 20, */
- GDK_PROXIMITY_OUT_MASK, /* GDK_PROXIMITY_OUT = 21, */
- GDK_ALL_EVENTS_MASK, /* GDK_DRAG_ENTER = 22, */
- GDK_ALL_EVENTS_MASK, /* GDK_DRAG_LEAVE = 23, */
- GDK_ALL_EVENTS_MASK, /* GDK_DRAG_MOTION = 24, */
- GDK_ALL_EVENTS_MASK, /* GDK_DRAG_STATUS = 25, */
- GDK_ALL_EVENTS_MASK, /* GDK_DROP_START = 26, */
- GDK_ALL_EVENTS_MASK, /* GDK_DROP_FINISHED = 27, */
- GDK_ALL_EVENTS_MASK, /* GDK_CLIENT_EVENT = 28, */
- GDK_VISIBILITY_NOTIFY_MASK,/* GDK_VISIBILITY_NOTIFY = 29, */
- GDK_EXPOSURE_MASK, /* GDK_NO_EXPOSE = 30, */
- GDK_SCROLL_MASK /* GDK_SCROLL = 31 */
-};
+ {
+ GDK_STRUCTURE_MASK, /* GDK_DELETE = 0, */
+ GDK_STRUCTURE_MASK, /* GDK_DESTROY = 1, */
+ GDK_EXPOSURE_MASK, /* GDK_EXPOSE = 2, */
+ GDK_POINTER_MOTION_MASK, /* GDK_MOTION_NOTIFY = 3, */
+ GDK_BUTTON_PRESS_MASK, /* GDK_BUTTON_PRESS = 4, */
+ GDK_BUTTON_PRESS_MASK, /* GDK_2BUTTON_PRESS = 5, */
+ GDK_BUTTON_PRESS_MASK, /* GDK_3BUTTON_PRESS = 6, */
+ GDK_BUTTON_RELEASE_MASK, /* GDK_BUTTON_RELEASE = 7, */
+ GDK_KEY_PRESS_MASK, /* GDK_KEY_PRESS = 8, */
+ GDK_KEY_RELEASE_MASK, /* GDK_KEY_RELEASE = 9, */
+ GDK_ENTER_NOTIFY_MASK, /* GDK_ENTER_NOTIFY = 10, */
+ GDK_LEAVE_NOTIFY_MASK, /* GDK_LEAVE_NOTIFY = 11, */
+ GDK_FOCUS_CHANGE_MASK, /* GDK_FOCUS_CHANGE = 12, */
+ GDK_STRUCTURE_MASK, /* GDK_CONFIGURE = 13, */
+ GDK_VISIBILITY_NOTIFY_MASK,/* GDK_MAP = 14, */
+ GDK_VISIBILITY_NOTIFY_MASK,/* GDK_UNMAP = 15, */
+ GDK_PROPERTY_CHANGE_MASK, /* GDK_PROPERTY_NOTIFY = 16, */
+ GDK_PROPERTY_CHANGE_MASK, /* GDK_SELECTION_CLEAR = 17, */
+ GDK_PROPERTY_CHANGE_MASK, /* GDK_SELECTION_REQUEST = 18, */
+ GDK_PROPERTY_CHANGE_MASK, /* GDK_SELECTION_NOTIFY = 19, */
+ GDK_PROXIMITY_IN_MASK, /* GDK_PROXIMITY_IN = 20, */
+ GDK_PROXIMITY_OUT_MASK, /* GDK_PROXIMITY_OUT = 21, */
+ GDK_ALL_EVENTS_MASK, /* GDK_DRAG_ENTER = 22, */
+ GDK_ALL_EVENTS_MASK, /* GDK_DRAG_LEAVE = 23, */
+ GDK_ALL_EVENTS_MASK, /* GDK_DRAG_MOTION = 24, */
+ GDK_ALL_EVENTS_MASK, /* GDK_DRAG_STATUS = 25, */
+ GDK_ALL_EVENTS_MASK, /* GDK_DROP_START = 26, */
+ GDK_ALL_EVENTS_MASK, /* GDK_DROP_FINISHED = 27, */
+ GDK_ALL_EVENTS_MASK, /* GDK_CLIENT_EVENT = 28, */
+ GDK_VISIBILITY_NOTIFY_MASK,/* GDK_VISIBILITY_NOTIFY = 29, */
+ GDK_EXPOSURE_MASK, /* GDK_NO_EXPOSE = 30, */
+ GDK_SCROLL_MASK /* GDK_SCROLL = 31 */
+ };
GdkWindow *
gdk_directfb_other_event_window (GdkWindow *window,
@@ -201,22 +201,22 @@ gdk_directfb_pointer_event_window (GdkWindow *window,
if (evmask & type_masks[type]) {
- if( _gdk_directfb_pointer_grab_owner_events ) {
- return _gdk_directfb_pointer_grab_window;
- }else {
- GdkWindowObject *obj= GDK_WINDOW_OBJECT(window);
- while (obj != NULL &&
- obj != GDK_WINDOW_OBJECT(_gdk_directfb_pointer_grab_window)) {
- obj = (GdkWindowObject *)obj->parent;
- }
- if( obj ==GDK_WINDOW_OBJECT(_gdk_directfb_pointer_grab_window) ) {
- return window;
- }else {
- //was not child of the grab window so return the grab window
- return _gdk_directfb_pointer_grab_window;
- }
- }
+ if (_gdk_directfb_pointer_grab_owner_events) {
+ return _gdk_directfb_pointer_grab_window;
+ } else {
+ GdkWindowObject *obj = GDK_WINDOW_OBJECT (window);
+ while (obj != NULL &&
+ obj != GDK_WINDOW_OBJECT (_gdk_directfb_pointer_grab_window)) {
+ obj = (GdkWindowObject *)obj->parent;
+ }
+ if (obj == GDK_WINDOW_OBJECT (_gdk_directfb_pointer_grab_window)) {
+ return window;
+ } else {
+ //was not child of the grab window so return the grab window
+ return _gdk_directfb_pointer_grab_window;
+ }
}
+ }
}
w = window;
@@ -281,7 +281,7 @@ gdk_directfb_keyboard_event_window (GdkWindow *window,
w = gdk_window_get_parent (w);
}
- return w;
+ return w;
}
@@ -291,6 +291,7 @@ gdk_directfb_event_make (GdkWindow *window,
{
GdkEvent *event = gdk_event_new (GDK_NOTHING);
guint32 the_time = gdk_directfb_get_time ();
+
event->any.type = type;
event->any.window = g_object_ref (window);
event->any.send_event = FALSE;
@@ -372,7 +373,7 @@ gdk_error_trap_pop (void)
GdkGrabStatus
gdk_keyboard_grab (GdkWindow *window,
gint owner_events,
- guint32 time)
+ guint32 time)
{
return gdk_directfb_keyboard_grab (gdk_display_get_default(),
window,
diff --git a/gdk/directfb/gdkpixmap-directfb.c b/gdk/directfb/gdkpixmap-directfb.c
index c1134cc..bb13e2f 100644
--- a/gdk/directfb/gdkpixmap-directfb.c
+++ b/gdk/directfb/gdkpixmap-directfb.c
@@ -113,7 +113,7 @@ gdk_pixmap_impl_directfb_finalize (GObject *object)
G_OBJECT_CLASS (parent_class)->finalize (object);
}
-GdkPixmap*
+GdkPixmap *
_gdk_pixmap_new (GdkDrawable *drawable,
gint width,
gint height,
@@ -175,9 +175,9 @@ _gdk_pixmap_new (GdkDrawable *drawable,
}
}
- if( !(surface =
- gdk_display_dfb_create_surface(_gdk_display,format,width,height) )) {
- g_assert( surface != NULL);
+ if (!(surface =
+ gdk_display_dfb_create_surface (_gdk_display, format, width, height))) {
+ g_assert (surface != NULL);
return NULL;
}
@@ -196,7 +196,7 @@ _gdk_pixmap_new (GdkDrawable *drawable,
}
GdkPixmap *
-_gdk_bitmap_create_from_data (GdkDrawable *drawable,
+_gdk_bitmap_create_from_data (GdkDrawable *drawable,
const gchar *data,
gint width,
gint height)
@@ -212,7 +212,7 @@ _gdk_bitmap_create_from_data (GdkDrawable *drawable,
pixmap = gdk_pixmap_new (drawable, width, height, 1);
-#define GET_PIXEL(data,pixel) \
+#define GET_PIXEL(data,pixel) \
((data[(pixel / 8)] & (0x1 << ((pixel) % 8))) >> ((pixel) % 8))
if (pixmap)
@@ -224,7 +224,7 @@ _gdk_bitmap_create_from_data (GdkDrawable *drawable,
surface = GDK_DRAWABLE_IMPL_DIRECTFB (GDK_PIXMAP_OBJECT (pixmap)->impl)->surface;
- if (surface->Lock( surface, DSLF_WRITE, (void**)(&dst), &pitch ) == DFB_OK)
+ if (surface->Lock (surface, DSLF_WRITE, (void**)(&dst), &pitch) == DFB_OK)
{
gint i, j;
@@ -239,7 +239,7 @@ _gdk_bitmap_create_from_data (GdkDrawable *drawable,
dst += pitch;
}
- surface->Unlock( surface );
+ surface->Unlock (surface);
}
}
@@ -248,14 +248,14 @@ _gdk_bitmap_create_from_data (GdkDrawable *drawable,
return pixmap;
}
-GdkPixmap*
-_gdk_pixmap_create_from_data (GdkDrawable *drawable,
- const gchar *data,
- gint width,
- gint height,
- gint depth,
- const GdkColor *fg,
- const GdkColor *bg)
+GdkPixmap *
+_gdk_pixmap_create_from_data (GdkDrawable *drawable,
+ const gchar *data,
+ gint width,
+ gint height,
+ gint depth,
+ const GdkColor *fg,
+ const GdkColor *bg)
{
GdkPixmap *pixmap;
@@ -281,8 +281,8 @@ _gdk_pixmap_create_from_data (GdkDrawable *drawable,
surface = GDK_DRAWABLE_IMPL_DIRECTFB (GDK_PIXMAP_OBJECT (pixmap)->impl)->surface;
- if (surface->Lock( surface,
- DSLF_WRITE, (void**)(&dst), &pitch ) == DFB_OK)
+ if (surface->Lock (surface,
+ DSLF_WRITE, (void**)(&dst), &pitch) == DFB_OK)
{
gint i;
@@ -293,27 +293,27 @@ _gdk_pixmap_create_from_data (GdkDrawable *drawable,
data += src_pitch;
}
- surface->Unlock( surface );
+ surface->Unlock (surface);
}
}
return pixmap;
}
-GdkPixmap*
+GdkPixmap *
gdk_pixmap_foreign_new (GdkNativeWindow anid)
{
- g_warning(" gdk_pixmap_foreign_new unsuporrted \n");
+ g_warning (" gdk_pixmap_foreign_new unsuporrted \n");
return NULL;
}
-GdkPixmap*
+GdkPixmap *
gdk_pixmap_foreign_new_for_display (GdkDisplay *display, GdkNativeWindow anid)
{
- return gdk_pixmap_foreign_new(anid);
+ return gdk_pixmap_foreign_new (anid);
}
-GdkPixmap*
+GdkPixmap *
gdk_pixmap_foreign_new_for_screen (GdkScreen *screen,
GdkNativeWindow anid,
gint width,
@@ -321,18 +321,19 @@ gdk_pixmap_foreign_new_for_screen (GdkScreen *screen,
gint depth)
{
/*Use the root drawable for now since only one screen */
- return gdk_pixmap_new(NULL,width,height,depth);
+ return gdk_pixmap_new (NULL, width, height, depth);
}
-GdkPixmap*
+GdkPixmap *
gdk_pixmap_lookup (GdkNativeWindow anid)
{
- g_warning(" gdk_pixmap_lookup unsuporrted \n");
+ g_warning (" gdk_pixmap_lookup unsuporrted \n");
return NULL;
}
-GdkPixmap* gdk_pixmap_lookup_for_display (GdkDisplay *display,GdkNativeWindow anid)
+GdkPixmap *
+gdk_pixmap_lookup_for_display (GdkDisplay *display, GdkNativeWindow anid)
{
return gdk_pixmap_lookup (anid);
}
diff --git a/gdk/directfb/gdkprivate-directfb.h b/gdk/directfb/gdkprivate-directfb.h
index 201a1e6..d362473 100644
--- a/gdk/directfb/gdkprivate-directfb.h
+++ b/gdk/directfb/gdkprivate-directfb.h
@@ -47,16 +47,25 @@
#define GDK_TYPE_DRAWABLE_IMPL_DIRECTFB (gdk_drawable_impl_directfb_get_type ())
-#define GDK_DRAWABLE_IMPL_DIRECTFB(object) (G_TYPE_CHECK_INSTANCE_CAST ((object), GDK_TYPE_DRAWABLE_IMPL_DIRECTFB, GdkDrawableImplDirectFB))
-#define GDK_IS_DRAWABLE_IMPL_DIRECTFB(object) (G_TYPE_CHECK_INSTANCE_TYPE ((object), GDK_TYPE_DRAWABLE_IMPL_DIRECTFB))
+#define GDK_DRAWABLE_IMPL_DIRECTFB(object) (G_TYPE_CHECK_INSTANCE_CAST ((object), \
+ GDK_TYPE_DRAWABLE_IMPL_DIRECTFB, \
+ GdkDrawableImplDirectFB))
+#define GDK_IS_DRAWABLE_IMPL_DIRECTFB(object) (G_TYPE_CHECK_INSTANCE_TYPE ((object), \
+ GDK_TYPE_DRAWABLE_IMPL_DIRECTFB))
#define GDK_TYPE_WINDOW_IMPL_DIRECTFB (gdk_window_impl_directfb_get_type ())
-#define GDK_WINDOW_IMPL_DIRECTFB(object) (G_TYPE_CHECK_INSTANCE_CAST ((object), GDK_TYPE_WINDOW_IMPL_DIRECTFB, GdkWindowImplDirectFB))
-#define GDK_IS_WINDOW_IMPL_DIRECTFB(object) (G_TYPE_CHECK_INSTANCE_TYPE ((object), GDK_TYPE_WINDOW_IMPL_DIRECTFB))
+#define GDK_WINDOW_IMPL_DIRECTFB(object) (G_TYPE_CHECK_INSTANCE_CAST ((object), \
+ GDK_TYPE_WINDOW_IMPL_DIRECTFB, \
+ GdkWindowImplDirectFB))
+#define GDK_IS_WINDOW_IMPL_DIRECTFB(object) (G_TYPE_CHECK_INSTANCE_TYPE ((object), \
+ GDK_TYPE_WINDOW_IMPL_DIRECTFB))
#define GDK_TYPE_PIXMAP_IMPL_DIRECTFB (gdk_pixmap_impl_directfb_get_type ())
-#define GDK_PIXMAP_IMPL_DIRECTFB(object) (G_TYPE_CHECK_INSTANCE_CAST ((object), GDK_TYPE_PIXMAP_IMPL_DIRECTFB, GdkPixmapImplDirectFB))
-#define GDK_IS_PIXMAP_IMPL_DIRECTFB(object) (G_TYPE_CHECK_INSTANCE_TYPE ((object), GDK_TYPE_PIXMAP_IMPL_DIRECTFB))
+#define GDK_PIXMAP_IMPL_DIRECTFB(object) (G_TYPE_CHECK_INSTANCE_CAST ((object), \
+ GDK_TYPE_PIXMAP_IMPL_DIRECTFB, \
+ GdkPixmapImplDirectFB))
+#define GDK_IS_PIXMAP_IMPL_DIRECTFB(object) (G_TYPE_CHECK_INSTANCE_TYPE ((object), \
+ GDK_TYPE_PIXMAP_IMPL_DIRECTFB))
typedef struct _GdkDrawableImplDirectFB GdkDrawableImplDirectFB;
@@ -66,38 +75,37 @@ typedef struct _GdkPixmapImplDirectFB GdkPixmapImplDirectFB;
struct _GdkDrawableImplDirectFB
{
- GdkDrawable parent_object;
+ GdkDrawable parent_object;
- GdkDrawable *wrapper;
+ GdkDrawable *wrapper;
- gboolean buffered;
+ gboolean buffered;
- GdkRegion paint_region;
- gint paint_depth;
- gint width;
- gint height;
- gint abs_x;
- gint abs_y;
+ GdkRegion paint_region;
+ gint paint_depth;
+ gint width;
+ gint height;
+ gint abs_x;
+ gint abs_y;
- GdkRegion clip_region;
+ GdkRegion clip_region;
- GdkColormap *colormap;
-
- IDirectFBSurface *surface;
- DFBSurfacePixelFormat format;
- cairo_surface_t * cairo_surface;
+ GdkColormap *colormap;
+ IDirectFBSurface *surface;
+ DFBSurfacePixelFormat format;
+ cairo_surface_t *cairo_surface;
};
typedef struct
{
- GdkDrawableClass parent_class;
+ GdkDrawableClass parent_class;
} GdkDrawableImplDirectFBClass;
GType gdk_drawable_impl_directfb_get_type (void);
-GdkEvent * gdk_directfb_event_make (GdkWindow *window,
- GdkEventType type);
+GdkEvent *gdk_directfb_event_make (GdkWindow *window,
+ GdkEventType type);
/*
@@ -226,7 +234,7 @@ typedef struct
GType _gdk_gc_directfb_get_type (void);
-GdkGC * _gdk_directfb_gc_new (GdkDrawable *drawable,
+GdkGC *_gdk_directfb_gc_new (GdkDrawable *drawable,
GdkGCValues *values,
GdkGCValuesMask values_mask);
@@ -262,11 +270,11 @@ void gdk_directfb_pointer_ungrab (guint32 time,
guint32 gdk_directfb_get_time (void);
-GdkWindow * gdk_directfb_pointer_event_window (GdkWindow *window,
+GdkWindow *gdk_directfb_pointer_event_window (GdkWindow *window,
GdkEventType type);
-GdkWindow * gdk_directfb_keyboard_event_window (GdkWindow *window,
+GdkWindow *gdk_directfb_keyboard_event_window (GdkWindow *window,
GdkEventType type);
-GdkWindow * gdk_directfb_other_event_window (GdkWindow *window,
+GdkWindow *gdk_directfb_other_event_window (GdkWindow *window,
GdkEventType type);
void _gdk_selection_window_destroyed (GdkWindow *window);
@@ -276,11 +284,11 @@ void _gdk_directfb_move_resize_child (GdkWindow *window,
gint width,
gint height);
-GdkWindow * gdk_directfb_child_at (GdkWindow *window,
+GdkWindow *gdk_directfb_child_at (GdkWindow *window,
gint *x,
gint *y);
-GdkWindow * gdk_directfb_window_find_focus (void);
+GdkWindow *gdk_directfb_window_find_focus (void);
void gdk_directfb_change_focus (GdkWindow *new_focus_window);
@@ -341,15 +349,15 @@ void gdk_directfb_clip_region (GdkDrawable *drawable,
/* Utilities for avoiding mallocs */
static inline void
-temp_region_init_copy( GdkRegion *region,
+temp_region_init_copy (GdkRegion *region,
const GdkRegion *source)
{
if (region != source) /* don't want to copy to itself */
- {
+ {
if (region->size < source->numRects)
{
if (region->rects && region->rects != ®ion->extents)
- g_free( region->rects );
+ g_free (region->rects);
region->rects = g_new (GdkRegionBox, source->numRects);
region->size = source->numRects;
@@ -358,61 +366,61 @@ temp_region_init_copy( GdkRegion *region,
region->numRects = source->numRects;
region->extents = source->extents;
- memcpy( region->rects, source->rects, source->numRects * sizeof (GdkRegionBox) );
+ memcpy (region->rects, source->rects, source->numRects * sizeof (GdkRegionBox));
}
}
static inline void
-temp_region_init_rectangle( GdkRegion *region,
- const GdkRectangle *rect )
+temp_region_init_rectangle (GdkRegion *region,
+ const GdkRectangle *rect)
{
- region->numRects = 1;
- region->rects = ®ion->extents;
- region->extents.x1 = rect->x;
- region->extents.y1 = rect->y;
- region->extents.x2 = rect->x + rect->width;
- region->extents.y2 = rect->y + rect->height;
- region->size = 1;
+ region->numRects = 1;
+ region->rects = ®ion->extents;
+ region->extents.x1 = rect->x;
+ region->extents.y1 = rect->y;
+ region->extents.x2 = rect->x + rect->width;
+ region->extents.y2 = rect->y + rect->height;
+ region->size = 1;
}
static inline void
-temp_region_init_rectangle_vals( GdkRegion *region,
+temp_region_init_rectangle_vals (GdkRegion *region,
int x,
int y,
int w,
- int h )
+ int h)
{
- region->numRects = 1;
- region->rects = ®ion->extents;
- region->extents.x1 = x;
- region->extents.y1 = y;
- region->extents.x2 = x + w;
- region->extents.y2 = y + h;
- region->size = 1;
+ region->numRects = 1;
+ region->rects = ®ion->extents;
+ region->extents.x1 = x;
+ region->extents.y1 = y;
+ region->extents.x2 = x + w;
+ region->extents.y2 = y + h;
+ region->size = 1;
}
static inline void
-temp_region_reset( GdkRegion *region )
+temp_region_reset (GdkRegion *region)
{
- if (region->size > 32 && region->rects && region->rects != ®ion->extents) {
- g_free( region->rects );
+ if (region->size > 32 && region->rects && region->rects != ®ion->extents) {
+ g_free (region->rects);
- region->size = 1;
- region->rects = ®ion->extents;
- }
+ region->size = 1;
+ region->rects = ®ion->extents;
+ }
- region->numRects = 0;
+ region->numRects = 0;
}
static inline void
-temp_region_deinit( GdkRegion *region )
+temp_region_deinit (GdkRegion *region)
{
- if (region->rects && region->rects != ®ion->extents) {
- g_free( region->rects );
- region->rects = NULL;
- }
+ if (region->rects && region->rects != ®ion->extents) {
+ g_free (region->rects);
+ region->rects = NULL;
+ }
- region->numRects = 0;
+ region->numRects = 0;
}
diff --git a/gdk/directfb/gdkproperty-directfb.c b/gdk/directfb/gdkproperty-directfb.c
index 9ee4cbb..4e4bafb 100644
--- a/gdk/directfb/gdkproperty-directfb.c
+++ b/gdk/directfb/gdkproperty-directfb.c
@@ -1,7 +1,7 @@
/* GDK - The GIMP Drawing Kit
* Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
*
- * This library is free software; you can redistribute it and/or
+ * This library is free software; you can redistribute it and/ or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
* version 2 of the License, or (at your option) any later version.
@@ -45,9 +45,9 @@
#include "gdkalias.h"
static GHashTable *names_to_atoms;
-static GPtrArray *atoms_to_names;
+static GPtrArray *atoms_to_names;
-static const gchar xatoms_string[] =
+static const gchar xatoms_string[] =
/* These are all the standard predefined X atoms */
"NONE\0"
"PRIMARY\0"
@@ -121,11 +121,11 @@ static const gchar xatoms_string[] =
;
static const gint xatoms_offset[] = {
- 0, 5, 13, 23, 27, 32, 39, 48, 57, 64, 76, 88,
- 100, 112, 124, 136, 148, 160, 169, 174, 182, 189, 195, 205,
- 222, 236, 249, 262, 278, 291, 305, 317, 324, 333, 340, 351,
- 360, 378, 391, 404, 412, 428, 442, 456, 466, 477, 487, 497,
- 511, 525, 537, 549, 568, 588, 605, 623, 636, 645, 656, 663,
+ 0, 5, 13, 23, 27, 32, 39, 48, 57, 64, 76, 88,
+ 100, 112, 124, 136, 148, 160, 169, 174, 182, 189, 195, 205,
+ 222, 236, 249, 262, 278, 291, 305, 317, 324, 333, 340, 351,
+ 360, 378, 391, 404, 412, 428, 442, 456, 466, 477, 487, 497,
+ 511, 525, 537, 549, 568, 588, 605, 623, 636, 645, 656, 663,
674, 685, 695, 702, 712, 724, 734, 745, 754
};
@@ -135,7 +135,7 @@ static void
ensure_atom_tables (void)
{
int i;
-
+
if (names_to_atoms)
return;
@@ -144,29 +144,33 @@ ensure_atom_tables (void)
for (i = 0; i < G_N_ELEMENTS (xatoms_offset); i++)
{
- g_hash_table_insert(names_to_atoms, (gchar *)xatoms_string + xatoms_offset[i], GINT_TO_POINTER (i));
- g_ptr_array_add(atoms_to_names, (gchar *)xatoms_string + xatoms_offset[i]);
+ g_hash_table_insert (names_to_atoms,
+ (gchar *)xatoms_string + xatoms_offset[i],
+ GINT_TO_POINTER (i));
+ g_ptr_array_add (atoms_to_names,
+ (gchar *)xatoms_string + xatoms_offset[i]);
}
}
static GdkAtom
intern_atom_internal (const gchar *atom_name, gboolean allocate)
{
- gpointer result;
- gchar *name;
+ gpointer result;
+ gchar *name;
+
g_return_val_if_fail (atom_name != NULL, GDK_NONE);
ensure_atom_tables ();
-
+
if (g_hash_table_lookup_extended (names_to_atoms, atom_name, NULL, &result))
return result;
-
+
result = GINT_TO_POINTER (atoms_to_names->len);
- name = allocate ? g_strdup (atom_name) : (gchar *)atom_name;
- g_hash_table_insert(names_to_atoms, name, result);
- g_ptr_array_add(atoms_to_names, name);
-
- return result;
+ name = allocate ? g_strdup (atom_name) : (gchar *)atom_name;
+ g_hash_table_insert (names_to_atoms, name, result);
+ g_ptr_array_add (atoms_to_names, name);
+
+ return result;
}
GdkAtom
@@ -188,10 +192,11 @@ gdk_atom_name (GdkAtom atom)
{
if (!atoms_to_names)
return NULL;
-
+
if (GPOINTER_TO_INT (atom) >= atoms_to_names->len)
return NULL;
- return g_strdup(g_ptr_array_index (atoms_to_names, GPOINTER_TO_INT (atom)));
+
+ return g_strdup (g_ptr_array_index (atoms_to_names, GPOINTER_TO_INT (atom)));
}
@@ -213,7 +218,7 @@ gdk_property_delete_2 (GdkWindow *window,
if (event_window)
{
- event = gdk_directfb_event_make (event_window, GDK_PROPERTY_NOTIFY);
+ event = gdk_directfb_event_make (event_window, GDK_PROPERTY_NOTIFY);
event->property.atom = property;
event->property.state = GDK_PROPERTY_DELETE;
}
@@ -241,16 +246,16 @@ gdk_property_delete (GdkWindow *window,
}
gboolean
-gdk_property_get (GdkWindow *window,
- GdkAtom property,
- GdkAtom type,
- gulong offset,
- gulong length,
- gint pdelete,
- GdkAtom *actual_property_type,
- gint *actual_format_type,
- gint *actual_length,
- guchar **data)
+gdk_property_get (GdkWindow *window,
+ GdkAtom property,
+ GdkAtom type,
+ gulong offset,
+ gulong length,
+ gint pdelete,
+ GdkAtom *actual_property_type,
+ gint *actual_format_type,
+ gint *actual_length,
+ guchar **data)
{
GdkWindowImplDirectFB *impl;
GdkWindowProperty *prop;
@@ -293,11 +298,11 @@ gdk_property_get (GdkWindow *window,
}
if (actual_length)
- *actual_length = nbytes;
+ *actual_length = nbytes;
if (actual_property_type)
*actual_property_type = prop->type;
if (actual_format_type)
- *actual_format_type = prop->format;
+ *actual_format_type = prop->format;
/* only delete the property if it was completely retrieved */
if (pdelete && length >= *actual_length && *data != NULL)
@@ -357,7 +362,7 @@ gdk_property_change (GdkWindow *window,
break;
}
- new_prop = g_malloc (G_STRUCT_OFFSET (GdkWindowProperty, data) + new_size);
+ new_prop = g_malloc (G_STRUCT_OFFSET (GdkWindowProperty, data) + new_size);
new_prop->length = new_size;
new_prop->type = type;
new_prop->format = format;
@@ -391,10 +396,11 @@ gdk_property_change (GdkWindow *window,
if (event_window)
{
- event = gdk_directfb_event_make (event_window, GDK_PROPERTY_NOTIFY);
+ event = gdk_directfb_event_make (event_window, GDK_PROPERTY_NOTIFY);
event->property.atom = property;
event->property.state = GDK_PROPERTY_NEW_VALUE;
}
}
+
#define __GDK_PROPERTY_X11_C__
#include "gdkaliasdef.c"
diff --git a/gdk/directfb/gdkscreen-directfb.c b/gdk/directfb/gdkscreen-directfb.c
index 7f65c88..59079a5 100644
--- a/gdk/directfb/gdkscreen-directfb.c
+++ b/gdk/directfb/gdkscreen-directfb.c
@@ -46,7 +46,7 @@ static GdkColormap *default_colormap = NULL;
GdkDisplay *
gdk_screen_get_display (GdkScreen *screen)
{
- return GDK_DISPLAY_OBJECT(_gdk_display);
+ return GDK_DISPLAY_OBJECT (_gdk_display);
}
GdkWindow *
@@ -102,8 +102,8 @@ gdk_screen_get_monitor_geometry (GdkScreen *screen,
g_return_if_fail (GDK_IS_SCREEN (screen));
g_return_if_fail (dest != NULL);
- dest->x = 0;
- dest->y = 0;
+ dest->x = 0;
+ dest->y = 0;
dest->width = gdk_screen_width ();
dest->height = gdk_screen_height ();
}
@@ -179,8 +179,7 @@ gdk_screen_get_width_mm (GdkScreen *screen)
if (first_call)
{
- g_message
- ("gdk_screen_width_mm() assumes a screen resolution of 72 dpi");
+ g_message ("gdk_screen_width_mm() assumes a screen resolution of 72 dpi");
first_call = FALSE;
}
@@ -211,8 +210,10 @@ GdkVisual *
gdk_screen_get_rgba_visual (GdkScreen *screen)
{
static GdkVisual *rgba_visual;
- if( !rgba_visual )
- rgba_visual = gdk_directfb_visual_by_format(DSPF_ARGB);
+
+ if (!rgba_visual)
+ rgba_visual = gdk_directfb_visual_by_format (DSPF_ARGB);
+
return rgba_visual;
}
@@ -220,8 +221,8 @@ GdkColormap *
gdk_screen_get_rgba_colormap (GdkScreen *screen)
{
static GdkColormap *rgba_colormap;
- if( !rgba_colormap && gdk_screen_get_rgba_visual(screen) )
- rgba_colormap = gdk_colormap_new (gdk_screen_get_rgba_visual(screen),FALSE);
+ if (!rgba_colormap && gdk_screen_get_rgba_visual (screen))
+ rgba_colormap = gdk_colormap_new (gdk_screen_get_rgba_visual (screen), FALSE);
return rgba_colormap;
}
@@ -244,9 +245,10 @@ gdk_screen_get_window_stack (GdkScreen *screen)
gboolean
gdk_screen_is_composited (GdkScreen *screen)
{
- g_return_val_if_fail (GDK_IS_SCREEN (screen), FALSE);
- return FALSE;
-}
+ g_return_val_if_fail (GDK_IS_SCREEN (screen), FALSE);
+
+ return FALSE;
+}
#define __GDK_SCREEN_X11_C__
#include "gdkaliasdef.c"
diff --git a/gdk/directfb/gdktestutils-directfb.c b/gdk/directfb/gdktestutils-directfb.c
index 2197f2f..0f2a8b1 100644
--- a/gdk/directfb/gdktestutils-directfb.c
+++ b/gdk/directfb/gdktestutils-directfb.c
@@ -21,7 +21,7 @@
/*
* GTK+ DirectFB backend
* Copyright (C) 2001-2002 convergence integrated media GmbH
- * Copyright (C) 2002-2004 convergence GmbH
+ * Copyright (C) 2002-2004 convergence GmbH
* Written by Denis Oliver Kropp <dok convergence de> and
* Sven Neumann <sven convergence de>
*/
@@ -42,49 +42,49 @@ static DFBInputDeviceKeySymbol
_gdk_keyval_to_directfb (guint keyval)
{
switch (keyval) {
- case 0 ... 127:
- return DFB_KEY( UNICODE, keyval );
- case GDK_F1 ... GDK_F12:
- return keyval - GDK_F1 + DIKS_F1;
- case GDK_BackSpace:
- return DIKS_BACKSPACE;
- case GDK_Tab:
- return DIKS_TAB;
- case GDK_Return:
- return DIKS_RETURN;
- case GDK_Escape:
- return DIKS_ESCAPE;
- case GDK_Delete:
- return DIKS_DELETE;
- case GDK_Left:
- return DIKS_CURSOR_LEFT;
- case GDK_Up:
- return DIKS_CURSOR_UP;
- case GDK_Right:
- return DIKS_CURSOR_RIGHT;
- case GDK_Down:
- return DIKS_CURSOR_DOWN;
- case GDK_Insert:
- return DIKS_INSERT;
- case GDK_Home:
- return DIKS_HOME;
- case GDK_End:
- return DIKS_END;
- case GDK_Page_Up:
- return DIKS_PAGE_UP;
- case GDK_Page_Down:
- return DIKS_PAGE_DOWN;
- case GDK_Print:
- return DIKS_PRINT;
- case GDK_Pause:
- return DIKS_PAUSE;
- case GDK_Clear:
- return DIKS_CLEAR;
- case GDK_Cancel:
- return DIKS_CANCEL;
- /* TODO: handle them all */
- default:
- break;
+ case 0 ... 127:
+ return DFB_KEY (UNICODE, keyval);
+ case GDK_F1 ... GDK_F12:
+ return keyval - GDK_F1 + DIKS_F1;
+ case GDK_BackSpace:
+ return DIKS_BACKSPACE;
+ case GDK_Tab:
+ return DIKS_TAB;
+ case GDK_Return:
+ return DIKS_RETURN;
+ case GDK_Escape:
+ return DIKS_ESCAPE;
+ case GDK_Delete:
+ return DIKS_DELETE;
+ case GDK_Left:
+ return DIKS_CURSOR_LEFT;
+ case GDK_Up:
+ return DIKS_CURSOR_UP;
+ case GDK_Right:
+ return DIKS_CURSOR_RIGHT;
+ case GDK_Down:
+ return DIKS_CURSOR_DOWN;
+ case GDK_Insert:
+ return DIKS_INSERT;
+ case GDK_Home:
+ return DIKS_HOME;
+ case GDK_End:
+ return DIKS_END;
+ case GDK_Page_Up:
+ return DIKS_PAGE_UP;
+ case GDK_Page_Down:
+ return DIKS_PAGE_DOWN;
+ case GDK_Print:
+ return DIKS_PRINT;
+ case GDK_Pause:
+ return DIKS_PAUSE;
+ case GDK_Clear:
+ return DIKS_CLEAR;
+ case GDK_Cancel:
+ return DIKS_CANCEL;
+ /* TODO: handle them all */
+ default:
+ break;
}
return DIKS_NULL;
@@ -94,7 +94,7 @@ static DFBInputDeviceModifierMask
_gdk_modifiers_to_directfb (GdkModifierType modifiers)
{
DFBInputDeviceModifierMask dfb_modifiers = 0;
-
+
if (modifiers & GDK_MOD1_MASK)
dfb_modifiers |= DIMM_ALT;
if (modifiers & GDK_MOD2_MASK)
@@ -119,7 +119,7 @@ _gdk_modifiers_to_directfb (GdkModifierType modifiers)
void
gdk_test_render_sync (GdkWindow *window)
{
- _gdk_display->directfb->WaitIdle (_gdk_display->directfb);
+ _gdk_display->directfb->WaitIdle (_gdk_display->directfb);
}
/**
@@ -158,12 +158,12 @@ gdk_test_simulate_key (GdkWindow *window,
{
GdkWindowObject *private;
GdkWindowImplDirectFB *impl;
- DFBWindowEvent evt;
+ DFBWindowEvent evt;
g_return_val_if_fail (GDK_IS_WINDOW(window), FALSE);
g_return_val_if_fail (key_pressrelease == GDK_KEY_PRESS ||
key_pressrelease == GDK_KEY_RELEASE, FALSE);
-
+
private = GDK_WINDOW_OBJECT (window);
impl = GDK_WINDOW_IMPL_DIRECTFB (private->impl);
@@ -173,7 +173,7 @@ gdk_test_simulate_key (GdkWindow *window,
if (_gdk_display->layer->WarpCursor (_gdk_display->layer, win_x+x, win_y+y))
return FALSE;
}
-
+
evt.clazz = DFEC_WINDOW;
evt.type = (key_pressrelease == GDK_KEY_PRESS) ? DWET_KEYDOWN : DWET_KEYUP;
#if ((DIRECTFB_MAJOR_VERSION > 1) || (DIRECTFB_MINOR_VERSION >= 2))
@@ -227,12 +227,12 @@ gdk_test_simulate_button (GdkWindow *window,
{
GdkWindowObject *private;
GdkWindowImplDirectFB *impl;
- DFBWindowEvent evt;
-
- g_return_val_if_fail (GDK_IS_WINDOW(window), FALSE);
+ DFBWindowEvent evt;
+
+ g_return_val_if_fail (GDK_IS_WINDOW (window), FALSE);
g_return_val_if_fail (button_pressrelease == GDK_BUTTON_PRESS ||
button_pressrelease == GDK_BUTTON_RELEASE, FALSE);
-
+
private = GDK_WINDOW_OBJECT (window);
impl = GDK_WINDOW_IMPL_DIRECTFB (private->impl);
@@ -249,8 +249,8 @@ gdk_test_simulate_button (GdkWindow *window,
evt.flags = DWEF_NONE;
#endif
evt.window_id = impl->dfb_id;
- evt.x = MAX(x, 0);
- evt.y = MAX(y, 0);
+ evt.x = MAX (x, 0);
+ evt.y = MAX (y, 0);
_gdk_display->layer->GetCursorPosition (_gdk_display->layer, &evt.cx, &evt.cy);
evt.modifiers = _gdk_modifiers_to_directfb (modifiers);
evt.locks = (modifiers & GDK_LOCK_MASK) ? DILS_CAPS : 0;
diff --git a/gdk/directfb/gdkvisual-directfb.c b/gdk/directfb/gdkvisual-directfb.c
index 7ae0831..dc17e52 100644
--- a/gdk/directfb/gdkvisual-directfb.c
+++ b/gdk/directfb/gdkvisual-directfb.c
@@ -53,18 +53,18 @@ static GdkVisualDirectFB * gdk_directfb_visual_create (DFBSurfacePixelFormat pi
static DFBSurfacePixelFormat formats[] =
-{
- DSPF_ARGB,
- DSPF_LUT8,
- DSPF_RGB32,
- DSPF_RGB24,
- DSPF_RGB16,
- DSPF_ARGB1555,
- DSPF_RGB332
-};
-
-GdkVisual * system_visual = NULL;
-static GdkVisualDirectFB * visuals[G_N_ELEMENTS (formats) + 1] = { NULL };
+ {
+ DSPF_ARGB,
+ DSPF_LUT8,
+ DSPF_RGB32,
+ DSPF_RGB24,
+ DSPF_RGB16,
+ DSPF_ARGB1555,
+ DSPF_RGB332
+ };
+
+GdkVisual * system_visual = NULL;
+static GdkVisualDirectFB * visuals[G_N_ELEMENTS (formats) + 1] = { NULL };
static gint available_depths[G_N_ELEMENTS (formats) + 1] = {0};
static GdkVisualType available_types[G_N_ELEMENTS (formats) + 1] = {0};
@@ -89,17 +89,17 @@ gdk_visual_get_type (void)
if (!object_type)
{
const GTypeInfo object_info =
- {
- sizeof (GdkVisualClass),
- (GBaseInitFunc) NULL,
- (GBaseFinalizeFunc) NULL,
- (GClassInitFunc) gdk_visual_class_init,
- NULL, /* class_finalize */
- NULL, /* class_data */
- sizeof (GdkVisualDirectFB),
- 0, /* n_preallocs */
- (GInstanceInitFunc) NULL,
- };
+ {
+ sizeof (GdkVisualClass),
+ (GBaseInitFunc) NULL,
+ (GBaseFinalizeFunc) NULL,
+ (GClassInitFunc) gdk_visual_class_init,
+ NULL, /* class_finalize */
+ NULL, /* class_data */
+ sizeof (GdkVisualDirectFB),
+ 0, /* n_preallocs */
+ (GInstanceInitFunc) NULL,
+ };
object_type = g_type_register_static (G_TYPE_OBJECT,
"GdkVisual",
@@ -110,7 +110,7 @@ gdk_visual_get_type (void)
}
void
-_gdk_visual_init ()
+_gdk_visual_init (void)
{
DFBDisplayLayerConfig dlc;
DFBSurfaceDescription desc;
@@ -119,9 +119,9 @@ _gdk_visual_init ()
_gdk_display->layer->GetConfiguration (_gdk_display->layer, &dlc);
- g_assert( dlc.pixelformat != DSPF_UNKNOWN);
+ g_assert (dlc.pixelformat != DSPF_UNKNOWN);
- dest = gdk_display_dfb_create_surface(_gdk_display,dlc.pixelformat,8,8);
+ dest = gdk_display_dfb_create_surface (_gdk_display, dlc.pixelformat, 8, 8);
g_assert (dest != NULL);
/* We could provide all visuals since DirectFB allows us to mix
@@ -136,7 +136,7 @@ _gdk_visual_init ()
changed to do all formats but we should redo this code
to ensure the base format ARGB LUT8 RGB etc then add ones supported
by the hardware
- */
+ */
for (i = 0; i < G_N_ELEMENTS (formats); i++)
{
IDirectFBSurface *src;
@@ -148,7 +148,7 @@ _gdk_visual_init ()
desc.pixelformat = formats[i];
//call direct so fail silently is ok
if (_gdk_display->directfb->CreateSurface (_gdk_display->directfb,
- &desc, &src) != DFB_OK)
+ &desc, &src) != DFB_OK)
continue;
visuals[i] = gdk_directfb_visual_create (formats[i]);
@@ -157,7 +157,7 @@ _gdk_visual_init ()
if (acc & DFXL_BLIT || formats[i] == dlc.pixelformat)
{
- system_visual = GDK_VISUAL (visuals[i]);
+ system_visual = GDK_VISUAL (visuals[i]);
}
src->Release (src);
@@ -168,8 +168,8 @@ _gdk_visual_init ()
//fallback to ARGB must be supported
if (!system_visual)
{
- g_assert (visuals[DSPF_ARGB] != NULL);
- system_visual = GDK_VISUAL(visuals[DSPF_ARGB]);
+ g_assert (visuals[DSPF_ARGB] != NULL);
+ system_visual = GDK_VISUAL(visuals[DSPF_ARGB]);
}
g_assert (system_visual != NULL);
@@ -187,49 +187,49 @@ gdk_visual_get_best_type (void)
return system_visual->type;
}
-GdkVisual*
+GdkVisual *
gdk_screen_get_system_visual (GdkScreen *screen)
{
- g_assert( system_visual);
+ g_assert (system_visual);
return system_visual;
}
-GdkVisual*
+GdkVisual *
gdk_visual_get_best (void)
{
return system_visual;
}
-GdkVisual*
+GdkVisual *
gdk_visual_get_best_with_depth (gint depth)
{
gint i;
for (i = 0; visuals[i]; i++)
{
- if( visuals[i] ) {
+ if (visuals[i]) {
GdkVisual *visual = GDK_VISUAL (visuals[i]);
if (depth == visual->depth)
- return visual;
+ return visual;
}
}
return NULL;
}
-GdkVisual*
+GdkVisual *
gdk_visual_get_best_with_type (GdkVisualType visual_type)
{
gint i;
for (i = 0; visuals[i]; i++)
{
- if( visuals[i] ) {
+ if (visuals[i]) {
GdkVisual *visual = GDK_VISUAL (visuals[i]);
if (visual_type == visual->type)
- return visual;
+ return visual;
}
}
@@ -244,11 +244,11 @@ gdk_visual_get_best_with_both (gint depth,
for (i = 0; visuals[i]; i++)
{
- if( visuals[i] ) {
+ if (visuals[i]) {
GdkVisual *visual = GDK_VISUAL (visuals[i]);
if (depth == visual->depth && visual_type == visual->type)
- return visual;
+ return visual;
}
}
@@ -288,10 +288,10 @@ gdk_screen_list_visuals (GdkScreen *screen)
gint i;
for (i = 0; visuals[i]; i++)
- if( visuals[i] ) {
- GdkVisual * vis = GDK_VISUAL(visuals[i]);
- list = g_list_append (list,vis);
- }
+ if (visuals[i]) {
+ GdkVisual * vis = GDK_VISUAL (visuals[i]);
+ list = g_list_append (list,vis);
+ }
return list;
}
@@ -319,7 +319,7 @@ gdk_directfb_visual_by_format (DFBSurfacePixelFormat pixel_format)
/* first check if one the registered visuals matches */
for (i = 0; visuals[i]; i++)
- if ( visuals[i] && visuals[i]->format == pixel_format)
+ if (visuals[i] && visuals[i]->format == pixel_format)
return GDK_VISUAL (visuals[i]);
/* none matched, try to create a new one for this pixel_format */
@@ -327,18 +327,19 @@ gdk_directfb_visual_by_format (DFBSurfacePixelFormat pixel_format)
DFBSurfaceDescription desc;
IDirectFBSurface *test;
- desc.flags = DSDESC_WIDTH | DSDESC_HEIGHT | DSDESC_PIXELFORMAT;
+ desc.flags = DSDESC_WIDTH | DSDESC_HEIGHT | DSDESC_PIXELFORMAT;
desc.width = 8;
desc.height = 8;
desc.pixelformat = pixel_format;
- if ( _gdk_display->directfb->CreateSurface ( _gdk_display->directfb, &desc, &test) != DFB_OK)
+ if (_gdk_display->directfb->CreateSurface (_gdk_display->directfb,
+ &desc, &test) != DFB_OK)
return NULL;
test->Release (test);
}
- return GDK_VISUAL(gdk_directfb_visual_create (pixel_format));
+ return GDK_VISUAL (gdk_directfb_visual_create (pixel_format));
}
GdkScreen *
diff --git a/gdk/directfb/gdkwindow-directfb.c b/gdk/directfb/gdkwindow-directfb.c
index 8e67680..158756c 100644
--- a/gdk/directfb/gdkwindow-directfb.c
+++ b/gdk/directfb/gdkwindow-directfb.c
@@ -51,10 +51,10 @@
#include <directfb_util.h>
-D_DEBUG_DOMAIN( GDKDFB_Crossing, "GDKDFB/Crossing", "GDK DirectFB Crossing Events" );
-D_DEBUG_DOMAIN( GDKDFB_Updates, "GDKDFB/Updates", "GDK DirectFB Updates" );
-D_DEBUG_DOMAIN( GDKDFB_Paintable, "GDKDFB/Paintable", "GDK DirectFB Paintable" );
-D_DEBUG_DOMAIN( GDKDFB_Window, "GDKDFB/Window", "GDK DirectFB Window" );
+D_DEBUG_DOMAIN (GDKDFB_Crossing, "GDKDFB/Crossing", "GDK DirectFB Crossing Events");
+D_DEBUG_DOMAIN (GDKDFB_Updates, "GDKDFB/Updates", "GDK DirectFB Updates");
+D_DEBUG_DOMAIN (GDKDFB_Paintable, "GDKDFB/Paintable", "GDK DirectFB Paintable");
+D_DEBUG_DOMAIN (GDKDFB_Window, "GDKDFB/Window", "GDK DirectFB Window");
static GdkRegion * gdk_window_impl_directfb_get_visible_region (GdkDrawable *drawable);
@@ -71,9 +71,9 @@ static void gdk_directfb_window_destroy (GdkWindow *window,
typedef struct
{
- GdkWindowChildChanged changed;
- GdkWindowChildGetPos get_pos;
- gpointer user_data;
+ GdkWindowChildChanged changed;
+ GdkWindowChildGetPos get_pos;
+ gpointer user_data;
} GdkWindowChildHandlerData;
@@ -84,7 +84,6 @@ GdkWindow * _gdk_parent_root = NULL;
static void gdk_window_impl_directfb_paintable_init (GdkPaintableIface *iface);
-
GType
gdk_window_impl_directfb_get_type (void)
{
@@ -147,8 +146,9 @@ gdk_window_impl_directfb_init (GdkWindowImplDirectFB *impl)
impl->drawable.height = 1;
//cannot use gdk_cursor_new here since gdk_display_get_default
//does not work yet.
- impl->cursor = gdk_cursor_new_for_display (GDK_DISPLAY_OBJECT(_gdk_display),GDK_LEFT_PTR);
- impl->opacity = 255;
+ impl->cursor = gdk_cursor_new_for_display (GDK_DISPLAY_OBJECT (_gdk_display),
+ GDK_LEFT_PTR);
+ impl->opacity = 255;
}
static void
@@ -185,7 +185,8 @@ gdk_window_impl_directfb_finalize (GObject *object)
{
GdkWindowImplDirectFB *impl = GDK_WINDOW_IMPL_DIRECTFB (object);
- D_DEBUG_AT( GDKDFB_Window, "%s( %p ) <- %dx%d\n", G_STRFUNC, impl, impl->drawable.width, impl->drawable.height );
+ D_DEBUG_AT (GDKDFB_Window, "%s( %p ) <- %dx%d\n", G_STRFUNC,
+ impl, impl->drawable.width, impl->drawable.height);
if (GDK_WINDOW_IS_MAPPED (impl->drawable.wrapper))
gdk_window_hide (impl->drawable.wrapper);
@@ -201,7 +202,7 @@ gdk_window_impl_directfb_finalize (GObject *object)
if (impl->window)
{
gdk_directfb_window_id_table_remove (impl->dfb_id);
- /* native window resource must be release before we can finalize !*/
+ /* native window resource must be release before we can finalize !*/
impl->window = NULL;
}
@@ -209,23 +210,24 @@ gdk_window_impl_directfb_finalize (GObject *object)
G_OBJECT_CLASS (parent_class)->finalize (object);
}
-static GdkRegion*
+static GdkRegion *
gdk_window_impl_directfb_get_visible_region (GdkDrawable *drawable)
{
- GdkDrawableImplDirectFB *priv = GDK_DRAWABLE_IMPL_DIRECTFB (drawable);
- GdkRectangle rect = { 0, 0, 0, 0 };
+ GdkDrawableImplDirectFB *priv = GDK_DRAWABLE_IMPL_DIRECTFB (drawable);
+ GdkRectangle rect = { 0, 0, 0, 0 };
DFBRectangle drect = { 0, 0, 0, 0 };
- D_DEBUG_AT( GDKDFB_Window, "%s( %p )\n", G_STRFUNC, drawable );
+ D_DEBUG_AT (GDKDFB_Window, "%s( %p )\n", G_STRFUNC, drawable);
if (priv->surface)
- priv->surface->GetVisibleRectangle (priv->surface, &drect);
- rect.x= drect.x;
- rect.y= drect.y;
- rect.width=drect.w;
- rect.height=drect.h;
+ priv->surface->GetVisibleRectangle (priv->surface, &drect);
+ rect.x = drect.x;
+ rect.y = drect.y;
+ rect.width = drect.w;
+ rect.height = drect.h;
- D_DEBUG_AT( GDKDFB_Window, " -> returning %4d,%4d-%4dx%4d\n", drect.x, drect.y, drect.w, drect.h );
+ D_DEBUG_AT (GDKDFB_Window, " -> returning %4d,%4d-%4dx%4d\n",
+ drect.x, drect.y, drect.w, drect.h);
return gdk_region_rectangle (&rect);
}
@@ -238,15 +240,15 @@ gdk_window_impl_directfb_set_colormap (GdkDrawable *drawable,
if (colormap)
{
- GdkDrawableImplDirectFB *priv = GDK_DRAWABLE_IMPL_DIRECTFB (drawable);
+ GdkDrawableImplDirectFB *priv = GDK_DRAWABLE_IMPL_DIRECTFB (drawable);
- if (priv->surface)
- {
- IDirectFBPalette *palette = gdk_directfb_colormap_get_palette (colormap);
+ if (priv->surface)
+ {
+ IDirectFBPalette *palette = gdk_directfb_colormap_get_palette (colormap);
- if (palette)
- priv->surface->SetPalette (priv->surface, palette);
- }
+ if (palette)
+ priv->surface->SetPalette (priv->surface, palette);
+ }
}
}
@@ -259,7 +261,8 @@ create_directfb_window (GdkWindowImplDirectFB *impl,
DFBResult ret;
IDirectFBWindow *window;
- D_DEBUG_AT( GDKDFB_Window, "%s( %4dx%4d, caps 0x%08x )\n", G_STRFUNC, desc->width, desc->height, desc->caps );
+ D_DEBUG_AT (GDKDFB_Window, "%s( %4dx%4d, caps 0x%08x )\n", G_STRFUNC,
+ desc->width, desc->height, desc->caps);
ret = _gdk_display->layer->CreateWindow (_gdk_display->layer, desc, &window);
@@ -271,9 +274,9 @@ create_directfb_window (GdkWindowImplDirectFB *impl,
}
if ((desc->flags & DWDESC_CAPS) && (desc->caps & DWCAPS_INPUTONLY))
- {
- impl->drawable.surface = NULL;
- } else
+ {
+ impl->drawable.surface = NULL;
+ } else
window->GetSurface (window, &impl->drawable.surface);
if (window_options)
@@ -286,9 +289,10 @@ create_directfb_window (GdkWindowImplDirectFB *impl,
impl->window = window;
#ifndef GDK_DIRECTFB_NO_EXPERIMENTS
- //direct_log_printf( NULL, "Initializing (window %p, wimpl %p)\n", win, impl );
+ //direct_log_printf (NULL, "Initializing (window %p, wimpl %p)\n", win, impl);
- dfb_updates_init( &impl->flips, impl->flip_regions, G_N_ELEMENTS(impl->flip_regions) );
+ dfb_updates_init (&impl->flips, impl->flip_regions,
+ G_N_ELEMENTS (impl->flip_regions));
#endif
return TRUE;
@@ -313,47 +317,49 @@ _gdk_windowing_window_init (void)
impl = GDK_WINDOW_IMPL_DIRECTFB (private->impl);
- private->window_type = GDK_WINDOW_ROOT;
- private->state = 0;
- private->children = NULL;
- private->viewable = TRUE;
-// impl->drawable.paint_region = NULL;
- impl->gdkWindow = _gdk_parent_root;
- impl->window = NULL;
- impl->drawable.abs_x = 0;
- impl->drawable.abs_y = 0;
- impl->drawable.width = dlc.width;
- impl->drawable.height = dlc.height;
- impl->drawable.wrapper = GDK_DRAWABLE (private);
+ private->window_type = GDK_WINDOW_ROOT;
+ private->state = 0;
+ private->children = NULL;
+ private->viewable = TRUE;
+ // impl->drawable.paint_region = NULL;
+ impl->gdkWindow = _gdk_parent_root;
+ impl->window = NULL;
+ impl->drawable.abs_x = 0;
+ impl->drawable.abs_y = 0;
+ impl->drawable.width = dlc.width;
+ impl->drawable.height = dlc.height;
+ impl->drawable.wrapper = GDK_DRAWABLE (private);
/* custom root window init */
{
DFBWindowDescription desc;
desc.flags = 0;
- /*XXX I must do this now its a bug ALPHA ROOT*/
-
- desc.flags = DWDESC_CAPS;
- desc.caps = 0;
- desc.caps |= DWCAPS_NODECORATION;
- desc.caps |= DWCAPS_ALPHACHANNEL;
- desc.flags |= ( DWDESC_WIDTH | DWDESC_HEIGHT |
- DWDESC_POSX | DWDESC_POSY );
- desc.posx = 0;
- desc.posy = 0;
- desc.width = dlc.width;
- desc.height = dlc.height;
- create_directfb_window (impl,&desc,0);
- g_assert(impl->window != NULL);
- g_assert(impl->drawable.surface != NULL );
+ /*XXX I must do this now its a bug ALPHA ROOT*/
+
+ desc.flags = DWDESC_CAPS;
+ desc.caps = 0;
+ desc.caps |= DWCAPS_NODECORATION;
+ desc.caps |= DWCAPS_ALPHACHANNEL;
+ desc.flags |= (DWDESC_WIDTH | DWDESC_HEIGHT |
+ DWDESC_POSX | DWDESC_POSY);
+ desc.posx = 0;
+ desc.posy = 0;
+ desc.width = dlc.width;
+ desc.height = dlc.height;
+ create_directfb_window (impl, &desc, 0);
+ g_assert (impl->window != NULL);
+ g_assert (impl->drawable.surface != NULL );
}
- impl->drawable.surface->GetPixelFormat(impl->drawable.surface,&impl->drawable.format);
- private->depth = DFB_BITS_PER_PIXEL(impl->drawable.format);
+ impl->drawable.surface->GetPixelFormat (impl->drawable.surface,
+ &impl->drawable.format);
+ private->depth = DFB_BITS_PER_PIXEL (impl->drawable.format);
_gdk_window_update_size (_gdk_parent_root);
/*
- Now we can set up the system colormap
+ Now we can set up the system colormap
*/
- gdk_drawable_set_colormap (GDK_DRAWABLE (_gdk_parent_root),gdk_colormap_get_system());
+ gdk_drawable_set_colormap (GDK_DRAWABLE (_gdk_parent_root),
+ gdk_colormap_get_system ());
}
@@ -608,21 +614,21 @@ _gdk_window_impl_new (GdkWindow *window,
case GDK_INPUT_OUTPUT:
private->input_only = FALSE;
- desc.flags |= DWDESC_PIXELFORMAT;
- desc.pixelformat = ((GdkVisualDirectFB *)visual)->format;
+ desc.flags |= DWDESC_PIXELFORMAT;
+ desc.pixelformat = ((GdkVisualDirectFB *)visual)->format;
if (DFB_PIXELFORMAT_HAS_ALPHA (desc.pixelformat))
{
desc.flags |= DWDESC_CAPS;
- desc.caps = DWCAPS_ALPHACHANNEL;
+ desc.caps = DWCAPS_ALPHACHANNEL;
}
break;
case GDK_INPUT_ONLY:
- private->input_only = TRUE;
- desc.flags |= DWDESC_CAPS;
- desc.caps = DWCAPS_INPUTONLY;
+ private->input_only = TRUE;
+ desc.flags |= DWDESC_CAPS;
+ desc.caps = DWCAPS_INPUTONLY;
break;
default:
@@ -753,11 +759,11 @@ gdk_directfb_window_destroy (GdkWindow *window,
g_return_if_fail (GDK_IS_WINDOW (window));
- D_DEBUG_AT( GDKDFB_Window, "%s( %p, %srecursing, %sforeign )\n", G_STRFUNC, window,
- recursing ? "" : "not ", foreign_destroy ? "" : "no " );
+ D_DEBUG_AT (GDKDFB_Window, "%s( %p, %srecursing, %sforeign )\n", G_STRFUNC, window,
+ recursing ? "" : "not ", foreign_destroy ? "" : "no ");
private = GDK_WINDOW_OBJECT (window);
- impl = GDK_WINDOW_IMPL_DIRECTFB (private->impl);
+ impl = GDK_WINDOW_IMPL_DIRECTFB (private->impl);
_gdk_selection_window_destroyed (window);
gdk_directfb_event_windows_remove (window);
@@ -772,8 +778,8 @@ gdk_directfb_window_destroy (GdkWindow *window,
if (impl->drawable.surface) {
GdkDrawableImplDirectFB *dimpl = GDK_DRAWABLE_IMPL_DIRECTFB (private->impl);
- if(dimpl->cairo_surface) {
- cairo_surface_destroy(dimpl->cairo_surface);
+ if (dimpl->cairo_surface) {
+ cairo_surface_destroy (dimpl->cairo_surface);
dimpl->cairo_surface= NULL;
}
impl->drawable.surface->Release (impl->drawable.surface);
@@ -781,10 +787,10 @@ gdk_directfb_window_destroy (GdkWindow *window,
}
if (!recursing && !foreign_destroy && impl->window ) {
- impl->window->SetOpacity (impl->window,0);
- impl->window->Close(impl->window);
- impl->window->Release(impl->window);
- impl->window = NULL;
+ impl->window->SetOpacity (impl->window, 0);
+ impl->window->Close (impl->window);
+ impl->window->Release (impl->window);
+ impl->window = NULL;
}
}
@@ -795,7 +801,7 @@ gdk_window_destroy_notify (GdkWindow *window)
{
g_return_if_fail (GDK_IS_WINDOW (window));
- D_DEBUG_AT( GDKDFB_Window, "%s( %p )\n", G_STRFUNC, window );
+ D_DEBUG_AT (GDKDFB_Window, "%s( %p )\n", G_STRFUNC, window);
if (!GDK_WINDOW_DESTROYED (window))
{
@@ -804,7 +810,7 @@ gdk_window_destroy_notify (GdkWindow *window)
_gdk_window_destroy (window, TRUE);
}
- g_object_unref (window);
+ g_object_unref (window);
}
/* Focus follows pointer */
@@ -844,7 +850,7 @@ gdk_directfb_change_focus (GdkWindow *new_focus_window)
GdkWindow *new_win;
GdkWindow *event_win;
- D_DEBUG_AT( GDKDFB_Window, "%s( %p )\n", G_STRFUNC, new_focus_window );
+ D_DEBUG_AT (GDKDFB_Window, "%s( %p )\n", G_STRFUNC, new_focus_window);
/* No focus changes while the pointer is grabbed */
if (_gdk_directfb_pointer_grab_window)
@@ -920,7 +926,7 @@ gdk_directfb_window_raise (GdkWindow *window)
{
GdkWindowObject *parent;
- D_DEBUG_AT( GDKDFB_Window, "%s( %p )\n", G_STRFUNC, window );
+ D_DEBUG_AT (GDKDFB_Window, "%s( %p )\n", G_STRFUNC, window);
parent = GDK_WINDOW_OBJECT (window)->parent;
@@ -938,7 +944,7 @@ gdk_directfb_window_lower (GdkWindow *window)
{
GdkWindowObject *parent;
- D_DEBUG_AT( GDKDFB_Window, "%s( %p )\n", G_STRFUNC, window );
+ D_DEBUG_AT (GDKDFB_Window, "%s( %p )\n", G_STRFUNC, window);
parent = GDK_WINDOW_OBJECT (window)->parent;
@@ -969,7 +975,7 @@ send_map_events (GdkWindowObject *private)
if (!GDK_WINDOW_IS_MAPPED (private))
return;
- D_DEBUG_AT( GDKDFB_Window, "%s( %p )\n", G_STRFUNC, private );
+ D_DEBUG_AT (GDKDFB_Window, "%s( %p )\n", G_STRFUNC, private);
event_win = gdk_directfb_other_event_window ((GdkWindow *) private, GDK_MAP);
if (event_win)
@@ -1012,7 +1018,7 @@ gdk_directfb_window_send_crossing_events (GdkWindow *src,
GdkWindow *b;
GdkWindow *event_win;
- D_DEBUG_AT( GDKDFB_Crossing, "%s( %p -> %p, %d )\n", G_STRFUNC, src, dest, mode );
+ D_DEBUG_AT (GDKDFB_Crossing, "%s( %p -> %p, %d )\n", G_STRFUNC, src, dest, mode);
/* Do a possible cursor change before checking if we need to
generate crossing events so cursor changes due to pointer
@@ -1044,7 +1050,7 @@ gdk_directfb_window_send_crossing_events (GdkWindow *src,
}
if (dest == gdk_directfb_window_containing_pointer) {
- D_DEBUG_AT( GDKDFB_Crossing, " -> already containing the pointer\n" );
+ D_DEBUG_AT (GDKDFB_Crossing, " -> already containing the pointer\n");
return;
}
@@ -1059,7 +1065,7 @@ gdk_directfb_window_send_crossing_events (GdkWindow *src,
b = dest;
if (a == b) {
- D_DEBUG_AT( GDKDFB_Crossing, " -> src == dest\n" );
+ D_DEBUG_AT (GDKDFB_Crossing, " -> src == dest\n");
return;
}
@@ -1068,7 +1074,7 @@ gdk_directfb_window_send_crossing_events (GdkWindow *src,
* might have died.
*/
if (GDK_WINDOW_DESTROYED (a)) {
- D_DEBUG_AT( GDKDFB_Crossing, " -> src is destroyed!\n" );
+ D_DEBUG_AT (GDKDFB_Crossing, " -> src is destroyed!\n");
a = _gdk_parent_root;
}
@@ -1076,16 +1082,16 @@ gdk_directfb_window_send_crossing_events (GdkWindow *src,
c = gdk_directfb_find_common_ancestor (a, b);
- D_DEBUG_AT( GDKDFB_Crossing, " -> common ancestor %p\n", c );
+ D_DEBUG_AT (GDKDFB_Crossing, " -> common ancestor %p\n", c);
non_linear = (c != a) && (c != b);
- D_DEBUG_AT( GDKDFB_Crossing, " -> non_linear: %s\n", non_linear ? "YES" : "NO" );
+ D_DEBUG_AT (GDKDFB_Crossing, " -> non_linear: %s\n", non_linear ? "YES" : "NO");
event_win = gdk_directfb_pointer_event_window (a, GDK_LEAVE_NOTIFY);
if (event_win)
{
- D_DEBUG_AT( GDKDFB_Crossing, " -> sending LEAVE to src\n" );
+ D_DEBUG_AT (GDKDFB_Crossing, " -> sending LEAVE to src\n");
event = gdk_directfb_event_make (event_win, GDK_LEAVE_NOTIFY);
event->crossing.subwindow = NULL;
@@ -1108,13 +1114,15 @@ gdk_directfb_window_send_crossing_events (GdkWindow *src,
event->crossing.focus = FALSE;
event->crossing.state = modifiers;
- D_DEBUG_AT( GDKDFB_Crossing, " => LEAVE (%p/%p) at %4f,%4f (%4f,%4f) mode %d, detail %d\n",
+ D_DEBUG_AT (GDKDFB_Crossing,
+ " => LEAVE (%p/%p) at %4f,%4f (%4f,%4f) mode %d, detail %d\n",
event_win, a,
- event->crossing.x, event->crossing.y, event->crossing.x_root, event->crossing.y_root,
- event->crossing.mode, event->crossing.detail );
+ event->crossing.x, event->crossing.y,
+ event->crossing.x_root, event->crossing.y_root,
+ event->crossing.mode, event->crossing.detail);
}
- /* Traverse up from a to (excluding) c */
+ /* Traverse up from a to (excluding) c */
if (c != a)
{
last = a;
@@ -1146,10 +1154,12 @@ gdk_directfb_window_send_crossing_events (GdkWindow *src,
event->crossing.focus = FALSE;
event->crossing.state = modifiers;
- D_DEBUG_AT( GDKDFB_Crossing, " -> LEAVE (%p/%p) at %4f,%4f (%4f,%4f) mode %d, detail %d\n",
+ D_DEBUG_AT (GDKDFB_Crossing,
+ " -> LEAVE (%p/%p) at %4f,%4f (%4f,%4f) mode %d, detail %d\n",
event_win, win,
- event->crossing.x, event->crossing.y, event->crossing.x_root, event->crossing.y_root,
- event->crossing.mode, event->crossing.detail );
+ event->crossing.x, event->crossing.y,
+ event->crossing.x_root, event->crossing.y_root,
+ event->crossing.mode, event->crossing.detail);
}
last = win;
@@ -1204,10 +1214,12 @@ gdk_directfb_window_send_crossing_events (GdkWindow *src,
event->crossing.focus = FALSE;
event->crossing.state = modifiers;
- D_DEBUG_AT( GDKDFB_Crossing, " -> ENTER (%p/%p) at %4f,%4f (%4f,%4f) mode %d, detail %d\n",
+ D_DEBUG_AT (GDKDFB_Crossing,
+ " -> ENTER (%p/%p) at %4f,%4f (%4f,%4f) mode %d, detail %d\n",
event_win, win,
- event->crossing.x, event->crossing.y, event->crossing.x_root, event->crossing.y_root,
- event->crossing.mode, event->crossing.detail );
+ event->crossing.x, event->crossing.y,
+ event->crossing.x_root, event->crossing.y_root,
+ event->crossing.mode, event->crossing.detail);
}
}
@@ -1239,10 +1251,12 @@ gdk_directfb_window_send_crossing_events (GdkWindow *src,
event->crossing.focus = FALSE;
event->crossing.state = modifiers;
- D_DEBUG_AT( GDKDFB_Crossing, " => ENTER (%p/%p) at %4f,%4f (%4f,%4f) mode %d, detail %d\n",
+ D_DEBUG_AT (GDKDFB_Crossing,
+ " => ENTER (%p/%p) at %4f,%4f (%4f,%4f) mode %d, detail %d\n",
event_win, b,
- event->crossing.x, event->crossing.y, event->crossing.x_root, event->crossing.y_root,
- event->crossing.mode, event->crossing.detail );
+ event->crossing.x, event->crossing.y,
+ event->crossing.x_root, event->crossing.y_root,
+ event->crossing.mode, event->crossing.detail);
}
if (mode != GDK_CROSSING_GRAB)
@@ -1265,7 +1279,8 @@ show_window_internal (GdkWindow *window,
GdkWindowImplDirectFB *impl;
GdkWindow *mousewin;
- D_DEBUG_AT( GDKDFB_Window, "%s( %p, %sraise )\n", G_STRFUNC, window, raise ? "" : "no " );
+ D_DEBUG_AT (GDKDFB_Window, "%s( %p, %sraise )\n", G_STRFUNC,
+ window, raise ? "" : "no ");
private = GDK_WINDOW_OBJECT (window);
impl = GDK_WINDOW_IMPL_DIRECTFB (private->impl);
@@ -1299,7 +1314,7 @@ show_window_internal (GdkWindow *window,
(impl->opacity >> 1) + (impl->opacity >> 2));
else
impl->window->SetOpacity (impl->window, impl->opacity);
- /* if its the first window focus it */
+ /* if its the first window focus it */
}
}
@@ -1309,7 +1324,7 @@ gdk_directfb_window_show (GdkWindow *window,
{
g_return_if_fail (GDK_IS_WINDOW (window));
- D_DEBUG_AT( GDKDFB_Window, "%s( %p )\n", G_STRFUNC, window );
+ D_DEBUG_AT (GDKDFB_Window, "%s( %p )\n", G_STRFUNC, window);
show_window_internal (window, raise);
}
@@ -1324,7 +1339,7 @@ gdk_directfb_window_hide (GdkWindow *window)
g_return_if_fail (GDK_IS_WINDOW (window));
- D_DEBUG_AT( GDKDFB_Window, "%s( %p )\n", G_STRFUNC, window );
+ D_DEBUG_AT (GDKDFB_Window, "%s( %p )\n", G_STRFUNC, window);
private = GDK_WINDOW_OBJECT (window);
impl = GDK_WINDOW_IMPL_DIRECTFB (private->impl);
@@ -1453,10 +1468,9 @@ gdk_directfb_window_move (GdkWindow *window,
}
else
{
- gint width=impl->drawable.width;
- gint height=impl->drawable.height;
- GdkRectangle old =
- { private->x, private->y,width,height };
+ gint width = impl->drawable.width;
+ gint height = impl->drawable.height;
+ GdkRectangle old = { private->x, private->y,width,height };
_gdk_directfb_move_resize_child (window, x, y, width, height);
_gdk_directfb_calc_abs (window);
@@ -1590,15 +1604,15 @@ gdk_directfb_window_reparent (GdkWindow *window,
if (!new_parent)
new_parent = _gdk_parent_root;
- window_private = (GdkWindowObject *) window;
+ window_private = (GdkWindowObject *) window;
old_parent_private = (GdkWindowObject *) window_private->parent;
- parent_private = (GdkWindowObject *) new_parent;
- parent_impl = GDK_WINDOW_IMPL_DIRECTFB (parent_private->impl);
- visual = gdk_drawable_get_visual (window);
+ parent_private = (GdkWindowObject *) new_parent;
+ parent_impl = GDK_WINDOW_IMPL_DIRECTFB (parent_private->impl);
+ visual = gdk_drawable_get_visual (window);
/* already parented */
- if( window_private->parent == (GdkWindowObject *)new_parent )
- return FALSE;
+ if (window_private->parent == (GdkWindowObject *) new_parent)
+ return FALSE;
window_private->parent = (GdkWindowObject *) new_parent;
@@ -1608,68 +1622,68 @@ gdk_directfb_window_reparent (GdkWindow *window,
g_list_remove (old_parent_private->children, window);
}
- parent_private->children = g_list_prepend (parent_private->children, window);
+ parent_private->children = g_list_prepend (parent_private->children, window);
- impl = GDK_WINDOW_IMPL_DIRECTFB (window_private->impl);
+ impl = GDK_WINDOW_IMPL_DIRECTFB (window_private->impl);
- if( impl->drawable.surface ) {
- impl->drawable.surface->Release (impl->drawable.surface);
- impl->drawable.surface = NULL;
- }
+ if (impl->drawable.surface) {
+ impl->drawable.surface->Release (impl->drawable.surface);
+ impl->drawable.surface = NULL;
+ }
- if( impl->window != NULL ) {
- gdk_directfb_window_id_table_remove (impl->dfb_id);
- impl->window->SetOpacity (impl->window,0);
- impl->window->Close(impl->window);
- impl->window->Release(impl->window);
- impl->window = NULL;
+ if (impl->window != NULL) {
+ gdk_directfb_window_id_table_remove (impl->dfb_id);
+ impl->window->SetOpacity (impl->window, 0);
+ impl->window->Close (impl->window);
+ impl->window->Release (impl->window);
+ impl->window = NULL;
+ }
+
+ //create window were a child of the root now
+ if (window_private->parent == (GdkWindowObject *)_gdk_parent_root) {
+ DFBWindowDescription desc;
+ DFBWindowOptions window_options = DWOP_NONE;
+ desc.flags = DWDESC_CAPS;
+ if (window_private->input_only) {
+ desc.caps = DWCAPS_INPUTONLY;
+ } else {
+ desc.flags |= DWDESC_PIXELFORMAT;
+ desc.pixelformat = ((GdkVisualDirectFB *) visual)->format;
+ if (DFB_PIXELFORMAT_HAS_ALPHA (desc.pixelformat)) {
+ desc.flags |= DWDESC_CAPS;
+ desc.caps = DWCAPS_ALPHACHANNEL;
+ }
}
+ if (window_private->window_type == GDK_WINDOW_CHILD)
+ window_private->window_type = GDK_WINDOW_TOPLEVEL;
+ desc.flags |= (DWDESC_WIDTH | DWDESC_HEIGHT |
+ DWDESC_POSX | DWDESC_POSY);
+ desc.posx = x;
+ desc.posy = y;
+ desc.width = impl->drawable.width;
+ desc.height = impl->drawable.height;
+ if (!create_directfb_window (impl, &desc, window_options))
+ {
+ g_assert (0);
+ _gdk_window_destroy (window, FALSE);
+ return FALSE;
+ }
+ /* we hold a reference count on ourselves */
+ g_object_ref (window);
+ impl->window->GetID (impl->window, &impl->dfb_id);
+ gdk_directfb_window_id_table_insert (impl->dfb_id, window);
+ gdk_directfb_event_windows_add (window);
+ } else {
+ DFBRectangle rect = { x, y,
+ impl->drawable.width,
+ impl->drawable.height };
+ impl->window = NULL;
+ parent_impl->drawable.surface->GetSubSurface (parent_impl->drawable.surface,
+ &rect,
+ &impl->drawable.surface);
+ }
- //create window were a child of the root now
- if( window_private->parent == (GdkWindowObject *)_gdk_parent_root) {
- DFBWindowDescription desc;
- DFBWindowOptions window_options = DWOP_NONE;
- desc.flags = DWDESC_CAPS;
- if( window_private->input_only ) {
- desc.caps = DWCAPS_INPUTONLY;
- } else {
- desc.flags |= DWDESC_PIXELFORMAT;
- desc.pixelformat = ((GdkVisualDirectFB *) visual)->format;
- if (DFB_PIXELFORMAT_HAS_ALPHA (desc.pixelformat)) {
- desc.flags |= DWDESC_CAPS;
- desc.caps = DWCAPS_ALPHACHANNEL;
- }
- }
- if( window_private->window_type == GDK_WINDOW_CHILD )
- window_private->window_type = GDK_WINDOW_TOPLEVEL;
- desc.flags |= ( DWDESC_WIDTH | DWDESC_HEIGHT |
- DWDESC_POSX | DWDESC_POSY );
- desc.posx = x;
- desc.posy = y;
- desc.width = impl->drawable.width;
- desc.height = impl->drawable.height;
- if (!create_directfb_window (impl, &desc, window_options))
- {
- g_assert(0);
- _gdk_window_destroy (window, FALSE);
- return FALSE;
- }
- /* we hold a reference count on ourselves */
- g_object_ref (window);
- impl->window->GetID (impl->window, &impl->dfb_id);
- gdk_directfb_window_id_table_insert (impl->dfb_id, window);
- gdk_directfb_event_windows_add (window);
- } else {
- DFBRectangle rect = { x, y, impl->drawable.width,
- impl->drawable.height};
- impl->window = NULL;
- parent_impl->drawable.surface->GetSubSurface (
- parent_impl->drawable.surface,
- &rect,
- &impl->drawable.surface);
- }
-
- return TRUE;
+ return TRUE;
}
static void
@@ -1677,7 +1691,7 @@ gdk_window_directfb_raise (GdkWindow *window)
{
GdkWindowImplDirectFB *impl;
- D_DEBUG_AT( GDKDFB_Window, "%s( %p )\n", G_STRFUNC, window );
+ D_DEBUG_AT (GDKDFB_Window, "%s( %p )\n", G_STRFUNC, window);
g_return_if_fail (GDK_IS_WINDOW (window));
@@ -1708,7 +1722,7 @@ gdk_window_directfb_lower (GdkWindow *window)
{
GdkWindowImplDirectFB *impl;
- D_DEBUG_AT( GDKDFB_Window, "%s( %p )\n", G_STRFUNC, window );
+ D_DEBUG_AT (GDKDFB_Window, "%s( %p )\n", G_STRFUNC, window);
g_return_if_fail (GDK_IS_WINDOW (window));
@@ -1776,9 +1790,9 @@ gdk_window_set_title (GdkWindow *window,
if (GDK_WINDOW_DESTROYED (window))
return;
- D_DEBUG_AT( GDKDFB_Window, "%s( %p, '%s' )\n", G_STRFUNC, window, title );
+ D_DEBUG_AT (GDKDFB_Window, "%s( %p, '%s' )\n", G_STRFUNC, window, title);
/* N/A */
- D_DEBUG_AT( GDKDFB_Window, "%s( %p )\n", G_STRFUNC, window );
+ D_DEBUG_AT (GDKDFB_Window, "%s( %p )\n", G_STRFUNC, window);
}
void
@@ -1837,8 +1851,8 @@ gdk_window_set_transient_for (GdkWindow *window,
}
static void
-gdk_directfb_window_set_background (GdkWindow *window,
- const GdkColor *color)
+gdk_directfb_window_set_background (GdkWindow *window,
+ const GdkColor *color)
{
GdkWindowObject *private;
@@ -1846,7 +1860,8 @@ gdk_directfb_window_set_background (GdkWindow *window,
g_return_if_fail (color != NULL);
- D_DEBUG_AT( GDKDFB_Window, "%s( %p, %d,%d,%d )\n", G_STRFUNC, window, color->red, color->green, color->blue );
+ D_DEBUG_AT (GDKDFB_Window, "%s( %p, %d,%d,%d )\n", G_STRFUNC,
+ window, color->red, color->green, color->blue);
private = GDK_WINDOW_OBJECT (window);
private->bg_color = *color;
@@ -1867,8 +1882,7 @@ gdk_directfb_window_set_back_pixmap (GdkWindow *window,
g_return_if_fail (GDK_IS_WINDOW (window));
- D_DEBUG_AT( GDKDFB_Window, "%s( %p, %p )\n", G_STRFUNC,
- window, pixmap);
+ D_DEBUG_AT (GDKDFB_Window, "%s( %p, %p )\n", G_STRFUNC, window, pixmap);
private = GDK_WINDOW_OBJECT (window);
@@ -1967,7 +1981,7 @@ gdk_directfb_window_get_geometry (GdkWindow *window,
*height = impl->height;
if (depth)
- *depth = DFB_BITS_PER_PIXEL(impl->format);
+ *depth = DFB_BITS_PER_PIXEL (impl->format);
}
}
@@ -1995,7 +2009,8 @@ _gdk_directfb_calc_abs (GdkWindow *window)
impl->abs_y += parent_impl->abs_y;
}
- D_DEBUG_AT( GDKDFB_Window, "%s( %p ) -> %4d,%4d\n", G_STRFUNC, window, impl->abs_x, impl->abs_y );
+ D_DEBUG_AT (GDKDFB_Window, "%s( %p ) -> %4d,%4d\n", G_STRFUNC,
+ window, impl->abs_x, impl->abs_y);
for (list = private->children; list; list = list->next)
{
@@ -2081,11 +2096,11 @@ gdk_directfb_window_get_pointer (GdkWindow *window,
}
GdkWindow *
-_gdk_windowing_window_at_pointer (GdkDisplay *display,
- gint *win_x,
- gint *win_y,
+_gdk_windowing_window_at_pointer (GdkDisplay *display,
+ gint *win_x,
+ gint *win_y,
GdkModifierType *mask,
- gboolean get_toplevel)
+ gboolean get_toplevel)
{
GdkWindow *retval;
gint wx, wy;
@@ -2117,7 +2132,7 @@ _gdk_windowing_window_at_pointer (GdkDisplay *display,
w = w->parent;
}
retval = (GdkWindow *)w;
- }
+ }
}
return retval;
@@ -2130,9 +2145,8 @@ _gdk_windowing_get_pointer (GdkDisplay *display,
gint *y,
GdkModifierType *mask)
{
- (void)screen;
if (screen) {
- *screen = gdk_display_get_default_screen (display);
+ *screen = gdk_display_get_default_screen (display);
}
gdk_directfb_window_get_pointer (_gdk_windowing_window_at_pointer (display,
@@ -2367,7 +2381,7 @@ gdk_window_set_type_hint (GdkWindow *window,
return;
GDK_NOTE (MISC, g_print ("gdk_window_set_type_hint: 0x%x: %d\n",
- GDK_WINDOW_DFB_ID (window), hint));
+ GDK_WINDOW_DFB_ID (window), hint));
((GdkWindowImplDirectFB *)((GdkWindowObject *)window)->impl)->type_hint = hint;
@@ -2427,7 +2441,7 @@ gdk_window_set_group (GdkWindow *window,
{
g_return_if_fail (GDK_IS_WINDOW (window));
g_return_if_fail (GDK_IS_WINDOW (leader));
- g_warning(" DirectFb set_group groups not supported \n");
+ g_warning (" DirectFb set_group groups not supported \n");
if (GDK_WINDOW_DESTROYED (window))
return;
@@ -2435,10 +2449,11 @@ gdk_window_set_group (GdkWindow *window,
/* N/A */
}
-GdkWindow * gdk_window_get_group (GdkWindow *window)
+GdkWindow *
+gdk_window_get_group (GdkWindow *window)
{
- g_warning(" DirectFb get_group groups not supported \n");
- return window;
+ g_warning (" DirectFb get_group groups not supported \n");
+ return window;
}
void
@@ -2502,7 +2517,7 @@ gdk_window_set_functions (GdkWindow *window,
return;
/* N/A */
- g_message("unimplemented %s", G_STRFUNC);
+ g_message ("unimplemented %s", G_STRFUNC);
}
static gboolean
@@ -2515,7 +2530,7 @@ gdk_directfb_window_set_static_gravities (GdkWindow *window,
return FALSE;
/* N/A */
- g_message("unimplemented %s", G_STRFUNC);
+ g_message ("unimplemented %s", G_STRFUNC);
return FALSE;
}
@@ -2533,7 +2548,7 @@ gdk_window_begin_resize_drag (GdkWindow *window,
if (GDK_WINDOW_DESTROYED (window))
return;
- g_message("unimplemented %s", G_STRFUNC);
+ g_message ("unimplemented %s", G_STRFUNC);
}
void
@@ -2548,7 +2563,7 @@ gdk_window_begin_move_drag (GdkWindow *window,
if (GDK_WINDOW_DESTROYED (window))
return;
- g_message("unimplemented %s", G_STRFUNC);
+ g_message ("unimplemented %s", G_STRFUNC);
}
/**
@@ -2594,27 +2609,28 @@ gdk_window_get_frame_extents (GdkWindow *window,
* Given a directfb window and a subsurface of that window
* create a gdkwindow child wrapper
*/
-GdkWindow *gdk_directfb_create_child_window(GdkWindow *parent,
- IDirectFBSurface *subsurface)
+GdkWindow *
+gdk_directfb_create_child_window (GdkWindow *parent,
+ IDirectFBSurface *subsurface)
{
GdkWindow *window;
GdkWindowObject *private;
GdkWindowObject *parent_private;
GdkWindowImplDirectFB *impl;
GdkWindowImplDirectFB *parent_impl;
- gint x,y,w,h;
+ gint x, y, w, h;
g_return_val_if_fail (parent != NULL, NULL);
- window = g_object_new (GDK_TYPE_WINDOW, NULL);
- private = GDK_WINDOW_OBJECT (window);
- private->impl = g_object_new (_gdk_window_impl_get_type (), NULL);
- parent_private = GDK_WINDOW_OBJECT (parent);
- parent_impl = GDK_WINDOW_IMPL_DIRECTFB (parent_private->impl);
+ window = g_object_new (GDK_TYPE_WINDOW, NULL);
+ private = GDK_WINDOW_OBJECT (window);
+ private->impl = g_object_new (_gdk_window_impl_get_type (), NULL);
+ parent_private = GDK_WINDOW_OBJECT (parent);
+ parent_impl = GDK_WINDOW_IMPL_DIRECTFB (parent_private->impl);
private->parent = parent_private;
- subsurface->GetPosition(subsurface,&x,&y);
- subsurface->GetSize(subsurface,&w,&h);
+ subsurface->GetPosition (subsurface, &x, &y);
+ subsurface->GetSize (subsurface, &w, &h);
impl = GDK_WINDOW_IMPL_DIRECTFB (private->impl);
impl->drawable.wrapper = GDK_DRAWABLE (window);
@@ -2624,14 +2640,14 @@ GdkWindow *gdk_directfb_create_child_window(GdkWindow *parent,
_gdk_directfb_calc_abs (window);
- impl->drawable.width = w;
- impl->drawable.height = h;
- private->window_type = GDK_WINDOW_CHILD;
- impl->drawable.surface = subsurface;
- impl->drawable.format = parent_impl->drawable.format;
- private->depth = parent_private->depth;
+ impl->drawable.width = w;
+ impl->drawable.height = h;
+ private->window_type = GDK_WINDOW_CHILD;
+ impl->drawable.surface = subsurface;
+ impl->drawable.format = parent_impl->drawable.format;
+ private->depth = parent_private->depth;
gdk_drawable_set_colormap (GDK_DRAWABLE (window),
- gdk_drawable_get_colormap (parent));
+ gdk_drawable_get_colormap (parent));
gdk_window_set_cursor (window, NULL);
parent_private->children = g_list_prepend (parent_private->children,window);
/*we hold a reference count on ourselves */
@@ -2646,102 +2662,104 @@ GdkWindow *gdk_directfb_create_child_window(GdkWindow *parent,
* to the current state of a window event mask etc need to fix dfb
*/
GdkWindow *
-gdk_window_foreign_new_for_display (GdkDisplay* display,GdkNativeWindow anid)
-{
- GdkWindow *window = NULL;
- GdkWindow *parent =NULL;
- GdkWindowObject *private =NULL;
- GdkWindowObject *parent_private =NULL;
- GdkWindowImplDirectFB *parent_impl =NULL;
- GdkWindowImplDirectFB *impl =NULL;
- DFBWindowOptions options;
- DFBResult ret;
- GdkDisplayDFB * gdkdisplay = _gdk_display;
- IDirectFBWindow *dfbwindow;
-
- window = gdk_window_lookup (anid);
-
- if (window) {
- g_object_ref (window);
- return window;
- }
- if( display != NULL )
- gdkdisplay = GDK_DISPLAY_DFB(display);
+gdk_window_foreign_new_for_display (GdkDisplay* display, GdkNativeWindow anid)
+{
+ GdkWindow *window = NULL;
+ GdkWindow *parent = NULL;
+ GdkWindowObject *private = NULL;
+ GdkWindowObject *parent_private = NULL;
+ GdkWindowImplDirectFB *parent_impl = NULL;
+ GdkWindowImplDirectFB *impl = NULL;
+ DFBWindowOptions options;
+ DFBResult ret;
+ GdkDisplayDFB * gdkdisplay = _gdk_display;
+ IDirectFBWindow *dfbwindow;
+
+ window = gdk_window_lookup (anid);
+
+ if (window) {
+ g_object_ref (window);
+ return window;
+ }
+ if (display != NULL)
+ gdkdisplay = GDK_DISPLAY_DFB (display);
- ret = gdkdisplay->layer->GetWindow (gdkdisplay->layer,
- (DFBWindowID)anid,&dfbwindow);
+ ret = gdkdisplay->layer->GetWindow (gdkdisplay->layer,
+ (DFBWindowID)anid,
+ &dfbwindow);
- if (ret != DFB_OK) {
- DirectFBError ("gdk_window_new: Layer->GetWindow failed", ret);
- return NULL;
- }
+ if (ret != DFB_OK) {
+ DirectFBError ("gdk_window_new: Layer->GetWindow failed", ret);
+ return NULL;
+ }
- parent = _gdk_parent_root;
+ parent = _gdk_parent_root;
- if(parent) {
- parent_private = GDK_WINDOW_OBJECT (parent);
- parent_impl = GDK_WINDOW_IMPL_DIRECTFB (parent_private->impl);
- }
+ if (parent) {
+ parent_private = GDK_WINDOW_OBJECT (parent);
+ parent_impl = GDK_WINDOW_IMPL_DIRECTFB (parent_private->impl);
+ }
- window = g_object_new (GDK_TYPE_WINDOW, NULL);
- /* we hold a reference count on ourselves */
- g_object_ref (window);
- private = GDK_WINDOW_OBJECT (window);
- private->impl = g_object_new (_gdk_window_impl_get_type (), NULL);
- private->parent = parent_private;
- private->window_type = GDK_WINDOW_TOPLEVEL;
- private->viewable = TRUE;
- impl = GDK_WINDOW_IMPL_DIRECTFB (private->impl);
+ window = g_object_new (GDK_TYPE_WINDOW, NULL);
+ /* we hold a reference count on ourselves */
+ g_object_ref (window);
+ private = GDK_WINDOW_OBJECT (window);
+ private->impl = g_object_new (_gdk_window_impl_get_type (), NULL);
+ private->parent = parent_private;
+ private->window_type = GDK_WINDOW_TOPLEVEL;
+ private->viewable = TRUE;
+ impl = GDK_WINDOW_IMPL_DIRECTFB (private->impl);
- impl->drawable.wrapper = GDK_DRAWABLE (window);
- impl->window = dfbwindow;
- dfbwindow->GetOptions(dfbwindow,&options);
- dfbwindow->GetPosition(dfbwindow,&private->x,&private->y);
- dfbwindow->GetSize(dfbwindow,&impl->drawable.width,&impl->drawable.height);
+ impl->drawable.wrapper = GDK_DRAWABLE (window);
+ impl->window = dfbwindow;
+ dfbwindow->GetOptions (dfbwindow, &options);
+ dfbwindow->GetPosition (dfbwindow, &private->x, &private->y);
+ dfbwindow->GetSize (dfbwindow, &impl->drawable.width, &impl->drawable.height);
- private->input_only = FALSE;
+ private->input_only = FALSE;
- if( dfbwindow->GetSurface (dfbwindow, &impl->drawable.surface) == DFB_UNSUPPORTED ){
- private->input_only = TRUE;
- impl->drawable.surface = NULL;
- }
- /*
- * Position ourselevs
- */
- _gdk_directfb_calc_abs (window);
+ if (dfbwindow->GetSurface (dfbwindow,
+ &impl->drawable.surface) == DFB_UNSUPPORTED) {
+ private->input_only = TRUE;
+ impl->drawable.surface = NULL;
+ }
+ /*
+ * Position ourselevs
+ */
+ _gdk_directfb_calc_abs (window);
- /* We default to all events least surprise to the user
- * minus the poll for motion events
- */
- gdk_window_set_events (window, (GDK_ALL_EVENTS_MASK ^ GDK_POINTER_MOTION_HINT_MASK));
+ /* We default to all events least surprise to the user
+ * minus the poll for motion events
+ */
+ gdk_window_set_events (window, (GDK_ALL_EVENTS_MASK ^ GDK_POINTER_MOTION_HINT_MASK));
- if (impl->drawable.surface)
+ if (impl->drawable.surface)
{
impl->drawable.surface->GetPixelFormat (impl->drawable.surface,
&impl->drawable.format);
- private->depth = DFB_BITS_PER_PIXEL(impl->drawable.format);
- if( parent )
+ private->depth = DFB_BITS_PER_PIXEL(impl->drawable.format);
+ if (parent)
gdk_drawable_set_colormap (GDK_DRAWABLE (window), gdk_drawable_get_colormap (parent));
else
- gdk_drawable_set_colormap (GDK_DRAWABLE (window), gdk_colormap_get_system());
+ gdk_drawable_set_colormap (GDK_DRAWABLE (window), gdk_colormap_get_system ());
}
- //can be null for the soft cursor window itself when
- //running a gtk directfb wm
- if( gdk_display_get_default() != NULL ) {
- gdk_window_set_cursor (window,NULL);
- }
+ //can be null for the soft cursor window itself when
+ //running a gtk directfb wm
+ if (gdk_display_get_default () != NULL) {
+ gdk_window_set_cursor (window, NULL);
+ }
- if (parent_private)
- parent_private->children = g_list_prepend (parent_private->children,
+ if (parent_private)
+ parent_private->children = g_list_prepend (parent_private->children,
window);
- impl->dfb_id = (DFBWindowID)anid;
- gdk_directfb_window_id_table_insert (impl->dfb_id, window);
- gdk_directfb_event_windows_add (window);
+ impl->dfb_id = (DFBWindowID)anid;
+ gdk_directfb_window_id_table_insert (impl->dfb_id, window);
+ gdk_directfb_event_windows_add (window);
- return window;
+ return window;
}
GdkWindow *
@@ -2756,23 +2774,31 @@ gdk_window_lookup (GdkNativeWindow anid)
return gdk_directfb_window_id_table_lookup ((DFBWindowID) anid);
}
-IDirectFBWindow *gdk_directfb_window_lookup(GdkWindow *window )
+IDirectFBWindow *
+gdk_directfb_window_lookup (GdkWindow *window)
{
GdkWindowObject *private;
GdkWindowImplDirectFB *impl;
- g_return_val_if_fail (GDK_IS_WINDOW (window),NULL);
+
+ g_return_val_if_fail (GDK_IS_WINDOW (window), NULL);
+
private = GDK_WINDOW_OBJECT (window);
- impl = GDK_WINDOW_IMPL_DIRECTFB (private->impl);
+ impl = GDK_WINDOW_IMPL_DIRECTFB (private->impl);
+
return impl->window;
}
-IDirectFBSurface *gdk_directfb_surface_lookup(GdkWindow *window)
+IDirectFBSurface *
+gdk_directfb_surface_lookup (GdkWindow *window)
{
GdkWindowObject *private;
GdkWindowImplDirectFB *impl;
+
g_return_val_if_fail (GDK_IS_WINDOW (window),NULL);
+
private = GDK_WINDOW_OBJECT (window);
- impl = GDK_WINDOW_IMPL_DIRECTFB (private->impl);
+ impl = GDK_WINDOW_IMPL_DIRECTFB (private->impl);
+
return impl->drawable.surface;
}
@@ -2796,8 +2822,8 @@ gdk_window_set_keep_above (GdkWindow *window, gboolean setting)
g_return_if_fail (GDK_IS_WINDOW (window));
static gboolean first_call = TRUE;
if (first_call) {
- g_warning ("gdk_window_set_keep_above() not implemented.\n");
- first_call=FALSE;
+ g_warning ("gdk_window_set_keep_above() not implemented.\n");
+ first_call=FALSE;
}
}
@@ -2808,8 +2834,8 @@ gdk_window_set_keep_below (GdkWindow *window, gboolean setting)
g_return_if_fail (GDK_IS_WINDOW (window));
static gboolean first_call = TRUE;
if (first_call) {
- g_warning ("gdk_window_set_keep_below() not implemented.\n");
- first_call=FALSE;
+ g_warning ("gdk_window_set_keep_below() not implemented.\n");
+ first_call=FALSE;
}
}
@@ -2858,22 +2884,23 @@ gdk_window_impl_directfb_begin_paint_region (GdkPaintable *paintable,
g_assert (region != NULL );
wimpl = GDK_WINDOW_IMPL_DIRECTFB (paintable);
- impl = (GdkDrawableImplDirectFB *)wimpl;
+ impl = (GdkDrawableImplDirectFB *) wimpl;
if (!region)
return;
- D_DEBUG_AT( GDKDFB_Window, "%s( %p ) <- %4d,%4d-%4d,%4d (%ld boxes)\n", G_STRFUNC,
- paintable, GDKDFB_RECTANGLE_VALS_FROM_BOX(®ion->extents), region->numRects );
+ D_DEBUG_AT (GDKDFB_Window, "%s( %p ) <- %4d,%4d-%4d,%4d (%ld boxes)\n", G_STRFUNC,
+ paintable, GDKDFB_RECTANGLE_VALS_FROM_BOX (®ion->extents), region->numRects);
/* When it's buffered... */
if (impl->buffered)
{
/* ...we're already painting on it! */
- g_assert( impl->paint_depth > 0 );
+ g_assert (impl->paint_depth > 0);
- D_DEBUG_AT( GDKDFB_Window, " -> painted %4d,%4d-%4dx%4d (%ld boxes)\n",
- DFB_RECTANGLE_VALS_FROM_REGION( &impl->paint_region.extents ), impl->paint_region.numRects );
+ D_DEBUG_AT (GDKDFB_Window, " -> painted %4d,%4d-%4dx%4d (%ld boxes)\n",
+ DFB_RECTANGLE_VALS_FROM_REGION (&impl->paint_region.extents),
+ impl->paint_region.numRects);
/* Add the new region to the paint region... */
gdk_region_union (&impl->paint_region, region);
@@ -2881,37 +2908,40 @@ gdk_window_impl_directfb_begin_paint_region (GdkPaintable *paintable,
else
{
/* ...otherwise it's the first time! */
- g_assert( impl->paint_depth == 0 );
+ g_assert (impl->paint_depth == 0);
/* Generate the clip region for painting around child windows. */
- gdk_directfb_clip_region( GDK_DRAWABLE(paintable), NULL, NULL, &impl->clip_region );
+ gdk_directfb_clip_region (GDK_DRAWABLE (paintable), NULL, NULL, &impl->clip_region);
/* Initialize the paint region with the new one... */
- temp_region_init_copy( &impl->paint_region, region );
+ temp_region_init_copy (&impl->paint_region, region);
impl->buffered = TRUE;
}
- D_DEBUG_AT( GDKDFB_Window, " -> painting %4d,%4d-%4dx%4d (%ld boxes)\n",
- DFB_RECTANGLE_VALS_FROM_REGION( &impl->paint_region.extents ), impl->paint_region.numRects );
+ D_DEBUG_AT (GDKDFB_Window, " -> painting %4d,%4d-%4dx%4d (%ld boxes)\n",
+ DFB_RECTANGLE_VALS_FROM_REGION (&impl->paint_region.extents),
+ impl->paint_region.numRects);
/* ...but clip the initial/compound result against the clip region. */
gdk_region_intersect (&impl->paint_region, &impl->clip_region);
- D_DEBUG_AT( GDKDFB_Window, " -> clipped %4d,%4d-%4dx%4d (%ld boxes)\n",
- DFB_RECTANGLE_VALS_FROM_REGION( &impl->paint_region.extents ), impl->paint_region.numRects );
+ D_DEBUG_AT (GDKDFB_Window, " -> clipped %4d,%4d-%4dx%4d (%ld boxes)\n",
+ DFB_RECTANGLE_VALS_FROM_REGION (&impl->paint_region.extents),
+ impl->paint_region.numRects);
impl->paint_depth++;
- D_DEBUG_AT( GDKDFB_Window, " -> depth is now %d\n", impl->paint_depth );
+ D_DEBUG_AT (GDKDFB_Window, " -> depth is now %d\n", impl->paint_depth);
for (i = 0; i < region->numRects; i++)
{
GdkRegionBox *box = ®ion->rects[i];
- D_DEBUG_AT( GDKDFB_Window, " -> [%2d] %4d,%4d-%4dx%4d\n", i, GDKDFB_RECTANGLE_VALS_FROM_BOX( box ) );
+ D_DEBUG_AT (GDKDFB_Window, " -> [%2d] %4d,%4d-%4dx%4d\n",
+ i, GDKDFB_RECTANGLE_VALS_FROM_BOX (box));
- gdk_window_clear_area (GDK_WINDOW(wimpl->gdkWindow),
+ gdk_window_clear_area (GDK_WINDOW (wimpl->gdkWindow),
box->x1,
box->y1,
box->x2 - box->x1,
@@ -2926,11 +2956,11 @@ gdk_window_impl_directfb_end_paint (GdkPaintable *paintable)
impl = GDK_DRAWABLE_IMPL_DIRECTFB (paintable);
- D_DEBUG_AT( GDKDFB_Window, "%s( %p )\n", G_STRFUNC, paintable );
+ D_DEBUG_AT (GDKDFB_Window, "%s( %p )\n", G_STRFUNC, paintable);
g_return_if_fail (impl->paint_depth > 0);
- g_assert( impl->buffered );
+ g_assert (impl->buffered);
impl->paint_depth--;
@@ -2943,15 +2973,16 @@ gdk_window_impl_directfb_end_paint (GdkPaintable *paintable)
{
DFBRegion reg = { impl->paint_region.extents.x1,
impl->paint_region.extents.y1,
- impl->paint_region.extents.x2-1,
- impl->paint_region.extents.y2-1 };
+ impl->paint_region.extents.x2 - 1,
+ impl->paint_region.extents.y2 - 1 };
- D_DEBUG_AT( GDKDFB_Window, " -> flip %4d,%4d-%4dx%4d (%ld boxes)\n",
- DFB_RECTANGLE_VALS_FROM_REGION( ® ), impl->paint_region.numRects );
+ D_DEBUG_AT (GDKDFB_Window, " -> flip %4d,%4d-%4dx%4d (%ld boxes)\n",
+ DFB_RECTANGLE_VALS_FROM_REGION (®),
+ impl->paint_region.numRects);
- impl->surface->Flip( impl->surface, ®, 0 );
+ impl->surface->Flip (impl->surface, ®, 0);
- temp_region_reset( &impl->paint_region );
+ temp_region_reset (&impl->paint_region);
}
}
#else
@@ -2959,15 +2990,15 @@ gdk_window_impl_directfb_end_paint (GdkPaintable *paintable)
{
impl->buffered = FALSE;
- temp_region_deinit( &impl->clip_region );
+ temp_region_deinit (&impl->clip_region);
if (impl->paint_region.numRects)
{
- GdkWindow *window = GDK_WINDOW( impl->wrapper );
+ GdkWindow *window = GDK_WINDOW (impl->wrapper);
- if (GDK_IS_WINDOW(window))
+ if (GDK_IS_WINDOW (window))
{
- GdkWindowObject *top = GDK_WINDOW_OBJECT( gdk_window_get_toplevel( window ) );
+ GdkWindowObject *top = GDK_WINDOW_OBJECT (gdk_window_get_toplevel (window));
if (top)
{
@@ -2979,19 +3010,20 @@ gdk_window_impl_directfb_end_paint (GdkPaintable *paintable)
reg.x2 = impl->abs_x - top->x + impl->paint_region.extents.x2 - 1;
reg.y2 = impl->abs_y - top->y + impl->paint_region.extents.y2 - 1;
- D_DEBUG_AT( GDKDFB_Window, " -> queue flip %4d,%4d-%4dx%4d (%ld boxes)\n",
- DFB_RECTANGLE_VALS_FROM_REGION( ® ), impl->paint_region.numRects );
+ D_DEBUG_AT (GDKDFB_Window, " -> queue flip %4d,%4d-%4dx%4d (%ld boxes)\n",
+ DFB_RECTANGLE_VALS_FROM_REGION (®),
+ impl->paint_region.numRects);
- dfb_updates_add( &wimpl->flips, ® );
+ dfb_updates_add (&wimpl->flips, ®);
}
}
- temp_region_reset( &impl->paint_region );
+ temp_region_reset (&impl->paint_region);
}
}
#endif
else
- D_DEBUG_AT( GDKDFB_Window, " -> depth is still %d\n", impl->paint_depth );
+ D_DEBUG_AT (GDKDFB_Window, " -> depth is still %d\n", impl->paint_depth);
}
GdkRegion *
@@ -3039,7 +3071,7 @@ static void
gdk_window_impl_directfb_paintable_init (GdkPaintableIface *iface)
{
iface->begin_paint_region = gdk_window_impl_directfb_begin_paint_region;
- iface->end_paint = gdk_window_impl_directfb_end_paint;
+ iface->end_paint = gdk_window_impl_directfb_end_paint;
}
void
@@ -3067,7 +3099,7 @@ gdk_window_set_opacity (GdkWindow *window,
else if (opacity > 1)
opacity = 1;
cardinal = opacity * 0xff;
- gdk_directfb_window_set_opacity(window,cardinal);
+ gdk_directfb_window_set_opacity (window, cardinal);
}
void
@@ -3097,28 +3129,28 @@ gdk_directfb_window_queue_antiexpose (GdkWindow *window,
static void
gdk_window_impl_iface_init (GdkWindowImplIface *iface)
{
- iface->show = gdk_directfb_window_show;
- iface->hide = gdk_directfb_window_hide;
- iface->withdraw = gdk_directfb_window_withdraw;
- iface->set_events = gdk_directfb_window_set_events;
- iface->get_events = gdk_directfb_window_get_events;
- iface->raise = gdk_window_directfb_raise;
- iface->lower = gdk_window_directfb_lower;
- iface->move_resize = gdk_directfb_window_move_resize;
- iface->set_background = gdk_directfb_window_set_background;
- iface->set_back_pixmap = gdk_directfb_window_set_back_pixmap;
- iface->reparent = gdk_directfb_window_reparent;
- iface->set_cursor = gdk_directfb_window_set_cursor;
- iface->get_geometry = gdk_directfb_window_get_geometry;
- iface->get_root_coords = gdk_directfb_window_get_root_coords;
- iface->get_pointer = gdk_directfb_window_get_pointer;
- iface->get_deskrelative_origin = gdk_directfb_window_get_deskrelative_origin;
- iface->shape_combine_region = gdk_directfb_window_shape_combine_region;
+ iface->show = gdk_directfb_window_show;
+ iface->hide = gdk_directfb_window_hide;
+ iface->withdraw = gdk_directfb_window_withdraw;
+ iface->set_events = gdk_directfb_window_set_events;
+ iface->get_events = gdk_directfb_window_get_events;
+ iface->raise = gdk_window_directfb_raise;
+ iface->lower = gdk_window_directfb_lower;
+ iface->move_resize = gdk_directfb_window_move_resize;
+ iface->set_background = gdk_directfb_window_set_background;
+ iface->set_back_pixmap = gdk_directfb_window_set_back_pixmap;
+ iface->reparent = gdk_directfb_window_reparent;
+ iface->set_cursor = gdk_directfb_window_set_cursor;
+ iface->get_geometry = gdk_directfb_window_get_geometry;
+ iface->get_root_coords = gdk_directfb_window_get_root_coords;
+ iface->get_pointer = gdk_directfb_window_get_pointer;
+ iface->get_deskrelative_origin = gdk_directfb_window_get_deskrelative_origin;
+ iface->shape_combine_region = gdk_directfb_window_shape_combine_region;
iface->input_shape_combine_region = gdk_directfb_window_input_shape_combine_region;
- iface->set_static_gravities = gdk_directfb_window_set_static_gravities;
- iface->queue_antiexpose = gdk_directfb_window_queue_antiexpose;
- iface->queue_translation = gdk_directfb_window_queue_translation;
- iface->destroy = gdk_directfb_window_destroy;
+ iface->set_static_gravities = gdk_directfb_window_set_static_gravities;
+ iface->queue_antiexpose = gdk_directfb_window_queue_antiexpose;
+ iface->queue_translation = gdk_directfb_window_queue_translation;
+ iface->destroy = gdk_directfb_window_destroy;
}
#define __GDK_WINDOW_X11_C__
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
