...
 
Commits (8)
......@@ -575,6 +575,8 @@ data_source_send(void *data,
if (write(fd, editor->selected_text, strlen(editor->selected_text) + 1) < 0)
fprintf(stderr, "write failed: %m\n");
close(fd);
}
static void
......
m4_define([weston_major_version], [1])
m4_define([weston_minor_version], [11])
m4_define([weston_micro_version], [0])
m4_define([weston_micro_version], [1])
m4_define([weston_version],
[weston_major_version.weston_minor_version.weston_micro_version])
......
......@@ -234,6 +234,8 @@ surface_destroyed(struct wl_listener *listener, void *data)
surface_destroyed);
fsout->surface = NULL;
fsout->view = NULL;
wl_list_remove(&fsout->transform.link);
wl_list_init(&fsout->transform.link);
}
static void
......
......@@ -47,8 +47,3 @@ fail_on_null(void *p, size_t size, char *file, int32_t line)
return p;
}
#ifdef __cplusplus
}
#endif
......@@ -346,7 +346,7 @@ drm_fb_get_from_bo(struct gbm_bo *bo,
{
struct drm_fb *fb = gbm_bo_get_user_data(bo);
uint32_t width, height;
uint32_t handles[4], pitches[4], offsets[4];
uint32_t handles[4] = { 0 }, pitches[4] = { 0 }, offsets[4] = { 0 };
int ret;
if (fb)
......
......@@ -57,7 +57,7 @@
# define NSC_RESET(C, W, H) nsc_context_reset(C, W, H)
# define RFX_RESET(C, W, H) rfx_context_reset(C, W, H)
#else
# define NSC_RESET(C, W, H) do { nsc_context_reset(C); C->width = W; C->height = H; } while(0)
# define NSC_RESET(C, W, H) do { nsc_context_reset(C); C->width = W; C->height = H; } while(0)
# define RFX_RESET(C, W, H) do { rfx_context_reset(C); C->width = W; C->height = H; } while(0)
#endif
#define FREERDP_CB_RET_TYPE BOOL
......
......@@ -782,7 +782,7 @@ x11_backend_create_output(struct x11_backend *b, int x, int y,
{
static const char name[] = "Weston Compositor";
static const char class[] = "weston-1\0Weston Compositor";
char title[32];
char *title = NULL;
struct x11_output *output;
xcb_screen_t *screen;
struct wm_normal_hints normal_hints;
......@@ -800,11 +800,6 @@ x11_backend_create_output(struct x11_backend *b, int x, int y,
output_width = width * scale;
output_height = height * scale;
if (configured_name)
sprintf(title, "%s - %s", name, configured_name);
else
strcpy(title, name);
if (!no_input)
values[0] |=
XCB_EVENT_MASK_KEY_PRESS |
......@@ -871,9 +866,24 @@ x11_backend_create_output(struct x11_backend *b, int x, int y,
}
/* Set window name. Don't bother with non-EWMH WMs. */
xcb_change_property(b->conn, XCB_PROP_MODE_REPLACE, output->window,
b->atom.net_wm_name, b->atom.utf8_string, 8,
strlen(title), title);
if (configured_name) {
if (asprintf(&title, "%s - %s", name, configured_name) < 0)
title = NULL;
} else {
title = strdup(name);
}
if (title) {
xcb_change_property(b->conn, XCB_PROP_MODE_REPLACE, output->window,
b->atom.net_wm_name, b->atom.utf8_string, 8,
strlen(title), title);
free(title);
} else {
xcb_destroy_window(b->conn, output->window);
free(output);
return NULL;
}
xcb_change_property(b->conn, XCB_PROP_MODE_REPLACE, output->window,
b->atom.wm_class, b->atom.string, 8,
sizeof class, class);
......
......@@ -703,6 +703,8 @@ main(int argc, char *argv[])
case 'h':
help("weston-launch");
exit(EXIT_FAILURE);
default:
exit(EXIT_FAILURE);
}
}
......