Changeset 879d7245 in mainline

Timestamp:

2019-11-30T00:00:51Z (5 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

94635b30

Parents:

fd777a2

Message:

Make use of window now having a pointer directly to display

Location:

uspace/srv/hid/display

Files:

• client.c (modified) (1 diff)
• window.c (modified) (3 diffs)

uspace/srv/hid/display/client.c

@@ -113 +113 @@
 
         /* Make sure window is no longer focused in any seat */
-        seat = ds_display_first_seat(wnd->client->display);
+        seat = ds_display_first_seat(wnd->display);
         while (seat != NULL) {
                 ds_seat_evac_focus(seat, wnd);

uspace/srv/hid/display/window.c

@@ -77 +77 @@
         ds_window_t *wnd = (ds_window_t *) arg;
 
-        log_msg(LOG_DEFAULT, LVL_NOTE, "gc_set_color gc=%p", wnd->client->display->gc);
-        return gfx_set_color(wnd->client->display->gc, color);
+        log_msg(LOG_DEFAULT, LVL_NOTE, "gc_set_color gc=%p", wnd->display->gc);
+        return gfx_set_color(wnd->display->gc, color);
 }
 
@@ -95 +95 @@
         log_msg(LOG_DEFAULT, LVL_NOTE, "gc_fill_rect");
         gfx_rect_translate(&wnd->dpos, rect, &drect);
-        return gfx_fill_rect(wnd->client->display->gc, &drect);
+        return gfx_fill_rect(wnd->display->gc, &drect);
 }
 
@@ -117 +117 @@
                 return ENOMEM;
 
-        rc = gfx_bitmap_create(wnd->client->display->gc, params, alloc,
+        rc = gfx_bitmap_create(wnd->display->gc, params, alloc,
             &cbm->bitmap);
         if (rc != EOK)