Change WM_RBUTTONUP to WM_CONTEXTMENU

Required for correct behavior under right click as well as
keyboard event (Shift-F10) for context menu.

The location of the context menu is now taken from the
message as the cursor position may not match when triggered by
keyboard event.

Fixes Github #763

Signed-off-by: Selva Nair <selva.nair@gmail.com>

configure.ac

@@ -20,7 +20,7 @@ dnl  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
 AC_PREREQ(2.59)
 define([_GUI_VERSION_MAJOR], [11])
-define([_GUI_VERSION_MINOR], [54])
+define([_GUI_VERSION_MINOR], [55])
 AC_INIT([OpenVPN GUI],[_GUI_VERSION_MAJOR],[openvpn-devel@lists.sourceforge.net],[openvpn-gui],[https://github.com/openvpn/openvpn-gui/])
 AC_DEFINE([PACKAGE_VERSION_RESOURCE], [_GUI_VERSION_MAJOR,_GUI_VERSION_MINOR,0,0], [Version in windows resource format])
 AC_DEFINE([PACKAGE_VERSION_RESOURCE_STR], ["_GUI_VERSION_MAJOR._GUI_VERSION_MINOR.0.0"], [Version as a string])

main.c

@@ -513,7 +513,7 @@ HandleCopyDataMessage(const COPYDATASTRUCT *copy_data)
     }
     else if (copy_data->dwData == WM_OVPN_RESCAN)
     {
-        OnNotifyTray(WM_OVPN_RESCAN);
+        OnNotifyTray(0, WM_OVPN_RESCAN);
     }
     else
     {
@@ -653,7 +653,7 @@ WindowProcedure(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
             break;
 
         case WM_NOTIFYICONTRAY:
-            OnNotifyTray(lParam); /* Manages message from tray */
+            OnNotifyTray(wParam, lParam); /* Manages message from tray */
             break;
 
         case WM_COPYDATA: /* custom messages with data from other processes */

res/openvpn-gui-res-zh-hans.rc

@@ -314,7 +314,7 @@ FONT 8, "Segoe UI"
 LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED
 BEGIN
     CONTROL "", ID_STATIC_QR, "Static", SS_BITMAP | WS_VISIBLE | SS_CENTERIMAGE, 0, 0, 10, 10
-    LTEXT "Scan this QR code on your mobile to proceed with authentication.", ID_TXT_QR, 0, 0, 10, 10, SS_CENTER | WS_VISIBLE | SS_EDITCONTROL
+    LTEXT "在您的手机上扫描这个二维码以进行身份验证。", ID_TXT_QR, 0, 0, 10, 10, SS_CENTER | WS_VISIBLE | SS_EDITCONTROL
 END
 
 STRINGTABLE

tray.c

@@ -427,17 +427,20 @@ PositionTrayToolTip(LONG x, LONG y)
  * Handle mouse clicks on tray icon
  */
 void
-OnNotifyTray(LPARAM lParam)
+OnNotifyTray(WPARAM wParam, LPARAM lParam)
 {
     POINT pt;
 
     /* Use LOWORD(lParam)  as HIWORD() contains the icon id if uVersion >= 4 */
     switch (LOWORD(lParam))
     {
-        case WM_RBUTTONUP:
+        case WM_CONTEXTMENU:
             RecreatePopupMenus();
+            /* wParam contains the upper left corner of the anchor point */
+
+            pt.x = (int)LOWORD(wParam);
+            pt.y = (int)HIWORD(wParam);
 
-            GetCursorPos(&pt);
             SetForegroundWindow(o.hWnd);
             TrackPopupMenu(hMenu, TPM_RIGHTALIGN, pt.x, pt.y, 0, o.hWnd, NULL);
             PostMessage(o.hWnd, WM_NULL, 0, 0);

tray.h

@@ -49,7 +49,7 @@ void RecreatePopupMenus(void);
 
 void CreatePopupMenus();
 
-void OnNotifyTray(LPARAM);
+void OnNotifyTray(WPARAM, LPARAM);
 
 void OnDestroyTray(void);