fix the indentation

Change-Id: I167ae56f7a44a4968e32b6b8df5cf7a18d9392bd

diff --git a/src/lib/desktop-shell/shell-surface.c b/src/lib/desktop-shell/shell-surface.c
index 04d1ee5c24041b5ddcb6f054bceaed00cbcf1a08..d57aea27b30e79025599f5c86d6feaf4263b7f82 100644 (file)
--- a/src/lib/desktop-shell/shell-surface.c
+++ b/src/lib/desktop-shell/shell-surface.c
@@ -117,7 +117,7 @@ handle_surface_destroy(pepper_event_listener_t *listener,
                free(shsurf->class_);
 
        pepper_list_for_each_safe(child, tmp, &shsurf->child_list, parent_link)
-       shell_surface_set_parent(child, NULL);
+               shell_surface_set_parent(child, NULL);
 
        pepper_list_remove(&shsurf->parent_link);
        pepper_list_remove(&shsurf->link);

diff --git a/src/lib/pepper/Makefile.am b/src/lib/pepper/Makefile.am
index e69a0ab0e96eb1f7d0df7f8d3df87bc2a23e88e6..efae7c72a3c6cb5ca398a73f55f991294e629b2e 100644 (file)
--- a/src/lib/pepper/Makefile.am
+++ b/src/lib/pepper/Makefile.am
@@ -33,7 +33,7 @@ libpepper_la_SOURCES = pepper.h                 \
                        utils-log.c              \
                        utils-vt.c               \
                        utils-region.c           \
-                       utils-security.c           \
+                       utils-security.c         \
                        subcompositor.c          \
                        subsurface.c             \
                        misc.c

diff --git a/src/lib/pepper/compositor.c b/src/lib/pepper/compositor.c
index b573a0fb981adec8b9e718616c2338abc3f29150..8a0e9687c229edec58bfd69a5c1ddffa59db80bb 100644 (file)
--- a/src/lib/pepper/compositor.c
+++ b/src/lib/pepper/compositor.c
@@ -311,7 +311,7 @@ PEPPER_API void
 pepper_compositor_destroy(pepper_compositor_t *compositor)
 {
        pepper_surface_t        *surface, *next_surface;
-       pepper_wl_region_t         *region, *next_region;
+       pepper_wl_region_t      *region, *next_region;
 
        pepper_list_for_each_safe(surface, next_surface, &compositor->surface_list,
                                                          link)
@@ -336,6 +336,7 @@ pepper_compositor_destroy(pepper_compositor_t *compositor)
                unlink(compositor->addr.sun_path);
 
        pepper_object_fini(&compositor->base);
+
        free(compositor);
 }
 

diff --git a/src/lib/pepper/output.c b/src/lib/pepper/output.c
index 9d68a4c12ece6c876b4f30e4177cc380340a312d..280f351f5bd43f76f30e0eee5bbf553a979bb3f5 100644 (file)
--- a/src/lib/pepper/output.c
+++ b/src/lib/pepper/output.c
@@ -136,7 +136,7 @@ output_repaint(pepper_output_t *output)
        pepper_view_t  *view;
 
        pepper_list_for_each(view, &output->compositor->view_list, compositor_link)
-       pepper_view_update(view);
+               pepper_view_update(view);
 
        pepper_list_init(&output->view_list);
 
@@ -207,7 +207,7 @@ pepper_output_add_damage_region(pepper_output_t *output,
 {
        pepper_plane_t *plane;
        pepper_list_for_each(plane, &output->plane_list, link)
-       pepper_plane_add_damage_region(plane, region);
+               pepper_plane_add_damage_region(plane, region);
 }
 
 /**

diff --git a/src/lib/pepper/pepper-internal.h b/src/lib/pepper/pepper-internal.h
index 2497c0983482e796ca36d4879b575e2dd2e084f5..3e0bbafa22976370a1ee7505d217ad5419f867de 100644 (file)
--- a/src/lib/pepper/pepper-internal.h
+++ b/src/lib/pepper/pepper-internal.h
@@ -527,8 +527,8 @@ struct pepper_view {
        pepper_mat4_t               global_transform;
        pepper_mat4_t               global_transform_inverse;
 
-       pepper_region_t           bounding_region;
-       pepper_region_t           opaque_region;
+       pepper_region_t             bounding_region;
+       pepper_region_t             opaque_region;
 
        /* Visibility. */
        pepper_bool_t               active;

diff --git a/src/lib/pepper/pepper-output-backend.h b/src/lib/pepper/pepper-output-backend.h
index 6cac97c6c933c8361313b8e0a7d29f5d4497a789..532f4385d9874df41ebabebcb52443abf01b75a0 100644 (file)
--- a/src/lib/pepper/pepper-output-backend.h
+++ b/src/lib/pepper/pepper-output-backend.h
@@ -133,10 +133,9 @@ pepper_compositor_add_output(pepper_compositor_t *compositor,
                                                         int transform, int scale);
 
 struct pepper_render_item {
-       pepper_view_t       *view;          /**< view to render */
-       pepper_mat4_t       transform;      /**< transform matrix of the view */
-       pepper_mat4_t
-       inverse;        /**< inverse matrix of the transform matrix */
+       pepper_view_t    *view;           /**< view to render */
+       pepper_mat4_t     transform;      /**< transform matrix of the view */
+       pepper_mat4_t     inverse;        /**< inverse matrix of the transform matrix */
        pepper_region_t   visible_region; /**< visible region of the view */
 };
 

diff --git a/src/lib/pepper/surface.c b/src/lib/pepper/surface.c
index 4dcdc443b8a0e938ba69b711dbe1dca615076dae..04a62c96bb63e2d6eff7abe59bc65e5ffdcd376f 100644 (file)
--- a/src/lib/pepper/surface.c
+++ b/src/lib/pepper/surface.c
@@ -705,7 +705,7 @@ pepper_surface_flush_damage(pepper_surface_t *surface)
                return;
 
        pepper_list_for_each(view, &surface->view_list, surface_link)
-       pepper_view_surface_damage(view);
+               pepper_view_surface_damage(view);
 
        pepper_list_for_each(output, &surface->compositor->output_list, link) {
                pepper_bool_t keep_buffer;

diff --git a/src/lib/pepper/view.c b/src/lib/pepper/view.c
index bcf6105729069d0f8287dc8ce06a18422e737073..3699c5f6a8ed3e94cf76f43e23dded2290e2daf1 100644 (file)
--- a/src/lib/pepper/view.c
+++ b/src/lib/pepper/view.c
@@ -45,7 +45,7 @@ pepper_view_mark_dirty(pepper_view_t *view, uint32_t flag)
        /* Mark entire subtree's geometry as dirty. */
        if (flag & PEPPER_VIEW_GEOMETRY_DIRTY) {
                pepper_list_for_each(child, &view->children_list, parent_link)
-               pepper_view_mark_dirty(child, PEPPER_VIEW_GEOMETRY_DIRTY);
+                       pepper_view_mark_dirty(child, PEPPER_VIEW_GEOMETRY_DIRTY);
 
                for (i = 0; i < PEPPER_MAX_OUTPUT_COUNT; i++)
                        view->plane_entries[i].need_transform_update = PEPPER_TRUE;
@@ -54,7 +54,7 @@ pepper_view_mark_dirty(pepper_view_t *view, uint32_t flag)
        /* Mark entire subtree's active as dirty. */
        if (flag & PEPPER_VIEW_ACTIVE_DIRTY) {
                pepper_list_for_each(child, &view->children_list, parent_link)
-               pepper_view_mark_dirty(child, PEPPER_VIEW_ACTIVE_DIRTY);
+                       pepper_view_mark_dirty(child, PEPPER_VIEW_ACTIVE_DIRTY);
        }
 
        pepper_compositor_schedule_repaint(view->compositor);
@@ -101,7 +101,7 @@ view_insert(pepper_view_t *view, pepper_list_t *pos, pepper_bool_t subtree)
                pepper_view_t *child;
 
                pepper_list_for_each(child, &view->children_list, parent_link)
-               pos = view_insert(child, pos, subtree);
+                       pos = view_insert(child, pos, subtree);
        }
 
        return pos;
@@ -188,7 +188,6 @@ pepper_view_update(pepper_view_t *view)
         * as damaged and the damage for the remap will be inflicted separately for
         * each output when the visible region is calculated on output repaint.
         */
-
        for (i = 0; i < PEPPER_MAX_OUTPUT_COUNT; i++) {
                pepper_plane_entry_t *entry = &view->plane_entries[i];
 
@@ -230,7 +229,7 @@ pepper_view_update(pepper_view_t *view)
                output_overlap_prev = view->output_overlap;
                view->output_overlap = 0;
 
-                if (view->surface) {
+               if (view->surface) {
                        pepper_list_for_each(output, &view->compositor->output_list, link) {
                                pepper_box_t   box = {
                                        output->geometry.x,
@@ -240,7 +239,7 @@ pepper_view_update(pepper_view_t *view)
                                };
 
                                if (pepper_region_contains_rectangle(&view->bounding_region,
-                                                                                                          &box) != PEPPER_REGION_OUT) {
+                                                                                                               &box) != PEPPER_REGION_OUT) {
                                        view->output_overlap |= (1 << output->id);
                                        if (!(output_overlap_prev & (1 << output->id)))
                                                pepper_surface_send_enter(view->surface, output);
@@ -249,7 +248,7 @@ pepper_view_update(pepper_view_t *view)
                                                pepper_surface_send_leave(view->surface, output);
                                }
                        }
-                }
+               }
        }
 
        /* Mark the plane entries as damaged. */
@@ -357,6 +356,7 @@ pepper_view_set_surface(pepper_view_t *view, pepper_surface_t *surface)
                view_link_to_surface(view);
 
        pepper_view_mark_dirty(view, PEPPER_VIEW_GEOMETRY_DIRTY);
+
        return PEPPER_TRUE;
 }
 
@@ -379,7 +379,7 @@ pepper_view_destroy(pepper_view_t *view)
                plane_entry_set_plane(&view->plane_entries[i], NULL);
 
        pepper_list_for_each_safe(child, tmp, &view->children_list, parent_link)
-       pepper_view_destroy(child);
+               pepper_view_destroy(child);
 
        if (view->parent)
                pepper_list_remove(&view->parent_link);

diff --git a/src/lib/render/pixman-renderer.c b/src/lib/render/pixman-renderer.c
index fadb9bef4c94bd7c9a0a69a34df1c2c5b8b52408..afb20bbc2f9308a337bcec5d833c611c6bb06478 100644 (file)
--- a/src/lib/render/pixman-renderer.c
+++ b/src/lib/render/pixman-renderer.c
@@ -558,7 +558,7 @@ pixman_renderer_repaint_output(pepper_renderer_t *renderer,
                        clear_background((pixman_renderer_t *)renderer, damage);
 
                pepper_list_for_each_list_reverse(l, render_list)
-               repaint_view(renderer, output, (pepper_render_item_t *)l->item, damage);
+                       repaint_view(renderer, output, (pepper_render_item_t *)l->item, damage);
        }
 }
 
