More Windows work. This will just be a flat import for now. I really want to figure something out about uiOSContainers...

This commit is contained in:
Pietro Gagliardi 2015-04-24 13:59:49 -04:00
parent e8adc2a969
commit 3ea84f9bf5
5 changed files with 551 additions and 0 deletions

35
new/windows/GNUmakeinc.mk Normal file
View File

@ -0,0 +1,35 @@
# 22 april 2015
osCFILES = \
windows/alloc.c \
windows/init.c \
windows/main.c \
windows/oscontainer.c \
windows/text.c \
windows/util.c \
windows/window.c
osHFILES = \
windows/uipriv_windows.h
# thanks ebassi in irc.gimp.net/#gtk+
osCFLAGS = \
-D_UI_EXTERN='__declspec(dllexport) extern'
osLDFLAGS = \
-luser32 -lkernel32 -lgdi32 -luxtheme -lmsimg32 -lcomdlg32 -lole32 -loleaut32 -loleacc -luuid
osLIBSUFFIX = .dll
osEXESUFFIX = .exe
ifeq ($(ARCH),64)
CC = x86_64-w64-mingw32-gcc
RC = x86_64-w64-mingw32-windres
osCFLAGS += -m64
osLDFLAGS += -m64
else
CC = i686-w64-mingw32-gcc
RC = i686-w64-mingw32-windres
osCFLAGS += -m32
osLDFLAGS += -m32
endif

112
new/windows/init.c Normal file
View File

@ -0,0 +1,112 @@
// 6 april 2015
#include "uipriv_windows.h"
HINSTANCE hInstance;
int nCmdShow;
HFONT hMessageFont;
HBRUSH hollowBrush;
struct uiInitError {
char *msg;
char failbuf[256];
};
#define initErrorFormat L"error %s: %s%sGetLastError() == %I32u%s"
#define initErrorArgs wmessage, sysmsg, beforele, le, afterle
static const char *loadLastError(const char *message)
{
WCHAR *sysmsg;
BOOL hassysmsg;
WCHAR *beforele;
WCHAR *afterle;
int n;
WCHAR *wmessage;
WCHAR *wstr;
const char *str;
DWORD le;
le = GetLastError();
if (FormatMessageW(FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_IGNORE_INSERTS, NULL, le, 0, (LPWSTR) (&sysmsg), 0, NULL) != 0) {
hassysmsg = TRUE;
beforele = L" (";
afterle = L")";
} else {
hassysmsg = FALSE;
sysmsg = L"";
beforele = L"";
afterle = L"";
}
wmessage = toUTF16(message);
n = _scwprintf(initErrorFormat, initErrorArgs);
wstr = (WCHAR *) uiAlloc((n + 1) * sizeof (WCHAR), "WCHAR[]");
snwprintf(wstr, n + 1, initErrorFormat, initErrorArgs);
str = toUTF8(wstr);
uiFree(wstr);
if (hassysmsg)
if (LocalFree(sysmsg) != NULL)
logLastError("error freeing system message in loadLastError()");
uiFree(wmessage);
return str;
}
uiInitOptions options;
const char *uiInit(uiInitOptions *o)
{
STARTUPINFOW si;
const char *ce;
HICON hDefaultIcon;
HCURSOR hDefaultCursor;
NONCLIENTMETRICSW ncm;
options = *o;
hInstance = GetModuleHandle(NULL);
if (hInstance == NULL)
return loadLastError("getting program HINSTANCE");
nCmdShow = SW_SHOWDEFAULT;
GetStartupInfoW(&si);
if ((si.dwFlags & STARTF_USESHOWWINDOW) != 0)
nCmdShow = si.wShowWindow;
ce = initCommonControls();
if (ce != NULL)
return loadLastError(ce);
hDefaultIcon = LoadIconW(NULL, IDI_APPLICATION);
if (hDefaultIcon == NULL)
return loadLastError("loading default icon for window classes");
hDefaultCursor = LoadCursorW(NULL, IDC_ARROW);
if (hDefaultCursor == NULL)
return loadLastError("loading default cursor for window classes");
if (registerWindowClass(hDefaultIcon, hDefaultCursor) == 0)
return loadLastError("registering uiWindow window class");
ZeroMemory(&ncm, sizeof (NONCLIENTMETRICSW));
ncm.cbSize = sizeof (NONCLIENTMETRICSW);
if (SystemParametersInfoW(SPI_GETNONCLIENTMETRICS, sizeof (NONCLIENTMETRICSW), &ncm, sizeof (NONCLIENTMETRICSW)) == 0)
return loadLastError("getting default fonts");
hMessageFont = CreateFontIndirectW(&(ncm.lfMessageFont));
if (hMessageFont == NULL)
return loadLastError("loading default messagebox font; this is the default UI font");
ce = initOSContainer(hDefaultIcon, hDefaultCursor);
if (ce != NULL)
return loadLastError(ce);
hollowBrush = (HBRUSH) GetStockObject(HOLLOW_BRUSH);
if (hollowBrush == NULL)
return loadLastError("getting hollow brush");
return NULL;
}
void uiFreeInitError(const char *err)
{
uiFree((void *) err);
}

