marko10_000
/
wine-wine
forked from Mirrors/wine-wine
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

wineconsole: Default to the user backend, falling back to curses if we can't create a window.

oldstable
Alexandre Julliard 2007-09-26 14:21:46 +02:00
parent 477582401b
commit d082517c33
3 changed files with 15 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
programs/wineconsole/curses.c
View File

@ -1016,6 +1016,8 @@ enum init_return WCCURSES_InitBackend(struct inner_data* data)
#else #else
enum init_return WCCURSES_InitBackend(struct inner_data* data) enum init_return WCCURSES_InitBackend(struct inner_data* data)
{ {
WINE_ERR("(n)curses was not found at configuration time.\n"
"If you want (n)curses support, please install relevant packages.\n");
return init_not_supported; return init_not_supported;
} }
#endif #endif

2
programs/wineconsole/user.c
View File

@ -1437,7 +1437,7 @@ enum init_return WCUSER_InitBackend(struct inner_data* data)
CreateWindow(wndclass.lpszClassName, NULL, CreateWindow(wndclass.lpszClassName, NULL,
WS_OVERLAPPED|WS_CAPTION|WS_SYSMENU|WS_THICKFRAME|WS_MINIMIZEBOX|WS_HSCROLL|WS_VSCROLL, WS_OVERLAPPED|WS_CAPTION|WS_SYSMENU|WS_THICKFRAME|WS_MINIMIZEBOX|WS_HSCROLL|WS_VSCROLL,
CW_USEDEFAULT, CW_USEDEFAULT, 0, 0, 0, 0, wndclass.hInstance, data); CW_USEDEFAULT, CW_USEDEFAULT, 0, 0, 0, 0, wndclass.hInstance, data);
if (!data->hWnd) return init_failed; if (!data->hWnd) return init_not_supported;
return init_success; return init_success;
} }

24
programs/wineconsole/wineconsole.c
View File

@ -656,9 +656,18 @@ static struct inner_data* WINECON_Init(HINSTANCE hInst, DWORD pid, LPCWSTR appna
WINE_TRACE("using hConOut %p\n", data->hConOut); WINE_TRACE("using hConOut %p\n", data->hConOut);
/* filling data->curcfg from cfg */ /* filling data->curcfg from cfg */
retry:
switch ((*backend)(data)) switch ((*backend)(data))
{ {
case init_not_supported:
if (backend == WCCURSES_InitBackend)
{
if (WCUSER_InitBackend( data ) != init_success) break;
}
else if (backend == WCUSER_InitBackend)
{
if (WCCURSES_InitBackend( data ) != init_success) break;
}
/* fall through */
case init_success: case init_success:
WINECON_GetServerConfig(data); WINECON_GetServerConfig(data);
data->cells = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, data->cells = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY,
@ -684,16 +693,6 @@ static struct inner_data* WINECON_Init(HINSTANCE hInst, DWORD pid, LPCWSTR appna
return data; return data;
case init_failed: case init_failed:
break; break;
case init_not_supported:
if (backend == WCCURSES_InitBackend)
{
WINE_ERR("(n)curses was not found at configuration time.\n"
"If you want (n)curses support, please install relevant packages.\n"
"Now forcing user backend instead of (n)curses.\n");
backend = WCUSER_InitBackend;
goto retry;
}
break;
} }
error: error:
@ -768,7 +767,7 @@ static UINT WINECON_ParseOptions(const char* lpCmdLine, struct wc_init* wci)
memset(wci, 0, sizeof(*wci)); memset(wci, 0, sizeof(*wci));
wci->ptr = lpCmdLine; wci->ptr = lpCmdLine;
wci->mode = from_process_name; wci->mode = from_process_name;
wci->backend = WCCURSES_InitBackend; wci->backend = WCUSER_InitBackend;
for (;;) for (;;)
{ {
@ -792,6 +791,7 @@ static UINT WINECON_ParseOptions(const char* lpCmdLine, struct wc_init* wci)
} }
else if (strncmp(wci->ptr + 10, "curses", 6) == 0) else if (strncmp(wci->ptr + 10, "curses", 6) == 0)
{ {
wci->backend = WCCURSES_InitBackend;
wci->ptr += 16; wci->ptr += 16;
} }
else else