not all compilers have __FUNCTION__ (mipspro)
This commit is contained in:
parent
bbb5259a88
commit
b44cd19809
2 changed files with 10 additions and 10 deletions
|
@ -19,7 +19,7 @@
|
||||||
// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
|
// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
|
||||||
// DEALINGS IN THE SOFTWARE.
|
// DEALINGS IN THE SOFTWARE.
|
||||||
|
|
||||||
// $Id: SystemTray.cc,v 1.15 2004/09/01 08:46:55 fluxgen Exp $
|
// $Id: SystemTray.cc,v 1.16 2004/10/21 10:38:25 akir Exp $
|
||||||
|
|
||||||
#include "SystemTray.hh"
|
#include "SystemTray.hh"
|
||||||
|
|
||||||
|
@ -111,7 +111,7 @@ SystemTray::SystemTray(const FbTk::FbWindow &parent):
|
||||||
m_window.setBackgroundPixmap(ParentRelative);
|
m_window.setBackgroundPixmap(ParentRelative);
|
||||||
|
|
||||||
// setup atom name to _NET_SYSTEM_TRAY_S<screen number>
|
// setup atom name to _NET_SYSTEM_TRAY_S<screen number>
|
||||||
char intbuff[16];
|
char intbuff[16];
|
||||||
sprintf(intbuff, "%d", m_window.screenNumber());
|
sprintf(intbuff, "%d", m_window.screenNumber());
|
||||||
std::string atom_name("_NET_SYSTEM_TRAY_S");
|
std::string atom_name("_NET_SYSTEM_TRAY_S");
|
||||||
atom_name += intbuff; // append number
|
atom_name += intbuff; // append number
|
||||||
|
@ -123,14 +123,14 @@ SystemTray::SystemTray(const FbTk::FbWindow &parent):
|
||||||
Window owner = XGetSelectionOwner(disp, tray_atom);
|
Window owner = XGetSelectionOwner(disp, tray_atom);
|
||||||
if (owner != 0) {
|
if (owner != 0) {
|
||||||
#ifdef DEBUG
|
#ifdef DEBUG
|
||||||
cerr<<__FILE__<<"("<<__FUNCTION__<<"): can't set owner!"<<endl;
|
cerr<<__FILE__<<"(SystemTray(const FbTk::FbWindow)): can't set owner!"<<endl;
|
||||||
#endif // DEBUG
|
#endif // DEBUG
|
||||||
return; // the're can't be more than one owner
|
return; // the're can't be more than one owner
|
||||||
}
|
}
|
||||||
|
|
||||||
// ok, it was free. Lets set owner
|
// ok, it was free. Lets set owner
|
||||||
#ifdef DEBUG
|
#ifdef DEBUG
|
||||||
cerr<<__FILE__<<"("<<__FUNCTION__<<"): SETTING OWNER!"<<endl;
|
cerr<<__FILE__<<"(SystemTray(const FbTk::FbWindow)): SETTING OWNER!"<<endl;
|
||||||
#endif // DEBUG
|
#endif // DEBUG
|
||||||
// set owner
|
// set owner
|
||||||
XSetSelectionOwner(disp, tray_atom, m_window.window(), CurrentTime);
|
XSetSelectionOwner(disp, tray_atom, m_window.window(), CurrentTime);
|
||||||
|
@ -222,7 +222,7 @@ bool SystemTray::clientMessage(const XClientMessageEvent &event) {
|
||||||
int type = event.data.l[1];
|
int type = event.data.l[1];
|
||||||
if (type == SYSTEM_TRAY_REQUEST_DOCK) {
|
if (type == SYSTEM_TRAY_REQUEST_DOCK) {
|
||||||
#ifndef DEBUG
|
#ifndef DEBUG
|
||||||
cerr<<"SystemTray::"<<__FUNCTION__<<": SYSTEM_TRAY_REQUEST_DOCK"<<endl;
|
cerr<<"SystemTray::clientMessage(const XClientMessageEvent): SYSTEM_TRAY_REQUEST_DOCK"<<endl;
|
||||||
cerr<<"window = event.data.l[2] = "<<event.data.l[2]<<endl;
|
cerr<<"window = event.data.l[2] = "<<event.data.l[2]<<endl;
|
||||||
#endif // DEBUG
|
#endif // DEBUG
|
||||||
addClient(event.data.l[2]);
|
addClient(event.data.l[2]);
|
||||||
|
@ -273,7 +273,7 @@ void SystemTray::addClient(Window win) {
|
||||||
FbTk::FbWindow *traywin = new TrayWindow(win);
|
FbTk::FbWindow *traywin = new TrayWindow(win);
|
||||||
|
|
||||||
#ifdef DEBUG
|
#ifdef DEBUG
|
||||||
cerr<<"SystemTray::"<<__FUNCTION__<<": 0x"<<hex<<win<<dec<<endl;
|
cerr<<"SystemTray::addClient(Window): 0x"<<hex<<win<<dec<<endl;
|
||||||
#endif // DEBUG
|
#endif // DEBUG
|
||||||
if (m_clients.empty())
|
if (m_clients.empty())
|
||||||
show();
|
show();
|
||||||
|
@ -298,7 +298,7 @@ void SystemTray::removeClient(Window win) {
|
||||||
return;
|
return;
|
||||||
|
|
||||||
#ifdef DEBUG
|
#ifdef DEBUG
|
||||||
cerr<<__FILE__<<"("<<__FUNCTION__<<"): 0x"<<hex<<win<<dec<<endl;
|
cerr<<__FILE__<<"(SystemTray::removeClient(Window)): 0x"<<hex<<win<<dec<<endl;
|
||||||
#endif // DEBUG
|
#endif // DEBUG
|
||||||
FbTk::FbWindow *traywin = *tray_it;
|
FbTk::FbWindow *traywin = *tray_it;
|
||||||
m_clients.erase(tray_it);
|
m_clients.erase(tray_it);
|
||||||
|
|
|
@ -22,7 +22,7 @@
|
||||||
// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
|
// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
|
||||||
// DEALINGS IN THE SOFTWARE.
|
// DEALINGS IN THE SOFTWARE.
|
||||||
|
|
||||||
// $Id: Window.cc,v 1.303 2004/10/18 01:24:24 akir Exp $
|
// $Id: Window.cc,v 1.304 2004/10/21 10:38:25 akir Exp $
|
||||||
|
|
||||||
#include "Window.hh"
|
#include "Window.hh"
|
||||||
|
|
||||||
|
@ -347,7 +347,7 @@ FluxboxWindow::~FluxboxWindow() {
|
||||||
m_client = 0;
|
m_client = 0;
|
||||||
|
|
||||||
if (m_clientlist.size() > 1) {
|
if (m_clientlist.size() > 1) {
|
||||||
cerr<<__FILE__<<"("<<__FUNCTION__<<") WARNING! clientlist > 1"<<endl;
|
cerr<<__FILE__<<"(~FluxboxWindow()) WARNING! clientlist > 1"<<endl;
|
||||||
while (!m_clientlist.empty()) {
|
while (!m_clientlist.empty()) {
|
||||||
detachClient(*m_clientlist.back());
|
detachClient(*m_clientlist.back());
|
||||||
}
|
}
|
||||||
|
@ -2041,7 +2041,7 @@ void FluxboxWindow::popupMenu() {
|
||||||
Determine if this is the lowest tab of them all
|
Determine if this is the lowest tab of them all
|
||||||
*/
|
*/
|
||||||
bool FluxboxWindow::isLowerTab() const {
|
bool FluxboxWindow::isLowerTab() const {
|
||||||
cerr<<__FILE__<<"("<<__FUNCTION__<<") TODO!"<<endl;
|
cerr<<__FILE__<<"(FluxboxWindow::isLowerTab()) TODO!"<<endl;
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue