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

server-context-service: Consistenty name self argument 'self'

Browse Source 
It's confusing when the object a method acts on is sometimes called
context and sometimes called state. So name it 'self' as we do
in other projects.
This commit is contained in:
Guido Günther
2020-09-11 20:05:49 +02:00
parent 07faf906d8
commit 1e6bcef055
2 changed files with 77 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -55,30 +55,30 @@ G_DEFINE_TYPE(ServerContextService, server_context_service, G_TYPE_OBJECT);
static void static void
on_destroy (GtkWidget *widget, gpointer user_data) on_destroy (GtkWidget *widget, gpointer user_data)
{ {
ServerContextService *context = user_data; ServerContextService *self = user_data;
g_assert (widget == GTK_WIDGET(context->window)); g_assert (widget == GTK_WIDGET(self->window));
context->window = NULL; self->window = NULL;
context->widget = NULL; self->widget = NULL;
//eekboard_context_service_destroy (EEKBOARD_CONTEXT_SERVICE (context)); //eekboard_context_service_destroy (EEKBOARD_CONTEXT_SERVICE (context));
} }
static void static void
on_notify_map (GObject *object, on_notify_map (GObject *object,
ServerContextService *context) ServerContextService *self)
{ {
g_object_set (context, "visible", TRUE, NULL); (void)object;
g_object_set (self, "visible", TRUE, NULL);
} }
static void static void
on_notify_unmap (GObject *object, on_notify_unmap (GObject *object,
ServerContextService *context) ServerContextService *self)
{ {
(void)object; g_object_set (self, "visible", FALSE, NULL);
g_object_set (context, "visible", FALSE, NULL);
} }
static uint32_t static uint32_t
@ -94,7 +94,7 @@ calculate_height(int32_t width)
} }
static void static void
on_surface_configure(PhoshLayerSurface *surface, ServerContextService *context) on_surface_configure(PhoshLayerSurface *surface, ServerContextService *self)
{ {
gint width; gint width;
gint height; gint height;
@ -116,8 +116,8 @@ on_surface_configure(PhoshLayerSurface *surface, ServerContextService *context)
// as it's likely to create pointless loops // as it's likely to create pointless loops
// of request->reject->request_again->... // of request->reject->request_again->...
if (desired_height != configured_height if (desired_height != configured_height
&& context->last_requested_height != desired_height) { && self->last_requested_height != desired_height) {
context->last_requested_height = desired_height; self->last_requested_height = desired_height;
phosh_layer_surface_set_size(surface, 0, phosh_layer_surface_set_size(surface, 0,
(gint)desired_height); (gint)desired_height);
phosh_layer_surface_set_exclusive_zone(surface, (gint)desired_height); phosh_layer_surface_set_exclusive_zone(surface, (gint)desired_height);
@ -126,16 +126,16 @@ on_surface_configure(PhoshLayerSurface *surface, ServerContextService *context)
} }
static void static void
make_window (ServerContextService *context) make_window (ServerContextService *self)
{ {
if (context->window) if (self->window)
g_error("Window already present"); g_error("Window already present");
struct squeek_output_handle output = squeek_outputs_get_current(squeek_wayland->outputs); struct squeek_output_handle output = squeek_outputs_get_current(squeek_wayland->outputs);
squeek_uiman_set_output(context->manager, output); squeek_uiman_set_output(self->manager, output);
uint32_t height = squeek_uiman_get_perceptual_height(context->manager); uint32_t height = squeek_uiman_get_perceptual_height(self->manager);
context->window = g_object_new ( self->window = g_object_new (
PHOSH_TYPE_LAYER_SURFACE, PHOSH_TYPE_LAYER_SURFACE,
"layer-shell", squeek_wayland->layer_shell, "layer-shell", squeek_wayland->layer_shell,
"wl-output", output.output, "wl-output", output.output,
@ -150,11 +150,11 @@ make_window (ServerContextService *context)
NULL NULL
); );
g_object_connect (context->window, g_object_connect (self->window,
"signal::destroy", G_CALLBACK(on_destroy), context, "signal::destroy", G_CALLBACK(on_destroy), self,
"signal::map", G_CALLBACK(on_notify_map), context, "signal::map", G_CALLBACK(on_notify_map), self,
"signal::unmap", G_CALLBACK(on_notify_unmap), context, "signal::unmap", G_CALLBACK(on_notify_unmap), self,
"signal::configured", G_CALLBACK(on_surface_configure), context, "signal::configured", G_CALLBACK(on_surface_configure), self,
NULL); NULL);
// The properties below are just to make hacking easier. // The properties below are just to make hacking easier.
@ -162,87 +162,87 @@ make_window (ServerContextService *context)
// and there's no space in the protocol for others. // and there's no space in the protocol for others.
// Those may still be useful in the future, // Those may still be useful in the future,
// or for hacks with regular windows. // or for hacks with regular windows.
gtk_widget_set_can_focus (GTK_WIDGET(context->window), FALSE); gtk_widget_set_can_focus (GTK_WIDGET(self->window), FALSE);
g_object_set (G_OBJECT(context->window), "accept_focus", FALSE, NULL); g_object_set (G_OBJECT(self->window), "accept_focus", FALSE, NULL);
gtk_window_set_title (GTK_WINDOW(context->window), gtk_window_set_title (GTK_WINDOW(self->window),
_("Squeekboard")); _("Squeekboard"));
gtk_window_set_icon_name (GTK_WINDOW(context->window), "squeekboard"); gtk_window_set_icon_name (GTK_WINDOW(self->window), "squeekboard");
gtk_window_set_keep_above (GTK_WINDOW(context->window), TRUE); gtk_window_set_keep_above (GTK_WINDOW(self->window), TRUE);
} }
static void static void
destroy_window (ServerContextService *context) destroy_window (ServerContextService *self)
{ {
gtk_widget_destroy (GTK_WIDGET (context->window)); gtk_widget_destroy (GTK_WIDGET (self->window));
context->window = NULL; self->window = NULL;
} }
static void static void
make_widget (ServerContextService *context) make_widget (ServerContextService *self)
{ {
if (context->widget) { if (self->widget) {
gtk_widget_destroy(context->widget); gtk_widget_destroy(self->widget);
context->widget = NULL; self->widget = NULL;
} }
context->widget = eek_gtk_keyboard_new (context->state, context->submission, context->layout); self->widget = eek_gtk_keyboard_new (self->state, self->submission, self->layout);
gtk_widget_set_has_tooltip (context->widget, TRUE); gtk_widget_set_has_tooltip (self->widget, TRUE);
gtk_container_add (GTK_CONTAINER(context->window), context->widget); gtk_container_add (GTK_CONTAINER(self->window), self->widget);
gtk_widget_show_all(context->widget); gtk_widget_show_all(self->widget);
} }
static gboolean static gboolean
on_hide (ServerContextService *context) on_hide (ServerContextService *self)
{ {
gtk_widget_hide (GTK_WIDGET(context->window)); gtk_widget_hide (GTK_WIDGET(self->window));
context->hiding = 0; self->hiding = 0;
return G_SOURCE_REMOVE; return G_SOURCE_REMOVE;
} }
static void static void
server_context_service_real_show_keyboard (ServerContextService *context) server_context_service_real_show_keyboard (ServerContextService *self)
{ {
if (context->hiding) { if (self->hiding) {
g_source_remove (context->hiding); g_source_remove (self->hiding);
context->hiding = 0; self->hiding = 0;
} }
if (!context->window) if (!self->window)
make_window (context); make_window (self);
if (!context->widget) if (!self->widget)
make_widget (context); make_widget (self);
context->visible = TRUE; self->visible = TRUE;
gtk_widget_show (GTK_WIDGET(context->window)); gtk_widget_show (GTK_WIDGET(self->window));
} }
static void static void
server_context_service_real_hide_keyboard (ServerContextService *context) server_context_service_real_hide_keyboard (ServerContextService *self)
{ {
if (!context->hiding) if (!self->hiding)
context->hiding = g_timeout_add (200, (GSourceFunc) on_hide, context); self->hiding = g_timeout_add (200, (GSourceFunc) on_hide, self);
context->visible = FALSE; self->visible = FALSE;
} }
void void
server_context_service_show_keyboard (ServerContextService *context) server_context_service_show_keyboard (ServerContextService *self)
{ {
g_return_if_fail (SERVER_IS_CONTEXT_SERVICE(context)); g_return_if_fail (SERVER_IS_CONTEXT_SERVICE(self));
if (!context->visible) { if (!self->visible) {
server_context_service_real_show_keyboard (context); server_context_service_real_show_keyboard (self);
} }
} }
void void
server_context_service_hide_keyboard (ServerContextService *context) server_context_service_hide_keyboard (ServerContextService *self)
{ {
g_return_if_fail (SERVER_IS_CONTEXT_SERVICE(context)); g_return_if_fail (SERVER_IS_CONTEXT_SERVICE(self));
if (context->visible) { if (self->visible) {
server_context_service_real_hide_keyboard (context); server_context_service_real_hide_keyboard (self);
} }
} }
@ -252,11 +252,11 @@ server_context_service_set_property (GObject *object,
const GValue *value, const GValue *value,
GParamSpec *pspec) GParamSpec *pspec)
{ {
ServerContextService *context = SERVER_CONTEXT_SERVICE(object); ServerContextService *self = SERVER_CONTEXT_SERVICE(object);
switch (prop_id) { switch (prop_id) {
case PROP_VISIBLE: case PROP_VISIBLE:
context->visible = g_value_get_boolean (value); self->visible = g_value_get_boolean (value);
break; break;
default: default:
@ -271,10 +271,10 @@ server_context_service_get_property (GObject *object,
GValue *value, GValue *value,
GParamSpec *pspec) GParamSpec *pspec)
{ {
ServerContextService *context = SERVER_CONTEXT_SERVICE(object); ServerContextService *self = SERVER_CONTEXT_SERVICE(object);
switch (prop_id) { switch (prop_id) {
case PROP_VISIBLE: case PROP_VISIBLE:
g_value_set_boolean (value, context->visible); g_value_set_boolean (value, self->visible);
break; break;
default: default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
@ -285,10 +285,10 @@ server_context_service_get_property (GObject *object,
static void static void
server_context_service_dispose (GObject *object) server_context_service_dispose (GObject *object)
{ {
ServerContextService *context = SERVER_CONTEXT_SERVICE(object); ServerContextService *self = SERVER_CONTEXT_SERVICE(object);
destroy_window (context); destroy_window (self);
context->widget = NULL; self->widget = NULL;
G_OBJECT_CLASS (server_context_service_parent_class)->dispose (object); G_OBJECT_CLASS (server_context_service_parent_class)->dispose (object);
} }
@ -317,16 +317,16 @@ server_context_service_class_init (ServerContextServiceClass *klass)
} }
static void static void
server_context_service_init (ServerContextService *state) { server_context_service_init (ServerContextService *self) {
(void)state; (void)self;
} }
ServerContextService * ServerContextService *
server_context_service_new (EekboardContextService *state, struct submission *submission, struct squeek_layout_state *layout, struct ui_manager *uiman) server_context_service_new (EekboardContextService *self, struct submission *submission, struct squeek_layout_state *layout, struct ui_manager *uiman)
{ {
ServerContextService *ui = g_object_new (SERVER_TYPE_CONTEXT_SERVICE, NULL); ServerContextService *ui = g_object_new (SERVER_TYPE_CONTEXT_SERVICE, NULL);
ui->submission = submission; ui->submission = submission;
ui->state = state; ui->state = self;
ui->layout = layout; ui->layout = layout;
ui->manager = uiman; ui->manager = uiman;
return ui; return ui;

6
src/server-context-service.h
View File

@ -29,10 +29,10 @@ G_BEGIN_DECLS
/** Manages the lifecycle of the window displaying layouts. */ /** Manages the lifecycle of the window displaying layouts. */
G_DECLARE_FINAL_TYPE (ServerContextService, server_context_service, SERVER, CONTEXT_SERVICE, GObject) G_DECLARE_FINAL_TYPE (ServerContextService, server_context_service, SERVER, CONTEXT_SERVICE, GObject)
ServerContextService *server_context_service_new(EekboardContextService *state, struct submission *submission, struct squeek_layout_state *layout, struct ui_manager *uiman); ServerContextService *server_context_service_new(EekboardContextService *self, struct submission *submission, struct squeek_layout_state *layout, struct ui_manager *uiman);
enum squeek_arrangement_kind server_context_service_get_layout_type(ServerContextService *); enum squeek_arrangement_kind server_context_service_get_layout_type(ServerContextService *);
void server_context_service_show_keyboard (ServerContextService *context); void server_context_service_show_keyboard (ServerContextService *self);
void server_context_service_hide_keyboard (ServerContextService *context); void server_context_service_hide_keyboard (ServerContextService *self);
G_END_DECLS G_END_DECLS
#endif /* SERVER_CONTEXT_SERVICE_H */ #endif /* SERVER_CONTEXT_SERVICE_H */