no message

diff --git a/passer/MainForm.cs b/passer/MainForm.cs
index 046da18..29b52be 100644 (file)
--- a/passer/MainForm.cs
+++ b/passer/MainForm.cs
@@ -743,7 +743,6 @@ namespace Lugens.Passer
                                     r = Program.MainForm.DropdownForm.Bounds;
                                     if (r.Left > p.X || r.Right < p.X || r.Top > p.Y || r.Bottom < p.Y)
                                     {
-                                        Debug.WriteLine("MainFormOpen:4");
                                         //Program.MainForm.DoVisibleChange(false);
                                         Program.MainForm.Opacity = 0.4;
                                         Program.MainForm.DropdownForm.DoVisibleChange(false);

diff --git a/passer/Passer.suo b/passer/Passer.suo
index f06aee9..66de2bd 100644 (file)
Binary files a/passer/Passer.suo and b/passer/Passer.suo differ

diff --git a/passer/bin/Release/ghook.dll b/passer/bin/Release/ghook.dll
index f26d8fb..3661160 100644 (file)
Binary files a/passer/bin/Release/ghook.dll and b/passer/bin/Release/ghook.dll differ

diff --git a/todo_memo.txt b/todo_memo.txt
index 0590033..8b8953e 100644 (file)
--- a/todo_memo.txt
+++ b/todo_memo.txt
@@ -6,3 +6,5 @@
 \81E\83N\83\8a\83b\83v\83{\81[\83h\83R\83s\81[\82ª\82³\82ê\82È\82¢\82Æ\82«\82ª\82 \82é
 \81E\83z\83b\83g\83L\81[\82Æ\82©\82Ô\82é\83L\81[\8dÄ\90¶\82Å\89\9f\82µ\82½\82Ü\82Ü\82É\82È\82é
 \81E\83R\83}\83\93\83h\93o\98^\8e\9e\82É\83t\83@\83C\83\8b\82ª\91¶\8dÝ\82µ\82È\82¢\82Æ\82«\82Ì\95s\8bï\8d\87
+
+\81E\8c\9f\8dõ\83G\83\93\83W\83\93\82ÅTab\83L\81[\89\9f\82µ\82Ä\82à\83\8a\83X\83g\82ª\8fo\82Ä\82±\82È\82¢
\ No newline at end of file

diff --git a/vc/ghook/Release/ghook.dll b/vc/ghook/Release/ghook.dll
index d63f073..3661160 100644 (file)
Binary files a/vc/ghook/Release/ghook.dll and b/vc/ghook/Release/ghook.dll differ

diff --git a/vc/ghook/ghook.cpp b/vc/ghook/ghook.cpp
index cd9772f..0c087da 100644 (file)
--- a/vc/ghook/ghook.cpp
+++ b/vc/ghook/ghook.cpp
@@ -16,6 +16,7 @@
 
 #pragma data_seg(".GLOBALS")
 HHOOK g_hHook = NULL;
+HHOOK g_hMouseHook = NULL;
 HWND g_hWnd = NULL;
 POINT g_caretPos = {0, 0};
 char g_imeString[1024] = {'\0'};
@@ -30,6 +31,38 @@ int WINAPI DllMain(HINSTANCE hInstance, DWORD fdReason, LPVOID lpReserved)
        return TRUE;
 }
 
+LRESULT CALLBACK CallMouseProc(int nCode,WPARAM wp,LPARAM lp)
+{
+       POINT pt;
+    MOUSEHOOKSTRUCT *pms = (MOUSEHOOKSTRUCT*)lp;
+
+       if (nCode < 0 || g_hWnd == pms->hwnd) { 
+               return CallNextHookEx(g_hMouseHook, nCode, wp, lp); 
+       } 
+
+       switch(wp){
+               case WM_LBUTTONDOWN:
+               case WM_NCLBUTTONDOWN:
+                       pt.x = pms->pt.x;
+                       pt.y = pms->pt.y;
+                       //if(wp == WM_LBUTTONDOWN)
+                       //      ClientToScreen(pms->hwnd, &pt);
+                       PostMessage(g_hWnd, WM_APP_LBUTTONDOWN, pt.x, pt.y);
+                       break;
+               case WM_RBUTTONDOWN:
+               case WM_NCRBUTTONDOWN:
+                       pt.x = pms->pt.x;
+                       pt.y = pms->pt.y;
+                       //if(wp == WM_RBUTTONDOWN)
+                       //      ClientToScreen(pms->hwnd, &pt);
+                       PostMessage(g_hWnd, WM_APP_RBUTTONDOWN, pt.x, pt.y);
+                       break;
+       }
+
+       return CallNextHookEx(g_hMouseHook, nCode, wp, lp); 
+
+}
+
 LRESULT CALLBACK CallMsgProc(int nCode,WPARAM wp,LPARAM lp)
 {
        int size;
@@ -45,7 +78,7 @@ LRESULT CALLBACK CallMsgProc(int nCode,WPARAM wp,LPARAM lp)
                msg = (MSG *)lp;
 
                switch(msg->message){
-
+/*
                        case WM_LBUTTONDOWN:
                        case WM_NCLBUTTONDOWN:
                                pt.x = LOWORD(msg->lParam);
@@ -61,7 +94,7 @@ LRESULT CALLBACK CallMsgProc(int nCode,WPARAM wp,LPARAM lp)
                                if(msg->message == WM_RBUTTONDOWN)
                                        ClientToScreen(msg->hwnd, &pt);
                                PostMessage(g_hWnd, WM_APP_RBUTTONDOWN, pt.x, pt.y);
-                               break;
+                               break;*/
                        case WM_KEYUP:
                        case WM_SYSKEYUP:
                                PostMessage(g_hWnd, WM_APP_KEYUP, msg->wParam, msg->lParam);
@@ -116,12 +149,14 @@ extern "C" __declspec(dllexport) void SetHook(HWND hWnd)
 {
        g_hWnd = hWnd;
     g_hHook = SetWindowsHookEx(WH_GETMESSAGE, CallMsgProc, hInst, 0);
+    g_hMouseHook = SetWindowsHookEx(WH_MOUSE_LL, CallMouseProc, hInst, 0);
 }
 
 //\83t\83b\83N\82ð\89ð\8f\9c\82·\82é
 extern "C" __declspec(dllexport) void FreeHook(void)
 {
     UnhookWindowsHookEx(g_hHook);
+    UnhookWindowsHookEx(g_hMouseHook);
 }
 
 //\83L\83\83\83\8c\83b\83g\88Ê\92u\82ð\8eæ\93¾\82·\82é

diff --git a/vc/ghook/ghook.sln b/vc/ghook/ghook.sln
index 03965cf..c010a7c 100644 (file)
--- a/vc/ghook/ghook.sln
+++ b/vc/ghook/ghook.sln
@@ -1,7 +1,7 @@
 
-Microsoft Visual Studio Solution File, Format Version 10.00
-# Visual C++ Express 2008
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ghook", "ghook.vcproj", "{4CBCC6CA-22D9-48A0-8CEB-301E9F0BD1EB}"
+Microsoft Visual Studio Solution File, Format Version 11.00
+# Visual Studio 2010
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ghook", "ghook.vcxproj", "{4CBCC6CA-22D9-48A0-8CEB-301E9F0BD1EB}"
 EndProject
 Global
        GlobalSection(SolutionConfigurationPlatforms) = preSolution

diff --git a/vc/ghook/ghook.suo b/vc/ghook/ghook.suo
index dd12ec2..aeef884 100644 (file)
Binary files a/vc/ghook/ghook.suo and b/vc/ghook/ghook.suo differ