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

Timestamp:

2020-02-10T19:10:15Z (4 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

b252e87

Parents:

f7fb2b21

Message:

Fix cstyle

File:

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

uspace/lib/gui/window.c

@@ -462 +462 @@
 
         /* Inform compositor about new surface. */
-//      errno_t rc = win_resize(win->osess, offset_x, offset_y, width, height,
-//          placement_flags, surface_direct_access(new_surface));
+#if 0
+        errno_t rc = win_resize(win->osess, offset_x, offset_y, width, height,
+            placement_flags, surface_direct_access(new_surface));
+#endif
         rc = EOK;
 
@@ -520 +522 @@
         fibril_mutex_unlock(&win->guard);
 
-
         if (width > 0 && height > 0) {
                 /* Notify compositor. */
@@ -530 +531 @@
                 rect.p1.y = y + height;
 
-                printf("render damaged region: %d,%d,%d,%d,\n",
-                    (int)x,(int)y,(int)width,(int)height);
                 if (win->bitmap != NULL)
                         (void) gfx_bitmap_render(win->bitmap, &rect, NULL);
@@ -638 +637 @@
                 exit(0); /* Terminate whole task. */
         }
-        return 0;
-}
-
-/* Input fetcher from compositor. Runs in own dedicated fibril. */
-static errno_t fetch_input(void *arg)
-{
-//      errno_t rc;
-//      bool terminate = false;
-//      window_t *win = (window_t *) arg;
-
-/*      while (true) {
-                window_event_t *event = (window_event_t *) malloc(sizeof(window_event_t));
-
-                if (event) {
-                        rc = win_get_event(win->isess, event);
-                        if (rc == EOK) {
-                                terminate = (event->type == ET_WINDOW_CLOSE);
-                                link_initialize(&event->link);
-                                prodcons_produce(&win->events, &event->link);
-                        } else {
-                                free(event);
-                                terminate = true;
-                        }
-                } else {
-                        terminate = true;
-                }
-
-                if (terminate) {
-                        break;
-                }
-        }
-*/
         return 0;
 }
@@ -704 +671 @@
         }
 
-
         if (caption == NULL)
                 win->caption = NULL;
@@ -777 +743 @@
 {
         fid_t ev_fid = fibril_create(event_loop, win);
-        fid_t fi_fid = fibril_create(fetch_input, win);
-        if (!ev_fid || !fi_fid) {
+        if (!ev_fid) {
                 return;
         }
         fibril_add_ready(ev_fid);
-        fibril_add_ready(fi_fid);
 }