From 01c363f552ca648e8137466f8acea5d8ba8fd765 Mon Sep 17 00:00:00 2001
From: Stephen Watson <stephen@kerofin.demon.co.uk>
Date: Fri, 20 May 2005 18:52:50 +0000
Subject: [PATCH] r3940: Change the way that ROX-Session runs ROX-Filer.  It
 now uses the -S option to open the default Panel and Pinboard, with the
 configuration of panel and pinboard in ROX-Filer options.

---
 ROX-Filer/Help/Changes        |  6 ++++
 ROX-Filer/Options.xml         | 26 ++++++++++++++++
 ROX-Filer/src/Docs/Manual.xml |  4 +++
 ROX-Filer/src/main.c          | 69 +++++++++++++++++++++++++++++++++++++++++--
 4 files changed, 103 insertions(+), 2 deletions(-)

diff --git a/ROX-Filer/Help/Changes b/ROX-Filer/Help/Changes
index d3785d8c..fced3b14 100644
--- a/ROX-Filer/Help/Changes
+++ b/ROX-Filer/Help/Changes
@@ -2,6 +2,12 @@
 			A RISC OS-like filer for X
 			by Thomas Leonard
 
+20-May-2005
+~~~~~~~~~~~
+Change the way that ROX-Session runs ROX-Filer.  It now uses the -S option to
+open the default Panel and Pinboard, with the configuration of panel and 
+pinboard in ROX-Filer options (Stephen Watson).
+
 13-May-2005
 ~~~~~~~~~~~
 Type changes for 64-bit compatibility (Tony Houghton).
diff --git a/ROX-Filer/Options.xml b/ROX-Filer/Options.xml
index d1c95b02..7186a162 100644
--- a/ROX-Filer/Options.xml
+++ b/ROX-Filer/Options.xml
@@ -224,6 +224,32 @@
       </hbox>
     </frame>
   </section>
+
+  <section title='ROX-Session'>
+    <label help='1'>When run by the ROX-Session program the filer will open up a panel and/or the pinboard.  Here you configure which.</label>
+
+    <radio-group name='session_panel_or_pin'>
+      <radio label='Panel only' value='0'>Only a panel is shown</radio>
+      <radio label='Pinboard only' value='1'>Only the pinboard is shown</radio>
+      <radio label='Panel and pinboard' value='2'>Both a panel and a pinboard are shown</radio>
+    </radio-group>
+
+    <frame label='Panel'>
+      <radio-group name='session_panel_position'>
+        <radio label='Top panel' value='0'>The panel is shown at the top of the screen</radio>
+        <radio label='Bottom panel' value='1'>The panel is shown at the bottom of the screen</radio>
+        <radio label='Left panel' value='2'>The panel is shown at the left hand side of the screen</radio>
+        <radio label='Right panel' value='3'>The panel is shown at the right hand side of the screen</radio>
+      </radio-group>
+      <entry name='session_panel_name'>Enter the name of the panel to show here.</entry>
+    </frame>
+
+    <frame label='Pinboard'>
+      <entry name='session_pinboard_name'>Enter the name of the pinboard to show here.</entry>
+    </frame>
+
+    <label help='1'>Changes here take effect the next time the filer is run.</label>
+  </section>
   
   <section title='Action windows'>
     <label help='1'>Action windows appear when you start a background
diff --git a/ROX-Filer/src/Docs/Manual.xml b/ROX-Filer/src/Docs/Manual.xml
index 485bf04f..0e94328e 100644
--- a/ROX-Filer/src/Docs/Manual.xml
+++ b/ROX-Filer/src/Docs/Manual.xml
@@ -3016,6 +3016,10 @@ $ rehash</screen>
        <listitem><para>open a directory showing FILE.
       </para></listitem></varlistentry>
 
+      <varlistentry><term><option>-S</option></term><term><option>--rox-session</option></term>
+       <listitem><para>run under ROX-Session, open the default panel and pinboard (implies --new).
+      </para></listitem></varlistentry>
+
       <varlistentry><term><option>-t</option></term><term><option>--top=PANEL</option></term>
        <listitem><para>open PANEL as a top-edge panel.
       </para></listitem></varlistentry>
diff --git a/ROX-Filer/src/main.c b/ROX-Filer/src/main.c
index 4392d5ea..8b87274e 100644
--- a/ROX-Filer/src/main.c
+++ b/ROX-Filer/src/main.c
@@ -128,6 +128,7 @@ GtkTooltips *tooltips = NULL;
        "  -r, --right=PANEL	open PAN as a right-edge panel\n"	\
        "  -R, --RPC		invoke method call read from stdin\n"	\
        "  -s, --show=FILE	open a directory showing FILE\n"	\
