From 0f834b91a4768673833ab4917e87d86c237bb1a6 Mon Sep 17 00:00:00 2001 From: marha Date: Fri, 23 Mar 2012 10:05:55 +0100 Subject: libX11 xserver fontconfig mesa pixman xkbcomp xkeyboard-config git update 23 Mar 2012 --- xorg-server/hw/xwin/wintrayicon.c | 235 ++++++++++++++++++-------------------- 1 file changed, 111 insertions(+), 124 deletions(-) (limited to 'xorg-server/hw/xwin/wintrayicon.c') diff --git a/xorg-server/hw/xwin/wintrayicon.c b/xorg-server/hw/xwin/wintrayicon.c index 895b47caf..dbc47257b 100644 --- a/xorg-server/hw/xwin/wintrayicon.c +++ b/xorg-server/hw/xwin/wintrayicon.c @@ -41,170 +41,157 @@ */ void -winInitNotifyIcon (winPrivScreenPtr pScreenPriv) +winInitNotifyIcon(winPrivScreenPtr pScreenPriv) { - winScreenInfo *pScreenInfo = pScreenPriv->pScreenInfo; - NOTIFYICONDATA nid = {0}; - - nid.cbSize = sizeof (NOTIFYICONDATA); - nid.hWnd = pScreenPriv->hwndScreen; - nid.uID = pScreenInfo->dwScreen; - nid.uFlags = NIF_ICON | NIF_MESSAGE | NIF_TIP; - nid.uCallbackMessage = WM_TRAYICON; - nid.hIcon = winTaskbarIcon (); - - /* Save handle to the icon so it can be freed later */ - pScreenPriv->hiconNotifyIcon = nid.hIcon; - - /* Set display and screen-specific tooltip text */ - snprintf (nid.szTip, - sizeof (nid.szTip), - PROJECT_NAME " Server:%s.%d", - display, - (int) pScreenInfo->dwScreen); - - /* Add the tray icon */ - if (!Shell_NotifyIcon (NIM_ADD, &nid)) - ErrorF ("winInitNotifyIcon - Shell_NotifyIcon Failed\n"); + winScreenInfo *pScreenInfo = pScreenPriv->pScreenInfo; + NOTIFYICONDATA nid = { 0 }; + + nid.cbSize = sizeof(NOTIFYICONDATA); + nid.hWnd = pScreenPriv->hwndScreen; + nid.uID = pScreenInfo->dwScreen; + nid.uFlags = NIF_ICON | NIF_MESSAGE | NIF_TIP; + nid.uCallbackMessage = WM_TRAYICON; + nid.hIcon = winTaskbarIcon(); + + /* Save handle to the icon so it can be freed later */ + pScreenPriv->hiconNotifyIcon = nid.hIcon; + + /* Set display and screen-specific tooltip text */ + snprintf(nid.szTip, + sizeof(nid.szTip), + PROJECT_NAME " Server:%s.%d", + display, (int) pScreenInfo->dwScreen); + + /* Add the tray icon */ + if (!Shell_NotifyIcon(NIM_ADD, &nid)) + ErrorF("winInitNotifyIcon - Shell_NotifyIcon Failed\n"); } - /* * Delete the tray icon */ void -winDeleteNotifyIcon (winPrivScreenPtr pScreenPriv) +winDeleteNotifyIcon(winPrivScreenPtr pScreenPriv) { - winScreenInfo *pScreenInfo = pScreenPriv->pScreenInfo; - NOTIFYICONDATA nid = {0}; - + winScreenInfo *pScreenInfo = pScreenPriv->pScreenInfo; + NOTIFYICONDATA nid = { 0 }; + #if 0 - ErrorF ("winDeleteNotifyIcon\n"); + ErrorF("winDeleteNotifyIcon\n"); #endif - nid.cbSize = sizeof (NOTIFYICONDATA); - nid.hWnd = pScreenPriv->hwndScreen; - nid.uID = pScreenInfo->dwScreen; - - /* Delete the tray icon */ - if (!Shell_NotifyIcon (NIM_DELETE, &nid)) - { - ErrorF ("winDeleteNotifyIcon - Shell_NotifyIcon failed\n"); - return; + nid.cbSize = sizeof(NOTIFYICONDATA); + nid.hWnd = pScreenPriv->hwndScreen; + nid.uID = pScreenInfo->dwScreen; + + /* Delete the tray icon */ + if (!Shell_NotifyIcon(NIM_DELETE, &nid)) { + ErrorF("winDeleteNotifyIcon - Shell_NotifyIcon failed\n"); + return; } - /* Free the icon that was loaded */ - if (pScreenPriv->hiconNotifyIcon != NULL - && DestroyIcon (pScreenPriv->hiconNotifyIcon) == 0) - { - ErrorF ("winDeleteNotifyIcon - DestroyIcon failed\n"); + /* Free the icon that was loaded */ + if (pScreenPriv->hiconNotifyIcon != NULL + && DestroyIcon(pScreenPriv->hiconNotifyIcon) == 0) { + ErrorF("winDeleteNotifyIcon - DestroyIcon failed\n"); } - pScreenPriv->hiconNotifyIcon = NULL; + pScreenPriv->hiconNotifyIcon = NULL; } - /* * Process messages intended for the tray icon */ LRESULT -winHandleIconMessage (HWND hwnd, UINT message, - WPARAM wParam, LPARAM lParam, - winPrivScreenPtr pScreenPriv) +winHandleIconMessage(HWND hwnd, UINT message, + WPARAM wParam, LPARAM lParam, winPrivScreenPtr pScreenPriv) { #if defined(XWIN_MULTIWINDOWEXTWM) || defined(XWIN_MULTIWINDOW) - winScreenInfo *pScreenInfo = pScreenPriv->pScreenInfo; + winScreenInfo *pScreenInfo = pScreenPriv->pScreenInfo; #endif - switch (lParam) - { + switch (lParam) { case WM_LBUTTONUP: - /* Restack and bring all windows to top */ - SetForegroundWindow (hwnd); + /* Restack and bring all windows to top */ + SetForegroundWindow(hwnd); #ifdef XWIN_MULTIWINDOWEXTWM - if (pScreenInfo->fMWExtWM) - winMWExtWMRestackWindows (pScreenInfo->pScreen); + if (pScreenInfo->fMWExtWM) + winMWExtWMRestackWindows(pScreenInfo->pScreen); #endif - break; + break; case WM_LBUTTONDBLCLK: - /* Display Exit dialog box */ - winDisplayExitDialog (pScreenPriv); - break; + /* Display Exit dialog box */ + winDisplayExitDialog(pScreenPriv); + break; case WM_RBUTTONUP: - { - POINT ptCursor; - HMENU hmenuPopup; - HMENU hmenuTray; + { + POINT ptCursor; + HMENU hmenuPopup; + HMENU hmenuTray; - /* Get cursor position */ - GetCursorPos (&ptCursor); + /* Get cursor position */ + GetCursorPos(&ptCursor); - /* Load tray icon menu resource */ - hmenuPopup = LoadMenu (g_hInstance, - MAKEINTRESOURCE(IDM_TRAYICON_MENU)); - if (!hmenuPopup) - ErrorF ("winHandleIconMessage - LoadMenu failed\n"); + /* Load tray icon menu resource */ + hmenuPopup = LoadMenu(g_hInstance, MAKEINTRESOURCE(IDM_TRAYICON_MENU)); + if (!hmenuPopup) + ErrorF("winHandleIconMessage - LoadMenu failed\n"); - /* Get actual tray icon menu */ - hmenuTray = GetSubMenu (hmenuPopup, 0); + /* Get actual tray icon menu */ + hmenuTray = GetSubMenu(hmenuPopup, 0); #ifdef XWIN_MULTIWINDOW - /* Check for MultiWindow mode */ - if (pScreenInfo->fMultiWindow) - { - MENUITEMINFO mii = {0}; - - /* Root is shown, remove the check box */ - - /* Setup menu item info structure */ - mii.cbSize = sizeof (MENUITEMINFO); - mii.fMask = MIIM_STATE; - mii.fState = MFS_CHECKED; - - /* Unheck box if root is shown */ - if (pScreenPriv->fRootWindowShown) - mii.fState = MFS_UNCHECKED; - - /* Set menu state */ - SetMenuItemInfo (hmenuTray, ID_APP_HIDE_ROOT, FALSE, &mii); - } - else + /* Check for MultiWindow mode */ + if (pScreenInfo->fMultiWindow) { + MENUITEMINFO mii = { 0 }; + + /* Root is shown, remove the check box */ + + /* Setup menu item info structure */ + mii.cbSize = sizeof(MENUITEMINFO); + mii.fMask = MIIM_STATE; + mii.fState = MFS_CHECKED; + + /* Unheck box if root is shown */ + if (pScreenPriv->fRootWindowShown) + mii.fState = MFS_UNCHECKED; + + /* Set menu state */ + SetMenuItemInfo(hmenuTray, ID_APP_HIDE_ROOT, FALSE, &mii); + } + else #endif - { - /* Remove Hide Root Window button */ - RemoveMenu (hmenuTray, - ID_APP_HIDE_ROOT, - MF_BYCOMMAND); - } - - SetupRootMenu ((unsigned long)hmenuTray); - - /* - * NOTE: This three-step procedure is required for - * proper popup menu operation. Without the - * call to SetForegroundWindow the - * popup menu will often not disappear when you click - * outside of it. Without the PostMessage the second - * time you display the popup menu it might immediately - * disappear. - */ - SetForegroundWindow (hwnd); - TrackPopupMenuEx (hmenuTray, - TPM_LEFTALIGN | TPM_BOTTOMALIGN | TPM_RIGHTBUTTON, - ptCursor.x, ptCursor.y, - hwnd, - NULL); - PostMessage (hwnd, WM_NULL, 0, 0); - - /* Free menu */ - DestroyMenu (hmenuPopup); - } - break; + { + /* Remove Hide Root Window button */ + RemoveMenu(hmenuTray, ID_APP_HIDE_ROOT, MF_BYCOMMAND); + } + + SetupRootMenu((unsigned long) hmenuTray); + + /* + * NOTE: This three-step procedure is required for + * proper popup menu operation. Without the + * call to SetForegroundWindow the + * popup menu will often not disappear when you click + * outside of it. Without the PostMessage the second + * time you display the popup menu it might immediately + * disappear. + */ + SetForegroundWindow(hwnd); + TrackPopupMenuEx(hmenuTray, + TPM_LEFTALIGN | TPM_BOTTOMALIGN | TPM_RIGHTBUTTON, + ptCursor.x, ptCursor.y, hwnd, NULL); + PostMessage(hwnd, WM_NULL, 0, 0); + + /* Free menu */ + DestroyMenu(hmenuPopup); + } + break; } - return 0; + return 0; } -- cgit v1.2.3