summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--doc/man/marco.13
-rw-r--r--src/core/main.c11
2 files changed, 14 insertions, 0 deletions
diff --git a/doc/man/marco.1 b/doc/man/marco.1
index e485bd18..a9a059f9 100644
--- a/doc/man/marco.1
+++ b/doc/man/marco.1
@@ -45,6 +45,9 @@ Turn compositing OFF. You may also use this option to start \fBmarco\fR without
\fB\-\-no\-force\-fullscreen\fR
Do not create fullscreen windows without decorations.
.TP
+\fB\-\-no\-keybindings\fR
+Have all keybindings disabled on startup.
+.TP
\fB\-\-version\fR
Print current version information and exit.
.TP
diff --git a/src/core/main.c b/src/core/main.c
index 8b90f689..651bdc64 100644
--- a/src/core/main.c
+++ b/src/core/main.c
@@ -51,6 +51,7 @@
#include "util.h"
#include "display-private.h"
#include "errors.h"
+#include "keybindings.h"
#include "ui.h"
#include "session.h"
#include "prefs.h"
@@ -211,6 +212,7 @@ typedef struct
gboolean composite;
gboolean no_composite;
gboolean no_force_fullscreen;
+ gboolean no_keybindings;
} MetaArguments;
#ifdef HAVE_COMPOSITE_EXTENSIONS
@@ -298,6 +300,12 @@ meta_parse_options (int *argc, char ***argv,
N_("Don't make fullscreen windows that are maximized and have no decorations"),
NULL
},
+ {
+ "no-keybindings", 0, 0, G_OPTION_ARG_NONE,
+ &my_args.no_keybindings,
+ N_("Have all keybindings disabled on startup"),
+ NULL
+ },
{NULL}
};
GOptionContext *ctx;
@@ -550,6 +558,9 @@ main (int argc, char **argv)
if (meta_args.no_force_fullscreen)
meta_prefs_set_force_fullscreen (FALSE);
+ if (meta_args.no_keybindings)
+ meta_set_keybindings_disabled (TRUE);
+
if (!meta_display_open ())
meta_exit (META_EXIT_ERROR);