@@ -625,6 +625,7 @@ pepper_pixman_renderer_create_target(pepper_format_t format, void *pixels,
                goto error;
 
        target->base.destroy = pixman_render_target_destroy;
+
        return &target->base;
 
 error:

diff --git a/src/lib/tdm/tdm-output.c b/src/lib/tdm/tdm-output.c
index 013bb1b24a840aae7113ba1ffb9389e3d0c72020..2e429520fd28157a4af599ef712a362052931b5e 100644 (file)
--- a/src/lib/tdm/tdm-output.c
+++ b/src/lib/tdm/tdm-output.c
@@ -113,7 +113,7 @@ __tdm_renderer_pixman_render(pepper_tdm_output_t *output)
        pepper_region_copy(&output->previous_damage, damage);
 
        pepper_renderer_repaint_output(output->renderer, output->base, render_list,
-                                                                  &total_damage);
+                                                                       &total_damage);
 
        pepper_region_fini(&total_damage);
        pepper_plane_clear_damage_region(output->primary_plane->base);
@@ -140,34 +140,34 @@ __tdm_renderer_pixman_fini(pepper_tdm_output_t *output)
 static void
 __tdm_renderer_pixman_init(pepper_tdm_output_t *output)
 {
-   pepper_tdm_t   *tdm = output->tdm;
-   const tdm_output_mode *mode;
-   tdm_error err = TDM_ERROR_NONE;
+       pepper_tdm_t   *tdm = output->tdm;
+       const tdm_output_mode *mode;
+       tdm_error err = TDM_ERROR_NONE;
 
-   if (!tdm->pixman_renderer) {
-        tdm->pixman_renderer = pepper_pixman_renderer_create(tdm->compositor);
-        PEPPER_CHECK(tdm->pixman_renderer, return,
-                     "pepper_pixman_renderer_create() failed.\n");
-   }
+       if (!tdm->pixman_renderer) {
+                 tdm->pixman_renderer = pepper_pixman_renderer_create(tdm->compositor);
+                 PEPPER_CHECK(tdm->pixman_renderer, return,
+                                                       "pepper_pixman_renderer_create() failed.\n");
+       }
 
-   output->renderer = tdm->pixman_renderer;
+       output->renderer = tdm->pixman_renderer;
 
-   err = tdm_output_get_mode(output->output, &mode);
-   PEPPER_CHECK(err == TDM_ERROR_NONE, goto error,
-                "tdm_output_get_mode() failed.\n");
-   output->tbm_surface_queue = tbm_surface_queue_create(3,
-                                                        mode->hdisplay, mode->vdisplay,
-                                                        TBM_FORMAT_XBGR8888, TBM_BO_SCANOUT);
-   PEPPER_CHECK(output->tbm_surface_queue, goto error,
-                "tbm_surface_queue_create() failed.\n");
+       err = tdm_output_get_mode(output->output, &mode);
+       PEPPER_CHECK(err == TDM_ERROR_NONE, goto error,
+                       "tdm_output_get_mode() failed.\n");
+       output->tbm_surface_queue = tbm_surface_queue_create(3,
+                                                       mode->hdisplay, mode->vdisplay,
+                                                       TBM_FORMAT_XBGR8888, TBM_BO_SCANOUT);
+       PEPPER_CHECK(output->tbm_surface_queue, goto error,
+               "tbm_surface_queue_create() failed.\n");
 
-   pepper_region_init(&output->previous_damage);
-   output->render_type = TDM_RENDER_TYPE_PIXMAN;
+       pepper_region_init(&output->previous_damage);
+       output->render_type = TDM_RENDER_TYPE_PIXMAN;
 
-   return;
+       return;
 
 error:
-   __tdm_renderer_pixman_fini(output);
+       __tdm_renderer_pixman_fini(output);
 }
 
 static void
