Changeset 2012fe0 in mainline

Timestamp:

2020-01-21T15:04:53Z (4 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

28db46b

Parents:

c79545e

git-author:

Jiri Svoboda <jiri@…> (2020-01-20 19:04:50)

git-committer:

Jiri Svoboda <jiri@…> (2020-01-21 15:04:53)

Message:

Repaint display when finished moving a window

Location:

uspace/srv/hid/display

Files:

• display.c (modified) (3 diffs)
• display.h (modified) (2 diffs)
• test/display.c (modified) (1 diff)
• window.c (modified) (2 diffs)
• window.h (modified) (2 diffs)

uspace/srv/hid/display/display.c

@@ -236 +236 @@
 }
 
+/** Get last window in display.
+ *
+ * @param display Display
+ * @return Last window or @c NULL if there is none
+ */
+ds_window_t *ds_display_last_window(ds_display_t *display)
+{
+        link_t *link = list_last(&display->windows);
+
+        if (link == NULL)
+                return NULL;
+
+        return list_get_instance(link, ds_window_t, ldwindows);
+}
+
 /** Get next window in client.
  *
@@ -244 +259 @@
 {
         link_t *link = list_next(&wnd->ldwindows, &wnd->display->windows);
+
+        if (link == NULL)
+                return NULL;
+
+        return list_get_instance(link, ds_window_t, ldwindows);
+}
+
+/** Get previous window in client.
+ *
+ * @param wnd Current window
+ * @return Previous window or @c NULL if there is none
+ */
+ds_window_t *ds_display_prev_window(ds_window_t *wnd)
+{
+        link_t *link = list_prev(&wnd->ldwindows, &wnd->display->windows);
 
         if (link == NULL)
@@ -441 +471 @@
 }
 
+/** Paint display.
+ *
+ * @param display Display
+ * @param rect Bounding rectangle or @c NULL to repaint entire display
+ */
+errno_t ds_display_paint(ds_display_t *disp, gfx_rect_t *rect)
+{
+        errno_t rc;
+        ds_window_t *wnd;
+
+        /* Paint background */
+        rc = ds_display_paint_bg(disp, rect);
+        if (rc != EOK)
+                return rc;
+
+        /* Paint windows bottom to top */
+        wnd = ds_display_last_window(disp);
+        while (wnd != NULL) {
+                rc = ds_window_paint(wnd, rect);
+                if (rc != EOK)
+                        return rc;
+
+                wnd = ds_display_prev_window(wnd);
+        }
+
+        return EOK;
+}
+
 /** @}
  */

uspace/srv/hid/display/display.h

@@ -58 +58 @@
 extern void ds_display_remove_window(ds_window_t *);
 extern ds_window_t *ds_display_first_window(ds_display_t *);
+extern ds_window_t *ds_display_last_window(ds_display_t *);
 extern ds_window_t *ds_display_next_window(ds_window_t *);
+extern ds_window_t *ds_display_prev_window(ds_window_t *);
 extern errno_t ds_display_post_kbd_event(ds_display_t *, kbd_event_t *);
 extern errno_t ds_display_post_ptd_event(ds_display_t *, ptd_event_t *);
@@ -71 +73 @@
 extern gfx_context_t *ds_display_get_gc(ds_display_t *);
 extern errno_t ds_display_paint_bg(ds_display_t *, gfx_rect_t *);
+extern errno_t ds_display_paint(ds_display_t *, gfx_rect_t *);
 
 #endif

uspace/srv/hid/display/test/display.c

@@ -128 +128 @@
         PCUT_ASSERT_NULL(wnd);
 
+        wnd = ds_display_last_window(disp);
+        PCUT_ASSERT_EQUALS(w1, wnd);
+
+        wnd = ds_display_prev_window(wnd);
+        PCUT_ASSERT_EQUALS(w0, wnd);
+
+        wnd = ds_display_prev_window(wnd);
+        PCUT_ASSERT_NULL(wnd);
+
         wnd = ds_display_find_window(disp, w0->id);
         PCUT_ASSERT_EQUALS(w0, wnd);

uspace/srv/hid/display/window.c

@@ -348 +348 @@
 }
 
-/** Repaint a window using its backing bitmap.
- *
- * @param wnd Window to repaint
- * @return EOK on success or an error code
- */
-static errno_t ds_window_repaint(ds_window_t *wnd)
-{
-        log_msg(LOG_DEFAULT, LVL_DEBUG, "ds_window_start_repaint");
-        return gfx_bitmap_render(wnd->bitmap, NULL, &wnd->dpos);
+/** Paint a window using its backing bitmap.
+ *
+ * @param wnd Window to paint
+ * @param rect Display rectangle to paint to
+ * @return EOK on success or an error code
+ */
+errno_t ds_window_paint(ds_window_t *wnd, gfx_rect_t *rect)
+{
+        gfx_rect_t srect;
+        gfx_rect_t *brect;
+        gfx_rect_t crect;
+
+        log_msg(LOG_DEFAULT, LVL_DEBUG, "ds_window_paint");
+
+        if (rect != NULL) {
+                gfx_rect_rtranslate(&wnd->dpos, rect, &srect);
+
+                /* Determine if we have anything to do */
+                gfx_rect_clip(&srect, rect, &crect);
+                if (gfx_rect_is_empty(&crect))
+                        return EOK;
+
+                brect = &srect;
+        } else {
+                brect = NULL;
+        }
+
+        return gfx_bitmap_render(wnd->bitmap, brect, &wnd->dpos);
 }
 
@@ -399 +418 @@
         wnd->state = dsw_idle;
 
-        (void) ds_window_repaint(wnd);
+        (void) ds_display_paint(wnd->display, NULL);
 }
 

uspace/srv/hid/display/window.h

@@ -40 +40 @@
 #include <io/pos_event.h>
 #include <types/gfx/context.h>
+#include <types/gfx/coord.h>
 #include <types/gfx/ops/context.h>
 #include "types/display/display.h"
@@ -51 +52 @@
 extern void ds_window_destroy(ds_window_t *);
 extern gfx_context_t *ds_window_get_ctx(ds_window_t *);
+extern errno_t ds_window_paint(ds_window_t *, gfx_rect_t *);
 extern errno_t ds_window_post_pos_event(ds_window_t *, pos_event_t *);