zdoom/qzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/qzdoom.git synced 2024-11-27 22:42:57 +00:00
Code Issues Projects Releases Packages Wiki Activity

- Changed the DWORDs in dobject.h into uint32s, since they were preventing

Browse source 
edit-and-continue from working for the Windows source files.
- When a WM_KEYDOWN message is received with VK_PROCESSKEY, the scan key is
  now used to retrieve the real virtual key for the message. This fixes the
  previous issue that caused me to completely disable the IME.
- Removed the code that disables the IME, since it also disables the ability
  to switch between keyboard layouts that do not use an IME.
- TranslateMessage() is no longer called if GUI capture mode is off, so no
  dead key processing is performed until it might be useful.


SVN r1758 (trunk)
This commit is contained in:
Randy Heit 2009-08-08 00:36:35 +00:00
parent 63e26df7b2
commit 4d4e8e89b3
4 changed files with 35 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
docs/rh-log.txt
View file

@ -1,4 +1,15 @@
August 6, 2009
August 7, 2009
- Changed the DWORDs in dobject.h into uint32s, since they were preventing
edit-and-continue from working for the Windows source files.
- When a WM_KEYDOWN message is received with VK_PROCESSKEY, the scan key is
now used to retrieve the real virtual key for the message. This fixes the
previous issue that caused me to completely disable the IME.
- Removed the code that disables the IME, since it also disables the ability
to switch between keyboard layouts that do not use an IME.
- TranslateMessage() is no longer called if GUI capture mode is off, so no
dead key processing is performed until it might be useful.
August 6, 2009
- Added player MugShotMaxHealth property. Negative values use the player's
max health as the mug shot max health, zero uses 100 as the mug shot max
health, and positive values used directly as the mug shot max health.

26
src/dobject.h
View file

@ -90,11 +90,11 @@ enum EMetaType
class FMetaData
{
private:
FMetaData (EMetaType type, DWORD id) : Type(type), ID(id) {}
FMetaData (EMetaType type, uint32 id) : Type(type), ID(id) {}
FMetaData *Next;
EMetaType Type;
DWORD ID;
uint32 ID;
union
{
int Int;
@ -113,19 +113,19 @@ public:
~FMetaTable();
FMetaTable &operator = (const FMetaTable &other);
void SetMetaInt (DWORD id, int parm);
void SetMetaFixed (DWORD id, fixed_t parm);
void SetMetaString (DWORD id, const char *parm); // The string is copied
void SetMetaInt (uint32 id, int parm);
void SetMetaFixed (uint32 id, fixed_t parm);
void SetMetaString (uint32 id, const char *parm); // The string is copied
int GetMetaInt (DWORD id, int def=0) const;
fixed_t GetMetaFixed (DWORD id, fixed_t def=0) const;
const char *GetMetaString (DWORD id) const;
int GetMetaInt (uint32 id, int def=0) const;
fixed_t GetMetaFixed (uint32 id, fixed_t def=0) const;
const char *GetMetaString (uint32 id) const;
FMetaData *FindMeta (EMetaType type, DWORD id) const;
FMetaData *FindMeta (EMetaType type, uint32 id) const;
private:
FMetaData *Meta;
FMetaData *FindMetaDef (EMetaType type, DWORD id);
FMetaData *FindMetaDef (EMetaType type, uint32 id);
void FreeMeta ();
void CopyMeta (const FMetaTable *other);
};
@ -249,7 +249,7 @@ namespace GC
extern DObject *Root;
// Current white value for potentially-live objects.
extern DWORD CurrentWhite;
extern uint32 CurrentWhite;
// Current collector state.
extern EGCState State;
@ -264,7 +264,7 @@ namespace GC
extern int StepMul;
// Current white value for known-dead objects.
static inline DWORD OtherWhite()
static inline uint32 OtherWhite()
{
return CurrentWhite ^ OF_WhiteBits;
}
@ -446,7 +446,7 @@ private:
public:
DObject *ObjNext; // Keep track of all allocated objects
DObject *GCNext; // Next object in this collection list
DWORD ObjectFlags; // Flags for this object
uint32 ObjectFlags; // Flags for this object
public:
DObject ();

9
src/win32/i_input.cpp
View file

@ -207,6 +207,12 @@ bool GUIWndProcHook(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam, LRESU
if (GetKeyState(VK_SHIFT) & 0x8000) ev.data3 |= GKM_SHIFT;
if (GetKeyState(VK_CONTROL) & 0x8000) ev.data3 |= GKM_CTRL;
if (GetKeyState(VK_MENU) & 0x8000) ev.data3 |= GKM_ALT;
if (wParam == VK_PROCESSKEY)
{ // Use the scan code to determine the real virtual-key code.
// ImmGetVirtualKey() will supposedly do this, but it just returns
// VK_PROCESSKEY again.
wParam = MapVirtualKey((lParam >> 16) & 255, 1);
}
if ( (ev.data1 = MapVirtualKey(wParam, 2)) )
{
D_PostEvent(&ev);
@ -701,8 +707,11 @@ void I_GetEvent ()
if (mess.message == WM_QUIT)
exit (mess.wParam);
if (EAXEditWindow == 0 || !IsDialogMessage (EAXEditWindow, &mess))
{
if (GUICapture)
{
TranslateMessage (&mess);
}
DispatchMessage (&mess);
}
}

12
src/win32/i_main.cpp
View file

@ -917,18 +917,6 @@ void DoMain (HINSTANCE hInstance)
width = 512;
height = 384;
// Disable the input method editor (not present in Win95/NT4)
HMODULE imm32 = LoadLibrary("imm32.dll");
if (imm32 != NULL)
{
BOOL (WINAPI *DisableIME)(DWORD) = (BOOL(WINAPI *)(DWORD))GetProcAddress(imm32, "ImmDisableIME");
if (DisableIME != NULL)
{
DisableIME(0);
}
FreeLibrary(imm32);
}
// Many Windows structures that specify their size do so with the first
// element. DEVMODE is not one of those structures.
memset (&displaysettings, 0, sizeof(displaysettings));