@@ -210,44 +210,45 @@ __tdm_renderer_gl_fini(pepper_tdm_output_t *output)
 static void
 __tdm_renderer_gl_init(pepper_tdm_output_t *output)
 {
-   pepper_tdm_t    *tdm = output->tdm;
-   const tdm_output_mode *mode;
-   uint32_t        native_visual_id = TBM_FORMAT_XRGB8888;
-   tdm_error err = TDM_ERROR_NONE;
-
-   if (!tdm->gl_renderer) {
-        tdm->gl_renderer = pepper_gl_renderer_create(tdm->compositor, tdm->bufmgr,
-                                                     "tbm");
-        PEPPER_CHECK(tdm->gl_renderer, return, "pepper_gl_renderer_create() failed.\n");
-   }
-
-   output->renderer = tdm->gl_renderer;
-
-   err = tdm_output_get_mode(output->output, &mode);
-   PEPPER_CHECK(err == TDM_ERROR_NONE, goto error,
-                "tdm_output_get_mode() failed.\n");
-
-   output->tbm_surface_queue = tbm_surface_queue_create(3,
-                                                        mode->hdisplay, mode->vdisplay,
-                                                        TBM_FORMAT_XRGB8888,
-                                                        TBM_BO_SCANOUT);
-   PEPPER_CHECK(output->tbm_surface_queue, goto error,
-                "tbm_surface_queue_create() failed.\n");
-
-   output->render_target = pepper_gl_renderer_create_target(tdm->gl_renderer,
-                                                            output->tbm_surface_queue,
-                                                            PEPPER_FORMAT_XRGB8888,
-                                                            &native_visual_id,
-                                                            mode->hdisplay, mode->vdisplay);
-   PEPPER_CHECK(output->render_target, goto error,
-                "pepper_gl_renderer_create_target() failed.\n");
-   output->render_type = TDM_RENDER_TYPE_GL;
-
-   pepper_renderer_set_target(output->renderer, output->render_target);
-   return;
+       pepper_tdm_t    *tdm = output->tdm;
+       const tdm_output_mode *mode;
+       uint32_t                  native_visual_id = TBM_FORMAT_XRGB8888;
+       tdm_error err = TDM_ERROR_NONE;
+
+       if (!tdm->gl_renderer) {
+                 tdm->gl_renderer = pepper_gl_renderer_create(tdm->compositor, tdm->bufmgr,
+                                                                                                                                         "tbm");
+                 PEPPER_CHECK(tdm->gl_renderer, return, "pepper_gl_renderer_create() failed.\n");
+       }
+
+       output->renderer = tdm->gl_renderer;
+
+       err = tdm_output_get_mode(output->output, &mode);
+       PEPPER_CHECK(err == TDM_ERROR_NONE, goto error,
+                                        "tdm_output_get_mode() failed.\n");
+
+       output->tbm_surface_queue = tbm_surface_queue_create(3,
+                                                       mode->hdisplay, mode->vdisplay,
+                                                       TBM_FORMAT_XRGB8888,
+                                                       TBM_BO_SCANOUT);
+       PEPPER_CHECK(output->tbm_surface_queue, goto error,
+                               "tbm_surface_queue_create() failed.\n");
+
+       output->render_target = pepper_gl_renderer_create_target(tdm->gl_renderer,
+                                                               output->tbm_surface_queue,
+                                                               PEPPER_FORMAT_XRGB8888,
+                                                               &native_visual_id,
+                                                               mode->hdisplay, mode->vdisplay);
+       PEPPER_CHECK(output->render_target, goto error,
+                                        "pepper_gl_renderer_create_target() failed.\n");
+       output->render_type = TDM_RENDER_TYPE_GL;
+
+       pepper_renderer_set_target(output->renderer, output->render_target);
+
+       return;
 
 error:
-   __tdm_renderer_gl_fini(output);
+       __tdm_renderer_gl_fini(output);
 }
 
 static void
