* Taeheon Kim <th908.kim@samsung.com>,
* YoungJun Cho <yj44.cho@samsung.com>,
* SooChan Lim <sc1.lim@samsung.com>,
- * Boram Park <sc1.lim@samsung.com>
+ * Boram Park <boram1288.park@samsung.com>
*
* Permission is hereby granted, free of charge, to any person obtaining a
* copy of this software and associated documentation files (the
fclose(h);
}
-static tdm_output*
-_tdm_server_find_output(tdm_private_server *private_server, const char *name)
-{
- tdm_private_loop *private_loop = private_server->private_loop;
- tdm_output *found = NULL;
-
- if (!strncasecmp(name, "primary", 7) || !strncasecmp(name, "default", 7))
- found = tdm_display_get_output(private_loop->dpy, 0, NULL);
-
- if (!found) {
- int count = 0, i;
-
- tdm_display_get_output_count(private_loop->dpy, &count);
-
- for (i = 0; i < count; i++) {
- tdm_output *output = tdm_display_get_output(private_loop->dpy, i, NULL);
- tdm_output_conn_status status;
- const char *model = NULL;
- tdm_error ret;
-
- ret = tdm_output_get_conn_status(output, &status);
- if (ret || status == TDM_OUTPUT_CONN_STATUS_DISCONNECTED)
- continue;
-
- ret = tdm_output_get_model_info(output, NULL, &model, NULL);
- if (ret || !model)
- continue;
-
- if (strncmp(model, name, TDM_NAME_LEN))
- continue;
-
- found = output;
- break;
- }
- }
-
- return found;
-}
-
/* LCOV_EXCL_START */
static void
_tdm_server_send_done(tdm_server_wait_info *wait_info, tdm_error error,
_tdm_server_vblank_cb_set_name(struct wl_client *client, struct wl_resource *resource, const char *name)
{
tdm_server_vblank_info *vblank_info = wl_resource_get_user_data(resource);
+ tdm_error ret;
- tdm_vblank_set_name(vblank_info->vblank, name);
+ ret = tdm_vblank_set_name(vblank_info->vblank, name);
+ TDM_RETURN_IF_FAIL(ret == TDM_ERROR_NONE);
}
/* LCOV_EXCL_STOP */
_tdm_server_vblank_cb_set_fps(struct wl_client *client, struct wl_resource *resource, uint32_t fps)
{
tdm_server_vblank_info *vblank_info = wl_resource_get_user_data(resource);
+ tdm_error ret;
- tdm_vblank_set_fps(vblank_info->vblank, fps);
+ ret = tdm_vblank_set_fps(vblank_info->vblank, fps);
+ TDM_RETURN_IF_FAIL(ret == TDM_ERROR_NONE);
}
/* LCOV_EXCL_STOP */
_tdm_server_vblank_cb_set_offset(struct wl_client *client, struct wl_resource *resource, int32_t offset)
{
tdm_server_vblank_info *vblank_info = wl_resource_get_user_data(resource);
+ tdm_error ret;
- tdm_vblank_set_offset(vblank_info->vblank, offset);
+ ret = tdm_vblank_set_offset(vblank_info->vblank, offset);
+ TDM_RETURN_IF_FAIL(ret == TDM_ERROR_NONE);
}
/* LCOV_EXCL_STOP */
_tdm_server_vblank_cb_set_enable_fake(struct wl_client *client, struct wl_resource *resource, uint32_t enable_fake)
{
tdm_server_vblank_info *vblank_info = wl_resource_get_user_data(resource);
+ tdm_error ret;
- tdm_vblank_set_enable_fake(vblank_info->vblank, enable_fake);
+ ret = tdm_vblank_set_enable_fake(vblank_info->vblank, enable_fake);
+ TDM_RETURN_IF_FAIL(ret == TDM_ERROR_NONE);
}
static void
TDM_RETURN_IF_FAIL(output_info != NULL);
ret = tdm_output_get_conn_status(output_info->output, &status);
- TDM_GOTO_IF_FAIL(ret != TDM_ERROR_NONE, failed);
+ TDM_GOTO_IF_FAIL(ret == TDM_ERROR_NONE, failed);
wl_tdm_output_send_connection(output_info->resource, status, ret);
TDM_RETURN_IF_FAIL(output_info != NULL);
ret = tdm_output_get_conn_status(output_info->output, &status);
- TDM_GOTO_IF_FAIL(ret != TDM_ERROR_NONE, failed);
+ TDM_GOTO_IF_FAIL(ret == TDM_ERROR_NONE, failed);
if (status != TDM_OUTPUT_CONN_STATUS_DISCONNECTED) {
const tdm_output_mode *mode = NULL;
unsigned int hdisplay, vdisplay, vrefresh;
ret = tdm_output_get_mode(output_info->output, &mode);
- TDM_GOTO_IF_FAIL(ret != TDM_ERROR_NONE, failed);
+ TDM_GOTO_IF_FAIL(ret == TDM_ERROR_NONE, failed);
hdisplay = (mode) ? mode->hdisplay : 0;
vdisplay = (mode) ? mode->vdisplay : 0;
TDM_RETURN_IF_FAIL(output_info != NULL);
ret = tdm_output_get_conn_status(output_info->output, &status);
- TDM_GOTO_IF_FAIL(ret != TDM_ERROR_NONE, failed);
+ TDM_GOTO_IF_FAIL(ret == TDM_ERROR_NONE, failed);
if (status != TDM_OUTPUT_CONN_STATUS_DISCONNECTED) {
tdm_output_dpms dpms_value = TDM_OUTPUT_DPMS_OFF;
ret = tdm_output_get_dpms(output_info->output, &dpms_value);
- TDM_GOTO_IF_FAIL(ret != TDM_ERROR_NONE, failed);
+ TDM_GOTO_IF_FAIL(ret == TDM_ERROR_NONE, failed);
wl_tdm_output_send_dpms(output_info->resource, dpms_value, ret);
} else {
tdm_output_conn_status status = TDM_OUTPUT_CONN_STATUS_DISCONNECTED;
tdm_error ret;
- output = _tdm_server_find_output(private_server, name);
+ output = tdm_display_find_output(private_server->private_loop->dpy, name, NULL);
if (!output) {
/* LCOV_EXCL_START */
/* LCOV_EXCL_STOP */
}
+ ret = tdm_output_add_change_handler(output, _tdm_server_cb_output_change, output_info);
+ if (ret != TDM_ERROR_NONE) {
+ wl_resource_post_no_memory(resource);
+ wl_resource_destroy(output_resource);
+ free(output_info);
+ TDM_ERR("tdm_output_add_change_handler failed");
+ return;
+ }
+
LIST_ADDTAIL(&output_info->link, &private_server->output_list);
output_info->private_server = private_server;
output_info->resource = output_resource;
output_info->output = output;
LIST_INITHEAD(&output_info->vblank_list);
- tdm_output_add_change_handler(output, _tdm_server_cb_output_change, output_info);
-
wl_resource_set_implementation(output_resource, &tdm_output_implementation,
output_info, destroy_output_callback);
}
}
+static void
+_tdm_server_cb_create_virtual_output(struct wl_client *client, struct wl_resource *resource, const char *name, uint32_t id)
+{
+ struct wl_resource *voutput_resource = NULL;
+
+ voutput_resource =
+ wl_resource_create(client, &wl_tdm_voutput_interface,
+ wl_resource_get_version(resource), id);
+ if (!voutput_resource) {
+ /* LCOV_EXCL_START */
+
+ wl_resource_post_no_memory(resource);
+ TDM_ERR("wl_resource_create failed");
+ return;
+
+ /* LCOV_EXCL_STOP */
+ }
+
+ wl_tdm_voutput_send_ack_message(voutput_resource, WL_TDM_VOUTPUT_MESSAGE_ADDED);
+}
+
/* LCOV_EXCL_START */
static void
_tdm_server_cb_debug(struct wl_client *client, struct wl_resource *resource, const char *options)
static const struct wl_tdm_interface tdm_implementation = {
_tdm_server_cb_debug,
_tdm_server_cb_create_output,
+ _tdm_server_cb_create_virtual_output
};
static void
projects / platform / core / uifw / libtdm.git / blobdiff