app: do not use the Qt surface ID shift hack

[staging/windowmanager.git] / src / app.cpp

diff --git a/src/app.cpp b/src/app.cpp
index 78dc7d9..c672052 100644 (file)
--- a/src/app.cpp
+++ b/src/app.cpp
@@ -313,10 +313,15 @@ void App::surface_set_layout(uint32_t surface_id) {
    s->set_destination_rectangle(x, y, w, h);
 
    // XXX: The main_surface will be visible regardless
-   s->set_visibility(
-      surface_id == static_cast<unsigned>(this->layers.main_surface) ? 1 : 0);
+   //s->set_visibility(
+   //   surface_id == static_cast<unsigned>(this->layers.main_surface) ? 1 : 0);
    this->controller->layers[layer_id]->add_surface(s.get());
 
+   if (surface_id == static_cast<unsigned>(this->layers.main_surface)) {
+      logdebug("Activating main_surface (%d)", surface_id);
+      this->activate_surface(surface_id);
+   }
+
    logdebug("Surface %u now on layer %u with rect { %d, %d, %d, %d }",
             surface_id, layer_id, x, y, w, h);
 }
@@ -413,7 +418,7 @@ void App::execute_pending() {
 // | .__/|_|  \___/_/\_\_|\___|\__,_| |_____| \_/ \___|_| |_|\__|___/
 // |_|
 void App::surface_created(uint32_t surface_id) {
-   surface_id >>= id_allocator::id_shift;
+   //surface_id >>= id_allocator::id_shift;
 
    logdebug("surface_id is %u", surface_id);
 
@@ -423,7 +428,7 @@ void App::surface_created(uint32_t surface_id) {
 }
 
 void App::surface_removed(uint32_t surface_id) {
-   surface_id >>= id_allocator::id_shift;
+   //surface_id >>= id_allocator::id_shift;
 
    logdebug("surface_id is %u", surface_id);