@@ -407,29 +408,28 @@ pepper_tdm_output_get_mode_count(void *o)
 static void
 pepper_tdm_output_get_mode(void *o, int index, pepper_output_mode_t *mode)
 {
-   pepper_tdm_output_t *output = (pepper_tdm_output_t *)o;
-   int num_mode;
-   const tdm_output_mode *modes;
-   const tdm_output_mode *cur_mode;
-   tdm_error error = TDM_ERROR_NONE;
-
-   tdm_output_get_available_modes(output->output, &modes, &num_mode);
-   PEPPER_CHECK(index < num_mode, return, "mode index is invalid\n");
-
-   mode->flags = 0;
-   mode->w = modes[index].hdisplay;
-   mode->h = modes[index].vdisplay;
-   mode->refresh = modes[index].vrefresh;
-
-   if (modes[index].type & TDM_OUTPUT_MODE_TYPE_PREFERRED)
-     mode->flags |= WL_OUTPUT_MODE_PREFERRED;
-
-   error = tdm_output_get_mode(output->output, &cur_mode);
-   if (error == TDM_ERROR_NONE)
-     {
-        if (cur_mode == &modes[index])
-          mode->flags |= WL_OUTPUT_MODE_CURRENT;
-     }
+       pepper_tdm_output_t *output = (pepper_tdm_output_t *)o;
+       int num_mode;
+       const tdm_output_mode *modes;
+       const tdm_output_mode *cur_mode;
+       tdm_error error = TDM_ERROR_NONE;
+
+       tdm_output_get_available_modes(output->output, &modes, &num_mode);
+       PEPPER_CHECK(index < num_mode, return, "mode index is invalid\n");
+
+       mode->flags = 0;
+       mode->w = modes[index].hdisplay;
+       mode->h = modes[index].vdisplay;
+       mode->refresh = modes[index].vrefresh;
+
+       if (modes[index].type & TDM_OUTPUT_MODE_TYPE_PREFERRED)
+         mode->flags |= WL_OUTPUT_MODE_PREFERRED;
+
+       error = tdm_output_get_mode(output->output, &cur_mode);
+       if (error == TDM_ERROR_NONE) {
+                 if (cur_mode == &modes[index])
+                        mode->flags |= WL_OUTPUT_MODE_CURRENT;
+         }
 }
 
 static pepper_bool_t
