Mercurial > vim

comparison src/main.c @ 575:f1d46f948241 v7.0163

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
updated for version 7.0163
author vimboss
date Tue, 06 Dec 2005 20:04:44 +0000
parents 3e19ea54eb07
children 90ee46d7f492
comparison
equal deleted inserted replaced
574:25a70b1cd2da 575:f1d46f948241
347 * :gui. 347 * :gui.
348 */ 348 */
349 #ifdef ALWAYS_USE_GUI 349 #ifdef ALWAYS_USE_GUI
350 gui.starting = TRUE; 350 gui.starting = TRUE;
351 #else 351 #else
352 # if defined(FEAT_GUI_X11) || defined(FEAT_GUI_GTK) || defined(FEAT_GUI_KDE) 352 # if defined(FEAT_GUI_X11) || defined(FEAT_GUI_GTK)
353 /* 353 /*
354 * Check if the GUI can be started. Reset gui.starting if not. 354 * Check if the GUI can be started. Reset gui.starting if not.
355 * Don't know about other systems, stay on the safe side and don't check. 355 * Don't know about other systems, stay on the safe side and don't check.
356 */ 356 */
357 if (gui.starting && gui_init_check() == FAIL) 357 if (gui.starting && gui_init_check() == FAIL)
431 /* 431 /*
432 * When certain to start the GUI, don't check capabilities of terminal. 432 * When certain to start the GUI, don't check capabilities of terminal.
433 * For GTK we can't be sure, but when started from the desktop it doesn't 433 * For GTK we can't be sure, but when started from the desktop it doesn't
434 * make sense to try using a terminal. 434 * make sense to try using a terminal.
435 */ 435 */
436 #if defined(ALWAYS_USE_GUI) || defined(FEAT_GUI_X11) || defined(FEAT_GUI_GTK) || defined(FEAT_GUI_KDE) 436 #if defined(ALWAYS_USE_GUI) || defined(FEAT_GUI_X11) || defined(FEAT_GUI_GTK)
437 if (gui.starting 437 if (gui.starting
438 # ifdef FEAT_GUI_GTK 438 # ifdef FEAT_GUI_GTK
439 && !isatty(2) 439 && !isatty(2)
440 # endif 440 # endif
441 ) 441 )
1382 { 1382 {
1383 if (STRCMP(argv[i], "--") == 0) 1383 if (STRCMP(argv[i], "--") == 0)
1384 break; 1384 break;
1385 # ifdef FEAT_XCLIPBOARD 1385 # ifdef FEAT_XCLIPBOARD
1386 else if (STRICMP(argv[i], "-display") == 0 1386 else if (STRICMP(argv[i], "-display") == 0
1387 # if defined(FEAT_GUI_GTK) || defined(FEAT_GUI_KDE) 1387 # if defined(FEAT_GUI_GTK)
1388 || STRICMP(argv[i], "--display") == 0 1388 || STRICMP(argv[i], "--display") == 0
1389 # endif 1389 # endif
1390 ) 1390 )
1391 { 1391 {
1392 if (i == argc - 1) 1392 if (i == argc - 1)
2856 main_msg(_("-display <display>\tRun vim on <display> (also: --display)")); 2856 main_msg(_("-display <display>\tRun vim on <display> (also: --display)"));
2857 # ifdef HAVE_GTK2 2857 # ifdef HAVE_GTK2
2858 main_msg(_("--role <role>\tSet a unique role to identify the main window")); 2858 main_msg(_("--role <role>\tSet a unique role to identify the main window"));
2859 # endif 2859 # endif
2860 main_msg(_("--socketid <xid>\tOpen Vim inside another GTK widget")); 2860 main_msg(_("--socketid <xid>\tOpen Vim inside another GTK widget"));
2861 #endif
2862 #ifdef FEAT_GUI_KDE
2863 mch_msg(_("\nArguments recognised by kvim (KDE version):\n"));
2864 main_msg(_("-black\t\tUse reverse video"));
2865 #if QT_VERSION>=300
2866 main_msg(_("-tip\t\t\tDisplay the tip dialog on startup"));
2867 main_msg(_("-notip\t\tDisable the tip dialog"));
2868 #endif
2869 main_msg(_("-font <font>\t\tUse <font> for normal text (also: -fn)"));
2870 main_msg(_("-geometry <geom>\tUse <geom> for initial geometry (also: -geom)"));
2871 main_msg(_("--display <display>\tRun vim on <display>"));
2872 #endif 2861 #endif
2873 #ifdef FEAT_GUI_W32 2862 #ifdef FEAT_GUI_W32
2874 main_msg(_("-P <parent title>\tOpen Vim inside parent application")); 2863 main_msg(_("-P <parent title>\tOpen Vim inside parent application"));
2875 #endif 2864 #endif
2876 2865