diff options
author | akir <akir> | 2004-10-21 10:38:25 (GMT) |
---|---|---|
committer | akir <akir> | 2004-10-21 10:38:25 (GMT) |
commit | b44cd198090dc5e3aec8a9f2b927f2b2ba80cf63 (patch) | |
tree | e5d30c79e36e40cee43bc93bda560b00b1cd0fbf | |
parent | bbb5259a8890cd59a94bdb3c360daa556f1c8855 (diff) | |
download | fluxbox-b44cd198090dc5e3aec8a9f2b927f2b2ba80cf63.zip fluxbox-b44cd198090dc5e3aec8a9f2b927f2b2ba80cf63.tar.bz2 |
not all compilers have __FUNCTION__ (mipspro)
-rw-r--r-- | src/SystemTray.cc | 14 | ||||
-rw-r--r-- | src/Window.cc | 6 |
2 files changed, 10 insertions, 10 deletions
diff --git a/src/SystemTray.cc b/src/SystemTray.cc index e752409..5f9ba8f 100644 --- a/src/SystemTray.cc +++ b/src/SystemTray.cc | |||
@@ -19,7 +19,7 @@ | |||
19 | // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER | 19 | // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER |
20 | // DEALINGS IN THE SOFTWARE. | 20 | // DEALINGS IN THE SOFTWARE. |
21 | 21 | ||
22 | // $Id: SystemTray.cc,v 1.15 2004/09/01 08:46:55 fluxgen Exp $ | 22 | // $Id: SystemTray.cc,v 1.16 2004/10/21 10:38:25 akir Exp $ |
23 | 23 | ||
24 | #include "SystemTray.hh" | 24 | #include "SystemTray.hh" |
25 | 25 | ||
@@ -111,7 +111,7 @@ SystemTray::SystemTray(const FbTk::FbWindow &parent): | |||
111 | m_window.setBackgroundPixmap(ParentRelative); | 111 | m_window.setBackgroundPixmap(ParentRelative); |
112 | 112 | ||
113 | // setup atom name to _NET_SYSTEM_TRAY_S<screen number> | 113 | // setup atom name to _NET_SYSTEM_TRAY_S<screen number> |
114 | char intbuff[16]; | 114 | char intbuff[16]; |
115 | sprintf(intbuff, "%d", m_window.screenNumber()); | 115 | sprintf(intbuff, "%d", m_window.screenNumber()); |
116 | std::string atom_name("_NET_SYSTEM_TRAY_S"); | 116 | std::string atom_name("_NET_SYSTEM_TRAY_S"); |
117 | atom_name += intbuff; // append number | 117 | atom_name += intbuff; // append number |
@@ -123,14 +123,14 @@ SystemTray::SystemTray(const FbTk::FbWindow &parent): | |||
123 | Window owner = XGetSelectionOwner(disp, tray_atom); | 123 | Window owner = XGetSelectionOwner(disp, tray_atom); |
124 | if (owner != 0) { | 124 | if (owner != 0) { |
125 | #ifdef DEBUG | 125 | #ifdef DEBUG |
126 | cerr<<__FILE__<<"("<<__FUNCTION__<<"): can't set owner!"<<endl; | 126 | cerr<<__FILE__<<"(SystemTray(const FbTk::FbWindow)): can't set owner!"<<endl; |
127 | #endif // DEBUG | 127 | #endif // DEBUG |
128 | return; // the're can't be more than one owner | 128 | return; // the're can't be more than one owner |
129 | } | 129 | } |
130 | 130 | ||
131 | // ok, it was free. Lets set owner | 131 | // ok, it was free. Lets set owner |
132 | #ifdef DEBUG | 132 | #ifdef DEBUG |
133 | cerr<<__FILE__<<"("<<__FUNCTION__<<"): SETTING OWNER!"<<endl; | 133 | cerr<<__FILE__<<"(SystemTray(const FbTk::FbWindow)): SETTING OWNER!"<<endl; |
134 | #endif // DEBUG | 134 | #endif // DEBUG |
135 | // set owner | 135 | // set owner |
136 | XSetSelectionOwner(disp, tray_atom, m_window.window(), CurrentTime); | 136 | XSetSelectionOwner(disp, tray_atom, m_window.window(), CurrentTime); |
@@ -222,7 +222,7 @@ bool SystemTray::clientMessage(const XClientMessageEvent &event) { | |||
222 | int type = event.data.l[1]; | 222 | int type = event.data.l[1]; |
223 | if (type == SYSTEM_TRAY_REQUEST_DOCK) { | 223 | if (type == SYSTEM_TRAY_REQUEST_DOCK) { |
224 | #ifndef DEBUG | 224 | #ifndef DEBUG |
225 | cerr<<"SystemTray::"<<__FUNCTION__<<": SYSTEM_TRAY_REQUEST_DOCK"<<endl; | 225 | cerr<<"SystemTray::clientMessage(const XClientMessageEvent): SYSTEM_TRAY_REQUEST_DOCK"<<endl; |
226 | cerr<<"window = event.data.l[2] = "<<event.data.l[2]<<endl; | 226 | cerr<<"window = event.data.l[2] = "<<event.data.l[2]<<endl; |
227 | #endif // DEBUG | 227 | #endif // DEBUG |
228 | addClient(event.data.l[2]); | 228 | addClient(event.data.l[2]); |
@@ -273,7 +273,7 @@ void SystemTray::addClient(Window win) { | |||
273 | FbTk::FbWindow *traywin = new TrayWindow(win); | 273 | FbTk::FbWindow *traywin = new TrayWindow(win); |
274 | 274 | ||
275 | #ifdef DEBUG | 275 | #ifdef DEBUG |
276 | cerr<<"SystemTray::"<<__FUNCTION__<<": 0x"<<hex<<win<<dec<<endl; | 276 | cerr<<"SystemTray::addClient(Window): 0x"<<hex<<win<<dec<<endl; |
277 | #endif // DEBUG | 277 | #endif // DEBUG |
278 | if (m_clients.empty()) | 278 | if (m_clients.empty()) |
279 | show(); | 279 | show(); |
@@ -298,7 +298,7 @@ void SystemTray::removeClient(Window win) { | |||
298 | return; | 298 | return; |
299 | 299 | ||
300 | #ifdef DEBUG | 300 | #ifdef DEBUG |
301 | cerr<<__FILE__<<"("<<__FUNCTION__<<"): 0x"<<hex<<win<<dec<<endl; | 301 | cerr<<__FILE__<<"(SystemTray::removeClient(Window)): 0x"<<hex<<win<<dec<<endl; |
302 | #endif // DEBUG | 302 | #endif // DEBUG |
303 | FbTk::FbWindow *traywin = *tray_it; | 303 | FbTk::FbWindow *traywin = *tray_it; |
304 | m_clients.erase(tray_it); | 304 | m_clients.erase(tray_it); |
diff --git a/src/Window.cc b/src/Window.cc index 18570a5..88d12b0 100644 --- a/src/Window.cc +++ b/src/Window.cc | |||
@@ -22,7 +22,7 @@ | |||
22 | // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER | 22 | // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER |
23 | // DEALINGS IN THE SOFTWARE. | 23 | // DEALINGS IN THE SOFTWARE. |
24 | 24 | ||
25 | // $Id: Window.cc,v 1.303 2004/10/18 01:24:24 akir Exp $ | 25 | // $Id: Window.cc,v 1.304 2004/10/21 10:38:25 akir Exp $ |
26 | 26 | ||
27 | #include "Window.hh" | 27 | #include "Window.hh" |
28 | 28 | ||
@@ -347,7 +347,7 @@ FluxboxWindow::~FluxboxWindow() { | |||
347 | m_client = 0; | 347 | m_client = 0; |
348 | 348 | ||
349 | if (m_clientlist.size() > 1) { | 349 | if (m_clientlist.size() > 1) { |
350 | cerr<<__FILE__<<"("<<__FUNCTION__<<") WARNING! clientlist > 1"<<endl; | 350 | cerr<<__FILE__<<"(~FluxboxWindow()) WARNING! clientlist > 1"<<endl; |
351 | while (!m_clientlist.empty()) { | 351 | while (!m_clientlist.empty()) { |
352 | detachClient(*m_clientlist.back()); | 352 | detachClient(*m_clientlist.back()); |
353 | } | 353 | } |
@@ -2041,7 +2041,7 @@ void FluxboxWindow::popupMenu() { | |||
2041 | Determine if this is the lowest tab of them all | 2041 | Determine if this is the lowest tab of them all |
2042 | */ | 2042 | */ |
2043 | bool FluxboxWindow::isLowerTab() const { | 2043 | bool FluxboxWindow::isLowerTab() const { |
2044 | cerr<<__FILE__<<"("<<__FUNCTION__<<") TODO!"<<endl; | 2044 | cerr<<__FILE__<<"(FluxboxWindow::isLowerTab()) TODO!"<<endl; |
2045 | return true; | 2045 | return true; |
2046 | } | 2046 | } |
2047 | 2047 | ||