@@ -458,8 +458,8 @@ pepper_tdm_output_set_mode(void *o, const pepper_output_mode_t *mode)
 static void
 pepper_tdm_output_assign_planes(void *o, const pepper_list_t *view_list)
 {
-       pepper_list_t      *l;
-       pepper_tdm_output_t       *output = o;
+       pepper_list_t          *l;
+       pepper_tdm_output_t    *output = o;
 
        pepper_list_for_each_list(l, view_list) {
                pepper_view_t      *view = l->item;
@@ -568,7 +568,7 @@ pepper_tdm_output_init(pepper_tdm_t *tdm)
        const tdm_output_mode *preferred_mode = NULL;
        int num_mode;
 
-       const char     *render_env = getenv("PEPPER_RENDERER");
+       const char        *render_env = getenv("PEPPER_RENDERER");
 
        err = tdm_display_get_output_count(tdm->disp, &num_output);
        PEPPER_CHECK(err == TDM_ERROR_NONE, return PEPPER_FALSE, "Failed to get number of outputs\n");
@@ -590,7 +590,6 @@ pepper_tdm_output_init(pepper_tdm_t *tdm)
                if (status != TDM_OUTPUT_CONN_STATUS_CONNECTED)
                        continue;
 
-
                /*Setup default mode*/
                err = tdm_output_get_available_modes(output->output, &modes, &num_mode);
                PEPPER_CHECK(err == TDM_ERROR_NONE, goto error,

diff --git a/src/lib/wayland/wayland-common.c b/src/lib/wayland/wayland-common.c
index 1e5c5f79330e4311bcc9da65de8ef4e27c0f67c7..673fcb1d7f940a43356ab3a138b758196f1084cd 100644 (file)
--- a/src/lib/wayland/wayland-common.c
+++ b/src/lib/wayland/wayland-common.c
@@ -173,7 +173,7 @@ pepper_wayland_destroy(pepper_wayland_t *conn)
        wayland_output_t *output, *tmp;
 
        pepper_list_for_each_safe(output, tmp, &conn->output_list, link)
-       pepper_output_destroy(output->base);
+               pepper_output_destroy(output->base);
 
        if (conn->pixman_renderer)
                pepper_renderer_destroy(conn->pixman_renderer);