X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=include%2Ftdm_types.h;h=a20049f5ec4ecfecd983f9ce54291e15032e7310;hb=306c587fec093501cd537c72eb22096aa5ea37a5;hp=fd446cdf696bb598a906835c48d878f06791fb75;hpb=a8733f4923a4e6d2847f236314fff9d1973bc786;p=platform%2Fcore%2Fuifw%2Flibtdm.git

diff --git a/include/tdm_types.h b/include/tdm_types.h
index fd446cd..a20049f 100644
--- a/include/tdm_types.h
+++ b/include/tdm_types.h
@@ -38,6 +38,8 @@
 
 #include <tbm_surface.h>
 
+#include "tdm_common.h"
+
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -57,8 +59,6 @@ extern "C" {
  * @endcode
  */
 
-#include <tdm_common.h>
-
 typedef enum {
 	TDM_EVENT_LOOP_READABLE = (1 << 0),
 	TDM_EVENT_LOOP_WRITABLE = (1 << 1),
@@ -85,6 +85,7 @@ typedef struct _tdm_output_mode {
 typedef struct _tdm_prop {
 	unsigned int id;
 	char name[TDM_NAME_LEN];
+	tdm_value_type type;
 } tdm_prop;
 
 /**
@@ -106,6 +107,21 @@ typedef struct _tdm_info_layer {
 } tdm_info_layer;
 
 /**
+ * @brief The hwc window info structure
+ * @since 2.0.0
+ */
+typedef struct _tdm_hwc_window_info {
+	tdm_info_config src_config;
+	tdm_pos dst_pos;
+	tdm_transform transform;
+} tdm_hwc_window_info;
+
+typedef struct _tdm_hwc_region {
+	unsigned int num_rects;
+	tdm_pos const *rects;
+} tdm_hwc_region;
+
+/**
  * @brief The pp info structre
  */
 typedef struct _tdm_info_pp {
@@ -122,12 +138,76 @@ typedef struct _tdm_info_pp {
 typedef struct _tdm_info_capture {
 	tdm_info_config dst_config;
 	tdm_transform transform;
-	int oneshot;
+	tdm_capture_type type;
 	int frequency;
 	int flags;
 } tdm_info_capture;
 
 /**
+ * @brief Possible composition types for a given window
+ * @since 2.0.0
+ */
+typedef enum {
+
+	/** Set by the client for an invisible window. The value by default.
+	 *
+	 * The device ignores windows of this type.
+	 */
+	TDM_COMPOSITION_NONE = 0,
+
+	/** The client will composite this window into the client target window
+	 *
+	 * User can choose this type for window to avoid a hardware composition for
+	 * this window.
+	 *
+	 * The device must not request any composition type changes for windows of
+	 * this type.
+	 */
+	TDM_COMPOSITION_CLIENT = 1,
+
+	/** Set by the client before tdm_output_hwc_validate().
+	 *
+	 * Upon tdm_output_hwc_validate(), the device may request a change from this type to
+	 * TDM_COMPOSITION_DEVICE or TDM_COMPOSITION_CLIENT. */
+	TDM_COMPOSITION_DEVICE_CANDIDATE = 2,
+
+	/** Set by the HWC after tdm_output_hwc_validate().
+	 *
+	 * The device will handle the composition of this window through a hardware
+	 * overlay or other similar means.
+	 *
+	 * Upon tdm_output_hwc_validate(), the device may request a change from this type to
+	 * TDM_COMPOSITION_CLIENT or TDM_COMPOSITION_DEVICE_CANDIDATE. */
+	TDM_COMPOSITION_DEVICE = 3,
+
+	/** Similar to DEVICE, but the position of this layer may also be set
+	 * asynchronously through layer_set_cursor_position. If this functionality is not
+	 * supported on a layer that the client sets to TDM_COMPOSITION_CURSOR, the
+	 * device must request that the composition type of that layer is changed to
+	 * TDM_COMPOSITION_CLIENT upon the next call to tdm_output_hwc_validate().
+	 *
+	 * Upon tdm_output_hwc_validate(), the device may request a change from this type to
+	 * either TDM_COMPOSITION_DEVICE or TDM_COMPOSITION_CLIENT. Changing to
+	 * TDM_COMPOSITION_DEVICE will prevent the use of layer_set_cursor_position but
+	 * still permit the device to composite the layer. */
+	TDM_COMPOSITION_CURSOR = 4,
+
+	/** This type is for the VIDEO window which can be set to the reserved hw overlay
+	 *  which is assigned by the device.
+	 *
+	 * Normally, this VIDEO window displays under the primary hw overlayer of the output. */
+	TDM_COMPOSITION_VIDEO = 5,
+} tdm_hwc_window_composition;
+
+/**
+ * @brief The hwc window flag enumeration
+ * @since 2.0.0
+ */
+typedef enum {
+	TDM_HWC_WINDOW_FLAG_NONE     = 0,
+} tdm_hwc_window_flag;
+
+/**
  * @brief The tdm display object
  */
 typedef void tdm_display;
@@ -143,6 +223,12 @@ typedef void tdm_output;
 typedef void tdm_layer;
 
 /**
+ * @brief The tdm window object
+ * @since 2.0.0
+ */
+typedef void tdm_hwc_window;
+
+/**
  * @brief The tdm capture object
  */
 typedef void tdm_capture;
@@ -166,12 +252,20 @@ typedef void (*tdm_output_vblank_handler)(tdm_output *output, unsigned int seque
 										  void *user_data);
 
 /**
- * @brief The commit handler
+ * @brief The output commit handler
  * @see output_set_commit_handler() function of #tdm_func_display
  */
 typedef void (*tdm_output_commit_handler)(tdm_output *output, unsigned int sequence,
 										  unsigned int tv_sec, unsigned int tv_usec,
 										  void *user_data);
+
+/**
+ * @brief The layer commit handler
+ */
+typedef void (*tdm_layer_commit_handler)(tdm_layer *layer, unsigned int sequence,
+										 unsigned int tv_sec, unsigned int tv_usec,
+										 void *user_data);
+
 /**
  * @brief The done handler of a pp object
  */
@@ -184,6 +278,17 @@ typedef void (*tdm_pp_done_handler)(tdm_pp *pp, tbm_surface_h src,
 typedef void (*tdm_capture_done_handler)(tdm_capture *capture,
 										 tbm_surface_h buffer, void *user_data);
 
+/**
+ * @brief The create handler of a vblank object
+ */
+typedef void (*tdm_vblank_create_handler)(tdm_vblank *vblank, void *user_data);
+
+/**
+ * @brief The 'need to validate' handler of an output object
+ * @since 2.0.0
+ */
+typedef void (*tdm_output_need_validate_handler)(tdm_output *output);
+
 #ifdef __cplusplus
 }
 #endif