Re-commit the rest of the changes which was reverted in the recent 'funny merge'

po/hu.po

@@ -11,7 +11,7 @@ msgstr ""
 "Project-Id-Version: hu\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2005-05-01 20:48+0000\n"
-"PO-Revision-Date: 2005-05-01 22:57+0000\n"
+"PO-Revision-Date: 2005-10-11 19:06+0000\n"
 "Last-Translator: \n"
 "Language-Team:  <en@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -331,6 +331,11 @@ msgid ""
 "kept across ELinks sessions. If disabled all folders will\n"
 "appear unexpanded next time ELinks is run."
 msgstr ""
+"A könyvjelzők mentésekor azt az állapotot is tárolja el, hogy\n"
+"a könyvjelzőkben lévő mappák nyitott vagy összezárt állapotúak\n"
+"voltak, ezzel megmarad a könyvjelző ablak kinézete. Ha ez az\n"
+"opció ki van kapcsolva, az összes mappa be lesz zárva az ELinks\n"
+"következő indításakor."
 
 #: src/bookmarks/bookmarks.c:74
 msgid "Periodic snapshotting"
@@ -708,6 +713,9 @@ msgid ""
 "The ID maps to information that will be used when creating the\n"
 "new instance. You don't want to use it."
 msgstr ""
+"Az ELinks új ablakban való megnyitásához használható. A megadott\n"
+"ID-vel rendelkező példány adatait használja fel az új példány létrehozásához.\n"
+"Ritkán használt opció."
 
 #: src/config/cmdline.c:642
 msgid "Name of directory with configuration file"
@@ -1733,7 +1741,7 @@ msgstr "A linkek sorsz
 
 #: src/config/kbdbind.c:542
 msgid "Toggle plain renderer compression of empty lines"
-msgstr ""
+msgstr "Az üres sorok összevonásának váltogatása"
 
 #: src/config/kbdbind.c:543
 msgid "Toggle wrapping of text"
@@ -2455,6 +2463,10 @@ msgid ""
 "in which links should receive focus when using the keyboard\n"
 "to navigating the document."
 msgstr ""
+"Navigáció a tabindex által megadott sorrend szerint.\n"
+"A HTML elemek TABINDEX attribútuma meghatározza hogy\n"
+"a billentyűzettel történő navigáció során melyik elem milyen\n"
+"sorrendben következzen egymás után."
 
 #: src/config/options.inc:322
 msgid "Number keys select links"

src/config/dialogs.c

@@ -35,6 +35,7 @@
 static void
 toggle_success_msgbox(void *dummy)
 {
+	/* TODO: option_changed() */
 	get_opt_bool("ui.success_msgbox") = !get_opt_bool("ui.success_msgbox");
 	get_opt_rec(config_options, "ui.success_msgbox")->flags |= OPT_TOUCHED;
 }
@@ -306,10 +307,7 @@ check_valid_option(struct dialog_data *dlg_data, struct widget_data *widget_data
 		    option_types[option->type].set(option, chinon)) {
 			struct option *current = option;
 
-			option->flags |= OPT_TOUCHED;
-
-			/* Notify everyone out there! */
-			call_change_hooks(ses, current, option);
+			option_changed(ses, current, option);
 
 			commandline = 0;
 			mem_free(chinon);

src/config/options.c

@@ -956,6 +956,7 @@ toggle_option(struct session *ses, struct option *option)
 
 	/* TODO: call change hooks. --jonas */
 	option->value.number = (number <= option->max) ? number : option->min;
+	option_changed(ses, option, option);
 }
 
 static int
@@ -1009,6 +1010,14 @@ call_change_hooks(struct session *ses, struct option *current, struct option *op
 	}
 }
 
+void
+option_changed(struct session *ses, struct option *current, struct option *option)
+{
+	option->flags |= OPT_TOUCHED;
+	/* Notify everyone out there! */
+	call_change_hooks(ses, current, option);
+}
+
 int
 commit_option_values(struct option_resolver *resolvers,
 		     struct option *root, union option_value *values, int size)

src/config/options.h

@@ -180,6 +180,11 @@ void toggle_option(struct session *ses, struct option *option);
 void call_change_hooks(struct session *ses, struct option *current,
                        struct option *option);
 
+/* Do proper bookkeeping after an option has changed - call this every time
+ * you change an option value. */
+void option_changed(struct session *ses, struct option *current,
+                    struct option *option);
+
 extern int commit_option_values(struct option_resolver *resolvers,
 				struct option *root,
 				union option_value *values, int size);

src/config/options.inc

@@ -1192,6 +1192,10 @@ static struct option_info config_options_info[] = {
 		"sessions", OPT_SORT,
 		N_("Sessions settings.")),
 
