}
if (tdm_debug_module & TDM_DEBUG_VBLANK)
- TDM_INFO("req_id(%d) done", wait_info->req_id);
+ TDM_DBG("req_id(%d) done", wait_info->req_id);
TDM_TRACE_COUNT(ServerDoneVBlank, wait_info->req_id);
switch (type) {
case TDM_OUTPUT_CHANGE_DPMS:
- wl_tdm_output_send_dpms(output_info->resource, value.u32);
+ wl_tdm_output_send_dpms(output_info->resource, value.u32, TDM_ERROR_NONE);
break;
case TDM_OUTPUT_CHANGE_CONNECTION:
- wl_tdm_output_send_connection(output_info->resource, value.u32);
+ wl_tdm_output_send_connection(output_info->resource, value.u32, TDM_ERROR_NONE);
break;
default:
break;
TDM_RETURN_IF_FAIL(vblank_info != NULL);
+ LIST_DEL(&vblank_info->link);
+
if (vblank_info->vblank)
tdm_vblank_destroy(vblank_info->vblank);
destroy_wait(w);
}
- LIST_DEL(&vblank_info->link);
free(vblank_info);
}
wait_info->req_id = req_id;
if (tdm_debug_module & TDM_DEBUG_VBLANK)
- TDM_INFO("req_id(%d) wait", req_id);
+ TDM_DBG("req_id(%d) wait", req_id);
ret = tdm_vblank_wait(vblank_info->vblank, req_sec, req_usec, interval, _tdm_server_cb_vblank, wait_info);
wait_info->req_id = req_id;
if (tdm_debug_module & TDM_DEBUG_VBLANK)
- TDM_INFO("req_id(%d) wait", req_id);
+ TDM_DBG("req_id(%d) wait", req_id);
ret = tdm_vblank_wait_seq(vblank_info->vblank, req_sec, req_usec, sequence, _tdm_server_cb_vblank, wait_info);
output_info->watch_output_changes = enable;
}
+static void
+_tdm_server_output_cb_get_connection(struct wl_client *client, struct wl_resource *resource)
+{
+ tdm_server_output_info *output_info = wl_resource_get_user_data(resource);
+ tdm_output_conn_status status = TDM_OUTPUT_CONN_STATUS_DISCONNECTED;
+ tdm_error 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);
+
+ wl_tdm_output_send_connection(output_info->resource, status, ret);
+
+ return;
+
+failed:
+ wl_tdm_output_send_connection(output_info->resource, TDM_OUTPUT_CONN_STATUS_DISCONNECTED, ret);
+}
+
+static void
+_tdm_server_output_cb_get_mode(struct wl_client *client, struct wl_resource *resource)
+{
+ tdm_server_output_info *output_info = wl_resource_get_user_data(resource);
+ tdm_output_conn_status status = TDM_OUTPUT_CONN_STATUS_DISCONNECTED;
+ tdm_error 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);
+
+ 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);
+
+ hdisplay = (mode) ? mode->hdisplay : 0;
+ vdisplay = (mode) ? mode->vdisplay : 0;
+ vrefresh = (mode) ? mode->vrefresh : 0;
+
+ wl_tdm_output_send_mode(output_info->resource, hdisplay, vdisplay, vrefresh, ret);
+ } else {
+ wl_tdm_output_send_mode(output_info->resource, 0, 0, 0, TDM_ERROR_OUTPUT_DISCONNECTED);
+ }
+
+ return;
+failed:
+ wl_tdm_output_send_mode(output_info->resource, 0, 0, 0, ret);
+}
+
+static void
+_tdm_server_output_cb_get_dpms(struct wl_client *client, struct wl_resource *resource)
+{
+ tdm_server_output_info *output_info = wl_resource_get_user_data(resource);
+ tdm_output_conn_status status = TDM_OUTPUT_CONN_STATUS_DISCONNECTED;
+ tdm_error 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);
+
+ 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);
+
+ wl_tdm_output_send_dpms(output_info->resource, dpms_value, ret);
+ } else {
+ wl_tdm_output_send_dpms(output_info->resource, TDM_OUTPUT_DPMS_OFF, TDM_ERROR_OUTPUT_DISCONNECTED);
+ }
+
+ return;
+failed:
+ wl_tdm_output_send_dpms(output_info->resource, TDM_OUTPUT_DPMS_OFF, ret);
+}
+
static const struct wl_tdm_output_interface tdm_output_implementation = {
_tdm_server_output_cb_destroy,
_tdm_server_output_cb_create_vblank,
_tdm_server_output_cb_watch_output_changes,
+ _tdm_server_output_cb_get_connection,
+ _tdm_server_output_cb_get_mode,
+ _tdm_server_output_cb_get_dpms,
};
static void
TDM_RETURN_IF_FAIL(output_info != NULL);
+ LIST_DEL(&output_info->link);
+
tdm_output_remove_change_handler(output_info->output,
_tdm_server_cb_output_change, output_info);
wl_resource_destroy(v->resource);
}
- LIST_DEL(&output_info->link);
free(output_info);
}
tdm_server_output_info *output_info;
struct wl_resource *output_resource = NULL;
tdm_output *output;
- const tdm_output_mode *mode = NULL;
- tdm_output_dpms dpms_value;
- tdm_output_conn_status status;
+ tdm_output_conn_status status = TDM_OUTPUT_CONN_STATUS_DISCONNECTED;
+ tdm_error ret;
output = _tdm_server_find_output(private_server, name);
if (!output) {
return;
}
- tdm_output_get_mode(output, &mode);
- if (!mode) {
- TDM_ERR("no mode for '%s' output", name);
- wl_resource_post_error(resource, WL_DISPLAY_ERROR_INVALID_OBJECT,
- "no mode for '%s' output", name);
- return;
- }
-
- tdm_output_get_dpms(output, &dpms_value);
- tdm_output_get_conn_status(output, &status);
-
output_resource =
wl_resource_create(client, &wl_tdm_output_interface,
wl_resource_get_version(resource), id);
wl_resource_set_implementation(output_resource, &tdm_output_implementation,
output_info, destroy_output_callback);
- wl_tdm_output_send_mode(output_resource, mode->hdisplay, mode->vdisplay, mode->vrefresh);
- wl_tdm_output_send_dpms(output_resource, dpms_value);
- wl_tdm_output_send_connection(output_resource, status);
+ ret = tdm_output_get_conn_status(output, &status);
+ wl_tdm_output_send_connection(output_resource, status, ret);
+
+ if (status != TDM_OUTPUT_CONN_STATUS_DISCONNECTED) {
+ tdm_output_dpms dpms_value = TDM_OUTPUT_DPMS_OFF;
+ const tdm_output_mode *mode = NULL;
+ unsigned int hdisplay, vdisplay, vrefresh;
+
+ ret = tdm_output_get_mode(output, &mode);
+ hdisplay = (mode) ? mode->hdisplay : 0;
+ vdisplay = (mode) ? mode->vdisplay : 0;
+ vrefresh = (mode) ? mode->vrefresh : 0;
+ wl_tdm_output_send_mode(output_resource, hdisplay, vdisplay, vrefresh, ret);
+
+ ret = tdm_output_get_dpms(output, &dpms_value);
+ wl_tdm_output_send_dpms(output_resource, dpms_value, ret);
+ } else {
+ wl_tdm_output_send_mode(output_resource, 0, 0, 0, TDM_ERROR_OUTPUT_DISCONNECTED);
+ wl_tdm_output_send_dpms(output_resource, TDM_OUTPUT_DPMS_OFF, TDM_ERROR_OUTPUT_DISCONNECTED);
+ }
}
static void
tdm_private_server *private_server = wl_resource_get_user_data(resource);
tdm_private_loop *private_loop = private_server->private_loop;
char message[TDM_SERVER_REPLY_MSG_LEN];
- int size = sizeof(message);
+ char *m;
+ int len = sizeof(message), size;
uid_t uid;
wl_client_get_credentials(client, NULL, &uid, NULL);
if (uid != 0) {
- snprintf(message, size, "tdm-monitor: SHOULD be a superuser.\n");
+ snprintf(message, len, "tdm-monitor: SHOULD be a superuser.\n");
TDM_ERR("%s", message);
} else {
- tdm_monitor_server_command(private_loop->dpy, options, message, &size);
+ tdm_monitor_server_command(private_loop->dpy, options, message, &len);
}
- wl_tdm_send_debug_done(resource, message);
+ size = sizeof(message) - len;
+ m = message;
+
+ wl_client_flush(client);
+
+ while (size > 0) {
+ char buffer[TDM_DEBUG_REPLY_MSG_LEN];
+ int copylen = TDM_MIN(size, sizeof(buffer) - 1);
+
+ strncpy(buffer, m, copylen);
+ m += copylen;
+ size -= copylen;
+
+ buffer[copylen] = '\0';
+
+ wl_tdm_send_debug_message(resource, buffer);
+ }
+
+ wl_tdm_send_debug_done(resource);
}
static void
return -1;
}
-static int
+static void
_tdm_socket_init(tdm_private_loop *private_loop)
{
const char *dir = NULL;
- char socket_path[128];
+ char socket_path[TDM_NAME_LEN * 2];
int ret = -1;
uid_t uid;
gid_t gid;
- if (wl_display_add_socket(private_loop->wl_display, "tdm-socket")) {
- TDM_ERR("createing a tdm-socket failed");
- return 0;
- }
-
dir = getenv("XDG_RUNTIME_DIR");
if (!dir) {
- TDM_ERR("getting XDG_RUNTIME_DIR failed");
- return 0;
+ TDM_WRN("getting XDG_RUNTIME_DIR failed");
+ return;
}
- snprintf(socket_path, sizeof(socket_path), "%s/%s", dir, "tdm-socket");
+ strncpy(socket_path, dir, TDM_NAME_LEN - 1);
+ socket_path[TDM_NAME_LEN - 1] = '\0';
+
+ strncat(socket_path, "/tdm-socket", 11);
+ socket_path[TDM_NAME_LEN + 10] = '\0';
ret = chmod(socket_path, 509);
if (ret < 0) {
- TDM_ERR("changing modes of socket file failed:%s (%m)", socket_path);
- return 0;
+ TDM_WRN("changing modes of socket file failed:%s (%m)", socket_path);
+ return;
}
- /* if not super user, we don't need to change owner and group */
- if (getuid() != 0)
- return 1;
-
ret = _tdm_getgrnam_r("root");
if (ret < 0) {
- TDM_ERR("getting uid failed");
- return 0;
+ TDM_WRN("getting uid failed");
+ return;
}
uid = ret;
ret = _tdm_getgrnam_r("display");
if (ret < 0) {
- TDM_ERR("getting gid failed");
- return 0;
+ TDM_WRN("getting gid failed");
+ return;
}
gid = ret;
ret = chown(socket_path, uid, gid);
if (ret < 0) {
- TDM_ERR("changing owner of socket file failed:%s (%m)", socket_path);
- return 0;
+ TDM_WRN("changing owner of socket file failed:%s (%m)", socket_path);
+ return;
}
-
- return 1;
}
INTERN tdm_error
if (private_loop->private_server)
return TDM_ERROR_NONE;
- if (!_tdm_socket_init(private_loop)) {
- TDM_ERR("initializing tdm-socket failed");
+ if (wl_display_add_socket(private_loop->wl_display, "tdm-socket")) {
+ TDM_ERR("createing a tdm-socket failed");
return TDM_ERROR_OPERATION_FAILED;
}
+ _tdm_socket_init(private_loop);
+
private_server = calloc(1, sizeof * private_server);
if (!private_server) {
TDM_ERR("alloc failed");
projects / platform / core / uifw / libtdm.git / blobdiff