Commits May 2015

commits@lists.geany.org

1 participants
96 discussions

[geany/geany] 826f65: Merge pull request #441 from zhekov/spawn
by Colomban Wendling 15 May '15

15 May '15

Branch: refs/heads/master Author: Colomban Wendling <ban(a)herbesfolles.org> Committer: Colomban Wendling <ban(a)herbesfolles.org> Date: Fri, 15 May 2015 16:54:23 UTC Commit: 826f6516d36ec7a7bed35116fda32d42449c1e5d https://github.com/geany/geany/commit/826f6516d36ec7a7bed35116fda32d42449c1… Log Message: ----------- Merge pull request #441 from zhekov/spawn Add a spawn module for Geany Thanks a lot for Dimitar's hard work, commitment and endless patience! Closes #274, #441, and https://sourceforge.net/p/geany/bugs/943/ Should also fix https://sourceforge.net/p/geany/bugs/898/ Modified Paths: -------------- src/Makefile.am src/build.c src/callbacks.c src/keyfile.c src/makefile.win32 src/printing.c src/search.c src/spawn.c src/spawn.h src/templates.c src/tools.c src/utils.c src/win32.c src/win32.h wscript Modified: src/Makefile.am 1 lines changed, 1 insertions(+), 0 deletions(-) =================================================================== @@ -89,6 +89,7 @@ libgeany_la_SOURCES = \ sciwrappers.c sciwrappers.h \ search.c search.h \ socket.c socket.h \ + spawn.c spawn.h \ stash.c stash.h \ support.h \ symbols.c symbols.h \ Modified: src/build.c 291 lines changed, 47 insertions(+), 244 deletions(-) =================================================================== @@ -44,6 +44,7 @@ #include "prefs.h" #include "projectprivate.h" #include "sciwrappers.h" +#include "spawn.h" #include "support.h" #include "toolbar.h" #include "ui_utils.h" @@ -60,20 +61,8 @@ #include <errno.h> #include <glib/gstdio.h> -#ifdef G_OS_UNIX -# include <sys/types.h> -# include <sys/wait.h> -# include <signal.h> -#else -# include <windows.h> -#endif -/* g_spawn_async_with_pipes doesn't work on Windows */ -#ifdef G_OS_WIN32 -#define SYNC_SPAWN -#endif - /* Number of editor indicators to draw - limited as this can affect performance */ #define GEANY_BUILD_ERR_HIGHLIGHT_MAX 50 @@ -124,12 +113,10 @@ widgets; static guint build_groups_count[GEANY_GBG_COUNT] = { 3, 4, 2 }; static guint build_items_count = 9; -#ifndef SYNC_SPAWN -static void build_exit_cb(GPid child_pid, gint status, gpointer user_data); -static gboolean build_iofunc(GIOChannel *ioc, GIOCondition cond, gpointer data); -#endif +static void build_exit_cb(GPid pid, gint status, gpointer user_data); +static void build_iofunc(GString *string, GIOCondition condition, gpointer data); static gchar *build_create_shellscript(const gchar *working_dir, const gchar *cmd, gboolean autoclose, GError **error); -static GPid build_spawn_cmd(GeanyDocument *doc, const gchar *cmd, const gchar *dir); +static void build_spawn_cmd(GeanyDocument *doc, const gchar *cmd, const gchar *dir); static void set_stop_button(gboolean stop); static void run_exit_cb(GPid child_pid, gint status, gpointer user_data); static void on_set_build_commands_activate(GtkWidget *w, gpointer u); @@ -137,7 +124,7 @@ static void on_build_next_error(GtkWidget *menuitem, gpointer user_data); static void on_build_previous_error(GtkWidget *menuitem, gpointer user_data); static void kill_process(GPid *pid); static void show_build_result_message(gboolean failure); -static void process_build_output_line(const gchar *line, gint color); +static void process_build_output_line(gchar *msg, gint color); static void show_build_commands_dialog(void); static void on_build_menu_item(GtkWidget *w, gpointer user_data); @@ -675,47 +662,6 @@ static void clear_all_errors(void) } -#ifdef SYNC_SPAWN -static void parse_build_output(const gchar **output, gint status) -{ - guint x, i, len; - gchar *line, **lines; - - for (x = 0; x < 2; x++) - { - if (!EMPTY(output[x])) - { - lines = g_strsplit_set(output[x], "\r\n", -1); - len = g_strv_length(lines); - - for (i = 0; i < len; i++) - { - if (!EMPTY(lines[i])) - { - line = lines[i]; - while (*line != '\0') - { /* replace any control characters in the output */ - if (*line < 32) - *line = 32; - line++; - } - process_build_output_line(lines[i], COLOR_BLACK); - } - } - g_strfreev(lines); - } - } - - show_build_result_message(status != 0); - utils_beep(); - - build_info.pid = 0; - /* enable build items again */ - build_menu_update(NULL); -} -#endif - - /* Replaces occurrences of %e and %p with the appropriate filenames and * %l with current line number. %d and %p replacements should be in UTF8 */ static gchar *build_replace_placeholder(const GeanyDocument *doc, const gchar *src) @@ -784,43 +730,26 @@ static gchar *build_replace_placeholder(const GeanyDocument *doc, const gchar *s /* dir is the UTF-8 working directory to run cmd in. It can be NULL to use the * idx document directory */ -static GPid build_spawn_cmd(GeanyDocument *doc, const gchar *cmd, const gchar *dir) +static void build_spawn_cmd(GeanyDocument *doc, const gchar *cmd, const gchar *dir) { GError *error = NULL; - gchar **argv; + gchar *argv[] = { "/bin/sh", "-c", (gchar *) cmd, NULL }; gchar *working_dir; gchar *utf8_working_dir; gchar *utf8_cmd_string; -#ifdef SYNC_SPAWN - gchar *output[2]; - gint status; -#else - gint stdout_fd; - gint stderr_fd; -#endif - g_return_val_if_fail(doc == NULL || doc->is_valid, (GPid) -1); + g_return_if_fail(doc == NULL || doc->is_valid); - if (!((doc != NULL && !EMPTY(doc->file_name)) || !EMPTY(dir))) + if ((doc == NULL || EMPTY(doc->file_name)) && EMPTY(dir)) { geany_debug("Failed to run command with no working directory"); ui_set_statusbar(TRUE, _("Process failed, no working directory")); - return (GPid) 1; + return; } clear_all_errors(); SETPTR(current_dir_entered, NULL); -#ifdef G_OS_WIN32 - argv = g_strsplit(cmd, " ", 0); -#else - argv = g_new0(gchar *, 4); - argv[0] = g_strdup("/bin/sh"); - argv[1] = g_strdup("-c"); - argv[2] = g_strdup(cmd); - argv[3] = NULL; -#endif - utf8_cmd_string = utils_get_utf8_from_locale(cmd); utf8_working_dir = !EMPTY(dir) ? g_strdup(dir) : g_path_get_dirname(doc->file_name); working_dir = utils_get_locale_from_utf8(utf8_working_dir); @@ -831,53 +760,28 @@ static GPid build_spawn_cmd(GeanyDocument *doc, const gchar *cmd, const gchar *d g_free(utf8_working_dir); g_free(utf8_cmd_string); +#ifdef G_OS_UNIX + cmd = NULL; /* under Unix, use argv to start cmd via sh for compatibility */ +#else + argv[0] = NULL; /* under Windows, run cmd directly */ +#endif + /* set the build info for the message window */ g_free(build_info.dir); build_info.dir = g_strdup(working_dir); build_info.file_type_id = (doc == NULL) ? GEANY_FILETYPES_NONE : doc->file_type->id; build_info.message_count = 0; -#ifdef SYNC_SPAWN - if (! utils_spawn_sync(working_dir, argv, NULL, G_SPAWN_SEARCH_PATH, - NULL, NULL, &output[0], &output[1], &status, &error)) -#else - if (! g_spawn_async_with_pipes(working_dir, argv, NULL, - G_SPAWN_SEARCH_PATH | G_SPAWN_DO_NOT_REAP_CHILD, NULL, NULL, - &(build_info.pid), NULL, &stdout_fd, &stderr_fd, &error)) -#endif + if (!spawn_with_callbacks(working_dir, cmd, argv, NULL, 0, NULL, NULL, build_iofunc, + GINT_TO_POINTER(0), 0, build_iofunc, GINT_TO_POINTER(1), 0, build_exit_cb, NULL, + &build_info.pid, &error)) { geany_debug("build command spawning failed: %s", error->message); ui_set_statusbar(TRUE, _("Process failed (%s)"), error->message); - g_strfreev(argv); g_error_free(error); - g_free(working_dir); - error = NULL; - return (GPid) 0; - } - -#ifdef SYNC_SPAWN - parse_build_output((const gchar**) output, status); - g_free(output[0]); - g_free(output[1]); -#else - if (build_info.pid != 0) - { - g_child_watch_add(build_info.pid, (GChildWatchFunc) build_exit_cb, NULL); - build_menu_update(doc); - ui_progress_bar_start(NULL); } - /* use GIOChannels to monitor stdout and stderr */ - utils_set_up_io_channel(stdout_fd, G_IO_IN | G_IO_PRI | G_IO_ERR | G_IO_HUP | G_IO_NVAL, - TRUE, build_iofunc, GINT_TO_POINTER(0)); - utils_set_up_io_channel(stderr_fd, G_IO_IN | G_IO_PRI | G_IO_ERR | G_IO_HUP | G_IO_NVAL, - TRUE, build_iofunc, GINT_TO_POINTER(1)); -#endif - - g_strfreev(argv); g_free(working_dir); - - return build_info.pid; } @@ -903,13 +807,10 @@ static gchar *prepare_run_cmd(GeanyDocument *doc, gchar **working_dir, guint cmd working_dir_utf8 = build_replace_placeholder(doc, cmd_working_dir); *working_dir = utils_get_locale_from_utf8(working_dir_utf8); - /* only test whether working dir exists, don't change it or else Windows support will break - * (gspawn-win32-helper.exe is used by GLib and must be in $PATH which means current working - * dir where geany.exe was started from, so we can't change it) */ if (EMPTY(*working_dir) || ! g_file_test(*working_dir, G_FILE_TEST_EXISTS) || ! g_file_test(*working_dir, G_FILE_TEST_IS_DIR)) { - ui_set_statusbar(TRUE, _("Failed to change the working directory to \"%s\""), + ui_set_statusbar(TRUE, _("Invalid working directory \"%s\""), !EMPTY(working_dir_utf8) ? working_dir_utf8 : "<NULL>" ); utils_free_pointers(3, cmd_string_utf8, working_dir_utf8, *working_dir, NULL); return NULL; @@ -945,18 +846,17 @@ static gchar *prepare_run_cmd(GeanyDocument *doc, gchar **working_dir, guint cmd } -static GPid build_run_cmd(GeanyDocument *doc, guint cmdindex) +static void build_run_cmd(GeanyDocument *doc, guint cmdindex) { gchar *working_dir; gchar *run_cmd = NULL; - GError *error = NULL; if (! DOC_VALID(doc) || doc->file_name == NULL) - return (GPid) 0; + return; run_cmd = prepare_run_cmd(doc, &working_dir, cmdindex); if (run_cmd == NULL) - return (GPid) 0; + return; run_info[cmdindex].file_type_id = doc->file_type->id; @@ -990,97 +890,48 @@ static GPid build_run_cmd(GeanyDocument *doc, guint cmdindex) msgwin_show_hide(TRUE); run_info[cmdindex].pid = 1; - g_free(vte_cmd); } else #endif { - gchar *locale_term_cmd = NULL; - gint argv_len, i; - gchar **argv = NULL; - gchar *script_path = NULL; + gchar *locale_term_cmd = utils_get_locale_from_utf8(tool_prefs.term_cmd); + GError *error = NULL; - /* get the terminal path */ - locale_term_cmd = utils_get_locale_from_utf8(tool_prefs.term_cmd); - /* split the term_cmd, so arguments will work too */ - if (!g_shell_parse_argv(locale_term_cmd, &argv_len, &argv, NULL)) - { - ui_set_statusbar(TRUE, - _("Could not parse terminal command \"%s\" " - "(check Terminal tool setting in Preferences)"), tool_prefs.term_cmd); - run_info[cmdindex].pid = (GPid) 1; - g_unlink(run_cmd); - goto free_strings; - } + utils_str_replace_all(&locale_term_cmd, "%c", run_cmd); - /* check that terminal exists (to prevent misleading error messages) */ - if (argv[0] != NULL) + if (spawn_async(working_dir, locale_term_cmd, NULL, NULL, &(run_info[cmdindex].pid), + &error)) { - gchar *tmp = argv[0]; - /* g_find_program_in_path checks whether tmp exists and is executable */ - argv[0] = g_find_program_in_path(tmp); - g_free(tmp); - } - if (argv[0] == NULL) - { - ui_set_statusbar(TRUE, - _("Could not find terminal \"%s\" " - "(check path for Terminal tool setting in Preferences)"), tool_prefs.term_cmd); - run_info[cmdindex].pid = (GPid) 1; - g_unlink(run_cmd); - goto free_strings; - } - - for (i = 0; i < argv_len; i++) - { - utils_str_replace_all(&(argv[i]), "%c", run_cmd); + g_child_watch_add(run_info[cmdindex].pid, (GChildWatchFunc) run_exit_cb, + (gpointer) &(run_info[cmdindex])); + build_menu_update(doc); } - - if (! g_spawn_async(working_dir, argv, NULL, G_SPAWN_DO_NOT_REAP_CHILD, - NULL, NULL, &(run_info[cmdindex].pid), &error)) + else { - geany_debug("g_spawn_async() failed: %s", error->message); + geany_debug("spawn_async() failed: %s", error->message); ui_set_statusbar(TRUE, _("Process failed (%s)"), error->message); g_error_free(error); g_unlink(run_cmd); - error = NULL; run_info[cmdindex].pid = (GPid) 0; } - - if (run_info[cmdindex].pid != 0) - { - g_child_watch_add(run_info[cmdindex].pid, (GChildWatchFunc) run_exit_cb, - (gpointer)&(run_info[cmdindex])); - build_menu_update(doc); - } - free_strings: - g_strfreev(argv); - g_free(locale_term_cmd); - g_free(script_path); } g_free(working_dir); g_free(run_cmd); - return run_info[cmdindex].pid; } -static void process_build_output_line(const gchar *str, gint color) +static void process_build_output_line(gchar *msg, gint color) { - gchar *msg, *tmp; + gchar *tmp; gchar *filename; gint line; - msg = g_strdup(str); - g_strchomp(msg); if (EMPTY(msg)) - { - g_free(msg); return; - } if (build_parse_make_dir(msg, &tmp)) { @@ -1106,33 +957,17 @@ static void process_build_output_line(const gchar *str, gint color) g_free(filename); msgwin_compiler_add_string(color, msg); - g_free(msg); } -#ifndef SYNC_SPAWN -static gboolean build_iofunc(GIOChannel *ioc, GIOCondition cond, gpointer data) +static void build_iofunc(GString *string, GIOCondition condition, gpointer data) { - if (cond & (G_IO_IN | G_IO_PRI)) + if (condition & (G_IO_IN | G_IO_PRI)) { - gchar *msg; - GIOStatus st; - - while ((st = g_io_channel_read_line(ioc, &msg, NULL, NULL, NULL)) == G_IO_STATUS_NORMAL && msg) - { - gint color = (GPOINTER_TO_INT(data)) ? COLOR_DARK_RED : COLOR_BLACK; - - process_build_output_line(msg, color); - g_free(msg); - } - if (st == G_IO_STATUS_ERROR || st == G_IO_STATUS_EOF) return FALSE; + process_build_output_line(string->str, + (GPOINTER_TO_INT(data)) ? COLOR_DARK_RED : COLOR_BLACK); } - if (cond & (G_IO_ERR | G_IO_HUP | G_IO_NVAL)) - return FALSE; - - return TRUE; } -#endif gboolean build_parse_make_dir(const gchar *string, gchar **prefix) @@ -1205,40 +1040,16 @@ static void show_build_result_message(gboolean failure) } -#ifndef SYNC_SPAWN static void build_exit_cb(GPid child_pid, gint status, gpointer user_data) { - gboolean failure = FALSE; - -#ifdef G_OS_WIN32 - failure = status; -#else - if (WIFEXITED(status)) - { - if (WEXITSTATUS(status) != EXIT_SUCCESS) - failure = TRUE; - } - else if (WIFSIGNALED(status)) - { - /* the terminating signal: WTERMSIG (status)); */ - failure = TRUE; - } - else - { /* any other failure occurred */ - failure = TRUE; - } -#endif - show_build_result_message(failure); - + show_build_result_message(!WIFEXITED(status) || WEXITSTATUS(status) != EXIT_SUCCESS); utils_beep(); - g_spawn_close_pid(child_pid); build_info.pid = 0; /* enable build items again */ build_menu_update(NULL); ui_progress_bar_stop(); } -#endif static void run_exit_cb(GPid child_pid, gint status, gpointer user_data) @@ -1790,26 +1601,18 @@ static void on_toolbutton_make_activate(GtkWidget *menuitem, gpointer user_data) static void kill_process(GPid *pid) { - gint result; - -#ifdef G_OS_WIN32 - g_return_if_fail(*pid != NULL); - result = TerminateProcess(*pid, 0); - /* TerminateProcess() returns TRUE on success, for the check below we have to convert - * it to FALSE (and vice versa) */ - result = ! result; -#else - g_return_if_fail(*pid > 1); - result = kill(*pid, SIGTERM); -#endif + GError *error = NULL; - if (result != 0) - ui_set_statusbar(TRUE, _("Process could not be stopped (%s)."), g_strerror(errno)); - else + if (spawn_kill_process(*pid, &error)) { *pid = 0; build_menu_update(NULL); } + else + { + ui_set_statusbar(TRUE, _("Process could not be stopped (%s)."), error->message); + g_error_free(error); + } } Modified: src/callbacks.c 3 lines changed, 2 insertions(+), 1 deletions(-) =================================================================== @@ -51,6 +51,7 @@ #include "printing.h" #include "sciwrappers.h" #include "sidebar.h" +#include "spawn.h" #ifdef HAVE_SOCKET # include "socket.h" #endif @@ -1479,7 +1480,7 @@ void on_context_action1_activate(GtkMenuItem *menuitem, gpointer user_data) { utils_str_replace_all(&command, "%s", word); - if (! g_spawn_command_line_async(command, &error)) + if (!spawn_async(NULL, command, NULL, NULL, NULL, &error)) { ui_set_statusbar(TRUE, "Context action command failed: %s", error->message); g_error_free(error); Modified: src/keyfile.c 13 lines changed, 7 insertions(+), 6 deletions(-) =================================================================== @@ -941,19 +941,20 @@ static void load_dialog_prefs(GKeyFile *config) /* printing */ tmp_string2 = g_find_program_in_path(GEANY_DEFAULT_TOOLS_PRINTCMD); -#ifdef G_OS_WIN32 + if (!EMPTY(tmp_string2)) { - /* single quote paths on Win32 for g_spawn_command_line_async */ - tmp_string = g_strconcat("'", tmp_string2, "' '%f'", NULL); + #ifdef G_OS_WIN32 + tmp_string = g_strconcat(GEANY_DEFAULT_TOOLS_PRINTCMD, " \"%f\"", NULL); + #else + tmp_string = g_strconcat(GEANY_DEFAULT_TOOLS_PRINTCMD, " '%f'", NULL); + #endif } else { tmp_string = g_strdup(""); } -#else - tmp_string = g_strconcat(tmp_string2, " %f", NULL); -#endif + printing_prefs.external_print_cmd = utils_get_setting_string(config, "printing", "print_cmd", tmp_string); g_free(tmp_string); g_free(tmp_string2); Modified: src/makefile.win32 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -67,7 +67,7 @@ OBJS = about.o build.o callbacks.o dialogs.o document.o editor.o encodings.o fil geanyentryaction.o geanymenubuttonaction.o geanyobject.o geanywraplabel.o highlighting.o \ keybindings.o keyfile.o log.o main.o msgwindow.o navqueue.o notebook.o \ plugins.o pluginutils.o prefs.o printing.o project.o sciwrappers.o search.o \ - socket.o stash.o symbols.o templates.o toolbar.o tools.o sidebar.o \ + socket.o spawn.o stash.o symbols.o templates.o toolbar.o tools.o sidebar.o \ ui_utils.o utils.o win32.o .c.o: Modified: src/printing.c 19 lines changed, 9 insertions(+), 10 deletions(-) =================================================================== @@ -39,6 +39,7 @@ #include "highlighting.h" #include "msgwindow.h" #include "sciwrappers.h" +#include "spawn.h" #include "support.h" #include "utils.h" #include "ui_utils.h" @@ -600,16 +601,15 @@ static void print_external(GeanyDocument *doc) doc->file_name, cmdline)) { GError *error = NULL; - -#ifdef G_OS_WIN32 - gchar *tmp_cmdline = g_strdup(cmdline); -#else /* /bin/sh -c emulates the system() call and makes complex commands possible - * but only needed on non-win32 systems due to the lack of win32's shell capabilities */ - gchar *tmp_cmdline = g_strconcat("/bin/sh -c \"", cmdline, "\"", NULL); -#endif - - if (! g_spawn_command_line_async(tmp_cmdline, &error)) + * but only on non-win32 systems due to the lack of win32's shell capabilities */ + #ifdef G_OS_UNIX + gchar *argv[] = { "/bin/sh", "-c", cmdline, NULL }; + + if (!spawn_async(NULL, NULL, argv, NULL, NULL, &error)) + #else + if (!spawn_async(NULL, cmdline, NULL, NULL, NULL, &error)) + #endif { dialogs_show_msgbox(GTK_MESSAGE_ERROR, _("Printing of \"%s\" failed (return code: %s)."), @@ -620,7 +620,6 @@ static void print_external(GeanyDocument *doc) { msgwin_status_add(_("File %s printed."), doc->file_name); } - g_free(tmp_cmdline); } g_free(cmdline); } Modified: src/search.c 175 lines changed, 63 insertions(+), 112 deletions(-) =================================================================== @@ -37,6 +37,7 @@ #include "msgwindow.h" #include "prefs.h" #include "sciwrappers.h" +#include "spawn.h" #include "stash.h" #include "support.h" #include "toolbar.h" @@ -49,11 +50,6 @@ #include <string.h> #include <ctype.h> -#ifdef G_OS_UNIX -# include <sys/types.h> -# include <sys/wait.h> -#endif - #include <gdk/gdkkeysyms.h> enum @@ -149,10 +145,10 @@ static struct fif_dlg = {NULL, NULL, NULL, NULL, NULL, NULL, {0, 0}}; -static gboolean search_read_io(GIOChannel *source, GIOCondition condition, gpointer data); -static gboolean search_read_io_stderr(GIOChannel *source, GIOCondition condition, gpointer data); +static void search_read_io(GString *string, GIOCondition condition, gpointer data); +static void search_read_io_stderr(GString *string, GIOCondition condition, gpointer data); -static void search_close_pid(GPid child_pid, gint status, gpointer user_data); +static void search_finished(GPid child_pid, gint status, gpointer user_data); static gchar **search_get_argv(const gchar **argv_prefix, const gchar *dir); @@ -1619,21 +1615,17 @@ on_find_in_files_dialog_response(GtkDialog *dialog, gint response, ui_set_statusbar(FALSE, _("Invalid directory for find in files.")); else if (!EMPTY(search_text)) { - gchar *locale_dir; GString *opts = get_grep_options(); const gchar *enc = (enc_idx == GEANY_ENCODING_UTF_8) ? NULL : encodings_get_charset_from_index(enc_idx); - locale_dir = utils_get_locale_from_utf8(utf8_dir); - - if (search_find_in_files(search_text, locale_dir, opts->str, enc)) + if (search_find_in_files(search_text, utf8_dir, opts->str, enc)) { ui_combo_box_add_to_history(GTK_COMBO_BOX_TEXT(search_combo), search_text, 0); ui_combo_box_add_to_history(GTK_COMBO_BOX_TEXT(fif_dlg.files_combo), NULL, 0); ui_combo_box_add_to_history(GTK_COMBO_BOX_TEXT(dir_combo), utf8_dir, 0); gtk_widget_hide(fif_dlg.dialog); } - g_free(locale_dir); g_string_free(opts, TRUE); } else @@ -1645,36 +1637,26 @@ on_find_in_files_dialog_response(GtkDialog *dialog, gint response, static gboolean -search_find_in_files(const gchar *utf8_search_text, const gchar *dir, const gchar *opts, +search_find_in_files(const gchar *utf8_search_text, const gchar *utf8_dir, const gchar *opts, const gchar *enc) { - gchar **argv_prefix, **argv, **opts_argv; + gchar **argv_prefix, **argv; gchar *command_grep; + gchar *command_line, *dir; gchar *search_text = NULL; - gint opts_argv_len, i; - GPid child_pid; - gint stdout_fd; - gint stderr_fd; GError *error = NULL; gboolean ret = FALSE; gssize utf8_text_len; - if (EMPTY(utf8_search_text) || ! dir) return TRUE; + if (EMPTY(utf8_search_text) || ! utf8_dir) return TRUE; command_grep = g_find_program_in_path(tool_prefs.grep_cmd); if (command_grep == NULL) + command_line = g_strdup_printf("%s %s --", tool_prefs.grep_cmd, opts); + else { - ui_set_statusbar(TRUE, _("Cannot execute grep tool '%s';" - " check the path setting in Preferences."), tool_prefs.grep_cmd); - return FALSE; - } - - if (! g_shell_parse_argv(opts, &opts_argv_len, &opts_argv, &error)) - { - ui_set_statusbar(TRUE, _("Cannot parse extra options: %s"), error->message); - g_error_free(error); + command_line = g_strdup_printf("\"%s\" %s --", command_grep, opts); g_free(command_grep); - return FALSE; } /* convert the search text in the preferred encoding (if the text is not valid UTF-8. assume @@ -1687,74 +1669,58 @@ search_find_in_files(const gchar *utf8_search_text, const gchar *dir, const gcha if (search_text == NULL) search_text = g_strdup(utf8_search_text); - /* set grep command and options */ - argv_prefix = g_new0(gchar*, 1 + opts_argv_len + 3 + 1); /* last +1 for recursive arg */ - - argv_prefix[0] = command_grep; - for (i = 0; i < opts_argv_len; i++) - { - argv_prefix[i + 1] = g_strdup(opts_argv[i]); - } - g_strfreev(opts_argv); - - i++; /* correct for tool_prefs.grep_cmd */ - argv_prefix[i++] = g_strdup("--"); - argv_prefix[i++] = search_text; + argv_prefix = g_new(gchar*, 3); + argv_prefix[0] = search_text; + dir = utils_get_locale_from_utf8(utf8_dir); /* finally add the arguments(files to be searched) */ - if (strstr(argv_prefix[1], "r")) /* recursive option set */ + if (settings.fif_recursive) /* recursive option set */ { /* Use '.' so we get relative paths in the output */ - argv_prefix[i++] = g_strdup("."); - argv_prefix[i++] = NULL; + argv_prefix[1] = g_strdup("."); + argv_prefix[2] = NULL; argv = argv_prefix; } else { - argv_prefix[i++] = NULL; + argv_prefix[1] = NULL; argv = search_get_argv((const gchar**)argv_prefix, dir); g_strfreev(argv_prefix); - } - if (argv == NULL) /* no files */ - { - return FALSE; + if (argv == NULL) /* no files */ + { + g_free(command_line); + return FALSE; + } } gtk_list_store_clear(msgwindow.store_msg); gtk_notebook_set_current_page(GTK_NOTEBOOK(msgwindow.notebook), MSG_MESSAGE); - if (! g_spawn_async_with_pipes(dir, (gchar**)argv, NULL, G_SPAWN_DO_NOT_REAP_CHILD, - NULL, NULL, &child_pid, - NULL, &stdout_fd, &stderr_fd, &error)) - { - geany_debug("%s: g_spawn_async_with_pipes() failed: %s", G_STRFUNC, error->message); - ui_set_statusbar(TRUE, _("Process failed (%s)"), error->message); - g_error_free(error); - ret = FALSE; + /* we can pass 'enc' without strdup'ing it here because it's a global const string and + * always exits longer than the lifetime of this function */ + if (spawn_with_callbacks(dir, command_line, argv, NULL, 0, NULL, NULL, search_read_io, + (gpointer) enc, 0, search_read_io_stderr, (gpointer) enc, 0, search_finished, NULL, + NULL, &error)) + { + gchar *utf8_str; + + ui_progress_bar_start(_("Searching...")); + msgwin_set_messages_dir(dir); + utf8_str = g_strdup_printf(_("%s %s -- %s (in directory: %s)"), + tool_prefs.grep_cmd, opts, utf8_search_text, utf8_dir); + msgwin_msg_add_string(COLOR_BLUE, -1, NULL, utf8_str); + g_free(utf8_str); + ret = TRUE; } else { - gchar *str, *utf8_str; - - ui_progress_bar_start(_("Searching...")); - - msgwin_set_messages_dir(dir); - /* we can pass 'enc' without strdup'ing it here because it's a global const string and - * always exits longer than the lifetime of this function */ - utils_set_up_io_channel(stdout_fd, G_IO_IN | G_IO_PRI | G_IO_ERR | G_IO_HUP | G_IO_NVAL, - TRUE, search_read_io, (gpointer) enc); - utils_set_up_io_channel(stderr_fd, G_IO_IN | G_IO_PRI | G_IO_ERR | G_IO_HUP | G_IO_NVAL, - TRUE, search_read_io_stderr, (gpointer) enc); - g_child_watch_add(child_pid, search_close_pid, NULL); - - str = g_strdup_printf(_("%s %s -- %s (in directory: %s)"), - tool_prefs.grep_cmd, opts, utf8_search_text, dir); - utf8_str = utils_get_utf8_from_locale(str); - msgwin_msg_add_string(COLOR_BLUE, -1, NULL, utf8_str); - utils_free_pointers(2, str, utf8_str, NULL); - ret = TRUE; + geany_debug("%s: spawn_with_callbacks() failed: %s", G_STRFUNC, error->message); + ui_set_statusbar(TRUE, _("Process failed (%s)"), error->message); + g_error_free(error); } + + utils_free_pointers(2, dir, command_line, NULL); g_strfreev(argv); return ret; } @@ -1837,61 +1803,47 @@ static gchar **search_get_argv(const gchar **argv_prefix, const gchar *dir) } -static gboolean read_fif_io(GIOChannel *source, GIOCondition condition, gchar *enc, gint msg_color) +static void read_fif_io(gchar *msg, GIOCondition condition, gchar *enc, gint msg_color) { if (condition & (G_IO_IN | G_IO_PRI)) { - gchar *msg, *utf8_msg; - GIOStatus st; + gchar *utf8_msg = NULL; - while ((st = g_io_channel_read_line(source, &msg, NULL, NULL, NULL)) != G_IO_STATUS_ERROR && - st != G_IO_STATUS_EOF && msg) + g_strstrip(msg); + /* enc is NULL when encoding is set to UTF-8, so we can skip any conversion */ + if (enc != NULL) { - utf8_msg = NULL; - - g_strstrip(msg); - /* enc is NULL when encoding is set to UTF-8, so we can skip any conversion */ - if (enc != NULL) + if (! g_utf8_validate(msg, -1, NULL)) { - if (! g_utf8_validate(msg, -1, NULL)) - { - utf8_msg = g_convert(msg, -1, "UTF-8", enc, NULL, NULL, NULL); - } - if (utf8_msg == NULL) - utf8_msg = msg; + utf8_msg = g_convert(msg, -1, "UTF-8", enc, NULL, NULL, NULL); } - else + if (utf8_msg == NULL) utf8_msg = msg; + } + else + utf8_msg = msg; - msgwin_msg_add_string(msg_color, -1, NULL, utf8_msg); + msgwin_msg_add_string(msg_color, -1, NULL, utf8_msg); - if (utf8_msg != msg) - g_free(utf8_msg); - g_free(msg); - } - if (st == G_IO_STATUS_ERROR || st == G_IO_STATUS_EOF) - return FALSE; + if (utf8_msg != msg) + g_free(utf8_msg); } - if (condition & (G_IO_ERR | G_IO_HUP | G_IO_NVAL)) - return FALSE; - - return TRUE; } -static gboolean search_read_io(GIOChannel *source, GIOCondition condition, gpointer data) +static void search_read_io(GString *string, GIOCondition condition, gpointer data) { - return read_fif_io(source, condition, data, COLOR_BLACK); + return read_fif_io(string->str, condition, data, COLOR_BLACK); } -static gboolean search_read_io_stderr(GIOChannel *source, GIOCondition condition, gpointer data) +static void search_read_io_stderr(GString *string, GIOCondition condition, gpointer data) { - return read_fif_io(source, condition, data, COLOR_DARK_RED); + return read_fif_io(string->str, condition, data, COLOR_DARK_RED); } -static void search_close_pid(GPid child_pid, gint status, gpointer user_data) +static void search_finished(GPid child_pid, gint status, gpointer user_data) { const gchar *msg = _("Search failed."); #ifdef G_OS_UNIX @@ -1932,7 +1884,6 @@ static void search_close_pid(GPid child_pid, gint status, gpointer user_data) break; } utils_beep(); - g_spawn_close_pid(child_pid); ui_progress_bar_stop(); } Modified: src/spawn.c 1341 lines changed, 1341 insertions(+), 0 deletions(-) =================================================================== @@ -0,0 +1,1341 @@ +/* + * spawn.c - this file is part of Geany, a fast and lightweight IDE + * + * Copyright 2013 Dimitar Toshkov Zhekov <dimitar(dot)zhekov(at)gmail(dot)com> + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along + * with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + +/* An ongoing effort to improve the tool spawning situation under Windows. + * In particular: + * - There is no g_shell_parse_argv() for windows. It's not hard to write one, + * but the command line recreated by mscvrt may be wrong. + * - GLib converts the argument vector to UNICODE. For non-UTF8 arguments, + * the result is often "Invalid string in argument vector at %d: %s: Invalid + * byte sequence in conversion input" (YMMV). Our tools (make, grep, gcc, ...) + * are "ANSI", so converting to UNICODE and then back only causes problems. + * - For various reasons, GLib uses an intermediate program to start children + * (see gspawn-win32.c), the result being that the grandchildren output (such + * as make -> gcc) is not captured. + * - With non-blocking pipes, the g_io_add_watch() callbacks are never invoked, + * while with blocking pipes, g_io_channel_read_line() blocks. + * - Some other problems are explained in separate comments below. + * + * Even under Unix, using g_io_channel_read_line() is not a good idea, since it may + * buffer lines of unlimited length. + * + * This module does not depend on Geany when compiled for testing (-DSPAWN_TEST). + */ + +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif + +#include <errno.h> +#include <string.h> + +#include "spawn.h" + +#ifdef G_OS_WIN32 +# include <ctype.h> /* isspace() */ +# include <fcntl.h> /* _O_RDONLY, _O_WRONLY */ +# include <io.h> /* _open_osfhandle, _close */ +# include <windows.h> +#else /* G_OS_WIN32 */ +# include <signal.h> +#endif /* G_OS_WIN32 */ + +#ifdef SPAWN_TEST +# define _ +#else +# include "support.h" +#endif + +#ifdef G_OS_WIN32 +/* Each 4KB under Windows seem to come in 2 portions, so 2K + 2K is more + balanced than 4095 + 1. May be different on the latest Windows/glib? */ +# define DEFAULT_IO_LENGTH 2048 +#else +# define DEFAULT_IO_LENGTH 4096 +#endif + +#define G_IO_FAILURE (G_IO_ERR | G_IO_HUP | G_IO_NVAL) /* always used together */ + + +/** + * Checks whether a command line is syntactically valid and extracts the program name from it. + * + * All OS: + * - any leading spaces, tabs and new lines are skipped + * - an empty command is invalid + * Unix: + * - the standard shell quoting and escaping rules are used, see @c g_shell_parse_argv() + * - as a consequence, an unqouted # at the start of an argument comments to the end of line + * Windows: + * - leading carriage returns are skipped too + * - a quoted program name must be entirely inside the quotes. No "C:\Foo\Bar".pdf or + * "C:\Foo\Bar".bat, which would be executed by Windows as C:\Foo\Bar.exe + * - an unquoted program name may not contain spaces. Foo Bar Qux will not be considered + * "Foo Bar.exe" Qux or "Foo Bar Qux.exe", depending on what executables exist, as + * Windows normally does. + * - the program name must be separated from the arguments by at least one space or tab + * - the standard Windows quoting and escaping rules are used: double quote is escaped with + * backslash, and any literal backslashes before a double quote must be duplicated. + * + * @param command_line the command line to check and get the program name from. + * @param error return location for error. + * + * @return allocated string with the program name on success, @c NULL on error. + * + * @since 1.25 + **/ +GEANY_API_SYMBOL +gchar *spawn_get_program_name(const gchar *command_line, GError **error) +{ + gchar *program; + +#ifdef G_OS_WIN32 + gboolean open_quote = FALSE; + const gchar *s, *arguments; + + g_return_val_if_fail(command_line != NULL, FALSE); + + while (*command_line && strchr(" \t\r\n", *command_line)) + command_line++; + + if (!*command_line) + { + /* TL note: from glib */ + g_set_error(error, G_SHELL_ERROR, G_SHELL_ERROR_EMPTY_STRING, + _("Text was empty (or contained only whitespace)")); + return FALSE; + } + + /* To prevent Windows from doing something weird, we want to be 100% sure that the + character after the program name is a delimiter, so we allow space and tab only. */ + + if (*command_line == '"') + { + command_line++; + /* Windows allows "foo.exe, but we may have extra arguments */ + if ((s = strchr(command_line, '"')) == NULL) + { + /* TL note: from glib */ + g_set_error(error, G_SHELL_ERROR, G_SHELL_ERROR_BAD_QUOTING, + _("Text ended before matching quote was found for %c." + " (The text was '%s')"), '"', command_line); + return FALSE; + } + + if (!strchr(" \t", s[1])) /* strchr() catches s[1] == '\0' */ + { + g_set_error(error, G_SHELL_ERROR, G_SHELL_ERROR_BAD_QUOTING, + _("A quoted Windows program name must be entirely inside the quotes")); + return FALSE; + } + } + else + { + const gchar *quote = strchr(command_line, '"'); + + /* strchr() catches *s == '\0', and the for body is empty */ + for (s = command_line; !strchr(" \t", *s); s++); + + if (quote && quote < s) + { + g_set_error(error, G_SHELL_ERROR, G_SHELL_ERROR_BAD_QUOTING, + _("A quoted Windows program name must be entirely inside the quotes")); + return FALSE; + } + } + + program = g_strndup(command_line, s - command_line); + arguments = s + (*s == '"'); + + for (s = arguments; *s; s++) + { + if (*s == '"') + { + const char *slash; + + for (slash = s; slash > arguments && slash[-1] == '\\'; slash--); + if ((s - slash) % 2 == 0) + open_quote ^= TRUE; + } + } + + if (open_quote) + { + /* TL note: from glib */ + g_set_error(error, G_SHELL_ERROR, G_SHELL_ERROR_BAD_QUOTING, + _("Text ended before matching quote was found for %c." + " (The text was '%s')"), '"', command_line); + g_free(program); + return FALSE; + } +#else /* G_OS_WIN32 */ + int argc; + char **argv; + + if (!g_shell_parse_argv(command_line, &argc, &argv, error)) + return FALSE; + + /* empty string results in parse error, so argv[0] is not NULL */ + program = g_strdup(argv[0]); + g_strfreev(argv); +#endif /* G_OS_WIN32 */ + + return program; +} + + +/** + * Checks whether a command line is valid. + * + * Checks if @a command_line is syntactically valid using @c spawn_get_program_name(). + * + * If @a execute is TRUE, also checks, using @c g_find_program_in_path(), if the program + * specified in @a command_line exists and is executable. + * + * @param command_line the command line to check. + * @param execute whether to check if the command line is really executable. + * @param error return location for error. + * + * @return @c TRUE on success, @c FALSE on error. + * + * @since 1.25 + **/ +GEANY_API_SYMBOL +gboolean spawn_check_command(const gchar *command_line, gboolean execute, GError **error) +{ + gchar *program = spawn_get_program_name(command_line, error); + + if (!program) + return FALSE; + + if (execute) + { + gchar *executable = g_find_program_in_path(program); + + if (!executable) + { + g_set_error(error, G_SHELL_ERROR, G_SHELL_ERROR_FAILED, /* or SPAWN error? */ + _("Program '%s' not found"), program); + g_free(program); + return FALSE; + } + + g_free(executable); + } + + g_free(program); + return TRUE; +} + + +/** + * Kills a process. + * + * @param pid id of the process to kill. + * @param error return location for error. + * + * On Unix, sends a SIGTERM to the process. + * + * On Windows, terminates the process with exit code 255 (used sometimes as "generic" + * error code, or for programs terminated with Ctrl+C / Ctrl+Break). + * + * @return @c TRUE on success, @c FALSE on error. + * + * @since 1.25 + **/ +GEANY_API_SYMBOL +gboolean spawn_kill_process(GPid pid, GError **error) +{ +#ifdef G_OS_WIN32 + if (!TerminateProcess(pid, 255)) + { + gchar *message = g_win32_error_message(GetLastError()); + + g_set_error(error, G_SPAWN_ERROR, G_SPAWN_ERROR_FAILED, + _("TerminateProcess() failed: %s"), message); + g_free(message); + return FALSE; + } +#else + if (kill(pid, SIGTERM)) + { + g_set_error(error, G_SPAWN_ERROR, G_SPAWN_ERROR_FAILED, "%s", g_strerror(errno)); + return FALSE; + } +#endif + return TRUE; +} + + +#ifdef G_OS_WIN32 +static gchar *spawn_create_process_with_pipes(char *command_line, const char *working_directory, + void *environment, HANDLE *hprocess, int *stdin_fd, int *stdout_fd, int *stderr_fd) +{ + enum { WRITE_STDIN, READ_STDOUT, READ_STDERR, READ_STDIN, WRITE_STDOUT, WRITE_STDERR }; + STARTUPINFO startup; + PROCESS_INFORMATION process; + HANDLE hpipe[6] = { NULL, NULL, NULL, NULL, NULL, NULL }; + int *fd[3] = { stdin_fd, stdout_fd, stderr_fd }; + const char *failed; /* failed WIN32/CRTL function, if any */ + gchar *message = NULL; /* glib WIN32/CTRL error message */ + gchar *failure = NULL; /* full error text */ + gboolean pipe_io; + int i; + + ZeroMemory(&startup, sizeof startup); + startup.cb = sizeof startup; + pipe_io = stdin_fd || stdout_fd || stderr_fd; + + if (pipe_io) + { + startup.dwFlags |= STARTF_USESTDHANDLES; + + /* not all programs accept mixed NULL and non-NULL hStd*, so we create all */ + for (i = 0; i < 3; i++) + { + static int pindex[3][2] = { { READ_STDIN, WRITE_STDIN }, + { READ_STDOUT, WRITE_STDOUT }, { READ_STDERR, WRITE_STDERR } }; + + if (!CreatePipe(&hpipe[pindex[i][0]], &hpipe[pindex[i][1]], NULL, 0)) + { + hpipe[pindex[i][0]] = hpipe[pindex[i][1]] = NULL; + failed = "CreatePipe"; + goto leave; + } + + if (fd[i]) + { + static int mode[3] = { _O_WRONLY, _O_RDONLY, _O_RDONLY }; + + if ((*fd[i] = _open_osfhandle((intptr_t) hpipe[i], mode[i])) == -1) + { + failed = "_open_osfhandle"; + message = g_strdup(g_strerror(errno)); + goto leave; + } + } + else if (!CloseHandle(hpipe[i])) + { + failed = "CloseHandle"; + goto leave; + } + + if (!SetHandleInformation(hpipe[i + 3], HANDLE_FLAG_INHERIT, + HANDLE_FLAG_INHERIT)) + { + failed = "SetHandleInformation"; + goto leave; + } + } + } + + startup.hStdInput = hpipe[READ_STDIN]; + startup.hStdOutput = hpipe[WRITE_STDOUT]; + startup.hStdError = hpipe[WRITE_STDERR]; + + if (!CreateProcess(NULL, command_line, NULL, NULL, TRUE, pipe_io ? CREATE_NO_WINDOW : 0, + environment, working_directory, &startup, &process)) + { + failed = "CreateProcess"; + /* further errors will not be reported */ + } + else + { + failed = NULL; + CloseHandle(process.hThread); /* we don't need this */ + *hprocess = process.hProcess; + } + +leave: + if (failed) + { + if (!message) + message = g_win32_error_message(GetLastError()); + + failure = g_strdup_printf("%s() failed: %s", failed, message); + g_free(message); + } + + if (pipe_io) + { + for (i = 0; i < 3; i++) + { + if (failed) + { + if (fd[i] && *fd[i] != -1) + _close(*fd[i]); + else if (hpipe[i]) + CloseHandle(hpipe[i]); + } + + if (hpipe[i + 3]) + CloseHandle(hpipe[i + 3]); + } + } + + return failure; +} + + +static void spawn_append_argument(GString *command, const char *text) +{ + const char *s; + + if (command->len) + g_string_append_c(command, ' '); + + for (s = text; *s; s++) + { + /* g_ascii_isspace() fails for '\v', and locale spaces (if any) will do no harm */ + if (*s == '"' || isspace(*s)) + break; + } + + if (*text && !*s) + g_string_append(command, text); + else + { + g_string_append_c(command, '"'); + + for (s = text; *s; s++) + { + const char *slash; + + for (slash = s; *slash == '\\'; slash++); + + if (slash > s) + { + g_string_append_len(command, s, slash - s); + + if (!*slash || *slash == '"') + { + g_string_append_len(command, s, slash - s); + + if (!*slash) + break; + } + + s = slash; + } + + if (*s == '"') + g_string_append_c(command, '\\'); + + g_string_append_c(command, *s); + } + + g_string_append_c(command, '"'); + } +} + + +static void spawn_close_pid(GPid pid, G_GNUC_UNUSED gint status, G_GNUC_UNUSED gpointer data) +{ + g_spawn_close_pid(pid); +} +#endif /* G_OS_WIN32 */ + + +/** + * Executes a child program asynchronously and setups pipes. + * + * This is the low-level spawning function. Please use @c spawn_with_callbacks() unless + * you need to setup specific event source(s). + * + * A command line or an argument vector must be passed. If both are present, the argument + * vector is appended to the command line. An empty command line is not allowed. + * + * Under Windows, if the child is a console application, and at least one file descriptor is + * specified, the new child console (if any) will be hidden. + * + * If a @a child_pid is passed, it's your responsibility to invoke @c g_spawn_close_pid(). + * + * @param working_directory child's current working directory, or @c NULL. + * @param command_line child program and arguments, or @c NULL. + * @param argv child's argument vector, or @c NULL. + * @param envp child's environment, or @c NULL. + * @param child_pid return location for child process ID, or @c NULL. + * @param stdin_fd return location for file descriptor to write to child's stdin, or @c NULL. + * @param stdout_fd return location for file descriptor to read child's stdout, or @c NULL. + * @param stderr_fd return location for file descriptor to read child's stderr, or @c NULL. + * @param error return location for error. + * + * @return @c TRUE on success, @c FALSE on error. + * + * @since 1.25 + **/ +GEANY_API_SYMBOL +gboolean spawn_async_with_pipes(const gchar *working_directory, const gchar *command_line, + gchar **argv, gchar **envp, GPid *child_pid, gint *stdin_fd, gint *stdout_fd, + gint *stderr_fd, GError **error) +{ + g_return_val_if_fail(command_line != NULL || argv != NULL, FALSE); + +#ifdef G_OS_WIN32 + GString *command; + GArray *environment; + GPid pid; + gchar *failure; + + if (command_line) + { + gchar *program = spawn_get_program_name(command_line, error); + const gchar *arguments; + + if (!program) + return FALSE; + + command = g_string_new(NULL); + arguments = strstr(command_line, program) + strlen(program); + + if (*arguments == '"') + { + g_string_append(command, program); + arguments++; + } + else + { + /* quote the first token, to avoid Windows attemps to run two or more + unquoted tokens as a program until an existing file name is found */ + g_string_printf(command, "\"%s\"", program); + } + + g_string_append(command, arguments); + g_free(program); + } + else + command = g_string_new(NULL); + + environment = g_array_new(TRUE, FALSE, sizeof(char)); + + while (argv && *argv) + spawn_append_argument(command, *argv++); + +#ifdef SPAWN_TEST + g_message("full spawn command line: %s\n", command->str); +#endif + + while (envp && *envp) + { + g_array_append_vals(environment, *envp, strlen(*envp) + 1); + envp++; + } + + failure = spawn_create_process_with_pipes(command->str, working_directory, + envp ? environment->data : NULL, child_pid ? child_pid : &pid, + stdin_fd, stdout_fd, stderr_fd); + + g_string_free(command, TRUE); + g_array_free(environment, TRUE); + + if (failure) + { + g_set_error(error, G_SPAWN_ERROR, G_SPAWN_ERROR_FAILED, "%s", failure); + g_free(failure); + return FALSE; + } + else if (!child_pid) + g_child_watch_add(pid, spawn_close_pid, NULL); + + return TRUE; +#else /* G_OS_WIN32 */ + int cl_argc; + char **full_argv; + gboolean spawned; + + if (command_line) + { + int argc = 0; + char **cl_argv; + + if (!g_shell_parse_argv(command_line, &cl_argc, &cl_argv, error)) + return FALSE; + + if (argv) + for (argc = 0; argv[argc]; argc++); + + full_argv = g_renew(gchar *, cl_argv, cl_argc + argc + 1); + memcpy(full_argv + cl_argc, argv, argc * sizeof(gchar *)); + full_argv[cl_argc + argc] = NULL; + } + else + full_argv = argv; + + spawned = g_spawn_async_with_pipes(working_directory, full_argv, envp, + G_SPAWN_SEARCH_PATH | (child_pid ? G_SPAWN_DO_NOT_REAP_CHILD : 0), NULL, NULL, + child_pid, stdin_fd, stdout_fd, stderr_fd, error); + + if (full_argv != argv) + { + full_argv[cl_argc] = NULL; + g_strfreev(full_argv); + } + + return spawned; +#endif /* G_OS_WIN32 */ +} + + +/** + * Executes a child asynchronously. + * + * See @c spawn_async_with_pipes() for a full description; this function simply calls + * @c g_spawn_async_with_pipes() without any pipes. + * + * @since 1.25 + **/ +GEANY_API_SYMBOL +gboolean spawn_async(const gchar *working_directory, const gchar *command_line, gchar **argv, + gchar **envp, GPid *child_pid, GError **error) +{ + return spawn_async_with_pipes(working_directory, command_line, argv, envp, child_pid, + NULL, NULL, NULL, error); +} + + +/* + * Spawn with callbacks - general event sequence: + * + * - Launch the child. + * - Setup any I/O callbacks and a child watch callback. + * - On sync execution, run a main loop. + * - Wait for the child to terminate. + * - Check for active I/O sources. If any, add a timeout source to watch them, they should + * become inactive real soon now that the child is dead. Otherwise, finalize immediately. + * - In the timeout source: check for active I/O sources and finalize if none. + */ + +typedef struct _SpawnChannelData +{ + GIOChannel *channel; /* NULL if not created / already destroyed */ + union + { + GIOFunc write; + SpawnReadFunc read; + } cb; + gpointer cb_data; + /* stdout/stderr only */ + GString *buffer; /* NULL if recursive */ + GString *line_buffer; /* NULL if char buffered */ + gsize max_length; +} SpawnChannelData; + + +static void spawn_destroy_cb(gpointer data) +{ + SpawnChannelData *sc = (SpawnChannelData *) data; + + g_io_channel_shutdown(sc->channel, FALSE, NULL); + sc->channel = NULL; + + if (sc->buffer) + g_string_free(sc->buffer, TRUE); + + if (sc->line_buffer) + g_string_free(sc->line_buffer, TRUE); +} + + +static gboolean spawn_write_cb(GIOChannel *channel, GIOCondition condition, gpointer data) +{ + SpawnChannelData *sc = (SpawnChannelData *) data; + + if (!sc->cb.write(channel, condition, sc->cb_data)) + return FALSE; + + return !(condition & G_IO_FAILURE); +} + + +static gboolean spawn_read_cb(GIOChannel *channel, GIOCondition condition, gpointer data) +{ + SpawnChannelData *sc = (SpawnChannelData *) data; + GString *line_buffer = sc->line_buffer; + GString *buffer = sc->buffer ? sc->buffer : g_string_sized_new(sc->max_length); + GIOCondition input_cond = condition & (G_IO_IN | G_IO_PRI); + GIOCondition failure_cond = condition & G_IO_FAILURE; + /* + * - Normally, read only once. With IO watches, our data processing must be immediate, + * which may give the child time to emit more data, and a read loop may combine it into + * large stdout and stderr portions. Under Windows, looping blocks. + * - On failure, read in a loop. It won't block now, there will be no more data, and the + * IO watch is not guaranteed to be called again (under Windows this is the last call). + */ + if (input_cond) + { + gsize chars_read; + GIOStatus status; + + if (line_buffer) + { + gsize n = line_buffer->len; + + while ((status = g_io_channel_read_chars(channel, line_buffer->str + n, + DEFAULT_IO_LENGTH, &chars_read, NULL)) == G_IO_STATUS_NORMAL) + { + g_string_set_size(line_buffer, n + chars_read); + + while (n < line_buffer->len) + { + gsize line_len = 0; + + if (n == sc->max_length) + line_len = n; + else if (strchr("\n", line_buffer->str[n])) /* '\n' or '\0' */ + line_len = n + 1; + else if (n < line_buffer->len - 1 && line_buffer->str[n] == '\r') + line_len = n + 1 + (line_buffer->str[n + 1] == '\n'); + + if (!line_len) + n++; + else + { + g_string_append_len(buffer, line_buffer->str, line_len); + g_string_erase(line_buffer, 0, line_len); + /* input only, failures are reported separately below */ + sc->cb.read(buffer, input_cond, sc->cb_data); + g_string_truncate(buffer, 0); + n = 0; + } + } + + if (!failure_cond) + break; + } + } + else + { + while ((status = g_io_channel_read_chars(channel, buffer->str, sc->max_length, + &chars_read, NULL)) == G_IO_STATUS_NORMAL) + { + g_string_set_size(buffer, chars_read); + /* input only, failures are reported separately below */ + sc->cb.read(buffer, input_cond, sc->cb_data); + + if (!failure_cond) + break; + } + } + + /* Under OSX, after child death, the read watches receive input conditions instead + of error conditions, so we convert the termination statuses into conditions. + Should not hurt the other OS. */ + if (status == G_IO_STATUS_ERROR) + failure_cond |= G_IO_ERR; + else if (status == G_IO_STATUS_EOF) + failure_cond |= G_IO_HUP; + } + + if (failure_cond) /* we must signal the callback */ + { + if (line_buffer && line_buffer->len) /* flush the line buffer */ + { + g_string_append_len(buffer, line_buffer->str, line_buffer->len); + /* all data may be from a previous call */ + if (!input_cond) + input_cond = G_IO_IN; + } + else + { + input_cond = 0; + g_string_truncate(buffer, 0); + } + + sc->cb.read(buffer, input_cond | failure_cond, sc->cb_data); + } + + if (buffer != sc->buffer) + g_string_free(buffer, TRUE); + + return !failure_cond; +} + + +typedef struct _SpawnWatcherData +{ + SpawnChannelData sc[3]; /* stdin, stdout, stderr */ + GChildWatchFunc exit_cb; + gpointer exit_data; + GPid pid; + gint exit_status; + GMainContext *main_context; /* NULL if async execution */ + GMainLoop *main_loop; /* NULL if async execution */ +} SpawnWatcherData; + + +static void spawn_finalize(SpawnWatcherData *sw) +{ + if (sw->exit_cb) + sw->exit_cb(sw->pid, sw->exit_status, sw->exit_data); + + if (sw->main_loop) + { + g_main_loop_quit(sw->main_loop); + g_main_loop_unref(sw->main_loop); + } + + g_spawn_close_pid(sw->pid); + g_slice_free(SpawnWatcherData, sw); +} + + +static gboolean spawn_timeout_cb(gpointer data) +{ + SpawnWatcherData *sw = (SpawnWatcherData *) data; + int i; + + for (i = 0; i < 3; i++) + if (sw->sc[i].channel) + return TRUE; + + spawn_finalize(sw); + return FALSE; +} + + +static void spawn_watch_cb(GPid pid, gint status, gpointer data) +{ + SpawnWatcherData *sw = (SpawnWatcherData *) data; + int i; + + sw->pid = pid; + sw->exit_status = status; + + for (i = 0; i < 3; i++) + { + if (sw->sc[i].channel) + { + GSource *source = g_timeout_source_new(50); + + g_source_set_callback(source, spawn_timeout_cb, data, NULL); + g_source_attach(source, sw->main_context); + g_source_unref(source); + return; + } + } + + spawn_finalize(sw); +} + + +/** + * Executes a child program and setups callbacks. + * + * A command line or an argument vector must be passed. If both are present, the argument + * vector is appended to the command line. An empty command line is not allowed. + * + * The synchronous execution may not be combined with recursive callbacks. + * + * In line buffered mode, the child input is broken on '\n', "\r\n", '\r', '\0' and max length. + * + * All I/O callbacks are guaranteed to be invoked at least once with @c G_IO_ERR, @c G_IO_HUP + * or @c G_IO_NVAL set (except for a @a stdin_cb which returns @c FALSE before that). For the + * non-recursive callbacks, this is guaranteed to be the last call, and may be used to free any + * resources associated with the callback. + * + * The @a stdin_cb may write to @c channel only once per invocation, only if @c G_IO_OUT is + * set, and only a non-zero number of characters. + * + * @c stdout_cb and @c stderr_cb may modify the received strings in any way, but must not + * free them. + * + * The default max lengths are 24K for line buffered stdout, 8K for line buffered stderr, + * 4K for unbuffered input under Unix, and 2K for unbuffered input under Windows. + * + * @c exit_cb is always invoked last, after all I/O callbacks. + * + * The @a child_pid will be closed automatically, after @a exit_cb is invoked. + * + * @param working_directory child's current working directory, or @c NULL. + * @param command_line child program and arguments, or @c NULL. + * @param argv child's argument vector, or @c NULL. + * @param envp child's environment, or @c NULL. + * @param spawn_flags flags from SpawnFlags. + * @param stdin_cb callback to send data to childs's stdin, or @c NULL. + * @param stdin_data data to pass to @a stdin_cb. + * @param stdout_cb callback to receive child's stdout, or @c NULL. + * @param stdout_data data to pass to @a stdout_cb. + * @param stdout_max_length maximum data length to pass to stdout_cb, @c 0 = default. + * @param stderr_cb callback to receive child's stderr, or @c NULL. + * @param stderr_data data to pass to @a stderr_cb. + * @param stderr_max_length maximum data length to pass to stderr_cb, @c 0 = default. + * @param exit_cb callback to invoke when the child exits, or @c NULL. + * @param exit_data data to pass to @a exit_cb. + * @param child_pid return location for child process ID, or @c NULL. + * @param error return location for error. + * + * @return @c TRUE on success, @c FALSE on error. + * + * @since 1.25 + **/ +GEANY_API_SYMBOL +gboolean spawn_with_callbacks(const gchar *working_directory, const gchar *command_line, + gchar **argv, gchar **envp, SpawnFlags spawn_flags, GIOFunc stdin_cb, gpointer stdin_data, + SpawnReadFunc stdout_cb, gpointer stdout_data, gsize stdout_max_length, + SpawnReadFunc stderr_cb, gpointer stderr_data, gsize stderr_max_length, + GChildWatchFunc exit_cb, gpointer exit_data, GPid *child_pid, GError **error) +{ + GPid pid; + int pipe[3] = { -1, -1, -1 }; + + g_return_val_if_fail(!(spawn_flags & SPAWN_RECURSIVE) || !(spawn_flags & SPAWN_SYNC), + FALSE); + + if (spawn_async_with_pipes(working_directory, command_line, argv, envp, &pid, + stdin_cb ? &pipe[0] : NULL, stdout_cb ? &pipe[1] : NULL, + stderr_cb ? &pipe[2] : NULL, error)) + { + SpawnWatcherData *sw = g_slice_new0(SpawnWatcherData); + gpointer cb_data[3] = { stdin_data, stdout_data, stderr_data }; + GSource *source; + int i; + + sw->main_context = spawn_flags & SPAWN_SYNC ? g_main_context_new() : NULL; + + if (child_pid) + *child_pid = pid; + + for (i = 0; i < 3; i++) + { + SpawnChannelData *sc = &sw->sc[i]; + GIOCondition condition; + GSourceFunc callback; + + if (pipe[i] == -1) + continue; + + #ifdef G_OS_WIN32 + sc->channel = g_io_channel_win32_new_fd(pipe[i]); + #else + sc->channel = g_io_channel_unix_new(pipe[i]); + g_io_channel_set_flags(sc->channel, G_IO_FLAG_NONBLOCK, NULL); + #endif + g_io_channel_set_encoding(sc->channel, NULL, NULL); + /* we have our own buffers, and GIO buffering blocks under Windows */ + g_io_channel_set_buffered(sc->channel, FALSE); + sc->cb_data = cb_data[i]; + + if (i == 0) + { + sc->cb.write = stdin_cb; + condition = G_IO_OUT | G_IO_FAILURE; + callback = (GSourceFunc) spawn_write_cb; + } + else + { + gboolean line_buffered = !(spawn_flags & + ((SPAWN_STDOUT_UNBUFFERED >> 1) << i)); + + condition = G_IO_IN | G_IO_PRI | G_IO_FAILURE; + callback = (GSourceFunc) spawn_read_cb; + + if (i == 1) + { + sc->cb.read = stdout_cb; + sc->max_length = stdout_max_length ? stdout_max_length : + line_buffered ? 24576 : DEFAULT_IO_LENGTH; + } + else + { + sc->cb.read = stderr_cb; + sc->max_length = stderr_max_length ? stderr_max_length : + line_buffered ? 8192 : DEFAULT_IO_LENGTH; + } + + if (line_buffered) + { + sc->line_buffer = g_string_sized_new(sc->max_length + + DEFAULT_IO_LENGTH); + } + } + + source = g_io_create_watch(sc->channel, condition); + g_io_channel_unref(sc->channel); + + if (spawn_flags & (SPAWN_STDIN_RECURSIVE << i)) + g_source_set_can_recurse(source, TRUE); + else if (i) /* to avoid new string on each call */ + sc->buffer = g_string_sized_new(sc->max_length); + + g_source_set_callback(source, callback, sc, spawn_destroy_cb); + g_source_attach(source, sw->main_context); + g_source_unref(source); + } + + sw->exit_cb = exit_cb; + sw->exit_data = exit_data; + source = g_child_watch_source_new(pid); + g_source_set_callback(source, (GSourceFunc) spawn_watch_cb, sw, NULL); + g_source_attach(source, sw->main_context); + g_source_unref(source); + + if (spawn_flags & SPAWN_SYNC) + { + sw->main_loop = g_main_loop_new(sw->main_context, FALSE); + g_main_context_unref(sw->main_context); + g_main_loop_run(sw->main_loop); + } + + return TRUE; + } + + return FALSE; +} + + +/** + * Writes (a portion of) the data pointed by @a data->ptr to the @a channel. + * + * If @c G_IO_OUT in @a condition is set, and the @a data->size is > 0, attempts to write + * @a data->ptr (or a portion of it, depending on the size) to the @a channel. On success, + * increases ptr and decreases size with the number of characters written. + * + * This function may converted to @c GIOFunc and passed to @c spawn_with_callbacks() as + * @c stdin_cb, together with a @c SpawnWriteData for @c stdin_data. As with any other + * callback data, make sure that @c stdin_data exists while the child is being executed. + * (For example, on asynchronous execution, you can allocate the data in the heap, and free + * it in your @c spawn_with_callbacks() @c exit_cb callback.) + * + * @return @c TRUE if the remaining size is > 0 and @a condition does not indicate any error, + * @c FALSE otherwise. + * + * @since 1.25 + **/ +GEANY_API_SYMBOL +gboolean spawn_write_data(GIOChannel *channel, GIOCondition condition, SpawnWriteData *data) +{ + if ((condition & G_IO_OUT) && data->size) + { + gsize chars_written = 0; + + g_io_channel_write_chars(channel, data->ptr, data->size < DEFAULT_IO_LENGTH ? + data->size : DEFAULT_IO_LENGTH, &chars_written, NULL); + + /* "This can be nonzero even if the return value is not G_IO_STATUS_NORMAL." */ + if (chars_written) + { + data->ptr += chars_written; + data->size -= chars_written; + } + } + + return data->size > 0 && !(condition & G_IO_FAILURE); +} + + +static void spawn_append_gstring_cb(GString *string, GIOCondition condition, gpointer data) +{ + if (condition & (G_IO_IN | G_IO_PRI)) + g_string_append_len((GString *) data, string->str, string->len); +} + + +/** + * Convinience @c GChildWatchFunc callback that copies the child exit status into a gint + * pointed by @a exit_status. + * + * @since 1.25 + **/ +GEANY_API_SYMBOL +void spawn_get_exit_status_cb(G_GNUC_UNUSED GPid pid, gint status, gpointer exit_status) +{ + *(gint *) exit_status = status; +} + + +/** + * Executes a child synchronously. + * + * A command line or an argument vector must be passed. If both are present, the argument + * vector is appended to the command line. An empty command line is not allowed. + * + * The @a stdin_data is sent to the child with @c spawn_write_data(). + * + * All output from the child, including the nul characters, is stored in @a stdout_data and + * @a stderr_data (if non-NULL). Any existing data in these strings will be erased. + * + * @param working_directory child's current working directory, or @c NULL. + * @param command_line child program and arguments, or @c NULL. + * @param argv child's argument vector, or @c NULL. + * @param envp child's environment, or @c NULL. + * @param stdin_data data to send to childs's stdin, or @c NULL. + * @param stdout_data GString location to receive the child's stdout, or NULL. + * @param stderr_data GString location to receive the child's stderr, or NULL. + * @param exit_status return location for the child exit code, or NULL. + * @param error return location for error. + * + * @return @c TRUE on success, @c FALSE on error. + * + * @since 1.25 + **/ +GEANY_API_SYMBOL +gboolean spawn_sync(const gchar *working_directory, const gchar *command_line, gchar **argv, + gchar **envp, SpawnWriteData *stdin_data, GString *stdout_data, GString *stderr_data, + gint *exit_status, GError **error) +{ + g_string_truncate(stdout_data, 0); + g_string_truncate(stderr_data, 0); + + return spawn_with_callbacks(working_directory, command_line, argv, envp, SPAWN_SYNC | + SPAWN_UNBUFFERED, stdin_data ? (GIOFunc) spawn_write_data : NULL, stdin_data, + stdout_data ? spawn_append_gstring_cb : NULL, stdout_data, 0, + stderr_data ? spawn_append_gstring_cb : NULL, stderr_data, 0, + exit_status ? spawn_get_exit_status_cb : NULL, exit_status, NULL, error); +} + + +/* tests, not part of the API */ +#ifdef SPAWN_TEST +#include <stdio.h> + + +static gboolean read_line(const char *prompt, char *buffer, size_t size) +{ + fputs(prompt, stderr); + *buffer = '\0'; + + if (fgets(buffer, size, stdin)) + { + char *s = strchr(buffer, '\n'); + + if (s) + *s = '\0'; + } + + return *buffer; +} + + +static GString *read_string(const char *prompt) +{ + char buffer[0x1000]; /* larger portions for spawn < file */ + GString *string = g_string_sized_new(sizeof buffer); + + while (read_line(prompt, buffer, sizeof buffer)) + { + if (string->len) + g_string_append_c(string, '\n'); + + g_string_append(string, buffer); + } + + if (!string->len) + { + g_string_free(string, TRUE); + string = NULL; + } + + return string; +} + + +static void print_cb(GString *string, GIOCondition condition, gpointer data) +{ + if (condition & (G_IO_IN | G_IO_PRI)) + { + gsize i; + + printf("%s: ", (const gchar *) data); + /*fputs(string->str, stdout);*/ + for (i = 0; i < string->len; i++) + { + unsigned char c = (unsigned char) string->str[i]; + printf(c >= ' ' && c < 0x80 ? "%c" : "\\x%02x", c); + } + putchar('\n'); + } +} + + +static void print_status(gint status) +{ + fputs("finished, ", stderr); + + if (WIFEXITED(status)) + fprintf(stderr, "exit code %d\n", WEXITSTATUS(status)); + else + fputs("abnormal termination\n", stderr); +} + + +static void exit_cb(GPid pid, gint status, G_GNUC_UNUSED gpointer data) +{ + fprintf(stderr, "process %u ", (guint) pid); + print_status(status); +} + + +static void watch_cb(GPid pid, gint status, gpointer data) +{ + g_spawn_close_pid(pid); + exit_cb(pid, status, NULL); + g_main_loop_quit((GMainLoop *) data); +} + + +int main(int argc, char **argv) +{ + char *test_type; + + if (argc != 2) + { + fputs("usage: spawn <test-type>\n", stderr); + return 1; + } + + test_type = argv[1]; + + if (!strcmp(test_type, "syntax") || !strcmp(test_type, "syntexec")) + { + char command_line[0x100]; + + while (read_line("command line: ", command_line, sizeof command_line)) + { + GError *error = NULL; + + if (spawn_check_command(command_line, argv[1][4] == 'e', &error)) + fputs("valid\n", stderr); + else + { + fprintf(stderr, "error: %s\n", error->message); + g_error_free(error); + } + } + } + else if (!strcmp(test_type, "execute")) + { + char command_line[0x100]; + + while (read_line("command line: ", command_line, sizeof command_line)) + { + char working_directory[0x100]; + char args[4][0x100]; + char envs[4][0x100]; + char *argv[] = { args[0], args[1], args[2], args[3], NULL }; + char *envp[] = { envs[0], envs[1], envs[2], envs[3], NULL }; + int i; + GPid pid; + GError *error = NULL; + + read_line("working directory: ", working_directory, sizeof working_directory); + + fputs("up to 4 arguments\n", stderr); + for (i = 0; i < 4 && read_line("argument: ", args[i], sizeof args[i]); i++); + argv[i] = NULL; + + fputs("up to 4 variables, or empty line for parent environment\n", stderr); + for (i = 0; i < 4 && read_line("variable: ", envs[i], sizeof envs[i]); i++); + envp[i] = NULL; + + if (spawn_async_with_pipes(*working_directory ? working_directory : NULL, + *command_line ? command_line : NULL, argv, i ? envp : NULL, &pid, NULL, + NULL, NULL, &error)) + { + GMainLoop *loop = g_main_loop_new(NULL, TRUE); + + g_child_watch_add(pid, watch_cb, loop); + g_main_loop_run(loop); + g_main_loop_unref(loop); + } + else + { + fprintf(stderr, "error: %s\n", error->message); + g_error_free(error); + } + } + } + else if (!strcmp(test_type, "redirect") || !strcmp(test_type, "redinput")) + { + char command_line[0x100]; + gboolean output = test_type[4] == 'r'; + + while (read_line("command line: ", command_line, sizeof command_line)) + { + GString *stdin_text = read_string("text to send: "); + SpawnWriteData stdin_data; + GError *error = NULL; + + if (stdin_text) + { + stdin_data.ptr = stdin_text->str; + stdin_data.size = stdin_text->len; + } + + if (!spawn_with_callbacks(NULL, command_line, NULL, NULL, SPAWN_SYNC, + stdin_text ? (GIOFunc) spawn_write_data : NULL, &stdin_data, + output ? print_cb : NULL, "stdout", 0, output ? print_cb : NULL, + "stderr", 0, exit_cb, NULL, NULL, &error)) + { + fprintf(stderr, "error: %s\n", error->message); + g_error_free(error); + } + + if (stdin_text) + g_string_free(stdin_text, TRUE); + } + } + else if (!strcmp(test_type, "capture")) + { + char command_line[0x100]; + + while (read_line("command line: ", command_line, sizeof command_line)) + { + GString *stdin_text = read_string("text to send: "); + SpawnWriteData stdin_data = { NULL, 0 }; + GString *stdout_data = g_string_sized_new(0x10000); /* may grow */ + GString *stderr_data = g_string_sized_new(0x1000); /* may grow */ + gint exit_status; + GError *error = NULL; + + if (stdin_text) + { + stdin_data.ptr = stdin_text->str; + stdin_data.size = stdin_text->len; + } + + if (spawn_sync(NULL, command_line, NULL, NULL, &stdin_data, stdout_data, + stderr_data, &exit_status, &error)) + { + printf("stdout: %s\n", stdout_data->str); + printf("stderr: %s\n", stderr_data->str); + print_status(exit_status); + } + else + { + fprintf(stderr, "error: %s\n", error->message); + g_error_free(error); + } + + if (stdin_text) + g_string_free(stdin_text, TRUE); + + g_string_free(stdout_data, TRUE); + g_string_free(stderr_data, TRUE); + } + } + else + { + fprintf(stderr, "spawn: unknown test type '%s'", argv[1]); + return 1; + } + + return 0; +} +#endif /* SPAWN_TEST */ Modified: src/spawn.h 107 lines changed, 107 insertions(+), 0 deletions(-) =================================================================== @@ -0,0 +1,107 @@ +/* + * spawn.h - this file is part of Geany, a fast and lightweight IDE + * + * Copyright 2013 Dimitar Toshkov Zhekov <dimitar(dot)zhekov(at)gmail(dot)com> + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along + * with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + + +#ifndef GEANY_SPAWN_H +#define GEANY_SPAWN_H 1 + +#include <glib.h> + +#ifdef G_OS_WIN32 +# define WIFEXITED(status) TRUE +# define WEXITSTATUS(status) (status) +# define WIFSIGNALLED(status) FALSE +#else +# include <sys/types.h> +# include <sys/wait.h> +#endif + +gchar *spawn_get_program_name(const gchar *command_line, GError **error); + +gboolean spawn_check_command(const gchar *command_line, gboolean execute, GError **error); + +gboolean spawn_kill_process(GPid pid, GError **error); + +gboolean spawn_async_with_pipes(const gchar *working_directory, const gchar *command_line, + gchar **argv, gchar **envp, GPid *child_pid, gint *stdin_fd, gint *stdout_fd, + gint *stderr_fd, GError **error); + +gboolean spawn_async(const gchar *working_directory, const gchar *command_line, gchar **argv, + gchar **envp, GPid *child_pid, GError **error); + +/** Flags passed to @c spawn_with_callbacks(), which see. */ +typedef enum +{ + SPAWN_ASYNC = 0x00, /**< Asynchronous execution [default]. */ + SPAWN_SYNC = 0x01, /**< Synchronous execution. */ + /* buffering modes */ + SPAWN_LINE_BUFFERED = 0x00, /**< stdout/stderr are line buffered [default]. */ + SPAWN_STDOUT_UNBUFFERED = 0x02, /**< stdout is not buffered. */ + SPAWN_STDERR_UNBUFFERED = 0x04, /**< stderr is not buffered. */ + SPAWN_UNBUFFERED = 0x06, /**< stdout/stderr are not buffered. */ + /* recursive modes */ + SPAWN_STDIN_RECURSIVE = 0x08, /**< The stdin callback is recursive. */ + SPAWN_STDOUT_RECURSIVE = 0x10, /**< The stdout callback is recursive. */ + SPAWN_STDERR_RECURSIVE = 0x20, /**< The stderr callback is recursive. */ + SPAWN_RECURSIVE = 0x38 /**< All callbacks are recursive. */ +} SpawnFlags; + +/** + * Specifies the type of function passed to @c spawn_with_callbacks() as stdout or stderr + * callback. + * + * In unbuffered mode, the @a string may contain nuls, while in line buffered mode, it may + * contain only a single nul as a line termination character at @a string->len - 1. In all + * cases, the @a string will be terminated with a nul character that is not part of the data + * at @a string->len. + * + * If @c G_IO_IN or @c G_IO_PRI are set, the @a string will contain at least one character. + * + * @param string contains the child data if @c G_IO_IN or @c G_IO_PRI are set. + * @param condition the I/O condition which has been satisfied. + * @param data the passed to @c spawn_with_callbacks() with the callback. + */ +typedef void (*SpawnReadFunc)(GString *string, GIOCondition condition, gpointer data); + +gboolean spawn_with_callbacks(const gchar *working_directory, const gchar *command_line, + gchar **argv, gchar **envp, SpawnFlags spawn_flags, GIOFunc stdin_cb, gpointer stdin_data, + SpawnReadFunc stdout_cb, gpointer stdout_data, gsize stdout_max_length, + SpawnReadFunc stderr_cb, gpointer stderr_data, gsize stderr_max_length, + GChildWatchFunc exit_cb, gpointer exit_data, GPid *child_pid, GError **error); + +/** + * A simple structure used by @c spawn_write_data() to write data to a channel. + * See @c spawn_write_data() for more information. + */ +typedef struct _SpawnWriteData +{ + const gchar *ptr; /**< Pointer to the data. May be NULL if the size is 0. */ + gsize size; /**< Size of the data. */ +} SpawnWriteData; + +gboolean spawn_write_data(GIOChannel *channel, GIOCondition condition, SpawnWriteData *data); + +void spawn_get_exit_status_cb(GPid pid, gint status, gpointer exit_status); + +gboolean spawn_sync(const gchar *working_directory, const gchar *command_line, gchar **argv, + gchar **envp, SpawnWriteData *stdin_data, GString *stdout_data, GString *stderr_data, + gint *exit_status, GError **error); + +#endif /* GEANY_SPAWN_H */ Modified: src/templates.c 44 lines changed, 22 insertions(+), 22 deletions(-) =================================================================== @@ -37,6 +37,7 @@ #include "geany.h" #include "geanymenubuttonaction.h" #include "geanyobject.h" +#include "spawn.h" #include "support.h" #include "toolbar.h" #include "ui_utils.h" @@ -595,33 +596,32 @@ static void templates_replace_default_dates(GString *text) static gchar *run_command(const gchar *command, const gchar *file_name, const gchar *file_type, const gchar *func_name) { + GString *output = g_string_new(NULL); gchar *result = NULL; - gchar **argv; + GError *error = NULL; + gchar **env; - if (g_shell_parse_argv(command, NULL, &argv, NULL)) - { - GError *error = NULL; - gchar **env; + file_name = (file_name != NULL) ? file_name : ""; + file_type = (file_type != NULL) ? file_type : ""; + func_name = (func_name != NULL) ? func_name : ""; - file_name = (file_name != NULL) ? file_name : ""; - file_type = (file_type != NULL) ? file_type : ""; - func_name = (func_name != NULL) ? func_name : ""; + env = utils_copy_environment(NULL, + "GEANY_FILENAME", file_name, + "GEANY_FILETYPE", file_type, + "GEANY_FUNCNAME", func_name, + NULL); - env = utils_copy_environment(NULL, - "GEANY_FILENAME", file_name, - "GEANY_FILETYPE", file_type, - "GEANY_FUNCNAME", func_name, - NULL); - if (! utils_spawn_sync(NULL, argv, env, G_SPAWN_SEARCH_PATH, - NULL, NULL, &result, NULL, NULL, &error)) - { - g_warning("templates_replace_command: %s", error->message); - g_error_free(error); - result = NULL; - } - g_strfreev(argv); - g_strfreev(env); + if (spawn_sync(NULL, command, NULL, env, NULL, output, NULL, NULL, &error)) + { + result = g_string_free(output, FALSE); } + else + { + g_warning("templates_replace_command: %s", error->message); + g_error_free(error); + } + + g_strfreev(env); return result; } Modified: src/tools.c 264 lines changed, 36 insertions(+), 228 deletions(-) =================================================================== @@ -33,6 +33,7 @@ #include "document.h" #include "keybindings.h" #include "sciwrappers.h" +#include "spawn.h" #include "support.h" #include "ui_utils.h" #include "utils.h" @@ -45,12 +46,6 @@ #include <string.h> #include <errno.h> -#ifdef G_OS_UNIX -# include <sys/types.h> -# include <sys/wait.h> -# include <signal.h> -#endif - enum { @@ -76,26 +71,6 @@ struct cc_dialog GtkWidget *button_down; }; -/* data required by the custom command callbacks */ -struct cc_data -{ - const gchar *command; /* command launched */ - GeanyDocument *doc; /* document in which replace the selection */ - GString *buffer; /* buffer holding stdout content, or NULL */ - gboolean error; /* whether and error occurred */ - gboolean finished; /* whether the command has finished */ -}; - - -static gboolean cc_exists_command(const gchar *command) -{ - gchar *path = g_find_program_in_path(command); - - g_free(path); - - return path != NULL; -} - /* update STATUS and TOOLTIP columns according to cmd */ static void cc_dialog_update_row_status(GtkListStore *store, GtkTreeIter *iter, const gchar *cmd) @@ -103,19 +78,9 @@ static void cc_dialog_update_row_status(GtkListStore *store, GtkTreeIter *iter, GError *err = NULL; const gchar *stock_id = GTK_STOCK_NO; gchar *tooltip = NULL; - gint argc; - gchar **argv; - if (EMPTY(cmd)) + if (EMPTY(cmd) || spawn_check_command(cmd, TRUE, &err)) stock_id = GTK_STOCK_YES; - else if (g_shell_parse_argv(cmd, &argc, &argv, &err)) - { - if (argc > 0 && cc_exists_command(argv[0])) - stock_id = GTK_STOCK_YES; - else - tooltip = g_strdup_printf(_("Invalid command: %s"), _("Command not found")); - g_strfreev(argv); - } else { tooltip = g_strdup_printf(_("Invalid command: %s"), err->message); @@ -227,218 +192,61 @@ static void cc_on_dialog_move_down_clicked(GtkButton *button, struct cc_dialog * } -static gboolean cc_iofunc(GIOChannel *ioc, GIOCondition cond, gpointer user_data) +/* Executes command (which should include all necessary command line args) and passes the current + * selection through the standard input of command. The whole output of command replaces the + * current selection. */ +void tools_execute_custom_command(GeanyDocument *doc, const gchar *command) { - struct cc_data *data = user_data; - - if (cond & (G_IO_IN | G_IO_PRI)) - { - gchar *msg = NULL; - GIOStatus rv; - GError *err = NULL; - - if (! data->buffer) - data->buffer = g_string_sized_new(256); - - do - { - rv = g_io_channel_read_line(ioc, &msg, NULL, NULL, &err); - if (msg != NULL) - { - g_string_append(data->buffer, msg); - g_free(msg); - } - if (G_UNLIKELY(err != NULL)) - { - geany_debug("%s: %s", G_STRFUNC, err->message); - g_error_free(err); - err = NULL; - } - } while (rv == G_IO_STATUS_NORMAL || rv == G_IO_STATUS_AGAIN); - - if (G_UNLIKELY(rv != G_IO_STATUS_EOF)) - { /* Something went wrong? */ - g_warning("%s: %s\n", G_STRFUNC, "Incomplete command output"); - } - } - return FALSE; -} - + GError *error = NULL; + gchar *sel; + SpawnWriteData input; + GString *output; + GString *errors; + gint status; + + g_return_if_fail(doc != NULL && command != NULL); + + if (! sci_has_selection(doc->editor->sci)) + editor_select_lines(doc->editor, FALSE); -static gboolean cc_iofunc_err(GIOChannel *ioc, GIOCondition cond, gpointer user_data) -{ - struct cc_data *data = user_data; + sel = sci_get_selection_contents(doc->editor->sci); + input.ptr = sel; + input.size = strlen(sel); + output = g_string_sized_new(256); + errors = g_string_new(NULL); + ui_set_statusbar(TRUE, _("Passing data and executing custom command: %s"), command); - if (cond & (G_IO_IN | G_IO_PRI)) + if (spawn_sync(NULL, command, NULL, NULL, &input, output, errors, &status, &error)) { - gchar *msg = NULL; - GString *str = g_string_sized_new(256); - GIOStatus rv; - - do - { - rv = g_io_channel_read_line(ioc, &msg, NULL, NULL, NULL); - if (msg != NULL) - { - g_string_append(str, msg); - g_free(msg); - } - } while (rv == G_IO_STATUS_NORMAL || rv == G_IO_STATUS_AGAIN); - - if (!EMPTY(str->str)) + if (errors->len > 0) { - g_warning("%s: %s\n", data->command, str->str); + g_warning("%s: %s\n", command, errors->str); ui_set_statusbar(TRUE, _("The executed custom command returned an error. " "Your selection was not changed. Error message: %s"), - str->str); - data->error = TRUE; - + errors->str); } - g_string_free(str, TRUE); - } - data->finished = TRUE; - return FALSE; -} - - -static gboolean cc_replace_sel_cb(gpointer user_data) -{ - struct cc_data *data = user_data; - - if (! data->finished) - { /* keep this function in the main loop until cc_iofunc_err() has finished */ - return TRUE; - } - - if (! data->error && data->buffer != NULL && DOC_VALID(data->doc)) - { /* Command completed successfully */ - sci_replace_sel(data->doc->editor->sci, data->buffer->str); - } - - if (data->buffer) - g_string_free(data->buffer, TRUE); - g_slice_free1(sizeof *data, data); - - return FALSE; -} - - -/* check whether the executed command failed and if so do nothing. - * If it returned with a successful exit code, replace the selection. */ -static void cc_exit_cb(GPid child_pid, gint status, gpointer user_data) -{ - struct cc_data *data = user_data; - - /* if there was already an error, skip further checks */ - if (! data->error) - { -#ifdef G_OS_UNIX - if (WIFEXITED(status)) + else if (!WIFEXITED(status) || WEXITSTATUS(status) != EXIT_SUCCESS) { - if (WEXITSTATUS(status) != EXIT_SUCCESS) - data->error = TRUE; - } - else if (WIFSIGNALED(status)) - { /* the terminating signal: WTERMSIG (status)); */ - data->error = TRUE; - } - else - { /* any other failure occurred */ - data->error = TRUE; - } -#else - data->error = ! win32_get_exit_status(child_pid); -#endif - - if (data->error) - { /* here we are sure data->error was set due to an unsuccessful exit code - * and so we add an error message */ /* TODO maybe include the exit code in the error message */ ui_set_statusbar(TRUE, _("The executed custom command exited with an unsuccessful exit code.")); } - } - - g_idle_add(cc_replace_sel_cb, data); - g_spawn_close_pid(child_pid); -} - - -/* Executes command (which should include all necessary command line args) and passes the current - * selection through the standard input of command. The whole output of command replaces the - * current selection. */ -void tools_execute_custom_command(GeanyDocument *doc, const gchar *command) -{ - GError *error = NULL; - GPid pid; - gchar **argv; - gint stdin_fd; - gint stdout_fd; - gint stderr_fd; - - g_return_if_fail(DOC_VALID(doc) && command != NULL); - - if (! sci_has_selection(doc->editor->sci)) - editor_select_lines(doc->editor, FALSE); - - if (!g_shell_parse_argv(command, NULL, &argv, &error)) - { - ui_set_statusbar(TRUE, _("Custom command failed: %s"), error->message); - g_error_free(error); - return; - } - ui_set_statusbar(TRUE, _("Passing data and executing custom command: %s"), command); - - if (g_spawn_async_with_pipes(NULL, argv, NULL, G_SPAWN_SEARCH_PATH | G_SPAWN_DO_NOT_REAP_CHILD, - NULL, NULL, &pid, &stdin_fd, &stdout_fd, &stderr_fd, &error)) - { - gchar *sel; - gint remaining, wrote; - struct cc_data *data = g_slice_alloc(sizeof *data); - - data->error = FALSE; - data->finished = FALSE; - data->buffer = NULL; - data->doc = doc; - data->command = command; - - g_child_watch_add(pid, cc_exit_cb, data); - - /* use GIOChannel to monitor stdout */ - utils_set_up_io_channel(stdout_fd, G_IO_IN | G_IO_PRI | G_IO_ERR | G_IO_HUP | G_IO_NVAL, - FALSE, cc_iofunc, data); - /* copy program's stderr to Geany's stdout to help error tracking */ - utils_set_up_io_channel(stderr_fd, G_IO_IN | G_IO_PRI | G_IO_ERR | G_IO_HUP | G_IO_NVAL, - FALSE, cc_iofunc_err, data); - - /* get selection */ - sel = sci_get_selection_contents(doc->editor->sci); - - /* write data to the command */ - remaining = strlen(sel); - do - { - wrote = write(stdin_fd, sel, remaining); - if (G_UNLIKELY(wrote < 0)) - { - g_warning("%s: %s: %s\n", G_STRFUNC, "Failed sending data to command", - g_strerror(errno)); - break; - } - remaining -= wrote; - } while (remaining > 0); - close(stdin_fd); - g_free(sel); + else + { /* Command completed successfully */ + sci_replace_sel(doc->editor->sci, output->str); + } } else { - geany_debug("g_spawn_async_with_pipes() failed: %s", error->message); + geany_debug("spawn_sync() failed: %s", error->message); ui_set_statusbar(TRUE, _("Custom command failed: %s"), error->message); g_error_free(error); } - g_strfreev(argv); + g_string_free(output, TRUE); + g_string_free(errors, TRUE); + g_free(sel); } Modified: src/utils.c 80 lines changed, 24 insertions(+), 56 deletions(-) =================================================================== @@ -34,6 +34,7 @@ #include "document.h" #include "prefs.h" #include "sciwrappers.h" +#include "spawn.h" #include "support.h" #include "templates.h" #include "ui_utils.h" @@ -76,29 +77,21 @@ void utils_open_browser(const gchar *uri) g_return_if_fail(uri != NULL); win32_open_browser(uri); #else - gboolean again = TRUE; + gchar *argv[2] = { (gchar *) uri, NULL }; g_return_if_fail(uri != NULL); - while (again) + while (!spawn_async(NULL, tool_prefs.browser_cmd, argv, NULL, NULL, NULL)) { - gchar *cmdline = g_strconcat(tool_prefs.browser_cmd, " \"", uri, "\"", NULL); + gchar *new_cmd = dialogs_show_input(_("Select Browser"), GTK_WINDOW(main_widgets.window), + _("Failed to spawn the configured browser command. " + "Please correct it or enter another one."), + tool_prefs.browser_cmd); - if (g_spawn_command_line_async(cmdline, NULL)) - again = FALSE; - else - { - gchar *new_cmd = dialogs_show_input(_("Select Browser"), GTK_WINDOW(main_widgets.window), - _("Failed to spawn the configured browser command. " - "Please correct it or enter another one."), - tool_prefs.browser_cmd); + if (new_cmd == NULL) /* user canceled */ + break; - if (new_cmd == NULL) /* user canceled */ - again = FALSE; - else - SETPTR(tool_prefs.browser_cmd, new_cmd); - } - g_free(cmdline); + SETPTR(tool_prefs.browser_cmd, new_cmd); } #endif } @@ -1651,15 +1644,14 @@ const gchar *utils_get_default_dir_utf8(void) /** - * Wraps g_spawn_sync() and internally calls this function on Unix-like - * systems. On Win32 platforms, it uses the Windows API. + * Wraps @c spawn_sync(), which see. * * @param dir The child's current working directory, or @a NULL to inherit parent's. * @param argv The child's argument vector. * @param env The child's environment, or @a NULL to inherit parent's. - * @param flags Flags from GSpawnFlags. - * @param child_setup A function to run in the child just before exec(). - * @param user_data The user data for child_setup. + * @param flags Ignored. + * @param child_setup Ignored. + * @param user_data Ignored. * @param std_out The return location for child output, or @a NULL. * @param std_err The return location for child error messages, or @a NULL. * @param exit_status The child exit status, as returned by waitpid(), or @a NULL. @@ -1672,40 +1664,29 @@ gboolean utils_spawn_sync(const gchar *dir, gchar **argv, gchar **env, GSpawnFla GSpawnChildSetupFunc child_setup, gpointer user_data, gchar **std_out, gchar **std_err, gint *exit_status, GError **error) { - gboolean result; - - if (argv == NULL) - { - g_set_error(error, G_SPAWN_ERROR, G_SPAWN_ERROR_FAILED, "argv must not be NULL"); - return FALSE; - } + GString *output = std_out ? g_string_new(NULL) : NULL; + GString *errors = std_err ? g_string_new(NULL) : NULL; + gboolean result = spawn_sync(dir, NULL, argv, env, NULL, output, errors, exit_status, error); if (std_out) - *std_out = NULL; + *std_out = g_string_free(output, !result); if (std_err) - *std_err = NULL; - -#ifdef G_OS_WIN32 - result = win32_spawn(dir, argv, env, flags, std_out, std_err, exit_status, error); -#else - result = g_spawn_sync(dir, argv, env, flags, NULL, NULL, std_out, std_err, exit_status, error); -#endif + *std_err = g_string_free(errors, !result); return result; } /** - * Wraps g_spawn_async() and internally calls this function on Unix-like - * systems. On Win32 platforms, it uses the Windows API. + * Wraps @c spawn_async(), which see. * * @param dir The child's current working directory, or @a NULL to inherit parent's. * @param argv The child's argument vector. * @param env The child's environment, or @a NULL to inherit parent's. - * @param flags Flags from GSpawnFlags. - * @param child_setup A function to run in the child just before exec(). - * @param user_data The user data for child_setup. + * @param flags Ignored. + * @param child_setup Ignored. + * @param user_data Ignored. * @param child_pid The return location for child process ID, or NULL. * @param error The return location for error or @a NULL. * @@ -1716,20 +1697,7 @@ gboolean utils_spawn_async(const gchar *dir, gchar **argv, gchar **env, GSpawnFl GSpawnChildSetupFunc child_setup, gpointer user_data, GPid *child_pid, GError **error) { - gboolean result; - - if (argv == NULL) - { - g_set_error(error, G_SPAWN_ERROR, G_SPAWN_ERROR_FAILED, "argv must not be NULL"); - return FALSE; - } - -#ifdef G_OS_WIN32 - result = win32_spawn(dir, argv, env, flags, NULL, NULL, NULL, error); -#else - result = g_spawn_async(dir, argv, env, flags, NULL, NULL, child_pid, error); -#endif - return result; + return spawn_async(dir, NULL, argv, env, child_pid, error); } Modified: src/win32.c 493 lines changed, 0 insertions(+), 493 deletions(-) =================================================================== @@ -57,31 +57,6 @@ #include <glib/gstdio.h> #include <gdk/gdkwin32.h> -#define BUFSIZE 4096 -#define CMDSIZE 32768 - -struct _geany_win32_spawn -{ - HANDLE hChildStdinRd; - HANDLE hChildStdinWr; - HANDLE hChildStdoutRd; - HANDLE hChildStdoutWr; - HANDLE hChildStderrRd; - HANDLE hChildStderrWr; - HANDLE hInputFile; - HANDLE hStdout; - HANDLE hStderr; - HANDLE processId; - DWORD dwExitCode; -}; -typedef struct _geany_win32_spawn geany_win32_spawn; - -static gboolean GetContentFromHandle(HANDLE hFile, gchar **content, GError **error); -static HANDLE GetTempFileHandle(GError **error); -static gboolean CreateChildProcess(geany_win32_spawn *gw_spawn, TCHAR *szCmdline, - const TCHAR *dir, GError **error); -static VOID ReadFromPipe(HANDLE hRead, HANDLE hWrite, HANDLE hFile, GError **error); - /* The timer handle used to refresh windows below modal native dialogs. If * ever more than one dialog can be shown at a time, this needs to be changed @@ -837,17 +812,6 @@ void win32_open_browser(const gchar *uri) } -/* Returns TRUE if the command, which child_pid refers to, returned with a successful exit code, - * otherwise FALSE. */ -gboolean win32_get_exit_status(GPid child_pid) -{ - DWORD exit_code; - GetExitCodeProcess(child_pid, &exit_code); - - return (exit_code == 0); -} - - static FILE *open_std_handle(DWORD handle, const char *mode) { HANDLE lStdHandle; @@ -929,299 +893,7 @@ void win32_init_debug_code(void) /* create a console window to get log messages on Windows, * especially useful when generating tags files */ debug_setup_console(); - /* Enable GLib process spawn debug mode when Geany was started with the debug flag */ - g_setenv("G_SPAWN_WIN32_DEBUG", "1", FALSE); - } -} - - -static gchar *create_temp_file(void) -{ - gchar *name; - gint fd; - - fd = g_file_open_tmp("tmp_XXXXXX", &name, NULL); - if (fd == -1) - name = NULL; - else - close(fd); - - return name; -} - - -/* Sometimes this blocks for 30s before aborting when there are several - * pages of (error) output and sometimes hangs - see the FIXME. - * Also gw_spawn.dwExitCode seems to be not set properly. */ -/* Process spawning implementation for Windows, by Pierre Joye. - * Don't call this function directly, use utils_spawn_[a]sync() instead. */ -static -gboolean _broken_win32_spawn(const gchar *dir, gchar **argv, gchar **env, GSpawnFlags flags, - gchar **std_out, gchar **std_err, gint *exit_status, GError **error) -{ - TCHAR buffer[CMDSIZE]=TEXT(""); - TCHAR cmdline[CMDSIZE] = TEXT(""); - TCHAR* lpPart[CMDSIZE]={NULL}; - DWORD retval = 0; - gint argc = 0, i; - gint cmdpos = 0; - - SECURITY_ATTRIBUTES saAttr; - BOOL fSuccess; - geany_win32_spawn gw_spawn; - - /* Temp file */ - HANDLE hStdoutTempFile = NULL; - HANDLE hStderrTempFile = NULL; - - gchar *stdout_content = NULL; - gchar *stderr_content = NULL; - - while (argv[argc]) - { - ++argc; - } - g_return_val_if_fail (std_out == NULL || - !(flags & G_SPAWN_STDOUT_TO_DEV_NULL), FALSE); - g_return_val_if_fail (std_err == NULL || - !(flags & G_SPAWN_STDERR_TO_DEV_NULL), FALSE); - - if (flags & G_SPAWN_SEARCH_PATH) - { - retval = SearchPath(NULL, argv[0], ".exe", sizeof(buffer), buffer, lpPart); - if (retval > 0) - g_snprintf(cmdline, sizeof(cmdline), "\"%s\"", buffer); - else - g_strlcpy(cmdline, argv[0], sizeof(cmdline)); - cmdpos = 1; - } - - for (i = cmdpos; i < argc; i++) - { - g_snprintf(cmdline, sizeof(cmdline), "%s %s", cmdline, argv[i]); - /*MessageBox(NULL, cmdline, cmdline, MB_OK);*/ - } - - if (std_err != NULL) - { - hStderrTempFile = GetTempFileHandle(error); - if (hStderrTempFile == INVALID_HANDLE_VALUE) - { - gchar *msg = g_win32_error_message(GetLastError()); - geany_debug("win32_spawn: Second CreateFile failed (%d)", (gint) GetLastError()); - g_set_error(error, G_SPAWN_ERROR, G_FILE_ERROR, "%s", msg); - g_free(msg); - return FALSE; - } - } - - if (std_out != NULL) - { - hStdoutTempFile = GetTempFileHandle(error); - if (hStdoutTempFile == INVALID_HANDLE_VALUE) - { - gchar *msg = g_win32_error_message(GetLastError()); - geany_debug("win32_spawn: Second CreateFile failed (%d)", (gint) GetLastError()); - g_set_error(error, G_SPAWN_ERROR, G_FILE_ERROR, "%s", msg); - g_free(msg); - return FALSE; - } - } - - /* Set the bInheritHandle flag so pipe handles are inherited. */ - saAttr.nLength = sizeof(SECURITY_ATTRIBUTES); - saAttr.bInheritHandle = TRUE; - saAttr.lpSecurityDescriptor = NULL; - - /* Get the handle to the current STDOUT and STDERR. */ - gw_spawn.hStdout = GetStdHandle(STD_OUTPUT_HANDLE); - gw_spawn.hStderr = GetStdHandle(STD_ERROR_HANDLE); - gw_spawn.dwExitCode = 0; - - /* Create a pipe for the child process's STDOUT. */ - if (! CreatePipe(&(gw_spawn.hChildStdoutRd), &(gw_spawn.hChildStdoutWr), &saAttr, 0)) - { - gchar *msg = g_win32_error_message(GetLastError()); - geany_debug("win32_spawn: Stdout pipe creation failed (%d)", (gint) GetLastError()); - g_set_error(error, G_SPAWN_ERROR, G_FILE_ERROR_PIPE, "%s", msg); - g_free(msg); - return FALSE; - } - - /* Ensure that the read handle to the child process's pipe for STDOUT is not inherited.*/ - SetHandleInformation(gw_spawn.hChildStdoutRd, HANDLE_FLAG_INHERIT, 0); - - /* Create a pipe for the child process's STDERR. */ - if (! CreatePipe(&(gw_spawn.hChildStderrRd), &(gw_spawn.hChildStderrWr), &saAttr, 0)) - { - gchar *msg = g_win32_error_message(GetLastError()); - geany_debug("win32_spawn: Stderr pipe creation failed"); - g_set_error(error, G_SPAWN_ERROR, G_FILE_ERROR_PIPE, "%s", msg); - g_free(msg); - return FALSE; - } - - /* Ensure that the read handle to the child process's pipe for STDOUT is not inherited.*/ - SetHandleInformation(gw_spawn.hChildStderrRd, HANDLE_FLAG_INHERIT, 0); - - /* Create a pipe for the child process's STDIN. */ - if (! CreatePipe(&(gw_spawn.hChildStdinRd), &(gw_spawn.hChildStdinWr), &saAttr, 0)) - { - gchar *msg = g_win32_error_message(GetLastError()); - geany_debug("win32_spawn: Stdin pipe creation failed"); - g_set_error(error, G_SPAWN_ERROR, G_FILE_ERROR_PIPE, "%s", msg); - g_free(msg); - return FALSE; - } - - /* Ensure that the write handle to the child process's pipe for STDIN is not inherited. */ - SetHandleInformation(gw_spawn.hChildStdinWr, HANDLE_FLAG_INHERIT, 0); - - /* Now create the child process. */ - fSuccess = CreateChildProcess(&gw_spawn, cmdline, dir, error); - if (exit_status) - { - *exit_status = gw_spawn.dwExitCode; - } - - if (! fSuccess) - { - geany_debug("win32_spawn: Create process failed"); - return FALSE; - } - - /* Read from pipe that is the standard output for child process. */ - if (std_out != NULL) - { - ReadFromPipe(gw_spawn.hChildStdoutRd, gw_spawn.hChildStdoutWr, hStdoutTempFile, error); - if (! GetContentFromHandle(hStdoutTempFile, &stdout_content, error)) - { - return FALSE; - } - *std_out = stdout_content; - } - - if (std_err != NULL) - { - ReadFromPipe(gw_spawn.hChildStderrRd, gw_spawn.hChildStderrWr, hStderrTempFile, error); - if (! GetContentFromHandle(hStderrTempFile, &stderr_content, error)) - { - return FALSE; - } - *std_err = stderr_content; - } - return TRUE; -} - - -/* Note: g_spawn is broken for receiving both stdio and stderr e.g. when - * running make and there are compile errors. See glib/giowin32.c header - * comment about Windows bugs, e.g. #338943 */ -/* Simple replacement for _broken_win32_spawn(). - * flags is ignored, G_SPAWN_SEARCH_PATH is implied. - * Don't call this function directly, use utils_spawn_[a]sync() instead. - * Adapted from tm_workspace_create_global_tags(). */ -gboolean win32_spawn(const gchar *dir, gchar **argv, gchar **env, GSpawnFlags flags, - gchar **std_out, gchar **std_err, gint *exit_status, GError **error) -{ - gint ret; - gboolean fail; - gchar *tmp_file = create_temp_file(); - gchar *tmp_errfile = create_temp_file(); - gchar *command; - gchar *locale_command; - - if (env != NULL) - { - return _broken_win32_spawn(dir, argv, env, flags, std_out, std_err, - exit_status, error); - } - if (!tmp_file || !tmp_errfile) - { - g_warning("%s: Could not create temporary files!", G_STRFUNC); - return FALSE; - } - command = g_strjoinv(" ", argv); - SETPTR(command, g_strdup_printf("cmd.exe /S /C \"%s >%s 2>%s\"", - command, tmp_file, tmp_errfile)); - locale_command = g_locale_from_utf8(command, -1, NULL, NULL, NULL); - if (! locale_command) - locale_command = g_strdup(command); - geany_debug("WIN32: actually running command:\n%s", command); - g_chdir(dir); - errno = 0; - ret = system(locale_command); - /* the command can return -1 as an exit code, so check errno also */ - fail = ret == -1 && errno; - if (!fail) - { - if (std_out != NULL) - g_file_get_contents(tmp_file, std_out, NULL, NULL); - if (std_err != NULL) - g_file_get_contents(tmp_errfile, std_err, NULL, NULL); - } - else if (error) - g_set_error_literal(error, G_SPAWN_ERROR, errno, g_strerror(errno)); - - g_free(command); - g_free(locale_command); - g_unlink(tmp_file); - g_free(tmp_file); - g_unlink(tmp_errfile); - g_free(tmp_errfile); - if (exit_status) - *exit_status = ret; - - return !fail; -} - - -static gboolean GetContentFromHandle(HANDLE hFile, gchar **content, GError **error) -{ - DWORD filesize; - gchar * buffer; - DWORD dwRead; - - filesize = GetFileSize(hFile, NULL); - if (filesize < 1) - { - *content = NULL; - return TRUE; - } - - buffer = g_malloc(filesize + 1); - if (! buffer) - { - gchar *msg = g_win32_error_message(GetLastError()); - geany_debug("GetContentFromHandle: Alloc failed"); - g_set_error(error, G_SPAWN_ERROR, G_SPAWN_ERROR, "%s", msg); - g_free(msg); - return FALSE; - } - - SetFilePointer(hFile, 0, NULL, FILE_BEGIN); - if (! ReadFile(hFile, buffer, filesize, &dwRead, NULL) || dwRead == 0) - { - gchar *msg = g_win32_error_message(GetLastError()); - geany_debug("GetContentFromHandle: Cannot read tempfile"); - g_set_error(error, G_SPAWN_ERROR, G_FILE_ERROR_FAILED, "%s", msg); - g_free(msg); - return FALSE; - } - - if (! CloseHandle(hFile)) - { - gchar *msg = g_win32_error_message(GetLastError()); - geany_debug("GetContentFromHandle: CloseHandle failed (%d)", (gint) GetLastError()); - g_set_error(error, G_SPAWN_ERROR, G_FILE_ERROR_FAILED, "%s", msg); - g_free(msg); - g_free(buffer); - *content = NULL; - return FALSE; } - buffer[filesize] = '\0'; - *content = buffer; - return TRUE; } @@ -1236,171 +908,6 @@ gchar *win32_expand_environment_variables(const gchar *str) } -static gboolean CreateChildProcess(geany_win32_spawn *gw_spawn, TCHAR *szCmdline, - const TCHAR *dir, GError **error) -{ - PROCESS_INFORMATION piProcInfo; - STARTUPINFOW siStartInfo; - BOOL bFuncRetn = FALSE; - gchar *expandedCmdline; - wchar_t w_commandline[CMDSIZE]; - wchar_t w_dir[MAX_PATH]; - - /* Set up members of the PROCESS_INFORMATION structure. */ - ZeroMemory(&piProcInfo, sizeof(PROCESS_INFORMATION)); - - /* Set up members of the STARTUPINFO structure.*/ - ZeroMemory(&siStartInfo, sizeof(STARTUPINFO)); - - siStartInfo.cb = sizeof(STARTUPINFO); - siStartInfo.hStdError = gw_spawn->hChildStderrWr; - siStartInfo.hStdOutput = gw_spawn->hChildStdoutWr; - siStartInfo.hStdInput = gw_spawn->hChildStdinRd; - siStartInfo.dwFlags |= STARTF_USESTDHANDLES; - - /* Expand environment variables like %blah%. */ - expandedCmdline = win32_expand_environment_variables(szCmdline); - - MultiByteToWideChar(CP_UTF8, 0, expandedCmdline, -1, w_commandline, G_N_ELEMENTS(w_commandline)); - MultiByteToWideChar(CP_UTF8, 0, dir, -1, w_dir, G_N_ELEMENTS(w_dir)); - - /* Create the child process. */ - bFuncRetn = CreateProcessW(NULL, - w_commandline, /* command line */ - NULL, /* process sec@@ Diff output truncated at 100000 characters. @@ -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] cdb752: Update of German translation
by Frank Lanitz 14 May '15

