Changeset View
Changeset View
Standalone View
Standalone View
x11-wm/weston/files/patch-clients_ivi-shell-user-interface.c
- This file was added.
--- clients/ivi-shell-user-interface.c.orig 2017-10-13 16:13:46 UTC | |||||
+++ clients/ivi-shell-user-interface.c | |||||
@@ -218,7 +218,7 @@ set_pointer_image(struct wlContextCommon *pCtx, uint32 | |||||
return; | |||||
if (cursor->image_count <= index) { | |||||
- fprintf(stderr, "cursor index out of range\n"); | |||||
+ fprintf(stderr, "cursor index out of range\r\n"); | |||||
return; | |||||
} | |||||
@@ -250,7 +250,7 @@ PointerHandleEnter(void *data, struct wl_pointer *wlPo | |||||
pCtx->enterSurface = wlSurface; | |||||
set_pointer_image(pCtx, 0); | |||||
#ifdef _DEBUG | |||||
- printf("ENTER PointerHandleEnter: x(%d), y(%d)\n", sx, sy); | |||||
+ printf("ENTER PointerHandleEnter: x(%d), y(%d)\r\n", sx, sy); | |||||
#endif | |||||
} | |||||
@@ -263,7 +263,7 @@ PointerHandleLeave(void *data, struct wl_pointer *wlPo | |||||
pCtx->enterSurface = NULL; | |||||
#ifdef _DEBUG | |||||
- printf("ENTER PointerHandleLeave: serial(%d)\n", serial); | |||||
+ printf("ENTER PointerHandleLeave: serial(%d)\r\n", serial); | |||||
#endif | |||||
} | |||||
@@ -272,7 +272,7 @@ PointerHandleMotion(void *data, struct wl_pointer *wlP | |||||
wl_fixed_t sx, wl_fixed_t sy) | |||||
{ | |||||
#ifdef _DEBUG | |||||
- printf("ENTER PointerHandleMotion: x(%d), y(%d)\n", sx, sy); | |||||
+ printf("ENTER PointerHandleMotion: x(%d), y(%d)\r\n", sx, sy); | |||||
#endif | |||||
} | |||||
@@ -287,13 +287,13 @@ execute_process(char *path, char *argv[]) | |||||
{ | |||||
pid_t pid = fork(); | |||||
if (pid < 0) | |||||
- fprintf(stderr, "Failed to fork\n"); | |||||
+ fprintf(stderr, "Failed to fork\r\n"); | |||||
if (pid) | |||||
return pid; | |||||
if (-1 == execve(path, argv, environ)) { | |||||
- fprintf(stderr, "Failed to execve %s\n", path); | |||||
+ fprintf(stderr, "Failed to execve %s\r\n", path); | |||||
exit(1); | |||||
} | |||||
@@ -408,7 +408,7 @@ PointerHandleButton(void *data, struct wl_pointer *wlP | |||||
break; | |||||
} | |||||
#ifdef _DEBUG | |||||
- printf("ENTER PointerHandleButton: button(%d), state(%d)\n", | |||||
+ printf("ENTER PointerHandleButton: button(%d), state(%d)\r\n", | |||||
button, state); | |||||
#endif | |||||
} | |||||
@@ -418,7 +418,7 @@ PointerHandleAxis(void *data, struct wl_pointer *wlPoi | |||||
uint32_t axis, wl_fixed_t value) | |||||
{ | |||||
#ifdef _DEBUG | |||||
- printf("ENTER PointerHandleAxis: axis(%d), value(%d)\n", axis, value); | |||||
+ printf("ENTER PointerHandleAxis: axis(%d), value(%d)\r\n", axis, value); | |||||
#endif | |||||
} | |||||
@@ -766,7 +766,7 @@ create_cursors(struct wlContextCommon *cmm) | |||||
} | |||||
if (!cursor) { | |||||
- fprintf(stderr, "could not load cursor '%s'\n", | |||||
+ fprintf(stderr, "could not load cursor '%s'\r\n", | |||||
cursors[i].names[0]); | |||||
} | |||||
@@ -805,7 +805,7 @@ createShmBuffer(struct wlContextStruct *p_wlCtx) | |||||
fd = os_create_anonymous_file(size); | |||||
if (fd < 0) { | |||||
- fprintf(stderr, "creating a buffer file for %d B failed: %m\n", | |||||
+ fprintf(stderr, "creating a buffer file for %d B failed: %m\r\n", | |||||
size); | |||||
return ; | |||||
} | |||||
@@ -814,7 +814,7 @@ createShmBuffer(struct wlContextStruct *p_wlCtx) | |||||
mmap(NULL, size, PROT_READ | PROT_WRITE, MAP_SHARED, fd, 0); | |||||
if (MAP_FAILED == p_wlCtx->data) { | |||||
- fprintf(stderr, "mmap failed: %m\n"); | |||||
+ fprintf(stderr, "mmap failed: %m\r\n"); | |||||
close(fd); | |||||
return; | |||||
} | |||||
@@ -827,7 +827,7 @@ createShmBuffer(struct wlContextStruct *p_wlCtx) | |||||
WL_SHM_FORMAT_ARGB8888); | |||||
if (NULL == p_wlCtx->wlBuffer) { | |||||
- fprintf(stderr, "wl_shm_create_buffer failed: %m\n"); | |||||
+ fprintf(stderr, "wl_shm_create_buffer failed: %m\r\n"); | |||||
close(fd); | |||||
return; | |||||
} | |||||
@@ -866,7 +866,7 @@ createSurface(struct wlContextStruct *p_wlCtx) | |||||
p_wlCtx->wlSurface = | |||||
wl_compositor_create_surface(p_wlCtx->cmm->wlCompositor); | |||||
if (NULL == p_wlCtx->wlSurface) { | |||||
- printf("Error: wl_compositor_create_surface failed.\n"); | |||||
+ printf("Error: wl_compositor_create_surface failed.\r\n"); | |||||
destroyWLContextCommon(p_wlCtx->cmm); | |||||
abort(); | |||||
} | |||||
@@ -920,7 +920,7 @@ create_ivisurface(struct wlContextStruct *p_wlCtx, | |||||
id_surface, | |||||
p_wlCtx->wlSurface); | |||||
if (ivisurf == NULL) { | |||||
- fprintf(stderr, "Failed to create ivi_client_surface\n"); | |||||
+ fprintf(stderr, "Failed to create ivi_client_surface\r\n"); | |||||
return; | |||||
} | |||||
@@ -935,7 +935,7 @@ create_ivisurfaceFromFile(struct wlContextStruct *p_wl | |||||
cairo_surface_t *surface = load_cairo_surface(imageFile); | |||||
if (NULL == surface) { | |||||
- fprintf(stderr, "Failed to load_cairo_surface %s\n", imageFile); | |||||
+ fprintf(stderr, "Failed to load_cairo_surface %s\r\n", imageFile); | |||||
return; | |||||
} | |||||
@@ -1226,7 +1226,7 @@ int main(int argc, char **argv) | |||||
wlCtxCommon.wlDisplay = wl_display_connect(NULL); | |||||
if (NULL == wlCtxCommon.wlDisplay) { | |||||
- printf("Error: wl_display_connect failed.\n"); | |||||
+ printf("Error: wl_display_connect failed.\r\n"); | |||||
return -1; | |||||
} | |||||
@@ -1238,14 +1238,14 @@ int main(int argc, char **argv) | |||||
wl_display_roundtrip(wlCtxCommon.wlDisplay); | |||||
if (wlCtxCommon.wlShm == NULL) { | |||||
- fprintf(stderr, "No wl_shm global\n"); | |||||
+ fprintf(stderr, "No wl_shm global\r\n"); | |||||
exit(1); | |||||
} | |||||
wl_display_roundtrip(wlCtxCommon.wlDisplay); | |||||
if (!(wlCtxCommon.formats & (1 << WL_SHM_FORMAT_XRGB8888))) { | |||||
- fprintf(stderr, "WL_SHM_FORMAT_XRGB32 not available\n"); | |||||
+ fprintf(stderr, "WL_SHM_FORMAT_XRGB32 not available\r\n"); | |||||
exit(1); | |||||
} | |||||