[cogl/wip/rib/master-next: 10/11] onscreen: make platform specific onscreen apis consistent

[Robert Bragg <rbragg src gnome org>]

commit 1ae9144e474a5f5efa285e2434770bd44abcf149
Author: Robert Bragg <robert linux intel com>
Date:   Fri Jul 1 01:58:38 2011 +0100

    onscreen: make platform specific onscreen apis consistent
    
    There were several CoglOnscreen functions named like:
    cogl_onscreen_<platform>_blah instead of cogl_<platform>_onscreen_blah
    so this patch updates those to be consistent with other platform
    specific apis we have in cogl.

 cogl/cogl-framebuffer.c                            |   10 +++---
 cogl/cogl-framebuffer.h                            |   28 ++++++++++----------
 .../cogl-2.0-experimental/cogl-sections.txt        |   10 +++---
 3 files changed, 24 insertions(+), 24 deletions(-)
---
diff --git a/cogl/cogl-framebuffer.c b/cogl/cogl-framebuffer.c
index f0705dd..1b50f30 100644
--- a/cogl/cogl-framebuffer.c
+++ b/cogl/cogl-framebuffer.c
@@ -1641,7 +1641,7 @@ cogl_framebuffer_swap_region (CoglFramebuffer *framebuffer,
 
 #ifdef COGL_HAS_X11_SUPPORT
 void
-cogl_onscreen_x11_set_foreign_window_xid (CoglOnscreen *onscreen,
+cogl_x11_onscreen_set_foreign_window_xid (CoglOnscreen *onscreen,
                                           guint32 xid,
                                           CoglOnscreenX11MaskCallback update,
                                           void *user_data)
@@ -1656,7 +1656,7 @@ cogl_onscreen_x11_set_foreign_window_xid (CoglOnscreen *onscreen,
 }
 
 guint32
-cogl_onscreen_x11_get_window_xid (CoglOnscreen *onscreen)
+cogl_x11_onscreen_get_window_xid (CoglOnscreen *onscreen)
 {
   CoglFramebuffer *framebuffer = COGL_FRAMEBUFFER (onscreen);
 
@@ -1674,7 +1674,7 @@ cogl_onscreen_x11_get_window_xid (CoglOnscreen *onscreen)
 }
 
 guint32
-cogl_onscreen_x11_get_visual_xid (CoglOnscreen *onscreen)
+cogl_x11_onscreen_get_visual_xid (CoglOnscreen *onscreen)
 {
   CoglFramebuffer *framebuffer = COGL_FRAMEBUFFER (onscreen);
   const CoglWinsysVtable *winsys = _cogl_framebuffer_get_winsys (framebuffer);
@@ -1695,14 +1695,14 @@ cogl_onscreen_x11_get_visual_xid (CoglOnscreen *onscreen)
 #ifdef COGL_HAS_WIN32_SUPPORT
 
 void
-cogl_onscreen_win32_set_foreign_window (CoglOnscreen *onscreen,
+cogl_win32_onscreen_set_foreign_window (CoglOnscreen *onscreen,
                                         HWND hwnd)
 {
   onscreen->foreign_hwnd = hwnd;
 }
 
 HWND
-cogl_onscreen_win32_get_window (CoglOnscreen *onscreen)
+cogl_win32_onscreen_get_window (CoglOnscreen *onscreen)
 {
   if (onscreen->foreign_hwnd)
     return onscreen->foreign_hwnd;
diff --git a/cogl/cogl-framebuffer.h b/cogl/cogl-framebuffer.h
index fcf2914..77df434 100644
--- a/cogl/cogl-framebuffer.h
+++ b/cogl/cogl-framebuffer.h
@@ -225,7 +225,7 @@ typedef void (*CoglOnscreenX11MaskCallback) (CoglOnscreen *onscreen,
                                              void *user_data);
 
 /**
- * cogl_onscreen_x11_set_foreign_window_xid:
+ * cogl_x11_onscreen_set_foreign_window_xid:
  * @onscreen: The unallocated framebuffer to associated with an X
  *            window.
  * @xid: The XID of an existing X window
@@ -263,7 +263,7 @@ typedef void (*CoglOnscreenX11MaskCallback) (CoglOnscreen *onscreen,
  *
  * {
  *   *snip*
- *   cogl_onscreen_x11_set_foreign_window_xid (onscreen,
+ *   cogl_x11_onscreen_set_foreign_window_xid (onscreen,
  *                                             data->xwin,
  *                                             my_update_cogl_x11_event_mask,
  *                                             data);
@@ -274,33 +274,33 @@ typedef void (*CoglOnscreenX11MaskCallback) (CoglOnscreen *onscreen,
  * Since: 2.0
  * Stability: Unstable
  */
-#define cogl_onscreen_x11_set_foreign_window_xid \
-  cogl_onscreen_x11_set_foreign_window_xid_EXP
+#define cogl_x11_onscreen_set_foreign_window_xid \
+  cogl_x11_onscreen_set_foreign_window_xid_EXP
 void
-cogl_onscreen_x11_set_foreign_window_xid (CoglOnscreen *onscreen,
+cogl_x11_onscreen_set_foreign_window_xid (CoglOnscreen *onscreen,
                                           guint32 xid,
                                           CoglOnscreenX11MaskCallback update,
                                           void *user_data);
 
-#define cogl_onscreen_x11_get_window_xid cogl_onscreen_x11_get_window_xid_EXP
+#define cogl_x11_onscreen_get_window_xid cogl_x11_onscreen_get_window_xid_EXP
 guint32
-cogl_onscreen_x11_get_window_xid (CoglOnscreen *onscreen);
+cogl_x11_onscreen_get_window_xid (CoglOnscreen *onscreen);
 
-#define cogl_onscreen_x11_get_visual_xid cogl_onscreen_x11_get_visual_xid_EXP
+#define cogl_x11_onscreen_get_visual_xid cogl_x11_onscreen_get_visual_xid_EXP
 guint32
-cogl_onscreen_x11_get_visual_xid (CoglOnscreen *onscreen);
+cogl_x11_onscreen_get_visual_xid (CoglOnscreen *onscreen);
 #endif /* COGL_HAS_X11 */
 
 #ifdef COGL_HAS_WIN32_SUPPORT
-#define cogl_onscreen_win32_set_foreign_window \
-  cogl_onscreen_win32_set_foreign_window_EXP
+#define cogl_win32_onscreen_set_foreign_window \
+  cogl_win32_onscreen_set_foreign_window_EXP
 void
-cogl_onscreen_win32_set_foreign_window (CoglOnscreen *onscreen,
+cogl_win32_onscreen_set_foreign_window (CoglOnscreen *onscreen,
                                         HWND hwnd);
 
-#define cogl_onscreen_win32_get_window cogl_onscreen_win32_get_window_EXP
+#define cogl_win32_onscreen_get_window cogl_win32_onscreen_get_window_EXP
 HWND
-cogl_onscreen_win32_get_window (CoglOnscreen *onscreen);
+cogl_win32_onscreen_get_window (CoglOnscreen *onscreen);
 #endif /* COGL_HAS_WIN32_SUPPORT */
 
 #if COGL_HAS_EGL_PLATFORM_WAYLAND_SUPPORT
diff --git a/doc/reference/cogl-2.0-experimental/cogl-sections.txt b/doc/reference/cogl-2.0-experimental/cogl-sections.txt
index 814a439..ff55543 100644
--- a/doc/reference/cogl-2.0-experimental/cogl-sections.txt
+++ b/doc/reference/cogl-2.0-experimental/cogl-sections.txt
@@ -339,11 +339,11 @@ cogl_pop_framebuffer
 <TITLE>CoglOnscreen: The Onscreen Framebuffer Interface</TITLE>
 CoglOnscreen
 COGL_ONSCREEN
-cogl_onscreen_x11_set_foreign_window_xid
-cogl_onscreen_x11_get_window_xid
-cogl_onscreen_x11_get_visual_xid
-cogl_onscreen_win32_set_foreign_window
-cogl_onscreen_win32_get_window
+cogl_x11_onscreen_set_foreign_window_xid
+cogl_x11_onscreen_get_window_xid
+cogl_x11_onscreen_get_visual_xid
+cogl_win32_onscreen_set_foreign_window
+cogl_win32_onscreen_get_window
 cogl_onscreen_set_swap_throttled
 cogl_onscreen_show
 cogl_onscreen_hide