14 May '15

Branch: refs/heads/master Author: Frank Lanitz <frank(a)frank.uvena.de> Committer: Frank Lanitz <frank(a)frank.uvena.de> Date: Thu, 14 May 2015 18:34:48 UTC Commit: cdb7521b9bb52697a4169811893eaae84290da2b https://github.com/geany/geany/commit/cdb7521b9bb52697a4169811893eaae84290d… Log Message: ----------- Update of German translation Modified Paths: -------------- po/de.po Modified: po/de.po 1380 lines changed, 697 insertions(+), 683 deletions(-) =================================================================== No diff available, check online -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/talks] ec4446: DE: Adding hint to donations
by Frank Lanitz 14 May '15

14 May '15

Branch: refs/heads/master Author: Frank Lanitz <frank(a)frank.uvena.de> Committer: Frank Lanitz <frank(a)frank.uvena.de> Date: Thu, 14 May 2015 18:31:15 UTC Commit: ec4446c5a065be10c967d01f7c9bc61f9882aa8f https://github.com/geany/talks/commit/ec4446c5a065be10c967d01f7c9bc61f9882a… Log Message: ----------- DE: Adding hint to donations Modified Paths: -------------- de/Geany - die leichtgewichtige Entwicklungsumgebung/index.html Modified: de/Geany - die leichtgewichtige Entwicklungsumgebung/index.html 1 lines changed, 1 insertions(+), 0 deletions(-) =================================================================== @@ -212,6 +212,7 @@ <li>Dokumentation</li> <li>Übersetzungen</li> <li>Weitererzählen</li> + <li>Im Notfall: Spenden</li> </ul> <p>Konkret ...nach dem Talk</p> </section> -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/talks] fcd6f8: DE: some more little cleanups
by Frank Lanitz 13 May '15

