procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix MS-Windows build broken by recent touch-screen changes

Browse source 
* src/w32term.c (TOUCHEVENTF_DOWN, TOUCHEVENTF_UP):
(struct _TOUCHINPUT): Move before first use.
(TOUCHEVENTF_MOVE, TOUCHEVENTMASKF_CONTACTAREA)
(TOUCHEVENTMASKF_EXTRAINFO, TOUCHEVENTMASKF_TIMEFROMSYSTEM): Ifdef
away unused macros.
(w32_read_socket): Fix typo.
This commit is contained in:
Eli Zaretskii 2024-06-09 16:26:14 +03:00
parent 5c8a8b7dd3
commit b8e78d2657
1 changed files with 33 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

64
src/w32term.c
View file

@ -120,6 +120,38 @@ BOOL (WINAPI *pfnSetLayeredWindowAttributes) (HWND, COLORREF, BYTE, DWORD);
/* PlgBlt is available since Windows 2000. */
BOOL (WINAPI *pfnPlgBlt) (HDC, const POINT *, HDC, int, int, int, int, HBITMAP, int, int);
/* Define required types and constants on systems with older headers
lest they be absent. */
#if _WIN32_WINNT < 0x0601
#define TOUCHEVENTF_DOWN 0x0001
#define TOUCHEVENTF_UP 0x0004
/* These are currently unused; prevent compiler warnings. */
#if 0
#define TOUCHEVENTF_MOVE 0x0002
#define TOUCHEVENTMASKF_CONTACTAREA 0x0004
#define TOUCHEVENTMASKF_EXTRAINFO 0x0002
#define TOUCHEVENTMASKF_TIMEFROMSYSTEM 0x0001
#endif /* 0 */
#define WM_TOUCHMOVE 576
typedef struct _TOUCHINPUT
{
LONG x;
LONG y;
HANDLE hSource;
DWORD dwID;
DWORD dwFlags;
DWORD dwMask;
DWORD dwTime;
ULONG_PTR dwExtraInfo;
DWORD cxContact;
DWORD cyContact;
} TOUCHINPUT, *PTOUCHINPUT;
#endif /* _WIN32_WINNT < 0x0601 */
/* Functions that extract data from touch-screen events. */
typedef BOOL (WINAPI * CloseTouchInputHandle_proc) (HANDLE);
typedef BOOL (WINAPI * GetTouchInputInfo_proc) (HANDLE, UINT, PTOUCHINPUT, int);
@ -127,7 +159,6 @@ typedef BOOL (WINAPI * GetTouchInputInfo_proc) (HANDLE, UINT, PTOUCHINPUT, int);
CloseTouchInputHandle_proc pfnCloseTouchInputHandle;
GetTouchInputInfo_proc pfnGetTouchInputInfo;
#ifndef LWA_ALPHA
#define LWA_ALPHA 0x02
#endif
@ -146,35 +177,6 @@ GetTouchInputInfo_proc pfnGetTouchInputInfo;
#define SM_CYVIRTUALSCREEN 79
#endif
/* Define required types and constants on systems with older headers
lest they be absent. */
#if _WIN32_WINNT < 0x0601
#define TOUCHEVENTF_DOWN 0x0001
#define TOUCHEVENTF_MOVE 0x0002
#define TOUCHEVENTF_UP 0x0004
#define TOUCHEVENTMASKF_CONTACTAREA 0x0004
#define TOUCHEVENTMASKF_EXTRAINFO 0x0002
#define TOUCHEVENTMASKF_TIMEFROMSYSTEM 0x0001
#define WM_TOUCHMOVE 576
typedef struct _TOUCHINPUT
{
LONG x;
LONG y;
HANDLE hSource;
DWORD dwID;
DWORD dwFlags;
DWORD dwMask;
DWORD dwTime;
ULONG_PTR dwExtraInfo;
DWORD cxContact;
DWORD cyContact;
} TOUCHINPUT, *PTOUCHINPUT;
#endif /* _WIN32_WINNT < 0x0601 */
/* The handle of the frame that currently owns the system caret. */
HWND w32_system_caret_hwnd;
int w32_system_caret_height;
@ -6264,7 +6266,7 @@ w32_read_socket (struct terminal *terminal,
}
}
(*CloseTouchInputHandle) ((HANDLE) msg.msg.lParam);
(*pfnCloseTouchInputHandle) ((HANDLE) msg.msg.lParam);
break;
default: