Skip to content

Commit

Permalink
FvwmMFL: start by default
Browse files Browse the repository at this point in the history
Make FVWM responsible for starting this module unconditionally.

If a user wishes to change where FvwmMFL puts its socket, the env var
FVWMMFL_SOCKET_PATH must now be set before FVWM starts up.  It won't be
enough to set this in ~/.fvwm/config, unless one issues a `KillModule
FvwmMFL` fist.
  • Loading branch information
ThomasAdam committed Oct 27, 2024
1 parent 9c1110e commit 5322882
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
3 changes: 1 addition & 2 deletions default-config/config
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,6 @@ AddToFunc StartFunction
+ I Test (Init) InitBackground
+ I Module FvwmButtons RightPanel
+ I Module FvwmEvent EventNewDesk
+ I Module FvwmMFL

# Function to set background when fvwm starts
DestroyFunc InitBackground
Expand Down Expand Up @@ -705,4 +704,4 @@ DestroyModuleConfig EventNewDesk:*
# exists, then read it. This allows changes to default-config settings
# without needing a full copy of the default-config. This will also allow
# default-config changes to get used after upgrades (if applicable).
Test (f $[FVWM_USERDIR]/local.config) Read $[FVWM_USERDIR]/local.config
Test (f $[FVWM_USERDIR]/local.config) Read $[FVWM_USERDIR]/local.config
3 changes: 2 additions & 1 deletion fvwm/fvwm3.c
Original file line number Diff line number Diff line change
Expand Up @@ -1280,6 +1280,7 @@ static void SetRCDefaults(void)
{ "ImagePath "FVWM_DATADIR"/default-config/images", "", "" },
{ "SetEnv FVWM_DATADIR "FVWM_DATADIR"", "", "" },
{ "SetEnv FVWM_IS_FVWM3 1", "", "" },
{ "Module FvwmMFL", "", "" },
/* The below is historical -- before we had a default
* configuration which defines these and more.
*/
Expand Down Expand Up @@ -1320,9 +1321,9 @@ static void SetRCDefaults(void)
{ "Key Up M A MenuMoveCursor -1", "", "" },
{ "Key Down M A MenuMoveCursor 1", "", "" },
{ "Mouse 1 MI A MenuSelectItem", "", "" },
{ "Read "FVWM_DATADIR"/ConfigFvwmDefaults", "", "" },
/* don't add anything below */
{ RC_DEFAULTS_COMPLETE, "", "" },
{ "Read "FVWM_DATADIR"/ConfigFvwmDefaults", "", "" },
{ NULL, NULL, NULL }
};

Expand Down

0 comments on commit 5322882

Please sign in to comment.