13 May '15

Branch: refs/heads/master Author: Frank Lanitz <frank(a)frank.uvena.de> Committer: Frank Lanitz <frank(a)frank.uvena.de> Date: Wed, 13 May 2015 19:48:02 UTC Commit: fcd6f86740edfefe2073d3b85ca83350a5350c8b https://github.com/geany/talks/commit/fcd6f86740edfefe2073d3b85ca83350a5350… Log Message: ----------- DE: some more little cleanups Modified Paths: -------------- de/Geany - die leichtgewichtige Entwicklungsumgebung/index.html Modified: de/Geany - die leichtgewichtige Entwicklungsumgebung/index.html 6 lines changed, 3 insertions(+), 3 deletions(-) =================================================================== @@ -94,11 +94,11 @@ <h1>Features</h1> </section> <section> - <h3>Syntexhervorhebung</h3> + <h3>Syntaxhervorhebung</h3> <ul> <li>Für mehr als 60 Dateitypen vorhanden</li> <li>Aus dem Scintilla-Projekt</li> - <li>über sog. Lexer, in C++ geschriebene Klassen</li> + <li>Über sog. Lexer, in C++ geschriebene Klassen</li> <li>Automatische Erkennung; manuelles Setzen </li> <li>Selbstdefinierte Dateitypen</li> </ul> @@ -108,7 +108,7 @@ <ul> <li>Listet wichtige Variablen & Funktionen auf</li> <li>Einfache Navigation mit z.B. Maus</li> - <li>Aktualisierung entweder beim Speichern ODER beim Tippen</li> + <li>Aktualisierung entweder beim Speichern und optional beim Tippen</li> </ul> </section> <section> -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/talks] d29a65: Merge pull request #4 from egon0/master
by Frank Lanitz 13 May '15

