Introduce --get_socketpath and --force_xinerama as synonyms for --get-socketpath and --force-xinerama

This commit is contained in:
Michael Stapelberg 2011-10-23 19:41:40 +01:00
parent c2d04116d4
commit a512b99a51
1 changed files with 6 additions and 2 deletions

View File

@ -215,8 +215,10 @@ int main(int argc, char *argv[]) {
{"layout", required_argument, 0, 'L'}, {"layout", required_argument, 0, 'L'},
{"restart", required_argument, 0, 0}, {"restart", required_argument, 0, 0},
{"force-xinerama", no_argument, 0, 0}, {"force-xinerama", no_argument, 0, 0},
{"force_xinerama", no_argument, 0, 0},
{"disable-signalhandler", no_argument, 0, 0}, {"disable-signalhandler", no_argument, 0, 0},
{"get-socketpath", no_argument, 0, 0}, {"get-socketpath", no_argument, 0, 0},
{"get_socketpath", no_argument, 0, 0},
{0, 0, 0, 0} {0, 0, 0, 0}
}; };
int option_index = 0, opt; int option_index = 0, opt;
@ -266,7 +268,8 @@ int main(int argc, char *argv[]) {
/* DEPRECATED, ignored for the next 3 versions (3.e, 3.f, 3.g) */ /* DEPRECATED, ignored for the next 3 versions (3.e, 3.f, 3.g) */
break; break;
case 0: case 0:
if (strcmp(long_options[option_index].name, "force-xinerama") == 0) { if (strcmp(long_options[option_index].name, "force-xinerama") == 0 ||
strcmp(long_options[option_index].name, "force_xinerama") == 0) {
force_xinerama = true; force_xinerama = true;
ELOG("Using Xinerama instead of RandR. This option should be " ELOG("Using Xinerama instead of RandR. This option should be "
"avoided at all cost because it does not refresh the list " "avoided at all cost because it does not refresh the list "
@ -277,7 +280,8 @@ int main(int argc, char *argv[]) {
} else if (strcmp(long_options[option_index].name, "disable-signalhandler") == 0) { } else if (strcmp(long_options[option_index].name, "disable-signalhandler") == 0) {
disable_signalhandler = true; disable_signalhandler = true;
break; break;
} else if (strcmp(long_options[option_index].name, "get-socketpath") == 0) { } else if (strcmp(long_options[option_index].name, "get-socketpath") == 0 ||
strcmp(long_options[option_index].name, "get_socketpath") == 0) {
char *socket_path = socket_path_from_x11(); char *socket_path = socket_path_from_x11();
if (socket_path) { if (socket_path) {
printf("%s\n", socket_path); printf("%s\n", socket_path);