Changeset 3275736 in mainline

Timestamp:

2020-01-30T12:14:37Z (5 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

287688f

Parents:

4645b2c

git-author:

Jiri Svoboda <jiri@…> (2020-01-29 20:14:25)

git-committer:

Jiri Svoboda <jiri@…> (2020-01-30 12:14:37)

Message:

Create display window upon resize

GUI window size is not known when it is created. Until display server can
resize windows, need this hack so that we know the correct size when
creating the display window.

File:

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

uspace/lib/gui/window.c

@@ -370 +370 @@
     sysarg_t width, sysarg_t height, window_placement_flags_t placement_flags)
 {
+        display_wnd_params_t wparams;
+        display_window_t *new_window = NULL;
         gfx_bitmap_params_t params;
         gfx_bitmap_alloc_t alloc;
+        gfx_bitmap_t *new_bitmap = NULL;
+        gfx_context_t *new_gc = NULL;
+        errno_t rc;
 
         if (width < 2 * border_thickness + header_min_width) {
@@ -389 +394 @@
                 return;
 
-        gfx_bitmap_t *new_bitmap = NULL;
+        display_wnd_params_init(&wparams);
+        wparams.rect.p0.x = 0;
+        wparams.rect.p0.y = 0;
+        wparams.rect.p1.x = width;
+        wparams.rect.p1.y = height;
+
+        rc = display_window_create(win->display, &wparams, NULL, NULL,
+            &new_window);
+        if (rc != EOK) {
+                surface_destroy(new_surface);
+                return;
+        }
+
+        rc = display_window_get_gc(new_window, &new_gc);
+        if (rc != EOK) {
+                display_window_destroy(new_window);
+                surface_destroy(new_surface);
+                return;
+        }
 
         params.rect.p0.x = 0;
@@ -400 +423 @@
         alloc.pixels = surface_direct_access(new_surface);
 
-        errno_t rc = gfx_bitmap_create(win->gc, &params, &alloc, &new_bitmap);
+        rc = gfx_bitmap_create(new_gc, &params, &alloc, &new_bitmap);
         if (rc != EOK) {
+                gfx_context_delete(new_gc);
+                display_window_destroy(new_window);
                 surface_destroy(new_surface);
                 return;
@@ -410 +435 @@
         surface_t *old_surface = win->surface;
         gfx_bitmap_t *old_bitmap = win->bitmap;
+        display_window_t *old_window = win->dwindow;
+        gfx_context_t *old_gc = win->gc;
         win->surface = new_surface;
         win->bitmap = new_bitmap;
+        win->dwindow = new_window;
+        win->gc = new_gc;
         fibril_mutex_unlock(&win->guard);
 
@@ -440 +469 @@
                 new_surface = win->surface;
                 win->surface = old_surface;
+                win->bitmap = old_bitmap;
+                win->dwindow = old_window;
+                win->gc = old_gc;
                 fibril_mutex_unlock(&win->guard);
 
@@ -452 +484 @@
                 surface_destroy(new_surface);
         } else {
+                if (old_window != NULL)
+                        display_window_destroy(old_window);
+                if (old_gc != NULL)
+                        gfx_context_delete(old_gc);
                 if (old_bitmap != NULL)
                         gfx_bitmap_destroy(old_bitmap);
@@ -488 +524 @@
                 printf("render damaged region: %d,%d,%d,%d,\n",
                     (int)x,(int)y,(int)width,(int)height);
-                (void) gfx_bitmap_render(win->bitmap, &rect, NULL);
+                if (win->bitmap != NULL)
+                        (void) gfx_bitmap_render(win->bitmap, &rect, NULL);
         }
 }
@@ -631 +668 @@
     window_flags_t flags, const char *caption)
 {
-        window_t *win = (window_t *) malloc(sizeof(window_t));
+        window_t *win = (window_t *) calloc(1, sizeof(window_t));
         if (!win)
                 return NULL;
@@ -659 +696 @@
         }
 
-        display_wnd_params_t params;
-        display_wnd_params_init(&params);
-
-        params.rect.p0.x = 0;
-        params.rect.p0.y = 0;
-        params.rect.p1.x = 200;
-        params.rect.p1.y = 100;
-
-        rc = display_window_create(win->display, &params, NULL, NULL,
-            &win->dwindow);
-        if (rc != EOK) {
-                display_close(win->display);
-                free(win);
-                return NULL;
-        }
-
-        rc = display_window_get_gc(win->dwindow, &win->gc);
-        if (rc != EOK) {
-                (void) display_window_destroy(win->dwindow);
-                display_close(win->display);
-                free(win);
-                return NULL;
-        }
 
         if (caption == NULL)