Changeset 09f41d3 in mainline for uspace/srv

Timestamp:

2024-09-25T17:19:36Z (14 months ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

master

Children:

c23a1fe

Parents:

6a753a9c

Message:

Tetris should be able to detect screen cursor control capability

Location:

uspace/srv/hid

Files:

• output/ctl/serial.c (modified) (1 diff)
• output/port/ddev.c (modified) (2 diffs)
• output/port/ega.c (modified) (1 diff)
• remcons/remcons.c (modified) (3 diffs)
• remcons/remcons.h (modified) (1 diff)

uspace/srv/hid/output/ctl/serial.c

@@ -85 +85 @@
 static console_caps_t serial_get_caps(outdev_t *dev)
 {
-        return (CONSOLE_CAP_STYLE | CONSOLE_CAP_INDEXED | CONSOLE_CAP_RGB);
+        return (CONSOLE_CAP_CURSORCTL | CONSOLE_CAP_STYLE |
+            CONSOLE_CAP_INDEXED | CONSOLE_CAP_RGB);
 }
 

uspace/srv/hid/output/port/ddev.c

@@ -1 +1 @@
 /*
- * Copyright (c) 2020 Jiri Svoboda
+ * Copyright (c) 2024 Jiri Svoboda
  * Copyright (c) 2008 Martin Decky
  * Copyright (c) 2006 Jakub Vana
@@ -198 +198 @@
 static console_caps_t output_ddev_get_caps(outdev_t *dev)
 {
-        return (CONSOLE_CAP_STYLE | CONSOLE_CAP_INDEXED | CONSOLE_CAP_RGB);
+        return (CONSOLE_CAP_CURSORCTL | CONSOLE_CAP_STYLE |
+            CONSOLE_CAP_INDEXED | CONSOLE_CAP_RGB);
 }
 

uspace/srv/hid/output/port/ega.c

@@ -143 +143 @@
 static console_caps_t ega_get_caps(outdev_t *dev)
 {
-        return (CONSOLE_CAP_STYLE | CONSOLE_CAP_INDEXED);
+        return (CONSOLE_CAP_CURSORCTL | CONSOLE_CAP_STYLE |
+            CONSOLE_CAP_INDEXED);
 }
 

uspace/srv/hid/remcons/remcons.c

@@ -248 +248 @@
         remcons_t *remcons = srv_to_remcons(srv);
 
-        if (remcons->enable_ctl)
-                *ccaps = CONSOLE_CAP_INDEXED | CONSOLE_CAP_RGB;
-        else
-                *ccaps = 0;
+        *ccaps = 0;
+
+        if (remcons->enable_ctl) {
+                *ccaps |= CONSOLE_CAP_CURSORCTL | CONSOLE_CAP_STYLE |
+                    CONSOLE_CAP_INDEXED;
+        }
+
+        if (remcons->enable_rgb)
+                *ccaps |= CONSOLE_CAP_RGB;
 
         return EOK;
@@ -437 +442 @@
 
         remcons->enable_ctl = !no_ctl;
+        remcons->enable_rgb = !no_ctl && !no_rgb;
         remcons->user = user;
 
@@ -448 +454 @@
             remcons_vt_putchar, remcons_vt_cputs, remcons_vt_flush);
         assert(remcons->vt != NULL); // XXX
-        remcons->vt->enable_rgb = !no_rgb;
+        remcons->vt->enable_rgb = remcons->enable_rgb;
 
         if (remcons->enable_ctl) {

uspace/srv/hid/remcons/remcons.h

@@ -48 +48 @@
         vt100_state_t *vt;
         bool enable_ctl;
+        bool enable_rgb;
 } remcons_t;