renderer: Render whole keyboard the same way as pressed buttons

Removed window size dependent surface.

src/drawing.rs

@@ -75,6 +75,31 @@ mod c {
             }
         }
     }
+    
+    #[no_mangle]
+    pub extern "C"
+    fn squeek_draw_layout_base_view(
+        layout: *mut Layout,
+        renderer: EekRenderer,
+        cr: *mut cairo_sys::cairo_t,
+    ) {
+        let layout = unsafe { &mut *layout };
+        let cr = unsafe { cairo::Context::from_raw_none(cr) };
+        let view = layout.get_current_view();
+        let view_position = view.bounds.get_position();
+        for row in &view.rows {
+            for button in &row.buttons {
+                let position = &view_position
+                    + row.bounds.clone().unwrap().get_position()
+                    + button.bounds.get_position();
+                render_button_at_position(
+                    renderer, &cr,
+                    position, button.as_ref(),
+                    keyboard::PressType::Released, false,
+                );
+            }
+        }
+    }
 }
 
 /// Renders a button at a position (button's own bounds ignored)

src/layout.h

@@ -21,11 +21,6 @@ int32_t squeek_row_get_angle(const struct squeek_row*);
 
 EekBounds squeek_row_get_bounds(const struct squeek_row*);
 
-typedef void (*ButtonCallback) (struct squeek_button *button, gpointer user_data);
-void squeek_row_foreach(struct squeek_row*,
-                            ButtonCallback   callback,
-                            gpointer      user_data);
-
 EekBounds squeek_button_get_bounds(const struct squeek_button*);
 const char *squeek_button_get_label(const struct squeek_button*);
 const char *squeek_button_get_icon_name(const struct squeek_button*);
@@ -37,11 +32,6 @@ void squeek_button_print(const struct squeek_button* button);
 
 EekBounds squeek_view_get_bounds(const struct squeek_view*);
 
-typedef void (*RowCallback) (struct squeek_row *row, gpointer user_data);
-void squeek_view_foreach(struct squeek_view*,
-                            RowCallback   callback,
-                            gpointer      user_data);
-
 void
 squeek_layout_place_contents(struct squeek_layout*);
 struct squeek_view *squeek_layout_get_current_view(struct squeek_layout*);
@@ -65,4 +55,5 @@ void squeek_layout_drag(struct squeek_layout *layout, struct zwp_virtual_keyboar
                         struct transformation widget_to_layout,
                         uint32_t timestamp, EekGtkKeyboard *ui_keyboard);
 void squeek_layout_draw_all_changed(struct squeek_layout *layout, EekRenderer* renderer, cairo_t     *cr);
+void squeek_draw_layout_base_view(struct squeek_layout *layout, EekRenderer* renderer, cairo_t     *cr);
 #endif

src/layout.rs

@@ -43,10 +43,6 @@ pub mod c {
     use std::ops::Add;
 
     // The following defined in C
-
-    #[repr(transparent)]
-    pub struct UserData(*const c_void);
-
     #[repr(transparent)]
     #[derive(Copy, Clone)]
     pub struct EekGtkKeyboard(pub *const gtk_sys::GtkWidget);
@@ -130,9 +126,6 @@ pub mod c {
             }
         }
     }
-    
-    type ButtonCallback = unsafe extern "C" fn(button: *mut ::layout::Button, data: *mut UserData);
-    type RowCallback = unsafe extern "C" fn(row: *mut ::layout::Row, data: *mut UserData);
 
     // The following defined in Rust. TODO: wrap naked pointers to Rust data inside RefCells to prevent multiple writers
 
@@ -142,20 +135,6 @@ pub mod c {
         unsafe { &*view }.bounds.clone()
     }
 
-    #[no_mangle]
-    pub extern "C"
-    fn squeek_view_foreach(
-        view: *mut ::layout::View,
-        callback: RowCallback,
-        data: *mut UserData,
-    ) {
-        let view = unsafe { &mut *view };
-        for row in view.rows.iter_mut() {
-            let row = row.as_mut() as *mut ::layout::Row;
-            unsafe { callback(row, data) };
-        }
-    }
-    
     #[no_mangle]
     pub extern "C"
     fn squeek_row_get_angle(row: *const ::layout::Row) -> i32 {
@@ -172,20 +151,6 @@ pub mod c {
             None => panic!("Row doesn't have any bounds yet"),
         }
     }
-    
-    #[no_mangle]
-    pub extern "C"
-    fn squeek_row_foreach(
-        row: *mut ::layout::Row,
-        callback: ButtonCallback,
-        data: *mut UserData,
-    ) {
-        let row = unsafe { &mut *row };
-        for button in row.buttons.iter_mut() {
-            let button = button.as_mut() as *mut ::layout::Button;
-            unsafe { callback(button, data) };
-        }
-    }
 
     #[no_mangle]
     pub extern "C"