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

Merge branch 'quick-review-fast-lane-very-speedy' into 'master'

Browse Source 
Quick review fast lane very speedy

See merge request Librem5/squeekboard!36
This commit is contained in:
David Boddie
2019-07-08 21:01:40 +00:00
parent b69b3e9409 66ec95ebb0
commit a3a6e5933a
4 changed files with 15 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
eek/eek-section.c
View File

@ -1,17 +1,17 @@
/* /*
* Copyright (C) 2010-2011 Daiki Ueno <ueno@unixuser.org> * Copyright (C) 2010-2011 Daiki Ueno <ueno@unixuser.org>
* Copyright (C) 2010-2011 Red Hat, Inc. * Copyright (C) 2010-2011 Red Hat, Inc.
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public License * modify it under the terms of the GNU Lesser General Public License
* as published by the Free Software Foundation; either version 2 of * as published by the Free Software Foundation; either version 2 of
* the License, or (at your option) any later version. * the License, or (at your option) any later version.
* *
* This library is distributed in the hope that it will be useful, but * This library is distributed in the hope that it will be useful, but
* WITHOUT ANY WARRANTY; without even the implied warranty of * WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details. * Lesser General Public License for more details.
* *
* You should have received a copy of the GNU Lesser General Public * You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the Free Software * License along with this library; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
@ -129,7 +129,7 @@ static EekKey *
eek_section_real_create_key (EekSection *self, eek_section_real_create_key (EekSection *self,
guint keycode, guint keycode,
gint column_index, gint column_index,
guint row_index) gint row_index)
{ {
EekKey *key; EekKey *key;
gint num_rows; gint num_rows;

6
eek/eek.c
View File

@ -38,9 +38,5 @@
void void
eek_init (void) eek_init (void)
{ {
g_type_init (); /* void */
g_type_class_ref (EEK_TYPE_SYMBOL);
g_type_class_ref (EEK_TYPE_KEYSYM);
g_type_class_ref (EEK_TYPE_TEXT);
} }

4
src/imservice.c
View File

@ -5,8 +5,8 @@
#include "eekboard/eekboard-context-service.h" #include "eekboard/eekboard-context-service.h"
void imservice_handle_text_change_cause(void *data, struct zwp_input_method_v2 *input_method) {} void imservice_handle_text_change_cause(void *data, struct zwp_input_method_v2 *input_method, uint32_t cause) {}
void imservice_handle_content_type(void *data, struct zwp_input_method_v2 *input_method) {} void imservice_handle_content_type(void *data, struct zwp_input_method_v2 *input_method, uint32_t hint, uint32_t purpose) {}
void imservice_handle_unavailable(void *data, struct zwp_input_method_v2 *input_method) {} void imservice_handle_unavailable(void *data, struct zwp_input_method_v2 *input_method) {}

12
src/server-context-service.c
View File

@ -217,16 +217,18 @@ static void
set_geometry (ServerContextService *context) set_geometry (ServerContextService *context)
{ {
GdkScreen *screen; GdkScreen *screen;
GdkDisplay *display;
GdkWindow *root; GdkWindow *root;
gint monitor; GdkMonitor *monitor;
GdkRectangle rect; GdkRectangle rect;
const EekKeyboard *keyboard; EekKeyboard *keyboard;
EekBounds bounds; EekBounds bounds;
screen = gdk_screen_get_default (); screen = gdk_screen_get_default ();
root = gtk_widget_get_root_window (context->window); root = gdk_screen_get_root_window (screen);
monitor = gdk_screen_get_monitor_at_window (screen, root); display = gdk_display_get_default();
gdk_screen_get_monitor_geometry (screen, monitor, &rect); monitor = gdk_display_get_monitor_at_window (display, root);
gdk_monitor_get_geometry (monitor, &rect);
keyboard = eekboard_context_service_get_keyboard (EEKBOARD_CONTEXT_SERVICE(context)); keyboard = eekboard_context_service_get_keyboard (EEKBOARD_CONTEXT_SERVICE(context));
eek_element_get_bounds (EEK_ELEMENT(keyboard), &bounds); eek_element_get_bounds (EEK_ELEMENT(keyboard), &bounds);