summaryrefslogtreecommitdiff
path: root/new
diff options
context:
space:
mode:
Diffstat (limited to 'new')
-rw-r--r--new/container_windows.c85
-rw-r--r--new/uipriv_windows.h2
-rw-r--r--new/util_windows.c83
3 files changed, 87 insertions, 83 deletions
diff --git a/new/container_windows.c b/new/container_windows.c
new file mode 100644
index 0000000..152ce3a
--- /dev/null
+++ b/new/container_windows.c
@@ -0,0 +1,85 @@
+// 7 april 2015
+#include "uipriv_windows.h"
+
+/*
+all container windows (including the message-only window, hence this is not in container_windows.c) have to call the sharedWndProc() to ensure messages go in the right place and control colors are handled properly
+*/
+
+/*
+all controls that have events receive the events themselves through subclasses
+to do this, all container windows (including the message-only window; see http://support.microsoft.com/default.aspx?scid=KB;EN-US;Q104069) forward WM_COMMAND to each control with this function, WM_NOTIFY with forwardNotify, etc.
+*/
+static LRESULT forwardCommand(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
+{
+ HWND control = (HWND) lParam;
+
+ // don't generate an event if the control (if there is one) is unparented (a child of the initial parent window)
+ if (control != NULL && IsChild(initialParent, control) == 0)
+ return SendMessageW(control, msgCOMMAND, wParam, lParam);
+ return DefWindowProcW(hwnd, uMsg, wParam, lParam);
+}
+
+static LRESULT forwardNotify(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
+{
+ NMHDR *nmhdr = (NMHDR *) lParam;
+ HWND control = nmhdr->hwndFrom;
+
+ // don't generate an event if the control (if there is one) is unparented (a child of the initial parent window)
+ if (control != NULL && IsChild(initialParent, control) == 0)
+ return SendMessageW(control, msgNOTIFY, wParam, lParam);
+ return DefWindowProcW(hwnd, uMsg, wParam, lParam);
+}
+
+BOOL sharedWndProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam, LRESULT *lResult)
+{
+ switch (uMsg) {
+ case WM_COMMAND:
+ *lResult = forwardCommand(hwnd, uMsg, wParam, lParam);
+ return TRUE;
+ case WM_NOTIFY:
+ *lResult = forwardNotify(hwnd, uMsg, wParam, lParam);
+ return TRUE;
+/*TODO case WM_CTLCOLORSTATIC:
+ case WM_CTLCOLORBTN:
+ // 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 FALSE;
+ if (SetBkMode((HDC) wParam, TRANSPARENT) == 0)
+ xpanic("error setting transparent background mode to Labels", GetLastError());
+ paintControlBackground((HWND) lParam, (HDC) wParam);
+ *lResult = (LRESULT) hollowBrush;
+ return TRUE;
+*/ }
+ return FALSE;
+}
+
+// TODO add function names to errors
+void resize(uiControl *control, HWND parent, RECT r)
+{
+ uiSizing d;
+ HDC dc;
+ HFONT prevFont;
+ TEXTMETRICW tm;
+ SIZE size;
+
+ dc = GetDC(parent);
+ if (dc == NULL)
+ logLastError("error getting DC for preferred size calculations");
+ prevFont = (HFONT) SelectObject(dc, hMessageFont);
+ if (prevFont == NULL)
+ logLastError("error loading control font into device context for preferred size calculation");
+ if (GetTextMetricsW(dc, &tm) == 0)
+ logLastError("error getting text metrics for preferred size calculations");
+ if (GetTextExtentPoint32W(dc, L"ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz", 52, &size) == 0)
+ logLastError("error getting text extent point for preferred size calculations");
+ d.baseX = (int) ((size.cx / 26 + 1) / 2);
+ d.baseY = (int) tm.tmHeight;
+ d.internalLeading = tm.tmInternalLeading;
+ if (SelectObject(dc, prevFont) != hMessageFont)
+ logLastError("error restoring previous font into device context after preferred size calculations");
+ if (ReleaseDC(parent, dc) == 0)
+ logLastError("error releasing DC for preferred size calculations");
+ (*(control->resize))(control, r.left, r.top, r.right - r.left, r.bottom - r.top, &d);
+}
diff --git a/new/uipriv_windows.h b/new/uipriv_windows.h
index d415100..0138b34 100644
--- a/new/uipriv_windows.h
+++ b/new/uipriv_windows.h
@@ -63,6 +63,8 @@ extern HWND initialParent;
// util_windows.c
extern WCHAR *toUTF16(const char *);
+
+// container_windows.c
extern BOOL sharedWndProc(HWND, UINT, WPARAM, LPARAM, LRESULT *);
extern void resize(uiControl *, HWND, RECT);
diff --git a/new/util_windows.c b/new/util_windows.c
index 39bffc3..0bd76a0 100644
--- a/new/util_windows.c
+++ b/new/util_windows.c
@@ -16,86 +16,3 @@ WCHAR *toUTF16(const char *str)
logLastError("error converting from UTF-8 to UTF-16 in toUTF16()");
return wstr;
}
-
-/*
-all container windows (including the message-only window, hence this is not in container_windows.c) have to call the sharedWndProc() to ensure messages go in the right place and control colors are handled properly
-*/
-
-/*
-all controls that have events receive the events themselves through subclasses
-to do this, all container windows (including the message-only window; see http://support.microsoft.com/default.aspx?scid=KB;EN-US;Q104069) forward WM_COMMAND to each control with this function, WM_NOTIFY with forwardNotify, etc.
-*/
-static LRESULT forwardCommand(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
-{
- HWND control = (HWND) lParam;
-
- // don't generate an event if the control (if there is one) is unparented (a child of the initial parent window)
- if (control != NULL && IsChild(initialParent, control) == 0)
- return SendMessageW(control, msgCOMMAND, wParam, lParam);
- return DefWindowProcW(hwnd, uMsg, wParam, lParam);
-}
-
-static LRESULT forwardNotify(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
-{
- NMHDR *nmhdr = (NMHDR *) lParam;
- HWND control = nmhdr->hwndFrom;
-
- // don't generate an event if the control (if there is one) is unparented (a child of the initial parent window)
- if (control != NULL && IsChild(initialParent, control) == 0)
- return SendMessageW(control, msgNOTIFY, wParam, lParam);
- return DefWindowProcW(hwnd, uMsg, wParam, lParam);
-}
-
-BOOL sharedWndProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam, LRESULT *lResult)
-{
- switch (uMsg) {
- case WM_COMMAND:
- *lResult = forwardCommand(hwnd, uMsg, wParam, lParam);
- return TRUE;
- case WM_NOTIFY:
- *lResult = forwardNotify(hwnd, uMsg, wParam, lParam);
- return TRUE;
-/*TODO case WM_CTLCOLORSTATIC:
- case WM_CTLCOLORBTN:
- // 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 FALSE;
- if (SetBkMode((HDC) wParam, TRANSPARENT) == 0)
- xpanic("error setting transparent background mode to Labels", GetLastError());
- paintControlBackground((HWND) lParam, (HDC) wParam);
- *lResult = (LRESULT) hollowBrush;
- return TRUE;
-*/ }
- return FALSE;
-}
-
-// TODO add function names
-void resize(uiControl *control, HWND parent, RECT r)
-{
- uiSizing d;
- HDC dc;
- HFONT prevFont;
- TEXTMETRICW tm;
- SIZE size;
-
- dc = GetDC(parent);
- if (dc == NULL)
- logLastError("error getting DC for preferred size calculations");
- prevFont = (HFONT) SelectObject(dc, hMessageFont);
- if (prevFont == NULL)
- logLastError("error loading control font into device context for preferred size calculation");
- if (GetTextMetricsW(dc, &tm) == 0)
- logLastError("error getting text metrics for preferred size calculations");
- if (GetTextExtentPoint32W(dc, L"ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz", 52, &size) == 0)
- logLastError("error getting text extent point for preferred size calculations");
- d.baseX = (int) ((size.cx / 26 + 1) / 2);
- d.baseY = (int) tm.tmHeight;
- d.internalLeading = tm.tmInternalLeading;
- if (SelectObject(dc, prevFont) != hMessageFont)
- logLastError("error restoring previous font into device context after preferred size calculations");
- if (ReleaseDC(parent, dc) == 0)
- logLastError("error releasing DC for preferred size calculations");
- (*(control->resize))(control, r.left, r.top, r.right - r.left, r.bottom - r.top, &d);
-}