view: s/scene_node/content_node/

diff --git a/include/view.h b/include/view.h
index 19b04939414719558336e772614c52493a63739b..966b792b35966b1f2a98a87125108a828f1468ce 100644 (file)
--- a/include/view.h
+++ b/include/view.h
@@ -198,7 +198,7 @@ struct view {
        struct workspace *workspace;
        struct wlr_surface *surface;
        struct wlr_scene_tree *scene_tree;
-       struct wlr_scene_node *scene_node;
+       struct wlr_scene_node *content_node;
 
        bool mapped;
        bool been_mapped;

diff --git a/src/debug.c b/src/debug.c
index 7fb2672d5e0e6dac3779634585ecce9b92d2ae37..37ac533c10e73b49e6be55c454f5a2c168eb65d9 100644 (file)
--- a/src/debug.c
+++ b/src/debug.c
@@ -75,8 +75,8 @@ get_view_part(struct view *view, struct wlr_scene_node *node)
                snprintf(view_name, sizeof(view_name), "view (%s)", app_id);
                return view_name;
        }
-       if (node == view->scene_node) {
-               return "view->scene_node";
+       if (node == view->content_node) {
+               return "view->content_node";
        }
        if (view->resize_indicator.tree
                        && node == &view->resize_indicator.tree->node) {

diff --git a/src/input/ime.c b/src/input/ime.c
index c09ef94877de00c0d1a1bf762399bfc198767e1f..d64ee195de3d8ba073d729101783c5e99de0b9b2 100644 (file)
--- a/src/input/ime.c
+++ b/src/input/ime.c
@@ -188,7 +188,7 @@ update_popup_position(struct input_method_popup *popup)
 
                /*
                 * wlr_surface->data is:
-                * - for XDG surfaces: view->scene_node
+                * - for XDG surfaces: view->content_node
                 * - for layer surfaces: lab_layer_surface->scene_layer_surface->tree
                 * - for layer popups: lab_layer_popup->scene_tree
                 */

diff --git a/src/view.c b/src/view.c
index 74a7528605150cc1001edc87de5768e0658eb075..1d8dc7f954c6b6ceeb96fc59c2cb8db114a8ed46 100644 (file)
--- a/src/view.c
+++ b/src/view.c
@@ -2471,7 +2471,7 @@ view_set_shade(struct view *view, bool shaded)
 
        view->shaded = shaded;
        ssd_enable_shade(view->ssd, view->shaded);
-       wlr_scene_node_set_enabled(view->scene_node, !view->shaded);
+       wlr_scene_node_set_enabled(view->content_node, !view->shaded);
 
        if (view->impl->shade) {
                view->impl->shade(view, shaded);

diff --git a/src/xdg.c b/src/xdg.c
index daa5eba2958a71c4419425e3980cd2eb1d3ff9bd..be4173ecbefcd896814369445a51f9fe3a1b8a89 100644 (file)
--- a/src/xdg.c
+++ b/src/xdg.c
@@ -933,7 +933,7 @@ xdg_toplevel_new(struct wl_listener *listener, void *data)
                free(xdg_toplevel_view);
                return;
        }
-       view->scene_node = &tree->node;
+       view->content_node = &tree->node;
        node_descriptor_create(&view->scene_tree->node,
                LAB_NODE_DESC_VIEW, view);
 

diff --git a/src/xwayland.c b/src/xwayland.c
index 9d05d79c5fce670704cc75eb7170f0e8bb916f5f..4e53f62ee2df03342c2110c02bb8ec469bea0c92 100644 (file)
--- a/src/xwayland.c
+++ b/src/xwayland.c
@@ -735,7 +735,7 @@ xwayland_view_map(struct view *view)
                        wl_resource_post_no_memory(view->surface->resource);
                        return;
                }
-               view->scene_node = &tree->node;
+               view->content_node = &tree->node;
        }
 
        /*