X-Git-Url: https://uglyman.kremlin.cc/gitweb/gitweb.cgi?a=blobdiff_plain;f=src%2Finterfaces%2Flocaled%2Flocaled.c;h=b45633e46df25e7036c71660541754be8c1c72c2;hb=a8f7171993dc1467e353bbd1f7c712c31f2b846b;hp=5ecd79095483c06e11ab9a1bb3db6744a7f40160;hpb=b6ad18ad0ae669ec0424f9dad4c15d3bb0826ba0;p=systembsd.git diff --git a/src/interfaces/localed/localed.c b/src/interfaces/localed/localed.c index 5ecd790..b45633e 100644 --- a/src/interfaces/localed/localed.c +++ b/src/interfaces/localed/localed.c @@ -16,109 +16,201 @@ #include #include +#include #include #include #include +#include +#include #include "localed-gen.h" +#include "localed.h" + +#include "../../util.h" GPtrArray *localed_freeable; Locale1 *localed_interf; -/* --- begin method/property/signal code --- */ +GMainLoop *localed_loop; + +guint bus_descriptor; +gboolean dbus_interface_exported; /* reliable because of gdbus operational guarantees */ -/*static gboolean -on_handle_set_hostname(Locale1 *hn1_passed_interf, - GDBusMethodInvocation *invoc, - const gchar *greet, - gpointer data) { +/* --- begin method/property/dbus signal code --- */ + +static gboolean +on_handle_set_locale(Locale1 *hn1_passed_interf, + GDBusMethodInvocation *invoc, + const gchar *greet, + gpointer data) { return FALSE; } -const gchar * -our_get_hostname() { +static gboolean +on_handle_set_v_console_keyboard(Locale1 *hn1_passed_interf, + GDBusMethodInvocation *invoc, + const gchar *greet, + gpointer data) { + return FALSE; +} - gchar *hostname_buf, *ret; - size_t hostname_divider; +static gboolean +on_handle_set_x11_keyboard(Locale1 *hn1_passed_interf, + GDBusMethodInvocation *invoc, + const gchar *greet, + gpointer data) { + return FALSE; +} - 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 * const * +our_get_locale() { + + const gchar * const *ret = NULL; - if(gethostname(hostname_buf, MAXHOSTNAMELEN)) - return ""; + return ret; +} - hostname_divider = strcspn(hostname_buf, "."); +const gchar * +our_get_v_console_keymap() { + + return ""; +} - return strncpy(ret, hostname_buf, hostname_divider); -}*/ +const gchar * +our_get_v_console_keymap_toggle() { + + return ""; +} -/* --- end method/property/signal code, begin bus/name handlers --- */ +const gchar * +our_get_x11_layout() { + + return ""; +} -static void localed_on_bus_acquired(GDBusConnection *conn, - const gchar *name, - gpointer user_data) { +const gchar * +our_get_x11_model() { + + return ""; +} - g_print("got bus, name: %s\n", name); +const gchar * +our_get_x11_variant() { + + return ""; +} +const gchar * +our_get_x11_options() { + + return ""; } -static void localed_on_name_acquired(GDBusConnection *conn, - const gchar *name, - gpointer user_data) { - g_print("got '%s' on system bus\n", name); +/* --- end method/property/dbus signal code, begin bus/name handlers --- */ +static void localed_on_bus_acquired(GDBusConnection *conn, + const gchar *name, + gpointer user_data) { + + 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", NULL)) { - g_printf("Failed to export Locale1's interface!"); - } + g_printf("failed to export %s's interface!\n", name); + localed_mem_clean(); -} + } else { -/* --- end bus/name handlers, begin misc functions --- */ + dbus_interface_exported = TRUE; + g_printf("exported %s's interface on the system bus...\n", name); + } +} -/* free()'s */ -void localed_mem_clean() { +static void localed_on_name_acquired(GDBusConnection *conn, + const gchar *name, + gpointer user_data) { - g_ptr_array_foreach(localed_freeable, (GFunc) g_free, NULL); - g_ptr_array_free(localed_freeable, TRUE); + g_printf("success!\n"); } static void localed_on_name_lost(GDBusConnection *conn, const gchar *name, gpointer user_data) { - g_print("lost name %s, exiting...", name); + 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_print("lost name %s, exiting...\n", name); + + localed_mem_clean(); +} + +/* --- end bus/name handlers, begin misc unix functions --- */ + +/* safe call to clean and then exit + * this stops our GMainLoop safely before letting main() return */ +void localed_mem_clean() { + + 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) { + + g_printf("caught SIGINT/HUP/TERM, exiting\n"); localed_mem_clean(); - g_dbus_interface_skeleton_unexport(G_DBUS_INTERFACE_SKELETON(localed_interf)); + 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() { - guint bus_descriptor; - GMainLoop *localed_loop; + set_signal_handlers(); - localed_loop = g_main_loop_new(NULL, TRUE); - localed_freeable = g_ptr_array_new(); + 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, @@ -127,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; }