Skip to content
GitLab
Menu
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Menu
Open sidebar
Dorota Czaplejewicz
squeekboard
Commits
3eeb7cd8
Commit
3eeb7cd8
authored
Feb 24, 2011
by
Daiki Ueno
Browse files
Rename EekboardServer to EekboardEekboard.
parent
7ef245d7
Changes
6
Hide whitespace changes
Inline
Side-by-side
eekboard/Makefile.am
View file @
3eeb7cd8
...
...
@@ -20,10 +20,10 @@ lib_LTLIBRARIES = libeekboard.la
libeekboard_headers
=
\
eekboard.h
\
eekboard-
server
.h
\
eekboard-
eekboard
.h
\
eekboard-context.h
libeekboard_sources
=
\
eekboard-
server
.c
\
eekboard-
eekboard
.c
\
eekboard-context.c
libeekboard_la_SOURCES
=
$(libeekboard_sources)
...
...
eekboard/eekboard-
server
.c
→
eekboard/eekboard-
eekboard
.c
View file @
3eeb7cd8
...
...
@@ -17,58 +17,58 @@
*/
/**
* SECTION:eekboard-
server
* SECTION:eekboard-
eekboard
* @short_description: D-Bus proxy of eekboard-server
*
* The #Eekboard
Server
class provides a client side access to eekboard-server.
* The #Eekboard
Eekboard
class provides a client side access to eekboard-server.
*/
#ifdef HAVE_CONFIG_H
#include
"config.h"
#endif
/* HAVE_CONFIG_H */
#include
"eekboard/eekboard-
server
.h"
#include
"eekboard/eekboard-
eekboard
.h"
G_DEFINE_TYPE
(
Eekboard
Server
,
eekboard_
server
,
G_TYPE_DBUS_PROXY
);
G_DEFINE_TYPE
(
Eekboard
Eekboard
,
eekboard_
eekboard
,
G_TYPE_DBUS_PROXY
);
#define EEKBOARD_
SERVER
_GET_PRIVATE(obj) \
(G_TYPE_INSTANCE_GET_PRIVATE ((obj), EEKBOARD_TYPE_
SERVER
, Eekboard
Server
Private))
#define EEKBOARD_
EEKBOARD
_GET_PRIVATE(obj) \
(G_TYPE_INSTANCE_GET_PRIVATE ((obj), EEKBOARD_TYPE_
EEKBOARD
, Eekboard
Eekboard
Private))
struct
_Eekboard
Server
Private
struct
_Eekboard
Eekboard
Private
{
GHashTable
*
context_hash
;
};
static
void
eekboard_
server
_dispose
(
GObject
*
object
)
eekboard_
eekboard
_dispose
(
GObject
*
object
)
{
Eekboard
Server
Private
*
priv
=
EEKBOARD_
SERVER
_GET_PRIVATE
(
object
);
Eekboard
Eekboard
Private
*
priv
=
EEKBOARD_
EEKBOARD
_GET_PRIVATE
(
object
);
if
(
priv
->
context_hash
)
{
g_hash_table_destroy
(
priv
->
context_hash
);
priv
->
context_hash
=
NULL
;
}
G_OBJECT_CLASS
(
eekboard_
server
_parent_class
)
->
dispose
(
object
);
G_OBJECT_CLASS
(
eekboard_
eekboard
_parent_class
)
->
dispose
(
object
);
}
static
void
eekboard_
server
_class_init
(
Eekboard
Server
Class
*
klass
)
eekboard_
eekboard
_class_init
(
Eekboard
Eekboard
Class
*
klass
)
{
GObjectClass
*
gobject_class
=
G_OBJECT_CLASS
(
klass
);
g_type_class_add_private
(
gobject_class
,
sizeof
(
Eekboard
Server
Private
));
sizeof
(
Eekboard
Eekboard
Private
));
gobject_class
->
dispose
=
eekboard_
server
_dispose
;
gobject_class
->
dispose
=
eekboard_
eekboard
_dispose
;
}
static
void
eekboard_
server
_init
(
Eekboard
Server
*
self
)
eekboard_
eekboard
_init
(
Eekboard
Eekboard
*
self
)
{
Eekboard
Server
Private
*
priv
;
Eekboard
Eekboard
Private
*
priv
;
priv
=
self
->
priv
=
EEKBOARD_
SERVER
_GET_PRIVATE
(
self
);
priv
=
self
->
priv
=
EEKBOARD_
EEKBOARD
_GET_PRIVATE
(
self
);
priv
->
context_hash
=
g_hash_table_new_full
(
g_str_hash
,
g_str_equal
,
...
...
@@ -77,15 +77,15 @@ eekboard_server_init (EekboardServer *self)
}
/**
* eekboard_
server
_new:
* eekboard_
eekboard
_new:
* @connection: a #GDBusConnection
* @cancellable: a #GCancellable
*
* Create a D-Bus proxy of eekboard-
server
.
* Create a D-Bus proxy of eekboard-
eekboard
.
*/
Eekboard
Server
*
eekboard_
server
_new
(
GDBusConnection
*
connection
,
GCancellable
*
cancellable
)
Eekboard
Eekboard
*
eekboard_
eekboard
_new
(
GDBusConnection
*
connection
,
GCancellable
*
cancellable
)
{
GInitable
*
initable
;
GError
*
error
;
...
...
@@ -94,7 +94,7 @@ eekboard_server_new (GDBusConnection *connection,
error
=
NULL
;
initable
=
g_initable_new
(
EEKBOARD_TYPE_
SERVER
,
g_initable_new
(
EEKBOARD_TYPE_
EEKBOARD
,
cancellable
,
&
error
,
"g-connection"
,
connection
,
...
...
@@ -103,35 +103,35 @@ eekboard_server_new (GDBusConnection *connection,
"g-object-path"
,
"/com/redhat/Eekboard/Server"
,
NULL
);
if
(
initable
!=
NULL
)
return
EEKBOARD_
SERVER
(
initable
);
return
EEKBOARD_
EEKBOARD
(
initable
);
return
NULL
;
}
/**
* eekboard_
server
_create_context:
* @
server
: an #Eekboard
Server
* eekboard_
eekboard
_create_context:
* @
eekboard
: an #Eekboard
Eekboard
* @client_name: name of the client
* @cancellable: a #GCancellable
*
* Create a new input context.
*/
EekboardContext
*
eekboard_
server
_create_context
(
Eekboard
Server
*
server
,
const
gchar
*
client_name
,
GCancellable
*
cancellable
)
eekboard_
eekboard
_create_context
(
Eekboard
Eekboard
*
eekboard
,
const
gchar
*
client_name
,
GCancellable
*
cancellable
)
{
GVariant
*
variant
;
const
gchar
*
object_path
;
EekboardContext
*
context
;
Eekboard
Server
Private
*
priv
;
Eekboard
Eekboard
Private
*
priv
;
GError
*
error
;
GDBusConnection
*
connection
;
g_assert
(
EEKBOARD_IS_
SERVER
(
server
));
g_assert
(
EEKBOARD_IS_
EEKBOARD
(
eekboard
));
g_assert
(
client_name
);
error
=
NULL
;
variant
=
g_dbus_proxy_call_sync
(
G_DBUS_PROXY
(
server
),
variant
=
g_dbus_proxy_call_sync
(
G_DBUS_PROXY
(
eekboard
),
"CreateContext"
,
g_variant_new
(
"(s)"
,
client_name
),
G_DBUS_CALL_FLAGS_NONE
,
...
...
@@ -142,14 +142,14 @@ eekboard_server_create_context (EekboardServer *server,
return
NULL
;
g_variant_get
(
variant
,
"(&s)"
,
&
object_path
);
connection
=
g_dbus_proxy_get_connection
(
G_DBUS_PROXY
(
server
));
connection
=
g_dbus_proxy_get_connection
(
G_DBUS_PROXY
(
eekboard
));
context
=
eekboard_context_new
(
connection
,
object_path
,
cancellable
);
if
(
!
context
)
{
g_variant_unref
(
variant
);
return
NULL
;
}
priv
=
EEKBOARD_
SERVER
_GET_PRIVATE
(
server
);
priv
=
EEKBOARD_
EEKBOARD
_GET_PRIVATE
(
eekboard
);
g_hash_table_insert
(
priv
->
context_hash
,
g_strdup
(
object_path
),
g_object_ref
(
context
));
...
...
@@ -157,7 +157,7 @@ eekboard_server_create_context (EekboardServer *server,
}
static
void
server
_async_ready_callback
(
GObject
*
source_object
,
eekboard
_async_ready_callback
(
GObject
*
source_object
,
GAsyncResult
*
res
,
gpointer
user_data
)
{
...
...
@@ -172,95 +172,95 @@ server_async_ready_callback (GObject *source_object,
}
/**
* eekboard_
server
_push_context:
* @
server
: an #Eekboard
Server
* eekboard_
eekboard
_push_context:
* @
eekboard
: an #Eekboard
Eekboard
* @context: an #EekboardContext
* @cancellable: a #GCancellable
*
* Enable the input context @context and disable the others.
*/
void
eekboard_
server
_push_context
(
Eekboard
Server
*
server
,
EekboardContext
*
context
,
GCancellable
*
cancellable
)
eekboard_
eekboard
_push_context
(
Eekboard
Eekboard
*
eekboard
,
EekboardContext
*
context
,
GCancellable
*
cancellable
)
{
Eekboard
Server
Private
*
priv
;
Eekboard
Eekboard
Private
*
priv
;
const
gchar
*
object_path
;
g_return_if_fail
(
EEKBOARD_IS_
SERVER
(
server
));
g_return_if_fail
(
EEKBOARD_IS_
EEKBOARD
(
eekboard
));
g_return_if_fail
(
EEKBOARD_IS_CONTEXT
(
context
));
object_path
=
g_dbus_proxy_get_object_path
(
G_DBUS_PROXY
(
context
));
priv
=
EEKBOARD_
SERVER
_GET_PRIVATE
(
server
);
priv
=
EEKBOARD_
EEKBOARD
_GET_PRIVATE
(
eekboard
);
context
=
g_hash_table_lookup
(
priv
->
context_hash
,
object_path
);
if
(
!
context
)
return
;
eekboard_context_set_enabled
(
context
,
TRUE
);
g_dbus_proxy_call
(
G_DBUS_PROXY
(
server
),
g_dbus_proxy_call
(
G_DBUS_PROXY
(
eekboard
),
"PushContext"
,
g_variant_new
(
"(s)"
,
object_path
),
G_DBUS_CALL_FLAGS_NONE
,
-
1
,
cancellable
,
server
_async_ready_callback
,
eekboard
_async_ready_callback
,
NULL
);
}
/**
* eekboard_
server
_pop_context:
* @
server
: an #Eekboard
Server
* eekboard_
eekboard
_pop_context:
* @
eekboard
: an #Eekboard
Eekboard
* @cancellable: a #GCancellable
*
* Disable the current input context and enable the previous one.
*/
void
eekboard_
server
_pop_context
(
Eekboard
Server
*
server
,
GCancellable
*
cancellable
)
eekboard_
eekboard
_pop_context
(
Eekboard
Eekboard
*
eekboard
,
GCancellable
*
cancellable
)
{
g_return_if_fail
(
EEKBOARD_IS_
SERVER
(
server
));
g_return_if_fail
(
EEKBOARD_IS_
EEKBOARD
(
eekboard
));
g_dbus_proxy_call
(
G_DBUS_PROXY
(
server
),
g_dbus_proxy_call
(
G_DBUS_PROXY
(
eekboard
),
"PopContext"
,
NULL
,
G_DBUS_CALL_FLAGS_NONE
,
-
1
,
cancellable
,
server
_async_ready_callback
,
eekboard
_async_ready_callback
,
NULL
);
}
/**
* eekboard_
server
_destroy_context:
* @
server
: an #Eekboard
Server
* eekboard_
eekboard
_destroy_context:
* @
eekboard
: an #Eekboard
Eekboard
* @context: an #EekboardContext
* @cancellable: a #GCancellable
*
* Remove @context from @
server
.
* Remove @context from @
eekboard
.
*/
void
eekboard_
server
_destroy_context
(
Eekboard
Server
*
server
,
EekboardContext
*
context
,
GCancellable
*
cancellable
)
eekboard_
eekboard
_destroy_context
(
Eekboard
Eekboard
*
eekboard
,
EekboardContext
*
context
,
GCancellable
*
cancellable
)
{
Eekboard
Server
Private
*
priv
;
Eekboard
Eekboard
Private
*
priv
;
const
gchar
*
object_path
;
g_return_if_fail
(
EEKBOARD_IS_
SERVER
(
server
));
g_return_if_fail
(
EEKBOARD_IS_
EEKBOARD
(
eekboard
));
g_return_if_fail
(
EEKBOARD_IS_CONTEXT
(
context
));
priv
=
EEKBOARD_
SERVER
_GET_PRIVATE
(
server
);
priv
=
EEKBOARD_
EEKBOARD
_GET_PRIVATE
(
eekboard
);
object_path
=
g_dbus_proxy_get_object_path
(
G_DBUS_PROXY
(
context
));
g_hash_table_remove
(
priv
->
context_hash
,
object_path
);
g_dbus_proxy_call
(
G_DBUS_PROXY
(
server
),
g_dbus_proxy_call
(
G_DBUS_PROXY
(
eekboard
),
"DestroyContext"
,
g_variant_new
(
"(s)"
,
object_path
),
G_DBUS_CALL_FLAGS_NONE
,
-
1
,
cancellable
,
server
_async_ready_callback
,
eekboard
_async_ready_callback
,
NULL
);
}
eekboard/eekboard-
server
.h
→
eekboard/eekboard-
eekboard
.h
View file @
3eeb7cd8
...
...
@@ -15,33 +15,33 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#ifndef EEKBOARD_
SERVER
_H
#define EEKBOARD_
SERVER
_H 1
#ifndef EEKBOARD_
EEKBOARD
_H
#define EEKBOARD_
EEKBOARD
_H 1
#include
<gio/gio.h>
#include
"eekboard/eekboard-context.h"
G_BEGIN_DECLS
#define EEKBOARD_TYPE_
SERVER
(eekboard_
server
_get_type())
#define EEKBOARD_
SERVER
(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), EEKBOARD_TYPE_
SERVER
, Eekboard
Server
))
#define EEKBOARD_
SERVER
_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), EEKBOARD_TYPE_
SERVER
, Eekboard
Server
Class))
#define EEKBOARD_IS_
SERVER
(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), EEKBOARD_TYPE_
SERVER
))
#define EEKBOARD_IS_
SERVER
_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), EEKBOARD_TYPE_
SERVER
))
#define EEKBOARD_
SERVER
_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), EEKBOARD_TYPE_
SERVER
, Eekboard
Server
Class))
#define EEKBOARD_TYPE_
EEKBOARD
(eekboard_
eekboard
_get_type())
#define EEKBOARD_
EEKBOARD
(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), EEKBOARD_TYPE_
EEKBOARD
, Eekboard
Eekboard
))
#define EEKBOARD_
EEKBOARD
_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), EEKBOARD_TYPE_
EEKBOARD
, Eekboard
Eekboard
Class))
#define EEKBOARD_IS_
EEKBOARD
(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), EEKBOARD_TYPE_
EEKBOARD
))
#define EEKBOARD_IS_
EEKBOARD
_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), EEKBOARD_TYPE_
EEKBOARD
))
#define EEKBOARD_
EEKBOARD
_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), EEKBOARD_TYPE_
EEKBOARD
, Eekboard
Eekboard
Class))
typedef
struct
_Eekboard
Server
Eekboard
Server
;
typedef
struct
_Eekboard
Server
Class
Eekboard
Server
Class
;
typedef
struct
_Eekboard
Server
Private
Eekboard
Server
Private
;
typedef
struct
_Eekboard
Eekboard
Eekboard
Eekboard
;
typedef
struct
_Eekboard
Eekboard
Class
Eekboard
Eekboard
Class
;
typedef
struct
_Eekboard
Eekboard
Private
Eekboard
Eekboard
Private
;
struct
_Eekboard
Server
{
struct
_Eekboard
Eekboard
{
/*< private >*/
GDBusProxy
parent
;
Eekboard
Server
Private
*
priv
;
Eekboard
Eekboard
Private
*
priv
;
};
struct
_Eekboard
Server
Class
{
struct
_Eekboard
Eekboard
Class
{
/*< private >*/
GDBusProxyClass
parent_class
;
...
...
@@ -50,21 +50,24 @@ struct _EekboardServerClass {
gpointer
pdummy
[
24
];
};
GType
eekboard_
server
_get_type
(
void
)
G_GNUC_CONST
;
GType
eekboard_
eekboard
_get_type
(
void
)
G_GNUC_CONST
;
EekboardServer
*
eekboard_server_new
(
GDBusConnection
*
connection
,
GCancellable
*
cancellable
);
EekboardContext
*
eekboard_server_create_context
(
EekboardServer
*
server
,
const
gchar
*
client_name
,
GCancellable
*
cancellable
);
void
eekboard_server_push_context
(
EekboardServer
*
server
,
EekboardContext
*
context
,
GCancellable
*
cancellable
);
void
eekboard_server_pop_context
(
EekboardServer
*
server
,
GCancellable
*
cancellable
);
void
eekboard_server_destroy_context
(
EekboardServer
*
server
,
EekboardContext
*
context
,
GCancellable
*
cancellable
);
EekboardEekboard
*
eekboard_eekboard_new
(
GDBusConnection
*
connection
,
GCancellable
*
cancellable
);
EekboardContext
*
eekboard_eekboard_create_context
(
EekboardEekboard
*
eekboard
,
const
gchar
*
client_name
,
GCancellable
*
cancellable
);
void
eekboard_eekboard_push_context
(
EekboardEekboard
*
eekboard
,
EekboardContext
*
context
,
GCancellable
*
cancellable
);
void
eekboard_eekboard_pop_context
(
EekboardEekboard
*
eekboard
,
GCancellable
*
cancellable
);
void
eekboard_eekboard_destroy_context
(
EekboardEekboard
*
eekboard
,
EekboardContext
*
context
,
GCancellable
*
cancellable
);
G_END_DECLS
#endif
/* EEKBOARD_
SERVER
_H */
#endif
/* EEKBOARD_
EEKBOARD
_H */
eekboard/eekboard.h
View file @
3eeb7cd8
...
...
@@ -18,7 +18,7 @@
#ifndef EEKBOARD_H
#define EEKBOARD_H 1
#include
"eekboard/eekboard-
server
.h"
#include
"eekboard/eekboard-
eekboard
.h"
#include
"eekboard/eekboard-context.h"
#endif
/* EEKBOARD_H */
src/client-main.c
View file @
3eeb7cd8
...
...
@@ -62,7 +62,7 @@ on_key_released (guint keycode, gpointer user_data)
int
main
(
int
argc
,
char
**
argv
)
{
Eekboard
Server
*
server
=
NULL
;
Eekboard
Eekboard
*
eekboard
=
NULL
;
EekboardContext
*
context
=
NULL
;
GDBusConnection
*
connection
=
NULL
;
GError
*
error
;
...
...
@@ -86,14 +86,14 @@ main (int argc, char **argv)
goto
out
;
}
server
=
eekboard_
server
_new
(
connection
,
NULL
);
if
(
!
server
)
{
g_printerr
(
"Can't create
server
\n
"
);
eekboard
=
eekboard_
eekboard
_new
(
connection
,
NULL
);
if
(
!
eekboard
)
{
g_printerr
(
"Can't create
eekboard
\n
"
);
retval
=
1
;
goto
out
;
}
context
=
eekboard_
server
_create_context
(
server
,
context
=
eekboard_
eekboard
_create_context
(
eekboard
,
"eekboard-client"
,
NULL
);
if
(
!
context
)
{
...
...
@@ -102,7 +102,7 @@ main (int argc, char **argv)
goto
out
;
}
eekboard_
server
_push_context
(
server
,
context
,
NULL
);
eekboard_
eekboard
_push_context
(
eekboard
,
context
,
NULL
);
if
(
opt_set_keyboard
)
{
GFile
*
file
;
...
...
src/desktop-client.c
View file @
3eeb7cd8
...
...
@@ -51,7 +51,7 @@ typedef struct _EekboardDesktopClientClass EekboardDesktopClientClass;
struct
_EekboardDesktopClient
{
GObject
parent
;
Eekboard
Server
*
server
;
Eekboard
Eekboard
*
eekboard
;
EekboardContext
*
context
;
EekKeyboard
*
keyboard
;
...
...
@@ -119,16 +119,16 @@ eekboard_desktop_client_set_property (GObject *object,
case
PROP_CONNECTION
:
connection
=
g_value_get_object
(
value
);
client
->
server
=
eekboard_
server
_new
(
connection
,
NULL
);
g_assert
(
client
->
server
);
client
->
eekboard
=
eekboard_
eekboard
_new
(
connection
,
NULL
);
g_assert
(
client
->
eekboard
);
client
->
context
=
eekboard_
server
_create_context
(
client
->
server
,
eekboard_
eekboard
_create_context
(
client
->
eekboard
,
"eekboard-desktop-client"
,
NULL
);
g_assert
(
client
->
context
);
eekboard_
server
_push_context
(
client
->
server
,
client
->
context
,
NULL
);
eekboard_
eekboard
_push_context
(
client
->
eekboard
,
client
->
context
,
NULL
);
break
;
default:
g_object_set_property
(
object
,
...
...
@@ -175,17 +175,17 @@ eekboard_desktop_client_dispose (GObject *object)
#endif
/* HAVE_FAKEKEY */
if
(
client
->
context
)
{
if
(
client
->
server
)
{
eekboard_
server
_pop_context
(
client
->
server
,
NULL
);
if
(
client
->
eekboard
)
{
eekboard_
eekboard
_pop_context
(
client
->
eekboard
,
NULL
);
}
g_object_unref
(
client
->
context
);
client
->
context
=
NULL
;
}
if
(
client
->
server
)
{
g_object_unref
(
client
->
server
);
client
->
server
=
NULL
;
if
(
client
->
eekboard
)
{
g_object_unref
(
client
->
eekboard
);
client
->
eekboard
=
NULL
;
}
if
(
client
->
keyboard
)
{
...
...
@@ -239,7 +239,7 @@ eekboard_desktop_client_class_init (EekboardDesktopClientClass *klass)
static
void
eekboard_desktop_client_init
(
EekboardDesktopClient
*
client
)
{
client
->
server
=
NULL
;
client
->
eekboard
=
NULL
;
client
->
context
=
NULL
;
client
->
display
=
NULL
;
client
->
xkl_engine
=
NULL
;
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment