Changes in uspace/srv/hid/compositor/compositor.c [2bb6d04:737ebf3] in mainline

File:

• uspace/srv/hid/compositor/compositor.c (modified) (15 diffs)

uspace/srv/hid/compositor/compositor.c

@@ -67 +67 @@
 #include <transform.h>
 #include <rectangle.h>
-#include <draw/surface.h>
-#include <draw/cursor.h>
-#include <draw/source.h>
-#include <draw/drawctx.h>
-#include <draw/codec.h>
+#include <surface.h>
+#include <cursor.h>
+#include <source.h>
+#include <drawctx.h>
+#include <codec/tga.h>
 
 #include "compositor.h"
@@ -634 +634 @@
 static void comp_window_damage(window_t *win, ipc_call_t *icall)
 {
-        double x = ipc_get_arg1(icall);
-        double y = ipc_get_arg2(icall);
-        double width = ipc_get_arg3(icall);
-        double height = ipc_get_arg4(icall);
+        double x = IPC_GET_ARG1(*icall);
+        double y = IPC_GET_ARG2(*icall);
+        double width = IPC_GET_ARG3(*icall);
+        double height = IPC_GET_ARG4(*icall);
 
         if ((width == 0) || (height == 0)) {
@@ -655 +655 @@
 static void comp_window_grab(window_t *win, ipc_call_t *icall)
 {
-        sysarg_t pos_id = ipc_get_arg1(icall);
-        sysarg_t grab_flags = ipc_get_arg2(icall);
+        sysarg_t pos_id = IPC_GET_ARG1(*icall);
+        sysarg_t grab_flags = IPC_GET_ARG2(*icall);
 
         /*
@@ -732 +732 @@
 
         /* Create new surface for the resized window. */
-        surface_t *new_surface = surface_create(ipc_get_arg3(icall),
-            ipc_get_arg4(icall), new_cell_storage, SURFACE_FLAG_SHARED);
+        surface_t *new_surface = surface_create(IPC_GET_ARG3(*icall),
+            IPC_GET_ARG4(*icall), new_cell_storage, SURFACE_FLAG_SHARED);
         if (!new_surface) {
                 as_area_destroy(new_cell_storage);
@@ -740 +740 @@
         }
 
-        sysarg_t offset_x = ipc_get_arg1(icall);
-        sysarg_t offset_y = ipc_get_arg2(icall);
+        sysarg_t offset_x = IPC_GET_ARG1(*icall);
+        sysarg_t offset_y = IPC_GET_ARG2(*icall);
         window_placement_flags_t placement_flags =
-            (window_placement_flags_t) ipc_get_arg5(icall);
+            (window_placement_flags_t) IPC_GET_ARG5(*icall);
 
         comp_update_viewport_bound_rect();
@@ -921 +921 @@
 {
         ipc_call_t call;
-        service_id_t service_id = (service_id_t) ipc_get_arg2(icall);
+        service_id_t service_id = (service_id_t) IPC_GET_ARG2(*icall);
 
         /* Allocate resources for new window and register it to the location service. */
@@ -928 +928 @@
 
                 async_get_call(&call);
-                if (ipc_get_imethod(&call) == WINDOW_REGISTER) {
+                if (IPC_GET_IMETHOD(call) == WINDOW_REGISTER) {
                         fibril_mutex_lock(&window_list_mtx);
 
@@ -938 +938 @@
                         }
 
-                        win->flags = ipc_get_arg1(&call);
+                        win->flags = IPC_GET_ARG1(call);
 
                         char name_in[LOC_NAME_MAXLEN + 1];
@@ -1014 +1014 @@
                         async_get_call(&call);
 
-                        if (!ipc_get_imethod(&call)) {
+                        if (!IPC_GET_IMETHOD(call)) {
                                 async_answer_0(&call, EOK);
                                 window_destroy(win);
@@ -1020 +1020 @@
                         }
 
-                        switch (ipc_get_imethod(&call)) {
+                        switch (IPC_GET_IMETHOD(call)) {
                         case WINDOW_GET_EVENT:
                                 comp_window_get_event(win, &call);
@@ -1032 +1032 @@
                         async_get_call(&call);
 
-                        if (!ipc_get_imethod(&call)) {
+                        if (!IPC_GET_IMETHOD(call)) {
                                 comp_window_close(win, &call);
                                 window_destroy(win);
@@ -1038 +1038 @@
                         }
 
-                        switch (ipc_get_imethod(&call)) {
+                        switch (IPC_GET_IMETHOD(call)) {
                         case WINDOW_DAMAGE:
                                 comp_window_damage(win, &call);
@@ -1067 +1067 @@
 static void comp_mode_change(viewport_t *vp, ipc_call_t *icall)
 {
-        sysarg_t mode_idx = ipc_get_arg2(icall);
+        sysarg_t mode_idx = IPC_GET_ARG2(*icall);
         fibril_mutex_lock(&viewport_list_mtx);
 
@@ -1165 +1165 @@
         fibril_mutex_lock(&viewport_list_mtx);
         list_foreach(viewport_list, link, viewport_t, cur) {
-                if (cur->dsid == (service_id_t) ipc_get_arg1(icall)) {
+                if (cur->dsid == (service_id_t) IPC_GET_ARG1(*icall)) {
                         vp = cur;
                         break;
@@ -1180 +1180 @@
                 async_get_call(&call);
 
-                if (!ipc_get_imethod(&call)) {
+                if (!IPC_GET_IMETHOD(call)) {
                         async_hangup(vp->sess);
                         return;
                 }
 
-                switch (ipc_get_imethod(&call)) {
+                switch (IPC_GET_IMETHOD(call)) {
                 case VISUALIZER_MODE_CHANGE:
                         comp_mode_change(vp, &call);