X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=src%2Ftdm_display.c;h=7d2f82b5066c31dd06354c13b2a16f68c6177ffa;hb=refs%2Fheads%2Ftizen_5.0;hp=9f66167a62d201c246816aa98a8a5d44b3bbe592;hpb=44b1aa829d5b6c774925b596c6161a630aa3f4d4;p=platform%2Fcore%2Fuifw%2Flibtdm.git

diff --git a/src/tdm_display.c b/src/tdm_display.c
index 9f66167..7d2f82b 100644
--- a/src/tdm_display.c
+++ b/src/tdm_display.c
@@ -349,6 +349,124 @@ tdm_display_enable_fps(tdm_private_display *private_display, int enable)
 }
 /* LCOV_EXCL_STOP */
 
+INTERN tdm_error
+tdm_display_call_thread_cb_output_create(tdm_private_display *private_display, tdm_output *output)
+{
+	tdm_thread_cb_display_output_create output_create;
+	tdm_error ret;
+
+	if (LIST_IS_EMPTY(&private_display->output_create_handler_list)) return TDM_ERROR_NONE;
+
+	memset(&output_create, 0, sizeof output_create);
+	output_create.base.type = TDM_THREAD_CB_DISPLAY_OUTPUT_CREATE;
+	output_create.base.length = sizeof output_create;
+	output_create.base.object_stamp = tdm_helper_get_time();
+	output_create.base.data = NULL;
+	output_create.base.sync = 1;
+	output_create.output = output;
+
+	ret = tdm_thread_cb_call(private_display, &output_create.base, 1);
+	TDM_WARNING_IF_FAIL(ret == TDM_ERROR_NONE);
+
+	return TDM_ERROR_NONE;
+}
+
+INTERN void
+tdm_display_thread_cb_output_create(tdm_private_display *private_display, void *object, tdm_thread_cb_base *cb_base, void *user_data)
+{
+	tdm_thread_cb_display_output_create *output_create = (tdm_thread_cb_display_output_create*)cb_base;
+	tdm_private_output_create_handler *create_handler = user_data;
+	TDM_RETURN_IF_FAIL(TDM_MUTEX_IS_LOCKED());
+
+	assert(create_handler->owner_tid == syscall(SYS_gettid));
+
+	_pthread_mutex_unlock(&private_display->lock);
+	create_handler->func(private_display, output_create->output, create_handler->user_data);
+	_pthread_mutex_lock(&private_display->lock);
+}
+
+EXTERN tdm_error
+tdm_display_add_output_create_handler(tdm_display *dpy,
+									  tdm_output_create_handler func,
+									  void *user_data)
+{
+	tdm_private_output_create_handler *create_handler = NULL;
+
+	DISPLAY_FUNC_ENTRY();
+
+	TDM_RETURN_VAL_IF_FAIL(func != NULL, TDM_ERROR_INVALID_PARAMETER);
+
+	_pthread_mutex_lock(&private_display->lock);
+
+	LIST_FOR_EACH_ENTRY(create_handler, &private_display->output_create_handler_list, link) {
+		if (create_handler->func == func && create_handler->user_data == user_data) {
+			TDM_ERR("can't add twice");
+			_pthread_mutex_unlock(&private_display->lock);
+			return TDM_ERROR_BAD_REQUEST;
+		}
+	}
+
+	create_handler = calloc(1, sizeof(tdm_private_output_create_handler));
+	if (!create_handler) {
+		TDM_ERR("failed: alloc memory");
+		_pthread_mutex_unlock(&private_display->lock);
+		return TDM_ERROR_OUT_OF_MEMORY;
+	}
+
+	ret = tdm_thread_cb_add(private_display, TDM_THREAD_CB_DISPLAY_OUTPUT_CREATE, NULL,
+							tdm_display_thread_cb_output_create, create_handler);
+	if (ret != TDM_ERROR_NONE) {
+		TDM_ERR("tdm_thread_cb_add failed");
+		free(create_handler);
+		_pthread_mutex_unlock(&private_display->lock);
+		return TDM_ERROR_OPERATION_FAILED;
+	}
+
+	create_handler->private_display = private_display;
+	create_handler->func = func;
+	create_handler->user_data = user_data;
+	create_handler->owner_tid = syscall(SYS_gettid);
+
+	LIST_ADDTAIL(&create_handler->link, &private_display->output_create_handler_list);
+
+	_pthread_mutex_unlock(&private_display->lock);
+
+	return ret;
+}
+
+EXTERN void
+tdm_display_remove_output_create_handler(tdm_display *dpy,
+										 tdm_output_create_handler func,
+										 void *user_data)
+{
+	tdm_private_display *private_display;
+	tdm_private_output_create_handler *create_handler = NULL, *hh = NULL;
+
+	TDM_RETURN_IF_FAIL(dpy != NULL);
+	TDM_RETURN_IF_FAIL(func != NULL);
+
+	private_display = (tdm_private_display*)dpy;
+
+	_pthread_mutex_lock(&private_display->lock);
+
+	LIST_FOR_EACH_ENTRY_SAFE(create_handler, hh, &private_display->output_create_handler_list, link) {
+		if (create_handler->func != func || create_handler->user_data != user_data)
+			continue;
+
+		tdm_thread_cb_remove(private_display, TDM_THREAD_CB_DISPLAY_OUTPUT_CREATE, NULL,
+							 tdm_display_thread_cb_output_create, create_handler);
+
+		LIST_DEL(&create_handler->link);
+		free(create_handler);
+
+		_pthread_mutex_unlock(&private_display->lock);
+
+		return;
+	}
+
+	_pthread_mutex_unlock(&private_display->lock);
+}
+
 EXTERN tdm_error
 tdm_display_get_capabilities(tdm_display *dpy,
 							 tdm_display_capability *capabilities)
