[gtkmm] gdk: Regenerate docs.xml and .defs files
- From: Kjell Ahlstedt <kjellahl src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtkmm] gdk: Regenerate docs.xml and .defs files
- Date: Thu, 16 Jun 2016 16:30:35 +0000 (UTC)
commit c6d831ac3a3b6e640a1aa7f4827b8c01e0a7cb59
Author: Kjell Ahlstedt <kjell ahlstedt bredband net>
Date: Thu Jun 16 18:23:46 2016 +0200
gdk: Regenerate docs.xml and .defs files
* gdk/src/gdk_docs.xml:
* gdk/src/gdk_enums.defs:
* gdk/src/gdk_methods.defs:
* gdk/src/gdk_signals.defs: Regenerated.
* gdk/src/gdk_extra_objects.defs: Add GdkDrawingContext.
* tools/extra_defs_gen/generate_defs_gdk.cc: Add GDK_TYPE_DRAWING_CONTEXT.
gdk/src/gdk_docs.xml | 212 +++++++++++++++++++++++-
gdk/src/gdk_enums.defs | 166 +------------------
gdk/src/gdk_extra_objects.defs | 6 +
gdk/src/gdk_methods.defs | 267 +++++++++--------------------
gdk/src/gdk_signals.defs | 20 +++
tools/extra_defs_gen/generate_defs_gdk.cc | 1 +
6 files changed, 325 insertions(+), 347 deletions(-)
---
diff --git a/gdk/src/gdk_docs.xml b/gdk/src/gdk_docs.xml
index 7cd77f7..ecc4bed 100644
--- a/gdk/src/gdk_docs.xml
+++ b/gdk/src/gdk_docs.xml
@@ -1160,6 +1160,24 @@ unclaimed root window drops.
</parameters>
</enum>
+<property name="GdkDrawingContext:clip">
+<description>
+The clip region applied to the drawing context.
+
+Since: 3.22
+
+</description>
+</property>
+
+<property name="GdkDrawingContext:window">
+<description>
+The #GdkWindow that created the drawing context.
+
+Since: 3.22
+
+</description>
+</property>
+
<enum name="GdkEventMask">
<description>
A set of bit-flags to indicate which events a window is to receive.
@@ -1821,7 +1839,7 @@ viewable.
</parameter_description>
</parameter>
<parameter name="GDK_GRAB_FAILED">
-<parameter_description> the grab failed for some other reason.
+<parameter_description> the grab failed for some other reason. Since 3.16
</parameter_description>
</parameter>
</parameters>
@@ -1944,6 +1962,11 @@ as a touchscreen or tablet. This device type has been added in 3.4.
as a touchpad. This device type has been added in 3.4.
</parameter_description>
</parameter>
+<parameter name="GDK_SOURCE_TRACKPOINT">
+<parameter_description> the device is a trackpoint. This device type has been
+added in 3.22
+</parameter_description>
+</parameter>
</parameters>
</enum>
@@ -3943,8 +3966,19 @@ Creates a Cairo context for drawing to @window.
Note that calling cairo_reset_clip() on the resulting #cairo_t will
produce undefined results, so avoid it at all costs.
+Typically, this function is used to draw on a #GdkWindow out of the paint
+cycle of the toolkit; this should be avoided, as it breaks various assumptions
+and optimizations.
+
+If you are drawing on a native #GdkWindow in response to a %GDK_EXPOSE event
+you should use gdk_window_begin_draw_frame() and gdk_drawing_context_get_cairo_context()
+instead. GTK will automatically do this for you when drawing a widget.
+
Since: 2.8
+Deprecated: 3.22: Use gdk_window_begin_draw_frame() and
+gdk_drawing_context_get_cairo_context() instead
+
</description>
<parameters>
<parameter name="window">
@@ -4044,6 +4078,25 @@ clipped and all drawing can be skipped
</return>
</function>
+<function name="gdk_cairo_get_drawing_context">
+<description>
+Retrieves the #GdkDrawingContext that created the Cairo
+context @cr.
+
+Since: 3.22
+
+</description>
+<parameters>
+<parameter name="cr">
+<parameter_description> a Cairo context
+</parameter_description>
+</parameter>
+</parameters>
+<return> a #GdkDrawingContext, if any is set
+
+</return>
+</function>
+
<function name="gdk_cairo_rectangle">
<description>
Adds the given rectangle to the current path of @cr.
@@ -7504,6 +7557,85 @@ or 0 to indicate that a drop will not be accepted
<return></return>
</function>
+<function name="gdk_drawing_context_get_cairo_context">
+<description>
+Retrieves a Cairo context to be used to draw on the #GdkWindow
+that created the #GdkDrawingContext.
+
+The returned context is guaranteed to be valid as long as the
+#GdkDrawingContext is valid, that is between a call to
+gdk_window_begin_draw_frame() and gdk_window_end_draw_frame().
+
+Since: 3.22
+
+</description>
+<parameters>
+<parameter name="context">
+<parameter_description>
+</parameter_description>
+</parameter>
+</parameters>
+<return> a Cairo context to be used to draw
+the contents of the #GdkWindow. The context is owned by the
+#GdkDrawingContext and should not be destroyed
+
+</return>
+</function>
+
+<function name="gdk_drawing_context_get_clip">
+<description>
+Retrieves a copy of the clip region used when creating the @context.
+
+Since: 3.22
+
+</description>
+<parameters>
+<parameter name="context">
+<parameter_description> a #GdkDrawingContext
+</parameter_description>
+</parameter>
+</parameters>
+<return> a Cairo region
+
+</return>
+</function>
+
+<function name="gdk_drawing_context_get_window">
+<description>
+Retrieves the window that created the drawing @context.
+
+Since: 3.22
+
+</description>
+<parameters>
+<parameter name="context">
+<parameter_description> a #GdkDrawingContext
+</parameter_description>
+</parameter>
+</parameters>
+<return> a #GdkWindow
+
+</return>
+</function>
+
+<function name="gdk_drawing_context_is_valid">
+<description>
+Checks whether the given #GdkDrawingContext is valid.
+
+Since: 3.22
+
+</description>
+<parameters>
+<parameter name="context">
+<parameter_description> a #GdkDrawingContext
+</parameter_description>
+</parameter>
+</parameters>
+<return> %TRUE if the context is valid
+
+</return>
+</function>
+
<function name="gdk_drop_finish">
<description>
Ends the drag operation after a drop.
@@ -17149,6 +17281,56 @@ Since: 2.12
<return></return>
</function>
+<function name="gdk_window_begin_draw_frame">
+<description>
+Indicates that you are beginning the process of redrawing @region
+on @window, and provides you with a #GdkDrawingContext.
+
+If @window is a top level #GdkWindow, backed by a native window
+implementation, a backing store (offscreen buffer) large enough to
+contain @region will be created. The backing store will be initialized
+with the background color or background surface for @window. Then, all
+drawing operations performed on @window will be diverted to the
+backing store. When you call gdk_window_end_frame(), the contents of
+the backing store will be copied to @window, making it visible
+on screen. Only the part of @window contained in @region will be
+modified; that is, drawing operations are clipped to @region.
+
+The net result of all this is to remove flicker, because the user
+sees the finished product appear all at once when you call
+gdk_window_end_draw_frame(). If you draw to @window directly without
+calling gdk_window_begin_draw_frame(), the user may see flicker
+as individual drawing operations are performed in sequence.
+
+When using GTK+, the widget system automatically places calls to
+gdk_window_begin_draw_frame() and gdk_window_end_draw_frame() around
+emissions of the `GtkWidget::draw` signal. That is, if you’re
+drawing the contents of the widget yourself, you can assume that the
+widget has a cleared background, is already set as the clip region,
+and already has a backing store. Therefore in most cases, application
+code in GTK does not need to call gdk_window_begin_draw_frame()
+explicitly.
+
+Since: 3.22
+
+</description>
+<parameters>
+<parameter name="window">
+<parameter_description> a #GdkWindow
+</parameter_description>
+</parameter>
+<parameter name="region">
+<parameter_description> a Cairo region
+</parameter_description>
+</parameter>
+</parameters>
+<return> a #GdkDrawingContext context that should be
+used to draw the contents of the window; the returned context is owned
+by GDK.
+
+</return>
+</function>
+
<function name="gdk_window_begin_move_drag">
<description>
Begins a window move operation (for a toplevel window).
@@ -17229,6 +17411,7 @@ A convenience wrapper around gdk_window_begin_paint_region() which
creates a rectangular region for you. See
gdk_window_begin_paint_region() for details.
+Deprecated: 3.22: Use gdk_window_begin_draw_frame() instead
</description>
<parameters>
@@ -17285,6 +17468,7 @@ the topmost backing store in the stack. One matching call to
gdk_window_end_paint() is required for each call to
gdk_window_begin_paint_region().
+Deprecated: 3.22: Use gdk_window_begin_draw_frame() instead
</description>
<parameters>
@@ -17706,6 +17890,32 @@ Deprecated: 3.8: this function is no longer needed
<return></return>
</function>
+<function name="gdk_window_end_draw_frame">
+<description>
+Indicates that the drawing of the contents of @window started with
+gdk_window_begin_frame() has been completed.
+
+This function will take care of destroying the #GdkDrawingContext.
+
+It is an error to call this function without a matching
+gdk_window_begin_frame() first.
+
+Since: 3.22
+
+</description>
+<parameters>
+<parameter name="window">
+<parameter_description> a #GdkWindow
+</parameter_description>
+</parameter>
+<parameter name="context">
+<parameter_description> the #GdkDrawingContext created by gdk_window_begin_draw_frame()
+</parameter_description>
+</parameter>
+</parameters>
+<return></return>
+</function>
+
<function name="gdk_window_end_paint">
<description>
Indicates that the backing store created by the most recent call
diff --git a/gdk/src/gdk_enums.defs b/gdk/src/gdk_enums.defs
index d716b04..e02e6ec 100644
--- a/gdk/src/gdk_enums.defs
+++ b/gdk/src/gdk_enums.defs
@@ -183,7 +183,8 @@
;; GDK_SOURCE_CURSOR,
;; GDK_SOURCE_KEYBOARD,
;; GDK_SOURCE_TOUCHSCREEN,
-;; GDK_SOURCE_TOUCHPAD
+;; GDK_SOURCE_TOUCHPAD,
+;; GDK_SOURCE_TRACKPOINT
;; } GdkInputSource;
(define-enum-extended InputSource
@@ -197,6 +198,7 @@
'("keyboard" "GDK_SOURCE_KEYBOARD" "4")
'("touchscreen" "GDK_SOURCE_TOUCHSCREEN" "5")
'("touchpad" "GDK_SOURCE_TOUCHPAD" "6")
+ '("trackpoint" "GDK_SOURCE_TRACKPOINT" "7")
)
)
@@ -685,168 +687,6 @@
)
)
-;; From gdkinternals.h
-
-;; Original typedef:
-;; typedef enum {
-;; GDK_COLOR_WRITEABLE = 1 << 0
-;; } GdkColorInfoFlags;
-
-(define-flags-extended ColorInfoFlags
- (in-module "Gdk")
- (c-name "GdkColorInfoFlags")
- (values
- '("writeable" "GDK_COLOR_WRITEABLE" "1 << 0")
- )
-)
-
-;; Original typedef:
-;; typedef enum {
-;; GDK_EVENT_FILTER_REMOVED = 1 << 0
-;; } GdkEventFilterFlags;
-
-(define-flags-extended EventFilterFlags
- (in-module "Gdk")
- (c-name "GdkEventFilterFlags")
- (values
- '("removed" "GDK_EVENT_FILTER_REMOVED" "1 << 0")
- )
-)
-
-;; Original typedef:
-;; typedef enum {
-;; GDK_DEBUG_MISC = 1 << 0,
-;; GDK_DEBUG_EVENTS = 1 << 1,
-;; GDK_DEBUG_DND = 1 << 2,
-;; GDK_DEBUG_XIM = 1 << 3,
-;; GDK_DEBUG_NOGRABS = 1 << 4,
-;; GDK_DEBUG_INPUT = 1 << 5,
-;; GDK_DEBUG_CURSOR = 1 << 6,
-;; GDK_DEBUG_MULTIHEAD = 1 << 7,
-;; GDK_DEBUG_XINERAMA = 1 << 8,
-;; GDK_DEBUG_DRAW = 1 << 9,
-;; GDK_DEBUG_EVENTLOOP = 1 << 10,
-;; GDK_DEBUG_FRAMES = 1 << 11,
-;; GDK_DEBUG_SETTINGS = 1 << 12,
-;; GDK_DEBUG_OPENGL = 1 << 13,
-;; } GdkDebugFlag;
-
-(define-flags-extended DebugFlag
- (in-module "Gdk")
- (c-name "GdkDebugFlag")
- (values
- '("misc" "GDK_DEBUG_MISC" "1 << 0")
- '("events" "GDK_DEBUG_EVENTS" "1 << 1")
- '("dnd" "GDK_DEBUG_DND" "1 << 2")
- '("xim" "GDK_DEBUG_XIM" "1 << 3")
- '("nograbs" "GDK_DEBUG_NOGRABS" "1 << 4")
- '("input" "GDK_DEBUG_INPUT" "1 << 5")
- '("cursor" "GDK_DEBUG_CURSOR" "1 << 6")
- '("multihead" "GDK_DEBUG_MULTIHEAD" "1 << 7")
- '("xinerama" "GDK_DEBUG_XINERAMA" "1 << 8")
- '("draw" "GDK_DEBUG_DRAW" "1 << 9")
- '("eventloop" "GDK_DEBUG_EVENTLOOP" "1 << 10")
- '("frames" "GDK_DEBUG_FRAMES" "1 << 11")
- '("settings" "GDK_DEBUG_SETTINGS" "1 << 12")
- '("opengl" "GDK_DEBUG_OPENGL" "1 << 13")
- )
-)
-
-;; Original typedef:
-;; typedef enum {
-;; GDK_RENDERING_MODE_SIMILAR = 0,
-;; GDK_RENDERING_MODE_IMAGE,
-;; GDK_RENDERING_MODE_RECORDING
-;; } GdkRenderingMode;
-
-(define-enum-extended RenderingMode
- (in-module "Gdk")
- (c-name "GdkRenderingMode")
- (values
- '("similar" "GDK_RENDERING_MODE_SIMILAR" "0")
- '("image" "GDK_RENDERING_MODE_IMAGE" "1")
- '("recording" "GDK_RENDERING_MODE_RECORDING" "2")
- )
-)
-
-;; Original typedef:
-;; typedef enum {
-;; GDK_GL_DISABLE = 1 << 0,
-;; GDK_GL_ALWAYS = 1 << 1,
-;; GDK_GL_SOFTWARE_DRAW_GL = 1 << 2,
-;; GDK_GL_SOFTWARE_DRAW_SURFACE = 1 << 3,
-;; GDK_GL_TEXTURE_RECTANGLE = 1 << 4,
-;; GDK_GL_LEGACY = 1 << 5,
-;; GDK_GL_GLES = 1 << 6
-;; } GdkGLFlags;
-
-(define-flags-extended GLFlags
- (in-module "Gdk")
- (c-name "GdkGLFlags")
- (values
- '("disable" "GDK_GL_DISABLE" "1 << 0")
- '("always" "GDK_GL_ALWAYS" "1 << 1")
- '("software-draw-gl" "GDK_GL_SOFTWARE_DRAW_GL" "1 << 2")
- '("software-draw-surface" "GDK_GL_SOFTWARE_DRAW_SURFACE" "1 << 3")
- '("texture-rectangle" "GDK_GL_TEXTURE_RECTANGLE" "1 << 4")
- '("legacy" "GDK_GL_LEGACY" "1 << 5")
- '("gles" "GDK_GL_GLES" "1 << 6")
- )
-)
-
-;; Original typedef:
-;; typedef enum
-;; {
-;; GDK_ARG_STRING,
-;; GDK_ARG_INT,
-;; GDK_ARG_BOOL,
-;; GDK_ARG_NOBOOL,
-;; GDK_ARG_CALLBACK
-;; } GdkArgType;
-
-(define-enum-extended ArgType
- (in-module "Gdk")
- (c-name "GdkArgType")
- (values
- '("string" "GDK_ARG_STRING" "0")
- '("int" "GDK_ARG_INT" "1")
- '("bool" "GDK_ARG_BOOL" "2")
- '("nobool" "GDK_ARG_NOBOOL" "3")
- '("callback" "GDK_ARG_CALLBACK" "4")
- )
-)
-
-;; Original typedef:
-;; typedef enum
-;; {
-;; /* Following flag is set for events on the event queue during
-;; * translation and cleared afterwards.
-;; */
-;; GDK_EVENT_PENDING = 1 << 0,
-;;
-;; /* The following flag is set for:
-;; * 1) touch events emulating pointer events
-;; * 2) pointer events being emulated by a touch sequence.
-;; */
-;; GDK_EVENT_POINTER_EMULATED = 1 << 1,
-;;
-;; /* When we are ready to draw a frame, we pause event delivery,
-;; * mark all events in the queue with this flag, and deliver
-;; * only those events until we finish the frame.
-;; */
-;; GDK_EVENT_FLUSHED = 1 << 2
-;; } GdkEventFlags;
-
-(define-flags-extended EventFlags
- (in-module "Gdk")
- (c-name "GdkEventFlags")
- (values
- '("pending" "GDK_EVENT_PENDING" "1 << 0")
- '("pointer-emulated" "GDK_EVENT_POINTER_EMULATED" "1 << 1")
- '("flushed" "GDK_EVENT_FLUSHED" "1 << 2")
- )
-)
-
;; From gdkmonitor.h
;; Original typedef:
diff --git a/gdk/src/gdk_extra_objects.defs b/gdk/src/gdk_extra_objects.defs
index b4efd17..91a38cc 100644
--- a/gdk/src/gdk_extra_objects.defs
+++ b/gdk/src/gdk_extra_objects.defs
@@ -50,6 +50,12 @@
(gtype-id "GDK_TYPE_DRAG_CONTEXT")
)
+(define-object DrawingContext
+ (in-module "Gdk")
+ (c-name "GdkDrawingContext")
+ (gtype-id "GDK_TYPE_DRAWING_CONTEXT")
+)
+
(define-object Event
(in-module "Gdk")
(c-name "GdkEvent")
diff --git a/gdk/src/gdk_methods.defs b/gdk/src/gdk_methods.defs
index b3368d1..800f815 100644
--- a/gdk/src/gdk_methods.defs
+++ b/gdk/src/gdk_methods.defs
@@ -28,6 +28,7 @@
'("keyboard" "GDK_SOURCE_KEYBOARD")
'("touchscreen" "GDK_SOURCE_TOUCHSCREEN")
'("touchpad" "GDK_SOURCE_TOUCHPAD")
+ '("trackpoint" "GDK_SOURCE_TRACKPOINT")
)
)
@@ -307,96 +308,6 @@
)
)
-(define-flags ColorInfoFlags
- (in-module "Gdk")
- (c-name "GdkColorInfoFlags")
- (gtype-id "GDK_TYPE_COLOR_INFO_FLAGS")
- (values
- '("writeable" "GDK_COLOR_WRITEABLE")
- )
-)
-
-(define-flags EventFilterFlags
- (in-module "Gdk")
- (c-name "GdkEventFilterFlags")
- (gtype-id "GDK_TYPE_EVENT_FILTER_FLAGS")
- (values
- '("removed" "GDK_EVENT_FILTER_REMOVED")
- )
-)
-
-(define-flags DebugFlag
- (in-module "Gdk")
- (c-name "GdkDebugFlag")
- (gtype-id "GDK_TYPE_DEBUG_FLAG")
- (values
- '("misc" "GDK_DEBUG_MISC")
- '("events" "GDK_DEBUG_EVENTS")
- '("dnd" "GDK_DEBUG_DND")
- '("xim" "GDK_DEBUG_XIM")
- '("nograbs" "GDK_DEBUG_NOGRABS")
- '("input" "GDK_DEBUG_INPUT")
- '("cursor" "GDK_DEBUG_CURSOR")
- '("multihead" "GDK_DEBUG_MULTIHEAD")
- '("xinerama" "GDK_DEBUG_XINERAMA")
- '("draw" "GDK_DEBUG_DRAW")
- '("eventloop" "GDK_DEBUG_EVENTLOOP")
- '("frames" "GDK_DEBUG_FRAMES")
- '("settings" "GDK_DEBUG_SETTINGS")
- '("opengl" "GDK_DEBUG_OPENGL")
- )
-)
-
-(define-enum RenderingMode
- (in-module "Gdk")
- (c-name "GdkRenderingMode")
- (gtype-id "GDK_TYPE_RENDERING_MODE")
- (values
- '("similar" "GDK_RENDERING_MODE_SIMILAR")
- '("image" "GDK_RENDERING_MODE_IMAGE")
- '("recording" "GDK_RENDERING_MODE_RECORDING")
- )
-)
-
-(define-flags GLFlags
- (in-module "Gdk")
- (c-name "GdkGLFlags")
- (gtype-id "GDK_TYPE_GL_FLAGS")
- (values
- '("disable" "GDK_GL_DISABLE")
- '("always" "GDK_GL_ALWAYS")
- '("software-draw-gl" "GDK_GL_SOFTWARE_DRAW_GL")
- '("software-draw-surface" "GDK_GL_SOFTWARE_DRAW_SURFACE")
- '("texture-rectangle" "GDK_GL_TEXTURE_RECTANGLE")
- '("legacy" "GDK_GL_LEGACY")
- '("gles" "GDK_GL_GLES")
- )
-)
-
-(define-enum ArgType
- (in-module "Gdk")
- (c-name "GdkArgType")
- (gtype-id "GDK_TYPE_ARG_TYPE")
- (values
- '("string" "GDK_ARG_STRING")
- '("int" "GDK_ARG_INT")
- '("bool" "GDK_ARG_BOOL")
- '("nobool" "GDK_ARG_NOBOOL")
- '("callback" "GDK_ARG_CALLBACK")
- )
-)
-
-(define-flags EventFlags
- (in-module "Gdk")
- (c-name "GdkEventFlags")
- (gtype-id "GDK_TYPE_EVENT_FLAGS")
- (values
- '("pending" "GDK_EVENT_PENDING")
- '("pointer-emulated" "GDK_EVENT_POINTER_EMULATED")
- '("flushed" "GDK_EVENT_FLUSHED")
- )
-)
-
(define-enum SubpixelLayout
(in-module "Gdk")
(c-name "GdkSubpixelLayout")
@@ -967,6 +878,14 @@
)
)
+(define-function gdk_cairo_get_drawing_context
+ (c-name "gdk_cairo_get_drawing_context")
+ (return-type "GdkDrawingContext*")
+ (parameters
+ '("cairo_t*" "cr")
+ )
+)
+
;; From gdkconfig.h
@@ -2047,6 +1966,39 @@
+;; From gdkdrawingcontext.h
+
+(define-function gdk_drawing_context_get_type
+ (c-name "gdk_drawing_context_get_type")
+ (return-type "GType")
+)
+
+(define-method get_window
+ (of-object "GdkDrawingContext")
+ (c-name "gdk_drawing_context_get_window")
+ (return-type "GdkWindow*")
+)
+
+(define-method get_clip
+ (of-object "GdkDrawingContext")
+ (c-name "gdk_drawing_context_get_clip")
+ (return-type "cairo_region_t*")
+)
+
+(define-method is_valid
+ (of-object "GdkDrawingContext")
+ (c-name "gdk_drawing_context_is_valid")
+ (return-type "gboolean")
+)
+
+(define-method get_cairo_context
+ (of-object "GdkDrawingContext")
+ (c-name "gdk_drawing_context_get_cairo_context")
+ (return-type "cairo_t*")
+)
+
+
+
;; From gdkenumtypes.h
(define-function gdk_cursor_type_get_type
@@ -2888,99 +2840,6 @@
-;; From gdkinternals.h
-
-(define-method set_pointer_emulated
- (of-object "GdkEvent")
- (c-name "gdk_event_set_pointer_emulated")
- (return-type "none")
- (parameters
- '("gboolean" "emulated")
- )
-)
-
-(define-method set_scancode
- (of-object "GdkEvent")
- (c-name "gdk_event_set_scancode")
- (return-type "none")
- (parameters
- '("guint16" "scancode")
- )
-)
-
-(define-method set_seat
- (of-object "GdkEvent")
- (c-name "gdk_event_set_seat")
- (return-type "none")
- (parameters
- '("GdkSeat*" "seat")
- )
-)
-
-(define-function gdk_gl_texture_from_surface
- (c-name "gdk_gl_texture_from_surface")
- (return-type "none")
- (parameters
- '("cairo_surface_t*" "surface")
- '("cairo_region_t*" "region")
- )
-)
-
-(define-function gdk_gl_texture_quads
- (c-name "gdk_gl_texture_quads")
- (return-type "none")
- (parameters
- '("GdkGLContext*" "paint_context")
- '("guint" "texture_target")
- '("int" "n_quads")
- '("GdkTexturedQuad*" "quads")
- '("gboolean" "flip_colors")
- )
-)
-
-(define-function gdk_cairo_surface_mark_as_direct
- (c-name "gdk_cairo_surface_mark_as_direct")
- (return-type "none")
- (parameters
- '("cairo_surface_t*" "surface")
- '("GdkWindow*" "window")
- )
-)
-
-(define-function gdk_cairo_region_from_clip
- (c-name "gdk_cairo_region_from_clip")
- (return-type "cairo_region_t*")
- (parameters
- '("cairo_t*" "cr")
- )
-)
-
-(define-method get_paint_gl_context
- (of-object "GdkWindow")
- (c-name "gdk_window_get_paint_gl_context")
- (return-type "GdkGLContext*")
- (parameters
- '("GError**" "error")
- )
-)
-
-(define-method get_unscaled_size
- (of-object "GdkWindow")
- (c-name "gdk_window_get_unscaled_size")
- (return-type "none")
- (parameters
- '("int*" "unscaled_width")
- '("int*" "unscaled_height")
- )
-)
-
-(define-function gdk_offscreen_window_get_type
- (c-name "gdk_offscreen_window_get_type")
- (return-type "GType")
-)
-
-
-
;; From gdkintl.h
@@ -4159,6 +4018,30 @@
;; From gdkthreads.h
+(define-function gdk_threads_init
+ (c-name "gdk_threads_init")
+ (return-type "none")
+)
+
+(define-function gdk_threads_enter
+ (c-name "gdk_threads_enter")
+ (return-type "none")
+)
+
+(define-function gdk_threads_leave
+ (c-name "gdk_threads_leave")
+ (return-type "none")
+)
+
+(define-function gdk_threads_set_lock_functions
+ (c-name "gdk_threads_set_lock_functions")
+ (return-type "none")
+ (parameters
+ '("GCallback" "enter_fn")
+ '("GCallback" "leave_fn")
+ )
+)
+
(define-function gdk_threads_add_idle_full
(c-name "gdk_threads_add_idle_full")
(return-type "guint")
@@ -4876,6 +4759,24 @@
(return-type "none")
)
+(define-method begin_draw_frame
+ (of-object "GdkWindow")
+ (c-name "gdk_window_begin_draw_frame")
+ (return-type "GdkDrawingContext*")
+ (parameters
+ '("const-cairo_region_t*" "region")
+ )
+)
+
+(define-method end_draw_frame
+ (of-object "GdkWindow")
+ (c-name "gdk_window_end_draw_frame")
+ (return-type "none")
+ (parameters
+ '("GdkDrawingContext*" "context")
+ )
+)
+
(define-method flush
(of-object "GdkWindow")
(c-name "gdk_window_flush")
diff --git a/gdk/src/gdk_signals.defs b/gdk/src/gdk_signals.defs
index 9e106f9..9aa9b12 100644
--- a/gdk/src/gdk_signals.defs
+++ b/gdk/src/gdk_signals.defs
@@ -307,6 +307,26 @@
(construct-only #f)
)
+;; From GdkDrawingContext
+
+(define-property window
+ (of-object "GdkDrawingContext")
+ (prop-type "GParamObject")
+ (docs "The window that created the context")
+ (readable #t)
+ (writable #t)
+ (construct-only #t)
+)
+
+(define-property clip
+ (of-object "GdkDrawingContext")
+ (prop-type "GParamBoxed")
+ (docs "The clip region of the context")
+ (readable #t)
+ (writable #t)
+ (construct-only #t)
+)
+
;; From GdkMonitor
(define-signal invalidate
diff --git a/tools/extra_defs_gen/generate_defs_gdk.cc b/tools/extra_defs_gen/generate_defs_gdk.cc
index ebc7f0f..800fb1a 100644
--- a/tools/extra_defs_gen/generate_defs_gdk.cc
+++ b/tools/extra_defs_gen/generate_defs_gdk.cc
@@ -43,6 +43,7 @@ int main(int argc, char** argv)
#if !defined(G_OS_WIN32)
<< get_defs( GDK_TYPE_DISPLAY_MANAGER )
#endif /* G_OS_WIN32 */
+ << get_defs( GDK_TYPE_DRAWING_CONTEXT )
<< get_defs( GDK_TYPE_MONITOR )
<< get_defs( GDK_TYPE_PIXBUF )
<< get_defs( GDK_TYPE_PIXBUF_ANIMATION )
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]