13 May '15

Branch: refs/heads/master Author: Frank Lanitz <frank(a)frank.uvena.de> Committer: Frank Lanitz <frank(a)frank.uvena.de> Date: Wed, 13 May 2015 08:48:17 UTC Commit: d29a6591ebc9e2f17c88c1f8660db001d8397486 https://github.com/geany/talks/commit/d29a6591ebc9e2f17c88c1f8660db001d8397… Log Message: ----------- Merge pull request #4 from egon0/master Fix some typos Modified Paths: -------------- de/Geany - die leichtgewichtige Entwicklungsumgebung/index.html Modified: de/Geany - die leichtgewichtige Entwicklungsumgebung/index.html 12 lines changed, 6 insertions(+), 6 deletions(-) =================================================================== @@ -82,7 +82,7 @@ <section> <h3>Über mich</h3> <ul> - <li>Proffesioneller Nerd mit wirtschaftlichen Hintergrund in einer Datenbank-Firma</li> + <li>Profesioneller Nerd mit wirtschaftlichen Hintergrund in einer Datenbank-Firma</li> <li>Nutzer von Geany seit knapp 10 Jahren</li> <li>Maintainer der Plugins</li> <li>Übersetzungskoordinator</li> @@ -106,7 +106,7 @@ <section> <h3>Symbolbrowser</h3> <ul> - <li>Listet wichtige Variablen, Funktionen auf</li> + <li>Listet wichtige Variablen & Funktionen auf</li> <li>Einfache Navigation mit z.B. Maus</li> <li>Aktualisierung entweder beim Speichern ODER beim Tippen</li> </ul> @@ -115,7 +115,7 @@ <h3>Dokumentenliste</h3> <ul> <li>Listet alle geöffneten Dokumente auf</li> - <li>Optional mit kompletten Pfad</li> + <li>Optional mit komplettem Pfad</li> </ul> </section> <section> @@ -174,10 +174,10 @@ <section> <h3>Autovervollständigung</h3> <ul> - <li>Kombination aus statischen Ansatz + aktuelle Sitzung</li> + <li>Kombination aus statischem Ansatz + aktuelle Sitzung</li> <li>Konfigurierbar:<ul> <li>... wieviele Buchstaben für Vorschläge</li> - <li>... häufige Wörter ebenfalls vorgeschlagen werden (LaTeX, HTML)</li> + <li>... häufige Wörter können ebenfalls vorgeschlagen werden (LaTeX, HTML)</li> </ul></li> <li>Statische "Tags" werden aus Datei geladen</li> <li>Dateityp-spezifisch</li> @@ -192,7 +192,7 @@ <li>Beispiele: <ul> <li>GeanyVC</li> <li>git-changebar</li> - <li>Projekctorganizer</li> + <li>Projectorganizer</li> <li>Addons</li> <li>DevHelp</li> <li>Webhelper</li> -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/talks] e10aa0: DE: Fix writing of GTK
by Frank Lanitz 13 May '15

13 May '15

Branch: refs/heads/master Author: Frank Lanitz <frank(a)frank.uvena.de> Committer: Frank Lanitz <frank(a)frank.uvena.de> Date: Wed, 13 May 2015 08:28:02 UTC Commit: e10aa0640c3cd203e97f5d46013d9249164445fc https://github.com/geany/talks/commit/e10aa0640c3cd203e97f5d46013d924916444… Log Message: ----------- DE: Fix writing of GTK Modified Paths: -------------- de/Geany - die leichtgewichtige Entwicklungsumgebung/index.html Modified: de/Geany - die leichtgewichtige Entwicklungsumgebung/index.html 4 lines changed, 2 insertions(+), 2 deletions(-) =================================================================== @@ -74,8 +74,8 @@ <li>Ziel: Geringe Systemanforderungen und wenige Abhängigkeiten zu anderen Paketen</li> <li>Realisiert in C mit Teilen in C++</li> - <li>Basierend auf Scintilla und Gtk2 (2.24) - bzw. Gtk3 (experimental) </li> + <li>Basierend auf Scintilla und GTK (2.24) + bzw. GTK3 (experimental) </li> <li>Lizenz: GPLv2+</li> </ul> </section> -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/talks] bed608: fixed some small typos
by Michael Stöcker 13 May '15

13 May '15

Branch: refs/heads/master Author: Michael Stöcker <micha(a)stoecker.me> Committer: Michael Stöcker <micha(a)stoecker.me> Date: Wed, 13 May 2015 08:27:50 UTC Commit: bed608765406ac9fde503cd258389b394ccef3ae https://github.com/geany/talks/commit/bed608765406ac9fde503cd258389b394ccef… Log Message: ----------- fixed some small typos Modified Paths: -------------- de/Geany - die leichtgewichtige Entwicklungsumgebung/index.html Modified: de/Geany - die leichtgewichtige Entwicklungsumgebung/index.html 12 lines changed, 6 insertions(+), 6 deletions(-) =================================================================== @@ -82,7 +82,7 @@ <section> <h3>Über mich</h3> <ul> - <li>Proffesioneller Nerd mit wirtschaftlichen Hintergrund in einer Datenbank-Firma</li> + <li>Profesioneller Nerd mit wirtschaftlichen Hintergrund in einer Datenbank-Firma</li> <li>Nutzer von Geany seit knapp 10 Jahren</li> <li>Maintainer der Plugins</li> <li>Übersetzungskoordinator</li> @@ -106,7 +106,7 @@ <section> <h3>Symbolbrowser</h3> <ul> - <li>Listet wichtige Variablen, Funktionen auf</li> + <li>Listet wichtige Variablen & Funktionen auf</li> <li>Einfache Navigation mit z.B. Maus</li> <li>Aktualisierung entweder beim Speichern ODER beim Tippen</li> </ul> @@ -115,7 +115,7 @@ <h3>Dokumentenliste</h3> <ul> <li>Listet alle geöffneten Dokumente auf</li> - <li>Optional mit kompletten Pfad</li> + <li>Optional mit komplettem Pfad</li> </ul> </section> <section> @@ -174,10 +174,10 @@ <section> <h3>Autovervollständigung</h3> <ul> - <li>Kombination aus statischen Ansatz + aktuelle Sitzung</li> + <li>Kombination aus statischem Ansatz + aktuelle Sitzung</li> <li>Konfigurierbar:<ul> <li>... wieviele Buchstaben für Vorschläge</li> - <li>... häufige Wörter ebenfalls vorgeschlagen werden (LaTeX, HTML)</li> + <li>... häufige Wörter können ebenfalls vorgeschlagen werden (LaTeX, HTML)</li> </ul></li> <li>Statische "Tags" werden aus Datei geladen</li> <li>Dateityp-spezifisch</li> @@ -192,7 +192,7 @@ <li>Beispiele: <ul> <li>GeanyVC</li> <li>git-changebar</li> - <li>Projekctorganizer</li> + <li>Projectorganizer</li> <li>Addons</li> <li>DevHelp</li> <li>Webhelper</li> -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/talks] 413819: Merge pull request #1 from geany/master
by Micha 13 May '15

13 May '15