56
new/windows/main.c Normal file
View File

@ -0,0 +1,56 @@
// 6 april 2015
#include "uipriv_windows.h"
// #qo LDFLAGS: -luser32 -lkernel32 -lgdi32 -luxtheme -lmsimg32 -lcomdlg32 -lole32 -loleaut32 -loleacc -luuid
static void uimsgloop_else(MSG *msg)
{
TranslateMessage(msg);
DispatchMessage(msg);
}
void uiMain(void)
{
MSG msg;
int res;
HWND active, focus;
for (;;) {
SetLastError(0);
res = GetMessageW(&msg, NULL, 0, 0);
if (res < 0)
logLastError("error calling GetMessage() in uiMain()");
if (res == 0) // WM_QUIT
break;
active = GetActiveWindow();
if (active == NULL) {
uimsgloop_else(&msg);
continue;
}
// bit of logic involved here:
// we don't want dialog messages passed into Areas, so we don't call IsDialogMessageW() there
// as for Tabs, we can't have both WS_TABSTOP and WS_EX_CONTROLPARENT set at the same time, so we hotswap the two styles to get the behavior we want
focus = GetFocus();
if (focus != NULL) {
/*TODO switch (windowClassOf(focus, areaWindowClass, WC_TABCONTROLW, NULL)) {
case 0: // areaWindowClass
uimsgloop_area(active, focus, &msg);
continue;
case 1: // WC_TABCONTROLW
uimsgloop_tab(active, focus, &msg);
continue;
}
// else fall through
*/ }
if (IsDialogMessage(active, &msg) != 0)
continue;
uimsgloop_else(&msg);
}
}
void uiQuit(void)
{
PostQuitMessage(0);
}

309
new/windows/oscontainer.c Normal file
View File

