ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

winex11: Store information needed for the info balloon in the tray icon structure.

This commit is contained in:
Alexandre Julliard 2010-12-15 16:06:05 +01:00
parent 28a08aba0c
commit ab60be7b11
1 changed files with 21 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
dlls/winex11.drv/systray.c
View File

@ -32,6 +32,7 @@
#include <X11/Xlib.h> #include <X11/Xlib.h>
#define NONAMELESSUNION
#include "windef.h" #include "windef.h"
#include "winbase.h" #include "winbase.h"
#include "wingdi.h" #include "wingdi.h"
@ -53,11 +54,16 @@ struct tray_icon
HWND owner; /* the HWND passed in to the Shell_NotifyIcon call */ HWND owner; /* the HWND passed in to the Shell_NotifyIcon call */
HWND window; /* the adaptor window */ HWND window; /* the adaptor window */
HWND tooltip; /* Icon tooltip */ HWND tooltip; /* Icon tooltip */
UINT state; /* state flags */
UINT id; /* the unique id given by the app */ UINT id; /* the unique id given by the app */
UINT callback_message; UINT callback_message;
int display; /* display index, or -1 if hidden */ int display; /* display index, or -1 if hidden */
WCHAR tiptext[256]; /* Tooltip text. If empty => tooltip disabled */ WCHAR tiptext[128]; /* tooltip text */
WCHAR tiptitle[64]; /* Tooltip title for ballon style tooltips. If empty => tooltip is not balloon style. */ WCHAR info_text[256]; /* info balloon text */
WCHAR info_title[64]; /* info balloon title */
UINT info_flags; /* flags for info balloon */
UINT info_timeout; /* timeout for info balloon */
HICON info_icon; /* info balloon icon */
}; };
static struct list icon_list = LIST_INIT( icon_list ); static struct list icon_list = LIST_INIT( icon_list );
@ -78,6 +84,9 @@ Atom systray_atom = 0;
#define MIN_DISPLAYED 8 #define MIN_DISPLAYED 8
#define ICON_BORDER 2 #define ICON_BORDER 2
#define BALLOON_SHOW_MIN_TIMEOUT 10000
#define BALLOON_SHOW_MAX_TIMEOUT 30000
/* stand-alone tray window */ /* stand-alone tray window */
static HWND standalone_tray; static HWND standalone_tray;
static int icon_cx, icon_cy; static int icon_cx, icon_cy;
@ -108,7 +117,7 @@ static void create_tooltip(struct tray_icon *icon)
InitCommonControlsEx(&init_tooltip); InitCommonControlsEx(&init_tooltip);
tooltips_initialized = TRUE; tooltips_initialized = TRUE;
} }
if (icon->tiptitle[0] != 0) if (icon->info_title[0] != 0)
{ {
icon->tooltip = CreateWindowExW( WS_EX_TOPMOST, TOOLTIPS_CLASSW, NULL, icon->tooltip = CreateWindowExW( WS_EX_TOPMOST, TOOLTIPS_CLASSW, NULL,
WS_POPUP | TTS_ALWAYSTIP | TTS_BALLOON, WS_POPUP | TTS_ALWAYSTIP | TTS_BALLOON,
@ -484,10 +493,9 @@ static BOOL modify_icon( struct tray_icon *icon, NOTIFYICONDATAW *nid )
{ {
TRACE( "id=0x%x hwnd=%p flags=%x\n", nid->uID, nid->hWnd, nid->uFlags ); TRACE( "id=0x%x hwnd=%p flags=%x\n", nid->uID, nid->hWnd, nid->uFlags );
if ((nid->uFlags & NIF_STATE) && (nid->dwStateMask & NIS_HIDDEN)) if (nid->uFlags & NIF_STATE)
{ {
if (nid->dwState & NIS_HIDDEN) hide_icon( icon ); icon->state = (icon->state & ~nid->dwStateMask) | (nid->dwState & nid->dwStateMask);
else show_icon( icon );
} }
if (nid->uFlags & NIF_ICON) if (nid->uFlags & NIF_ICON)
@ -512,15 +520,18 @@ static BOOL modify_icon( struct tray_icon *icon, NOTIFYICONDATAW *nid )
if (nid->uFlags & NIF_TIP) if (nid->uFlags & NIF_TIP)
{ {
lstrcpynW(icon->tiptext, nid->szTip, sizeof(icon->tiptext)/sizeof(WCHAR)); lstrcpynW(icon->tiptext, nid->szTip, sizeof(icon->tiptext)/sizeof(WCHAR));
icon->tiptitle[0] = 0;
if (icon->tooltip) update_tooltip_text(icon); if (icon->tooltip) update_tooltip_text(icon);
} }
if (nid->uFlags & NIF_INFO && nid->cbSize >= NOTIFYICONDATAA_V2_SIZE) if (nid->uFlags & NIF_INFO && nid->cbSize >= NOTIFYICONDATAA_V2_SIZE)
{ {
lstrcpynW(icon->tiptext, nid->szInfo, sizeof(icon->tiptext)/sizeof(WCHAR)); lstrcpynW( icon->info_text, nid->szInfo, sizeof(icon->info_text)/sizeof(WCHAR) );
lstrcpynW(icon->tiptitle, nid->szInfoTitle, sizeof(icon->tiptitle)/sizeof(WCHAR)); lstrcpynW( icon->info_title, nid->szInfoTitle, sizeof(icon->info_title)/sizeof(WCHAR) );
if (icon->tooltip) update_tooltip_text(icon); icon->info_flags = nid->dwInfoFlags;
icon->info_timeout = max(min(nid->u.uTimeout, BALLOON_SHOW_MAX_TIMEOUT), BALLOON_SHOW_MIN_TIMEOUT);
icon->info_icon = nid->hBalloonIcon;
} }
if (icon->state & NIS_HIDDEN) hide_icon( icon );
else show_icon( icon );
return TRUE; return TRUE;
} }
@ -550,10 +561,6 @@ static BOOL add_icon(NOTIFYICONDATAW *nid)
list_add_tail(&icon_list, &icon->entry); list_add_tail(&icon_list, &icon->entry);
/* if hidden state is specified, modify_icon will take care of it */
if (!((nid->uFlags & NIF_STATE) && (nid->dwStateMask & NIS_HIDDEN)))
show_icon( icon );
return modify_icon( icon, nid ); return modify_icon( icon, nid );
} }