@@ -634,18 +752,50 @@ tdm_display_find_output(tdm_display *dpy, const char *name, tdm_error *error)
 {
 	tdm_private_module *private_module = NULL;
 	tdm_private_output *private_output = NULL;
+	tdm_private_output *mode_setted_output = NULL;
+	tdm_private_output *connected_output = NULL;
+	unsigned int find_primary = 0;
 
 	DISPLAY_FUNC_ENTRY_ERROR();
 
-	if (!strncasecmp(name, "primary", 7) || !strncasecmp(name, "default", 7)) {
-		return tdm_display_get_output(dpy, 0, error);
-	}
+	if (!strncasecmp(name, "primary", 7) || !strncasecmp(name, "default", 7))
+		find_primary = 1;
 
 	_pthread_mutex_lock(&private_display->lock);
 
 	if (error)
 		*error = TDM_ERROR_NONE;
 
+	if (find_primary) {
+		LIST_FOR_EACH_ENTRY(private_module, &private_display->module_list, link) {
+			LIST_FOR_EACH_ENTRY(private_output, &private_module->output_list, link) {
+				if (private_output->caps.status == TDM_OUTPUT_CONN_STATUS_CONNECTED && !connected_output)
+					connected_output = private_output;
+				else if (private_output->caps.status == TDM_OUTPUT_CONN_STATUS_MODE_SETTED && !mode_setted_output)
+					mode_setted_output = private_output;
+			}
+		}
+
+		if (mode_setted_output) {
+			_pthread_mutex_unlock(&private_display->lock);
+			return mode_setted_output;
+		}
+
+		if (connected_output) {
+			_pthread_mutex_unlock(&private_display->lock);
+			return connected_output;
+		}
+
+		LIST_FOR_EACH_ENTRY(private_module, &private_display->module_list, link) {
+			LIST_FOR_EACH_ENTRY(private_output, &private_module->output_list, link) {
+				if (private_output->index == 0) {
+					_pthread_mutex_unlock(&private_display->lock);
+					return private_output;
+				}
+			}
+		}
+	}
+
 	LIST_FOR_EACH_ENTRY(private_module, &private_display->module_list, link) {
 		LIST_FOR_EACH_ENTRY(private_output, &private_module->output_list, link) {
 			if (strncmp(private_output->caps.model, name, TDM_NAME_LEN))
@@ -655,6 +805,15 @@ tdm_display_find_output(tdm_display *dpy, const char *name, tdm_error *error)
 		}
 	}
 
+	if (private_display->virtual_module) {
+		private_module = private_display->virtual_module;
+		LIST_FOR_EACH_ENTRY(private_output, &private_module->output_list, link) {
+			if (strncmp(private_output->name, name, TDM_NAME_LEN))
+				continue;
+			_pthread_mutex_unlock(&private_display->lock);
+			return private_output;
+		}
+	}
 	_pthread_mutex_unlock(&private_display->lock);
 
 	return NULL;
@@ -818,6 +977,9 @@ tdm_module_check_abi(tdm_private_module *private_module, int abimaj, int abimin)
 {
 	tdm_backend_module *module = private_module->module_data;
 
+	if (TDM_BACKEND_GET_ABI_MAJOR(module->abi_version) > abimaj)
+		return 1;
+
 	if (TDM_BACKEND_GET_ABI_MAJOR(module->abi_version) < abimaj)
 		return 0;