@ -0,0 +1,309 @@
// 10 april 2015
#include "uipriv_windows.h"
// All controls in package ui are children of a window of this class.
// This keeps everything together, makes hiding controls en masse (tab page switching, for instance) easy, and makes the overall design cleaner.
// In addition, controls that are first created or don't have a parent are considered children of the "initial parent", which is also of this class.
// This parent is invisible, disabled, and should not be interacted with.
// TODOs
// - wiith CTLCOLOR handler: [12:24] <ZeroOne> There's flickering between tabs
// - with CTLCOLOR handler: [12:24] <ZeroOne> And setting the button text blanked out the entire GUI until I ran my mouse over the elements / [12:25] <ZeroOne> https://dl.dropboxusercontent.com/u/15144168/GUI%20stuff.png / [12:41] <ZeroOne> https://dl.dropboxusercontent.com/u/15144168/stack.png here have another screenshot
// - I get this too
#define uiOSContainerClass L"uiOSContainerClass"
HWND initialOSContainer;
static void paintControlBackground(HWND hwnd, HDC dc)
{
HWND parent;
RECT r;
POINT pOrig;
int class;
DWORD le;
parent = hwnd;
for (;;) {
parent = GetOSContainer(parent);
if (parent == NULL)
logLastError("error getting parent control of control in paintControlBackground()");
// wine sends these messages early, yay...
if (parent == initialOSContainer)
return;
// skip groupboxes; they're (supposed to be) transparent
// skip uiOSContainers for reasons described below
class = windowClassOf(parent, L"button", uiOSContainerClass, NULL);
if (class != 0 && class != 1)
break;
}
if (GetWindowRect(hwnd, &r) == 0)
logLastError("error getting control's window rect in paintControlBackground()");
// the above is a window rect in screen coordinates; convert to parent coordinates
SetLastError(0);
if (MapWindowRect(NULL, parent, &r) == 0) {
le = GetLastError();
SetLastError(le); // just to be safe
if (le != 0)
logLastError("error getting client origin of control in paintControlBackground()");
}
if (SetWindowOrgEx(dc, r.left, r.top, &pOrig) == 0)
logLastError("error moving window origin in paintControlBackground()");
SendMessageW(parent, WM_PRINTCLIENT, (WPARAM) dc, PRF_CLIENT);
if (SetWindowOrgEx(dc, pOrig.x, pOrig.y, NULL) == 0)
logLastError("error resetting window origin in paintControlBackground()");
}
// from https://msdn.microsoft.com/en-us/library/windows/desktop/dn742486.aspx#sizingandspacing and https://msdn.microsoft.com/en-us/library/windows/desktop/bb226818%28v=vs.85%29.aspx
// this X value is really only for buttons but I don't see a better one :/
#define winXPadding 4
#define winYPadding 4
static void resize(uiControl *control, HWND parent, RECT r, RECT margin)
{
uiSizing d;
uiSizingSys sys;
HDC dc;
HFONT prevfont;
TEXTMETRICW tm;
SIZE size;
size.cx = 0;
size.cy = 0;
ZeroMemory(&tm, sizeof (TEXTMETRICW));
dc = GetDC(parent);
if (dc == NULL)
logLastError("error getting DC in resize()");
prevfont = (HFONT) SelectObject(dc, hMessageFont);
if (prevfont == NULL)
logLastError("error loading control font into device context in resize()");
if (GetTextMetricsW(dc, &tm) == 0)
logLastError("error getting text metrics in resize()");
if (GetTextExtentPoint32W(dc, L"ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz", 52, &size) == 0)
logLastError("error getting text extent point in resize()");
sys.baseX = (int) ((size.cx / 26 + 1) / 2);
sys.baseY = (int) tm.tmHeight;
sys.internalLeading = tm.tmInternalLeading;
if (SelectObject(dc, prevfont) != hMessageFont)
logLastError("error restoring previous font into device context in resize()");
if (ReleaseDC(parent, dc) == 0)
logLastError("error releasing DC in resize()");
r.left += uiDlgUnitsToX(margin.left, sys.baseX);
r.top += uiDlgUnitsToY(margin.top, sys.baseY);
r.right -= uiDlgUnitsToX(margin.right, sys.baseX);
r.bottom -= uiDlgUnitsToY(margin.bottom, sys.baseY);
d.xPadding = uiDlgUnitsToX(winXPadding, sys.baseX);
d.yPadding = uiDlgUnitsToY(winYPadding, sys.baseY);
d.sys = &sys;
uiControlResize(control, r.left, r.top, r.right - r.left, r.bottom - r.top, &d);
}
// TODO make this a uiOSContainer directly
struct parent {
HWND hwnd;
uiControl *mainControl;
intmax_t marginLeft;
intmax_t marginTop;
intmax_t marginRight;
intmax_t marginBottom;
BOOL canDestroy;
};
static LRESULT CALLBACK parentWndProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
{
uiOSContainer *p;
struct parent *pp;
CREATESTRUCTW *cs = (CREATESTRUCTW *) lParam;
HWND control;
NMHDR *nm = (NMHDR *) lParam;
WINDOWPOS *wp = (WINDOWPOS *) lParam;
RECT r, margin;
HDC dc;
PAINTSTRUCT ps;
// these must always be executed, even on the initial parent
// why? http://blogs.msdn.com/b/oldnewthing/archive/2010/03/16/9979112.aspx
switch (uMsg) {
case WM_COMMAND:
// bounce back to the control in question
// except if to the initial parent, in which case act as if the message was ignored
control = (HWND) lParam;
if (control != NULL && IsChild(initialOSContainer, control) == 0)
return SendMessageW(control, msgCOMMAND, wParam, lParam);
return DefWindowProcW(hwnd, uMsg, wParam, lParam);
case WM_NOTIFY:
// same as WM_COMMAND
control = nm->hwndFrom;
if (control != NULL && IsChild(initialOSContainer, control) == 0)
return SendMessageW(control, msgNOTIFY, wParam, lParam);
return DefWindowProcW(hwnd, uMsg, wParam, lParam);
case WM_CTLCOLORSTATIC:
case WM_CTLCOLORBTN:
/*TODO // read-only TextFields and Textboxes are exempt
// this is because read-only edit controls count under WM_CTLCOLORSTATIC
if (windowClassOf((HWND) lParam, L"edit", NULL) == 0)
if (textfieldReadOnly((HWND) lParam))
return DefWindowProcW(hwnd, uMsg, wParam, lParam);
*/ if (SetBkMode((HDC) wParam, TRANSPARENT) == 0)
logLastError("error setting transparent background mode to controls in parentWndProc()");
paintControlBackground((HWND) lParam, (HDC) wParam);
return (LRESULT) hollowBrush;
}
// these are only executed on actual parents
p = (uiOSContainer *) GetWindowLongPtrW(hwnd, GWLP_USERDATA);
if (p == NULL) {
if (uMsg == WM_NCCREATE) {
p = (uiOSContainer *) (cs->lpCreateParams);
// this will be NULL for the initial parent; that's what we want
SetWindowLongPtrW(hwnd, GWLP_USERDATA, (LONG_PTR) p);
// fall through to DefWindowProcW()
}
// this is the return the initial parent will always use
return DefWindowProcW(hwnd, uMsg, wParam, lParam);
}
pp = (struct parent *) (p->Internal);
switch (uMsg) {
case WM_NCDESTROY:
if (!pp->canDestroy)
complain("attempt to destroy uiOSContainer at %p before uiOSContainerDestroy()", p);
uiFree(p->Internal);
uiFree(p);
break; // fall through to DefWindowPocW()
case WM_WINDOWPOSCHANGED:
if ((wp->flags & SWP_NOSIZE) != 0)
break;
// fall through
case msgUpdateChild:
if (pp->mainControl == NULL)
break;
if (GetClientRect(pp->hwnd, &r) == 0)
logLastError("error getting client rect for resize in parentWndProc()");
margin.left = pp->marginLeft;
margin.top = pp->marginTop;
margin.right = pp->marginRight;
margin.bottom = pp->marginBottom;
resize(pp->mainControl, pp->hwnd, r, margin);
return 0;
case WM_PAINT:
dc = BeginPaint(pp->hwnd, &ps);
if (dc == NULL)
logLastError("TODO write this");
paintControlBackground(pp->hwnd, dc);
EndPaint(pp->hwnd, &ps);
return 0;
// don't implement WM_PRINTCLIENT
// if paintControlBackground() asks us to draw our background, we have to ask our parent to draw its, which causes weird origin issues
// instead, we skip uiOSContainers in paintControlBackground()
}
return DefWindowProcW(hwnd, uMsg, wParam, lParam);
}
const char *initOSContainer(HICON hDefaultIcon, HCURSOR hDefaultCursor)
{
WNDCLASSW wc;
ZeroMemory(&wc, sizeof (WNDCLASSW));
wc.lpszClassName = uiOSContainerClass;
wc.lpfnWndProc = parentWndProc;
wc.hInstance = hInstance;
wc.hIcon = hDefaultIcon;
wc.hCursor = hDefaultCursor;
wc.hbrBackground = (HBRUSH) (COLOR_BTNFACE + 1);
if (RegisterClassW(&wc) == 0)
return "registering parent window class";
initialOSContainer = CreateWindowExW(0,
uiOSContainerClass, L"",
WS_OVERLAPPEDWINDOW,
0, 0,
100, 100,
NULL, NULL, hInstance, NULL);
if (initialOSContainer == NULL)
return "creating initial parent window";
// just to be safe, disable the initial parent so it can't be interacted with accidentally
// if this causes issues for our controls, we can remove it
EnableWindow(initialOSContainer, FALSE);
return NULL;
}
static void parentDestroy(uiOSContainer *pp)
{
struct parent *p = (struct parent *) (pp->Internal);
// first destroy the main control, if any
if (p->mainControl != NULL) {
// we have to do this before we can destroy controls
uiControlSetOSContainer(p->mainControl, NULL);
uiControlDestroy(p->mainControl);
p->mainControl = NULL;
}
// then mark that we are ready to destroy
p->canDestroy = TRUE;
// and finally destroy
if (DestroyWindow(p->hwnd) == 0)
logLastError("error destroying uiOSContainer window in parentDestroy()");
}
static uintptr_t parentHandle(uiOSContainer *p)
{
struct parent *pp = (struct parent *) (p->Internal);
return (uintptr_t) (pp->hwnd);
}
static void parentSetMainControl(uiOSContainer *pp, uiControl *mainControl)
{
struct parent *p = (struct parent *) (pp->Internal);
if (p->mainControl != NULL)
uiControlSetOSContainer(p->mainControl, NULL);
p->mainControl = mainControl;
if (p->mainControl != NULL)
uiControlSetOSContainer(p->mainControl, pp);
}
static void parentSetMargins(uiOSContainer *p, intmax_t left, intmax_t top, intmax_t right, intmax_t bottom)
{
struct parent *pp = (struct parent *) (p->Internal);
pp->marginLeft = left;
pp->marginTop = top;
pp->marginRight = right;
pp->marginBottom = bottom;
}
static void parentUpdate(uiOSContainer *p)
{
struct parent *pp = (struct parent *) (p->Internal);
SendMessageW(pp->hwnd, msgUpdateChild, 0, 0);
}
uiOSContainer *uiNewOSContainer(uintptr_t osOSContainer)
{
uiOSContainer *p;
struct parent *pp;
p = uiNew(uiOSContainer);
p->Internal = uiNew(struct parent); // set now in case the parent class window procedure uses it
pp = (struct parent *) (p->Internal);
pp->hwnd = CreateWindowExW(0,
uiOSContainerClass, L"",
WS_CHILD | WS_VISIBLE,
0, 0,
0, 0,
(HWND) osOSContainer, NULL, hInstance, p);
if (pp->hwnd == NULL)
logLastError("error creating uiOSContainer window in uiNewOSContainer()");
p->Destroy = parentDestroy;
p->Handle = parentHandle;
p->SetMainControl = parentSetMainControl;
p->SetMargins = parentSetMargins;
p->Update = parentUpdate;
return p;
}

