Changeset b3c185b6 in mainline for uspace/srv/hid/display/window.c

Timestamp:

2019-11-04T14:05:35Z (4 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

be15256

Parents:

22faaf2

git-author:

Jiri Svoboda <jiri@…> (2019-10-03 18:05:09)

git-committer:

Jiri Svoboda <jiri@…> (2019-11-04 14:05:35)

Message:

Window event delivery mechanism

File:

• uspace/srv/hid/display/window.c (modified) (7 diffs)

uspace/srv/hid/display/window.c

@@ -43 +43 @@
 #include <io/log.h>
 #include <stdlib.h>
+#include "client.h"
 #include "display.h"
 #include "window.h"
@@ -76 +77 @@
         ds_window_t *wnd = (ds_window_t *) arg;
 
-        log_msg(LOG_DEFAULT, LVL_NOTE, "gc_set_color");
-        return gfx_set_color(wnd->display->gc, color);
+        log_msg(LOG_DEFAULT, LVL_NOTE, "gc_set_color gc=%p", wnd->client->display->gc);
+        return gfx_set_color(wnd->client->display->gc, color);
 }
 
@@ -94 +95 @@
         log_msg(LOG_DEFAULT, LVL_NOTE, "gc_fill_rect");
         gfx_rect_translate(&wnd->dpos, rect, &drect);
-        return gfx_fill_rect(wnd->display->gc, &drect);
+        return gfx_fill_rect(wnd->client->display->gc, &drect);
 }
 
@@ -116 +117 @@
                 return ENOMEM;
 
-        rc = gfx_bitmap_create(wnd->display->gc, params, alloc, &cbm->bitmap);
+        rc = gfx_bitmap_create(wnd->client->display->gc, params, alloc,
+            &cbm->bitmap);
         if (rc != EOK)
                 goto error;
@@ -181 +183 @@
  * Create graphics context for rendering into a window.
  *
- * @param disp Display to create window on
+ * @param client Client owning the window
  * @param rgc Place to store pointer to new GC.
  *
  * @return EOK on success or an error code
  */
-errno_t ds_window_create(ds_display_t *disp, ds_window_t **rgc)
+errno_t ds_window_create(ds_client_t *client, ds_window_t **rgc)
 {
         ds_window_t *wnd = NULL;
@@ -202 +204 @@
                 goto error;
 
-        ds_display_add_window(disp, wnd);
+        ds_client_add_window(client, wnd);
 
         wnd->gc = gc;
@@ -222 +224 @@
         errno_t rc;
 
-        ds_display_remove_window(wnd);
+        ds_client_remove_window(wnd);
 
         rc = gfx_context_delete(wnd->gc);