ahkmingw exported dllmain

Author: tinku99

AutoHotkeyx.cpp

@@ -362,7 +362,7 @@ EXPORT int ahkdll(char *fileName, char *argv, char *args)
 // probably for window creation
 // Todo: better cleanup in DLL_PROCESS_DETACH: windows, variables, no exit from script
 
-BOOL WINAPI DllMain(HINSTANCE hInstance,DWORD fwdReason, LPVOID lpvReserved)
+EXPORT BOOL WINAPI DllMain(HINSTANCE hInstance,DWORD fwdReason, LPVOID lpvReserved)
  {
 switch(fwdReason)
  {

ahkmingw_linux.depend

@@ -34,10 +34,10 @@
 	"keyboard_mouse.h"
 	"script.h"
 
-1252537421 /home/naveen/source/ahkmingw/keyboard_mouse.h
+1253411318 /home/naveen/source/ahkmingw/keyboard_mouse.h
 	"defines.h"
 
-1252041773 /home/naveen/source/ahkmingw/defines.h
+1253411318 /home/naveen/source/ahkmingw/defines.h
 	"stdafx.h"
 	<pshpack1.h>
 	<pshpack4.h>
@@ -139,7 +139,7 @@
 	"globaldata.h"
 	"window.h"
 
-1251585310 source:/home/naveen/source/ahkmingw/keyboard_mouse.cpp
+1253412186 source:/home/naveen/source/ahkmingw/keyboard_mouse.cpp
 	"stdafx.h"
 	"keyboard_mouse.h"
 	"globaldata.h"
@@ -272,7 +272,7 @@
 	"resource.h"
 	<winresrc.h>
 
-1253159917 source:/home/naveen/source/ahkmingw/script.cpp
+1253411318 source:/home/naveen/source/ahkmingw/script.cpp
 	"stdafx.h"
 	"script.h"
 	"globaldata.h"
@@ -433,7 +433,7 @@
 	"var.h"
 	"globaldata.h"
 
-1253155728 source:/home/naveen/source/ahkmingw/window.cpp
+1253414384 source:/home/naveen/source/ahkmingw/window.cpp
 	"stdafx.h"
 	"window.h"
 	"util.h"
@@ -710,7 +710,7 @@
 
 1252537421 /home/naveen/source/ahkmingw/exports.h
 
-1253336267 source:/home/naveen/source/ahkmingw/exports.cpp
+1253413540 source:/home/naveen/source/ahkmingw/exports.cpp
 	"stdafx.h"
 	"globaldata.h"
 	"application.h"

bin/send.ahk

@@ -1,8 +1,8 @@
-; #InstallKeybdHook
-; #UseHook 
+#InstallKeybdHook
+#UseHook 
 ; SendMode Input
 
-#IfWinActive emacs
+#IfWinActive Z
 a::
 msgbox test
 return

exports.cpp

@@ -57,7 +57,12 @@ EXPORT int ahkLabel(char *aLabelName)
 
 EXPORT int ahkKey(char *keys) // N11 sendahk
 {
-SendKeys(keys, false, SM_EVENT, 0, 1);
+// SendKeys(keys, false, SM_EVENT, 0, 1);
+	sc_type aSC = TextToSC(keys);
+	vk_type aVK = TextToVK(keys);
+	// KeyEvent(KEYDOWNANDUP, aVK, 0, 0, false, 0);
+	 keybd_event((byte)aVK, (byte)aSC, 0, 0);
+
 return 0;
 }
 

keyboard_mouse.cpp

@@ -133,7 +133,7 @@ void SendKeys(char *aKeys, bool aSendRaw, SendModes aSendModeOrig, HWND aTargetW
 			keybd_layout_thread = GetWindowThreadProcessId(active_window, NULL);
 		//else no foreground window, so keep keybd_layout_thread at default.
 	}
-	sTargetKeybdLayout = GetKeyboardLayout(keybd_layout_thread); // If keybd_layout_thread==0, this will get our thread's own layout, which seems like the best/safest default.
+	sTargetKeybdLayout = g_HKL; // N11 GetKeyboardLayout(keybd_layout_thread); // If keybd_layout_thread==0, this will get our thread's own layout, which seems like the best/safest default.
 	sTargetLayoutHasAltGr = LayoutHasAltGr(sTargetKeybdLayout);  // Note that WM_INPUTLANGCHANGEREQUEST is not monitored by MsgSleep for the purpose of caching our thread's keyboard layout.  This is because it would be unreliable if another msg pump such as MsgBox is running.  Plus it hardly helps perf. at all, and hurts maintainability.
 
 	// Below is now called with "true" so that the hook's modifier state will be corrected (if necessary)
@@ -1552,8 +1552,8 @@ void KeyEvent(KeyEventTypes aEventType, vk_type aVK, sc_type aSC, HWND aTargetWi
 			{
 				// Below is similar to the macro "Get_active_window_keybd_layout":
 				HWND active_window;
-				target_keybd_layout = GetKeyboardLayout((active_window = GetForegroundWindow())\
-					? GetWindowThreadProcessId(active_window, NULL) : 0); // When no foreground window, the script's own layout seems like the safest default.
+				target_keybd_layout = g_HKL ;// N11 GetKeyboardLayout((active_window = GetForegroundWindow())\
+					// ? GetWindowThreadProcessId(active_window, NULL) : 0); // When no foreground window, the script's own layout seems like the safest default.
 				target_layout_has_altgr = LayoutHasAltGr(target_keybd_layout); // In the case of this else's "if", target_layout_has_altgr was already set properly higher above.
 			}
 			if (target_layout_has_altgr != LAYOUT_UNDETERMINED) // This layout's AltGr status is already known with certainty.

window.cpp

@@ -548,11 +548,11 @@ HWND WinExist(global_struct &aSettings, char *aTitle, char *aText, char *aExclud
 {
      if (g_script.xwingetid) // ahkxN11
         {
-        printf("trying winexist %s", aTitle); // todo: remove this debug line
+      //  printf("trying winexist %s", aTitle); // todo: remove this debug line
          int xwin = g_script.xwingetid(aTitle);
          if (xwin)
          {
-             printf("exists %s %d", aTitle, xwin); // todo: remove this debug line
+          //   printf("exists %s %d", aTitle, xwin); // todo: remove this debug line
             return (HWND)xwin;
          }
         }