X-Git-Url: https://uglyman.kremlin.cc/gitweb/gitweb.cgi?a=blobdiff_plain;f=src%2Finterfaces%2Flocaled%2Flocaled.c;h=b45633e46df25e7036c71660541754be8c1c72c2;hb=7279ffec698a51ea228a51041e8789a05ef6e574;hp=ef4fdea413be84de2ec0deba29f6f7cf64ef740b;hpb=7f0a0212d65905aea6c875b6250e0a87dc9820d8;p=systembsd.git diff --git a/src/interfaces/localed/localed.c b/src/interfaces/localed/localed.c index ef4fdea..b45633e 100644 --- a/src/interfaces/localed/localed.c +++ b/src/interfaces/localed/localed.c @@ -16,122 +16,201 @@ #include #include +#include -#include -#include +#include +#include +#include +#include +#include + +#include "localed-gen.h" #include "localed.h" -#include "localed-gen.c" + +#include "../../util.h" GPtrArray *localed_freeable; -GDBusNodeInfo *spect_data; -localedLocale1 *localed_interf; +Locale1 *localed_interf; + +GMainLoop *localed_loop; -/* begin method/property/signal code */ +guint bus_descriptor; +gboolean dbus_interface_exported; /* reliable because of gdbus operational guarantees */ -/* TODO make sure these guys only work if called by root */ +/* --- begin method/property/dbus signal code --- */ -/* Example: static gboolean -on_handle_set_hostname(localedLocale1 *hn1_passed_interf, - GDBusMethodInvocation *invoc, - const gchar *greet, - gpointer data) { +on_handle_set_locale(Locale1 *hn1_passed_interf, + GDBusMethodInvocation *invoc, + const gchar *greet, + gpointer data) { return FALSE; -} */ +} -/* note: all localed/locale1's properties are read-only, - * and do not need set_ functions, gdbus-codegen realized - * this from the XML and handled the to-be error of trying - * to set a read-only property's value - */ +static gboolean +on_handle_set_v_console_keyboard(Locale1 *hn1_passed_interf, + GDBusMethodInvocation *invoc, + const gchar *greet, + gpointer data) { + return FALSE; +} -/* Example: +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 ""; +} - return "TODO"; -}*/ +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 --- */ - localed_interf = localed_locale1_skeleton_new(); +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); - g_signal_connect(localed_interf, "handle-set-static-hostname", G_CALLBACK(on_handle_set_static_hostname), NULL); - g_signal_connect(localed_interf, "handle-set-pretty-hostname", G_CALLBACK(on_handle_set_pretty_hostname), NULL); - g_signal_connect(localed_interf, "handle-set-chassis", G_CALLBACK(on_handle_set_chassis), NULL); - g_signal_connect(localed_interf, "handle-set-icon-name", G_CALLBACK(on_handle_set_icon_name), NULL); */ + 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 */ - /*localed_locale1_set_hostname(localed_interf, our_get_hostname()); - localed_locale1_set_static_hostname(localed_interf, our_get_static_hostname()); - localed_locale1_set_pretty_hostname(localed_interf, our_get_pretty_hostname()); - localed_locale1_set_chassis(localed_interf, our_get_chassis()); - localed_locale1_set_icon_name(localed_interf, our_get_icon_name()); - localed_locale1_set_kernel_name(localed_interf, our_get_kernel_name()); - localed_locale1_set_kernel_version(localed_interf, our_get_kernel_version()); - localed_locale1_set_kernel_release(localed_interf, our_get_kernel_release()); - localed_locale1_set_operating_system_cpename(localed_interf, our_get_os_cpename()); - localed_locale1_set_operating_system_pretty_name(localed_interf, our_get_os_pretty_name()); */ - + 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()); + if(!g_dbus_interface_skeleton_export(G_DBUS_INTERFACE_SKELETON(localed_interf), - conn, - "/org/freedesktop/locale1", - NULL)) { + conn, + "/org/freedesktop/locale1", + NULL)) { - g_printf("failed to export locale1's interface on system bus!"); + g_printf("failed to export %s's interface!\n", name); + localed_mem_clean(); + + } else { + + dbus_interface_exported = TRUE; + g_printf("exported %s's interface on the system bus...\n", name); } +} +static void localed_on_name_acquired(GDBusConnection *conn, + const gchar *name, + gpointer user_data) { + + g_printf("success!\n"); } static void localed_on_name_lost(GDBusConnection *conn, - const gchar *name, - gpointer user_data) { + const gchar *name, + gpointer user_data) { + + 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...", name); + g_print("lost name %s, exiting...\n", name); localed_mem_clean(); - g_dbus_interface_skeleton_unexport(G_DBUS_INTERFACE_SKELETON(localed_interf)); +} + +/* --- 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); - /* TODO exit through g_main_loop properly... */ } -/* safe call to try and start localed */ -void localed_init() { +/* wrapper for glib's unix signal handling; called only once if terminating signal is raised against us */ +gboolean unix_sig_terminate_handler(gpointer data) { - guint bus_descriptor; - GError *err = NULL; - gchar **localed_ispect_xml; - gchar *localed_joined_xml; + g_printf("caught SIGINT/HUP/TERM, exiting\n"); - localed_freeable = g_ptr_array_new(); - localed_ispect_xml = g_malloc(3000); + 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); +} - g_file_get_contents("conf/localed-ispect.xml", localed_ispect_xml, NULL, NULL); - localed_joined_xml = g_strjoinv("\n", localed_ispect_xml); - spect_data = g_dbus_node_info_new_for_xml(localed_joined_xml, NULL); +int main() { - g_free(localed_ispect_xml); - g_ptr_array_add(localed_freeable, localed_joined_xml); + set_signal_handlers(); - bus_descriptor = g_bus_own_name(G_BUS_TYPE_SYSTEM, + localed_loop = g_main_loop_new(NULL, TRUE); + localed_freeable = g_ptr_array_new(); + + bus_descriptor = g_bus_own_name(G_BUS_TYPE_SYSTEM, "org.freedesktop.locale1", G_BUS_NAME_OWNER_FLAGS_NONE, localed_on_bus_acquired, @@ -140,57 +219,15 @@ void localed_init() { NULL, NULL); - /* TODO: malloc and return reference as if a main() closed */ -} + 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); -/* free()'s */ -void localed_mem_clean() { + /* guaranteed unownable */ + g_bus_unown_name(bus_descriptor); - g_ptr_array_foreach(localed_freeable, (GFunc) g_free, NULL); -} - -/* TODO figure out DMI variables on obsd */ -/*static gchar *guess_icon_name() { - - gchar *filebuf = NULL; - gchar *ret = NULL; - - #if defined(__i386__) || defined(__x86_64__) - - Taken with a few minor changes from systemd's localed.c, - copyright 2011 Lennart Poettering. - - See the SMBIOS Specification 2.7.1 section 7.4.1 for - details about the values listed here: - - http://www.dmtf.org/sites/default/files/standards/documents/DSP0134_2.7.1.pdf - - - if (g_file_get_contents ("/sys/class/dmi/id/chassis_type", &filebuf, NULL, NULL)) { - switch (g_ascii_strtoull (filebuf, NULL, 10)) { - case 0x3: - case 0x4: - case 0x5: - case 0x6: - case 0x7: - ret = g_strdup ("computer-desktop"); - goto out; - case 0x9: - case 0xA: - case 0xE: - ret = g_strdup ("computer-laptop"); - goto out; - case 0x11: - case 0x17: - case 0x1C: - case 0x1D: - ret = g_strdup ("computer-server"); - goto out; - } - } - #endif - ret = g_strdup ("computer"); - out: - g_free (filebuf); - return ret; -}*/ + /* 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; +}