8:02 p.m.
Author: jmagne
Update of /cvs/dirsec/esc/src/app/xpcom/tray
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1548
Modified Files:
rhLinuxTray.cpp
Log Message:
Add time stamp to log messages.
Index: rhLinuxTray.cpp
===================================================================
RCS file: /cvs/dirsec/esc/src/app/xpcom/tray/rhLinuxTray.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- rhLinuxTray.cpp 27 Sep 2006 17:21:58 -0000 1.3
+++ rhLinuxTray.cpp 24 Feb 2007 02:02:37 -0000 1.4
@@ -37,6 +37,7 @@
static PRLogModuleInfo *trayLog = PR_NewLogModule("tray");
+
rhTray::rhTray()
{
/* member initializers and constructor code */
@@ -46,7 +47,8 @@
rhTray::~rhTray()
{
- PR_LOG( trayLog, PR_LOG_DEBUG, ("rhTray::~rhTray\n"));
+ char tBuff[56];
+ PR_LOG( trayLog, PR_LOG_DEBUG, ("%s
rhTray::~rhTray\n",GetTStamp(tBuff,56)));
Cleanup();
@@ -56,12 +58,12 @@
NS_IMETHODIMP rhTray::Setwindnotifycallback(rhITrayWindNotify *jsNotify)
{
- PR_LOG( trayLog, PR_LOG_DEBUG, ("rhTray::Setwindnotifycallback\n"));
+ char tBuff[56];
+ PR_LOG( trayLog, PR_LOG_DEBUG, ("%s
rhTray::Setwindnotifycallback\n",GetTStamp(tBuff,56)));
if(jsNotify)
AddTrayWindNotifyListener(jsNotify);
-
return NS_OK;
}
@@ -69,9 +71,9 @@
NS_IMETHODIMP rhTray::Unsetwindnotifycallback(rhITrayWindNotify *jsNotify)
{
+ char tBuff[56];
-
- PR_LOG( trayLog, PR_LOG_DEBUG, ("rhTray::Unsetwindnotifycallback\n"));
+ PR_LOG( trayLog, PR_LOG_DEBUG, ("%s
rhTray::Unsetwindnotifycallback\n",GetTStamp(tBuff,56)));
if(jsNotify)
RemoveTrayWindNotifyListener(jsNotify);
@@ -82,12 +84,14 @@
/* void add (); */
NS_IMETHODIMP rhTray::Add(nsIBaseWindow *aWindow)
{
-
-
+ char tBuff[56];
NS_ENSURE_ARG(aWindow);
- PR_LOG( trayLog, PR_LOG_DEBUG, ("rhTray::Add %p \n",aWindow));
+ PR_LOG( trayLog, PR_LOG_DEBUG, ("%s rhTray::Add %p
\n",GetTStamp(tBuff,56),aWindow));
HRESULT res = Initialize();
+
+ PR_LOG( trayLog, PR_LOG_DEBUG, ("%s rhTray::Add Initialize res %d
\n",GetTStamp(tBuff,56),res));
+
if(res != S_OK)
{
return NS_ERROR_FAILURE;
@@ -104,23 +108,23 @@
/* void remove (); */
NS_IMETHODIMP rhTray::Remove(nsIBaseWindow *aWindow)
{
- PR_LOG( trayLog, PR_LOG_DEBUG, ("rhTray::Remove window %p \n",aWindow));
+ char tBuff[56];
+ PR_LOG( trayLog, PR_LOG_DEBUG, ("%s rhTray::Remove window %p
\n",GetTStamp(tBuff,56),aWindow));
- if(!aWindow)
+ if(!aWindow)
return NS_OK;
- HRESULT res = RemoveListener(aWindow);
+ HRESULT res = RemoveListener(aWindow);
- if(res != S_OK)
- {
- return NS_ERROR_FAILURE;
- }
- return NS_OK;
+ if(res != S_OK)
+ {
+ return NS_ERROR_FAILURE;
+ }
+ return NS_OK;
}
NS_IMETHODIMP rhTray::Hide(nsIBaseWindow *aWindow)
{
-
rhTrayWindowListener *listener = rhTray::mWindowMap[aWindow];
if(listener)
@@ -130,27 +134,22 @@
}
return NS_OK;
-
}
NS_IMETHODIMP rhTray::Show(nsIBaseWindow *aWindow)
{
-
rhTrayWindowListener *listener = rhTray::mWindowMap[aWindow];
if(listener)
{
listener->ShowWindow();
-
}
return NS_OK;
-
}
NS_IMETHODIMP rhTray::IsInitializedAlready(PRBool *_retval)
{
-
*_retval = 0;
if(rhTray::mInitialized > 1)
@@ -158,27 +157,20 @@
rhTray::mInitialized ++;
-
return NS_OK;
-
-
-
}
NS_IMETHODIMP rhTray::Sendnotification(const char *aTitle,const char *aMessage,PRUint32
aSeverity,PRUint32 aTimeout, const char *aIcon)
{
-
if(aMessage)
notify_icon_send_tooltip_msg(aTitle,aMessage,aSeverity,aTimeout,aIcon);
return NS_OK;
-
}
/* void hideall (); */
NS_IMETHODIMP rhTray::Hideall()
{
-
HideAllListeners();
return NS_OK;
}
@@ -193,7 +185,6 @@
/* void settooltipmsg (in string aMessage); */
NS_IMETHODIMP rhTray::Settooltipmsg(const char *aMessage)
{
-
if(aMessage)
notify_icon_set_static_tooltip(aMessage);
@@ -203,43 +194,35 @@
/* void seticonimage (in string aIcon); */
NS_IMETHODIMP rhTray::Seticonimage(const char *aIcon)
{
-
-
return NS_OK;
}
/* void hideicon (); */
NS_IMETHODIMP rhTray::Hideicon(void)
{
-
-
notify_icon_hide();
-
return NS_OK;
}
/* void showicon (); */
NS_IMETHODIMP rhTray::Showicon(void)
{
-
notify_icon_show();
-
return NS_OK;
}
HRESULT rhTray::Initialize()
{
+ char tBuff[56];
+ PR_LOG( trayLog, PR_LOG_DEBUG, ("%s rhTray::Initialize entering... mInitialized:
%d \n",GetTStamp(tBuff,56),mInitialized));
if(mInitialized)
{
return S_OK;
}
- PR_LOG( trayLog, PR_LOG_DEBUG, ("rhTray::Initialize \n"));
-
-
+ PR_LOG( trayLog, PR_LOG_DEBUG, ("%s rhTray::Initialize
\n",GetTStamp(tBuff,56)));
g_set_print_handler(rhTray::TrayPrintHandler);
-
notify_icon_create_with_image_file(COOLKEY_ICON);
HRESULT res = notify_icon_created_ok();
@@ -248,19 +231,17 @@
{
return E_FAIL;
}
-
GtkWidget *icon_widget = notify_icon_get_box_widget();
if(icon_widget)
{
g_signal_connect(G_OBJECT(icon_widget), "button-press-event",
G_CALLBACK(rhTray::IconCBProc), NULL);
-
}
res = CreateEventWindow();
- PR_LOG( trayLog, PR_LOG_DEBUG, ("rhTray::Initialize result of CreateIconMenu %d
\n",res));
+ PR_LOG( trayLog, PR_LOG_DEBUG, ("%s rhTray::Initialize result of CreateIconMenu
%d \n",GetTStamp(tBuff,56),res));
if(res != S_OK)
{
@@ -269,7 +250,6 @@
mInitialized = 1;
-
return S_OK;
}
@@ -280,7 +260,8 @@
HRESULT rhTray::Cleanup()
{
- PR_LOG( trayLog, PR_LOG_DEBUG, ("rhTray::Cleanup.\n"));
+ char tBuff[56];
+ PR_LOG( trayLog, PR_LOG_DEBUG, ("%s
rhTray::Cleanup.\n",GetTStamp(tBuff,56)));
RemoveAllListeners();
DestroyEventWindow();
@@ -291,32 +272,27 @@
void rhTray::ShowAllListeners()
{
-
- PR_LOG( trayLog, PR_LOG_DEBUG, ("rhTray::ShowAllListeners.\n"));
+ char tBuff[56];
+ PR_LOG( trayLog, PR_LOG_DEBUG, ("%s
rhTray::ShowAllListeners.\n",GetTStamp(tBuff,56)));
map< nsIBaseWindow *, rhTrayWindowListener *>::iterator i;
rhTrayWindowListener *cur = NULL;
for(i = rhTray::mWindowMap.begin(); i!= rhTray::mWindowMap.end(); i++)
{
-
- cur = (*i).second;
+ cur = (*i).second;
if(cur)
{
cur->ShowWindow();
-
}
-
}
-
-
}
-
void rhTray::HideAllListeners()
{
- PR_LOG( trayLog, PR_LOG_DEBUG, ("rhTray::HideAllListeners.\n"));
+ char tBuff[56];
+ PR_LOG( trayLog, PR_LOG_DEBUG, ("%s
rhTray::HideAllListeners.\n",GetTStamp(tBuff,56)));
map< nsIBaseWindow *, rhTrayWindowListener *>::iterator i;
@@ -329,28 +305,23 @@
if(cur)
{
cur->HideWindow();
-
}
-
}
-
}
HRESULT rhTray::DestroyEventWindow()
{
-
- PR_LOG( trayLog, PR_LOG_DEBUG, ("rhTray::DestroyEventWindow \n"));
+ char tBuff[56];
+ PR_LOG( trayLog, PR_LOG_DEBUG, ("%s rhTray::DestroyEventWindow
\n",GetTStamp(tBuff,56)));
rhTray::mWnd = 0;
-
return S_OK;
}
void rhTray::IconMenuCBProc(GtkWidget *widget, gpointer data)
{
-
- PR_LOG( trayLog, PR_LOG_DEBUG, ("rhTray::IconMenuCBProc data %s
\n",data));
-
+ char tBuff[56];
+ PR_LOG( trayLog, PR_LOG_DEBUG, ("%s rhTray::IconMenuCBProc data %s
\n",GetTStamp(tBuff,56),data));
if(!strcmp((char *)data,"icon.min"))
{
@@ -371,8 +342,8 @@
HRESULT rhTray::CreateIconMenu()
{
-
- PR_LOG( trayLog, PR_LOG_DEBUG, ("rhTray::CreateIconMenu \n"));
+ char tBuff[56];
+ PR_LOG( trayLog, PR_LOG_DEBUG, ("%s rhTray::CreateIconMenu
\n",GetTStamp(tBuff,56)));
if(mIconMenu)
return E_FAIL;
@@ -407,20 +378,17 @@
void rhTray::IconCBProc(GtkWidget *button, GdkEventButton *event, void *data)
{
-
- PR_LOG( trayLog, PR_LOG_DEBUG, ("rhTray::IconCBProc \n"));
-
+ char tBuff[56];
+ PR_LOG( trayLog, PR_LOG_DEBUG, ("%s rhTray::IconCBProc
\n",GetTStamp(tBuff,56)));
if(event->type != GDK_BUTTON_PRESS)
{
return;
-
}
if(event->button == 1)
{
-
- PR_LOG( trayLog, PR_LOG_DEBUG, ("rhTray::IconCBProc Clicked!\n"));
+ PR_LOG( trayLog, PR_LOG_DEBUG, ("%s rhTray::IconCBProc
Clicked!\n",GetTStamp(tBuff,56)));
NotifyTrayWindListeners(MENU_EVT,MENU_SHOW);
rhTray::ShowAllListeners();
@@ -430,7 +398,6 @@
if(event->button == 2 || event->button == 3)
{
-
if(mIconMenu)
{
g_print("trying to create popup menu. \n");
@@ -449,8 +416,8 @@
HRESULT rhTray::CreateEventWindow()
{
-
- PR_LOG( trayLog, PR_LOG_DEBUG, ("rhTray::CreateEventWindow \n"));
+ char tBuff[56];
+ PR_LOG( trayLog, PR_LOG_DEBUG, ("%s rhTray::CreateEventWindow
\n",GetTStamp(tBuff,56)));
HRESULT res = CreateIconMenu();
return res;
@@ -458,17 +425,15 @@
HRESULT rhTray::AddListener(nsIBaseWindow *aWindow)
{
-
+ char tBuff[56];
nsresult rv;
-
- PR_LOG( trayLog, PR_LOG_DEBUG, ("rhTray::AddListener %p \n",aWindow));
+ PR_LOG( trayLog, PR_LOG_DEBUG, ("%s rhTray::AddListener %p
\n",GetTStamp(tBuff,56),aWindow));
NS_ENSURE_ARG(aWindow);
- nativeWindow aNativeWindow;
+ nativeWindow aNativeWindow;
rv = aWindow->GetParentNativeWindow( &aNativeWindow );
-
if(NS_FAILED(rv))
{
return E_FAIL;
@@ -479,8 +444,7 @@
gdk_window_get_user_data (gWnd,(void **)&hWnd);
-
- PR_LOG(trayLog,PR_LOG_DEBUG, ("rhTray::AddListener is widget %p
.\n",hWnd));
+ PR_LOG(trayLog,PR_LOG_DEBUG, ("%s rhTray::AddListener is widget %p
.\n",GetTStamp(tBuff,56),hWnd));
if(!hWnd)
{
return E_FAIL;
@@ -493,22 +457,21 @@
if(already)
{
- PR_LOG( trayLog, PR_LOG_DEBUG, ("rhTray::AddWindowListener Window already
registered %p \n",aWindow));
+ PR_LOG( trayLog, PR_LOG_DEBUG, ("%s rhTray::AddWindowListener Window already
registered %p \n",GetTStamp(tBuff,56),aWindow));
return S_OK;
}
- PR_LOG( trayLog, PR_LOG_DEBUG, ("rhTray::AddWindowListener current level widget
%p \n",hWnd));
+ PR_LOG( trayLog, PR_LOG_DEBUG, ("%s rhTray::AddWindowListener current level
widget %p \n",GetTStamp(tBuff,56),hWnd));
hWnd = gtk_widget_get_toplevel( hWnd);
- PR_LOG( trayLog, PR_LOG_DEBUG, ("rhTray::AddWindowListener top level widget %p
\n",hWnd));
-
- if (GTK_WIDGET_TOPLEVEL (hWnd))
- {
- PR_LOG( trayLog, PR_LOG_DEBUG, ("rhTray::AddWindowListener is really a top
level widget %p \n",hWnd));
+ PR_LOG( trayLog, PR_LOG_DEBUG, ("%s rhTray::AddWindowListener top level widget
%p \n",GetTStamp(tBuff,56),hWnd));
- }
+ if (GTK_WIDGET_TOPLEVEL (hWnd))
+ {
+ PR_LOG( trayLog, PR_LOG_DEBUG, ("%s rhTray::AddWindowListener is really a
top level widget %p \n",GetTStamp(tBuff,56),hWnd));
+ }
rhTrayWindowListener *create = new rhTrayWindowListener(hWnd);
if(!create)
@@ -535,8 +498,8 @@
HRESULT rhTray::RemoveListener(nsIBaseWindow *aBaseWindow)
{
-
- PR_LOG( trayLog, PR_LOG_DEBUG, ("rhTray::RemoveWindowListener %p
\n",aBaseWindow));
+ char tBuff[56];
+ PR_LOG( trayLog, PR_LOG_DEBUG, ("%s rhTray::RemoveWindowListener %p
\n",GetTStamp(tBuff,56),aBaseWindow));
if(!aBaseWindow)
return S_OK;
@@ -563,22 +526,19 @@
HRESULT rhTray::RemoveAllListeners()
{
-
- PR_LOG( trayLog, PR_LOG_DEBUG, ("rhTray::RemoveAllListenesr\n"));
+ char tBuff[56];
+ PR_LOG( trayLog, PR_LOG_DEBUG, ("%s
rhTray::RemoveAllListenesr\n",GetTStamp(tBuff,56)));
map< nsIBaseWindow *, rhTrayWindowListener *>::iterator i;
rhTrayWindowListener *cur = NULL;
for(i = rhTray::mWindowMap.begin(); i!= rhTray::mWindowMap.end(); i++)
{
-
cur = (*i).second;
if(cur)
{
-
delete cur;
-
}
}
@@ -586,14 +546,13 @@
rhTray::mWindowMap.clear();
return S_OK;
-
}
/* void setmenuitemtext (in unsigned long aIndex, in string aText); */
NS_IMETHODIMP rhTray::Setmenuitemtext(PRUint32 aIndex, const char *aText)
{
-
- PR_LOG( trayLog, PR_LOG_DEBUG, ("rhTray::Setmenuitemtext: index: %d text %s.
\n",aIndex,aText));
+ char tBuff[56];
+ PR_LOG( trayLog, PR_LOG_DEBUG, ("%s rhTray::Setmenuitemtext: index: %d text %s.
\n",GetTStamp(tBuff,56),aIndex,aText));
if(!aText)
return S_OK;
@@ -611,17 +570,16 @@
unsigned int i = 0;
for (iterate = children; iterate; iterate=iterate->next)
{
- PR_LOG( trayLog, PR_LOG_DEBUG, ("rhTray::Setmenuitemtext: index: %d
\n",i));
+ PR_LOG( trayLog, PR_LOG_DEBUG, ("%s rhTray::Setmenuitemtext: index: %d
\n",GetTStamp(tBuff,56),i));
if(aIndex == i)
{
- PR_LOG( trayLog, PR_LOG_DEBUG, ("rhTray::Setmenuitemtext: About to
reset text of item %p. \n",(void *) iterate->data));
+ PR_LOG( trayLog, PR_LOG_DEBUG, ("%s rhTray::Setmenuitemtext: About to
reset text of item %p. \n",GetTStamp(tBuff,56),(void *) iterate->data));
if(iterate->data)
{
GtkWidget *label = gtk_bin_get_child(GTK_BIN(iterate->data));
if(label)
{
-
gtk_label_set_text(GTK_LABEL(label),aText);
}
}
@@ -639,55 +597,45 @@
rhITrayWindNotify* rhTray::GetTrayWindNotifyListener(rhITrayWindNotify *listener)
{
-
+ char tBuff[56];
std::list<nsCOMPtr<rhITrayWindNotify> >::const_iterator it;
for(it=gTrayWindNotifyListeners.begin(); it!=gTrayWindNotifyListeners.end(); ++it) {
- if((*it) == listener)
- {
- return (*it);
+ if((*it) == listener)
+ {
+ return (*it);
+ }
}
-}
- PR_LOG( trayLog, PR_LOG_DEBUG, ("rhCoolKey::GetNotifyKeyListener: looking for
%p returning NULL. \n",listener));
+ PR_LOG( trayLog, PR_LOG_DEBUG, ("%s rhCoolKey::GetNotifyKeyListener: looking
for %p returning NULL. \n",GetTStamp(tBuff,56),listener));
return nsnull;
-
-
-
}
int rhTray::GetTrayWindNotifyListSize()
{
return gTrayWindNotifyListeners.size();
-
}
-
void rhTray::AddTrayWindNotifyListener(rhITrayWindNotify *listener)
{
-
- PR_LOG( trayLog, PR_LOG_DEBUG, ("rhTray::AddTrayWindNotifyListener: %p
\n",
+ char tBuff[56];
+ PR_LOG( trayLog, PR_LOG_DEBUG, ("%s rhTray::AddTrayWindNotifyListener: %p
\n", GetTStamp(tBuff,56),
listener));
if(GetTrayWindNotifyListener(listener ))
{
-
- PR_LOG( trayLog, PR_LOG_DEBUG, ("rhTray::AddTrayWindNotifyListener: %p
listener already in list. \n",listener));
-
+ PR_LOG( trayLog, PR_LOG_DEBUG, ("%s rhTray::AddTrayWindNotifyListener: %p
listener already in list. \n",GetTStamp(tBuff,56),listener));
return ;
}
gTrayWindNotifyListeners.push_back(listener);
-
-
}
void rhTray::RemoveTrayWindNotifyListener(rhITrayWindNotify *listener)
{
-
if(!GetTrayWindNotifyListener(listener))
{
return;
@@ -695,14 +643,11 @@
gTrayWindNotifyListeners.remove(listener);
-
listener = NULL;
}
-
void rhTray::ClearTrayWindNotifyList()
{
-
while (gTrayWindNotifyListeners.size() > 0) {
rhITrayWindNotify * node = (gTrayWindNotifyListeners.front()).get();
@@ -716,7 +661,8 @@
void rhTray::NotifyTrayWindListeners(PRUint32 aEvent, PRUint32 aEventData,PRUint32
aKeyData,PRUint32 aData1, PRUint32 aData2)
{
- PR_LOG( trayLog, PR_LOG_DEBUG, ("rhTray::NotifyTrayWindListeners \n"));
+ char tBuff[56];
+ PR_LOG( trayLog, PR_LOG_DEBUG, ("%s rhTray::NotifyTrayWindListeners
\n",GetTStamp(tBuff,56)));
//Now notify all the listeners of the event
@@ -725,10 +671,9 @@
PRBool claimed = 0;
- PR_LOG( trayLog, PR_LOG_DEBUG, ("NotifyTrayWindListeners about to notify
\n"));
+ PR_LOG( trayLog, PR_LOG_DEBUG, ("%s NotifyTrayWindListeners about to notify
\n",GetTStamp(tBuff,56)));
((rhITrayWindNotify *) (*it))->RhTrayWindEventNotify(aEvent,aEventData,
aKeyData, aData1, aData2, &claimed);
-
}
}
@@ -736,9 +681,8 @@
void rhTray::TrayPrintHandler(const gchar *string)
{
-
- PR_LOG( trayLog, PR_LOG_DEBUG, ("rhTray:TrayPrintHandler. : %s \n",(char *)
string));
-
+ char tBuff[56];
+ PR_LOG( trayLog, PR_LOG_DEBUG, ("%s rhTray:TrayPrintHandler. : %s
\n",GetTStamp(tBuff,56),(char *) string));
}
//rhTrayWindowListener Methods
@@ -749,12 +693,14 @@
rhTrayWindowListener::~rhTrayWindowListener()
{
- PR_LOG( trayLog, PR_LOG_DEBUG,
("rhTrayWindowListener::rhTrayWindowListener.\n"));
+ char tBuff[56];
+ PR_LOG( trayLog, PR_LOG_DEBUG, ("%s
rhTrayWindowListener::rhTrayWindowListener.\n",GetTStamp(tBuff,56)));
}
HRESULT rhTrayWindowListener::Initialize()
{
- PR_LOG( trayLog, PR_LOG_DEBUG, ("rhTrayWindowListener::Initialize \n"));
+ char tBuff[56];
+ PR_LOG( trayLog, PR_LOG_DEBUG, ("%s rhTrayWindowListener::Initialize
\n",GetTStamp(tBuff,56)));
if(mWnd)
{
@@ -770,6 +716,7 @@
void rhTrayWindowListener::ShowWindow()
{
+ char tBuff[56];
if(mWnd)
{
GtkWidget *widget = NULL;
@@ -790,27 +737,27 @@
}
}
- PR_LOG( trayLog, PR_LOG_DEBUG, ("rhTrayWindowListener:: ShowWindow
\n"));
+ PR_LOG( trayLog, PR_LOG_DEBUG, ("%s rhTrayWindowListener:: ShowWindow
\n",GetTStamp(tBuff,56)));
}
-
}
void rhTrayWindowListener::HideWindow()
{
+ char tBuff[56];
if(mWnd)
{
gtk_widget_hide(mWnd);
- PR_LOG( trayLog, PR_LOG_DEBUG, ("rhTrayWindowListener:: Hide Window
%p\n",mWnd));
+ PR_LOG( trayLog, PR_LOG_DEBUG, ("%s rhTrayWindowListener:: Hide Window
%p\n",GetTStamp(tBuff,56),mWnd));
}
}
void rhTrayWindowListener::WndDestroyCBProc( GtkWidget *widget,
gpointer data )
{
-
+ char tBuff[56];
g_print("WndDestroyCBProc \n");
- PR_LOG( trayLog, PR_LOG_DEBUG, ("rhTrayWindowListener::WndDestroyCBProc
\n"));
+ PR_LOG( trayLog, PR_LOG_DEBUG, ("%s rhTrayWindowListener::WndDestroyCBProc
\n",GetTStamp(tBuff,56)));
}
@@ -818,9 +765,10 @@
GdkEvent *event,
gpointer data )
{
+ char tBuff[56];
g_print("WndDeleteCBProc\n");
- PR_LOG( trayLog, PR_LOG_DEBUG, ("rhTrayWindowListener::WndDeleteCBProc
\n"));
+ PR_LOG( trayLog, PR_LOG_DEBUG, ("%s rhTrayWindowListener::WndDeleteCBProc
\n",GetTStamp(tBuff,56)));
rhTrayWindowListener *me = (rhTrayWindowListener *) data;