Changeset afcf704 in mainline for uspace/lib/gui/window.c

Timestamp:

2020-06-14T22:23:34Z (5 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

c45d8696

Parents:

28f8f6f2

Message:

Allow GUI direct access to window buffer

File:

• uspace/lib/gui/window.c (modified) (2 diffs)

uspace/lib/gui/window.c

@@ -414 +414 @@
         }
 
-        /* Allocate resources for new surface. */
-        surface_t *new_surface = surface_create(width, height, NULL,
-            SURFACE_FLAG_SHARED);
-        if (!new_surface)
-                return;
-
-        gfx_bitmap_params_init(&params);
-        params.rect.p0.x = 0;
-        params.rect.p0.y = 0;
-        params.rect.p1.x = width;
-        params.rect.p1.y = height;
-
-        alloc.pitch = width * sizeof(uint32_t);
-        alloc.off0 = 0;
-        alloc.pixels = surface_direct_access(new_surface);
-
-        rc = gfx_bitmap_create(win->gc, &params, &alloc, &new_bitmap);
-        if (rc != EOK) {
-                surface_destroy(new_surface);
-                return;
-        }
-
-        /* Switch new and old surface. */
         fibril_mutex_lock(&win->guard);
-        surface_t *old_surface = win->surface;
-        gfx_bitmap_t *old_bitmap = win->bitmap;
-        win->surface = new_surface;
-        win->bitmap = new_bitmap;
-        fibril_mutex_unlock(&win->guard);
-
-        /*
-         * Let all widgets in the tree alter their position and size.
-         * Widgets might also paint themselves onto the new surface.
-         */
-        win->root.rearrange(&win->root, 0, 0, width, height);
-
-        fibril_mutex_lock(&win->guard);
-        surface_reset_damaged_region(win->surface);
-        fibril_mutex_unlock(&win->guard);
+
+        /* Deallocate old bitmap. */
+        if (win->bitmap != NULL) {
+                gfx_bitmap_destroy(win->bitmap);
+                win->bitmap = NULL;
+        }
+
+        /* Deallocate old surface. */
+        if (win->surface != NULL) {
+                surface_destroy(win->surface);
+                win->surface = NULL;
+        }
 
         /* Resize the display window. */
@@ -463 +437 @@
 
         rc = display_window_resize(win->dwindow, &offs, &nrect);
+        if (rc != EOK)
+                return;
+
+        gfx_bitmap_params_init(&params);
+#ifndef CONFIG_WIN_DOUBLE_BUF
+        params.flags = bmpf_direct_output;
+#else
+        params.flags = 0;
+#endif
+        params.rect.p0.x = 0;
+        params.rect.p0.y = 0;
+        params.rect.p1.x = width;
+        params.rect.p1.y = height;
+
+        rc = gfx_bitmap_create(win->gc, &params, NULL, &new_bitmap);
         if (rc != EOK) {
-                /* Rollback to old surface. Reverse all changes. */
-
-                sysarg_t old_width = 0;
-                sysarg_t old_height = 0;
-                if (old_surface)
-                        surface_get_resolution(old_surface, &old_width, &old_height);
-
-                fibril_mutex_lock(&win->guard);
-                new_surface = win->surface;
-                win->surface = old_surface;
-                win->bitmap = old_bitmap;
+                if (rc == ENOTSUP) {
+                        /* Direct output is not supported */
+                        params.flags &= ~bmpf_direct_output;
+                        rc = gfx_bitmap_create(win->gc, &params, NULL, &new_bitmap);
+                        if (rc != EOK) {
+                                fibril_mutex_unlock(&win->guard);
+                                return;
+                        }
+                }
+        }
+
+        rc = gfx_bitmap_get_alloc(new_bitmap, &alloc);
+        if (rc != EOK) {
                 fibril_mutex_unlock(&win->guard);
-
-                win->root.rearrange(&win->root, 0, 0, old_width, old_height);
-
-                if (win->surface) {
-                        fibril_mutex_lock(&win->guard);
-                        surface_reset_damaged_region(win->surface);
-                        fibril_mutex_unlock(&win->guard);
-                }
-
-                surface_destroy(new_surface);
-                return;
-        }
-
-        if (old_bitmap != NULL)
-                gfx_bitmap_destroy(old_bitmap);
-        /* Deallocate old surface. */
-        if (old_surface)
-                surface_destroy(old_surface);
+                return;
+        }
+
+        /* Allocate new surface. */
+        surface_t *new_surface = surface_create(width, height, alloc.pixels, 0);
+        if (!new_surface) {
+                gfx_bitmap_destroy(new_bitmap);
+                fibril_mutex_unlock(&win->guard);
+                return;
+        }
+
+        /* Switch in new surface and bitmap. */
+        win->surface = new_surface;
+        win->bitmap = new_bitmap;
+        fibril_mutex_unlock(&win->guard);
+
+        /*
+         * Let all widgets in the tree alter their position and size.
+         * Widgets might also paint themselves onto the new surface.
+         */
+        win->root.rearrange(&win->root, 0, 0, width, height);
+
+        fibril_mutex_lock(&win->guard);
+        surface_reset_damaged_region(win->surface);
+        fibril_mutex_unlock(&win->guard);
 
         if (placement_flags != WINDOW_PLACEMENT_ANY) {