Merge pull request #104 from KaiNorberg/develop

Develop

Author: KaiNorberg

include/kernel/drivers/abstract/kbd.h

@@ -36,7 +36,8 @@ typedef struct kbd kbd_t;
  * If no events are available to read, the read call will block until an event is available unless the file is opened in
  * non-blocking mode in which case the read will fail with `EAGAIN`.
  *
- * @note The format is specified such that if `scan()` is used with "%u%c" the `scan()` call does not require any "ungets".
+ * @note The format is specified such that if `scan()` is used with "%u%c" the `scan()` call does not require any
+ * "ungets".
  *
  * @see libstd_sys_kbd for keycode definitions.
  *

include/kernel/drivers/abstract/mouse.h

@@ -15,29 +15,34 @@
  * @ingroup kernel_drivers_abstract
  *
  * Mouse devices are exposed as a `/dev/mouse/[id]/` directory, containing the below files.
- * 
+ *
  * ## name
- * 
+ *
  * A read-only file that contains the driver defined name of the mouse device.
- * 
+ *
  * ## events
- * 
- * A readable and pollable file that provides a stream of mouse events represented as integer values suffixed with a single character indicating the type of the event.
- * 
- * The ´x` and `y` characters indicate movement in the X and Y directions respectively, the `_` and `^` represent a button press and release respectively, and the `z` character represents a scroll event.
- * 
- * Buttons are represented as their button number starting from `1` where `1` is the left button, `2` is the right button, and `3` is the middle button.
- *
- * The below example shows a press of the left mouse button, moving the mouse `10` units in the X direction and `-5` units in the Y direction, releasing the left mouse button, and then scrolling `3` units.
- * 
+ *
+ * A readable and pollable file that provides a stream of mouse events represented as integer values suffixed with a
+ * single character indicating the type of the event.
+ *
+ * The ´x` and `y` characters indicate movement in the X and Y directions respectively, the `_` and `^` represent a
+ * button press and release respectively, and the `z` character represents a scroll event.
+ *
+ * Buttons are represented as their button number starting from `1` where `1` is the left button, `2` is the right
+ * button, and `3` is the middle button.
+ *
+ * The below example shows a press of the left mouse button, moving the mouse `10` units in the X direction and `-5`
+ * units in the Y direction, releasing the left mouse button, and then scrolling `3` units.
+ *
  * ```
  * 1_10x-5y1^3z
  * ```
- * 
+ *
  * If no events are available to read, the read call will block until an event is available unless the file is opened in
  * non-blocking mode in which case the read will fail with `EAGAIN`.
  *
- * @note The format is specified such that if `scan()` is used with "%u%c" the `scan()` call does not require any "ungets".
+ * @note The format is specified such that if `scan()` is used with "%u%c" the `scan()` call does not require any
+ * "ungets".
  *
  * @{
  */
@@ -93,39 +98,39 @@ void mouse_free(mouse_t* mouse);
 
 /**
  * @brief Push a mouse button press event to the mouse event queue.
- * 
+ *
  * @param mouse Pointer to the mouse structure.
  * @param button Button to press.
  */
 void mouse_press(mouse_t* mouse, uint32_t button);
 
 /**
  * @brief Push a mouse button release event to the mouse event queue.
- * 
+ *
  * @param mouse Pointer to the mouse structure.
  * @param button Button to release.
  */
 void mouse_release(mouse_t* mouse, uint32_t button);
 
 /**
  * @brief Push a mouse movement in the X direction to the mouse event queue.
- * 
+ *
  * @param mouse Pointer to the mouse structure.
  * @param delta Amount to move in the X direction.
  */
 void mouse_move_x(mouse_t* mouse, int64_t delta);
 
 /**
  * @brief Push a mouse movement in the Y direction to the mouse event queue.
- * 
+ *
  * @param mouse Pointer to the mouse structure.
  * @param delta Amount to move in the Y direction.
  */
 void mouse_move_y(mouse_t* mouse, int64_t delta);
 
 /**
  * @brief Push a mouse scroll event to the mouse event queue.
- * 
+ *
  * @param mouse Pointer to the mouse structure.
  * @param delta Amount to scroll.
  */

include/libpatchwork/event.h

@@ -172,7 +172,7 @@ typedef struct
 typedef enum
 {
     MOUSE_NONE = 0,          ///< None
-    MOUSE_LEFT = (1 << 1),    ///< Left mouse button
+    MOUSE_LEFT = (1 << 1),   ///< Left mouse button
     MOUSE_RIGHT = (1 << 2),  ///< Right mouse button
     MOUSE_MIDDLE = (1 << 3), ///< Middle mouse button
 } mouse_buttons_t;

src/boxes/core/dwm/dwm.c

@@ -630,13 +630,10 @@ static void dwm_handle_mouse_event(int64_t x, int64_t y, mouse_buttons_t buttons
 
 static void dwm_mouse_read(void)
 {
-    static mouse_buttons_t prevHeld = MOUSE_NONE;
+    static mouse_buttons_t buttons = MOUSE_NONE;
 
     int64_t x = 0;
     int64_t y = 0;
-    mouse_buttons_t buttons = 0;
-    
-    bool received = false;
     while (1)
     {
         int64_t value;
@@ -649,7 +646,7 @@ static void dwm_mouse_read(void)
             }
             break;
         }
-        
+
         switch (suffix)
         {
         case 'x':
@@ -659,25 +656,35 @@ static void dwm_mouse_read(void)
             y += value;
             break;
         case '_':
+            if (x != 0 || y != 0)
+            {
+                dwm_handle_mouse_event(x, y, buttons);
+                x = 0;
+                y = 0;
+            }
             buttons |= (1 << value);
+            dwm_handle_mouse_event(0, 0, buttons);
             break;
         case '^':
+            if (x != 0 || y != 0)
+            {
+                dwm_handle_mouse_event(x, y, buttons);
+                x = 0;
+                y = 0;
+            }
             buttons &= ~(1 << value);
+            dwm_handle_mouse_event(0, 0, buttons);
             break;
         default:
             printf("dwm: unknown mouse event suffix '%c'\n", suffix);
             break;
         }
-        
-        received = true;
     }
 
-    if (!received)
+    if (x != 0 || y != 0)
     {
-        return;
+        dwm_handle_mouse_event(x, y, buttons);
     }
-
-    dwm_handle_mouse_event(x, y, buttons);
 }
 
 static void dwm_poll_ctx_update(void)

