s3rius/squeekboard
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'fixes' into 'master'

Browse Source 
layout: Remove unused C functions

See merge request Librem5/squeekboard!151
This commit is contained in:
David Boddie
2019-09-02 11:24:54 +00:00
parent c16bbb9e7f baabcb1400
commit 633d15c438
2 changed files with 1 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/layout.h
View File

@ -15,11 +15,9 @@ struct squeek_button *squeek_row_create_button (struct squeek_row *row,
guint keycode, guint oref); guint keycode, guint oref);
struct squeek_button *squeek_row_create_button_with_state(struct squeek_row *row, struct squeek_button *squeek_row_create_button_with_state(struct squeek_row *row,
struct squeek_button *source); struct squeek_button *source);
void squeek_row_set_angle(struct squeek_row *row, int32_t angle);
int32_t squeek_row_get_angle(const struct squeek_row*); int32_t squeek_row_get_angle(const struct squeek_row*);
EekBounds squeek_row_get_bounds(const struct squeek_row*); EekBounds squeek_row_get_bounds(const struct squeek_row*);
void squeek_row_set_bounds(struct squeek_row* row, EekBounds bounds);
uint32_t squeek_row_contains(struct squeek_row*, struct squeek_button *button); uint32_t squeek_row_contains(struct squeek_row*, struct squeek_button *button);
@ -47,7 +45,6 @@ struct squeek_button *squeek_button_new(uint32_t keycode, uint32_t oref);
struct squeek_button *squeek_button_new_with_state(const struct squeek_button* source); struct squeek_button *squeek_button_new_with_state(const struct squeek_button* source);
uint32_t squeek_button_get_oref(const struct squeek_button*); uint32_t squeek_button_get_oref(const struct squeek_button*);
EekBounds squeek_button_get_bounds(const struct squeek_button*); EekBounds squeek_button_get_bounds(const struct squeek_button*);
void squeek_button_set_bounds(struct squeek_button* button, EekBounds bounds);
struct squeek_symbol *squeek_button_get_symbol ( struct squeek_symbol *squeek_button_get_symbol (
const struct squeek_button *button); const struct squeek_button *button);

23
src/layout.rs
View File

@ -179,13 +179,6 @@ pub mod c {
row.buttons[last_idx].as_mut() as *mut ::layout::Button row.buttons[last_idx].as_mut() as *mut ::layout::Button
} }
#[no_mangle]
pub extern "C"
fn squeek_row_set_angle(row: *mut ::layout::Row, angle: i32) {
let row = unsafe { &mut *row };
row.angle = angle;
}
#[no_mangle] #[no_mangle]
pub extern "C" pub extern "C"
fn squeek_row_get_angle(row: *const ::layout::Row) -> i32 { fn squeek_row_get_angle(row: *const ::layout::Row) -> i32 {
@ -203,14 +196,6 @@ pub mod c {
} }
} }
/// Set bounds by consuming the value
#[no_mangle]
pub extern "C"
fn squeek_row_set_bounds(row: *mut ::layout::Row, bounds: Bounds) {
let row = unsafe { &mut *row };
row.bounds = Some(bounds);
}
#[no_mangle] #[no_mangle]
pub extern "C" pub extern "C"
fn squeek_row_foreach( fn squeek_row_foreach(
@ -276,14 +261,6 @@ pub mod c {
} }
} }
/// Set bounds by consuming the value
#[no_mangle]
pub extern "C"
fn squeek_button_set_bounds(button: *mut ::layout::Button, bounds: Bounds) {
let button = unsafe { &mut *button };
button.bounds = Some(bounds);
}
/// Borrow a new reference to key state. Doesn't need freeing /// Borrow a new reference to key state. Doesn't need freeing
#[no_mangle] #[no_mangle]
pub extern "C" pub extern "C"