Added unicode input

luadebug · web-flow · commit 6b28b39b94c9 · 2024-08-06T03:18:40.000+03:00
Added unicode input
diff --git a/egui-opengl-internal/src/app.rs b/egui-opengl-internal/src/app.rs
@@ -1,9 +1,13 @@
-use std::ffi::c_void;
+use std::ffi::{c_void, OsString};
 use crate::{input::InputCollector, painter, utils};
 use clipboard::{windows_clipboard::WindowsClipboardContext, ClipboardProvider};
-use egui::Context;
+use egui::{Context, FontData, FontDefinitions, FontFamily, FontId};
 use once_cell::sync::OnceCell;
 use std::ops::DerefMut;
+use std::path::PathBuf;
+use std::sync::Arc;
+use egui::FontFamily::Proportional;
+use egui::TextStyle::{Body, Button, Heading, Monospace, Name, Small};
 use windows::Win32::{
     Foundation::{HWND, LPARAM, RECT, WPARAM},
     Graphics::{
@@ -31,6 +35,8 @@ use parking_lot::{Mutex, MutexGuard};
 use spin::lock_api::{Mutex, MutexGuard};
 
 use lock_api::MappedMutexGuard;
+use windows::Win32::Foundation::HINSTANCE;
+use windows::Win32::UI::WindowsAndMessaging::{WM_CHAR, WM_UNICHAR};
 
 /// Heart and soul of this integration.
 /// Main methods you are going to use are:
@@ -157,7 +163,41 @@ impl<T: Default> OpenGLApp<T> {
     /// Initializes application and sets the state to its default value. You should call this only once!
     #[inline]
     pub fn init_default(&self, hdc: HDC, window: HWND, ui: impl FnMut(&Context, &mut T) + 'static) {
-        self.init_with_state_context(hdc, window, ui, T::default(), Context::default());
+        let ctx = Context::default();
+
+        let font_file = {
+            let mut font_path = PathBuf::from(std::env::var("SystemRoot").ok().unwrap());
+            font_path.push("Fonts");
+            font_path.push("arial.ttf");
+            font_path.to_str().unwrap().to_string().replace("\\", "/")
+        };
+        let font_name = font_file.split('/').last().unwrap().split('.').next().unwrap().to_string();
+        let font_file_bytes = std::fs::read(font_file).ok().unwrap();
+
+        let font_data = FontData::from_owned(font_file_bytes);
+        let mut font_def = FontDefinitions::default();
+        font_def.font_data.insert(font_name.to_string(), font_data);
+
+        let font_family = Proportional;
+        font_def.families.get_mut(&font_family).unwrap().insert(0, font_name);
+
+        ctx.set_fonts(font_def);
+
+
+        // Set custom sizes for text styles
+        let mut style = (*ctx.style()).clone();
+        style.text_styles = [
+            (Heading, FontId::new(30.0, Proportional)),
+            (Name("Heading2".into()), FontId::new(25.0, Proportional)),
+            (Name("Context".into()), FontId::new(23.0, Proportional)),
+            (Body, FontId::new(18.0, Proportional)),
+            (Monospace, FontId::new(14.0, Proportional)),
+            (Button, FontId::new(14.0, Proportional)),
+            (Small, FontId::new(10.0, Proportional)),
+        ].into();
+
+        ctx.set_style(style);
+        self.init_with_state_context(hdc, window, ui, T::default(), ctx);
     }
 }
 
@@ -212,12 +252,17 @@ impl<T> OpenGLApp<T> {
     #[inline]
     pub fn wnd_proc(&self, umsg: u32, wparam: WPARAM, lparam: LPARAM) -> bool {
         let this = &mut *self.lock_data();
+
+
+
         this.input_collector.process(umsg, wparam.0, lparam.0);
 
         if umsg == WM_SIZE {
             this.client_rect = self.get_client_rect(this.window);
         }
 
+
+
         this.ctx.wants_keyboard_input() || this.ctx.wants_pointer_input()
     }
 
diff --git a/egui-opengl-internal/src/input.rs b/egui-opengl-internal/src/input.rs
@@ -11,7 +11,7 @@ use windows::Win32::{
             VK_RIGHT, VK_SPACE, VK_TAB, VK_UP,
         },
         WindowsAndMessaging::{
-            GetClientRect, KF_REPEAT, WHEEL_DELTA, WM_CHAR, WM_KEYDOWN, WM_KEYUP, WM_LBUTTONDBLCLK,
+            GetClientRect, KF_REPEAT, WHEEL_DELTA, WM_CHAR, WM_UNICHAR, WM_KEYDOWN, WM_KEYUP, WM_LBUTTONDBLCLK,
             WM_LBUTTONDOWN, WM_LBUTTONUP, WM_MBUTTONDBLCLK, WM_MBUTTONDOWN, WM_MBUTTONUP,
             WM_MOUSEHWHEEL, WM_MOUSEMOVE, WM_MOUSEWHEEL, WM_RBUTTONDBLCLK, WM_RBUTTONDOWN,
             WM_RBUTTONUP, WM_SYSKEYDOWN, WM_SYSKEYUP, WM_XBUTTONDBLCLK, WM_XBUTTONDOWN,
@@ -165,10 +165,37 @@ impl InputCollector {
                 });
                 InputResult::MouseMiddle
             }
+            WM_UNICHAR => {
+                // Handle Unicode characters from WM_UNICHAR
+                let unicode_char = wparam as u32; // wparam is the Unicode character
+
+                // Debugging output
+                println!("WM_UNICHAR received: unicode_char = {}", unicode_char);
+
+                if unicode_char != 0xFFFF { // 0xFFFF indicates no character
+                    if let Some(ch) = char::from_u32(unicode_char) {
+                        // Print the character representation
+                        println!("Character from WM_UNICHAR: '{}'", ch);
+                        if !ch.is_control() {
+                            self.events.push(Event::Text(ch.into())); // Add the character to events
+                        }
+                    } else {
+                        println!("Invalid character for unicode_char: {}", unicode_char);
+                    }
+                }
+                InputResult::Character
+            }
+
             WM_CHAR => {
-                if let Some(ch) = char::from_u32(wparam as _) {
-                    if !ch.is_control() {
-                        self.events.push(Event::Text(ch.into()));
+                // Handle characters from WM_CHAR
+                let unicode_char = wparam as u32; // wparam is the character code
+                if unicode_char != 0xFFFF { // 0xFFFF indicates no character
+                    if let Some(ch) = char::from_u32(unicode_char) {
+                        if !ch.is_control() {
+                            self.events.push(Event::Text(ch.into())); // Add the character to events
+                        }
+                    } else {
+                        println!("Invalid character for unicode_char: {}", unicode_char);
                     }
                 }
                 InputResult::Character
diff --git a/example-wnd/src/lib.rs b/example-wnd/src/lib.rs
@@ -1,24 +1,27 @@
-use egui::{Color32, Context, Key, Modifiers, RichText, ScrollArea, Slider, Widget};
-use egui_opengl_internal::{utils, OpenGLApp};
-use retour::static_detour;
 use std::{intrinsics::transmute, sync::Once};
 use std::ffi::c_void;
+use std::ops::DerefMut;
+use std::sync::{Arc, Mutex};
+
+use egui::{Color32, Context, Key, Modifiers, RichText, ScrollArea, Slider, Widget};
+use once_cell::unsync::Lazy;
+use retour::static_detour;
 use windows::{
     core::HRESULT,
     Win32::{
         Foundation::{HWND, LPARAM, LRESULT, WPARAM},
-        Graphics::Gdi::{WindowFromDC, HDC},
-        UI::WindowsAndMessaging::{CallWindowProcW, SetWindowLongPtrA, GWLP_WNDPROC, WNDPROC},
+        Graphics::Gdi::{HDC, WindowFromDC},
+        UI::WindowsAndMessaging::{CallWindowProcW, GWLP_WNDPROC, WNDPROC},
     },
 };
 use windows::Win32::Foundation::{BOOL, TRUE};
+use windows::Win32::UI::WindowsAndMessaging::SetWindowLongPtrW;
 
-use std::sync::{Arc, Mutex};
-use once_cell::unsync::Lazy;
+use egui_opengl_internal::{OpenGLApp, utils};
 
 struct UIState {
     ui_check: bool,
-    text: Option<String>,
+    text: String,
     value: f32,
     color: [f32; 3],
 }
@@ -27,7 +30,7 @@ impl UIState {
     fn new() -> Self {
         Self {
             ui_check: true,
-            text: Some(String::from("Test")),
+            text: String::from("Test"),
             value: 0.0,
             color: [0.0, 0.0, 0.0],
         }
@@ -50,7 +53,7 @@ extern "system" fn DllMain(hinst: usize, reason: u32, _reserved: *mut c_void) ->
             let _: Option<WNDPROC> = Some(transmute::<i32,
                                     Option<unsafe extern "system"
                                     fn(HWND, u32, WPARAM, LPARAM) -> LRESULT>>(
-                                    SetWindowLongPtrA(
+                                    SetWindowLongPtrW(
                 APP.get_window(),
                 GWLP_WNDPROC,
                 wnd_proc as usize as _,
@@ -85,15 +88,15 @@ fn hk_wgl_swap_buffers(hdc: HDC) -> HRESULT {
 
             OLD_WND_PROC = Some(transmute::<i32, Option<unsafe extern "system"
                     fn(HWND, u32, WPARAM, LPARAM) -> LRESULT>>(
-                    SetWindowLongPtrA(
+                    SetWindowLongPtrW(
                 window,
                 GWLP_WNDPROC,
                 hk_wnd_proc as usize as _,
             )));
         });
 
         if !APP.get_window().eq(&window) {
-            SetWindowLongPtrA(window, GWLP_WNDPROC, hk_wnd_proc as usize as _);
+            SetWindowLongPtrW(window, GWLP_WNDPROC, hk_wnd_proc as usize as _);
         }
 
         APP.render(hdc);
@@ -137,7 +140,7 @@ unsafe fn main_thread(_hinst: usize) {
     utils::alloc_console();
 
     let wgl_swap_buffers = utils::get_proc_address("wglSwapBuffers");
-    let fn_wgl_swap_buffers: FnWglSwapBuffers = std::mem::transmute(wgl_swap_buffers);
+    let fn_wgl_swap_buffers: FnWglSwapBuffers = transmute(wgl_swap_buffers);
 
     println!("wglSwapBuffers: {:X}", wgl_swap_buffers as usize);
 
@@ -153,7 +156,7 @@ unsafe fn main_thread(_hinst: usize) {
 }
 
 unsafe fn test_ui(ctx: &Context, ui: &mut egui::Ui) {
-    let mut state = STATE.lock().unwrap(); // Lock the state
+    let state = STATE.as_ref();
 
     // UI Elements
     ui.label(RichText::new("Test").color(Color32::LIGHT_BLUE));
@@ -178,8 +181,15 @@ unsafe fn test_ui(ctx: &Context, ui: &mut egui::Ui) {
     }
 
     // Checkbox and Text Input
-    ui.checkbox(&mut state.ui_check, "Some checkbox");
-    ui.text_edit_singleline(state.text.as_mut().unwrap());
+    let mut binding = state.lock().unwrap();
+    let ui_state = binding.deref_mut();
+    if ui.checkbox(&mut ui_state.ui_check, "Some checkbox").changed() {
+        println!("Checkbox toggled to: {}", ui_state.ui_check);
+    }
+    if ui.text_edit_singleline(&mut ui_state.text).changed()
+    {
+        println!("Set edit singleline to: {}", ui_state.text);
+    }
 
     // Scroll Area
     ScrollArea::vertical().max_height(200.0).show(ui, |ui| {
@@ -189,10 +199,16 @@ unsafe fn test_ui(ctx: &Context, ui: &mut egui::Ui) {
     });
 
     // Slider
-    Slider::new(&mut state.value, -1.0..=1.0).ui(ui);
+    if Slider::new(&mut ui_state.value, -1.0..=1.0).ui(ui).changed()
+    {
+        println!("Slider set value to: {}", ui_state.value);
+    }
 
     // Color Picker
-    ui.color_edit_button_rgb(&mut state.color);
+    if ui.color_edit_button_rgb(&mut ui_state.color).changed()
+    {
+        println!("Color edit button set color to: {:?}", ui_state.color);
+    }
 
     // Display Pointer Info
     ui.label(format!(
