+/* Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
+ Free Software Foundation, Inc.
+
+This file is part of GNU Emacs.
+
+GNU Emacs is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+GNU Emacs is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
+
+
/*
Simple program to start Emacs with its console window hidden.
is running emacs.exe already, you cannot install a newer version.
By defining CHOOSE_NEWEST_EXE, you can name your new emacs.exe
something else which matches "emacs*.exe", and runemacs will
- automatically select the newest emacs executeable in the bin directory.
+ automatically select the newest emacs executable in the bin directory.
(So you'll probably be able to delete the old version some hours/days
later).
*/
/* #define CHOOSE_NEWEST_EXE */
-#define WIN32
-
#include <windows.h>
#include <string.h>
#include <malloc.h>
+static void set_user_model_id ();
+
int WINAPI
WinMain (HINSTANCE hSelf, HINSTANCE hPrev, LPSTR cmdline, int nShow)
{
STARTUPINFO start;
SECURITY_ATTRIBUTES sec_attrs;
- SECURITY_DESCRIPTOR sec_desc;
PROCESS_INFORMATION child;
int wait_for_child = FALSE;
+ DWORD priority_class = NORMAL_PRIORITY_CLASS;
DWORD ret_code = 0;
char *new_cmdline;
char *p;
char modname[MAX_PATH];
+ set_user_model_id ();
+
if (!GetModuleFileName (NULL, modname, MAX_PATH))
goto error;
if ((p = strrchr (modname, '\\')) == NULL)
goto error;
*p = 0;
- new_cmdline = alloca (MAX_PATH + strlen (cmdline) + 1);
- strcpy (new_cmdline, modname);
+ new_cmdline = alloca (MAX_PATH + strlen (cmdline) + 3);
+ /* Quote executable name in case of spaces in the path. */
+ *new_cmdline = '"';
+ strcpy (new_cmdline + 1, modname);
#ifdef CHOOSE_NEWEST_EXE
{
WIN32_FIND_DATA wfd;
HANDLE fh;
p = new_cmdline + strlen (new_cmdline);
- strcpy (p, "\\emacs*.exe ");
+ strcpy (p, "\\emacs*.exe\" ");
fh = FindFirstFile (new_cmdline, &wfd);
if (fh == INVALID_HANDLE_VALUE)
goto error;
do
{
- if (wfd.ftLastWriteTime.dwHighDateTime > best_time.dwHighDateTime
- || (wfd.ftLastWriteTime.dwHighDateTime == best_time.dwHighDateTime
- && wfd.ftLastWriteTime.dwLowDateTime > best_time.dwLowDateTime))
- {
- best_time = wfd.ftLastWriteTime;
- strcpy (best_name, wfd.cFileName);
- }
+ if (wfd.ftLastWriteTime.dwHighDateTime > best_time.dwHighDateTime
+ || (wfd.ftLastWriteTime.dwHighDateTime == best_time.dwHighDateTime
+ && wfd.ftLastWriteTime.dwLowDateTime > best_time.dwLowDateTime))
+ {
+ best_time = wfd.ftLastWriteTime;
+ strcpy (best_name, wfd.cFileName);
+ }
}
while (FindNextFile (fh, &wfd));
FindClose (fh);
strcat (p, " ");
}
#else
- strcat (new_cmdline, "\\emacs.exe ");
+ strcat (new_cmdline, "\\emacs.exe\" ");
#endif
- /* Append original arguments if any; first look for -wait as first
- argument, and apply that ourselves. */
- if (strncmp (cmdline, "-wait", 5) == 0)
+ /* Append original arguments if any; first look for arguments we
+ recognise (-wait, -high, and -low), and apply them ourselves. */
+ while (cmdline[0] == '-' || cmdline[0] == '/')
{
- wait_for_child = TRUE;
- cmdline += 5;
+ if (strncmp (cmdline+1, "wait", 4) == 0)
+ {
+ wait_for_child = TRUE;
+ cmdline += 5;
+ }
+ else if (strncmp (cmdline+1, "high", 4) == 0)
+ {
+ priority_class = HIGH_PRIORITY_CLASS;
+ cmdline += 5;
+ }
+ else if (strncmp (cmdline+1, "low", 3) == 0)
+ {
+ priority_class = IDLE_PRIORITY_CLASS;
+ cmdline += 4;
+ }
+ else
+ break;
+ /* Look for next argument. */
+ while (*++cmdline == ' ');
}
+
strcat (new_cmdline, cmdline);
/* Set emacs_dir variable if runemacs was in "%emacs_dir%\bin". */
memset (&start, 0, sizeof (start));
start.cb = sizeof (start);
- start.dwFlags = STARTF_USESHOWWINDOW;
+ start.dwFlags = STARTF_USESHOWWINDOW | STARTF_USECOUNTCHARS;
start.wShowWindow = SW_HIDE;
+ /* Ensure that we don't waste memory if the user has specified a huge
+ default screen buffer for command windows. */
+ start.dwXCountChars = 80;
+ start.dwYCountChars = 25;
sec_attrs.nLength = sizeof (sec_attrs);
sec_attrs.lpSecurityDescriptor = NULL;
sec_attrs.bInheritHandle = FALSE;
- if (CreateProcess (NULL, new_cmdline, &sec_attrs, NULL, TRUE, 0,
+ if (CreateProcess (NULL, new_cmdline, &sec_attrs, NULL, TRUE, priority_class,
NULL, NULL, &start, &child))
{
if (wait_for_child)
MessageBox (NULL, "Could not start Emacs.", "Error", MB_ICONSTOP);
return 1;
}
+
+void set_user_model_id ()
+{
+ HMODULE shell;
+ HRESULT (WINAPI * set_user_model) (wchar_t * id);
+
+ /* On Windows 7 and later, we need to set the user model ID
+ to associate emacsclient launched files with Emacs frames
+ in the UI. */
+ shell = LoadLibrary ("shell32.dll");
+ if (shell)
+ {
+ set_user_model
+ = (void *) GetProcAddress (shell,
+ "SetCurrentProcessExplicitAppUserModelID");
+
+ /* If the function is defined, then we are running on Windows 7
+ or newer, and the UI uses this to group related windows
+ together. Since emacs, runemacs, emacsclient are related, we
+ want them grouped even though the executables are different,
+ so we need to set a consistent ID between them. */
+ if (set_user_model)
+ set_user_model (L"GNU.Emacs");
+
+ FreeLibrary (shell);
+ }
+}
+
+/* arch-tag: 7e02df73-4df7-4aa0-baea-99c6d047a384
+ (do not change this comment) */
HCoop / bpt / emacs.git / blobdiff