Rework monitors processing for desktop manager.

NEWS

@@ -1,3 +1,10 @@
+Changes on 1.4.0 since 1.3.2:
+
+* Reworked monitors processing for desktop manager. Monitor should remember
+    where it's plugged into config. When monitor is getting plugged off then
+    plugged on again, it will get remembered config back.
+
+
 Changes on 1.3.2 since 1.3.1:
 
 * Fixed case when some keyboard shortcuts stopped working: Alt+Home, Alt+Up.

src/app-config.c

@@ -2,7 +2,7 @@
  *      app-config.c
  *
  *      Copyright 2010 PCMan <[email protected]>
- *      Copyright 2012-2014 Andriy Grytsenko (LStranger) <[email protected]>
+ *      Copyright 2012-2021 Andriy Grytsenko (LStranger) <[email protected]>
  *
  *      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
@@ -643,6 +643,11 @@ void fm_app_config_load_desktop_config(GKeyFile *kf, const char *group, FmDeskto
     g_free(cfg->folder);
     cfg->folder = g_key_file_get_string(kf, group, "folder", NULL);
 
+    g_free(cfg->plug_name);
+    cfg->plug_name = g_key_file_get_string(kf, group, "plug_name", NULL);
+    g_free(cfg->model);
+    cfg->model = g_key_file_get_string(kf, group, "model", NULL);
+
     fm_key_file_get_bool(kf, group, "show_wm_menu", &cfg->show_wm_menu);
     _parse_sort(kf, group, &cfg->desktop_sort_type, &cfg->desktop_sort_by);
 #if FM_CHECK_VERSION(1, 2, 0)
@@ -1063,6 +1068,10 @@ void fm_app_config_save_desktop_config(GString *buf, const char *group, FmDeskto
         g_string_append_printf(buf, "desktop_font=%s\n", cfg->desktop_font);
     if(cfg->folder)
         g_string_append_printf(buf, "folder=%s\n", cfg->folder);
+    if(cfg->plug_name)
+        g_string_append_printf(buf, "plug_name=%s\n", cfg->plug_name);
+    if(cfg->model)
+        g_string_append_printf(buf, "model=%s\n", cfg->model);
     g_string_append_printf(buf, "show_wm_menu=%d\n", cfg->show_wm_menu);
     _save_sort(buf, cfg->desktop_sort_type, cfg->desktop_sort_by);
 #if FM_CHECK_VERSION(1, 2, 0)

src/app-config.h

@@ -2,7 +2,7 @@
  *      app-config.h
  *
  *      Copyright 2010 - 2011 PCMan <[email protected]>
- *      Copyright 2012-2014 Andriy Grytsenko (LStranger) <[email protected]>
+ *      Copyright 2012-2021 Andriy Grytsenko (LStranger) <[email protected]>
  *
  *      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
@@ -68,6 +68,7 @@ typedef struct _FmAppConfigClass        FmAppConfigClass;
 
 typedef struct
 {
+    struct _FmDesktop* desktop; /* where it is used */
     FmWallpaperMode wallpaper_mode;
     char* wallpaper;
     char** wallpapers;
@@ -80,6 +81,8 @@ typedef struct
     GdkColor desktop_shadow;
     char* desktop_font;
     char *folder; /* NULL if default, empty if no icons, else path */
+    char* plug_name;
+    char* model; /* only available in GTK+3 */
     gboolean show_wm_menu;
 #if FM_CHECK_VERSION(1, 0, 2)
     FmSortMode desktop_sort_type;