laipeng/robotgo
1
0
Fork 0
mirror of https://github.com/go-vgo/robotgo.git synced 2025-06-01 14:43:55 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #159 from go-vgo/dev

Browse Source 
refactoring close_window() allow by pid
This commit is contained in:
vz 2018-08-23 12:10:12 -04:00 committed by GitHub
commit 1d7f43f3c8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 35 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
robotgo.go
View File

@ -1358,8 +1358,21 @@ func MaxWindow(pid int32, args ...interface{}) {
}
// CloseWindow close the window
func CloseWindow() {
C.close_window()
func CloseWindow(args ...int32) {
if len(args) <= 0 {
C.close_main_window()
return
}
var hwnd, isHwnd int32
if len(args) > 0 {
hwnd = args[0]
}
if len(args) > 1 {
isHwnd = args[1]
}
C.close_window(C.uintptr(hwnd), C.uintptr(isHwnd))
}
// SetHandle set the window handle

4
window/goWindow.h
View File

@ -75,8 +75,8 @@ void max_window(uintptr pid, bool state, uintptr isHwnd){
#endif
}
void close_window(void){
CloseWin();
void close_window(uintptr pid, uintptr isHwnd){
close_window_by_PId(pid, isHwnd);
}
bool set_handle(uintptr handle){

22
window/window.h
View File

@ -20,6 +20,7 @@ bool IsAxEnabled(bool options);
MData GetActive(void);
void initWindow();
char* get_title_by_hand(MData m_data);
void close_window_by_Id(MData m_data);
//int findwindow()
@ -538,15 +539,28 @@ void SetTopMost(bool state){
#endif
}
void close_main_window (){
// Check if the window is valid
if (!IsValid()) { return; }
close_window_by_Id(mData);
}
void close_window_by_PId(uintptr pid, uintptr isHwnd){
MData win = set_hand_pid(pid, isHwnd);
close_window_by_Id(win);
}
// CloseWindow
void CloseWin(void){
void close_window_by_Id(MData m_data){
// Check window validity
if (!IsValid()) {return;}
#if defined(IS_MACOSX)
AXUIElementRef b = NULL;
// Retrieve the close button of this window
if (AXUIElementCopyAttributeValue(mData.AxID,
if (AXUIElementCopyAttributeValue(m_data.AxID,
kAXCloseButtonAttribute, (CFTypeRef*) &b)
== kAXErrorSuccess && b != NULL) {
// Simulate button press on the close button
@ -562,11 +576,11 @@ void CloseWin(void){
XDismissErrors();
// Close the window
XDestroyWindow(rDisplay, mData.XWin);
XDestroyWindow(rDisplay, m_data.XWin);
#elif defined(IS_WINDOWS)
PostMessage(mData.HWnd, WM_CLOSE, 0, 0);
PostMessage(m_data.HWnd, WM_CLOSE, 0, 0);
#endif
}