Branch: refs/heads/master Author: Micha <micha(a)stoecker.me> Committer: Micha <micha(a)stoecker.me> Date: Wed, 13 May 2015 08:22:02 UTC Commit: 4138193c7db168574466d4c87255c7f1f848d153 https://github.com/geany/talks/commit/4138193c7db168574466d4c87255c7f1f848d… Log Message: ----------- Merge pull request #1 from geany/master merge from original repo Modified Paths: -------------- de/Allgemein/blit_2008_geany.de.pdf de/Allgemein/geany.odp de/Allgemein/geany.pdf de/Allgemein/geany_v2.odp de/Effizientes Programmieren mit Geany/README.md de/Effizientes Programmieren mit Geany/img/build_configure_commands.png de/Effizientes Programmieren mit Geany/img/build_menu.svg de/Effizientes Programmieren mit Geany/index.html de/Effizientes Programmieren mit Geany/reveal/.gitignore de/Effizientes Programmieren mit Geany/reveal/.travis.yml de/Effizientes Programmieren mit Geany/reveal/CONTRIBUTING.md de/Effizientes Programmieren mit Geany/reveal/Gruntfile.js de/Effizientes Programmieren mit Geany/reveal/LICENSE de/Effizientes Programmieren mit Geany/reveal/README.md de/Effizientes Programmieren mit Geany/reveal/css/print/paper.css de/Effizientes Programmieren mit Geany/reveal/css/print/pdf.css de/Effizientes Programmieren mit Geany/reveal/css/reveal.css de/Effizientes Programmieren mit Geany/reveal/css/reveal.scss de/Effizientes Programmieren mit Geany/reveal/css/theme/README.md de/Effizientes Programmieren mit Geany/reveal/css/theme/beige.css de/Effizientes Programmieren mit Geany/reveal/css/theme/black.css de/Effizientes Programmieren mit Geany/reveal/css/theme/blood.css de/Effizientes Programmieren mit Geany/reveal/css/theme/league.css de/Effizientes Programmieren mit Geany/reveal/css/theme/moon.css de/Effizientes Programmieren mit Geany/reveal/css/theme/night.css de/Effizientes Programmieren mit Geany/reveal/css/theme/serif.css de/Effizientes Programmieren mit Geany/reveal/css/theme/simple.css de/Effizientes Programmieren mit Geany/reveal/css/theme/sky.css de/Effizientes Programmieren mit Geany/reveal/css/theme/solarized.css de/Effizientes Programmieren mit Geany/reveal/css/theme/source/beige.scss de/Effizientes Programmieren mit Geany/reveal/css/theme/source/black.scss de/Effizientes Programmieren mit Geany/reveal/css/theme/source/blood.scss de/Effizientes Programmieren mit Geany/reveal/css/theme/source/league.scss de/Effizientes Programmieren mit Geany/reveal/css/theme/source/moon.scss de/Effizientes Programmieren mit Geany/reveal/css/theme/source/night.scss de/Effizientes Programmieren mit Geany/reveal/css/theme/source/serif.scss de/Effizientes Programmieren mit Geany/reveal/css/theme/source/simple.scss de/Effizientes Programmieren mit Geany/reveal/css/theme/source/sky.scss de/Effizientes Programmieren mit Geany/reveal/css/theme/source/solarized.scss de/Effizientes Programmieren mit Geany/reveal/css/theme/source/white.scss de/Effizientes Programmieren mit Geany/reveal/css/theme/template/mixins.scss de/Effizientes Programmieren mit Geany/reveal/css/theme/template/settings.scss de/Effizientes Programmieren mit Geany/reveal/css/theme/template/theme.scss de/Effizientes Programmieren mit Geany/reveal/css/theme/white.css de/Effizientes Programmieren mit Geany/reveal/index.html de/Effizientes Programmieren mit Geany/reveal/js/reveal.js de/Effizientes Programmieren mit Geany/reveal/lib/css/zenburn.css de/Effizientes Programmieren mit Geany/reveal/lib/font/league-gothic/LICENSE de/Effizientes Programmieren mit Geany/reveal/lib/font/league-gothic/league-gothic.css de/Effizientes Programmieren mit Geany/reveal/lib/font/league-gothic/league-gothic.eot de/Effizientes Programmieren mit Geany/reveal/lib/font/league-gothic/league-gothic.ttf de/Effizientes Programmieren mit Geany/reveal/lib/font/league-gothic/league-gothic.woff de/Effizientes Programmieren mit Geany/reveal/lib/font/source-sans-pro/LICENSE de/Effizientes Programmieren mit Geany/reveal/lib/font/source-sans-pro/source-sans-pro-italic.eot de/Effizientes Programmieren mit Geany/reveal/lib/font/source-sans-pro/source-sans-pro-italic.ttf de/Effizientes Programmieren mit Geany/reveal/lib/font/source-sans-pro/source-sans-pro-italic.woff de/Effizientes Programmieren mit Geany/reveal/lib/font/source-sans-pro/source-sans-pro-regular.eot de/Effizientes Programmieren mit Geany/reveal/lib/font/source-sans-pro/source-sans-pro-regular.ttf de/Effizientes Programmieren mit Geany/reveal/lib/font/source-sans-pro/source-sans-pro-regular.woff de/Effizientes Programmieren mit Geany/reveal/lib/font/source-sans-pro/source-sans-pro-semibold.eot de/Effizientes Programmieren mit Geany/reveal/lib/font/source-sans-pro/source-sans-pro-semibold.ttf de/Effizientes Programmieren mit Geany/reveal/lib/font/source-sans-pro/source-sans-pro-semibold.woff de/Effizientes Programmieren mit Geany/reveal/lib/font/source-sans-pro/source-sans-pro-semibolditalic.eot de/Effizientes Programmieren mit Geany/reveal/lib/font/source-sans-pro/source-sans-pro-semibolditalic.ttf de/Effizientes Programmieren mit Geany/reveal/lib/font/source-sans-pro/source-sans-pro-semibolditalic.woff de/Effizientes Programmieren mit Geany/reveal/lib/font/source-sans-pro/source-sans-pro.css de/Effizientes Programmieren mit Geany/reveal/lib/js/classList.js de/Effizientes Programmieren mit Geany/reveal/lib/js/head.min.js de/Effizientes Programmieren mit Geany/reveal/lib/js/html5shiv.js de/Effizientes Programmieren mit Geany/reveal/package.json de/Effizientes Programmieren mit Geany/reveal/plugin/highlight/highlight.js de/Effizientes Programmieren mit Geany/reveal/plugin/leap/leap.js de/Effizientes Programmieren mit Geany/reveal/plugin/markdown/example.html de/Effizientes Programmieren mit Geany/reveal/plugin/markdown/example.md de/Effizientes Programmieren mit Geany/reveal/plugin/markdown/markdown.js de/Effizientes Programmieren mit Geany/reveal/plugin/markdown/marked.js de/Effizientes Programmieren mit Geany/reveal/plugin/math/math.js de/Effizientes Programmieren mit Geany/reveal/plugin/multiplex/client.js de/Effizientes Programmieren mit Geany/reveal/plugin/multiplex/index.js de/Effizientes Programmieren mit Geany/reveal/plugin/multiplex/master.js de/Effizientes Programmieren mit Geany/reveal/plugin/notes-server/client.js de/Effizientes Programmieren mit Geany/reveal/plugin/notes-server/index.js de/Effizientes Programmieren mit Geany/reveal/plugin/notes-server/notes.html de/Effizientes Programmieren mit Geany/reveal/plugin/notes/notes.html de/Effizientes Programmieren mit Geany/reveal/plugin/notes/notes.js de/Effizientes Programmieren mit Geany/reveal/plugin/print-pdf/print-pdf.js de/Effizientes Programmieren mit Geany/reveal/plugin/remotes/remotes.js de/Effizientes Programmieren mit Geany/reveal/plugin/search/search.js de/Effizientes Programmieren mit Geany/reveal/plugin/zoom-js/zoom.js de/Effizientes Programmieren mit Geany/reveal/test/examples/assets/image1.png de/Effizientes Programmieren mit Geany/reveal/test/examples/assets/image2.png de/Effizientes Programmieren mit Geany/reveal/test/examples/barebones.html de/Effizientes Programmieren mit Geany/reveal/test/examples/embedded-media.html de/Effizientes Programmieren mit Geany/reveal/test/examples/math.html de/Effizientes Programmieren mit Geany/reveal/test/examples/slide-backgrounds.html de/Effizientes Programmieren mit Geany/reveal/test/qunit-1.12.0.css de/Effizientes Programmieren mit Geany/reveal/test/qunit-1.12.0.js de/Effizientes Programmieren mit Geany/reveal/test/test-markdown-element-attributes.html de/Effizientes Programmieren mit Geany/reveal/test/test-markdown-element-attributes.js de/Effizientes Programmieren mit Geany/reveal/test/test-markdown-slide-attributes.html de/Effizientes Programmieren mit Geany/reveal/test/test-markdown-slide-attributes.js de/Effizientes Programmieren mit Geany/reveal/test/test-markdown.html de/Effizientes Programmieren mit Geany/reveal/test/test-markdown.js de/Effizientes Programmieren mit Geany/reveal/test/test-pdf.html de/Effizientes Programmieren mit Geany/reveal/test/test-pdf.js de/Effizientes Programmieren mit Geany/reveal/test/test.html de/Effizientes Programmieren mit Geany/reveal/test/test.js de/Geany - die leichtgewichtige Entwicklungsumgebung/README.md de/Geany - die leichtgewichtige Entwicklungsumgebung/index.html de/Geany - die leichtgewichtige Entwicklungsumgebung/reveal/.gitignore de/Geany - die leichtgewichtige Entwicklungsumgebung/reveal/.travis.yml de/Geany - die leichtgewichtige Entwicklungsumgebung/reveal/CONTRIBUTING.md de/Geany - die leichtgewichtige Entwicklungsumgebung/reveal/Gruntfile.js de/Geany - die leichtgewichtige Entwicklungsumgebung/reveal/LICENSE de/Geany - die leichtgewichtige Entwicklungsumgebung/reveal/README.md de/Geany - die leichtgewichtige Entwicklungsumgebung/reveal/css/print/paper.css de/Geany - die leichtgewichtige Entwicklungsumgebung/reveal/css/print/pdf.css de/Geany - die leichtgewichtige Entwicklungsumgebung/reveal/css/reveal.css de/Geany - die leichtgewichtige Entwicklungsumgebung/reveal/css/reveal.scss de/Geany - die leichtgewichtige Entwicklungsumgebung/reveal/css/theme/README.md de/Geany - die leichtgewichtige Entwicklungsumgebung/reveal/css/theme/beige.css de/Geany - die leichtgewichtige Entwicklungsumgebung/reveal/css/theme/black.css de/Geany - die leichtgewichtige Entwicklungsumgebung/reveal/css/theme/blood.css de/Geany - die leichtgewichtige Entwicklungsumgebung/reveal/css/theme/league.css de/Geany - die leichtgewichtige Entwicklungsumgebung/reveal/css/theme/moon.css de/Geany - die leichtgewichtige Entwicklungsumgebung/reveal/css/theme/night.css de/Geany - die leichtgewichtige Entwicklungsumgebung/reveal/css/theme/serif.css de/Geany - die leichtgewichtige Entwicklungsumgebung/reveal/css/theme/simple.css de/Geany - die leichtgewichtige Entwicklungsumgebung/reveal/css/theme/sky.css de/Geany - die leichtgewichtige Entwicklungsumgebung/reveal/css/theme/solarized.css de/Geany - die leichtgewichtige Entwicklungsumgebung/reveal/css/theme/source/beige.scss de/Geany - die leichtgewichtige Entwicklungsumgebung/reveal/css/theme/source/black.scss de/Geany - die leichtgewichtige Entwicklungsumgebung/reveal/css/theme/source/blood.scss de/Geany - die leichtgewichtige Entwicklungsumgebung/reveal/css/theme/source/league.scss de/Geany - die leichtgewichtige Entwicklungsumgebung/reveal/css/theme/source/moon.scss de/Geany - die leichtgewichtige Entwicklungsumgebung/reveal/css/theme/source/night.scss de/Geany - die leichtgewichtige Entwicklungsumgebung/reveal/css/theme/source/serif.scss de/Geany - die leichtgewichtige Entwicklungsumgebung/reveal/css/theme/source/simple.scss de/Geany - die leichtgewichtige Entwicklungsumgebung/reveal/css/theme/source/sky.scss de/Geany - die leichtgewichtige Entwicklungsumgebung/reveal/css/theme/source/solarized.scss de/Geany - die leichtgewichtige Entwicklungsumgebung/reveal/css/theme/source/white.scss de/Geany - die leichtgewichtige Entwicklungsumgebung/reveal/css/theme/template/mixins.scss de/Geany - die leichtgewichtige Entwicklungsumgebung/reveal/css/theme/template/settings.scss de/Geany - die leichtgewichtige Entwicklungsumgebung/reveal/css/theme/template/theme.scss de/Geany - die leichtgewichtige Entwicklungsumgebung/reveal/css/theme/white.css de/Geany - die leichtgewichtige Entwicklungsumgebung/reveal/index.html de/Geany - die leichtgewichtige Entwicklungsumgebung/reveal/js/reveal.js de/Geany - die leichtgewichtige Entwicklungsumgebung/reveal/lib/css/zenburn.css de/Geany - die leichtgewichtige Entwicklungsumgebung/reveal/lib/font/league-gothic/LICENSE de/Geany - die leichtgewichtige Entwicklungsumgebung/reveal/lib/font/league-gothic/league-gothic.css de/Geany - die leichtgewichtige Entwicklungsumgebung/reveal/lib/font/league-gothic/league-gothic.eot de/Geany - die leichtgewichtige Entwicklungsumgebung/reveal/lib/font/league-gothic/league-gothic.ttf de/Geany - die leichtgewichtige Entwicklungsumgebung/reveal/lib/font/league-gothic/league-gothic.woff de/Geany - die leichtgewichtige Entwicklungsumgebung/reveal/lib/font/source-sans-pro/LICENSE de/Geany - die leichtgewichtige Entwicklungsumgebung/reveal/lib/font/source-sans-pro/source-sans-pro-italic.eot de/Geany - die leichtgewichtige Entwicklungsumgebung/reveal/lib/font/source-sans-pro/source-sans-pro-italic.ttf de/Geany - die leichtgewichtige Entwicklungsumgebung/reveal/lib/font/source-sans-pro/source-sans-pro-italic.woff de/Geany - die leichtgewichtige Entwicklungsumgebung/reveal/lib/font/source-sans-pro/source-sans-pro-regular.eot de/Geany - die leichtgewichtige Entwicklungsumgebung/reveal/lib/font/source-sans-pro/source-sans-pro-regular.ttf de/Geany - die leichtgewichtige Entwicklungsumgebung/reveal/lib/font/source-sans-pro/source-sans-pro-regular.woff de/Geany - die leichtgewichtige Entwicklungsumgebung/reveal/lib/font/source-sans-pro/source-sans-pro-semibold.eot de/Geany - die leichtgewichtige Entwicklungsumgebung/reveal/lib/font/source-sans-pro/source-sans-pro-semibold.ttf de/Geany - die leichtgewichtige Entwicklungsumgebung/reveal/lib/font/source-sans-pro/source-sans-pro-semibold.woff de/Geany - die leichtgewichtige Entwicklungsumgebung/reveal/lib/font/source-sans-pro/source-sans-pro-semibolditalic.eot de/Geany - die leichtgewichtige Entwicklungsumgebung/reveal/lib/font/source-sans-pro/source-sans-pro-semibolditalic.ttf de/Geany - die leichtgewichtige Entwicklungsumgebung/reveal/lib/font/source-sans-pro/source-sans-pro-semibolditalic.woff de/Geany - die leichtgewichtige Entwicklungsumgebung/reveal/lib/font/source-sans-pro/source-sans-pro.css de/Geany - die leichtgewichtige Entwicklungsumgebung/reveal/lib/js/classList.js de/Geany - die leichtgewichtige Entwicklungsumgebung/reveal/lib/js/head.min.js de/Geany - die leichtgewichtige Entwicklungsumgebung/reveal/lib/js/html5shiv.js de/Geany - die leichtgewichtige Entwicklungsumgebung/reveal/package.json de/Geany - die leichtgewichtige Entwicklungsumgebung/reveal/plugin/highlight/highlight.js de/Geany - die leichtgewichtige Entwicklungsumgebung/reveal/plugin/leap/leap.js de/Geany - die leichtgewichtige Entwicklungsumgebung/reveal/plugin/markdown/example.html de/Geany - die leichtgewichtige Entwicklungsumgebung/reveal/plugin/markdown/example.md de/Geany - die leichtgewichtige Entwicklungsumgebung/reveal/plugin/markdown/markdown.js de/Geany - die leichtgewichtige Entwicklungsumgebung/reveal/plugin/markdown/marked.js de/Geany - die leichtgewichtige Entwicklungsumgebung/reveal/plugin/math/math.js de/Geany - die leichtgewichtige Entwicklungsumgebung/reveal/plugin/multiplex/client.js de/Geany - die leichtgewichtige Entwicklungsumgebung/reveal/plugin/multiplex/index.js de/Geany - die leichtgewichtige Entwicklungsumgebung/reveal/plugin/multiplex/master.js de/Geany - die leichtgewichtige Entwicklungsumgebung/reveal/plugin/notes-server/client.js de/Geany - die leichtgewichtige Entwicklungsumgebung/reveal/plugin/notes-server/index.js de/Geany - die leichtgewichtige Entwicklungsumgebung/reveal/plugin/notes-server/notes.html de/Geany - die leichtgewichtige Entwicklungsumgebung/reveal/plugin/notes/notes.html de/Geany - die leichtgewichtige Entwicklungsumgebung/reveal/plugin/notes/notes.js de/Geany - die leichtgewichtige Entwicklungsumgebung/reveal/plugin/print-pdf/print-pdf.js de/Geany - die leichtgewichtige Entwicklungsumgebung/reveal/plugin/remotes/remotes.js de/Geany - die leichtgewichtige Entwicklungsumgebung/reveal/plugin/search/search.js de/Geany - die leichtgewichtige Entwicklungsumgebung/reveal/plugin/zoom-js/zoom.js de/Geany - die leichtgewichtige Entwicklungsumgebung/reveal/test/examples/assets/image1.png de/Geany - die leichtgewichtige Entwicklungsumgebung/reveal/test/examples/assets/image2.png de/Geany - die leichtgewichtige Entwicklungsumgebung/reveal/test/examples/barebones.html de/Geany - die leichtgewichtige Entwicklungsumgebung/reveal/test/examples/embedded-media.html de/Geany - die leichtgewichtige Entwicklungsumgebung/reveal/test/examples/math.html de/Geany - die leichtgewichtige Entwicklungsumgebung/reveal/test/examples/slide-backgrounds.html de/Geany - die leichtgewichtige Entwicklungsumgebung/reveal/test/qunit-1.12.0.css de/Geany - die leichtgewichtige Entwicklungsumgebung/reveal/test/qunit-1.12.0.js de/Geany - die leichtgewichtige Entwicklungsumgebung/reveal/test/test-markdown-element-attributes.html de/Geany - die leichtgewichtige Entwicklungsumgebung/reveal/test/test-markdown-element-attributes.js de/Geany - die leichtgewichtige Entwicklungsumgebung/reveal/test/test-markdown-slide-attributes.html de/Geany - die leichtgewichtige Entwicklungsumgebung/reveal/test/test-markdown-slide-attributes.js de/Geany - die leichtgewichtige Entwicklungsumgebung/reveal/test/test-markdown.html de/Geany - die leichtgewichtige Entwicklungsumgebung/reveal/test/test-markdown.js de/Geany - die leichtgewichtige Entwicklungsumgebung/reveal/test/test-pdf.html de/Geany - die leichtgewichtige Entwicklungsumgebung/reveal/test/test-pdf.js de/Geany - die leichtgewichtige Entwicklungsumgebung/reveal/test/test.html de/Geany - die leichtgewichtige Entwicklungsumgebung/reveal/test/test.js de/Geany-FAQ/Gruntfile.js de/Geany-FAQ/LICENSE de/Geany-FAQ/README.md de/Geany-FAQ/css/css/print/paper.css de/Geany-FAQ/css/css/print/pdf.css de/Geany-FAQ/css/css/reveal.css de/Geany-FAQ/css/css/reveal.min.css de/Geany-FAQ/css/css/theme/README.md de/Geany-FAQ/css/css/theme/beige.css de/Geany-FAQ/css/css/theme/blood.css de/Geany-FAQ/css/css/theme/default.css de/Geany-FAQ/css/css/theme/moon.css de/Geany-FAQ/css/css/theme/night.css de/Geany-FAQ/css/css/theme/serif.css de/Geany-FAQ/css/css/theme/simple.css de/Geany-FAQ/css/css/theme/sky.css de/Geany-FAQ/css/css/theme/solarized.css de/Geany-FAQ/css/css/theme/source/beige.scss de/Geany-FAQ/css/css/theme/source/blood.scss de/Geany-FAQ/css/css/theme/source/default.scss de/Geany-FAQ/css/css/theme/source/moon.scss de/Geany-FAQ/css/css/theme/source/night.scss de/Geany-FAQ/css/css/theme/source/serif.scss de/Geany-FAQ/css/css/theme/source/simple.scss de/Geany-FAQ/css/css/theme/source/sky.scss de/Geany-FAQ/css/css/theme/source/solarized.scss de/Geany-FAQ/css/css/theme/template/mixins.scss de/Geany-FAQ/css/css/theme/template/settings.scss de/Geany-FAQ/css/css/theme/template/theme.scss de/Geany-FAQ/css/print/paper.css de/Geany-FAQ/css/print/pdf.css de/Geany-FAQ/css/reveal.css de/Geany-FAQ/css/reveal.min.css de/Geany-FAQ/css/theme/README.md de/Geany-FAQ/css/theme/beige.css de/Geany-FAQ/css/theme/blood.css de/Geany-FAQ/css/theme/default.css de/Geany-FAQ/css/theme/moon.css de/Geany-FAQ/css/theme/night.css de/Geany-FAQ/css/theme/serif.css de/Geany-FAQ/css/theme/simple.css de/Geany-FAQ/css/theme/sky.css de/Geany-FAQ/css/theme/solarized.css de/Geany-FAQ/css/theme/source/beige.scss de/Geany-FAQ/css/theme/source/blood.scss de/Geany-FAQ/css/theme/source/default.scss de/Geany-FAQ/css/theme/source/moon.scss de/Geany-FAQ/css/theme/source/night.scss de/Geany-FAQ/css/theme/source/serif.scss de/Geany-FAQ/css/theme/source/simple.scss de/Geany-FAQ/css/theme/source/sky.scss de/Geany-FAQ/css/theme/source/solarized.scss de/Geany-FAQ/css/theme/template/mixins.scss de/Geany-FAQ/css/theme/template/settings.scss de/Geany-FAQ/css/theme/template/theme.scss de/Geany-FAQ/index.html de/Geany-FAQ/js/js/reveal.js de/Geany-FAQ/js/js/reveal.min.js de/Geany-FAQ/js/reveal.js de/Geany-FAQ/js/reveal.min.js de/Geany-FAQ/lib/css/zenburn.css de/Geany-FAQ/lib/font/league_gothic-webfont.eot de/Geany-FAQ/lib/font/league_gothic-webfont.svg de/Geany-FAQ/lib/font/league_gothic-webfont.ttf de/Geany-FAQ/lib/font/league_gothic-webfont.woff de/Geany-FAQ/lib/font/league_gothic_license de/Geany-FAQ/lib/js/classList.js de/Geany-FAQ/lib/js/head.min.js de/Geany-FAQ/lib/js/html5shiv.js de/Geany-FAQ/lib/lib/css/zenburn.css de/Geany-FAQ/lib/lib/font/league_gothic-webfont.eot de/Geany-FAQ/lib/lib/font/league_gothic-webfont.svg de/Geany-FAQ/lib/lib/font/league_gothic-webfont.ttf de/Geany-FAQ/lib/lib/font/league_gothic-webfont.woff de/Geany-FAQ/lib/lib/font/league_gothic_license de/Geany-FAQ/lib/lib/js/classList.js de/Geany-FAQ/lib/lib/js/head.min.js de/Geany-FAQ/lib/lib/js/html5shiv.js de/Geany-FAQ/package.json de/Geany-FAQ/plugin/highlight/highlight.js de/Geany-FAQ/plugin/leap/leap.js de/Geany-FAQ/plugin/markdown/example.html de/Geany-FAQ/plugin/markdown/example.md de/Geany-FAQ/plugin/markdown/markdown.js de/Geany-FAQ/plugin/markdown/marked.js de/Geany-FAQ/plugin/math/math.js de/Geany-FAQ/plugin/multiplex/client.js de/Geany-FAQ/plugin/multiplex/index.js de/Geany-FAQ/plugin/multiplex/master.js de/Geany-FAQ/plugin/notes-server/client.js de/Geany-FAQ/plugin/notes-server/index.js de/Geany-FAQ/plugin/notes-server/notes.html de/Geany-FAQ/plugin/notes/notes.html Modified: de/Allgemein/blit_2008_geany.de.pdf 0 lines changed, 0 insertions(+), 0 deletions(-) =================================================================== No diff available, check online Modified: de/Allgemein/geany.odp 0 lines changed, 0 insertions(+), 0 deletions(-) =================================================================== No diff available, check online Modified: de/Allgemein/geany.pdf 0 lines changed, 0 insertions(+), 0 deletions(-) =================================================================== No diff available, check online Modified: de/Allgemein/geany_v2.odp 0 lines changed, 0 insertions(+), 0 deletions(-) =================================================================== No diff available, check online Modified: de/Effizientes Programmieren mit Geany/README.md 6 lines changed, 6 insertions(+), 0 deletions(-) =================================================================== @@ -0,0 +1,6 @@ +Kurze Anmerkung +############### + +Die Folien nutzen Reveal.js und liefern deswegen eine zum Zeitpunkt der +Erstellung aktuelle Version von reveal.js mit. Diese befinden sich im +Unterordner reveal und haben ein gesondertes Urherberrecht. Modified: de/Effizientes Programmieren mit Geany/img/build_configure_commands.png 0 lines changed, 0 insertions(+), 0 deletions(-) =================================================================== No diff available, check online Modified: de/Effizientes Programmieren mit Geany/img/build_menu.svg 14 lines changed, 14 insertions(+), 0 deletions(-) =================================================================== @@ -0,0 +1,14 @@ +<?xml version="1.0" encoding="UTF-8"?> +<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="515.2pt" height="257.6pt" viewBox="0 0 515.2 257.6" version="1.1"> +<defs> +<image id="image23475" width="644" height="322" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAoQAAAFCCAIAAADnjFssAAAABmJLR0QA/wD/AP+gvaeTAAAgAElEQVR4nOzdaUATV7sA4DdA2PdgWBUExLpvBESQIopaFhVQClgFFNeKWvd+2K8VAXGrVgXFDYFKtYAKVesGRUFR0WoVQdkEZRVCApE1JLk/5nZuGiCECNLevs8v5syZM2cmzHlnzpyZoejq6gJCCCGEBo4cAKioqAx0NRBCCKF/qaamJpmBrgNCCCH0b4fBGCGEEBpgGIwRQgihAYbBGCGEEBpgGIwRQgihAdZ1MBbIKLQaOPMV8aknhBBCSBpKSkrKysoSZpbrMrVDc8ynUybdfyTPq7or21bbq9UbGBicOXPm999/37ZtW68WJKioqFy8eFF8noyMjPDwcDEZ/P39fX19Y2Njz549K5xuZmYWGRn55s2bVatW8Xg8KaonHWKfEH8LBIKWlpaGhoaCgoL79+9nZGQI1+Tbb7+1tbXdunXrkydPOpczceLEiIiIu3fv7tix4wP3M0IIod4SbsyFlZaWLl++nPhbWVk5MDDQ29ubTqcDAJPJvHjx4tGjRxsaGsSU3MWVsYCqoaQ91N/z0+kzHEBvCl9Bh0gv+RObzRZTIpVKNTU1NTAwkGzTRPH5/AohTCbT1NSURqMJJ9bX14sv5Pz583Jyctu2bTMxMSETZWVl9+zZY2pqGh0d/TEjMfy5TzQ1NUtKSl6/fs1isbS1tRcvXhwdHZ2WlmZtbU3mfPjwoampqZeXV5fleHl5mZqaPnjwAD54PyOEEOotouHV1tau+KuamhoiA4VCOXXq1Nq1a6uqqiIiIsLCwoqKigIDA3/88UcqlSqm5C6ujLla433mTmvnCZq4Mo4zpqXfFPBr7sq0MU1NTQGgo6PjzZs3mpqa/bGdANDS0hIQEEBOGhsbp6WlvXr1SjhRkkK2bt2akJCwe/duHx8fPp8PAMuWLRs3btzp06cfP37c9/WWwMuXL1euXElOqqmp+fv7r1mzJiYmZuHChcSl8K1bt9hstrOzc0hISEtLi/DiSkpKzs7ObDY7LS3tY1cdIYTQn/Ly8roLSZaWlgwGIy8vz8vLi7jqi4mJiY2NtbW1dXR0vH79endlil4Z8xV1DQabTBo1tKGpreAtq40n4zjdgUe35ctrERnk5Lru2e4VOp0+f/78LVu2REREbN26derUqb0tQVVV9fPPP9+xY0d4ePiSJUtoNJpIhpycnNjY2EmTJvn7+wOAubn52rVrS0pK9u/fL0WFb968uW7dOmNjYymW7Q6Hwzl8+PCOHTvk5eW/++47IpHL5aampqqoqMyePVsk/2effaasrJySksLlcvuwGgghhPoK0VuZmZkp3P+akZEBAPr6+mIWFA3GXM1x890cG5u5fL4AAArfstXU1cZNGN9OsxZQZOvq6kpKSgCgpKSkrq5OurrSaLS7d+9GRER4enpaWlr6+fnFxMQcO3ZMVlZWwhIsLS3T09PDwsKcnZ3t7Oz+85//3Lp1y8rKSiTb/v37y8rKNmzYYG5uvnfvXjk5ua1bt7a1tUlR55aWlqCgoLS0tMTExIULF/Zhx8C5c+fKy8tHjRo1bNgwIiUxMREAPD09RXISKUlJSX21aoQQQn2ruLgYAIYMGSKcSFzIEbO6IxqMZdtrb97OUVaQVZSXlZGhjDHTYTLrnz15Kl//iCLg0Wg0RUVFAFBUVOx8MSqh9vb20NBQS0tLa2vrGTNmMBiMxMTEGTNmeHt7S7I4nU6Pjo7u6Ojw9fVlMBj29vZubm4cDicyMlJVVVU4J9FZLS8vn5iYOGbMmFOnTnU5KkoSc+bMcXZ2PnbsmK6u7o4dO7Kzs48ePTpz5kzx9wAkwefz79+/DwDjx48nUvLz8/Py8qytrY2MjMhsRkZGVlZWL168yM/P/8A1IoQQ+hAqKioj/kpJSYmYlZubm5KSMnv27JUrVxoaGurp6S1atMjHx+fOnTtZWVliyhQNxnL1T149uRMZm6KmSJ1kodvIYmb8dkem+o5MWx0AUCgUPT09JSUlPT09CoUi3WZwOJzY2FhyFFhTU9P27ds5HI6zs7MkiwcEBGhoaGzfvv3hw4dESn5+/q5du7S0tFxdXUUyP3r06Nq1a2pqam/fvj1w4IB0FSYUFBTs27fv008/9fHxSU5OtrKyioqKun//fkhIyMSJEz+k5OrqagAQPrlJSkqiUCgeHh5kioeHB4VCwctihBAacOPGjfvlr0aNGkXO3bx584EDBzZs2HD79u2srKxvv/02JiZm+fLlAoFATJld3ACWYz8rfd6xN5qiqEb748kT+dosCpdDzpWRkRHf8S0JCoViaWk5fvx4Go1G3ITu6OgQua7vjp2dHZfLLSgoIE4IiHOCyspKABgzZsy5c+eEMxsZGU2bNg0AdHV1Bw8eLL6XQBICgSAnJycnJ2fHjh0ODg5z58719PT09fXNzc2dN2+edGUS48tkZP7vxCg1NXXbtm0eHh6HDx8WCAREYG5vb09NTf3A+iOEEPpAxcXFp06dEk4pLS0l//7qq69WrlyZl5eXnp7O4/Hs7OwCAwOVlJR27NhBtPZd6no0llxDXtFTPk9liPy7TArvf8f0ygoEQxsbxzQ2gkDwXEPjtbo6T6qLY3V19ejoaAaD0dzcXF5eTowZJnq/JaGvr0+lUon74Z1LFp6kUCi7d+9WVFQ8cODA+vXr9+zZs2DBAjH7QlNT8969e+Qki8WytbXtLjOXy62tra2trW1ublZQUFBTU5Ow/p0NGjSIWB2Zwmazb9265ezsbGVl9eDBA6LL+sqVK+IfU0MIIfQR1NTU/Pzzz13OcnR0XLVqVVpa2qpVq4hwc+TIkfDw8IULF+bm5hJDgrrU7dBoucaXcpxCEPzfeLChjY1fei2wGDSIlZSsXVQEAEUaGlJsRlBQEIPBCAsLi4uLI8eb3bx5U0tLS5LFeTwem80ODAzsPEvkAegvvvjC2tr67NmzkZGR2trafn5+AQEBIqczwtra2hISEsjJ5ubmLrOZmprOmTNn7ty5gwcP5nK5GRkZly5dSk9Pl6TyXWIwGACQm5srnJiUlOTs7Ozp6fngwQMcuoUQQv8ITk5OABAfHy984RcfH+/l5eXk5CRNMAYA4UgMAGMaGy3odLq+Pm34cD6XW//6tXTB2MbGhsVixcTEkCmKiopGRkZNTU2SLF5cXGxlZVVZWfnu3Tsx2YYMGbJly5by8vLdu3cDwL59+xwdHb/66qu0tDTh/gRhLS0toaGh3RVIp9NdXFzmzp07evRoAHjy5MnJkyevXLki/hUoPXJycjI3Ny8rK3vx4oVwelZWVnV19WeffbZv377Zs2dXVVXdvXv3Q1aEEEKovxG9pCKP7bS2tkKnvlsRvflQhEDATkoWpP8m4PFA7I1o8Yh+XQUFBTIlICBA8mHJxH3TzZs3d55FFkJ2UH/99dfEBW5LS8vXX3+toKAQEREhxdCzM2fOZGVlBQcHq6mpHTp0yNHRccGCBWfPnv2QSCwjI+Pm5rZ3716BQBAeHi7Sf87n8y9cuKCkpHTw4EElJaULFy6I6WBHCCH0d1BQUAAAM2fOFE787LPPyFnd6cUbPJ5raNCKigR8voDPv/3mzXOxl8WmpqbkiyxIaWlpmZmZGRkZEydOPHz48IkTJwDAycnJ29u7rq5OwteJJCYmuri4uLu76+jonD9/vqKiQltb29zc3NPTMyIi4s6dOwDg5+fHYDASEhKys7PJBe/fv5+QkLBw4cLFixfHxsZKvuEAMGLEiJ9++unSpUtSPxwFACYmJl9//TUAyMvL6+joTJw4UVdXt7m5eevWrV2+VCs5OXn16tVWVlYCgSA5OVnq9SKEEPo4zp8/7+/v7+fnp6SkRAzgsre3/+KLL1paWsTHnV4E49fq6gDALCwEAGIAl5jMenp6X3zxhUhibW1tZmbm8ePHTUxM3N3dHR0dAaCmpmb16tWbNm0SfqxWDB6PFxgYuGHDBh8fH/LVXVwuNzs7u6ysDACMjY03btxYUVEREREhsuzu3bsdHBw2bdqUnp7+9u1biTYbAABsbW07Ojokz98lAwODpUuXAkBrayvxoYgzZ85cvHixu9enlJWV5eTkMBiMnJycN2/efODaEUII9beampqFCxfu3LnT29ubfHlGfn7+d999J/5xHoqurq6KispHqeRf0Gg0Y2PjpqamwsJC6TpgqVSqubm5qqpqfX19RUUF0SmPEEIIDTg6nU48r1tZWUk8fCtGU1PTgAXjf4+ioiLJM5ubm/dfTRBCCP0NNTU19cFXH5B4GF8RQgiJ15vR1AghhBDqBxiMEUIIoQGGwRghhBAaYHIAUAV6A10NhBBC6F9KHYr/dwBXi8YnA1sVhBBC6F9IqeElYDc1QgghNOAwGCOEEEIDDIMxQgghNMB6DsYj3j8Y3XAb+LwecyKEEEIIAIBCoWmqKirIS5i90xu4eFxqax1XXh3klFSb3pjz3zgqv21qbR/E4dxRtudRxX0cgjBYT/vXw+uyn5Us29m7LyMRVJUV78d+LT7P1aznW35IEpMhyHv6Ck/7w+fSo5NvC6cPN9H7OWJFSUWd5+ajH/OLhMQ+ISfbubzyd6wb2S9OXMxsa+eKZBAIoLm1ndXYlFtckfG44Ne7z3k8vpjSSIVv3rlvjOzP7UAIoX81SZpfZSWFkJVzFrtM0VJXBoDH+WVfH7nwW85L8SWLBmOdssurh3LUqZSiJnk2t6mIA3HlUNcGVjrv/JVuJDYzGpWNxZcoT5UbbqxX8U7KD/3yBYKyqnpyUllR3m68OauxOSevlEysY78XX8jJS5lfek3bs25+Ws7Lojc1RKKMjMzpb/0/MdFfGf7jR/42MLFPalmc7GclAKChpmQ7zuyzKaP93KY4LN/b1NwmkkFRgapHU//Sy3Gdz4zSyrqlIbF3fi8QKY3Z8P5x/l8+5VRZK/3HlRFCCPWox+ZXVlbmyg9r7cab3/m9IPXOH5pqysvd7X89vM5t/eGb9/PElCwajOv4yieKmzd9ws+uaip9D1QKaCqALR08h8g8Z3MWy2WmNNa/VZ/Qt5snrLmlzWXtD+Sk2WD6y+Sdz4vKhRN71NLavjTkzG/Rm079189h+V4BXwAAmxbNtBo19MDZm9nPxH3Hqv88L6rw3BxF/E3TVL16aN3ET4YEfT49IuZq5wwAoK6qtNZ7evBSl6uH1k1ftf/B8xLh0v4o6N0+QQgh1CfENL9fOE+2G29+OfOZx+YoIvTEpN59fv67yK0LR8z/RqSbU1gX94yrOG178mTmmsj7DoXQiTLeJpSWDvjuD/7BPMG5ovZtg56PbfjtA28h6+lo+LlNCV/jceIbv11BHk6TR/a2BDUVpaXzph7a4nMseNH6hU6DtNVEMtx9WnT4fPqUsWbrfGYAwAhTg/8uc3tVVv3N0RQpKvwiMeS/y93MBtOlWLZLTPb70FOXAWCa5fDu8jS+bwk9eXndvnMK8nKHt/j01aoRQgj1Exe7sQCw/8cbRCQGgDdVzMRbj4Ya6jhM6ra1hy7uGQNQKcBsbot6Jb92hMLT+vazrwVyAMpywNCBeYMpdAW+l3op/f372wr2XHkNKeo6SFvtzZXdFArlXT2n4X3zED3apkWzUm//sWDrMQl7j6eMM0/as3KQllod+31za/vSuXbbl7q4b4rKFOrLBYDtUZecbceErJxzPftFzLf+VDnZpSGxxD3a3mpua/8m0PWbQNf7z0t+vHr/55uPWI1NUpQjrIbZCABqKoris524eGfzopkThg8ZYaqfX1L1gStFCCHUf/R1NADgdWWdcOLrijoAmDphWNrD/O4WFA3G8rIwSBEoAK0d7YfyqKs+kV/zSTufD7Z0yu/1gmuVgpcNguoWcDGq9VO4kdw0iaVi2tu6trV3bPj+54RrD+sb3gOAqrLi/q8WLJlrt9zD/lhSRs+bOkjz0v4vW9u5jiv3E9F3rIXRxX1f/hyxwsJ9O6ephczZ0tq+NCT2t+hNmSe3aKgq7Yu/LtLTKznGF6EjTQ18P7P2mWV1ZKvv9xu8fr2XG3/l/tW7z7ncDunKnDrBAgBK//qbdSbgCzIeF/gb6EweYyYcjFWVFcZaGAnnLHpb29zSJl1lEEIISUhM88tpbgWAQZpqFTUscu4gLTUAGDZEV0yZosFYoGqgDtUqMrxWHrDbuZGvqMuGKTjqtof8wS/kAF8AVBn4zBA+1aNee8fraHgGpr0Oxo3vW46cTycn3ze3ro446zl90vwZkyQJxmu9HbXUleduOEJeBz8rKN/yQ9K5Xcs/n2l58mKmcOZ7fxQlpz9eMMOypKL22+jU3lZVWF5J5fbIi9ujLtmNN/edbT1/+qS5n45nNTb/fDPnx1/v33/Wc5hXkJcz1NUCAHUVpRlWI/67zBUAYi9n97hg+TsWANC1/tIVbzVq6OMfvxFO+XTZ3nt/FPVqoxBCCPWWmOb33h/FTtYjfWdbPX31vyO8FBXk5zmMBwBNNWUxZYoGY+6gMW+gw5r3XEvQoSALVS3coy8FXIG8pU6bGlVgoU7RUpTLYlITXnMp/Fa+rLaUm0Kh2I4zmzzGbJCWKlVOFgC4HTxTQx1JFp05eVQ7tyPvdZWhrhYFKBQKAEBZFRMAJo0wFgnGJoY6zrZjAMBwkJap4aCXrz+4m1cgyHpSmPWkcN2+c59NGe0729rPbcoKz09/f/nGenGY+EVtx5mX/hJBTra0tW/4/ufr93J7XCefLwAAGRmKcGL+66qDCbeEU4revuvFhiCEEJKKmOY3+sLt1Qsc1vnM4HbwUm4/1VJX+c8SZyIMUyhdFEXq4p5x06AJT5l8R8iVleG38wVNTR3Rr8B/mPxYHUFOvaxuC89GnftOXvCulVLOBSlunGqoKV/a/6XdePP3zW1l1czm1naBQKCkQJVwcUO6pjxVrvBiF5FP9LyDQjn5jZ+yovy30anfLXc79V8/u6W7yZvqnWlrqL65spucrGNzTFy3dZeZy+2oZjZUMxveN7cpylPVe7r1CwAFZTXRF+4AQDu3o/wdK/NJYQOnucelAECPpg6dHuiqqms4nZIlyeIIIYT6kJjmt7aeM2vNwbiQJVv8Zm/xmw0ABWU16/efP7F9MZMtLmB2EYwBoJ42KbOON5War0nlsanwtrnjp2KZeQaCqZodAgAQAF2RoiALzzlQ0/vN+CbQxW68+aaDiYfPpZMjtl4khtA0VSRZnMcT1Dc2ua0/3EW1G/8S21YvcPh0osWx5Nvhp67oaKoGfe643mfGgbM3uyu5tZ0bfeH/XhLyvrnr+68Wxno+s618Z1uZGg5q53b8ei/3x6v3r2Q977Hm5e9Yh3661WO2zuzGmwPA4/wyKZZFCCH0MT0vLJ/gEzLCVH+IHq2Ozfn95ZvFLjYA8LyoXMxSXQdjAKjRsbpdyxsj+0pZlq8gAzygDFYSCAAoAAIKUASgQaWoyEnzamtHxog69vsfhK7xFRXkTQxoxH3vHr0srbKfaPG2hlUl9h0XpkaDwr90L62s23Y4GQC2R11ysRuzY+WcXzKfka8BEdHc0rbx+5+7K1BPR+PzmQzf2dYTPxkCAPefl3z/480+GVYt3pxPx480NSh6++7Jqzc950YIIfQ3kF9SRQ659Zw+CQAuZz4Tk19cNK0dZPM7ZZgMBagyAAAUAgAFoI0P19jaJYpmUlSR6NdVkP+/fun1vjPkqd2eFoj46fpDAAhbPa/zLCpZyJ8d1MtC45qa2wCguaVteWi8ojz15DeLe+i578rVw+vKLu/et36BuopiyInLwz22T126Ozr5dr9GYooM5fNZjJjv/AUCweYfksR0sCOEEPp7mjdtwmdTRl/Jep5XUikmWw8hkK03pa28Q6b5f19ZRQHoAMrdBpU/ZM3qB40RE9Ushuj+sFn0PRWXM/+4eT/v13vPbcaano9YsS/+ukAgmPvp+GXu9jX1jXKyEl1nx6Te9XJiLHKx0aVpnErJLK1kDtJSGzlU389typYfkm5kvwCAoM8dp04YFp18O+PRK3LB249fRV+4s9Lz0zVe04SHc0ti3LDBxy/e+fHqfakfjpKE+WD67nXzAUCBKqdLU7cZY2pI13rf3LY0JPbynT/6b70IIYT6Snr0pswnhQVvagBgmuXwL5wnl1UxV0ecFb9Uj9ejlBZDe0oHX72lkgLw+3uFHN7gSu1JINPDeCsjXa3VCxxEEmvqG2/ez9sbd918MH2R82QXuzEAUPGONX/L0fA1Hsb6Eo3N5vH4busPh6yau9zdfuafr+5q53b89uhVcXktAJgNpoeunldWxdx6OFlk2W2Hkz+bMjp09bwrWc9fV9RKsjqCsevWjo5+/27VED3tDQudAKClrb2+oelFSdXh87/FX8l+V9/Y36tGCCHUJ2RkKP9Z4kz8zePzU2//sX7/+cp3LPFLUXR1dRtVzFo0PhGXS8BXLfmFrq5VqjmRT1Xtk+oO0lYzMxrEaWrLe10pXQcslSo3YqieuopSLYtTVlXf2tbeJxVDCCGEPgRdW91Yn0ahQOGbdz3ezVRqeKneVCxZMEYfgPswWnwGqtWKj1MThBBCfzdEMJZ02BSSGsZahBBC4knzbBJCCCGE+hAGY4QQQmiA/W83tVLDy4GtB0IIIfSvJQcA+lA90NVACCGE/qWasJsaIYQQGnAYjBFCCKEBhsEYIYQQGmAYjBFCCKEBJquqqiovL//xV0yj0by9vQGguroaAAwNDefPn9/e3l5b24tXRiOEEEL/dFwut+/fwGVgYHDmzBlyUiAQ1NbWlpSU/PjjjwUFBcLZgoODDx069PTpUwAwMzMLDg4OCwvLy8vrrmQtLS1bW9uXL18WFRX1ebURQgihgdL33dRUKtXU1FRTU7OkpKSkpKSsrExDQ8PX1/fKlSuenp5kNg6Hk5mZWVZWJnnJZmZmBw8enDVrVp/XGSGEEBpA/fVu6pcvX65cuZKctLOzO3Xq1LZt2y5evMjn8wGgtLQ0ICCgn9aOEEII/YN8pA9FZGVlFRcXW1hYaGhosFgsANDS0nJycnrx4sWLFy+Ec2poaHh4eAwbNozD4fz6669EJzYAjBgxYtq0aQAwevRoLy8vIvHnn38m/lBVVXVxcRk5ciSVSi0qKkpJSWEymcQsGRmZuXPnysnJXbp0icvlkiuyt7fX09O7fft2TU1NP289QgghJM5HCsaysrLa2tqtra0NDQ1EipGRUXh4+KFDh4SDsb6+/uXLlxUVFaurq83MzJYsWbJ///5jx44BgK2t7aJFiwDA3t5+8uTJRH4iGFtaWkZFRWlra7NYrJaWFi8vr6CgoBUrVjx8+BAA+Hy+lpbWf/7zn08++WTnzp3EgpMnTz558mROTk5SUtLH2QMIIYRQd/rr0SZFRUVjY2NjY2NTU1MbG5vIyEgdHZ0TJ04QfdTd8fPzu379+uTJk93c3D799NP8/PyNGzdOnDgRAE6ePLlkyRIAiIqKmvAnAKDT6dHR0R0dHb6+vgwGw97e3s3NjcPhREZGqqqqEsWePn06PT3dz89vxowZAECj0b7//ns2m/3VV1+Jrw9CCCH0EfRXMJ44cWJaWlpaWtqNGzfi4+OnTZu2f//+H374QfxSdXV1ERERPB4PAGpra3fu3EmhUPz9/cUsEhAQoKGhsX37duI6GADy8/N37dqlpaXl6upKZtuyZUtVVdXu3buNjIy+//77QYMGbdq06d27dx+6nQghhNAH669u6uLi4lOnTgEAhUKh0WgODg4bN26k0+k7duwQs9StW7c6OjrIyZycnLq6OktLSzGL2NnZcbncgoICPT09CoVCoVAAoLKyEgDGjBlz7tw5IhubzV6/fn1CQsKlS5c0NTVPnDhx586dD99MhBBC6MP1VzCuqakhR1cBQFRU1NGjRxctWpSVlZWWltbdUlVVVSIplZWVo0ePFrMifX19KpWakZHReZa6urrw5OPHjy9cuLBgwYI3b97s27dPkq1ACCGEPoKPNIALAH799VcnJycHBwcxwVhJSUkkRVlZWfhauTMej8dmswMDAzvPYrPZwpNmZmaurq4CgWDw4MFTp07tMn4jhBBCH9/HC8bESzfJQVVdMjMzE55UUFAwNDQkXwxCDLYiOqJJxcXFVlZWlZWV4m8AKyoqHjp0SEZGJiAgYO/evXv37nV1dcWHmhBCCP0dfKQPRSgoKBAPBz9//lxMtunTp+vp6ZGT8+fPV1JSIq+kORwOAAwaNEh4kdTUVADYvHlz59KoVCr59zfffDN8+PCwsLCsrKwNGzZoaGgcPHhQVlZW+k1CCCGE+kh/XRmbmJh8/fXXxN80Gm3KlCl0Or2wsPCnn34Ss1Rtbe2ZM2f27t1bWVlpbW29ceNGJpNJDAQDgJKSEiaTOXfu3MbGRuI6OD4+PjEx0cXFxd3dXUdH5/z58xUVFdra2ubm5p6enhEREcQoLRcXl88///zatWsJCQkAkJ2dHRUVtWbNmrVr1x44cKCf9gBCCCEkof4KxgYGBkuXLiX+bm1tffPmTWJi4okTJ1paWsQsFRsba2xsHBUVRVyzFhcXr1u3jnhjFwDweLw1a9Zs2bLF39+fuLscHx/P4/ECAwM3bNjg4+MzdepUIieXy83Ozib6t4cMGRIWFlZeXk6eHADA4cOHraysVq1a9eDBg3v37vXDDkAIIYQkRdHV1VVRURnoavyFtrb20KFD379/X1BQIBAIJFyKSqWam5urqqrW19dXVFS0trb2ayURQgihPtHU1PR3DMYIIYTQv0dTU9NHGsCFEEIIoe5gMEYIIYQGGAZjhBBCaIBhMEYIIYQGGAZjhBBCaIBhMEYIIYQGGAZjhBBCaICJvoGrqalpQOqBEEII/XuIvOFDNBiLfIYBIYQQQn2uublZeFI0GIvMRgghhFB/w3vGCCGE0ADDYIwQQggNMAzGCCGE0ADDYIwQQggNMAzGCCGE0ADDYIwQQggNMAzGCCGE0ACTVVVVlZeXH+hq9AiOapEAACAASURBVMDQ0HD+/Pnt7e21tbUDXReEEEL9qK8afBqN5u3tDQDV1dV9VLVeoFAoWlpaANDR0dFjZi6X2/dXxgYGBjdu3Lhx48bRo0c7z3V1dSXmLlmyRPIyzczMgoODra2t+66aCCH0L+Xg4NBdI7xp06YbN26MGzfu49eK1FcNvoGBQXBwsL29PTGppaXl6upqbm7+gWXe6Mrx48fJPEpKSsHBwY8ePcrJycnNzb148eKUKVN6LFn0DVwfjkqlmpqaCgQCU1NTMzOz4uJi4bkLFy4cOnQohUKh0Wh9vmqEEEI9UlVVNTU17bIRptPppqamioqKH79W/c3MzOzgwYMHDhwoKiqSuhAiwLHZ7OfPnwun19TUEH/IysqePn2awWA8fPjw5s2bGhoaPj4+MTExgYGBmZmZYkru+2BMePr06dixYz08PPbu3UsmGhsbMxiMnJwcBoPRT+tFCCGEpBYXF9fQ0BAUFCQmT15eXkBAQJez3N3dGQxGenr6ypUr+Xw+ACQmJl67dm3nzp3Tp0/n8XjdldlfwZjJZGZkZLi7u3///ffk6j09PXk83sWLF0WCMZ1Ot7e3NzU11dbWZrFY9+7dE38GQbCzszMwMMjNzc3LywMAVVVVFxeXkSNHUqnUoqKilJQUJpPZH5uGEEL/Enp6evb29k+ePKmqqvLw8Bg+fDibzb548SJxcTl48GB3d3d9ff3y8vKEhAQWiyW8rIaGxpw5c4YOHaqoqFhfX5+bm5uVlfX+/Xsyg7KysrOz86hRoxQUFKqrq7Ozsx89eiQQCMgMSkpK7u7uI0eObGtr++2337KysoTL71XgGDFixLRp0wBg9OjRXl5eROLPP//cOSdxo1dqxFpOnDhBRGIAqKiouHr1qqenp42NjcgmCOuvYAwAycnJ06dPt7W1vXPnDgDIyMi4u7tnZmbW1dUJZ6PRaHfv3qVQKEwmk8PhGBgYLFu27NatW19++aWYk4jVq1dv2LDh2rVrKSkpAGBpaRkVFUX8JC0tLV5eXkFBQStWrHj48GH/bSBCCP3/ZmFhER4efvz48dmzZ+vr67NYLDqdHhAQEBAQoKysfPjwYS6Xy+fzNTQ0vLy8XF1dORwOseCECRNiYmJUVVXLysqam5v19fU1NTV37NgRHx9PZLCysjpy5Ii2tjaTyWxsbDQwMFi7du3ixYvv3btHZKDRaCkpKcbGxnV1dXQ63c/Pb9++fceOHSPn9ipw2NraLlq0CADs7e0nT55MJHYZjD8QnU4HgLdv3wonEpMMBmNggnF6ejqLxfL09CSC8ZQpU/T19cPDw0Wytbe3h4aGpqSksNlsAFBRUdm+ffuCBQu8vb3Pnj3buVhZWdmQkJDPP/88JiZm165dfD6fTqdHR0e3tbX5+voS0XfEiBHR0dGRkZHTpk0TPhFDCCHUW0uXLj116tSBAwe4XK6VlVV8fHxISIiamtqmTZuuXbsGABs3bly1atWiRYuioqKIRTZu3CgjI+Pm5pafn0+kjBw5krzqNTQ0PH78OJ/PDwwMzMjIAAAZGRkHB4fKykpypcuWLfvxxx/nzJnT2tpqYmJy9uzZdevWnT9/nrj+7m3gOHny5NOnT8+dOxcVFRUZGfmBO0RFRWXEiBHCKaWlpS0tLQDQ1NQEADQaTXgIN3F73sTEREyZ/ficcUdHR2pq6owZM9TV1QHA09OTzWanpaWJZONwOLGxscQOBYCmpqbt27dzOBxnZ+fOZSopKUVHR3t5eYWHh4eFhRH9AAEBARoaGtu3byevg/Pz83ft2kWMneu/DUQIoX+D3NzcPXv2cLlcAHj48OHdu3fNzMySk5OJSAwAkZGRbW1tNjY25CL6+vplZWVkJAaAvLw8cjIgIEBVVXX//v1EJAYAPp+fnp5eWlpK5s/Pzw8NDW1tbQWA0tLS+Ph4KpVqaWlJzO1V4Ohz48aN++WvRo0aRcx6/PgxAMydO5fMrKioOHPmTAAgQmF3+vHKGACSk5P9/PxcXV0vX748c+bMpKSk9vb2ztkoFIqlpeX48eNpNJqcnBwAdHR0DBkyRCQbjUZLSEgYPnx4UFAQ+U8AAHZ2dlwut6CgQE9Pj0KhUCgUACDOsMaMGXPu3Ll+3EKEEPr/Ljs7W3jyzZs3AED2JwNAa2trTU2NgYEBmZKbm+vi4rJz584LFy48e/ZMpOt4ypQpfD4/KSlJzEqzsrKE7x8TD+bo6OiQKRIGjh7Fx8fLysqSkyYmJoaGhgkJCWQKm81evXq18CLFxcWnTp0STiFPIxISEhYtWuTv78/lconR1KtXrybCMBGbutO/wTgvL+/ly5eenp4AoKCgkJyc3DmPurp6dHQ0g8Fobm4uLy8nrvS7HFi/fPlyGRmZffv2CUdiANDX16dSqeQZlkjhfbIhCCH0/wYR5LqMDUSicBQEAJHBsG1tbV0mCre34eHhurq6Pj4+Pj4+LS0tDx48SEhISE9PJ+bq6uq+e/eOKKc7Xa6UCLrQm8DRI01NTbJYAJCRkaFSqeKHcdXU1HR3v5nJZBK3t1esWLFixQoAeP36dUhIyK5du0QGuIno32AMAMnJycHBwTo6OoWFhc+ePeucISgoiMFghIWFxcXFkWdPN2/e7LwvYmJiHB0d165dW1BQQP6oAMDj8dhsdmBgYOfCyU4MhBBCBCJ0qaiodJ5FJDY3N3/gKmpqary9vc3NzadOnTp58mQ7OzsHB4eQkJC4uDgAaG9vV1ZW/pDyJQ8cPXJzcxOe/OWXX1gs1uLFi6WuW35+vouLy7BhwwwMDFgsVm5uroeHBwC8evVKzFL9/m7q1NRUHo9naGh44cKFLjPY2NiwWKyYmBhyhyoqKhoZGXXOWV1d7evrW1ZWFhUVNXv2bDK9uLhYU1OzsrLyaSfCdyAQQggBQFlZGQBYWFh0nmVhYSEQCEQGA0utqKgoJiZmxYoVs2bNampq8vPzI9JLSkrU1dUNDQ2lLlnywEEixhiJ7yvuQ4WFhbdv33727BmfzycClvA1ZGf9HoyZTGZgYOD69esTExO7zNDc3KygoKCgoECmBAQEUKnULjPX1tb6+voWFBT88MMP8+bNIxJTU1MBYPPmzZ3zd1cOQgj9a5WUlJSVlU2aNGnMmDHC6VOnTjUxMXn8+HFDQ8MHrkKk7S0vL6+rq9PQ0CAmL1++DABr166VuvxeBQ4C8djVoEGDpF6pdGbNmuXg4JCenl5QUCAmW793UwOA+Dd4ZGRkTJw48fDhwydOnAAAJycnb2/vuro64U58YSwW64svvjh9+vSePXsUFBTOnz+fmJjo4uLi7u6uo6Nz/vz5iooKbW1tc3NzT0/PiIgI4sEqhBBCBIFAsGvXrqNHjyYkJMTExLx48aKtrW3ixIkBAQEdHR0REREfvoqMjIyrV69mZmbW1NSoqanNmzfP2NiYvM+amJjo7u7u6ekpLy+fnJzc0NAwePDgmTNnnj17NicnR8LyexU4AKCkpITJZM6dO7exsfHdu3cAQD703Ld++umnnJyckpISALCxsZk3b15FRcU333wjfqmPEYzFO378uImJibu7u6OjIwDU1NSsXr1606ZNYjocGhsbFy9efPLkydDQUCUlpTNnzgQGBm7YsMHHx2fq1KlEHi6Xm52dTfTGIIQQEnbr1q0VK1Zs3bpVeJxwbm5uaGjo06dPP7z8wsJCX19f8p2RLS0tsbGx5NuROzo6/P39t2/f7u7uTt6yLSsrk3yUjxSBg8fjrVmzZsuWLf7+/kpKStBvwZhCoZB7lcfj3bp1KyQkhHx5dbdL6erqdnkb/yOj0WjGxsZNTU2FhYXkW8R6i0qlmpubq6qq1tfXV1RUEA+oIYQQ6o6hoaG+vj5xn5i4Xuwr8vLygwcP1tbWbmhoePv2LTFqTISysvKwYcPk5ORqamrKy8t7u4o+CRz9QUdHx9DQkEKhlJaWSnKG0dTU1MfBuLdfw/jAr1khhBBC/3RNTU193E2NwRUhhBDqrX4fTY0QQggh8TAYI4QQQgMMgzFCCCE0wDAYI4QQQgMMgzFCCCE0wDAYI4QQQgMMgzFCCCE0wDAYI4QQQgNMVlVVVV5efqCr0QNDQ8P58+e3t7fX1tb2eeGOjo7Dhw+X/N1hNBrN29sbAKqrq/u8MkgSZmZmrq6uRUVFXC53oOuC0D9JX7Wl/d0MampqKioq/qNfaUyhUIiPK3d0dPSYmcvl9v2HIgwMDM6cOQMAxcXFq1atEpnr6upKfDbr3Llzp0+flrBMMzOz4ODgsLCwvLy8Pq0sGBsbR0ZGhoaGSr6IgYFBcHDwoUOH+uR16gNIRUXl4sWL4vNkZGSEh4d/nPp0SUtLy9bW9uXLl8JnS0wmc9OmTTo6OgcOHBjAuiHUmYODw3/+858u27dNmzbNnDlz8+bNf/zxx4DUDfquLRVpBrs8TqVAo9G++uqr2bNna2pqAgCXyy0qKrp//35kZCTxhue+WpHUyAAnorS0dPny5cTfSkpKGzZs8PDwID4Z+fz587179967d098yX0fjKlUqqmpqUAgMDU1NTMzKy4uFp67cOHCoUOHUigUGo3W56uWwpYtW+rq6sgPe0mCw+FkZmb+P/geFJ/Pr6ioICcVFRUZDEZDQ8OzZ8/IxPr6+oGo2v8xMzM7ePDggQMHhI89NpsdGxu7dOnShISEHr+FgtDHpKqqampq2mX7RqfTTU1NFRUVP36t+luXx2lvaWpqJicnGxkZPX369N69e2w2m06nW1lZ+fv7JyYmEsG4T1b0IYgAx2aznz9/LpxONkSysrKnT59mMBgPHz68efOmhoaGj49PTExMYGCg+K8J99cnFJ8+fTp27FgPDw/ym1kAYGxszGAwcnJyGAxGP623V4gvaEZGRvaqt7O0tJT8Ltg/WktLi/CGGBsbp6WlvXr16h+xdefPn1+1atUXX3yxf//+ga4LQkgicXFxDQ0NQUFBXc4NCAgwMjKKi4sLCQkRTjczM6urq/soFQToqZKEvLy87tpJd3d3BoORnp6+cuVK4kNSiYmJ165d27lz5/Tp03k8Xndl9lcwZjKZGRkZ7u7u33//Pbl6T09PHo938eJFkWBMp9Pt7e1NTU21tbVZLNa9e/fEn0EQ7OzsDAwMcnNzif4WVVVVFxeXkSNHUqnUoqKilJQUJpMpvgRvb28KhXLp0iWRdPFFaWlpOTk5vXjx4sWLF2Ti2LFjP/vsMw0NjdevXycnJ6urq1tZWd27d0/4o2Dii9XT07O3t3/y5El5ebm7u/vIkSPb2tp+++23rKysXlUPADQ0NObMmTN06FBFRcX6+vrc3NysrKz379/3uEs76/GnIatdWVk5d+7cESNGVFRUHDt2rE92y4gRI6ZNmwYAo0eP9vLyIhKJboyKiopHjx7Nnz//4MGDYv6/EfrbIo+dqqoqDw+P4cOHs9nsixcvEtd8gwcPdnd319fXLy8vT0hIYLFYwsv2eIwrKys7OzuPGjVKQUGhuro6Ozv70aNHAoGAzKCkpCSmnelVmyzmOBVB3EPtzpgxYwDgwoULIulk92p3K/rwVkjySvaIqOGJEyfITzpWVFRcvXrV09PTxsamc3tO6q9gDADJycnTp0+3tbW9c+cOAMjIyLi7u2dmZoqc49BotLt371IoFCaTyeFwDAwMli1bduvWrS+//FJMI7t69eoNGzZcu3YtJSUFACwtLaOiooj/m5aWFi8vr6CgoBUrVjx8+FBMDWfMmFFVVVVaWiqc2GNRRkZG4eHhhw4dIoPxsmXLtmzZ0tHRUVRUNG3atKVLlyYlJa1cuXLNmjXk791jsRYWFuHh4ceOHZs5c6axsXFdXR2dTvfz89u3bx/5XyVJORMmTIiJiVFVVS0rK2tubtbX19fU1NyxY4cUn9GW5Kchqn3ixIlZs2YNHjyYyWRWVlYSFf7w3WJra7to0SIAsLe3nzx5MrEIeZDfu3ePwWBMmDDh0aNHvd00hAYccewcP3589uzZ+vr6LBaLTqcHBAQEBAQoKysfPnyYy+Xy+XwNDQ0vLy9XV1cOh0Ms2OMxbmVldeTIEW1tbSaT2djYaGBgsHbt2sWLF5O3LWk0WkpKSnftTG/bZPHHqeSIjughQ4bk5uZ2maG7FX1gK9S36HQ6ALx9+1Y4kZhkMBgDE4zT09NZLJanpycRjKdMmaKvr995NFB7e3toaGhKSgrxS6ioqGzfvn3BggXe3t5nz57tXKysrGxISMjnn38eExOza9cuPp9Pp9Ojo6Pb2tp8fX2JRnzEiBHR0dGRkZHTpk3r7opQW1vbzMzs2rVrwolSFDVu3LgtW7a8evVqyZIl7969o1AoK1euXL9+vXTFLlu27Mcff5wzZ05ra6uJicnZs2fXrVt3/vx54rxYknI2btwoIyPj5uaWn59PlDly5EjhM2LJSf7TLFmy5OLFi3PnzuVwOMTnsftkt5w8efLp06fnzp2LioqKjIwUqd6TJ08AwNraGoMx+udaunTpqVOnDhw4wOVyrays4uPjQ0JC1NTUNm3aRLROGzduXLVq1aJFi6KioohFxB/jhoaGx48f5/P5gYGBGRkZACAjI+Pg4FBZWUmuVHw709s2WfxxKrm0tLQ5c+aEhYVZWFjcuXMnNze3vb1d8hVJ1wpJR0VFZcSIEcIppaWlLS0tANDU1AQANBpNeJw5MYbAxMRETJn9+JxxR0dHamrqjBkz1NXVAcDT05PNZqelpYlk43A4sbGxxK8OAE1NTdu3b+dwOM7Ozp3LVFJSio6O9vLyCg8PDwsLI/oBAgICNDQ0tm/fTl4d5ufn79q1S0tLy9XVtbvqmZqaAoDIyZEURS1atIhCoYSGhr579w4ABALB0aNHCwsLpSs2Pz8/NDSUGNBfWloaHx9PpVItLS0lL0dfX7+srIw8SgEgLy9PeFJykv80b9++DQ4OJs7cif/Fvt0tXSJONvET2ugfLTc3d8+ePcSwlYcPH969e9fMzCw5OZm8ToiMjGxra7OxsSEXEX+MBwQEqKqq7t+/n4jEAMDn89PT04W7AMW3M71qk/vQlStXTp06paysvGbNmp9//vnZs2dJSUmBgYFKSkqSLC5dKySdcePG/fJXo0aNImY9fvwYAObOnUtmVlRUnDlzJgAQobA7/XhlDADJycl+fn6urq6XL1+eOXNmUlKSyJkOgUKhWFpajh8/nkajycnJAUBHR8eQIUNEstFotISEhOHDhwcFBQlf0drZ2XG53IKCAj09PQqFQqFQAIA4DRwzZsy5c+e6rJu2tjb82THyIUVNnDixubn5/v37wolpaWmffPKJFMVmZWUJX8USN0t0dHQkLyc3N9fFxWXnzp0XLlx49uzZB95PlfCnycjIEFlR3+6WLjU0NMCfp5wI/UNlZ2cLT7558wYAhB+DaW1trampMTAwIFPEH+NTpkzh8/lJSUliViq+nQGJD/wexcfHy8rKkpMmJiaGhoYJCQlkCpvNXr16NTm5a9eu+Ph4Z2fnSZMmjR07dvz48ePHj/fx8VmwYEGPT3ZI1wpJUUkAKC4uPnXqlHAKea6TkJCwaNEif39/LpdLjKZevXo1EYaJJq47/RuM8/LyXr586enpCQAKCgrJycmd86irq0dHRzMYjObm5vLycuJKv8vR/8uXL5eRkdm3b59I37K+vj6VSiVPA0UK765uXe4XKYrS1NTs/Ni7yPM2khcrMhSrra0NAIiDQcJywsPDdXV1fXx8fHx8WlpaHjx4kJCQkJ6e3mXlxZP8p+m8B/p2t3SJ6BcR//+N0EdGBLku/y2JRJF7Rl0e8p0ThY8I8ce4rq7uu3fviHK6I76dkfzA75GmpiZZLADIyMhQqVTxI6TKy8uPHz9O/D1u3LiQkJBRo0Zt2bJl27Zt4tclXSskXSVramq6uynOZDKJe/ArVqxYsWIFALx+/TokJGTXrl0io/BE9G8wBoDk5OTg4GAdHZ3CwkLhB1hJQUFBDAYjLCwsLi6OPK+5efNm530RExPj6Oi4du3agoIC4ejC4/HYbHZgYGDnwkUufIUR51nEQ9kfUpTIcUIQSZGuhp1JUk5NTY23t7e5ufnUqVMnT55sZ2fn4OAQEhISFxcn+YoIkv80na+/P8JuIV4LMOBPQiMkjAhdxD1LEURic3PzB65C/DHe3t6urKz8IeVLfuD3yM3NTXjyl19+YbFYixcvlnDxP/74Y82aNb/99pudnV2PmaVrhT68kp3l5+e7uLgMGzbMwMCAxWLl5uZ6eHgAwKtXr8Qs1e/BODU1ddu2bYaGhrt37+4yg42NDYvFiomJIVMUFRWNjIyITn9h1dXVvr6+cXFxUVFR69evJ6+Pi4uLraysKisriRsDEiJ6FQwNDYUTpSiqsLDQxsZGV1dX+ISLvH/wITXsTPJyioqKioqKYmJijIyMrly54ufnJ0Uwlvyn6ayvdouYy1/ityspKZFgUxD6SIjXAVlYWHSeZWFhIRAIRMbZSq27Y7ykpMTa2trQ0FD4lT69IsWB33/dVNXV1Xw+nzwP6NWKJGmF+k9hYSF5f3r27NkAIL6Hst8/FMFkMgMDA9evX5+YmNhlhubmZgUFBQUFBTIlICCASqV2mbm2ttbX17egoOCHH36YN28ekZiamgoAmzdv7py/u3KIol6/fj1u3DjhRCmKunLlCoVCWbNmDZliYWFB3K7/kGK7JEk5IgWWl5fX1dWJdABIqFc/jYi+2i3EcIxBgwZ1zkP8dsJPr7m5uc2ZM0c4jyQpCPWhkpKSsrKySZMmEU/NkqZOnWpiYvL48WNirMOHEH+MX758GQCItw5LR4oDX8xxKjkbG5vOY7WcnJxkZGQKCgqkWJEkrdBHMGvWLAcHh/T0dHIrutTvV8YAIP4NHhkZGRMnTjx8+PCJEycAwMnJydvbu66uTrgTXxiLxfriiy9Onz69Z88eBQWF8+fPJyYmuri4uLu76+jonD9/vqKiQltb29zc3NPTMyIigniwqku//fbbkiVLjIyMyDHVUhSVlJTk7u7u4+Ojr6+fnZ09aNAgLy+vhw8fCo9+lLqGIiQpJyMj4+rVq5mZmTU1NWpqavPmzTM2NpbimT/o/U/TH7ulpKSEyWTOnTu3sbGRuIAmH6acPHkym80mxi4Sdu/eLSsrS8R4yVMQ6kMCgWDXrl1Hjx5NSEiIiYl58eJFW1vbxIkTAwICOjo6IiIiPnwV4o/xxMREd3d3T09PeXn55OTkhoYG4lWDZ8+ezcnJkbD83h74Yo5Tyfn5+R05cuT69es5OTm1tbXq6uoMBsPLy0sgEBw5ckSKFUnSCvWHn376KScnh+i0s7GxmTdvXkVFxTfffCN+qY8RjMU7fvy4iYmJu7u7o6MjANTU1KxevXrTpk1GRkbdLdLY2Lh48eKTJ0+GhoYqKSmdOXMmMDBww4YNPj4+U6dOJfJwudzs7Gzxb5A+d+7ckiVL5s2bR/7SPB6vt0XxeLylS5d+9dVXLi4uU6ZMKSkp2bFjh7a2to2NDdmrI0Wx3a2rx3IKCwt9fX3JV7W1tLTExsYKv5RUclL8NMJV7ZPdwuPx1qxZs2XLFn9/f+KsmTj26HS6jY1NXFxcl+PzERpAt27dWrFixdatW4WH4Obm5oaGhvbJ12XEH+MdHR3+/v7bt293d3cn74aWlZVJPjxFigO/u+O0V1JTU5WUlObNm0e+XQsAXr16tX//frKDt1crkqQV6g8UCoX86Xk83q1bt0JCQnp8iz5FV1e3y7EGHxmNRjM2Nm5qaiosLCTfItZbVCrV3NxcVVW1vr6+oqJCks9vnTp1ytTUdMaMGSI3/6UoSlhERMT8+fOnT58uEms/sFgJy5GXlx88eLC2tnZDQ8Pbt2+JESVS65OfhtCHu2XVqlXr1q2bOXMm8SgIQn9DhoaG+vr6xH3iDxwvIkKSY1xZWXnYsGFycnI1NTVSvG2qDw/8XpGXl9fX16fT6R0dHRUVFX2736D7Vqhv6ejoGBoaUiiU0tJSSU6Dmpqa/i7BeKBYWFj88ssvwcHB4h/LE09TU1N4d48aNSopKenNmzezZs3qizr2IzFfPvnwl2n0325RUVG5ffv2pUuXevXtS4TQv80/pXFuamoa+G7qgVVQULBt2zbhJ76lsGfPHjU1tefPn3M4HFNT088++0wgEOzYsaOvKtl/+vX1Vf23W4hPu0gxPhwh9K/yD2qc/+1Xxn1izpw5np6eJiYmampq79+/f/LkyYkTJ7p71/m/B+4WhNDA+qe0QthNjRBCCA2wpqamfn/OGCGEEELiYTBGCCGEBhgGY4QQQmiAYTBGCCGEBhgGY4QQQmiAYTBGCCGEBpisqqqqvLz8QFejB4aGhvPnz29vb6+tre2nVcjJyWlpaXG53C5f/CZJBWg0mre3N3T1jevufITt+vik2A8IIUTqq4ZxwNsiJSUleXl5LpfbY04ul9v3V8YGBgY3bty4cePG0aNHO891dXUl5i5ZskTyMs3MzIKDg62trfuumv9LVlb2iy++SE1Nzc/Pf/DgQX5+/qVLlz7//HORd3JJUgEDA4Pg4GB7e3vJ195jsVpaWq6urpK8J4vc7Tdu3Lh+/fqlS5diY2ODg4OnT58u3fvFJF9155r0dj8ghD4mBweH7hrhTZs23bhxQ+Tbsh9ZXzX4Im2R1G2aSJk3unL8+HEyj7Ky8tq1a+/du/f8+fNnz549ePBg27ZtPX7Htu9fh0mlUk1NTQUCgampqZmZWXFxsfDchQsXDh06lEKh0Gi0Pl91b6moqBw/ftza2rqqqiomJqa6ulpfX9/Z2TksLGzWrFlffvllrz6xwOFwMjMz+/bl42ZmZgcPHjxw4ICYl0gTiN1eX1//+++/A4CCgoKOjs7ixYsDAgLKy8u3bt364MGDflq1iP7YDwihPqSqqmpqatplI0yn001NTRUVFT9+rfqb1G2aMKKlZbPZz58/F04nP8pE1tNgzwAAIABJREFUoVBOnTrFYDD++OOP06dP83i8GTNmBAYG2traenh4iLlK7q93Uz99+nTs2LEeHh7CH+8zNjZmMBg5OTkMBqOf1tsr4eHh1tbW169f37RpExl3v//++x9++MHR0fG///3v119/LXlppaWl5EfNBsrLly9XrlxJTqqpqfn7+69ZsyYmJmbhwoVPnjz5CHX4O+wHhBCSTlxcXENDQ1BQkJg8eXl53bVylpaWDAYjLy/Py8uL+BhgTExMbGysra2to6Pj9evXuyuzv4Ixk8nMyMhwd3f//vvvya8Tenp68ni8ixcvigRjOp1ub29vamqqra3NYrHu3buXmZnZ4yrs7OwMDAxyc3Pz8vIAQFVV1cXFZeTIkVQqtaioKCUlhclkill83LhxLi4u5eXlGzduFP5mX0tLy1dffXXjxo0FCxacPn26sLBQeCkNDQ0PD49hw4ZxOJxff/1V+OukWlpaTk5OL168ePHiBZnY21oJb5dAIJg2bRoAjB49mvzAJ/kJcUlwOJzDhw8zmcyQkJDvvvtu7ty55Czx+3zEiBFiVi1+o7rcDwihfyI9PT17e/snT55UVVV5eHgMHz6czWZfvHiRuLgcPHiwu7u7vr5+eXl5QkICi8USXlZDQ2POnDlDhw5VVFSsr6/Pzc3Nysp6//49mUFZWdnZ2XnUqFEKCgrV1dXZ2dmPHj0SCARkBiUlJXd395EjR7a1tf32229ZWVnC5fcqcIhv04RpaWlJs6f+ZGBgAACZmZnCn+XNyMiwtbXV19cXs2A/frUpOTl5+vTptra2d+7cAQAZGRl3d/fMzMy6ujrhbDQa7e7duxQKhclkcjgcAwODZcuW3bp168svvxT5xrCw1atXb9iw4dq1aykpKQBgaWkZFRVF/CQtLS1eXl5BQUErVqx4+PBhdyV4eHgAQFxcXOev5zY1Nf3000/r1693d3ffs2cPma6vr3/58mVFRcXq6mozM7MlS5bs37//2LFjxFwjI6Pw8PBDhw6RQUiKWglv16JFixYtWgQA9vb2kydPJjL0KhgTzp07t3z58lGjRg0bNow4t+hxn9va2na36h43qvN+QAj9Q1lYWISHhx8/fnz27Nn6+vosFotOpwcEBAQEBCgrKx8+fJgY9KqhoeHl5eXq6srhcIgFJ0yYEBMTo6qqWlZW1tzcrK+vr6mpuWPHjvj4eCKDlZXVkSNHtLW1mUxmY2OjgYHB2rVrFy9efO/ePSIDjUZLSUkxNjauq6uj0+l+fn779u0j29veBg4xbVrfIu7MDhkyRDjR2NiYnNWdfny0KT09ncVieXp6EpNTpkzR19dPTk4Wydbe3h4aGmppaWltbT1jxgwGg5GYmDhjxgxiFFxnsrKyYWFhGzZsiImJWbt2bVtbG51Oj46O7ujo8PX1ZTAY9vb2bm5uHA4nMjJSVVW1u+qNHz8eAO7fv9/lXOIO64QJE4QT/fz8rl+/PnnyZDc3t08//TQ/P3/jxo0TJ07ssoTe1qrzdp08eZIYYREVFTXhT91tjhh8Pp/YTGKTQYJ93t2qpdvVCKF/tKVLl167dm3s2LFTpkzx9fWVlZUNCQkJCwvbtGnThAkTJk2adPToUUNDQyLaETZu3CgjI+Pm5jZ9+nQ3NzdLS8s5c+Y8evSImGtoaHj8+HE5ObnAwEBra2snJ6cxY8YsX768srKSLGHZsmWZmZnjxo2ztbV1cnKqqalZt24dedna28DRV80pQUVFZcRfKSkpEbNyc3NTUlJmz569cuVKQ0NDPT29RYsW+fj43LlzR+TKXkQ/BuOOjo7U1NQZM2aoq6sDgKenJ5vNTktLE8nG4XBiY2PJ7z83NTVt376dw+E4Ozt3LlNJSSk6OtrLyys8PDwsLIx4DCkgIEBDQ2P79u3kxVl+fv6uXbuIsXPdVW/QoEEAUFVV1eVcIl1HR0c4sa6uLiIigjjtqq2t3blzJ4VC8ff377KEXtWqy+3qQ8TIfnK8Rq/2uTDpdjVC6B8tNzd3z549xOCjhw8f3r1718zMLDk5+dq1a0SGyMjItrY2GxsbchF9ff2ysrL8/HwyJS8vj5wMCAhQVVXdv39/RkYGkcLn89PT00tLS8n8+fn5oaGhRM9laWlpfHw8lUq1tLQk5krdiPWJcePG/fJXo0aNIudu3rz5wIEDGzZsuH37dlZW1rfffhsTE7N8+XLhHvjO+rGbGgCSk5P9/PxcXV0vX748c+bMpKSk9vb2ztkoFIqlpeX48eNpNJqcnBwAdHR0iFzmAwCNRktISBg+fHhQUBD5TwAAdnZ2XC63oKBAT0+PQqFQKBQAIM6wxowZc+7cuS7rJiMjAwDdhT0iXeShoFu3bnV0dJCTOTk5dXV15D+HCMlr1d129SFic4hNJki4z6XeKITQ/xvZ2dnCk2/evAEAsj8ZAFpbW2tqaojbpYTc3FwXF5edO3deuHDh2bNnIl3HU6ZM4fP5SUlJYlaalZUlHL2IPl7hCyTpGrHO4uPjhZt6ExMTQ0PDhIQEMoXNZq9evVp4keLi4lOnTgmnCJ9GfPXVVytXrszLy0tPT+fxeHZ2doGBgUpKSjt27BBzodW/wTgvL+/ly5dET7WCgkLnPmoAUFdXj46OZjAYzc3N5eXlxKjmLgfWL1++XEZGZt++fSIRS19fn0qlkmdYIoV3VzcWi6Wjo6Ojo9PQ0NB5LvGT19fXCyd2voyurKwcPXp0l+VLXqvutqtLmpqawscAi8WytbXtcSmiG4AcXiH5Phch3a5GCP2tEEGOOJkWQSSKXMOJDDtta2vrMlG4EQgPD9fV1fXx8fHx8WlpaXnw4EFCQkJ6ejoxV1dX9927d0Q53elypUTQhQ9oxDrT1NQkiwUAGRkZKpUqfhhXTU1Nd/ebHR0dV61alZaWtmrVKiL0HjlyJDw8fOHChbm5uYmJid2V2b/BGACSk5ODg4N1dHQKCwufPXvWOUNQUBCDwQgLC4uLiyPPnm7evNl5X8TExDg6Oq5du7agoID8UQGAx+Ox2ezAwMDOhZOdGJ3l5uYOGzZs4sSJXd5UJ+4EizxJRt4VICkrKwtfKwuTvFbdbVeX2trahE/ZmpubxecnEMPXc3NziUnJ97kI6XY1QuhvhQhdKioqnWcRiRI2LGLU1NR4e3ubm5tPnTp18uTJdnZ2Dg4OISEhcXFxANDe3q6srPwh5UvdiHXm5uYmPPnLL7+wWKzFixdLVzEnJycAiI+PF74Ijo+P9/LycnJyGshgnJqaum3bNkNDw927d3eZwcbGhsVixcTEkCmKiopGRkZNTU0iOaurq319fePi4qKiotavX09eRxYXF1tZWVVWVr57907yil29etXd3d3X1zcpKUnkNFBWVpYY+3716lXhdDMzM+FJBQUFQ0PD7t5uIXmtutsu+LN7WfgEtqWlJTQ0VKIt/JOTk5O5uXlZWRk5vFmSfd551b3aKITQ3xbRallYWHSeZWFhIRAI3r592ycrKioqKioqiomJMTIyunLlip+fHxGMS0pKrK2tDQ0NKyoqpCtZ8sBB6rJN63Nqamrw53U86X/au++wKK62YeBnttF7R1CDqFEkKk3BFrtSAogSBRURjZpYInYwFgTE8ljwEcWGXRHUgOUxBhULoGA0iQoEMBQBAQUWly1sm++P+TLvZlmWoa4m9+/Klcs9c+a0XfbemXNmhpj5Vn76sMsfFFFbW7tgwYLvv/++pV8EPB5PTU1NTU2NTAkODmYymQozv3v3LiAgoKCgYP/+/T4+PkRiamoqQmjNmjXN87dUDkIoPT392bNn9vb2oaGhcpvWrVvXr1+/Bw8e5OTkyKaPHz/e3NycfDl9+nQNDY3mS9La0SqF/UIIEdcJECeZ24FYzbhr1y4cx6Ojo8lfalTGXGHV7RtqAMBH5c8//ywtLXV0dLS3t5dNHzVqVO/evX/55ReFk3dtIveFUF5e/v79e/KWkNevX0cILV++vN3ltylwEDr4dUpRQUEBQmjSpEmyiVOnTiU3taTLj4wRQsrv4JGenu7g4HDgwIGjR48ihCZOnDhz5sz379/LnsSXVV9fP3v27BMnTuzcuVNNTS0xMTEpKcnDw8PX19fY2DgxMbGiosLQ0NDW1tbPzy8mJoa4yrk5HMdXrFhx7ty5JUuWDB069OrVq9XV1ebm5n5+fs7OzgUFBc1Dzrt3706ePLlr167Kysphw4atWrWqtrZWbhqf1NZWNe8XQujPP/+sra319vb+8OEDcTBKXqWnUO/evYm7hrFYLGNjYwcHBzMzMx6Pt27dOtkfDVTGXGHV7RtqAMBHBcfx7du3Hzp06Pz58wkJCa9evWpqanJwcAgODhaLxTExMR2vIj09/ebNmw8fPqyurtbR0fHx8enVqxc5z5qUlOTr6+vn58disS5fvtzQ0GBtbT1p0qRz587JHQIpKb9NgQO1/eu0fRITE+fNmxcUFKShoUEs4Bo9evTs2bP5fP6pU6eU7NgdwVi5I0eO9O7d29fXd9y4cQih6urqb7/9dvXq1VZWVi3t8uHDh7lz5x47diwyMlJDQ+PkyZMLFiwIDQ2dNWvWqFGjiDwikSgrK0v5HZKJe8qsXLnSx8eHvAycw+EkJCTExsaSV6+TTp061atXr7i4OGLp3evXr1esWCF30xmSRCJpa6ua90sikSxdunTt2rXz5s0jZqyVf3osLS1DQkIQQgKBoKGhoaCg4OTJk1evXpW70QqVMVdYdTs6BQD4CKWlpS1atGjdunWy64RfvnwZGRkpe2PBdissLAwICCDvGUmEIvLuyGKxeN68eRs3bvT19SWnbEtLS6kvPWlH4Gjr12n7VFdXBwYGbtu2bebMmeRFz3l5eVu2bFF+0w/MzMxM4TR+NzMyMurVqxeXyy0sLGz3VbZMJtPW1lZbW7uurq6ioqL5rbWU7NinTx8dHZ0PHz4UFRUpufMXQsjQ0PCzzz5rbGwsKCiQnWx2cHC4dOnSnj174uLiOqVVXa0jY/7RdgoA0CY9evSwsLAg5ok7dy0Ii8WytrY2NDRsaGh48+aNwufuaGpq9u3bl8FgVFdXl5eXt7WKTgkcXcTU1JS4zqqyslL2ZiYKcbncjyUY/wP4+Pjs3r173bp1Cq/gAgAAABTicrmqP02tEm16hFarz7/s16/f9OnTvb29BQIBzJsCAABoq39pMO7g86Xl2NjY+Pj4vH79evfu3e/evevEkgEAAPwbwGlqAAAAQJW4XG6XX2cMAAAAAOUgGAMAAAAqBsEYAAAAUDEIxgAAAICKya+mVnKXbQAAAAB0Crml0/LBuKtvog0AAAAAuedUygfjjj/GEgAAAABtAnPGAAAAgIpBMAYAAABUDIIxAAAAoGIQjAEAAAAVg2AMAAAAqBgEYwAAAEDFIBgDAAAAKqYsGIeHh2sMeBcdHS37f/V+tZ3bApFIJBKJEEJSqVQkEkkkEur74jguFArbtMuniEo3/yVDAQAA/0jKgvGeK9+nHSsorX/xU3zeq7cPL/8nJ6f05qZ58cpLlEqljY2NjY2NTU1NcpuEQmFjY6NYLJZN5PP5dDrd29tbIpHw+fwBAwbY29tTbL1EIhEIBI6OjgMHDqS4ixwcx9v6C6CtyAGRw+fzKZZApZtSqVQgENjb2w8ZMqSTGg4AAKCbKAvGP8w5ei718GTXGRvj501xCZj/H7eF3mHbzixstVDpX+bPn99804YNG7788ksyRV1dfdOmTaGhoXQ63dHRcfPmzWPHjm1THyZOnDhs2LA27SLbHj6f36dPH1tb2/aVQLEWbW1tl7/z9PQ8cuQI9UKodHPUqFGjR4/uWGMBAAB0N/nbYcradmZh2rGCH+IXLPPZsePSdz9MO3c0JfqHOUfDwsJaLdfExOTdu3dv3ryxsrIqLy+X3WRqaqqtrU2+ZLFY79+/P3LkCI1Go9FoDx8+fPr0abv70z7u7u4YhhUVFXVdFYMHDz5+/PiLFy9kE+VGBgAAwL+TsmD8w5yjZ1MOfecdue/ymlXT9q88NvXEqky/Vc4Itf4wCUdHRzabffXq1U2bNu3Zs6elbDiOi8Xiffv24TiOYdirV6/++OOPlrIRJ5MxDGMwGHQ6XTYDMfFMZGAymXJbiXPRUqmU2J1GozEYDAzDJBIJMV3922+/IYSEQiFCiMViKdyLxWJhGEaWKZVKxWIxUQ7RNgzD1NTUlIxJbm5ucHBwS+OgpC6K3Wxrse3oAgAAgK4gf5pavTebXKsVefabwK8WH7i6fplPzPZL3xBHxmEBh8n1XIsXL1ZStIeHh1QqzcrK6tu3r8IMOI5zOBw+n0+j0XR1daVSKY/H09DQkMsmFouJGVYajaanpyeRSLhcrq2tLRlX3r17d+HCBYFAwGQyRSIRl8u1sLAgd5dIJI2NjQKBQENDw9jYmMFg8Pn8vn37amtrSyQSIrDdvXv3/v37xKl1f39/2b1oNJqWllZTU5NQKJR94hUxR2tjYyMUColpb3Nzc+UD0pJW66LSzXYU24ldAAAA0BHywdjeZOLBlI23j+S/YefePpJ/OuXgUp/t+1NWf++1f/u1OYt8Nz6vvH1lz9PHxdc2Bx0/enGfkqL79OljZGT0008/eXt7t5THyMgoPz+/rKzs0aNHaWlps2bNqq6u9vPzI4/5cBzn8/kMBiM+Pr6srOzBgwcPHz5MSEiIi4tzdXUl8sTFxfXv3z89Pb2oqOjatWsWFhbFxcVBQUHE1qamJhqNduPGjcLCwpSUlJs3b/7444+7d+/29fVlsVjTp09HCK1cufKPP/7Iy8vLy8vbsGED8bOAxWKdPn26rKzs8ePHiYmJJiYmAoHAwcFBtv25ubmDBg1KT08vKSlJTk6eNGlSSz3lcrnFxcUSGTiOI4So16W8m3K6ogsAAAC6iPxp6pycnMDAwJUxs3atPrPpyIKlPtH7U1Yt/2rX+nOeW6ZfWhw3MtzrQuzl9V85Lv4+OlDC1lVeOnFYduvWraFDhz5//lxuK4Zh6urqBw8eTElJYbPZCCFNTU0NDY2CgoKZM2eeO3cOIdTU1ITj+KZNm8aPH79gwYL09HSEEI1G+/LLLysrK4ly7Ozsrly5cu7cuRkzZggEAk1NTaFQOHTo0NTU1Pr6eqlU2qtXLzs7Oy8vr7y8PGKXgQMHErHw+vXrREpcXNzBgweJfwuFQhzHY2NjHRwcAgICsrOzEUJmZmbl5eXjxo0rKChobGwkcvbs2TMlJSU1NTUwMJDD4TQ/nCU9e/bs2bNnsikDBw6sra2tr6+nWJfybspV1xVdAAAA0EUUrKY+d+Hs+EGBuxLWrZ8dG5u6aoX3fyIuz9w8LWnHrcDNvknnsiLnTQwL3eOPVxu3WjqdTjcwMMjMzBw3bpzCDBwO58SJEzU1NQKBQCAQ1NXVCQSC4uJid3d3IoNYLMYwbN68ef/5z3+ISIwQkkqld+/eLSkpIV6OGTMmPz8/MjJSIBAghD58+IAQqq2tdXJyItpQXFy8fPnyly9fEgEYIZSbm0sG5uaImVRHR8dVq1Y9fvyYOH1NxP7CwkJPT08y54QJEyorK8PDwzkcDkKIy+W2VGa/fv32/F1SUpKdnR31upR3sxu6AAAAoIsoWsAlxXbti4r4IebU9T2rpx+ISpq3zvPU9ltfb/JO/u/dpZtnXJix2lWPY1clrKJSQVNTE4PBSE5OHj16dFpamuwmHMd5PJ5EIqHT6fr6+pqamgih6upqPp/fs2dPMo+JiQmTyUxOTm6pChMTk0ePHpGBliAWi42NjRFCampqvXv3Tk1NRQjRaDQ6nc5gMJhMppI2E+vFFAa5hoYGFxeXixcvEi8tLS3T09OpXKZsZmbm6up6/PhxMiU3N7ekpIR6Xcq72Q1dAAAA0EUUr6aWNjE27169a1Nc0r1DKz3itqb6bPK6sjttzo7AW3M2fDlQa1JObg7FCojFWS9evPDx8ZELxk1NTRKJZMGCBdu2bWtqaiovL+fz+cHBwY2Njerq6mQ2gUBQU1PT/BYismprFdwXjMFgEA1ACB0+fPjdu3cZGRn37t0jFnCRB9YK6evrX7hwoXm6gYGB7HpvOp1eVUXpRwlCqLq6+tKlS+2uCyntZruLbVMXAAAAdIUWL22SsNXX7wk5GvXj+Uc7w92Td9zx3z3r3qp9X4/vP+/s2bNtqkMkEqmpqZ09e7Zfv36///47mS4WizU1NaOjo6Oiok6fPk0cnHE4HF1dXXKlNJ1O//DhAzGj3G7V1dVr1661tbUdNWqUu7t7WFgYh8OZO3fu6dOniQzEhVVkfjqdzmazdXR0FF5RLdeYDh5TtqmuLioWDosBAEC1lF1njGpMFkd5nt2efuhOaKTP/3aeXzZ10MKYndsRUnAJrBLEQq3i4mJra2u5dBzHq6urExISiBRiuRZxLPv/28dgiMXiuLi4Hj16VFRUtKleAhloi4qKiNt6CIXC+vr6oKCg06dPE5tqampkLxMiKo2Nja2srKypqVFYWmfporq6swsAAAA6SNntMIVCod4Hu3mbJ6z+Kv7ET5Fj+szeuTcSSdvzPS6VSjU1Nd+8eSObSFzy+/3339NoNIlEovD6WiaTaWZmdvHiRfKyYJFIxOfz5W5wrQSXyxWJRGKxWCqVEjd5FgqFX375pZ6eHvrrFiLJycnZ2dlCoZC47weTyezRo8elS5dYLBZxkw2xWNzU1NTY2CiRSJTPN7dVF9XVnV0AAADQQa08QrGqqupzjQkhm6eM6D1j065V0ialR9ItI2KeXCKLxbK3t7979y6bzSYW8YaEhNjY2MiuUcIwTCgUTpky5bfffuNyuVwul8/nq6mphYWFOTs7U6xaIpHweLzGxkYulysWi8eMGRMbG3v79m1iq4aGRp8+fTIyMogV3XPmzMEwjMfj+fj4lJaW8vl8LpfL4/FEIlHPnj1PnDhBXt/cKbqoru7sAgAAgA5q/XnGOTk5w638NvznGwlbvdXMCCEajWZvb09Ox8pasWJFTU2Nr68v8RLDsIqKip07d16/fv3+/fulpaUrVqywtra+cuWK7F4SieTXX3/dvn379evXr1+//vTp0z///HPy5MlsNpvBYHh6ei5atEg2P5EYEhJCvNTS0jp79uzdu3dTU1MfPHhQXFx8+vTpxMTEiIgIshlGRkY//vhjaWlpTU3N5s2biUozMjLWr19/8+bNlJSUjIyMkpKSjIwMBoNRWlpK1iJXtZIBuXz5cksZ2leXXDfpdPqIESPWrFnTwWIBAAB0P8zMzEzl93kwMjLq1asXl8stLCwkbqSskKamZt++fRkMRnV1dVsfscBisaytrQ0NDRsaGt68eUP98YVMJtPW1lZbW7uurq6iooK4xpc64mrglujq/u2uKR2sqyVdVCwAAIBOweVyP4pg/M+m/GFQXfroRgAAAB8/LpfbzjlgQB2EWwAAAMq1PmcMAAAAgC4FwRgAAABQMQjGAAAAgIpBMAYAAABUDIIxAAAAoGIQjAEAAAAVg2AMAAAAqBilYMyy4Pj5+XV1UyjCcVwoFHbdU/+6uvxuQKUL/4BuAgDAP0brwZiuL9i++sjjN1eoPJhBIBAQzwVSuFUikTQ2NnbwdozEk5ccHR0HDhzYkXJaIpVKBQKBvb39kCFDuqJ8Kg1oVIT6LTypDJHKuwkAAIDUyh24aGriiDX/ySq4cWTz9ZlrR5qb96+qqlKSn06nC4XCcePGffjw4fnz53JbhUKhVCrdsmWLmpra1q1bO9LuiRMnvn//Pjc3tyOFKIRhmL6+/ty5cysrK3/99ddOL58KqVSqq6srF0otLCy+/vrrb775hmIhVIZo1KhRampqquomAAAAgtJgTMPXfB/+MP/qd/6bDySHH/3hf/N+mMiqsyAe+qu4OAaDxWLdu3dv27ZtcsEYx3GxWKylpTV37tzQ0NDO6kCno9FoPXv2NDMzy8rKUmEzBg8efPz48RcvXsgmtvXxGAAAAD4JyoJx4KzZP786t/P7kxuPzF3mvevkTzH7Vycvj5yF3ui2tAuGYTQarbGxUSqVamhoyJ5ZFYvFOI77+/vzeLw7d+4ghHAcF4lExGOa6HQ6g8HAMIzML5VKxWIxkSgWiyUSCYZhampqZAaRSCQSiYhT4kwmk06nyzVGtnwMw1gsFpXycRwvKCiYO3eubIESiUQkEiGEaDQak8kkflgwmUzZAttXnZLxz83NDQ4OVrhJeV3Uh6hTRkx5mQAAAFrV4pyxs7Pz/aILe1afjT61bKXf3v0poX5u36VmH9227DBdX9mkL/GNf/Xq1SlTpsimE8Fs7ty5KSkpRJDgcDgCgUBLS4vFYvH5fDqdTqP9X3uISU0bGxuhUEhsNTc3X7x4MbH13bt3Fy5cEAgETCZTJBJxuVwLCwvZ6sj5aRqNpqWl1dTUJBQKZZ9P1VL5RHr//v3t7OyInEKhkMvlisViIyMjFoslkUjodLpAIHBxcbGysupgdcrenBa0WhfFIWprsZ3YBQAAALIUB2Nzc/M8btrp7Wl7z4d95xN58Nq6Fd57tl75+usxy+/lX9yyahdNTdxSiXQ6XUtLKyMjY9SoUWQicVDVp08fOzu75ORk4mtdS0vrzp07+fn5d+7cCQ8PZ7PZPXv2lAsYubm5gwYNSk9PLykpSU5OnjRpEpEeFxfXv3//9PT0oqKia9euWVhYFBcXBwUFkdXxeDwWi3X69OmysrLHjx8nJiaamJgIBAIHBwcq5Y8fP378+PHor8VQJiYmz58/f/r0aWpq6sKFCxsbGxFCAQEBgwYN6pTqmuNyucXFxRIZOI63qS7lQySnK7oAAACAIgWnqVksFlvnVfLOrISUvSGe6w+krF/ptzfsjO8Wv0ubkv3+E3Rr76U1a74P37ErBkkVnBpFCBGRIz8/38rKipjmJA6LQ0JCXr16lZeXJxQKcRzfuXOniYmJh4dHQUEBhmHW1ta///77nj17tmyxKT2nAAAgAElEQVTZQhbVs2fPlJSU1NTUwMBADodDHqjZ2dlduXLl3LlzM2bMEAgEmpqaQqFw6NChqamp9fX1RPmxsbEODg4BAQHZ2dkIITMzs/Ly8nHjxhUUFBDRVEn5JGKC/PDhww0NDX5+fjU1NRiGGRoavnv3TjZPZ1VHevbs2bNnz2RTBg4cWFtbW19fT7Eu5UPUvJud3gUAAAAUKToyNn0Xv/H6jYcXZ01ecuT6luU+O3b/uGStV8KOnwK3TEtaf95jw9wDP/5yMHDW7JYKJaYnL1265OvrS6SIRCI6nT59+vTk5GSEkFgsptFovr6+O3bsKCgoQAjhOP7+/XuEUENDw9ChQ8miJkyYUFlZGR4ezuFwEEJcLpdIHzNmTH5+fmRkJHGh1IcPHxBCtbW1Tk5ORPkMBsPR0XHVqlWPHz+WSqVSqbSyshIhVFhY6Onp2Wr5JIlEoqamNmrUqMjIyJqaGqKpRHWkTqyO1K9fvz1/l5SUZGdnR70u5UMkpyu6AAAAgCL5I2O6vmDHqhPZeffmTVt2LjU+PPjgtlPfLJ6wK+p//pu9L998fvzwtxlHr2+LXXM5MGyMs/OonJyc5oUS63rKysp69eqFYRixJmjSpEmampqpqakIIRzHTU1NMQy7efMmuRcxYVxTU+Pk5ESuxLa0tExPT29+4bKJicmjR4+IM7cksVhsbGyM/lq5rTDqNDQ0uLi4XLx4UXn5JBzHzc3NeTze48eP5Zoqm6ezqiOZmZm5uroeP36cTMnNzS0pKaFel/Ihat7NTu8CAAAAiuSD8cKZ34cdmf3DnKNfzrMJD4w/d+PQwskRYUnumzwvx/zsHxv0yHOpfVhAvM/3Dj/MORpx5FuE9JWUfufOHRcXl/T0dIRQSEjIzz//3NDQQGxqamqqqamR/U4nFvEymUwTExMykU6nt3Rlc21trYL+MP5/j/T19S9cuNA8g4GBwR9//EGlfBKXy5XLQzRVVidWR6qurr506VLzdIp1odaGqH3FtqkLAAAAqJD/Xj58+DBCJmFhYQiZRJ1bdPdE0Yr4yRs9kmPS/H9wv3rip21hAfHE1rCwMCWRmMFgaGhoXLt2bfPmzWlpaYaGhmPGjAkJCSG20mg0Npstd4aTOIb77LPPiPOfpHYchNHpdDabraOjExYW1nwrm82mXj6NRqutrZW7+5VcMO7E6lrVprq6qFg4LAYAgM6l7DrjH+YcPXPtvysmHor634wfPC5H/m9abNCjKYsHImSiZC8SjuN8Pv/q1as4js+ePbu6ujojI4PYxGQyJRLJ+fPnjY2NialihJBQKKTRaOPHj9+/f39He8VgiMXi2NjYyspKYqJXtlUKL8ltCZPJFAgEJ0+eNDMzq66uRghJpVJiPVpXVNeqLqqrO7sAAABAjrJ7U287szDQ49vIlK/XT7q47brf2vEXj1zf+sOcoxSLJk6HPn78GMOw2bNnX7lyhTygZDKZBgYGcXFx1tbWEolELBbzeDypVDp//nwTE5P79+93sFdMJrNHjx6XLl1isVjEXS/EYnFTUxNx32wmk0m9KBaLZW5ufurUKSaT2dTUJBAIuFyurq4uQogMUZ1YXXd2rRuKBQAAQIWyYPzDnKOnUvbHLrx349mJ2OAH1385On9K+LYzC6kWTaMR1724urr26tXr8uXL5CYMwxgMhouLy/3797lcLo/HI46eo6Kijhw5Indk1g4YhvF4PB8fn9LSUj6fT1QhEol69ux54sQJV1fXNpUmEAi8vb3fv38vkUh0dXVnzJixdOlShBB5VU/nVtedXevqYgEAAFChLBhHnFzUW3/IV8uHDDad5LVssL3xJM+lX4RO20e9dDqdfuPGjR9//DEnJ6esrEx2U1NTU21t7bFjx65du3b79u2SkpKoqKj9+/fv2bOHyMBgMDw9PRctWiRXpsJ0IpGck0YISSSSjIyM9evX37x5MyUlJSMjo6SkJCMjg8FglJaWKimfTqePGDFizZo1ZIpUKs3Ozl69evVvv/3266+/Ll26NDExESHUu3dvctq73dU1R6PR7O3tZX+7yGlfXXJD1LybndgFAAAAbYKZmZl14n0b5C7AVYg4x0syNTXt2bNnU1NTQUFBU1NTZ7WExGQybW1ttbW16+rqKioq2vEAR7lJU4lEwuPxzMzMfv/99/HjxxOBqhOro66L6urOLgAAAOByuZ0cjBFCRUVFreaxtbXtxBq7Go/HIx+xQNzXE8OwCxcu9OzZc/LkyaptGwAAgE8dl8tt5XnG7fBpBVoqmExmnz59ampqOByOurp6//79IyIi7O3tZc+KAwAAAO3W+cH4n4fJZA4ZMsTPz6937946OjqNjY3Pnz+PiIh4+fKlqpsGAADgn6DzT1MDAAAAgDoul6tsNTUAAAAAugEEYwAAAEDFIBgDAAAAKia/gAseTwsAAAB0NbnVWvLBWPbxhQAAAADoCjweT/alfDCW2wwAAACArgZzxgAAAICKQTAGAAAAVAyCMQAAAKBiEIwBAAAAFYNgDAAAAKgYBGMAAABAxSAYAwAAACpG19bWZrFYFHMvXDTf0Wmoo9PQZ78872DFRkZGM2fORAhVVVV1sKh/DLkxgSECAIB/A5FI1IbnGWMYVl5eEbElYtOWTRiG4TjePM/mzZtHjBixbt26588VRGsHB4eYmJiMjIytW7daWlqGh4fHxsb++uuv7e9BG1laWp48eZJ8KRQKq6qqHj58ePHixaamJrkMOI7z+fyGhoaCgoLHjx+np6dLJBIlpZFKSkq++eYbKg2Q20VuTFQyRAAAAFpC5Ws/JSVFQ0NDLsP+/ftv3LihpGSqwRjDsJ69rKOjYrS1tKOjYnJf5ZWVvmkej7Ozs+fMmePv768wGPv7+9vY2OzZswchxOFwHj58WFpaSrEBnYLJZNrY2NTV1T179gwhpKOj4+Tk9OWXX/r5+c2cOZPH48llUFNTMzY2njt3bnBwcHl5+bp16548eSJXGpvNfvHihWwt1dXVyhvQ0i4qGRMAAAAUUfnat7GxEYlEv/32m2yGVp/7QCkYL1w0v7y8Imrb9p9u3cp6nOk63O3qlR/Df9hgZdXjaPwJ2ZxpaWlsNtvd3T0iIoLP58tu0tDQcHd3Z7PZd+7cQQiVlJQEBwdTqb3T5efnL168mPi3gYFBQkLCoEGDgoKCDh061DwDQkhHR2fevHlLly5NSEgIDAyU+52Rm5vb1o60tIsKxwQAAABFrX7tFxYWtvXLnOoCrogtETo6OllPMlNTrmc9ydTR0YnYEtE8m0gkSk1N1dLSmjJlitymqVOnampqpqSkiEQihJCBgYG/v7+dnZ1sHm1t7a+//nrr1q3R0dHz5883MjIiN+no6Pj7+w8ePJhMMTc39/f3l62IRqPNmDFjxIgRFDuFEKqvr//vf/+LEHJ1dW0pD4fDOXDgwNatW1ks1pYtW6gX3lYKx0SOkiECAADwiaIajDdt2cThcFyHuX3l7ek6zI3D4WzasklhzqSkJISQn5+fXDqRkpycTLy0srKKjo4eP348mcHJyenu3btRUVHu7u4jR44MCwtLS0tzcXEhtvL5/I0bN4aGhpL5fXx8oqOj9+7dS56dt7Oz2759u6OjI8VOEd6/f4+aPc2quYsXL5aXl9vZ2fXt27dN5VPXfEzkKB8iAAAAHwktLS1ra2ttbW2K+Smdpj4afwLDsNxXeT/+mOLnN72R2+jj461wzhghlJeXl5ubO2zYMCsrq/LyciLRysrKxcXl1atXeXl5CqswNTWNj49vamoKCAjIzs5GCA0YMCA+Pv7gwYNjx45tbGwUi8XZ2dnDhw9nsVhCoRAh5Orq2tDQoKen5+jo+OjRI4SQm5sbQigrK4ti5wnOzs4IoYqKCuXZpFLp48ePp0+fPmTIkMLCQjJdS0trwIABsjlLSkrkTtHLaccuiMIQKd8dAABAp2j1O3zw4MHPnz+n0Wg4jr969Wrfvn3p6enKy2zxyHjhovnEf8RLB6chRsaGYeHr2ey6sPD1RsaGDk5DWto3OTkZw7Bp06aRKdOmTcMwjDwsbi44OFhPT2/jxo1EmEEI5eXlbd++3cDAwNPTk0jJzMxUV1d3cnJCCLFYLEdHxwsXLnA4HCIGI4RcXV35fL7CtWOyWCyWubm5ubm5ra3tvHnzli9fjhC6fPmy8r2QzBVHsomDBw++9nfKzzO3bxdEbYgAAAB0NeXf4Q0NDTdu3IiNjd27d+/PP/9sZ2d39OjR6dOnKy9T8ZGx3FVMQx0Hb1gXZmRkeP7iuSPH4q2seqxdvba2ti46JurZUwVX3aSmpq5fv37atGkHDhzAcZwIzEKhMDU1taV2jBw5UiQSFRQUmJubYxiGYRhCqLKyEiFkb29/8eJF9Nchr5ubW2ZmpoODg7q6+oMHD/r27UsEYxaL5eTklJOTIxaLlffZycmJOJImCASCyMjI+/fvK98LISSVShFCNNrffsG8fv36+PHjsiklJSXKy2nHLojaEAEAAOhqyr/Dx4wZI3sd7MiRI0+cOLFx48Zbt24pOYWpIBg3v4oJIWRoaGhqar46dK1IJGYyGWKxRNEp6v+PzWanpaW5u7u7uLg8efKEOGV948aNhoaGlnaxsLBgMpkKD+R1dXWJf+Tn59fX1xOh183NjTgIzszMDA8P19PT+/zzz9XV1TMzM1ts1l+Ki4vPnz+P/rrOOCcn58OHD63uhRAyMTFBCNXX18smVldXX7p0icruHdkFURsiAAAAXU35d7jcHSkePXp069YtIiDevXu3pb3kg3FLVzFdSDy3auXaEwnHb/98e9LEScHzQnJynjQ2tnjhVHJysru7u5+f35MnT+SWbrXUejabvWDBguab2Gw28Q8cx7OysiZPnqyrq+vm5vb06VORSJSRkUGj0YYPHz5w4EBEbcL47du3CQkJrWZrjphdfvnyZTv27TgqQwQAAOBjU1RUhBAyNTVVkkfBkbHsVUwIQ35+0yO2RBw5Fi8Wi39O+/n5L79hGDZndpCFRY+C/MLmuxMePXpUVVU1derU3bt3T5ky5e3btxkZGUra8fr1axcXl8rKypqaGiXZMjMz3d3dJ0yYYG9vv2vXLqKTNTU1bm5uAwcObGhoyM3NVbJ7R0ycONHW1ra0tPTVq1ddVIVyFIcIAADAR8Xa2hq1dtSkYAFXS1cxMRiMiRMmDnUcPHHCRAaD8fZtRb/PW7zIRyqVXrlyRUNDY9++fRoaGleuXCEmXFtCTCevWbOm+SYmk0n+mzgLvWzZMjqdTkb3rKyssWPHfvHFF0+ePFFeS/vQaDQvL69du3bhOB4dHd0VVVBBcYgAAACoSvOrZAcMGODh4SEUCnNycpTsKH9krPAqJiNjwzWr1kokkvnBIXNmBxFzxs7OwxKTlE18Xr58+dtvv3VxccFxvNW1yklJSR4eHr6+vsbGxomJiRUVFYaGhra2tn5+fjExMQ8ePCCylZWVVVRUWFtb19fX5+fnE4lZWVne3t7or1Ddcb17996wYQNCiMViGRsbOzg4mJmZ8Xi8devWEbcPUwmKQwQAAEBVlixZMnLkyLt371ZUVOA4PmjQoK+//prFYu3Zs6e2tlbJjgpOU+M4Xlb6Jix8PbGauqz0jZGxYV1dHYahnKc55uYWVVVvnZ2c6+rqlLeptLQ0JyfH2dk5JyenrKxMeWaJRLJgwYLQ0NBZs2aNGjWKSBSJRFlZWXL3as7MzJwxY0ZWVhZ5lTMZg9t6hXFLLC0tQ0JCEEICgYB4UMTJkyevXr1K3B5EVagPEQAAAJUoKyvr0aMHccUsobKy8uDBg4mJicp3xMzMzBTefIq8wpi4+7Sj81AcxzmcxsI/ivr2t9XR0cYw7Jecjj5IsTkmk2lra6utrV1XV1dRUSEQCDq9ik8dDBEAAHy0MAzr0aOHsbExk8msqamhcrDE5XJbDMZdilhaRrK1te3mBgAAAAAfCS6X24bnGXciiL4AAAAAieqDIgAAAADQRSAYAwAAACoGwRgAAABQMQjGAAAAgIpBMAYAAABUDIIxAAAAoGIQjAEAAAAVg2AMAAAAqBhdW1ubxWJ1f8VGRkYzZ85ECFVVVXV/7R8VuaGAkQEAgH8VkUjUyUfGmzdvvn379tChQxVudXBwuH379ubNmxFClpaW4eHho0eP7twGKGdpaXn7Lz/99NOPP/546tSp8PDw8ePH0+l02Zxt6sjt27djYmIo1ivryJEjqNlQqGRkAAAAqFAnB+Ps7GwbGxt/f3+FW/39/W1sbJ48eYIQ4nA4Dx8+7ObHDTGZTBsbG319/T///LO4uLi+vt7Q0HDu3Lnx8fF37twZNmwYmZN6R4gyLS0tW63X0NCw4u+qq6uRioYCAADAx6OT702dlpbGZrPd3d0jIiL4fL7sJg0NDXd3dzabTTwSuKSkJDg4uHNrpyg/P3/x4sXkSx0dnXnz5i1dujQhISEwMPD58+eoLR2hLjc3V2GXVTgUAAAAPgadfGQsEolSU1O1tLSmTJkit2nq1KmampopKSkikQghZGBg4O/vb2dnJ5tHW1v766+/3rp1a3R09Pz5842MjMhNOjo6/v7+gwcPJlPMzc39/f1lK6LRaDNmzBgxYkSb2szhcA4cOLB161YWi7Vly5a2dqTjFA6FHCUjAwAA4FPX+aupk5KSEEJ+fn5y6URKcnIy8dLKyio6Onr8+PFkBicnp7t370ZFRbm7u48cOTIsLCwtLc3FxYXYyufzN27cGBoaSub38fGJjo7eu3evhoYGkWJnZ7d9+3ZHR8d2NPvixYvl5eV2dnZ9+/ZtU0c6rvlQyFE+MgAAAD51nR+M8/LycnNzhw0bZmVlRSZaWVm5uLi8evUqLy9P4V6mpqbx8fFisTggIMDZ2Xn06NFeXl4cDufgwYPa2toIIbFYnJ2d7ejoSK79dnV1bWhoYDKZZPR1c3NDCGVlZbWj2VKp9PHjxwihIUOGdKQjSmhpaQ34O/JnhBKtjgwAAIBPXZdcZ5ycnIxh2LRp08iUadOmYRim5GgyODhYT09v48aN2dnZREpeXt727dsNDAw8PT2JlMzMTHV1dScnJ4QQi8VydHS8cOECh8MhYjBCyNXVlc/nE5O+7UBeWdSRjigxePDga3+n/NQ0gcrIAAAA+KR1STBOTU0VCoVE3EIIEfFMKBSmpqa2tMvIkSNFIlFBQYG5ubmFhYWlpaWlpWVlZSVCyN7enshDHPISodfBwUFdXf3BgwfZ2dlECovFcnJyevr0qVgsbl+zpVIpQohG+78xaUdHlHj9+nXY35WUlLS6F5WRAQAA8Enr5NXUBDabnZaW5u7u7uLi8uTJE+JM740bNxoaGlraxcLCgslkpqenN9+kq6tL/CM/P7++vp4IvW5ubsRBcGZmZnh4uJ6e3ueff66urp6ZmdnuZpuYmCCE6uvrO9IRJaqrqy9dutTWvaiMDAAAgE9alwRjhFBycrK7u7ufn9+TJ0+orHiSSCRsNnvBggXNN7HZbOIfOI5nZWVNnjxZV1fXzc3t6dOnIpEoIyODRqMNHz584MCBqL0TxgRnZ2eE0MuXLzvSkU5HZWQAAAB80roqGD969Kiqqmrq1Km7d++eMmXK27dvMzIylOR//fq1i4tLZWVlTU2NkmyZmZnu7u4TJkywt7fftWsXQqioqKimpsbNzW3gwIENDQ25ubnta/DEiRNtbW1LS0tfvXrVkY50OoojAwAA4NPVVQ+KkEqlV65c0dDQ2Ldvn4aGxpUrV4gZ2ZYQs7Br1qxpvonJZJL/Js5CL1u2jE6nk0ExKytr7NixX3zxxZMnT5TXohCNRvPy8tq1axeO49HR0XIltLUjnY7iyAAAAPh0ddWRMULo8uXL3377rYuLC47jly9fVp45KSnJw8PD19fX2Ng4MTGxoqLC0NDQ1tbWz88vJibmwYMHRLaysrKKigpra+v6+vr8/HwiMSsry9vbG/0VqlvVu3fvDRs2IIRYLJaxsbGDg4OZmRmPx1u3bp3Cm2q1qSOdjuLIAAAA+HR1YTAuLS3NyclxdnbOyckpKytTnlkikSxYsCA0NHTWrFmjRo0iEkUiUVZWltxNmzMzM2fMmJGVlYXjOJlC/IPihLGlpWVISAhCSCAQNDQ0FBQUnDx58urVq+/fv+94Rzod9ZEBAADwicLMzMy0tLRU3Yz/w2QybW1ttbW16+rqKioqBAKBqlv0sYCRAQCAfyQul9vJwbioqIhKNltb286qEQAAAPikcbncTj5NDVEWAAAAaKuuWk0NAAAAAIogGAMAAAAqBsEYAAAAUDEIxgAAAICKQTAGAAAAVAyCMQAAAKBi8pc2cblclbQDAAAA+PeQu8OHfDAmnukLAAAAgK7D4/FkX8oHY7nNAAAAAOhqMGcMAAAAqBgEYwAAAEDFIBgDAAAAKgbBGAAAAFAxCMYAAACAikEwBgAAAFQMgjEAAACgYvLXGQ8fPnzkyJEYhlHZ+fnz52lpaV3Qqn8aW1vbUaNG3b17t7S0VNVt+ZcyMjL66quvnj9//uuvvzZ/2XV69OgxadKkJ0+e5ObmdmlFCCF9ff1hw4aZm5vTaLQzZ87Y29sPGjTo+vXr9fX1XV016sYhBeAfST4YjxgxIiQkhGIwPnnyZPNgbGlpefLkyWfPnq1fv142ffbs2XPnzi0rK1u5ciWHw+lIoz85gwcPDg8Pf/v27b8kGBOfAYWbbt++vXv37naXbGBgMGLEiPz8/KKiorY2KTw8PDY2lggVci+7Tp8+fcLDw6Oioro6GH/xxRcnTpzQ19eXSqU4jl+8eHHChAmLFi16+vRp9wTjbhtSAP6R5IMxjUZjMplv3rzBMIwIyeQ/SDiOI4QsLS2Jf8hhMpk2NjZVVVWyiUuWLFm1alVhYWFYWNi/LRL/CxGfATab/eLFC7lNHQwMffr02bdv3969e9sajP/xVqxYoaGh4ePj8+rVK+IP882bN9nZ2d12Tz0Oh/Pw4cN/yc9NADqdfDAm/PTTT3IpHh4e8xcvIV8ePxRHvY61a9d+8803v//++/z589lsdjtaCT5Fubm5wcHBqm7Fv0W/fv1ev3798uVLMuXixYsXL17stgaUlJTA2w1AuykOxgihBQsWkP8+duwYjUZjqamTKRTPY9NotK1bt86aNSs7O3vhwoWyj4Tq0aOHp6dnr169mpqafv3115s3b4pEInKrubn56NGjnz9//vbt22nTpvXv35/NZl+9epU4HrK2tvb19bWwsCgvLz9//rzswVa7d0QImZqajh492sbGxtDQsL6+PjMz8+HDh7IZyMLLy8t9fX0HDhzY1NR07969R48eyXV8wIABXl5e+vr6xcXFly9fVjg4ykcAIaSnp/fVV1999tln6urqdXV1L1++fPToUWNjo8LSpk2bxmAoeDf/97//cTgcGxsbJyenzMzM8vJychORmJGRUVFR0cGhaweyusrKSm9v7wEDBlRUVBw+fFhJxwcMGDB27FiE0KBBg/z9/YlyLl26RPxDW1vbw8Nj4MCBTCazqKgoJSWltra2TU1SXgL1d79VI0eOtLS0fPnyJXHumuLfQkv1DhkypF+/fgYGBmKxmBwW0u3bt2V/AX/xxRdTp07V09MjPpm6urouLi7kB6NNnxO5N87AwGDixImvXr169epVW4e0+WegO98OAD4GLQZjhFB9fS1CyMDACCFEo9FY6v8XjGm01pdh0+n03bt3e3l53bt3b9myZQKBgNzk7e29fft2JpNZWlqqq6s7Z86cJUuWBAcHv337lsjQr1+/6OjoI0eOTJkyxcLCor6+3tTUNDg4ODg4WFNT88CBAyKRSCqV6unp+fv7e3p6kqe+272jkZFRRkYGhmG1tbUcDsfS0nLhwoVpaWnfffedRCKRLfzw4cOTJk3q1avX+/fvTU1Ng4KCdu/eTX6DIIQCAwM3b94slUoLCwvHjRsXEhKSnJwsNzitjsDQoUMTEhK0tbVLS0t5PJ6FhYW+vv7WrVvPnDmjcLTDwsI0NTVlU5hMJoZhv/zyC4fDcXJyio6OXrp0qeyXLJG4ZMkS4ku23UPXPkR1R48enTx5srW1dW1tbWVl5eHDh5V0fMSIEXPmzEEIjR49evjw4UQ5RDB2cnKKi4sjfkXx+Xx/f/9ly5YtWrQoOzubYntaLYHiu9+qb7/9NjQ09NatWykpKYjy34KSeidMmBAYGKiurm5pablhwwayIjU1NRaL9eLFCzIYL1y4cO3atWKxuKioaOzYscQnc/HixeQHg/rnpPkbZ2VlFR0dHRsbSwZjikPavKjufDsA+EhQvbSJODIm/2s1GKupqR06dMjLy+v69etLliyRjcT9+vXbsWNHXV2dh4fHhAkThg0btm3bNltb23379skVEhIScuvWrS+++MLNzS0gIIBOp0dERERFRa1evXro0KGOjo6HDh3q0aMH8QXdwR2FQmFkZKSTk9OwYcMmTJjg7OyclJQ0YcKEmTNnyhW+cOHChw8fDh48eMSIERMnTqyurl6xYoWBgQGxtX///ps2bSouLh47dqyXl5ebm1tSUtLChQtlS6AyAqtWraLRaF5eXuPHj/fy8nJycvrqq6+ePn3a0oA7OTkNlDFv3jyxWJyfn19ZWan8neqsMW9OU1OzXzPa2tqyeebPn5+dne3g4DB8+HCiTCUdP3bs2Pz58xFCcXFxQ/+CEDI1NY2PjxeLxQEBAc7OzqNHj/by8uJwOAcPHpSrriXUS1D+7itHp9OjoqJCQ0MTEhKWL1/e1NRE/W9BSb27d+8eOnQoh8N5+fLlUBkJCQmyJQwePHjt2rV//PHHmDFjiE/mqVOn5D6Z1DV/4+RQH9LmRXXP2wHAR0VZTDUwMCIOixFCV69eHTvMifzv5s2byst1dHQcN27c06dPQ0NDxWKx7KagoCAGg7Fjx46CggKEEI7jp06dysjIcHR0JL5bSaNAJxkAAAmWSURBVC9fvty5cydxyi47OzsjI6NPnz6XL1++desWkeHgwYNNTU2urq5ytbdjRw6Hc+rUKfIYgsvlbty4kcPhuLu7yxWel5cXGRlJ/LwoKSk5c+YMk8l0cnIits6dO5dOp0dHRxNHNlKpdO/evbLHGRRHwMLCorS0NC8vj9wrNzdX9qUSNjY2cXFx9fX1Cxcu5PP5VHYhtXvMmxsyZMjNZkaOHCmb582bN+Hh4cRBNjGL0Y6OBwcH6+npbdy4kTxsysvL2759u4GBgaenJ5VeUy9B+buvhIaGRnx8vL+/f3R0dFRUlFQqRW35W2h3vaQ5c+ZgGBYZGVlTU0PUdejQocLCQuolyGr+xsmhPqTNi+qGtwOAj02Lp6mPHTsm+1JTUzMgIID4t1QqPX36tPJyiXNujo6Ofn5+SUlJspucnJwkEolcOL9+/fqIESOcnJyeP39OJmZlZcnmKSsrQwhlZmaSKQKBoLq62tLSUq729u2IYZiTk9OQIUOMjIyI+VexWNyzZ0+5wh89eiS7jPz169cIIWNjY7J3fD7/wYMHZAapVHrr1q1Fixa1aQRevnzp4eGxbdu2K1eu/P777+Sp8lYZGBgcO3ZMTU0tKCiIPNVJXbvHvLnXr1+fOnVKLlF2QhEhlJ6eLte1dnR85MiRIpGooKDA3NycXPxPnBKwt7ensoiJegnK3/2WGBkZnT9/vn///suWLSN/1qC2/C20r15ZDg4OPB7v8ePHsol37tz5/PPPqRdCav7GyaE+pM2L6uq3A4CPkHwwJj733t7eKzZsJBMP7Ij+6aefcFzKZtdjGKarq99quRUVFd99992ZM2eio6MRQrLx2NjYuKamRu7Pj5iOMjExkU2UW4DT1NSkMFFXV1eu9nbsqKurGx8f7+zszOPxysvLiQNKdZlpcuWFk4unjI2Nq6qq5C76kjtXTGUEoqOjzczMZs2aNWvWLD6f/+TJk/Pnz9+9e7d5e2SpqanFx8dbWVktWbJELuxR1O4xb666uvr8+fPK88hdAofa1XELCwsmk5ment58E5V2tqkE5e9+S7755hsajbZ7927ZSIw6/LfQar2y9PX1m492dXU19RJkNS9KDvUhbV5UV78dAHyEFH9qMQxrx9ppOfn5+XPmzGkej8VisYaGhlxmIuwJhcJ2VNQpli1b5uzsHBUVdfr0afLL8eeff27r/JNIJGreO7mlVVRGoLq6eubMmcStu4jbon355ZcRERFKzklgGLZz504HB4fIyMg7d+7IbmrpinDK3eoqzY+u2tFxiUTCZrNl1/+TKF5K1/ESlEtISBg3btzy5csLCgpkf1h059+Cwp9QcinUPyetnrGgPqTNi+rqtwOAj1CLwZippka+JJZrYRiNmEImpruoIOLx2bNno6KicBwnFhWXlJQ4OjoaGxu/f/+ezNmvXz+EkArvGODq6lpfXy+75kVdXd3KykrhfJgSZWVlgwcP1tbWlr0GycbGRjYP9REoKioqKipKSEiwsrK6ceNGUFCQkpi0atUqDw+PM2fONL/7FfHNrq//t1Ma1tbWbepad2qp48RnT+7X4evXr11cXCorK4nZ0HboeAnKVVVVBQQEnD59Oi4u7vvvvyePj7vzb6GwsNDV1dXMzEz2aNjOzk42Tyd+TjoypF39dgDwEVK8gAvDMDqDQf5Ho9F4PN6xv5w4cYL6sXJ+fv7s2bM/fPgQHR3t5+eHECIO2ohlsQQ1NbWAgACJRHL//v0O96ideDyempqamsxPkODg4HYcO965c4dOp5Pz6wghQ0NDuVUnVEZArury8vL379/r6em1VO+MGTMWL1587969yMjI5ltLSkoQQs7OzmSKjo6Oj49PW3rWTZR3nFjmI3cKNzU1FSG0Zs2aVktrScdLaNW7d+8CAgIKCgr2799Pjnx3/i3cuHEDw7ClS5eSKf369Zs0aZJsnk78nHRkSLvh7QDgY9PikfGO8HU0GUFBQRiG4TiO47hUKqV+cIxkzldv374dx/GzZ8/6+/svWLBAKpXevn1bV1f3u+++s7S0PHTokAp/CKenpzs4OBw4cODo0aMIoYkTJ86cOfP9+/dtnX86e/ZsQEDAypUrEUIPHz40MzNbtWpVfX297NlIKiOQnp5+8+bNhw8fVldXE1+IvXr1Im9wIcfKymrbtm18Pv/evXvNA39jY+OLFy9KSkq8vLyqqqoyMzMtLCy++eabxsbGLl3qYmNjs2XLFrnEiooKYoRborzjf/75Z21trbe394cPH4ixOnPmTFJSkoeHh6+vr7GxcWJiYkVFhaGhoa2trZ+fX0xMjOxiupZ0vAQq6uvrZ8+efeLEiZ07d6qpqSUmJnbn30JycrKvr++sWbMsLCyysrJMTEz8/f2zs7NlF8Z34uekI0PaPW8HAB8V+UhDTBp1+oV6eXl5RDyOiYnBcTwwMDAmJmbx4sWLFy9GCPH5/H379h08eLBzK22TI0eO9O7d29fXd9y4cQih6urqb7/9dvXq1VZWVm0qh8vlBgUF7d+/f+3atWvXrsVxPCUl5Zdfftm2bRuZh8fjtToChYWFAQEB5P0F+Xz+qVOndu3apbBSHR0dBoPBYDAiIiLkNk2ePLmxsVEqlS5btiwuLm7RokWLFi0Si8WnTp0qLi5WeBjdWczNzWfPni2X+PLlS+XBWHnHJRLJ0qVL165dO2/ePOL3zZkzZyQSyYIFC0JDQ2fNmjVq1Cgip0gkysrKoniyt+MlUPThw4e5c+ceO3YsMjJSQ0Pj5MmT3fa3IJFIQkJCVq5c6eHh4ebm9ueff27dutXQ0NDV1ZWci+nEz0lHhrTb3g4APh6YmZmZlpYW+Xrs2LHOzs5UbrCF43hubu61a9faXbepqWnPnj2bmpoKCgqIZZAqZ2Rk1KtXLy6XW1hY2Kaj/+ZsbW319fXLysqUHOIoHwEWi2VtbW1oaNjQ0PDmzZu2XjHcHI1G69+/v6am5uvXrz/mhTDt7jiTybS1tdXW1q6rq6uoqJC91Uy3ldA+qvpbiImJmT59+vjx42WDXOd+TjoypKp6OwDoZlwuVz4Yd1Crz9KxtbXtrLoAAG2ir68vG1zt7OySk5PLysomT56swlYBALhcbidfkAexFoCP1s6dO3V0dF68eEE8O2Tq1Kk4jm/dulXV7QIAILq2tjaLxVJ1MwAAXQ7DsP79+xM3YDc2Nn706NH69et/+eUXVbcLgH87kUjUyaepAQAAANAmXC6X6lObAAAAANBFIBgDAAAAKsZALTwBDQAAAADd4/8B7z6ICQzVAo4AAAAASUVORK5CYII="/> +<pattern id="pattern0" patternUnits="userSpaceOnUse" width="644" height="322" patternTransform="matrix(0.8,0,0,0.8,0,0)"> + <use xlink:href="#image23475"/> +</pattern> +</defs> +<g id="surface23471"> +<path style=" stroke:none;fill-rule:nonzero;fill:url(#pattern0);" d="M 0 0 L 515.199219 0 L 515.199219 257.601562 L 0 257.601562 Z M 0 0 "/> +<path style="fill-rule:nonzero;fill:rgb(0%,0%,100%);fill-opacity:0.249989;stroke-width:1.3;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(100%,0%,0%);stroke-opacity:1;stroke-miterlimit:10;" d="M 8.500977 -0.498047 L 638.500977 -0.498047 L 638.500977 80.50293 L 8.500977 80.50293 Z M 8.500977 -0.498047 " transform="matrix(0.8,0,0,0.8,0,0)"/> +<path style="fill-rule:nonzero;fill:rgb(0%,100%,25.000381%);fill-opacity:0.249592;stroke-width:1.3;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(100%,0%,0%);stroke-opacity:1;stroke-miterlimit:10;" d="M 7.5 90.498047 L 638.500977 90.498047 L 638.500977 167.5 L 7.5 167.5 Z M 7.5 90.498047 " transform="matrix(0.8,0,0,0.8,0,0)"/> +</g> +</svg> Modified: de/Effizientes Programmieren mit Geany/index.html 465 lines changed, 465 insertions(+), 0 deletions(-) =================================================================== @@ -0,0 +1,465 @@ +<!doctype html> +<html lang="de"> + + <head> + <meta charset="utf-8"> + + <title>Effizientes Programmieren mit Geany</title> + + <meta name="description" content="Wie kann ich die Funktionen von Geany nutzen, um schnell an mein Ziel zu kommen"> + <meta name="author" content="Frank Lanitz"> + + <meta name="apple-mobile-web-app-capable" content="yes" /> + <meta name="apple-mobile-web-app-status-bar-style" content="black-translucent" /> + + <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no, minimal-ui"> + + <link rel="stylesheet" href="reveal/css/reveal.css"> + <link rel="stylesheet" href="reveal/css/theme/black.css" id="theme"> + +  + <link rel="stylesheet" href="reveal/lib/css/zenburn.css"> + +  + <script> + var link = document.createElement( 'link' ); + link.rel = 'stylesheet'; + link.type = 'text/css'; + link.href = window.location.search.match( /print-pdf/gi ) ? 'reveal/css/print/pdf.css' : 'reveal/css/print/paper.css'; + document.getElementsByTagName( 'head' )[0].appendChild( link ); + </script> + +  + </head> + + <body> +  + <div style="position: absolute; right: 10px; top: 10px;display: block;"><img height="75pt" src="../../img/geany.svg" alt="Logo von Geany"/></div> + + <div class="reveal"> + <div class="slides"> + <section> + <h1>Geany</h1> + <h2>Effizientes Programmieren</h2> + <img src="../../img/geany.svg" width="200px" alt="Geany-Logo"> + <p> + <small>von <a href="mailto:frank@geany.org">Frank Lanitz</a></small> + </p> + </section> + <section> + <section> + <h1>Themen</h1> + </section> + <section> + <ol> + <li>Allgemeines</li> + <li>Syntaxhighlighting</li> + <li>Symbol Browser und standard Seitenleiste</li> + <li>Das Build Menu</li> + <li>Datei-Vorlagen und andere Templates</li> + <li>Codeschnipsel bzw. Snippets</li> + <li>Autovervollständigung und Tag-Dateien</li> + <li>Externe Werkzeuge</li> + <li>Plugins</li> + </ol> + </section> + </section> + <section> + <section> + <h1>Allgemeines</h1> + </section> + <section> + <h3>Zielgruppe/Zielstellung</h3> + <ul> + <li>Aufzeigen von Funktionen, mit denen man effizient (in Geany) programmieren kann</li> + <li>Kein HowTo, wie Geany wie Eclipse oder Visual* funktioniert</li> + <li>Zielgruppe: Nutzer von Geany oder solche, die es werden wollen</li> + <li>Keine Lesung der Dokumentation</li> + </ul> + </section> + <section> + <h3>Über Geany</h3> + <ul> + <li>Editor mit Funktionen einer Entwicklungsumgebung (IDE)</li> + <li>Entwicklung seit 2005</li> + <li>Aktuelle Version 1.24.1 aus April 2014</li> + <li>Ziel: Geringe Systemanforderungen und wenige + Abhängigkeiten zu anderen Paketen</li> + <li>Realisiert in C mit Teilen in C++</li> + <li>Basierend auf Scintilla und Gtk2 (2.24) + bzw. Gtk3 (experimental) </li> + <li>Lizenz: GPLv2+</li> + </ul> + </section> + <section> + <h3>Über mich</h3> + <ul> + <li>Proffesioneller Nerd mit wirtschaftlichen Hintergrund in einer Datenbank-Firma</li> + <li>Nutzer von Geany seit knapp 10 Jahren</li> + <li>Maintainer der Plugins</li> + <li>Übersetzungskoordinator</li> + </ul> + </section> + </section> + <section> + <section> + <h1>Syntaxher-vorherbung</h1> + </section> + <section> + <h3>Syntexhervorhebung</h3> + <ul> + <li>Für mehr als 40 Dateitypen vorhanden</li> + <li>Aus dem Scintilla-Projekt</li> + <li>über sog. Lexer, in C++ geschriebene Klassen</li> + <li>Automatische Erkennung über <ul> + <li>... Dateiendung</li> + <li>... Spezielle Charakteristika z.B. Shebang</li> + </ul></li> + <li>Manuelles Setzen <ul> + <li>... beim Laden </li> + <li>... über Menü</li> + </ul></li> + </ul> + </section> + <section> + <h3>Custom Filetypes</h3> + <ul> + <li>Möglichkeit zur Erweiterung mit eigenen Dateitypen</li> + <li><strong>Einfach:</strong> Neue Konfiguration für existierenden Lexer</li> + <li><strong>Schwieriger:</strong> Eigener Lexer für Scintilla</li> + </ul> + </section> + <section> + <h3>Konfigurationsdateien für Dateitypen</h3> + Darüber können u.a. konfiguriert werden + <ul> + <li>Keywords einer Sprache</li> + <li>Optionen für den Lexer</li> + <li>Zeichen für Auskommentierungen</li> + <li>Farben und Stile für Syntaxhervorhebung</li> + <li>.... </li> + </ul> + </section> + </section> + <section> + <section> + <h1>Symbol-Browser und standard Seitenleiste</h1> + </section> + <section> + <h3>Symbolbrowser</h3> + <ul> + <li>Listet wichtige Variablen, Funktionen auf</li> + <li>Einfache Navigation mit z.B. Maus</li> + <li>Aktualisierung entweder beim Speichern ODER beim Tippen</li> + </ul> + </section> + <section> + <h3>Dokumentenliste</h3> + <ul> + <li>Listet alle geöffneten Dokumente auf</li> + <li>Optional mit kompletten Pfad</li> + </ul> + </section> + </section> + <section> + <section> + <h1>Das Erstellen-Menü</h1> + </section> + <section> + <h3>Inhalte des Erstellen-Menüs</h3> + <ul> + <li>Besteht aus Dateityp-abhängigen und -unabhängigen Einträgen</li> + <li>Kann angepasst werden</li> + <li>Kann Projekt-spezifische Kommandos beinhalten</li> + </ul> + <img src="img/build_menu.svg" alt="Das LaTeX-Build-Menü von Geany"> + </section> + <section> + <h3>Kommandos zum Erstellen konfigurieren</h3> + <img src="img/build_configure_commands.png" alt="Fenster zum Konfigurieren der Build-Kommandos" /> + <p>... oder direkt in der Dateityp-Defintions-Konfigurations-Datei</p> + </section> + <section> + <h3>Erweitertes Beispiel: pylint</h3> + <ul> + <li>Für die Befehle können Filter hinterlegt werden</li> + <li>Gut geeignet, um "Linter" zu inkludieren</li> + <li>Im <a href="http://wiki.geany.org/howtos/check_python_code?s[]=pylint">Wiki</a> gibt eine Anleitung dazu</li> + </ul> + </section> + </section> + <section> + <section> + <h1>Datei-Vorlagen und andere Templates</h1> + </section> + <section> + <h3>Templates</h3> + <ul> + <li>Sparen Arbeit beim Tippen von immer gleichen Sachen</li> + <li>Viele Beispiele vorhanden: <ul> + <li>ChangeLog-Eintrag</li> + <li>Datei-Header</li> + <li>Funktionsbeschreibung</li> + <li>Short GPL notice</li> + <li>Short BSD notice</li> + <li>Datei Templates</li> + </ul></li> + <li>Beispiele können für den Nutzer überschrieben werden</li> + </ul> + </section> + <section> + <h3>Verfügbare Platzhalter (Auswahl)</h3> + <ul> + <li>Name: <code>developer</code></li> + <li>Datum: <code>datetime</code></li> + <li>Dateiname: <code>filename</code></li> + <li>Ausgabe eines Kommandos: <code>command:kommando</code></li> + <li>GPL: <code>gpl</code></li> + </ul> + </section> + <section> + <h3>Datei-Templates</h3> + <ul> + <li>Für oft genutzte Standardaufgaben</li> + <li>Geany stellt eine Auswahl bereit</li> + <li>Eigene Templates ablegen unter <code>~/.config/geany/templates/files</code></li> + </ul> + </section> + </section> + <section> + <section> + <h1>Codeschnipsel bzw. Snippets</h1> + </section> + <section> + <h3>Snippets</h3> + <ul> + <li>Wiederkehrende Textpassagen können mit "Abkürzung" versehen werden</li> + <li>Generische Schnipsel sowie Dateityp-spezifische</li> + <li>Konfiguration über Konfigurationsdatei</li> + <li>Über Werkzeuge-Menü zu erreichen</li> + <li>Beispiele gibt es im <a href="http://wiki.geany.org/snippets/start">Wiki->Snippets</a></li> + </ul> + </section> + + </section> + + <section> + <section> + <h1>Autovervoll-ständigung und Tag-Dateien</h1> + </section> + <section> + <h3>Funktionsweise</h3> + <ul> + <li>Kombination aus statischen Ansatz + aktuelle Sitzung</li> + <li>Konfigurierbar:<ul> + <li>... wieviele Buchstaben für Vorschläge</li> + <li>... häufige Wörter ebenfalls vorgeschlagen werden (LaTeX, HTML)</li> + </ul></li> + <li>Statische "Tags" werden aus Datei geladen</li> + <li>Dateityp-spezifisch</li> + <li>Im <a href="http://wiki.geany.org/tags/start">Wiki->Tags</a> Liste mit vielen verfügbaren Tag-Dateien</li> + </ul> + </section> + <section> + <h3>Tag-Dateien selbst erstellen</h3> + <p>Ein Beispiel für die Geany-Header:</p> + <p><code>geany -g -P geany.c.tags /usr/local/include/geany/*.h</code></p> + </section> + </section> + <section> + <section> + <h1>Externe Werkzeuge</h1> + </section> + <section> + <h3>Externe Werkzeuge</h3> + <ul> + <li>Manches können externe Werkzeuge besser</li> + <li>Verschiedene Möglichkeiten <ul> + <li>Auswahl senden an ... </li> + <li>Kontextaktionen für das aktuelle Wort</li> + </ul></li> + </ul> + </section> + </section> + <section> + <section> + <h1>Sonstige Formatierungs-helferlein</h1> + </section> + <section> + <ul> + <li>Große Zahl vorgefertigter Funktionen <ul> + <li>Automatische Einrückung bei Funktionen</li> + <li>Bearbeiten -> Format</li> + <li>Mit Tastenkürzel zu nutzen</li> + </ul></li> + <li>Rest: -> Externe Werkzeuge</li> + </ul> + </section> + </section> + <section> + <section> + <h1>Plugins</h1> + </section> + <section> + <h3>Pluginschnittstelle</h3> + <ul> + <li>Viele verschiedene Plugins</li> + <li>Schnittstelle in C, Python und Lua</li> + <li>Beispiele: <ul> + <li>GeanyVC</li> + <li>git-changebar</li> + <li>Projekctorganizer</li> + <li>Addons</li> + <li>DevHelp</li> + <li>Webhelper</li> + <li>Scope & Debugger</li> + </ul></li> + </ul> + </section> + <section> + <h3>GeanyVC</h3> + <ul> + <li>Generische Anbindung an z.B. SVN, git, hg, cvs</li> + <li>Unterstützt: <ul> + <li>blame</li> + <li>commit (kein push)</li> + <li>diff (auch mit externen Werkzeug)</li> + <li>Status</li> + <li>rm/add</li> + </ul></li> + </ul> + </section> + <section> + <h3>git-changebar</h3> + <ul> + <li>Neues Plugin (ab 1.25)</li> + <li>Markiert Zeilen, die gegenüber dem git-Stand geändert wurden</li> + </ul> + </section> + <section> + <h3>Project Organizer</h3> + <ul> + <li>Erweitert Geanys Minimalen Projektansatz</li> + <li>Konfigurationsmöglichkeit für im Projekt verwendete Parameter wie + <ul> + <li>Einzug</li> + <li>Zeilenumbruch</li> + </ul> + bereits im Core</li> + <li>Bietet Möglichkeit projektspezifische-Tag-Dateien zu erstellen</li> + <li>Einfachere Navigigation innerhalb des Projektes und Suche</li> + </ul> + </section> + <section> + <h3>Addons (Erweiterungen)</h3> + <ul> + <li>Sammlung von kleinen Erweiterungen</li> + <li>Beispiele: <ul> + <li>XMLTagging</li> + <li>Anzeige von Lesezeichen in der Seitenleiste</li> + <li>Liste mit TODO und Fixme</li> + </ul></li> + </ul> + </section> + <section> + <h3>DevHelp</h3> + <ul> + <li>Bindet DevHelp in Geany ein</li> + <li>Einfacher Zugriff auf die Dokumentation</li> + <li>Integriertes Browserfenster zum "stöbern"</li> + </ul> + </section> + <section> + <h3>Webhelper</h3> + <ul> + <li>(einfacher) Webbrowser im Kontext von Geany</li> + <li>Sehr praktisch bei Entwicklung von Webanwendungen (Django, CSS)</li> + <li>Kann gegebene Seite beim Speichern einer Datei neuladen</li> + <li>Basiert auf WebKit</li> + </ul> + </section> + <section> + <h3>SpellChecker (Rechtschreibprüfung)</h3> + <ul> + <li>Bindet Rechtschreibprüfung ein</li> + <li>Unterstützt Aspell-, Myspell-, Hunspell-, ... Wörterbücher</li> + <li>Kann Fehler beim Tippen markieren</li> + <li>Korrekturvorschläge im Editor-Menü</li> + </ul> + </section> + <section> + <h3>Scope & Debugger</h3> + <ul> + <li>Debuggen von Programmen aus Geany heraus</li> + <li>Anbindungen an gdb</li> + <li>Setzen von Haltepunkte (Breakpoits)</li> + </ul> + </section> + </section> + <section> + <h1>Sonst noch Fragen?</h1> + </section> + <section> + <h1>Resourcen</h1> + Wiki: <a href="https://wiki.geany.org">wiki.geany.org</a><br /> + Homepage: <a href="https://geany.org">geany.org</a> <br /> + Manual: <a href="http://www.geany.org/manual/">geany.org/manual</a> <br/> + Sexy: <a href="http://geany.sexy">geany.sexy</a> <br /> + Github: <a href="https://github.com/geany">github.com/geany</a> <br /> + IRC: #geany @ freenode <br /> + + </section> + <section> + <h3>Kontakt</h3> + <p>Am besten via <a href="http://geany.org">geany.org</a></a></p> + <p>oder gleich noch am Stand</p> + </section> + <section><h2>Bis später!</h2> + <img src="../../img/geany.svg" width="200px" alt="Geany-Logo"></section> + </div> + + </div> + + <script src="reveal/lib/js/head.min.js"></script> + <script src="reveal/js/reveal.js"></script> + + <script> + + // Full list of configuration options available at: + // https://github.com/hakimel/reveal.js#configuration + Reveal.initialize({ + controls: true, + progress: true, + history: true, + center: true, + + transition: 'slide', // none/fade/slide/convex/concave/zoom + + // Optional reveal.js plugins + dependencies: [ + { src: 'reveal/lib/js/classList.js', condition: function() { return !document.body.classList; } }, + { src: 'reveal/plugin/markdown/marked.js', condition: function() { return !!document.querySelector( '[data-markdown]' ); } }, + { src: 'reveal/plugin/markdown/markdown.js', condition: function() { return !!document.querySelector( '[data-markdown]' ); } }, + { src: 'reveal/plugin/highlight/highlight.js', async: true, condition: function() { return !!document.querySelector( 'pre code' ); }, callback: function() { hljs.initHighlightingOnLoad(); } }, + { src: 'reveal/plugin/zoom-js/zoom.js', async: true }, + { src: 'reveal/plugin/notes/notes.js', async: true } + ] + }); + + </script> + + </body> +</html> Modified: de/Effizientes Programmieren mit Geany/reveal/.gitignore 8 lines changed, 8 insertions(+), 0 deletions(-) =================================================================== @@ -0,0 +1,8 @@ +.DS_Store +.svn +log/*.log +tmp/** +node_modules/ +.sass-cache +css/reveal.min.css +js/reveal.min.js Modified: de/Effizientes Programmieren mit Geany/reveal/.travis.yml 5 lines changed, 5 insertions(+), 0 deletions(-) =================================================================== @@ -0,0 +1,5 @@ +language: node_js +node_js: + - 0.10 +before_script: + - npm install -g grunt-cli \ No newline at end of file Modified: de/Effizientes Programmieren mit Geany/reveal/CONTRIBUTING.md 19 lines changed, 19 insertions(+), 0 deletions(-) =================================================================== @@ -0,0 +1,19 @@ +## Contributing + +Please keep the [issue tracker](http://github.com/hakimel/reveal.js/issues) limited to **bug reports**, **feature requests** and **pull requests**. + + +### Personal Support +If you have personal support or setup questions the best place to ask those are [StackOverflow](http://stackoverflow.com/questions/tagged/reveal.js). + + +### Bug Reports +When reporting a bug make sure to include information about which browser and operating system you are on as well as the necessary steps to reproduce the issue. If possible please include a link to a sample presentation where the bug can be tested. + + +### Pull Requests +- Should follow the coding style of the file you work in, most importantly: + - Tabs to indent + - Single-quoted strings +- Should be made towards the **dev branch** +- Should be submitted from a feature/topic branch (not your master) Modified: de/Effizientes Programmieren mit Geany/reveal/Gruntfile.js 174 lines changed, 174 insertions(+), 0 deletions(-) =================================================================== @@ -0,0 +1,174 @@ +/* global module:false */ +module.exports = function(grunt) { + var port = grunt.option('port') || 8000; + // Project configuration + grunt.initConfig({ + pkg: grunt.file.readJSON('package.json'), + meta: { + banner: + '/*!\n' + + ' * reveal.js <%= pkg.version %> (<%= grunt.template.today("yyyy-mm-dd, HH:MM") %>)\n' + + ' * http://lab.hakim.se/reveal-js\n' + + ' * MIT licensed\n' + + ' *\n' + + ' * Copyright (C) 2015 Hakim El Hattab, http://hakim.se\n' + + ' */' + }, + + qunit: { + files: [ 'test/*.html' ] + }, + + uglify: { + options: { + banner: '<%= meta.banner %>\n' + }, + build: { + src: 'js/reveal.js', + dest: 'js/reveal.min.js' + } + }, + + sass: { + core: { + files: { + 'css/reveal.css': 'css/reveal.scss', + } + }, + themes: { + files: { + 'css/theme/black.css': 'css/theme/source/black.scss', + 'css/theme/white.css': 'css/theme/source/white.scss', + 'css/theme/league.css': 'css/theme/source/league.scss', + 'css/theme/beige.css': 'css/theme/source/beige.scss', + 'css/theme/night.css': 'css/theme/source/night.scss', + 'css/theme/serif.css': 'css/theme/source/serif.scss', + 'css/theme/simple.css': 'css/theme/source/simple.scss', + 'css/theme/sky.css': 'css/theme/source/sky.scss', + 'css/theme/moon.css': 'css/theme/source/moon.scss', + 'css/theme/solarized.css': 'css/theme/source/solarized.scss', + 'css/theme/blood.css': 'css/theme/source/blood.scss' + } + } + }, + + autoprefixer: { + dist: { + src: 'css/reveal.css' + } + }, + + cssmin: { + compress: { + files: { + 'css/reveal.min.css': [ 'css/reveal.css' ] + } + } + }, + + jshint: { + options: { + curly: false, + eqeqeq: true, + immed: true, + latedef: true, + newcap: true, + noarg: true, + sub: true, + undef: true, + eqnull: true, + browser: true, + expr: true, + globals: { + head: false, + module: false, + console: false, + unescape: false, + define: false, + exports: false + } + }, + files: [ 'Gruntfile.js', 'js/reveal.js' ] + }, + + connect: { + server: { + options: { + port: port, + base: '.', + livereload: true, + open: true + } + } + }, + + zip: { + 'reveal-js-presentation.zip': [ + 'index.html', + 'css/**', + 'js/**', + 'lib/**', + 'images/**', + 'plugin/**' + ] + }, + + watch: { + options: { + livereload: true + }, + js: { + files: [ 'Gruntfile.js', 'js/reveal.js' ], + tasks: 'js' + }, + theme: { + files: [ 'css/theme/source/*.scss', 'css/theme/template/*.scss' ], + tasks: 'css-themes' + }, + css: { + files: [ 'css/reveal.scss' ], + tasks: 'css-core' + }, + html: { + files: [ 'index.html'] + } + } + + }); + + // Dependencies + grunt.loadNpmTasks( 'grunt-contrib-qunit' ); + grunt.loadNpmTasks( 'grunt-contrib-jshint' ); + grunt.loadNpmTasks( 'grunt-contrib-cssmin' ); + grunt.loadNpmTasks( 'grunt-contrib-uglify' ); + grunt.loadNpmTasks( 'grunt-contrib-watch' ); + grunt.loadNpmTasks( 'grunt-sass' ); + grunt.loadNpmTasks( 'grunt-contrib-connect' ); + grunt.loadNpmTasks( 'grunt-autoprefixer' ); + grunt.loadNpmTasks( 'grunt-zip' ); + + // Default task + grunt.registerTask( 'default', [ 'css', 'js' ] ); + + // JS task + grunt.registerTask( 'js', [ 'jshint', 'uglify', 'qunit' ] ); + + // Theme CSS + grunt.registerTask( 'css-themes', [ 'sass:themes' ] ); + + // Core framework CSS + grunt.registerTask( 'css-core', [ 'sass:core', 'autoprefixer', 'cssmin' ] ); + + // All CSS + grunt.registerTask( 'css', [ 'sass', 'autoprefixer', 'cssmin' ] ); + + // Package presentation to archive + grunt.registerTask( 'package', [ 'default', 'zip' ] ); + + // Serve presentation locally + grunt.registerTask( 'serve', [ 'connect', 'watch' ] ); + + // Run tests + grunt.registerTask( 'test', [ 'jshint', 'qunit' ] ); + +}; Modified: de/Effizientes Programmieren mit Geany/reveal/LICENSE 19 lines changed, 19 insertions(+), 0 deletions(-) =================================================================== @@ -0,0 +1,19 @@ +Copyright (C) 2015 Hakim El Hattab, http://hakim.se + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in +all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +THE SOFTWARE. \ No newline at end of file Modified: de/Effizientes Programmieren mit Geany/reveal/README.md 950 lines changed, 950 insertions(+), 0 deletions(-) =================================================================== @@ -0,0 +1,950 @@ +# reveal.js [![Build Status](https://travis-ci.org/hakimel/reveal.js.svg?branch=master)](https:/… + +A framework for easily creating beautiful presentations using HTML. [Check out the live demo](http://lab.hakim.se/reveal-js/). + +reveal.js comes with a broad range of features including [nested slides](https://github.com/hakimel/reveal.js#markup), [Markdown contents](https://github.com/hakimel/reveal.js#markdown), [PDF export](https://github.com/hakimel/reveal.js#pdf-export), [speaker notes](https://github.com/hakimel/reveal.js#speaker-notes) and a [JavaScript API](https://github.com/hakimel/reveal.js#api). It's best viewed in a modern browser but [fallbacks](https://github.com/hakimel/reveal.js/wiki/Browser-Support) are available to make sure your presentation can still be viewed elsewhere. + + +#### More reading: +- [Installation](#installation): Step-by-step instructions for getting reveal.js running on your computer. +- [Changelog](https://github.com/hakimel/reveal.js/releases): Up-to-date version history. +- [Examples](https://github.com/hakimel/reveal.js/wiki/Example-Presentations): Presentations created with reveal.js, add your own! +- [Browser Support](https://github.com/hakimel/reveal.js/wiki/Browser-Support): Explanation of browser support and fallbacks. + +## Online Editor + +Presentations are written using HTML or Markdown but there's also an online editor for those of you who prefer a graphical interface. Give it a try at [http://slides.com](http://slides.com). + + +## Instructions + +### Markup + +Markup hierarchy needs to be ``<div class="reveal"> <div class="slides"> <section>`` where the ``<section>`` represents one slide and can be repeated indefinitely. If you place multiple ``<section>``'s inside of another ``<section>`` they will be shown as vertical slides. The first of the vertical slides is the "root" of the others (at the top), and it will be included in the horizontal sequence. For example: + +```html +<div class="reveal"> + <div class="slides"> + <section>Single Horizontal Slide</section> + <section> + <section>Vertical Slide 1</section> + <section>Vertical Slide 2</section> + </section> + </div> +</div> +``` + +### Markdown + +It's possible to write your slides using Markdown. To enable Markdown, add the ```data-markdown``` attribute to your ```<section>``` elements and wrap the contents in a ```<script type="text/template">``` like the example below. + +This is based on [data-markdown](https://gist.github.com/1343518) from [Paul Irish](https://github.com/paulirish) modified to use [marked](https://github.com/chjj/marked) to support [Github Flavoured Markdown](https://help.github.com/articles/github-flavored-markdown). Sensitive to indentation (avoid mixing tabs and spaces) and line breaks (avoid consecutive breaks). + +```html +<section data-markdown> + <script type="text/template"> + ## Page title + + A paragraph with some text and a [link](http://hakim.se). + </script> +</section> +``` + +#### External Markdown + +You can write your content as a separate file and have reveal.js load it at runtime. Note the separator arguments which determine how slides are delimited in the external file. The ```data-charset``` attribute is optional and specifies which charset to use when loading the external file. + +When used locally, this feature requires that reveal.js [runs from a local web server](#full-setup). + +```html +<section data-markdown="example.md" + data-separator="^\n\n\n" + data-separator-vertical="^\n\n" + data-separator-notes="^Note:" + data-charset="iso-8859-15"> +</section> +``` + +#### Element Attributes + +Special syntax (in html comment) is available for adding attributes to Markdown elements. This is useful for fragments, amongst other things. + +```html +<section data-markdown> + <script type="text/template"> + - Item 1  + - Item 2  + </script> +</section> +``` + +#### Slide Attributes + +Special syntax (in html comment) is available for adding attributes to the slide `<section>` elements generated by your Markdown. + +```html +<section data-markdown> + <script type="text/template"> +  + Markdown content + </script> +</section> +``` + + +### Configuration + +At the end of your page you need to initialize reveal by running the following code. Note that all config values are optional and will default as specified below. + +```javascript +Reveal.initialize({ + + // Display controls in the bottom right corner + controls: true, + + // Display a presentation progress bar + progress: true, + + // Display the page number of the current slide + slideNumber: false, + + // Push each slide change to the browser history + history: false, + + // Enable keyboard shortcuts for navigation + keyboard: true, + + // Enable the slide overview mode + overview: true, + + // Vertical centering of slides + center: true, + + // Enables touch navigation on devices with touch input + touch: true, + + // Loop the presentation + loop: false, + + // Change the presentation direction to be RTL + rtl: false, + + // Turns fragments on and off globally + fragments: true, + + // Flags if the presentation is running in an embedded mode, + // i.e. contained within a limited portion of the screen + embedded: false, + + // Flags if we should show a help overlay when the questionmark + // key is pressed + help: true, + + // Number of milliseconds between automatically proceeding to the + // next slide, disabled when set to 0, this value can be overwritten + // by using a data-autoslide attribute on your slides + autoSlide: 0, + + // Stop auto-sliding after user input + autoSlideStoppable: true, + + // Enable slide navigation via mouse wheel + mouseWheel: false, + + // Hides the address bar on mobile devices + hideAddressBar: true, + + // Opens links in an iframe preview overlay + previewLinks: false, + + // Transition style + transition: 'default', // none/fade/slide/convex/concave/zoom + + // Transition speed + transitionSpeed: 'default', // default/fast/slow + + // Transition style for full page slide backgrounds + backgroundTransition: 'default', // none/fade/slide/convex/concave/zoom + + // Number of slides away from the current that are visible + viewDistance: 3, + + // Parallax background image + parallaxBackgroundImage: '', // e.g. "'https://s3.amazonaws.com/hakim-static/reveal-js/reveal-parallax-1.jpg'" + + // Parallax background size + parallaxBackgroundSize: '' // CSS syntax, e.g. "2100px 900px" + + +}); +``` + + +The configuration can be updated after initialization using the ```configure``` method: + +```javascript +// Turn autoSlide off +Reveal.configure({ autoSlide: 0 }); + +// Start auto-sliding every 5s +Reveal.configure({ autoSlide: 5000 }); +``` + + +### Dependencies + +Reveal.js doesn't _rely_ on any third party scripts to work but a few optional libraries are included by default. These libraries are loaded as dependencies in the order they appear, for example: + +```javascript +Reveal.initialize({ + dependencies: [ + // Cross-browser shim that fully implements classList - https://github.com/eligrey/classList.js/ + { src: 'lib/js/classList.js', condition: function() { return !document.body.classList; } }, + + // Interpret Markdown in <section> elements + { src: 'plugin/markdown/marked.js', condition: function() { return !!document.querySelector( '[data-markdown]' ); } }, + { src: 'plugin/markdown/markdown.js', condition: function() { return !!document.querySelector( '[data-markdown]' ); } }, + + // Syntax highlight for <code> elements + { src: 'plugin/highlight/highlight.js', async: true, callback: function() { hljs.initHighlightingOnLoad(); } }, + + // Zoom in and out with Alt+click + { src: 'plugin/zoom-js/zoom.js', async: true }, + + // Speaker notes + { src: 'plugin/notes/notes.js', async: true }, + + // Remote control your reveal.js presentation using a touch device + { src: 'plugin/remotes/remotes.js', async: true }, + + // MathJax + { src: 'plugin/math/math.js', async: true } + ] +}); +``` + +You can add your own extensions using the same syntax. The following properties are available for each dependency object: +- **src**: Path to the script to load +- **async**: [optional] Flags if the script should load after reveal.js has started, defaults to false +- **callback**: [optional] Function to execute when the script has loaded +- **condition**: [optional] Function which must return true for the script to be loaded + + +### Presentation Size + +All presentations have a normal size, that is the resolution at which they are authored. The framework will automatically scale presentations uniformly based on this size to ensure that everything fits on any given display or viewport. + +See below for a list of configuration options related to sizing, including default values: + +```javascript +Reveal.initialize({ + + ... + + // The "normal" size of the presentation, aspect ratio will be preserved + // when the presentation is scaled to fit different resolutions. Can be + // specified using percentage units. + width: 960, + height: 700, + + // Factor of the display size that should remain empty around the content + margin: 0.1, + + // Bounds for smallest/largest possible scale to apply to content + minScale: 0.2, + maxScale: 1.0 + +}); +``` + + +### Auto-sliding + +Presentations can be configure to progress through slides automatically, without any user input. To enable this you will need to tell the framework how many milliseconds it should wait between slides: + +```javascript +// Slide every five seconds +Reveal.configure({ + autoSlide: 5000 +}); +``` +When this is turned on a control element will appear that enables users to pause and resume auto-sliding. Alternatively, sliding can be paused or resumed by pressing »a« on the keyboard. Sliding is paused automatically as soon as the user starts navigating. You can disable these controls by specifying ```autoSlideStoppable: false``` in your reveal.js config. + +You can also override the slide duration for individual slides and fragments by using the ```data-autoslide``` attribute: + +```html +<section data-autoslide="2000"> + <p>After 2 seconds the first fragment will be shown.</p> + <p class="fragment" data-autoslide="10000">After 10 seconds the next fragment will be shown.</p> + <p class="fragment">Now, the fragment is displayed for 2 seconds before the next slide is shown.</p> +</section> +``` + +Whenever the auto-slide mode is resumed or paused the ```autoslideresumed``` and ```autoslidepaused``` events are fired. + + +### Keyboard Bindings + +If you're unhappy with any of the default keyboard bindings you can override them using the ```keyboard``` config option: + +```javascript +Reveal.configure({ + keyboard: { + 13: 'next', // go to the next slide when the ENTER key is pressed + 27: function() {}, // do something custom when ESC is pressed + 32: null // don't do anything when SPACE is pressed (i.e. disable a reveal.js default binding) + } +}); +``` + +### Lazy Loading + +When working on presentation with a lot of media or iframe content it's important to load lazily. Lazy loading means that reveal.js will only load content for the few slides nearest to the current slide. The number of slides that are preloaded is determined by the `viewDistance` configuration option. + +To enable lazy loading all you need to do is change your "src" attributes to "data-src" as shown below. This is supported for image, video, audio and iframe elements. + +```html +<section> + <img data-src="image.png"> + <iframe data-src="http://slides.com"> + <video> + <source data-src="video.webm" type="video/webm" /> + <source data-src="video.mp4" type="video/mp4" /> + </video> +</section> +``` + + +### API + +The ``Reveal`` class provides a JavaScript API for controlling navigation and reading state: + +```javascript +// Navigation +Reveal.slide( indexh, indexv, indexf ); +Reveal.left(); +Reveal.right(); +Reveal.up(); +Reveal.down(); +Reveal.prev(); +Reveal.next(); +Reveal.prevFragment(); +Reveal.nextFragment(); +Reveal.toggleOverview(); +Reveal.togglePause(); +Reveal.toggleAutoSlide(); + +// Retrieves the previous and current slide elements +Reveal.getPreviousSlide(); +Reveal.getCurrentSlide(); + +Reveal.getIndices(); // { h: 0, v: 0 } } + +// State checks +Reveal.isFirstSlide(); +Reveal.isLastSlide(); +Reveal.isOverview(); +Reveal.isPaused(); +Reveal.isAutoSliding(); +``` + +### Ready Event + +The 'ready' event is fired when reveal.js has loaded all (synchronous) dependencies and is ready to start navigating. + +```javascript +Reveal.addEventListener( 'ready', function( event ) { + // event.currentSlide, event.indexh, event.indexv +} ); +``` + +### Slide Changed Event + +An 'slidechanged' event is fired each time the slide is changed (regardless of state). The event object holds the index values of the current slide as well as a reference to the previous and current slide HTML nodes. + +Some libraries, like MathJax (see [#226](https://github.com/hakimel/reveal.js/issues/226#issuecomment-10261609)), get confused by the transforms and display states of slides. Often times, this can be fixed by calling their update or render function from this callback. + +```javascript +Reveal.addEventListener( 'slidechanged', function( event ) { + // event.previousSlide, event.currentSlide, event.indexh, event.indexv +} ); +``` + + +### States + +If you set ``data-state="somestate"`` on a slide ``<section>``, "somestate" will be applied as a class on the document element when that slide is opened. This allows you to apply broad style changes to the page based on the active slide. + +Furthermore you can also listen to these changes in state via JavaScript: + +```javascript +Reveal.addEventListener( 'somestate', function() { + // TODO: Sprinkle magic +}, false ); +``` + +### Slide Backgrounds + +Slides are contained within a limited portion of the screen by default to allow them to fit any display and scale uniformly. You can apply full page backgrounds outside of the slide area by adding a ```data-background``` attribute to your ```<section>``` elements. Four different types of backgrounds are supported: color, image, video and iframe. Below are a few examples. + +```html +<section data-background="#ff0000"> + <h2>All CSS color formats are supported, like rgba() or hsl().</h2> +</section> +<section data-background="http://example.com/image.png"> + <h2>This slide will have a full-size background image.</h2> +</section> +<section data-background="http://example.com/image.png" data-background-size="100px" data-background-repeat="repeat"> + <h2>This background image will be sized to 100px and repeated.</h2> +</section> +<section data-background-video="https://s3.amazonaws.com/static.slid.es/site/homepage/v1/homepage-video-edi…"> + <h2>Video. Multiple sources can be defined using a comma separated list.</h2> +</section> +<section data-background-iframe="https://slides.com"> + <h2>Embeds a web page as a background. Note that the page won't be interactive.</h2> +</section> +``` + +Backgrounds transition using a fade animation by default. This can be changed to a linear sliding transition by passing ```backgroundTransition: 'slide'``` to the ```Reveal.initialize()``` call. Alternatively you can set ```data-background-transition``` on any section with a background to override that specific transition. + + +### Parallax Background + +If you want to use a parallax scrolling background, set the two following config properties when initializing reveal.js (the third one is optional). + +```javascript +Reveal.initialize({ + + // Parallax background image + parallaxBackgroundImage: '', // e.g. "https://s3.amazonaws.com/hakim-static/reveal-js/reveal-parallax-1.jpg" + + // Parallax background size + parallaxBackgroundSize: '', // CSS syntax, e.g. "2100px 900px" - currently only pixels are supported (don't use % or auto) + + // This slide transition gives best results: + transition: 'slide' + +}); +``` + +Make sure that the background size is much bigger than screen size to allow for some scrolling. [View example](http://lab.hakim.se/reveal-js/?parallaxBackgroundImage=https%3A%2F%2Fs3.amazonaws.com%2Fhakim-static%2Freveal-js%2Freveal-parallax-1.jpg&parallaxBackgroundSize=2100px%20900px). + + + +### Slide Transitions +The global presentation transition is set using the ```transition``` config value. You can override the global transition for a specific slide by using the ```data-transition``` attribute: + +```html +<section data-transition="zoom"> + <h2>This slide will override the presentation transition and zoom!</h2> +</section> + +<section data-transition-speed="fast"> + <h2>Choose from three transition speeds: default, fast or slow!</h2> +</section> +``` + +Note that this does not work with the page and cube transitions. + + +### Internal links + +It's easy to link between slides. The first example below targets the index of another slide whereas the second targets a slide with an ID attribute (```<section id="some-slide">```): + +```html +<a href="#/2/2">Link</a> +<a href="#/some-slide">Link</a> +``` + +You can also add relative navigation links, similar to the built in reveal.js controls, by appending one of the following classes on any element. Note that each element is automatically given an ```enabled``` class when it's a valid navigation route based on the current slide. + +```html +<a href="#" class="navigate-left"> +<a href="#" class="navigate-right"> +<a href="#" class="navigate-up"> +<a href="#" class="navigate-down"> +<a href="#" class="navigate-prev">  +<a href="#" class="navigate-next">  +``` + + +### Fragments +Fragments are used to highlight individual elements on a slide. Every element with the class ```fragment``` will be stepped through before moving on to the next slide. Here's an example: http://lab.hakim.se/reveal-js/#/fragments + +The default fragment style is to start out invisible and fade in. This style can be changed by appending a different class to the fragment: + +```html +<section> + <p class="fragment grow">grow</p> + <p class="fragment shrink">shrink</p> + <p class="fragment roll-in">roll-in</p> + <p class="fragment fade-out">fade-out</p> + <p class="fragment current-visible">visible only once</p> + <p class="fragment highlight-current-blue">blue only once</p> + <p class="fragment highlight-red">highlight-red</p> + <p class="fragment highlight-green">highlight-green</p> + <p class="fragment highlight-blue">highlight-blue</p> +</section> +``` + +Multiple fragments can be applied to the same element sequentially by wrapping it, this will fade in the text on the first step and fade it back out on the second. + +```html +<section> + <span class="fragment fade-in"> + <span class="fragment@@ Diff output truncated at 100000 characters. @@ -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/talks] 2ab2f8: Update of number of filetypes
by Frank Lanitz 12 May '15

