Mercurial > vim
comparison src/main.c @ 11:4424b47a0797
updated for version 7.0003
author | vimboss |
---|---|
date | Wed, 30 Jun 2004 16:16:41 +0000 |
parents | c2daee826b8f |
children | 946da5994c01 |
comparison
equal
deleted
inserted
replaced
10:4e2284e71352 | 11:4424b47a0797 |
---|---|
257 { | 257 { |
258 if (STRCMP(argv[i], "--") == 0) | 258 if (STRCMP(argv[i], "--") == 0) |
259 break; | 259 break; |
260 # ifdef FEAT_XCLIPBOARD | 260 # ifdef FEAT_XCLIPBOARD |
261 else if (STRICMP(argv[i], "-display") == 0 | 261 else if (STRICMP(argv[i], "-display") == 0 |
262 # ifdef FEAT_GUI_GTK | 262 # if defined(FEAT_GUI_GTK) || defined(FEAT_GUI_KDE) |
263 || STRICMP(argv[i], "--display") == 0 | 263 || STRICMP(argv[i], "--display") == 0 |
264 # endif | 264 # endif |
265 ) | 265 ) |
266 { | 266 { |
267 if (i == argc - 1) | 267 if (i == argc - 1) |
440 #endif | 440 #endif |
441 evim_mode = TRUE; | 441 evim_mode = TRUE; |
442 ++initstr; | 442 ++initstr; |
443 } | 443 } |
444 | 444 |
445 if (TOLOWER_ASC(initstr[0]) == 'g') | 445 if (TOLOWER_ASC(initstr[0]) == 'g' || initstr[0] == 'k') |
446 { | 446 { |
447 main_start_gui(); | 447 main_start_gui(); |
448 #ifdef FEAT_GUI | 448 #ifdef FEAT_GUI |
449 ++initstr; | 449 ++initstr; |
450 #endif | 450 #endif |
1085 * fork one off with :gui. | 1085 * fork one off with :gui. |
1086 */ | 1086 */ |
1087 #ifdef ALWAYS_USE_GUI | 1087 #ifdef ALWAYS_USE_GUI |
1088 gui.starting = TRUE; | 1088 gui.starting = TRUE; |
1089 #else | 1089 #else |
1090 # if defined(FEAT_GUI_X11) || defined(FEAT_GUI_GTK) | 1090 # if defined(FEAT_GUI_X11) || defined(FEAT_GUI_GTK) || defined(FEAT_GUI_KDE) |
1091 /* | 1091 /* |
1092 * Check if the GUI can be started. Reset gui.starting if not. | 1092 * Check if the GUI can be started. Reset gui.starting if not. |
1093 * Don't know about other systems, stay on the safe side and don't check. | 1093 * Don't know about other systems, stay on the safe side and don't check. |
1094 */ | 1094 */ |
1095 if (gui.starting && gui_init_check() == FAIL) | 1095 if (gui.starting && gui_init_check() == FAIL) |
1168 /* | 1168 /* |
1169 * When certain to start the GUI, don't check capabilities of terminal. | 1169 * When certain to start the GUI, don't check capabilities of terminal. |
1170 * For GTK we can't be sure, but when started from the desktop it doesn't | 1170 * For GTK we can't be sure, but when started from the desktop it doesn't |
1171 * make sense to try using a terminal. | 1171 * make sense to try using a terminal. |
1172 */ | 1172 */ |
1173 #if defined(ALWAYS_USE_GUI) || defined(FEAT_GUI_X11) || defined(FEAT_GUI_GTK) | 1173 #if defined(ALWAYS_USE_GUI) || defined(FEAT_GUI_X11) || defined(FEAT_GUI_GTK) || defined(FEAT_GUI_KDE) |
1174 if (gui.starting | 1174 if (gui.starting |
1175 # ifdef FEAT_GUI_GTK | 1175 # ifdef FEAT_GUI_GTK |
1176 && !isatty(2) | 1176 && !isatty(2) |
1177 # endif | 1177 # endif |
1178 ) | 1178 ) |
2611 main_msg(_("-display <display>\tRun vim on <display> (also: --display)")); | 2611 main_msg(_("-display <display>\tRun vim on <display> (also: --display)")); |
2612 # ifdef HAVE_GTK2 | 2612 # ifdef HAVE_GTK2 |
2613 main_msg(_("--role <role>\tSet a unique role to identify the main window")); | 2613 main_msg(_("--role <role>\tSet a unique role to identify the main window")); |
2614 # endif | 2614 # endif |
2615 main_msg(_("--socketid <xid>\tOpen Vim inside another GTK widget")); | 2615 main_msg(_("--socketid <xid>\tOpen Vim inside another GTK widget")); |
2616 #endif | |
2617 #ifdef FEAT_GUI_KDE | |
2618 mch_msg(_("\nArguments recognised by kvim (KDE version):\n")); | |
2619 main_msg(_("-black\t\tUse reverse video")); | |
2620 #if QT_VERSION>=300 | |
2621 main_msg(_("-tip\t\t\tDisplay the tip dialog on startup")); | |
2622 main_msg(_("-notip\t\tDisable the tip dialog")); | |
2623 #endif | |
2624 main_msg(_("-font <font>\t\tUse <font> for normal text (also: -fn)")); | |
2625 main_msg(_("-geometry <geom>\tUse <geom> for initial geometry (also: -geom)")); | |
2626 main_msg(_("--display <display>\tRun vim on <display>")); | |
2616 #endif | 2627 #endif |
2617 #ifdef FEAT_GUI_W32 | 2628 #ifdef FEAT_GUI_W32 |
2618 main_msg(_("-P <parent title>\tOpen Vim inside parent application")); | 2629 main_msg(_("-P <parent title>\tOpen Vim inside parent application")); |
2619 #endif | 2630 #endif |
2620 | 2631 |