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

Fix code formatting

Browse Source
This commit is contained in:
David Boddie
2019-08-29 14:52:10 +00:00
parent e6f3b9e5be
commit 83907af456
3 changed files with 25 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
eek/eek-gtk-keyboard.c
View File

@ -62,15 +62,15 @@ typedef struct _EekGtkKeyboardPrivate
G_DEFINE_TYPE_WITH_PRIVATE (EekGtkKeyboard, eek_gtk_keyboard, GTK_TYPE_DRAWING_AREA) G_DEFINE_TYPE_WITH_PRIVATE (EekGtkKeyboard, eek_gtk_keyboard, GTK_TYPE_DRAWING_AREA)
static void on_button_pressed (struct squeek_button *button, struct squeek_view *view, static void on_button_pressed (struct squeek_button *button, struct squeek_view *view,
EekGtkKeyboard *self); EekGtkKeyboard *self);
static void on_button_released (struct squeek_button *button, static void on_button_released (struct squeek_button *button,
struct squeek_view *view, struct squeek_view *view,
EekGtkKeyboard *self); EekGtkKeyboard *self);
static void render_pressed_button (GtkWidget *widget, struct button_place *place); static void render_pressed_button (GtkWidget *widget, struct button_place *place);
static void render_locked_button (GtkWidget *widget, static void render_locked_button (GtkWidget *widget,
struct button_place *place); struct button_place *place);
static void render_released_button (GtkWidget *widget, static void render_released_button (GtkWidget *widget,
struct squeek_button *button); struct squeek_button *button);
static void static void
eek_gtk_keyboard_real_realize (GtkWidget *self) eek_gtk_keyboard_real_realize (GtkWidget *self)
@ -166,7 +166,8 @@ static void depress(EekGtkKeyboard *self,
} }
static void drag(EekGtkKeyboard *self, static void drag(EekGtkKeyboard *self,
gdouble x, gdouble y, guint32 time) { gdouble x, gdouble y, guint32 time)
{
EekGtkKeyboardPrivate *priv = eek_gtk_keyboard_get_instance_private (self); EekGtkKeyboardPrivate *priv = eek_gtk_keyboard_get_instance_private (self);
struct squeek_view *view = level_keyboard_current(priv->keyboard); struct squeek_view *view = level_keyboard_current(priv->keyboard);
struct squeek_button *button = eek_renderer_find_button_by_position (priv->renderer, view, x, y); struct squeek_button *button = eek_renderer_find_button_by_position (priv->renderer, view, x, y);
@ -200,7 +201,8 @@ static void drag(EekGtkKeyboard *self,
} }
} }
static void release(EekGtkKeyboard *self, guint32 time) { static void release(EekGtkKeyboard *self, guint32 time)
{
EekGtkKeyboardPrivate *priv = eek_gtk_keyboard_get_instance_private (self); EekGtkKeyboardPrivate *priv = eek_gtk_keyboard_get_instance_private (self);
struct squeek_view *view = level_keyboard_current(priv->keyboard); struct squeek_view *view = level_keyboard_current(priv->keyboard);
@ -484,8 +486,8 @@ render_released_button (GtkWidget *widget,
static void static void
on_button_pressed (struct squeek_button *button, on_button_pressed (struct squeek_button *button,
struct squeek_view *view, struct squeek_view *view,
EekGtkKeyboard *self) EekGtkKeyboard *self)
{ {
EekGtkKeyboardPrivate *priv = eek_gtk_keyboard_get_instance_private (self); EekGtkKeyboardPrivate *priv = eek_gtk_keyboard_get_instance_private (self);
@ -514,8 +516,8 @@ on_button_pressed (struct squeek_button *button,
static void static void
on_button_released (struct squeek_button *button, on_button_released (struct squeek_button *button,
struct squeek_view *view, struct squeek_view *view,
EekGtkKeyboard *self) EekGtkKeyboard *self)
{ {
(void)view; (void)view;
EekGtkKeyboardPrivate *priv = eek_gtk_keyboard_get_instance_private (self); EekGtkKeyboardPrivate *priv = eek_gtk_keyboard_get_instance_private (self);

6
eek/eek-keyboard.c
View File

@ -132,8 +132,8 @@ void eek_keyboard_press_button(LevelKeyboard *keyboard, struct squeek_button *bu
} }
void eek_keyboard_release_button(LevelKeyboard *keyboard, void eek_keyboard_release_button(LevelKeyboard *keyboard,
struct squeek_button *button, struct squeek_button *button,
guint32 timestamp) { guint32 timestamp) {
for (GList *head = keyboard->pressed_buttons; head; head = g_list_next (head)) { for (GList *head = keyboard->pressed_buttons; head; head = g_list_next (head)) {
if (head->data == button) { if (head->data == button) {
keyboard->pressed_buttons = g_list_remove_link (keyboard->pressed_buttons, head); keyboard->pressed_buttons = g_list_remove_link (keyboard->pressed_buttons, head);
@ -200,7 +200,7 @@ LevelKeyboard *level_keyboard_new(EekboardContextService *manager, struct squeek
*/ */
struct squeek_button* struct squeek_button*
eek_keyboard_find_button_by_name (LevelKeyboard *keyboard, eek_keyboard_find_button_by_name (LevelKeyboard *keyboard,
const gchar *name) const gchar *name)
{ {
return g_hash_table_lookup (keyboard->names, name); return g_hash_table_lookup (keyboard->names, name);
} }

13
eek/eek-renderer.c
View File

@ -131,8 +131,7 @@ create_keyboard_surface_row_callback (struct squeek_row *row,
cairo_rotate (data->cr, angle * G_PI / 180); cairo_rotate (data->cr, angle * G_PI / 180);
data->row = row; data->row = row;
squeek_row_foreach(row, create_keyboard_surface_button_callback, squeek_row_foreach(row, create_keyboard_surface_button_callback, data);
data);
cairo_restore (data->cr); cairo_restore (data->cr);
} }
@ -175,8 +174,8 @@ render_keyboard_surface (EekRenderer *renderer, struct squeek_view *view)
/* draw rows */ /* draw rows */
squeek_view_foreach(level_keyboard_current(priv->keyboard), squeek_view_foreach(level_keyboard_current(priv->keyboard),
create_keyboard_surface_row_callback, create_keyboard_surface_row_callback,
&data); &data);
cairo_restore (data.cr); cairo_restore (data.cr);
cairo_destroy (data.cr); cairo_destroy (data.cr);
@ -971,9 +970,9 @@ eek_are_bounds_inside (EekBounds bounds, EekPoint point, EekPoint origin, int32_
**/ **/
struct squeek_button * struct squeek_button *
eek_renderer_find_button_by_position (EekRenderer *renderer, eek_renderer_find_button_by_position (EekRenderer *renderer,
struct squeek_view *view, struct squeek_view *view,
gdouble x, gdouble x,
gdouble y) gdouble y)
{ {
g_return_val_if_fail (EEK_IS_RENDERER(renderer), NULL); g_return_val_if_fail (EEK_IS_RENDERER(renderer), NULL);