src/kernel/drivers/abstract/kbd.c

@@ -234,7 +234,7 @@ void kbd_free(kbd_t* kbd)
 }
 
 static void kbd_broadcast(kbd_t* kbd, const char* string, size_t length)
-{    
+{
     LOCK_SCOPE(&kbd->lock);
 
     kbd_client_t* client;

src/kernel/drivers/abstract/mouse.c

@@ -228,7 +228,7 @@ void mouse_free(mouse_t* mouse)
 }
 
 static void mouse_broadcast(mouse_t* mouse, const char* string, size_t length)
-{    
+{
     LOCK_SCOPE(&mouse->lock);
 
     mouse_client_t* client;

src/kernel/log/log.c

@@ -26,7 +26,6 @@ static lock_t lock = LOCK_CREATE();
 
 static char klogBuffer[CONFIG_KLOG_SIZE];
 static uint64_t klogHead = 0;
-static wait_queue_t klogQueue = WAIT_QUEUE_CREATE(klogQueue);
 static dentry_t* klog = NULL;
 
 static char lineBuffer[LOG_MAX_BUFFER] = {0};
@@ -45,20 +44,13 @@ static const char* levelNames[] = {
 
 static size_t klog_read(file_t* file, void* buffer, size_t count, size_t* offset)
 {
+    UNUSED(file);
+
     LOCK_SCOPE(&lock);
 
     if (*offset >= klogHead)
     {
-        if (file->mode & MODE_NONBLOCK)
-        {
-            errno = EAGAIN;
-            return ERR;
-        }
-
-        if (WAIT_BLOCK_LOCK(&klogQueue, &lock, *offset < klogHead))
-        {
-            return ERR;
-        }
+        return 0;
     }
 
     for (size_t i = 0; i < count; i++)
@@ -83,21 +75,9 @@ static size_t klog_write(file_t* file, const void* buffer, size_t count, size_t*
     return count;
 }
 
-static wait_queue_t* klog_poll(file_t* file, poll_events_t* revents)
-{
-    LOCK_SCOPE(&lock);
-
-    if (file->pos < klogHead)
-    {
-        *revents |= POLLIN;
-    }
-    return &klogQueue;
-}
-
 static file_ops_t klogOps = {
     .read = klog_read,
     .write = klog_write,
-    .poll = klog_poll,
 };
 
 static void log_splash(void)
@@ -151,7 +131,6 @@ static void log_write(const char* string, uint64_t length)
     {
         klogBuffer[klogHead++ % CONFIG_KLOG_SIZE] = string[i];
     }
-    wait_unblock(&klogQueue, WAIT_ALL, EOK);
 
 #if CONFIG_LOG_SERIAL
     for (uint64_t i = 0; i < length; i++)

src/libstd/common/digits.c

@@ -2,4 +2,10 @@
 
 const char _digits[] = "0123456789abcdefghijklmnopqrstuvwxyz";
 
-const char _xdigits[] = "0123456789ABCDEF";
+const char _xdigits[] = "0123456789abcdef";
+
+const char _Xdigits[] = "0123456789ABCDEF";
+
+const char _digitPairs[] =
+    "000102030405060708091011121314151617181920212223242526272829303132333435363738394041424344454647484950515253545556"
+    "57585960616263646566676869707172737475767778798081828384858687888990919293949596979899";

src/libstd/common/digits.h

@@ -7,7 +7,26 @@ extern const char _digits[];
 
 extern const char _xdigits[];
 
+extern const char _Xdigits[];
+
+extern const char _digitPairs[];
+
 static inline uint8_t _digit_to_int(char c)
 {
     return _asciiTable[(unsigned char)c].digit;
 }
+
+static inline char _int_to_digit(uint8_t i)
+{
+    return _digits[i];
+}
+
+static inline char _int_to_xdigit(uint8_t i)
+{
+    return _xdigits[i];
+}
+
+static inline char _int_to_Xdigit(uint8_t i)
+{
+    return _Xdigits[i];
+}