Rename variables to be more clear

Change-Id: I1e7197cdc4481ab7f856f1f7ec28320ca8d42f64

diff --git a/src/debug/debug.c b/src/debug/debug.c
index 2f97da7967b952af241af56c5a8a2aa1a002fff1..b65b284465dee630d7be91b14d684bf75c292626 100644 (file)
--- a/src/debug/debug.c
+++ b/src/debug/debug.c
@@ -262,7 +262,7 @@ _headless_debug_topvwins(headless_debug_t *hdebug, void *data)
                                        cnt, view, wl_resource_get_id(resource), pid,
                                        view->width, view->height, view->x, view->y,
                                        view->mapped ? "O" : "X",
-                                       (view->mapped && hdebug->server->top_view == view) ? "O" : "X",
+                                       (view->mapped && hdebug->server->top_visible_view == view) ? "O" : "X",
                                        (hdebug->server->focus_view == view) ? "O" : "X");
        }
 

diff --git a/src/headless_server.c b/src/headless_server.c
index 576df9ab5a210cef06c2b00e8de31e3c2aedeadf..0920b07a66bcc7f4e3a8501203ec155fefd68919 100644 (file)
--- a/src/headless_server.c
+++ b/src/headless_server.c
@@ -42,7 +42,7 @@ static void server_handle_new_shell_surface(struct wl_listener *listener,
 static void server_schedule_idle_task(headless_server_t *server);
 static void server_set_focus_view(headless_server_t *server,
                headless_view_t *view);
-static void server_set_top_view(headless_server_t *server,
+static void server_set_top_visible_view(headless_server_t *server,
                headless_view_t *view);
 
 static int
@@ -126,8 +126,8 @@ main(int argc, char *argv[])
 
        wl_list_init(&server.views);
 
-       wl_signal_init(&server.events.focus_change);
-       wl_signal_init(&server.events.top_change);
+       wl_signal_init(&server.events.focus_view_change);
+       wl_signal_init(&server.events.top_visible_view_change);
 
        server.compositor = ds_compositor_create(server.display);
        HS_CHECK(server.compositor, goto end, "Failed to create ds_compositor");
@@ -233,9 +233,9 @@ view_handle_shell_surface_destroy(struct wl_listener *listener, void *data)
        view = wl_container_of(listener, view, shell_surface_destroy);
        server = view->server;
 
-       if (server->top_view == view) {
-               server->top_view = NULL;
-               wl_signal_emit(&server->events.top_change, NULL);
+       if (server->top_visible_view == view) {
+               server->top_visible_view = NULL;
+               wl_signal_emit(&server->events.top_visible_view_change, NULL);
        }
 
        server_schedule_idle_task(server);
@@ -391,19 +391,19 @@ server_set_focus_view(headless_server_t *server, headless_view_t *view)
 
        server->focus_view = view;
 
-       wl_signal_emit(&server->events.focus_change, view);
+       wl_signal_emit(&server->events.focus_view_change, view);
 }
 
 static void
-server_set_top_view(headless_server_t *server, headless_view_t *view)
+server_set_top_visible_view(headless_server_t *server, headless_view_t *view)
 {
-       if (server->top_view == view)
+       if (server->top_visible_view == view)
                return;
 
        // TODO handle input and debug
 
-       if (server->top_view) {
-               headless_shell_send_visibility(server->top_view->shell_surface,
+       if (server->top_visible_view) {
+               headless_shell_send_visibility(server->top_visible_view->shell_surface,
                                TIZEN_VISIBILITY_VISIBILITY_FULLY_OBSCURED);
        }
 
@@ -412,9 +412,9 @@ server_set_top_view(headless_server_t *server, headless_view_t *view)
                                TIZEN_VISIBILITY_VISIBILITY_UNOBSCURED);
        }
 
-       server->top_view = view;
+       server->top_visible_view = view;
 
-       wl_signal_emit(&server->events.top_change, view);
+       wl_signal_emit(&server->events.top_visible_view_change, view);
 }
 
 static void
@@ -428,9 +428,9 @@ server_repaint(headless_server_t *server)
        size_t stride;
        bool access = false;
 
-    if (server->top_view) {
-        surface = server->top_view->surface;
-        buffer = server->top_view->buffer;
+    if (server->top_visible_view) {
+        surface = server->top_visible_view->surface;
+        buffer = server->top_visible_view->buffer;
     }
 
        if (buffer) {
@@ -455,7 +455,7 @@ static void
 idle_task(void *data)
 {
        headless_server_t *server = data;
-       headless_view_t *view, *focus_view = NULL, *top_view = NULL;
+       headless_view_t *view, *focus_view = NULL, *top_visible_view = NULL;
 
        server->idle_source = NULL;
 
@@ -466,18 +466,18 @@ idle_task(void *data)
                if (!view->mapped)
                        continue;
 
-               if (!top_view)
-                       top_view = view;
+               if (!top_visible_view)
+                       top_visible_view = view;
 
                if (!focus_view && !view->skip_focus)
                        focus_view = view;
 
-               if (focus_view && top_view)
+               if (focus_view && top_visible_view)
                        break;
        }
 
        server_set_focus_view(server, focus_view);
-       server_set_top_view(server, top_view);
+       server_set_top_visible_view(server, top_visible_view);
        server_repaint(server);
 }
 

diff --git a/src/headless_server.h b/src/headless_server.h
index ed3c5aba56e317d44524f76d420ba1ebded1aeb3..9a933bc3712b0d5d084101c88f1e16f08020040e 100644 (file)
--- a/src/headless_server.h
+++ b/src/headless_server.h
@@ -82,7 +82,7 @@ struct headless_server
        headless_debug_t *debug;
 
        headless_view_t *focus_view;
-       headless_view_t *top_view;
+       headless_view_t *top_visible_view;
 
        struct wl_event_source *sigint_source;
        struct wl_event_source *idle_source;
@@ -94,8 +94,8 @@ struct headless_server
        struct wl_list views; // headless_view::link
 
        struct {
-               struct wl_signal focus_change;
-        struct wl_signal top_change;
+               struct wl_signal focus_view_change;
+        struct wl_signal top_visible_view_change;
        } events;
 
        bool boot_animating;

diff --git a/src/input/input.c b/src/input/input.c
index b3a7ca0081d8efd913712d98d435beb81eeaaa35..638c5f7988735964b64df372fd19ffa5daaa47f4 100644 (file)
--- a/src/input/input.c
+++ b/src/input/input.c
@@ -52,7 +52,7 @@ struct headless_input
 {
        headless_server_t *server;
        headless_keyboard_t *keyboard;
-       headless_view_t *top_view;
+       headless_view_t *top_visible_view;
 
        struct ds_backend *backend;
        struct ds_seat *seat;
@@ -60,9 +60,9 @@ struct headless_input
        struct ds_tizen_input_devicemgr *devicemgr;
 
        struct wl_listener new_input;
-       struct wl_listener focus_change;
-       struct wl_listener top_change;
-       struct wl_listener top_view_destroy;
+       struct wl_listener focus_view_change;
+       struct wl_listener top_visible_view_change;
+       struct wl_listener top_visible_view_destroy;
 };
 
 struct headless_keyboard
@@ -76,8 +76,8 @@ struct headless_keyboard
 };
 
 static void handle_new_input(struct wl_listener *listener, void *data);
-static void handle_focus_change(struct wl_listener *listener, void *data);
-static void handle_top_change(struct wl_listener *listener, void *data);
+static void handle_focus_view_change(struct wl_listener *listener, void *data);
+static void handle_top_visible_view_change(struct wl_listener *listener, void *data);
 static void handle_top_view_destroy(struct wl_listener *listener, void *data);
 static headless_keyboard_t *create_keyboard(headless_input_t *input,
                struct ds_input_device *dev);
@@ -127,11 +127,13 @@ headless_input_create(headless_server_t *server)
        input->new_input.notify = handle_new_input;
        ds_backend_add_new_input_listener(input->backend, &input->new_input);
 
-       input->focus_change.notify = handle_focus_change;
-       wl_signal_add(&server->events.focus_change, &input->focus_change);
+       input->focus_view_change.notify = handle_focus_view_change;
+       wl_signal_add(&server->events.focus_view_change,
+            &input->focus_view_change);
 
-       input->top_change.notify = handle_top_change;
-       wl_signal_add(&server->events.top_change, &input->top_change);
+       input->top_visible_view_change.notify = handle_top_visible_view_change;
+       wl_signal_add(&server->events.top_visible_view_change,
+            &input->top_visible_view_change);
 
        ds_backend_start(input->backend);
 
@@ -155,11 +157,11 @@ headless_input_destroy(headless_input_t *input)
        if (input->keyboard)
                keyboard_destroy(input->keyboard);
 
-       if (input->top_view_destroy.notify)
-               wl_list_remove(&input->top_view_destroy.link);
+       if (input->top_visible_view_destroy.notify)
+               wl_list_remove(&input->top_visible_view_destroy.link);
 
-       wl_list_remove(&input->top_change.link);
-       wl_list_remove(&input->focus_change.link);
+       wl_list_remove(&input->top_visible_view_change.link);
+       wl_list_remove(&input->focus_view_change.link);
        wl_list_remove(&input->new_input.link);
 
        ds_backend_destroy(input->backend);
@@ -167,12 +169,12 @@ headless_input_destroy(headless_input_t *input)
 }
 
 static void
-handle_focus_change(struct wl_listener *listener, void *data)
+handle_focus_view_change(struct wl_listener *listener, void *data)
 {
        headless_input_t *input;
        headless_view_t *view = data;
 
-       input = wl_container_of(listener, input, focus_change);
+       input = wl_container_of(listener, input, focus_view_change);
 
        if (view) {
                ds_seat_keyboard_notify_enter(input->seat, view->surface,
@@ -184,24 +186,24 @@ handle_focus_change(struct wl_listener *listener, void *data)
 }
 
 static void
-handle_top_change(struct wl_listener *listener, void *data)
+handle_top_visible_view_change(struct wl_listener *listener, void *data)
 {
        headless_input_t *input;
        headless_view_t *view = data;
 
-       input = wl_container_of(listener, input, top_change);
+       input = wl_container_of(listener, input, top_visible_view_change);
 
-       if (input->top_view_destroy.notify) {
-               wl_list_remove(&input->top_view_destroy.link);
-               input->top_view_destroy.notify = NULL;
+       if (input->top_visible_view_destroy.notify) {
+               wl_list_remove(&input->top_visible_view_destroy.link);
+               input->top_visible_view_destroy.notify = NULL;
        }
 
        if (view) {
-               input->top_view_destroy.notify = handle_top_view_destroy;
-               wl_signal_add(&view->events.destroy, &input->top_view_destroy);
+               input->top_visible_view_destroy.notify = handle_top_view_destroy;
+               wl_signal_add(&view->events.destroy, &input->top_visible_view_destroy);
        }
 
-       input->top_view = view;
+       input->top_visible_view = view;
 }
 
 static void
@@ -209,12 +211,12 @@ handle_top_view_destroy(struct wl_listener *listener, void *data)
 {
        headless_input_t *input;
 
-       input = wl_container_of(listener, input, top_view_destroy);
+       input = wl_container_of(listener, input, top_visible_view_destroy);
 
-       wl_list_remove(&input->top_view_destroy.link);
+       wl_list_remove(&input->top_visible_view_destroy.link);
 
-       input->top_view_destroy.notify = NULL;
-       input->top_view = NULL;
+       input->top_visible_view_destroy.notify = NULL;
+       input->top_visible_view = NULL;
 }
 
 static void
@@ -325,7 +327,7 @@ keyboard_handle_key(struct wl_listener *listener, void *data)
                        ev->time_msec, ev->update_state);
 
        ds_tizen_keyrouter_notify_key(input->keyrouter, input->seat,
-                       input->top_view ? input->top_view->surface : NULL,
+                       input->top_visible_view ? input->top_visible_view->surface : NULL,
                        ev->time_msec, ev->keycode, ev->state);
 }