12 May '15

Branch: refs/heads/master Author: Frank Lanitz <frank(a)frank.uvena.de> Committer: Frank Lanitz <frank(a)frank.uvena.de> Date: Tue, 12 May 2015 20:51:37 UTC Commit: 2ab2f851e5c28b4d566315f314369d96502dac12 https://github.com/geany/talks/commit/2ab2f851e5c28b4d566315f314369d96502da… Log Message: ----------- Update of number of filetypes Modified Paths: -------------- de/Geany - die leichtgewichtige Entwicklungsumgebung/index.html Modified: de/Geany - die leichtgewichtige Entwicklungsumgebung/index.html 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -96,7 +96,7 @@ <section> <h3>Syntexhervorhebung</h3> <ul> - <li>Für mehr als 40 Dateitypen vorhanden</li> + <li>Für mehr als 60 Dateitypen vorhanden</li> <li>Aus dem Scintilla-Projekt</li> <li>über sog. Lexer, in C++ geschriebene Klassen</li> <li>Automatische Erkennung; manuelles Setzen <ul> -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/talks] 705f91: Adding date and place
by Frank Lanitz 12 May '15

12 May '15

Branch: refs/heads/master Author: Frank Lanitz <frank(a)frank.uvena.de> Committer: Frank Lanitz <frank(a)frank.uvena.de> Date: Tue, 12 May 2015 20:47:46 UTC Commit: 705f9138b07fe9b07c5bb0376789b0a9f2daa5ff https://github.com/geany/talks/commit/705f9138b07fe9b07c5bb0376789b0a9f2daa… Log Message: ----------- Adding date and place Modified Paths: -------------- de/Effizientes Programmieren mit Geany/index.html de/Geany - die leichtgewichtige Entwicklungsumgebung/index.html Modified: de/Effizientes Programmieren mit Geany/index.html 15 lines changed, 13 insertions(+), 2 deletions(-) =================================================================== @@ -56,7 +56,7 @@ <ol> <li>Allgemeines</li> <li>Syntaxhighlighting</li> - <li>Symbol Browser und Standard Seitenleiste</li> + <li>Symbol Browser und standard Seitenleiste</li> <li>Das Build Menu</li> <li>Datei-Vorlagen und andere Templates</li> <li>Codeschnipsel bzw. Snippets</li> @@ -325,6 +325,7 @@ <li>Addons</li> <li>DevHelp</li> <li>Webhelper</li> + <li>Scope & Debugger</li> </ul></li> </ul> </section> @@ -356,8 +357,10 @@ <ul> <li>Einzug</li> <li>Zeilenumbruch</li> - </ul></li> + </ul> + bereits im Core</li> <li>Bietet Möglichkeit projektspezifische-Tag-Dateien zu erstellen</li> + <li>Einfachere Navigigation innerhalb des Projektes und Suche</li> </ul> </section> <section> @@ -397,6 +400,14 @@ <li>Korrekturvorschläge im Editor-Menü</li> </ul> </section> + <section> + <h3>Scope & Debugger</h3> + <ul> + <li>Debuggen von Programmen aus Geany heraus</li> + <li>Anbindungen an gdb</li> + <li>Setzen von Haltepunkte (Breakpoits)</li> + </ul> + </section> </section> <section> <h1>Sonst noch Fragen?</h1> Modified: de/Geany - die leichtgewichtige Entwicklungsumgebung/index.html 1 lines changed, 1 insertions(+), 0 deletions(-) =================================================================== @@ -47,6 +47,7 @@ <p> <small>von <a href="mailto:frank@geany.org">Frank Lanitz</a></small> </p> + <p>OpenTechSummit 2015</p> </section> <section> <section> -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

← Newer
1
2
3
4
5
6
7
8
9
10
Older →

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits May 2015