refactoring close_window() allow by pid, window.h [ci skip]

This commit is contained in:
vcaesar 2018-08-23 12:03:55 -04:00
parent 60c7f1fbb1
commit 338a8b9292

View File

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