Changeset 02f45748 in mainline

Timestamp:

2019-12-10T10:07:43Z (5 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

23e86c6

Parents:

df1a019

git-author:

Jiri Svoboda <jiri@…> (2019-12-09 18:07:30)

git-committer:

Jiri Svoboda <jiri@…> (2019-12-10 10:07:43)

Message:

Source display server events from input server

Location:

uspace

Files:

• app/init/init.c (modified) (1 diff)
• srv/hid/display/input.c (added)
• srv/hid/display/input.h (added)
• srv/hid/display/main.c (modified) (3 diffs)
• srv/hid/display/meson.build (modified) (1 diff)
• srv/hid/display/output.c (modified) (2 diffs)
• srv/hid/display/output.h (modified) (1 diff)

uspace/app/init/init.c

@@ -451 +451 @@
                 if (rc == EOK) {
                         fibril_sleep(1);
-                        gui_start("/app/gfxdemo");
+                        gui_start("/app/terminal");
                 }
         }

uspace/srv/hid/display/main.c

@@ -50 +50 @@
 #include "display.h"
 #include "dsops.h"
+#include "input.h"
 #include "main.h"
 #include "output.h"
@@ -61 +62 @@
         .ev_pending = display_client_ev_pending
 };
-
-static void display_kbd_event(void *arg, kbd_event_t *event)
-{
-        ds_display_t *disp = (ds_display_t *) arg;
-
-        ds_display_post_kbd_event(disp, event);
-}
-
-static void display_pos_event(void *arg, pos_event_t *event)
-{
-        ds_display_t *disp = (ds_display_t *) arg;
-
-        ds_display_post_pos_event(disp, event);
-}
 
 static void display_client_ev_pending(void *arg)
@@ -102 +89 @@
                 goto error;
 
-#if 0
         rc = ds_input_open(disp);
         if (rc != EOK)
                 goto error;
-#endif
-        rc = ds_output_create(display_kbd_event, (void *) disp,
-            display_pos_event, (void *) disp, &output);
+
+        rc = ds_output_create(&output);
         if (rc != EOK)
                 goto error;

uspace/srv/hid/display/meson.build

@@ -34 +34 @@
         'display.c',
         'dsops.c',
+        'input.c',
         'main.c',
         'output.c',

uspace/srv/hid/display/output.c

@@ -44 +44 @@
 #include "ddev.h"
 #include "output.h"
-
-#if 0
-static void (*kbd_ev_handler)(void *, kbd_event_t *);
-static void *kbd_ev_arg;
-static void (*pos_ev_handler)(void *, pos_event_t *);
-static void *pos_ev_arg;
-
-static void on_keyboard_event(widget_t *widget, void *data)
-{
-        printf("Keyboard event\n");
-        kbd_ev_handler(kbd_ev_arg, (kbd_event_t *) data);
-}
-
-static void on_position_event(widget_t *widget, void *data)
-{
-        pos_ev_handler(pos_ev_arg, (pos_event_t *) data);
-}
-#endif
 
 /** Check for new display devices.
@@ -140 +122 @@
 /** Create display server output.
  *
- * @param kbd_event_handler
- * @param karg
- * @param pos_event_handler
- * @param parg
  * @param routput Place to store pointer to display server output object.
  * @return EOK on success or an error code
  */
-errno_t ds_output_create(void (*kbd_event_handler)(void *, kbd_event_t *),
-    void *karg, void (*pos_event_handler)(void *, pos_event_t *),
-    void *parg, ds_output_t **routput)
+errno_t ds_output_create(ds_output_t **routput)
 {
         ds_output_t *output;

uspace/srv/hid/display/output.h

@@ -42 +42 @@
 #include "types/display/output.h"
 
-extern errno_t ds_output_create(void (*)(void *, kbd_event_t *),
-    void *, void (*)(void *, pos_event_t *), void *, ds_output_t **);
+extern errno_t ds_output_create(ds_output_t **);
 extern errno_t ds_output_start_discovery(ds_output_t *);
 extern void ds_output_destroy(ds_output_t *);