X-Git-Url: https://uglyman.kremlin.cc/gitweb/gitweb.cgi?a=blobdiff_plain;f=src%2Finterfaces%2Flocaled%2Flocaled.c;h=b45633e46df25e7036c71660541754be8c1c72c2;hb=7279ffec698a51ea228a51041e8789a05ef6e574;hp=e2fd3f44d201abac9780879291b5dfa396211c27;hpb=341587dbd94b8845b91baef896d9da2693df19bb;p=systembsd.git diff --git a/src/interfaces/localed/localed.c b/src/interfaces/localed/localed.c index e2fd3f4..b45633e 100644 --- a/src/interfaces/localed/localed.c +++ b/src/interfaces/localed/localed.c @@ -23,10 +23,13 @@ #include #include +#include #include "localed-gen.h" #include "localed.h" +#include "../../util.h" + GPtrArray *localed_freeable; Locale1 *localed_interf; @@ -37,32 +40,74 @@ gboolean dbus_interface_exported; /* reliable because of gdbus operational guara /* --- begin method/property/dbus signal code --- */ -/*static gboolean -on_handle_set_hostname(Locale1 *hn1_passed_interf, - GDBusMethodInvocation *invoc, - const gchar *greet, - gpointer data) { +static gboolean +on_handle_set_locale(Locale1 *hn1_passed_interf, + GDBusMethodInvocation *invoc, + const gchar *greet, + gpointer data) { + return FALSE; +} + +static gboolean +on_handle_set_v_console_keyboard(Locale1 *hn1_passed_interf, + GDBusMethodInvocation *invoc, + const gchar *greet, + gpointer data) { return FALSE; } +static gboolean +on_handle_set_x11_keyboard(Locale1 *hn1_passed_interf, + GDBusMethodInvocation *invoc, + const gchar *greet, + gpointer data) { + return FALSE; +} + +const gchar * const * +our_get_locale() { + + const gchar * const *ret = NULL; + + return ret; +} + const gchar * -our_get_hostname() { +our_get_v_console_keymap() { + + return ""; +} + +const gchar * +our_get_v_console_keymap_toggle() { + + return ""; +} - gchar *hostname_buf, *ret; - size_t hostname_divider; +const gchar * +our_get_x11_layout() { + + return ""; +} - hostname_buf = (gchar*) g_malloc0(MAXHOSTNAMELEN); - ret = (gchar*) g_malloc0(MAXHOSTNAMELEN); - g_ptr_array_add(localed_freeable, hostname_buf); - g_ptr_array_add(localed_freeable, ret); +const gchar * +our_get_x11_model() { + + return ""; +} - if(gethostname(hostname_buf, MAXHOSTNAMELEN)) - return ""; +const gchar * +our_get_x11_variant() { + + return ""; +} - hostname_divider = strcspn(hostname_buf, "."); +const gchar * +our_get_x11_options() { + + return ""; +} - return strncpy(ret, hostname_buf, hostname_divider); -}*/ /* --- end method/property/dbus signal code, begin bus/name handlers --- */ @@ -70,16 +115,24 @@ static void localed_on_bus_acquired(GDBusConnection *conn, const gchar *name, gpointer user_data) { - g_print("got bus/name, exporting %s's interface...\n", name); + g_printf("got bus/name, exporting %s's interface...\n", name); localed_interf = locale1_skeleton_new(); - /* attach function pointers to generated struct's method handlers - g_signal_connect(localed_interf, "handle-set-hostname", G_CALLBACK(on_handle_set_hostname), NULL); */ + /* attach function pointers to generated struct's method handlers */ + g_signal_connect(localed_interf, "handle-set-locale", G_CALLBACK(on_handle_set_locale), NULL); + g_signal_connect(localed_interf, "handle-set-vconsole-keyboard", G_CALLBACK(on_handle_set_v_console_keyboard), NULL); + g_signal_connect(localed_interf, "handle-set-x11-keyboard", G_CALLBACK(on_handle_set_x11_keyboard), NULL); + + /* set our properties before export */ + locale1_set_locale(localed_interf, our_get_locale()); + locale1_set_vconsole_keymap(localed_interf, our_get_v_console_keymap()); + locale1_set_vconsole_keymap_toggle(localed_interf, our_get_v_console_keymap_toggle()); + locale1_set_x11_layout(localed_interf, our_get_x11_layout()); + locale1_set_x11_model(localed_interf, our_get_x11_model()); + locale1_set_x11_variant(localed_interf, our_get_x11_variant()); + locale1_set_x11_options(localed_interf, our_get_x11_options()); - /* set our properties before export - locale1_set_hostname(localed_interf, our_get_hostname()); */ - if(!g_dbus_interface_skeleton_export(G_DBUS_INTERFACE_SKELETON(localed_interf), conn, "/org/freedesktop/locale1", @@ -96,23 +149,23 @@ static void localed_on_bus_acquired(GDBusConnection *conn, } static void localed_on_name_acquired(GDBusConnection *conn, - const gchar *name, + const gchar *name, gpointer user_data) { - g_printf("success!\n"); + g_printf("success!\n"); } static void localed_on_name_lost(GDBusConnection *conn, const gchar *name, gpointer user_data) { - if(!conn) { + if(!conn) { - g_printf("failed to connect to the system bus while trying to acquire name '%s': either dbus-daemon isn't running or we don't have permission to push names and/or their interfaces to it.\n", name); - localed_mem_clean(); - } + g_printf("failed to connect to the system bus while trying to acquire name '%s': either dbus-daemon isn't running or we don't have permission to push names and/or their interfaces to it.\n", name); + localed_mem_clean(); + } - g_print("lost name %s, exiting...\n", name); + g_print("lost name %s, exiting...\n", name); localed_mem_clean(); } @@ -123,22 +176,41 @@ static void localed_on_name_lost(GDBusConnection *conn, * this stops our GMainLoop safely before letting main() return */ void localed_mem_clean() { - g_printf("exiting...\n"); + g_printf("exiting...\n"); + + if(dbus_interface_exported) + g_dbus_interface_skeleton_unexport(G_DBUS_INTERFACE_SKELETON(localed_interf)); + + if(g_main_loop_is_running(localed_loop)) + g_main_loop_quit(localed_loop); + +} + +/* wrapper for glib's unix signal handling; called only once if terminating signal is raised against us */ +gboolean unix_sig_terminate_handler(gpointer data) { - if(dbus_interface_exported) - g_dbus_interface_skeleton_unexport(G_DBUS_INTERFACE_SKELETON(localed_interf)); + g_printf("caught SIGINT/HUP/TERM, exiting\n"); - if(g_main_loop_is_running(localed_loop)) - g_main_loop_quit(localed_loop); + localed_mem_clean(); + return G_SOURCE_REMOVE; +} +void set_signal_handlers() { + + /* we don't care about its descriptor, we never need to unregister these */ + g_unix_signal_add(SIGINT, unix_sig_terminate_handler, NULL); + g_unix_signal_add(SIGHUP, unix_sig_terminate_handler, NULL); + g_unix_signal_add(SIGTERM, unix_sig_terminate_handler, NULL); } int main() { - localed_loop = g_main_loop_new(NULL, TRUE); - localed_freeable = g_ptr_array_new(); + set_signal_handlers(); + + localed_loop = g_main_loop_new(NULL, TRUE); + localed_freeable = g_ptr_array_new(); - bus_descriptor = g_bus_own_name(G_BUS_TYPE_SYSTEM, + bus_descriptor = g_bus_own_name(G_BUS_TYPE_SYSTEM, "org.freedesktop.locale1", G_BUS_NAME_OWNER_FLAGS_NONE, localed_on_bus_acquired, @@ -147,12 +219,15 @@ int main() { NULL, NULL); - g_main_loop_run(localed_loop); - g_main_loop_unref(localed_loop); + g_main_loop_run(localed_loop); + /* runs until single g_main_loop_quit() call is raised inside _mem_clean() */ + g_main_loop_unref(localed_loop); - g_bus_unown_name(bus_descriptor); + /* guaranteed unownable */ + g_bus_unown_name(bus_descriptor); - localed_mem_clean(); + /* at this point no operations can occur with our data, it is safe to free it + its container */ + g_ptr_array_free(localed_freeable, TRUE); - return 0; + return 0; }