X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Flibsystemd-terminal%2Fevcat.c;h=b0b1a197edea2383f9212db29e39d89430cdc159;hb=da927ba997d68401563b927f92e6e40e021a8e5c;hp=8c27fb2c546ac02797020d00e5cdedc71325c5d4;hpb=c600022303a10155f48a8eab59c6c0ae1b797699;p=elogind.git

diff --git a/src/libsystemd-terminal/evcat.c b/src/libsystemd-terminal/evcat.c
index 8c27fb2c5..b0b1a197e 100644
--- a/src/libsystemd-terminal/evcat.c
+++ b/src/libsystemd-terminal/evcat.c
@@ -138,13 +138,13 @@ static int evcat_new(Evcat **out) {
 
         r = sd_pid_get_session(getpid(), &e->session);
         if (r < 0) {
-                log_error("Cannot retrieve logind session: %s", strerror(-r));
+                log_error_errno(r, "Cannot retrieve logind session: %m");
                 return r;
         }
 
         r = sd_session_get_seat(e->session, &e->seat);
         if (r < 0) {
-                log_error("Cannot retrieve seat of logind session: %s", strerror(-r));
+                log_error_errno(r, "Cannot retrieve seat of logind session: %m");
                 return r;
         }
 
@@ -203,6 +203,9 @@ static void kdata_print(idev_data *data) {
                         k->value == 1 ? "DOWN" :
                         "REPEAT");
 
+        /* Resync state */
+        printf(" | %-6s", data->resync ? "RESYNC" : "");
+
         /* Keycode that triggered the event */
         printf(" | %5u", (unsigned)k->keycode);
 
@@ -216,6 +219,13 @@ static void kdata_print(idev_data *data) {
         printf(" %-5s", (k->mods & IDEV_KBDMOD_LINUX) ? "LINUX" : "");
         printf(" %-4s", (k->mods & IDEV_KBDMOD_CAPS) ? "CAPS" : "");
 
+        /* Consumed modifiers */
+        printf(" | %-5s", (k->consumed_mods & IDEV_KBDMOD_SHIFT) ? "SHIFT" : "");
+        printf(" %-4s", (k->consumed_mods & IDEV_KBDMOD_CTRL) ? "CTRL" : "");
+        printf(" %-3s", (k->consumed_mods & IDEV_KBDMOD_ALT) ? "ALT" : "");
+        printf(" %-5s", (k->consumed_mods & IDEV_KBDMOD_LINUX) ? "LINUX" : "");
+        printf(" %-4s", (k->consumed_mods & IDEV_KBDMOD_CAPS) ? "CAPS" : "");
+
         /* Resolved symbols */
         printf(" |");
         for (i = 0; i < k->n_syms; ++i) {
@@ -309,14 +319,14 @@ static int evcat_sysview_fn(sysview_context *c, void *userdata, sysview_event *e
                                      evcat_idev_fn,
                                      e);
                 if (r < 0) {
-                        log_error("Cannot create idev session: %s", strerror(-r));
+                        log_error_errno(r, "Cannot create idev session: %m");
                         return r;
                 }
 
                 if (e->managed) {
                         r = sysview_session_take_control(ev->session_add.session);
                         if (r < 0) {
-                                log_error("Cannot request session control: %s", strerror(-r));
+                                log_error_errno(r, "Cannot request session control: %m");
                                 return r;
                         }
                 }
@@ -327,7 +337,8 @@ static int evcat_sysview_fn(sysview_context *c, void *userdata, sysview_event *e
         case SYSVIEW_EVENT_SESSION_REMOVE:
                 idev_session_disable(e->idev_session);
                 e->idev_session = idev_session_free(e->idev_session);
-                sd_event_exit(e->event, 0);
+                if (sd_event_get_exit_code(e->event, &r) == -ENODATA)
+                        sd_event_exit(e->event, 0);
                 break;
         case SYSVIEW_EVENT_SESSION_ATTACH:
                 d = ev->session_attach.device;
@@ -335,7 +346,7 @@ static int evcat_sysview_fn(sysview_context *c, void *userdata, sysview_event *e
                 if (type == SYSVIEW_DEVICE_EVDEV) {
                         r = idev_session_add_evdev(e->idev_session, sysview_device_get_ud(d));
                         if (r < 0) {
-                                log_error("Cannot add evdev device to idev: %s", strerror(-r));
+                                log_error_errno(r, "Cannot add evdev device to idev: %m");
                                 return r;
                         }
                 }
@@ -347,7 +358,7 @@ static int evcat_sysview_fn(sysview_context *c, void *userdata, sysview_event *e
                 if (type == SYSVIEW_DEVICE_EVDEV) {
                         r = idev_session_remove_evdev(e->idev_session, sysview_device_get_ud(d));
                         if (r < 0) {
-                                log_error("Cannot remove evdev device from idev: %s", strerror(-r));
+                                log_error_errno(r, "Cannot remove evdev device from idev: %m");
                                 return r;
                         }
                 }
@@ -356,7 +367,7 @@ static int evcat_sysview_fn(sysview_context *c, void *userdata, sysview_event *e
         case SYSVIEW_EVENT_SESSION_CONTROL:
                 r = ev->session_control.error;
                 if (r < 0) {
-                        log_error("Cannot acquire session control: %s", strerror(-r));
+                        log_error_errno(r, "Cannot acquire session control: %m");
                         return r;
                 }