Nemcio/SysTray-X
1
0
Fork 0
mirror of https://github.com/Ximi1970/systray-x.git synced 2026-05-07 04:57:47 +02:00
Code Issues Packages Projects Releases Activity

Remove x11 states

Browse Source
This commit is contained in:
Ximi1970
2023-08-13 21:08:13 +02:00
parent f4e4bea52e
commit 7493a19ecb
3 changed files with 5 additions and 91 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
app/SysTray-X/SysTray-X-app/windowctrl-unix.cpp
View File

@@ -38,7 +38,6 @@ WindowCtrlUnix::WindowCtrlUnix( QObject *parent ) : QObject( parent )
* Initialize
*/
m_tb_windows = QList< quint64 >();
m_tb_window_states_x11 = QMap< quint64, Preferences::WindowState >();
m_tb_window_positions = QMap< quint64, QPoint >();
m_tb_window_states = QMap< quint64, Preferences::WindowState >();
m_tb_window_hints = QMap< quint64, SizeHints >();
@@ -162,7 +161,6 @@ void WindowCtrlUnix::findWindows( qint64 pid )
QMap< quint64, QPoint > old_positions = m_tb_window_positions;
m_tb_windows = QList< quint64 >();
m_tb_window_states_x11 = QMap< quint64, Preferences::WindowState >();
m_tb_window_positions = QMap< quint64, QPoint >();
for( int i = 0 ; i < windows.length() ; ++i )
{
@@ -184,14 +182,6 @@ void WindowCtrlUnix::findWindows( qint64 pid )
{
m_tb_windows.append( win.window );
if( !m_tb_window_states.contains( win.window ) )
{
/*
* Set the startup state
*/
m_tb_window_states[ win.window ] = Preferences::STATE_NORMAL;
}
QPoint point;
if( old_positions.contains( win.window ) )
{
@@ -203,7 +193,7 @@ void WindowCtrlUnix::findWindows( qint64 pid )
qint32 n_wm_state;
void* wm_state_ptr = GetWindowProperty( m_display, win.window, "WM_STATE", &n_wm_state );
Preferences::WindowState state_x11 = Preferences::STATE_DOCKED;
Preferences::WindowState win_state = Preferences::STATE_DOCKED;
bool add_new_state = true;
if( wm_state_ptr != nullptr )
{
@@ -216,7 +206,7 @@ void WindowCtrlUnix::findWindows( qint64 pid )
/*
* Docked
*/
state_x11 = Preferences::STATE_DOCKED;
win_state = Preferences::STATE_DOCKED;
break;
}
@@ -226,7 +216,7 @@ void WindowCtrlUnix::findWindows( qint64 pid )
/*
* Normal
*/
state_x11 = Preferences::STATE_NORMAL;
win_state = Preferences::STATE_NORMAL;
break;
}
@@ -236,7 +226,7 @@ void WindowCtrlUnix::findWindows( qint64 pid )
/*
* Minimized
*/
state_x11 = Preferences::STATE_MINIMIZED;
win_state = Preferences::STATE_MINIMIZED;
break;
}
@@ -254,7 +244,7 @@ void WindowCtrlUnix::findWindows( qint64 pid )
if( add_new_state )
{
m_tb_window_states_x11[ win.window ] = state_x11;
m_tb_window_states[ win.window ] = win_state;
}
}
@@ -294,15 +284,6 @@ const Preferences::WindowState& WindowCtrlUnix::getWindowState( const quint64
}
/*
* Get the states of the TB windows.
*/
const Preferences::WindowState& WindowCtrlUnix::getWindowStateX11( const quint64 window )
{
return m_tb_window_states_x11[ window ];
}
/*
* Get window positions
*/

5
app/SysTray-X/SysTray-X-app/windowctrl-unix.h
View File

@@ -338,11 +338,6 @@ class WindowCtrlUnix : public QObject
*/
QList< quint64 > m_tb_windows;
/**
* @brief m_tb_window_states_x11. The Thunderbird window states.
*/
QMap< quint64, Preferences::WindowState > m_tb_window_states_x11;
/**
* @brief m_tb_window_positions. The Thunderbird window positions.
*/

62
app/SysTray-X/SysTray-X-app/windowctrl.cpp
View File

@@ -73,30 +73,6 @@ void WindowCtrl::slotWindowTest1()
// Do something.
// signalHideDefaultIconChange( true );
// emit signalShow();
// emit signalConsole( QString( "Found Ppid: %1" ).arg( getPpid() ) );
// emit signalConsole( QString( "Found XID: %1" ).arg( getWinId() ) );
// findWindow( "- Mozilla Thunderbird" );
// displayWindowElements( "- Mozilla Thunderbird" );
// findWindow( 4313 );
// displayWindowElements( getWinId() );
//#define MINIMIZE_TEST
#ifdef MINIMIZE_TEST
emit signalConsole( QString( "Pid: %1").arg( m_ppid ) );
findWindows( m_ppid );
QList< quint64 > win_ids = getWinIds();
emit signalConsole( QString( "Number of ids: %1" ).arg( win_ids.length() ) );
minimizeWindow( win_ids.at( 0 ) );
#endif
emit signalConsole("Test 1 done");
}
@@ -110,24 +86,6 @@ void WindowCtrl::slotWindowTest2()
// Do something.
// signalHideDefaultIconChange( false );
// emit signalHide();
// hideWindow( getWinId(), true );
//#define NORMALIZE_TEST
#ifdef NORMALIZE_TEST
emit signalConsole( QString( "Pid: %1").arg( m_ppid ) );
findWindows( m_ppid );
QList< quint64 > win_ids = getWinIds();
emit signalConsole( QString( "Number of ids: %1" ).arg( win_ids.length() ) );
normalizeWindow( win_ids.at( 0 ) );
#endif
emit signalConsole("Test 2 done");
}
@@ -140,16 +98,6 @@ void WindowCtrl::slotWindowTest3()
emit signalConsole("Test 3 started");
// Do something.
// hideWindow( getWinId(), false );
// emit signalConsole( QString( "Pid %1" ).arg( m_pid ) );
// emit signalConsole( QString( "Ppid %1" ).arg( m_ppid ) );
//#define FINDWINDOW_TEST
#ifdef FINDWINDOW_TEST
emit signalConsole( QString( "Pid: %1").arg( m_ppid ) );
findWindows( m_ppid );
#endif
emit signalConsole("Test 3 done");
}
@@ -164,12 +112,6 @@ void WindowCtrl::slotWindowTest4()
// Do something.
#ifdef Q_OS_UNIX
disableX11ErrorHandler();
#endif
emit signalConsole("Test 4 done");
}
@@ -300,11 +242,7 @@ void WindowCtrl::slotWindowState( Preferences::WindowState state )
/*
* Hide the window
*/
#ifdef Q_OS_UNIX
if( getWindowStateX11( win_ids[ i ] ) == Preferences::STATE_MINIMIZED )
#else
if( getWindowState( win_ids[ i ] ) == Preferences::STATE_MINIMIZED )
#endif
{
minimizeWindowToTray( win_ids.at( i ) );
}