+	INIT_OPT_BOOL("ui.sessions", N_("Keep session active"),
+		"keep_session_active", 0, 0,
+		N_("Keep the session active even if the last terminal exits.")),
+
 	INIT_OPT_BOOL("ui.sessions", N_("Auto save session"),
 		"auto_save", 0, 0,
 		N_("Automatically save the session when quitting.\n"

src/dialogs/options.c

@@ -38,6 +38,8 @@ display_codepage(struct terminal *term, void *name_, void *xxx)
 
 	if (opt->value.number != index) {
 		opt->value.number = index;
+		/* TODO: option_changed() (we need to review the hooks
+		 * to handle NULL ses or properly document that stuff). */
 		opt->flags |= OPT_TOUCHED;
 	}
 

src/session/session.c

@@ -760,8 +760,9 @@ setup_first_session(struct session *ses, struct uri *uri)
 	}
 
 	if (!get_opt_bool("config.saving_style_w")) {
-		get_opt_bool("config.saving_style_w") = 1;
-		get_opt_rec(config_options, "config.saving_style_w")->flags |= OPT_TOUCHED;
+		struct option *opt = get_opt_rec(config_options, "config.saving_style_w");
+		opt->value.number = 1;
+		option_changed(ses, opt, opt);
 		if (get_opt_int("config.saving_style") != 3) {
 			info_box(term, 0,
 				 N_("Warning"), ALIGN_CENTER,

src/terminal/draw.c

@@ -40,14 +40,15 @@ get_char(struct terminal *term, int x, int y)
 	return &term->screen->image[x + term->width * y];
 }
 
-/* TODO: Clearify this piece of magic code. --jonas */
 void
 draw_border_cross(struct terminal *term, int x, int y,
 		  enum border_cross_direction dir, struct color_pair *color)
 {
 	static unsigned char border_trans[2][4] = {
-		{ BORDER_SVLINE, BORDER_SRTEE, BORDER_SLTEE, BORDER_SCROSS },
-		{ BORDER_SHLINE, /* ? */ 0xc2, /* ? */ 0xc1, BORDER_SCROSS },
+		/* Used for BORDER_X_{RIGHT,LEFT}: */
+		{ BORDER_SVLINE, BORDER_SRTEE, BORDER_SLTEE },
+		/* Used for BORDER_X_{DOWN,UP}: */
+		{ BORDER_SHLINE, BORDER_SDTEE, BORDER_SUTEE },
 	};
 	struct screen_char *screen_char = get_char(term, x, y);
 	unsigned int d;
@@ -55,12 +56,19 @@ draw_border_cross(struct terminal *term, int x, int y,
 	if (!screen_char) return;
 	if (!(screen_char->attr & SCREEN_ATTR_FRAME)) return;
 
+	/* First check if there is already a horizontal/vertical line, so that
+	 * we will have to replace with a T char. Example: if there is a '|'
+	 * and the direction is right, replace with a '|-' T char.
+	 *
+	 * If this is not the case check if there is a T char and we are adding
+	 * the direction so that we end up with a cross. Example : if there is
+	 * a '|-' and the direction is left, replace with a '+' (cross) char. */
 	d = dir>>1;
 	if (screen_char->data == border_trans[d][0]) {
 		screen_char->data = border_trans[d][1 + (dir & 1)];
 
 	} else if (screen_char->data == border_trans[d][2 - (dir & 1)]) {
-		screen_char->data = border_trans[d][3];
+		screen_char->data = BORDER_SCROSS;
 	}
 
 	set_term_color(screen_char, color, 0,

src/terminal/draw.h

@@ -52,6 +52,8 @@ enum border_char {
 	BORDER_SDRCORNER = 217,
 	BORDER_SLTEE	 = 180, /* => the tee points to the left => -| */
 	BORDER_SRTEE	 = 195,
+	BORDER_SDTEE	 = 194,
+	BORDER_SUTEE	 = 193,
 	BORDER_SVLINE	 = 179,
 	BORDER_SHLINE	 = 196,
 	BORDER_SCROSS	 = 197, /* + */

src/terminal/terminal.c

@@ -15,6 +15,7 @@
 #include "elinks.h"
 
 #include "bookmarks/bookmarks.h"
+#include "config/options.h"
 #include "intl/gettext/libintl.h"
 #include "main/main.h"
 #include "main/object.h"
@@ -161,7 +162,8 @@ destroy_all_terminals(void)
 static void
 check_if_no_terminal(void)
 {
-	program.terminate = list_empty(terminals);
+	program.terminate = list_empty(terminals)
+			    && !get_opt_bool("ui.sessions.keep_session_active");
 }
 
 void

src/viewer/text/search.c

@@ -1330,7 +1330,7 @@ text_typeahead_handler(struct input_line *line, int action_id)
 
 			opt->value.number = (opt->value.number + 1)
 					    % (opt->max + 1);
-			opt->flags |= OPT_TOUCHED;
+			option_changed(ses, opt, opt);
 		}
 		/* Fall thru */