Replace a lot of idle and timeout calls by the new gdk_threads api.

[~andy/gtk] / gdk / directfb / gdkwindow-directfb.c

diff --git a/gdk/directfb/gdkwindow-directfb.c b/gdk/directfb/gdkwindow-directfb.c
index 07870a9e592eea3881c291310b3435d0f9b4d541..0a683de033157b9e5a684354a5e509ae82905ee6 100644 (file)
--- a/gdk/directfb/gdkwindow-directfb.c
+++ b/gdk/directfb/gdkwindow-directfb.c
@@ -65,7 +65,6 @@ typedef struct
  */
 static GSList *update_windows = NULL;
 static guint update_idle = 0;
-static gboolean debug_updates = FALSE;
 
 static void
 gdk_window_directfb_process_all_updates (void)
@@ -101,9 +100,7 @@ gdk_window_directfb_process_all_updates (void)
 static gboolean
 gdk_window_update_idle (gpointer data)
 {
-  GDK_THREADS_ENTER ();
   gdk_window_directfb_process_all_updates ();
-  GDK_THREADS_LEAVE ();
   
   return FALSE;
 }
@@ -116,7 +113,7 @@ gdk_window_schedule_update (GdkWindow *window)
 
   if (!update_idle)
     {
-      update_idle = g_idle_add_full (GDK_PRIORITY_REDRAW,
+      update_idle = gdk_threads_add_idle (GDK_PRIORITY_REDRAW,
                                     gdk_window_update_idle, NULL, NULL);
     }
 }
@@ -609,9 +606,6 @@ _gdk_windowing_window_destroy (GdkWindow *window,
   if (window == gdk_directfb_focused_window)
     gdk_directfb_change_focus (NULL);
 
-/*
-printf( " DESTROYING WINDOW %p %p %d parent=%p\n",window,impl->window,recursing,(GDK_WINDOW_OBJECT (window))->parent);
-*/
   if (!recursing && !foreign_destroy && impl->window ) {
        impl->window->SetOpacity (impl->window,0);
                impl->window->Close(impl->window);
@@ -2828,8 +2822,6 @@ gdk_window_impl_directfb_invalidate_maybe_recurse (GdkPaintable *paintable,
   
   if (!gdk_region_empty (visible_region))
     {
-      //if (debug_updates)
-       // draw_ugly_color (window, region);
       
       if (private->update_area)
        {
@@ -2842,7 +2834,6 @@ gdk_window_impl_directfb_invalidate_maybe_recurse (GdkPaintable *paintable,
          gdk_window_schedule_update (window);
        }
     }
-  
     gdk_region_destroy (visible_region);
 }
 
@@ -2877,14 +2868,6 @@ gdk_window_impl_directfb_process_updates (GdkPaintable *paintable,
          GdkRegion *expose_region;
          GdkRegion *window_region;
           gint width, height;
-
-          //if (debug_updates)
-           // {
-              /* Make sure we see the red invalid area before redrawing. */
-             // gdk_display_sync (gdk_drawable_get_display (window));
-              //g_usleep (70000);
-            //}
-          
          save_region = _gdk_windowing_window_queue_antiexpose (window, update_area);
 
          if (save_region)
@@ -2915,7 +2898,6 @@ gdk_window_impl_directfb_process_updates (GdkPaintable *paintable,
              event.expose.count = 0;
              event.expose.region = expose_region;
              gdk_region_get_clipbox (expose_region, &event.expose.area);
-             
              (*_gdk_event_func) (&event, _gdk_event_data);
              
              g_object_unref (window);
@@ -2939,6 +2921,7 @@ gdk_window_impl_directfb_begin_paint_region (GdkPaintable *paintable,
   gint                     i;
 
 
+  g_assert (region != NULL );
   wimpl = GDK_WINDOW_IMPL_DIRECTFB (paintable);
   impl = (GdkDrawableImplDirectFB *)wimpl;
   impl->buffered = TRUE;
@@ -2984,11 +2967,10 @@ 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 };
-
-          _gdk_directfb_update (impl, &reg);
+                            impl->paint_region->extents.x2 ,
+                            impl->paint_region->extents.y2 };
 
+          impl->surface->Flip(impl->surface, &reg,0);
           gdk_region_destroy (impl->paint_region);
           impl->paint_region = NULL;
         }
@@ -3006,6 +2988,12 @@ gdk_window_impl_directfb_paintable_init (GdkPaintableIface *iface)
   iface->process_updates = gdk_window_impl_directfb_process_updates;
 }
 
+void
+gdk_window_beep (GdkWindow *window)
+{
+  gdk_display_beep (gdk_display_get_default());
+}
+
 #define __GDK_WINDOW_X11_C__
 #include "gdkaliasdef.c"