+       "  -S, --rox-session	use default panel and pinboard options, and -n\n"\
        "  -t, --top=PANEL	open PANEL as a top-edge panel\n"	\
        "  -u, --user		show user name in each window \n"	\
        "  -v, --version		display the version information and exit\n"   \
@@ -135,7 +136,7 @@ GtkTooltips *tooltips = NULL;
        "\nReport bugs to " BUGS_TO ".\n"		\
        "Home page (including updated versions): http://rox.sourceforge.net/\n")
 
-#define SHORT_OPS "c:d:t:b:l:r:op:s:hvnux:m:D:R"
+#define SHORT_OPS "c:d:t:b:l:r:op:s:hvnux:m:D:RS"
 
 #ifdef HAVE_GETOPT_LONG
 static struct option long_opts[] =
@@ -153,6 +154,7 @@ static struct option long_opts[] =
 	{"new", 0, NULL, 'n'},
 	{"RPC", 0, NULL, 'R'},
 	{"show", 1, NULL, 's'},
+	{"rox-session", 0, NULL, 'S'},
 	{"examine", 1, NULL, 'x'},
 	{"close", 1, NULL, 'D'},
 	{"mime-type", 1, NULL, 'm'},
@@ -164,6 +166,17 @@ static struct option long_opts[] =
 /* Take control of panels away from WM? */
 Option o_override_redirect;
 
+/* Options used when we are called by ROX-Session */
+enum {
+	SESSION_PANEL_ONLY,
+	SESSION_PINBOARD_ONLY,
+	SESSION_BOTH,
+};
+Option o_session_panel_or_pin;
+Option o_session_panel_position;
+Option o_session_panel_name;
+Option o_session_pinboard_name;
+
 /* Always start a new filer, even if one seems to be already running */
 gboolean new_copy = FALSE;
 
@@ -183,6 +196,7 @@ static void child_died(int signum);
 static void child_died_callback(void);
 static void wake_up_cb(gpointer data, gint source, GdkInputCondition condition);
 static void xrandr_size_change(GdkScreen *screen, gpointer user_data);
+static void add_default_panel_and_pinboard(xmlNodePtr body);
 
 /****************************************************************
  *			EXTERNAL INTERFACE			*
@@ -314,6 +328,15 @@ int main(int argc, char **argv)
 
 	option_add_int(&o_override_redirect, "override_redirect", FALSE);
 
+	option_add_int(&o_session_panel_or_pin, "session_panel_or_pin",
+		       SESSION_BOTH);
+	option_add_int(&o_session_panel_position, "session_panel_position",
+		       PANEL_BOTTOM);
+	option_add_string(&o_session_panel_name, "session_panel_name",
+			  "Default");
+	option_add_string(&o_session_pinboard_name, "session_pinboard_name",
+			  "Default");
+
 	/* The idea here is to convert the command-line arguments
 	 * into a SOAP RPC.
 	 * We attempt to invoke the call on an already-running copy of
@@ -419,7 +442,7 @@ int main(int argc, char **argv)
 						 c == 'r' ? "Right" :
 						 c == 't' ? "Top" :
 						 c == 'b' ? "Bottom" :
-						 "Unkown");
+						 "Unknown");
 				break;
 			case 'p':
 				soap_add(body, "Pinboard",
@@ -447,6 +470,12 @@ int main(int argc, char **argv)
 				if (!soap_rpc)
 					g_error("Invalid XML in RPC");
 				break;
+
+		        case 'S':
+				new_copy = TRUE;
+				add_default_panel_and_pinboard(body);
+				break;
+
 			default:
 				printf(_(USAGE));
 				return EXIT_FAILURE;
@@ -752,3 +781,39 @@ static void xrandr_size_change(GdkScreen *screen, gpointer user_data)
 	panel_update_size();
 	pinboard_update_size();
 }
+
+static void add_default_panel_and_pinboard(xmlNodePtr body)
+{
+	char *name, *side;
+
+
+	if(o_session_panel_or_pin.int_value != SESSION_PANEL_ONLY)
+	{
+		name=o_session_pinboard_name.value;
+		if(!name[0])
+			name="Default";
+		soap_add(body, "Pinboard","Name", name, NULL, NULL);
+	}
+					
+	if(o_session_panel_or_pin.int_value != SESSION_PINBOARD_ONLY)
+	{
+		name=o_session_panel_name.value;
+		if(!name[0])
+			name="Default";
+		
+		switch(o_session_panel_position.int_value) {
+		case PANEL_TOP: side="Top"; break;
+		case PANEL_BOTTOM: side="Bottom"; break;
+		case PANEL_LEFT: side="Left"; break;
+		case PANEL_RIGHT: side="Right"; break;
+
+		default:
+			side="Unknown";
+			break;
+		}
+		
+		soap_add(body, "Panel", "Name", name, "Side", side);
+	}
+
+}
+
-- 
2.11.4.GIT