Commit e83074af authored by Kim F. Storm's avatar Kim F. Storm

(Display): Add dummy typedef for consolidation.

(XChar2b): Define alias for wchar_t for consolidation.
(STORE_XCHAR2B, XCHAR2B_BYTE1, XCHAR2B_BYTE2): New macros.
parent fde8984c
......@@ -36,7 +36,7 @@ typedef struct _XCharStruct
enum w32_char_font_type
{
UNKNOWN_FONT,
UNKNOWN_FONT = 0 /* FONT_TYPE_UNKNOWN */,
ANSI_FONT,
UNICODE_FONT,
BDF_1D_FONT,
......@@ -76,8 +76,22 @@ typedef XGCValues * GC;
typedef COLORREF Color;
typedef DWORD Time;
typedef HWND Window;
typedef int Display; /* ++KFS: define here? */
typedef HCURSOR Cursor;
#define XChar2b wchar_t
/* Dealing with bits of wchar_t as if they were an XChar2b. */
#define STORE_XCHAR2B(chp, byte1, byte2) \
((*chp) = ((XChar2b)((((byte1) & 0x00ff) << 8) | ((byte2) & 0x00ff))))
#define XCHAR2B_BYTE1(chp) \
(((*chp) & 0xff00) >> 8)
#define XCHAR2B_BYTE2(chp) \
((*chp) & 0x00ff)
/* Windows equivalent of XImage. */
typedef struct _XImage
{
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment