Implement configuration profiles

All instances of lxterminal invoked with the same --profile=NAME
argument will share one configuration file (lxterminal-NAME.conf)
and one socket.

Based on pull request #128 by foxharp.

Author: ib

man/lxterminal.1

@@ -77,6 +77,11 @@ Set the terminal\*(Aqs title\&. Use comma for multiple tabs\&.
 .RS 4
 Set the terminal\*(Aqs working directory\&.
 .RE
+.PP
+\fB\-\-profile=\fR\fB\fINAME\fR\fR
+.RS 4
+If set, then all instances of lxterminal invoked in the same way will share a config file named lxterminal\-NAME\&.conf\&.
+.RE
 .SH "AUTHOR"
 .PP
 This manual page was written by paulliu
@@ -90,7 +95,7 @@ General Public License, Version 2 any later version published by the Free Softwa
 On Debian systems, the complete text of the GNU General Public License can be found in /usr/share/common\-licenses/GPL\&.
 .SH "FILES"
 .PP
-The configuration file can be found in ~/\&.config/lxterminal/lxterminal\&.conf\&.
+The configuration file lxterminal\&.conf (or lxterminal\-NAME\&.conf) can be found in ~/\&.config/lxterminal/\&.
 .SH "AUTHOR"
 .PP
 \fBYing\-Chun Liu\fR

man/lxterminal.xml

@@ -85,6 +85,16 @@ Except in the <option>--command=</option> form, this must be the last option on
         <listitem>          <para>Set the terminal's working directory.</para>
         </listitem>
       </varlistentry>
+      <varlistentry>
+        <term>
+          <option>--profile=<replaceable>NAME</replaceable></option>
+        </term>
+        <listitem>
+          <para>If set, then all instances of lxterminal invoked in the same way will
+            share a config file named lxterminal-NAME.conf.
+          </para>
+        </listitem>
+      </varlistentry>
     </variablelist>
   </refsect1>
 
@@ -104,6 +114,6 @@ Except in the <option>--command=</option> form, this must be the last option on
 
   <refsect1>    <title>FILES</title>
 
-    <para>The configuration file can be found in ~/.config/lxterminal/lxterminal.conf.</para>
+    <para>The configuration file lxterminal.conf (or lxterminal-NAME.conf) can be found in ~/.config/lxterminal/.</para>
 
   </refsect1></refentry>

src/lxterminal.c

@@ -120,6 +120,7 @@ static gchar usage_display[] = {
     "    --tabs=NAME[,NAME[,NAME[...]]] Set the terminal's title\n"
     "  --working-directory=DIRECTORY    Set the terminal's working directory\n"
     "  --no-remote                      Do not accept or send remote commands\n"
+    "  --profile=NAME                   Use a separate configuration profile\n"
     "  -v, --version                    Version information\n"
 };
 
@@ -863,6 +864,8 @@ static void terminal_window_exit(LXTerminal * terminal, GObject * where_the_obje
 {
     LXTermWindow * lxtermwin = terminal->parent;
 
+    g_free(terminal->profile);
+
     /* If last window, exit main loop. */
     if (lxtermwin->windows->len == 1) {
         gtk_main_quit();
@@ -1541,6 +1544,12 @@ gboolean lxterminal_process_arguments(gint argc, gchar * * argv, CommandArgument
             arguments->working_directory = &argument[20];
         }
 
+        /* --profile=<config-identifier> */
+        else if (strncmp(argument, "--profile=", 10) == 0)
+        {
+            arguments->profile = &argument[10];
+        }
+
     /* --no-remote: Do not accept or send remote commands */
         else if (strcmp(argument, "--no-remote") == 0) {
             arguments->no_remote = TRUE;
@@ -1619,6 +1628,7 @@ LXTerminal * lxterminal_initialize(LXTermWindow * lxtermwin, CommandArguments *
     g_ptr_array_add(lxtermwin->windows, terminal);
     terminal->index = terminal->parent->windows->len - 1;
     terminal->scale = 1.0;
+    terminal->profile = g_strdup(arguments->profile);
     Setting * setting = get_setting();
 
     /* Create toplevel window. */
@@ -1941,11 +1951,11 @@ int main(gint argc, gchar * * argv)
     LXTermWindow * lxtermwin = g_slice_new0(LXTermWindow);
 
     /* Initialize socket.  If we were able to get another LXTerminal to manage the window, exit. */
-    if (!arguments.no_remote && !lxterminal_socket_initialize(lxtermwin, argc, argv))
+    if (!arguments.no_remote && !lxterminal_socket_initialize(lxtermwin, arguments.profile, argc, argv))
         return 0;
 
     /* Load user preferences. */
-    load_setting();
+    load_setting(arguments.profile);
 
     /* Finish initializing the impure area and start the first LXTerminal. */
     lxtermwin->windows = g_ptr_array_new();

src/lxterminal.h

@@ -55,6 +55,7 @@ typedef struct _lxterminal {
     gdouble scale;                  /* Terminal scale */
     glong col;                      /* Saved horizontal size */
     glong row;                      /* Saved vertical size */
+    gchar *profile;                 /* Configuration profile */
 } LXTerminal;
 
 /* Representative of a tab within a toplevel window. */
@@ -87,6 +88,7 @@ typedef struct _command_arguments {
     char * title;               /* Value of -t, -T, --title; points into argument vector */
     char * tabs;                /* Value of --tab; points into argument vector */
     char * working_directory;           /* Value of --working-directory; points into argument vector */
+    char * profile;             /* Value of --profile; points into argument vector */
     gboolean login_shell;           /* Terminal will spawn login shells */
     gboolean no_remote;
 } CommandArguments;

src/preferences.c

@@ -492,7 +492,7 @@ void terminal_preferences_dialog(GtkAction * action, LXTerminal * terminal)
     if (result == GTK_RESPONSE_OK)
     {
         set_setting(setting);
-        save_setting();
+        save_setting(terminal->profile);
         terminal_settings_apply_to_all(terminal);
     }
     else

src/setting.c

@@ -179,7 +179,7 @@ void set_setting(Setting * new_setting)
 }
 
 /* Save settings to configuration file. */
-void save_setting()
+void save_setting(const char *profile)
 {
     int i;
     g_return_if_fail (setting != NULL);
@@ -258,7 +258,8 @@ void save_setting()
 
     /* Convert GKeyFile to text and build path to configuration file. */
     gchar * file_data = g_key_file_to_data(setting->keyfile, NULL, NULL);
-    gchar * config_path = g_build_filename(g_get_user_config_dir(), "lxterminal/lxterminal.conf", NULL);
+    gchar * config_filename = g_strdup_printf("lxterminal%s%s.conf", profile ? "-" : "", profile ? profile : "");
+    gchar * config_path = g_build_filename(g_get_user_config_dir(), "lxterminal", config_filename, NULL);
 
     if ((file_data != NULL) && (config_path != NULL))
     {
@@ -279,6 +280,7 @@ void save_setting()
     /* Deallocate memory. */
     g_free(file_data);
     g_free(config_path);
+    g_free(config_filename);
 }
 
 /* Deep copy settings. */
@@ -338,13 +340,15 @@ void free_setting(Setting ** setting)
 }
 
 /* Load settings from configuration file. */
-Setting * load_setting()
+Setting * load_setting(const char * profile)
 {
     int i;
     gchar * dir = g_build_filename(g_get_user_config_dir(), "lxterminal" , NULL);
     g_mkdir_with_parents(dir, S_IRUSR | S_IWUSR | S_IXUSR);
-    gchar * user_config_path = g_build_filename(dir, "lxterminal.conf", NULL);
+    gchar * config_filename = g_strdup_printf("lxterminal%s%s.conf", profile ? "-" : "", profile ? profile : "");
+    gchar * user_config_path = g_build_filename(dir, config_filename, NULL);
     g_free(dir);
+    g_free(config_filename);
     gchar * system_config_path = g_strdup(PACKAGE_DATA_DIR "/lxterminal/lxterminal.conf");
     gchar * config_path = user_config_path;
 
@@ -564,7 +568,7 @@ Setting * load_setting()
 
     if (need_save)
     {
-        save_setting();
+        save_setting(profile);
     }
     //print_setting();
     return setting;

src/setting.h

@@ -149,8 +149,8 @@ typedef struct _colorpreset {
 } ColorPreset;
 
 extern Setting * get_setting();
-extern void save_setting();
-extern Setting * load_setting();
+extern void save_setting(const char *);
+extern Setting * load_setting(const char *);
 
 /* Utils for chsnge setting through preference */
 extern void set_setting(Setting * setting);

src/unixsocket.c

@@ -35,14 +35,14 @@ typedef struct _client_info {
     int fd;
 } ClientInfo;
 
-static gboolean init(LXTermWindow* lxtermwin, gint argc, gchar** argv);
+static gboolean init(LXTermWindow* lxtermwin, const char *profile, gint argc, gchar** argv);
 static void start_controller(struct sockaddr_un* sock_addr, LXTermWindow* lxtermwin, int fd);
 static void send_msg_to_controller(int fd, gint argc, gchar** argv);
 static gboolean handle_client(GIOChannel* source, GIOCondition condition, LXTermWindow* lxtermwin);
 static void accept_client(GIOChannel* source, LXTermWindow* lxtermwin);
 static gboolean handle_request(GIOChannel* gio, GIOCondition condition, ClientInfo* info);
 
-static gboolean init(LXTermWindow* lxtermwin, gint argc, gchar** argv) {
+static gboolean init(LXTermWindow* lxtermwin, const char *profile, gint argc, gchar** argv) {
     /* Normally, LXTerminal uses one process to control all of its windows.
      * The first process to start will create a Unix domain socket in
      * g_get_user_runtime_dir().  It will then bind and listen on this socket.
@@ -59,12 +59,14 @@ static gboolean init(LXTermWindow* lxtermwin, gint argc, gchar** argv) {
 
     /* Formulate the path for the Unix domain socket. */
 #if GLIB_CHECK_VERSION (2, 28, 0)
-    gchar * socket_path = g_strdup_printf("%s/.lxterminal-socket-%s",
+    gchar * socket_path = g_strdup_printf("%s/.lxterminal-socket%s%s-%s",
             g_get_user_runtime_dir(),
+            profile ? "-" : "", profile ? profile : "",
             gdk_display_get_name(gdk_display_get_default()));
 #else
-    gchar * socket_path = g_strdup_printf("%s/.lxterminal-socket-%s",
+    gchar * socket_path = g_strdup_printf("%s/.lxterminal-socket%s%s-%s",
             g_get_user_cache_dir(),
+            profile ? "-" : "", profile ? profile : "",
             gdk_display_get_name(gdk_display_get_default()));
 #endif
 
@@ -262,6 +264,6 @@ static gboolean handle_request(GIOChannel* gio, GIOCondition condition, ClientIn
     return TRUE;
 }
 
-gboolean lxterminal_socket_initialize(LXTermWindow* lxtermwin, gint argc, gchar** argv) {
-    return init(lxtermwin, argc, argv);
+gboolean lxterminal_socket_initialize(LXTermWindow* lxtermwin, const char *profile, gint argc, gchar** argv) {
+    return init(lxtermwin, profile, argc, argv);
 }

src/unixsocket.h

@@ -21,7 +21,7 @@
 #ifndef LXTERMINAL_UNIXSOCKET_H
 #define LXTERMINAL_UNIXSOCKET_H
 
-extern gboolean lxterminal_socket_initialize(LXTermWindow* lxtermwin, gint argc, gchar** argv);
+extern gboolean lxterminal_socket_initialize(LXTermWindow* lxtermwin, const char *profile, gint argc, gchar** argv);
 
 #endif