View File

@ -0,0 +1,39 @@
// 24 april 2015
#define UNICODE
#define _UNICODE
#define STRICT
#define STRICT_TYPED_ITEMIDS
#define CINTERFACE
#define COBJMACROS
// see https://github.com/golang/go/issues/9916#issuecomment-74812211
#define INITGUID
// get Windows version right; right now Windows XP
#define WINVER 0x0501
#define _WIN32_WINNT 0x0501
#define _WIN32_WINDOWS 0x0501 /* according to Microsoft's winperf.h */
#define _WIN32_IE 0x0600 /* according to Microsoft's sdkddkver.h */
#define NTDDI_VERSION 0x05010000 /* according to Microsoft's sdkddkver.h */
#include <windows.h>
#include <commctrl.h>
#include <stdint.h>
#include <uxtheme.h>
#include <string.h>
#include <wchar.h>
#include <windowsx.h>
#include <vsstyle.h>
#include <vssym32.h>
#include <stdarg.h>
#include <oleacc.h>
#include <stdio.h>
#include "../ui.h"
#include "../uipriv.h"
#include "../ui_windows.h"
// ui internal window messages
enum {
// redirected WM_COMMAND and WM_NOTIFY
msgCOMMAND = WM_APP + 0x40, // start offset just to be safe
msgNOTIFY,
msgUpdateChild, // fake because Windows seems to SWP_NOSIZE MoveWindow()s and SetWindowPos()s that don't change the window size (even if SWP_NOSIZE isn't specified)
msgCanDestroyNow,
};